diff --git a/index.php b/index.php
index dd3d554472..86334797d6 100644
--- a/index.php
+++ b/index.php
@@ -11,7 +11,7 @@
  *
  * @var bool
  */
-define('WP_USE_THEMES', true);
+define( 'WP_USE_THEMES', true );
 
 /** Loads the WordPress Environment and Template */
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
diff --git a/wp-activate.php b/wp-activate.php
index 1a7d1ecdb9..5150c299f4 100644
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -9,17 +9,18 @@
 define( 'WP_INSTALLING', true );
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require( dirname( __FILE__ ) . '/wp-load.php' );
 
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
-if ( !is_multisite() ) {
+if ( ! is_multisite() ) {
 	wp_redirect( wp_registration_url() );
 	die();
 }
 
-if ( is_object( $wp_object_cache ) )
+if ( is_object( $wp_object_cache ) ) {
 	$wp_object_cache->cache_enabled = false;
+}
 
 // Fix for page title
 $wp_query->is_404 = false;
@@ -43,10 +44,10 @@ function do_activate_header() {
 	 * Fires before the Site Activation page is loaded.
 	 *
 	 * Fires on the {@see 'wp_head'} action.
-     *
-     * @since 3.0.0
-     */
-    do_action( 'activate_wp_head' );
+	 *
+	 * @since 3.0.0
+	 */
+	do_action( 'activate_wp_head' );
 }
 add_action( 'wp_head', 'do_activate_header' );
 
@@ -73,28 +74,29 @@ get_header( 'wp-activate' );
 
 <div id="signup-content" class="widecolumn">
 	<div class="wp-activate-container">
-	<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
+	<?php if ( empty( $_GET['key'] ) && empty( $_POST['key'] ) ) { ?>
 
-		<h2><?php _e('Activation Key Required') ?></h2>
-		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url('wp-activate.php'); ?>">
+		<h2><?php _e( 'Activation Key Required' ); ?></h2>
+		<form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
 			<p>
-			    <label for="key"><?php _e('Activation Key:') ?></label>
-			    <br /><input type="text" name="key" id="key" value="" size="50" />
+				<label for="key"><?php _e( 'Activation Key:' ); ?></label>
+				<br /><input type="text" name="key" id="key" value="" size="50" />
 			</p>
 			<p class="submit">
-			    <input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
+				<input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e( 'Activate' ); ?>" />
 			</p>
 		</form>
 
-	<?php } else {
+	<?php
+} else {
 
-		$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
-		$result = wpmu_activate_signup( $key );
-		if ( is_wp_error($result) ) {
-			if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
-				$signup = $result->get_error_data();
-				?>
-				<h2><?php _e('Your account is now active!'); ?></h2>
+	$key    = ! empty( $_GET['key'] ) ? $_GET['key'] : $_POST['key'];
+	$result = wpmu_activate_signup( $key );
+	if ( is_wp_error( $result ) ) {
+		if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+			$signup = $result->get_error_data();
+			?>
+			<h2><?php _e( 'Your account is now active!' ); ?></h2>
 				<?php
 				echo '<p class="lead-in">';
 				if ( $signup->domain . $signup->path == '' ) {
@@ -117,40 +119,46 @@ get_header( 'wp-activate' );
 					);
 				}
 				echo '</p>';
-			} else {
-				?>
-				<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
+		} else {
+			?>
+			<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
 				<p><?php echo $result->get_error_message(); ?></p>
 				<?php
-			}
-		} else {
-			$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
-			$user = get_userdata( (int) $result['user_id'] );
-			?>
-			<h2><?php _e('Your account is now active!'); ?></h2>
+		}
+	} else {
+		$url  = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
+		$user = get_userdata( (int) $result['user_id'] );
+		?>
+		<h2><?php _e( 'Your account is now active!' ); ?></h2>
 
 			<div id="signup-welcome">
-				<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
-				<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
+			<p><span class="h3"><?php _e( 'Username:' ); ?></span> <?php echo $user->user_login; ?></p>
+			<p><span class="h3"><?php _e( 'Password:' ); ?></span> <?php echo $result['password']; ?></p>
 			</div>
 
-			<?php if ( $url && $url != network_home_url( '', 'http' ) ) :
+			<?php
+			if ( $url && $url != network_home_url( '', 'http' ) ) :
 				switch_to_blog( (int) $result['blog_id'] );
 				$login_url = wp_login_url();
 				restore_current_blog();
 				?>
-				<p class="view"><?php
+				<p class="view">
+				<?php
 					/* translators: 1: site URL, 2: login URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) );
-				?></p>
-			<?php else: ?>
-				<p class="view"><?php
+				?>
+				</p>
+			<?php else : ?>
+				<p class="view">
+				<?php
 					/* translators: 1: login URL, 2: network home URL */
 					printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
-				?></p>
-			<?php endif;
-		}
+				?>
+				</p>
+			<?php
+			endif;
 	}
+}
 	?>
 	</div>
 </div>
@@ -158,4 +166,5 @@ get_header( 'wp-activate' );
 	var key_input = document.getElementById('key');
 	key_input && key_input.focus();
 </script>
-<?php get_footer( 'wp-activate' );
+<?php
+get_footer( 'wp-activate' );
diff --git a/wp-admin/about.php b/wp-admin/about.php
index 1f9d077ba8..f39b22e830 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -77,7 +77,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 						<img src="https://s.w.org/images/core/4.9/locking.svg" alt="">
 					</div>
 					<h3><?php _e( 'Design Locking To Guard Your Changes' ); ?></h3>
-					<p><?php _e( 'Ever encounter a scenario where two designers walk into a project and designer A overrides designer B&#8217;s beautiful changes? WordPress 4.9&#8217;s design lock feature (similar to post locking) secures your draft design so that no one can make changes to it or erase all your hard work.' );?></p>
+					<p><?php _e( 'Ever encounter a scenario where two designers walk into a project and designer A overrides designer B&#8217;s beautiful changes? WordPress 4.9&#8217;s design lock feature (similar to post locking) secures your draft design so that no one can make changes to it or erase all your hard work.' ); ?></p>
 				</div>
 				<div class="section-item">
 					<div class="inline-svg">
@@ -114,7 +114,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 						<img src="https://s.w.org/images/core/4.9/warning.svg" alt="">
 					</div>
 					<h3><?php _e( 'Warning: Potential Danger Ahead!' ); ?></h3>
-					<p><?php _e( 'When you edit themes and plugins directly, WordPress 4.9 will politely warn you that this is a dangerous practice. It will recommend that you backup your files before saving, so they don&#8217;t get overwritten by the next update. Take the safe route: your future self will thank you. Your team and customers will thank you.' );?></p>
+					<p><?php _e( 'When you edit themes and plugins directly, WordPress 4.9 will politely warn you that this is a dangerous practice. It will recommend that you backup your files before saving, so they don&#8217;t get overwritten by the next update. Take the safe route: your future self will thank you. Your team and customers will thank you.' ); ?></p>
 				</div>
 			</div>
 		</div>
@@ -182,33 +182,42 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 					);
 				?>
 			</h2>
-			<p><?php printf(
-				__( 'WordPress is working on a new way to create and control your content and we&#8217;d love to have your help. Interested in being an <a href="%s">early tester</a> or getting involved with the Gutenberg project? <a href="%s">Contribute on GitHub</a>.' ),
+			<p>
+			<?php
+			printf(
+				__( 'WordPress is working on a new way to create and control your content and we&#8217;d love to have your help. Interested in being an <a href="%1$s">early tester</a> or getting involved with the Gutenberg project? <a href="%2$s">Contribute on GitHub</a>.' ),
 				__( 'https://wordpress.org/plugins/gutenberg/' ),
-				'https://github.com/WordPress/gutenberg' ); ?></p>
+				'https://github.com/WordPress/gutenberg'
+			);
+				?>
+				</p>
 		</div>
 
 		<hr />
 
 		<div class="changelog">
-			<h2><?php
+			<h2>
+			<?php
 				printf(
 					/* translators: %s: smiling face with smiling eyes emoji */
 					__( 'Developer Happiness %s' ),
 					'&#x1F60A'
 				);
-			?></h2>
+			?>
+			</h2>
 
 			<div class="under-the-hood two-col">
 				<div class="col">
 					<h3><a href="https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/"><?php _e( 'Customizer JS API Improvements' ); ?></a></h3>
-					<p><?php
+					<p>
+					<?php
 						printf(
 							/* translators: %s: https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/  */
 							__( '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>
+					?>
+					</p>
 				</div>
 				<div class="col">
 					<h3><a href="https://make.wordpress.org/core/2017/10/22/code-editing-improvements-in-wordpress-4-9/"><?php _e( 'CodeMirror available for use in your themes and plugins' ); ?></a></h3>
@@ -352,16 +361,22 @@ __( '<strong>Version %s</strong> addressed one security issue.' );
 __( '<strong>Version %s</strong> addressed some security issues.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
-_n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-		'<strong>Version %1$s</strong> addressed %2$s bugs.' );
+_n_noop(
+	'<strong>Version %1$s</strong> addressed %2$s bug.',
+	'<strong>Version %1$s</strong> addressed %2$s bugs.'
+);
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-		'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+_n_noop(
+	'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+	'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.'
+);
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-		'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+_n_noop(
+	'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+	'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.'
+);
 
 /* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );
diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 8a1533254f..02254ec454 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -25,8 +25,9 @@ require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 send_origin_headers();
 
 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) )
+if ( empty( $_REQUEST['action'] ) ) {
 	wp_die( '0', 400 );
+}
 
 /** Load WordPress Administration APIs */
 require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -44,39 +45,104 @@ nocache_headers();
 do_action( 'admin_init' );
 
 $core_actions_get = array(
-	'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
-	'autocomplete-user', 'dashboard-widgets', 'logged-in',
+	'fetch-list',
+	'ajax-tag-search',
+	'wp-compression-test',
+	'imgedit-preview',
+	'oembed-cache',
+	'autocomplete-user',
+	'dashboard-widgets',
+	'logged-in',
 );
 
 $core_actions_post = array(
-	'oembed-cache', 'image-editor', 'delete-comment', 'delete-tag', 'delete-link',
-	'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
-	'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
-	'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'closed-postboxes',
-	'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
-	'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
-	'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
-	'save-widget', 'delete-inactive-widgets', 'set-post-thumbnail', 'date_format', 'time_format',
-	'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
-	'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
-	'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
-	'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
-	'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'crop-image',
-	'generate-password', 'save-wporg-username', 'delete-plugin', 'search-plugins',
-	'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme', 'install-theme',
-	'get-post-thumbnail-html', 'get-community-events', 'edit-theme-plugin-file',
+	'oembed-cache',
+	'image-editor',
+	'delete-comment',
+	'delete-tag',
+	'delete-link',
+	'delete-meta',
+	'delete-post',
+	'trash-post',
+	'untrash-post',
+	'delete-page',
+	'dim-comment',
+	'add-link-category',
+	'add-tag',
+	'get-tagcloud',
+	'get-comments',
+	'replyto-comment',
+	'edit-comment',
+	'add-menu-item',
+	'add-meta',
+	'add-user',
+	'closed-postboxes',
+	'hidden-columns',
+	'update-welcome-panel',
+	'menu-get-metabox',
+	'wp-link-ajax',
+	'menu-locations-save',
+	'menu-quick-search',
+	'meta-box-order',
+	'get-permalink',
+	'sample-permalink',
+	'inline-save',
+	'inline-save-tax',
+	'find_posts',
+	'widgets-order',
+	'save-widget',
+	'delete-inactive-widgets',
+	'set-post-thumbnail',
+	'date_format',
+	'time_format',
+	'wp-remove-post-lock',
+	'dismiss-wp-pointer',
+	'upload-attachment',
+	'get-attachment',
+	'query-attachments',
+	'save-attachment',
+	'save-attachment-compat',
+	'send-link-to-editor',
+	'send-attachment-to-editor',
+	'save-attachment-order',
+	'heartbeat',
+	'get-revision-diffs',
+	'save-user-color-scheme',
+	'update-widget',
+	'query-themes',
+	'parse-embed',
+	'set-attachment-thumbnail',
+	'parse-media-shortcode',
+	'destroy-sessions',
+	'install-plugin',
+	'update-plugin',
+	'crop-image',
+	'generate-password',
+	'save-wporg-username',
+	'delete-plugin',
+	'search-plugins',
+	'search-install-plugins',
+	'activate-plugin',
+	'update-theme',
+	'delete-theme',
+	'install-theme',
+	'get-post-thumbnail-html',
+	'get-community-events',
+	'edit-theme-plugin-file',
 );
 
 // Deprecated
 $core_actions_post_deprecated = array( 'wp-fullscreen-save-post', 'press-this-save-post', 'press-this-add-category' );
-$core_actions_post = array_merge( $core_actions_post, $core_actions_post_deprecated );
+$core_actions_post            = array_merge( $core_actions_post, $core_actions_post_deprecated );
 
 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
 	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+}
 
-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
+if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) ) {
 	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
+}
 
 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
 
diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index 2317a03bd8..6014d1767d 100644
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -7,8 +7,9 @@
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+	die( '-1' );
+}
 
 /**
  * @global string $hook_suffix
@@ -99,9 +100,10 @@ do_action( 'admin_print_footer_scripts' );
 do_action( "admin_footer-{$hook_suffix}" );
 
 // get_site_option() won't exist when auto upgrading from <= 2.7
-if ( function_exists('get_site_option') ) {
-	if ( false === get_site_option('can_compress_scripts') )
+if ( function_exists( 'get_site_option' ) ) {
+	if ( false === get_site_option( 'can_compress_scripts' ) ) {
 		compression_test();
+	}
 }
 
 ?>
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index abbb07998e..1185268744 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -9,7 +9,7 @@
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/admin.php' );
+_deprecated_file( basename( __FILE__ ), '2.5.0', 'wp-admin/includes/admin.php' );
 
 /** WordPress Administration API: Includes all Administration functions. */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );
diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php
index d5ceeccd61..ed9c0399f9 100644
--- a/wp-admin/admin-header.php
+++ b/wp-admin/admin-header.php
@@ -6,9 +6,10 @@
  * @subpackage Administration
  */
 
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if ( ! defined( 'WP_ADMIN' ) )
+@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+if ( ! defined( 'WP_ADMIN' ) ) {
 	require_once( dirname( __FILE__ ) . '/admin.php' );
+}
 
 /**
  * In case admin-header.php is included in a function.
@@ -26,8 +27,9 @@ global $title, $hook_suffix, $current_screen, $wp_locale, $pagenow,
 	$update_title, $total_update_count, $parent_file;
 
 // Catch plugins that include admin-header.php before admin.php completes.
-if ( empty( $current_screen ) )
+if ( empty( $current_screen ) ) {
 	set_current_screen();
+}
 
 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );
@@ -69,10 +71,10 @@ _wp_admin_html_begin();
 
 wp_enqueue_style( 'colors' );
 wp_enqueue_style( 'ie' );
-wp_enqueue_script('utils');
+wp_enqueue_script( 'utils' );
 wp_enqueue_script( 'svg-painter' );
 
-$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
+$admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
 ?>
 <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();}}};
@@ -141,37 +143,46 @@ do_action( "admin_head-{$hook_suffix}" );
  */
 do_action( 'admin_head' );
 
-if ( get_user_setting('mfold') == 'f' )
+if ( get_user_setting( 'mfold' ) == 'f' ) {
 	$admin_body_class .= ' folded';
+}
 
-if ( !get_user_setting('unfold') )
+if ( ! get_user_setting( 'unfold' ) ) {
 	$admin_body_class .= ' auto-fold';
+}
 
-if ( is_admin_bar_showing() )
+if ( is_admin_bar_showing() ) {
 	$admin_body_class .= ' admin-bar';
+}
 
-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}
 
-if ( $current_screen->post_type )
+if ( $current_screen->post_type ) {
 	$admin_body_class .= ' post-type-' . $current_screen->post_type;
+}
 
-if ( $current_screen->taxonomy )
+if ( $current_screen->taxonomy ) {
 	$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
+}
 
 $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
 $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	$admin_body_class .= ' mobile';
+}
 
-if ( is_multisite() )
+if ( is_multisite() ) {
 	$admin_body_class .= ' multisite';
+}
 
-if ( is_network_admin() )
+if ( is_network_admin() ) {
 	$admin_body_class .= ' network-admin';
+}
 
 $admin_body_class .= ' no-customize-support no-svg';
 
@@ -207,7 +218,7 @@ if ( current_user_can( 'customize' ) ) {
 ?>
 
 <div id="wpwrap">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php require( ABSPATH . 'wp-admin/menu-header.php' ); ?>
 <div id="wpcontent">
 
 <?php
@@ -221,13 +232,13 @@ do_action( 'in_admin_header' );
 
 <div id="wpbody" role="main">
 <?php
-unset($title_class, $blog_name, $total_update_count, $update_title);
+unset( $title_class, $blog_name, $total_update_count, $update_title );
 
 $current_screen->set_parentage( $parent_file );
 
 ?>
 
-<div id="wpbody-content" aria-label="<?php esc_attr_e('Main content'); ?>" tabindex="0">
+<div id="wpbody-content" aria-label="<?php esc_attr_e( 'Main content' ); ?>" tabindex="0">
 <?php
 
 $current_screen->render_screen_meta();
@@ -262,5 +273,6 @@ if ( is_network_admin() ) {
  */
 do_action( 'all_admin_notices' );
 
-if ( $parent_file == 'options-general.php' )
-	require(ABSPATH . 'wp-admin/options-head.php');
+if ( $parent_file == 'options-general.php' ) {
+	require( ABSPATH . 'wp-admin/options-head.php' );
+}
diff --git a/wp-admin/admin-post.php b/wp-admin/admin-post.php
index d3135f2ab3..1202fbe9b6 100644
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -13,15 +13,16 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 	define( 'WP_ADMIN', true );
 }
 
-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
-else
+if ( defined( 'ABSPATH' ) ) {
+	require_once( ABSPATH . 'wp-load.php' );
+} else {
 	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}
 
 /** Allow for cross-domain requests (from the front end). */
 send_origin_headers();
 
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );
 
 nocache_headers();
 
diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index d77ab723f8..8c3fc2c39a 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -15,26 +15,29 @@ if ( ! defined( 'WP_ADMIN' ) ) {
 	define( 'WP_ADMIN', true );
 }
 
-if ( ! defined('WP_NETWORK_ADMIN') )
-	define('WP_NETWORK_ADMIN', false);
-
-if ( ! defined('WP_USER_ADMIN') )
-	define('WP_USER_ADMIN', false);
-
-if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
-	define('WP_BLOG_ADMIN', true);
+if ( ! defined( 'WP_NETWORK_ADMIN' ) ) {
+	define( 'WP_NETWORK_ADMIN', false );
 }
 
-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
-	define('WP_LOAD_IMPORTERS', true);
+if ( ! defined( 'WP_USER_ADMIN' ) ) {
+	define( 'WP_USER_ADMIN', false );
+}
 
-require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
+if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
+	define( 'WP_BLOG_ADMIN', true );
+}
+
+if ( isset( $_GET['import'] ) && ! defined( 'WP_LOAD_IMPORTERS' ) ) {
+	define( 'WP_LOAD_IMPORTERS', true );
+}
+
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
 nocache_headers();
 
-if ( get_option('db_upgraded') ) {
+if ( get_option( 'db_upgraded' ) ) {
 	flush_rewrite_rules();
-	update_option( 'db_upgraded',  false );
+	update_option( 'db_upgraded', false );
 
 	/**
 	 * Fires on the next page load after a successful DB upgrade.
@@ -42,25 +45,25 @@ if ( get_option('db_upgraded') ) {
 	 * @since 2.8.0
 	 */
 	do_action( 'after_db_upgrade' );
-} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
-	if ( !is_multisite() ) {
+} elseif ( get_option( 'db_version' ) != $wp_db_version && empty( $_POST ) ) {
+	if ( ! is_multisite() ) {
 		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
 		exit;
 
-	/**
-	 * Filters whether to attempt to perform the multisite DB upgrade routine.
-	 *
-	 * In single site, the user would be redirected to wp-admin/upgrade.php.
-	 * In multisite, the DB upgrade routine is automatically fired, but only
-	 * when this filter returns true.
-	 *
-	 * If the network is 50 sites or less, it will run every time. Otherwise,
-	 * it will throttle itself to reduce load.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
-	 */
+		/**
+		 * Filters whether to attempt to perform the multisite DB upgrade routine.
+		 *
+		 * In single site, the user would be redirected to wp-admin/upgrade.php.
+		 * In multisite, the DB upgrade routine is automatically fired, but only
+		 * when this filter returns true.
+		 *
+		 * If the network is 50 sites or less, it will run every time. Otherwise,
+		 * it will throttle itself to reduce load.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
+		 */
 	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
 		$c = get_blog_count();
 
@@ -68,24 +71,30 @@ if ( get_option('db_upgraded') ) {
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
+		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( 'timeout' => 120, 'httpversion' => '1.1' ) );
+			$response = wp_remote_get(
+				admin_url( 'upgrade.php?step=1' ), array(
+					'timeout'     => 120,
+					'httpversion' => '1.1',
+				)
+			);
 			/** This action is documented in wp-admin/network/upgrade.php */
 			do_action( 'after_mu_upgrade', $response );
-			unset($response);
+			unset( $response );
 		}
-		unset($c);
+		unset( $c );
 	}
 }
 
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );
 
 auth_redirect();
 
 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
-	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
+	wp_schedule_event( time(), 'daily', 'wp_scheduled_delete' );
+}
 
 // Schedule Transient cleanup.
 if ( ! wp_next_scheduled( 'delete_expired_transients' ) && ! wp_installing() ) {
@@ -117,27 +126,30 @@ $page_hook = null;
 
 $editing = false;
 
-if ( isset($_GET['page']) ) {
+if ( isset( $_GET['page'] ) ) {
 	$plugin_page = wp_unslash( $_GET['page'] );
-	$plugin_page = plugin_basename($plugin_page);
+	$plugin_page = plugin_basename( $plugin_page );
 }
 
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
 	$typenow = $_REQUEST['post_type'];
-else
+} else {
 	$typenow = '';
+}
 
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
 	$taxnow = $_REQUEST['taxonomy'];
-else
+} else {
 	$taxnow = '';
+}
 
-if ( WP_NETWORK_ADMIN )
-	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
-	require(ABSPATH . 'wp-admin/user/menu.php');
-else
-	require(ABSPATH . 'wp-admin/menu.php');
+if ( WP_NETWORK_ADMIN ) {
+	require( ABSPATH . 'wp-admin/network/menu.php' );
+} elseif ( WP_USER_ADMIN ) {
+	require( ABSPATH . 'wp-admin/user/menu.php' );
+} else {
+	require( ABSPATH . 'wp-admin/menu.php' );
+}
 
 if ( current_user_can( 'manage_options' ) ) {
 	wp_raise_memory_limit( 'admin' );
@@ -155,26 +167,28 @@ if ( current_user_can( 'manage_options' ) ) {
  */
 do_action( 'admin_init' );
 
-if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
+if ( isset( $plugin_page ) ) {
+	if ( ! empty( $typenow ) ) {
 		$the_parent = $pagenow . '?post_type=' . $typenow;
-	else
+	} else {
 		$the_parent = $pagenow;
-	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
-		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
+	}
+	if ( ! $page_hook = get_plugin_page_hook( $plugin_page, $the_parent ) ) {
+		$page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );
 
 		// Back-compat for plugins using add_management_page().
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
-			else
+			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
+				$query_string = $_SERVER['QUERY_STRING'];
+			} else {
 				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
+			}
+			wp_redirect( admin_url( 'tools.php?' . $query_string ) );
 			exit;
 		}
 	}
-	unset($the_parent);
+	unset( $the_parent );
 }
 
 $hook_suffix = '';
@@ -189,7 +203,7 @@ if ( isset( $page_hook ) ) {
 set_current_screen();
 
 // Handle plugin admin pages.
-if ( isset($plugin_page) ) {
+if ( isset( $plugin_page ) ) {
 	if ( $page_hook ) {
 		/**
 		 * Fires before a particular screen is loaded.
@@ -212,8 +226,9 @@ if ( isset($plugin_page) ) {
 		 * @since 2.1.0
 		 */
 		do_action( "load-{$page_hook}" );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset( $_GET['noheader'] ) ) {
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		}
 
 		/**
 		 * Used to call the registered callback for a plugin screen.
@@ -227,8 +242,9 @@ if ( isset($plugin_page) ) {
 			wp_die( __( 'Invalid plugin page.' ) );
 		}
 
-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
-			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		if ( ! ( file_exists( WP_PLUGIN_DIR . "/$plugin_page" ) && is_file( WP_PLUGIN_DIR . "/$plugin_page" ) ) && ! ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) && is_file( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) ) {
+			wp_die( sprintf( __( 'Cannot load %s.' ), htmlentities( $plugin_page ) ) );
+		}
 
 		/**
 		 * Fires before a particular screen is loaded.
@@ -244,16 +260,18 @@ if ( isset($plugin_page) ) {
 		 */
 		do_action( "load-{$plugin_page}" );
 
-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset( $_GET['noheader'] ) ) {
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		}
 
-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
-		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+		if ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) {
+			include( WPMU_PLUGIN_DIR . "/$plugin_page" );
+		} else {
+			include( WP_PLUGIN_DIR . "/$plugin_page" );
+		}
 	}
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 	exit();
 } elseif ( isset( $_GET['import'] ) ) {
@@ -264,12 +282,12 @@ if ( isset($plugin_page) ) {
 		wp_die( __( 'Sorry, you are not allowed to import content.' ) );
 	}
 
-	if ( validate_file($importer) ) {
+	if ( validate_file( $importer ) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}
 
-	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
+	if ( ! isset( $wp_importers[ $importer ] ) || ! is_callable( $wp_importers[ $importer ][2] ) ) {
 		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
 		exit;
 	}
@@ -283,16 +301,17 @@ if ( isset($plugin_page) ) {
 	 */
 	do_action( "load-importer-{$importer}" );
 
-	$parent_file = 'tools.php';
+	$parent_file  = 'tools.php';
 	$submenu_file = 'import.php';
-	$title = __('Import');
+	$title        = __( 'Import' );
 
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if ( ! isset( $_GET['noheader'] ) ) {
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	}
 
-	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-	define('WP_IMPORTING', true);
+	define( 'WP_IMPORTING', true );
 
 	/**
 	 * Whether to filter imported data through kses on import.
@@ -308,12 +327,12 @@ if ( isset($plugin_page) ) {
 		kses_init_filters();  // Always filter imported data with kses on multisite.
 	}
 
-	call_user_func($wp_importers[$importer][2]);
+	call_user_func( $wp_importers[ $importer ][2] );
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 	// Make sure rules are flushed
-	flush_rewrite_rules(false);
+	flush_rewrite_rules( false );
 
 	exit();
 } else {
@@ -336,16 +355,18 @@ if ( isset($plugin_page) ) {
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
 	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
+		if ( $pagenow == 'post-new.php' ) {
 			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
+		} elseif ( $pagenow == 'post.php' ) {
 			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
+		}
+	} elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' ) {
 			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
+		} elseif ( $taxnow == 'link_category' ) {
 			do_action( 'load-edit-link-categories.php' );
-	} elseif( 'term.php' === $pagenow ) {
+		}
+	} elseif ( 'term.php' === $pagenow ) {
 		do_action( 'load-edit-tags.php' );
 	}
 }
diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index 2293fde811..ffdfda097e 100644
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -39,51 +39,60 @@ if ( ! current_user_can( 'upload_files' ) ) {
 }
 
 // just fetch the detail form for that attachment
-if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
+if ( isset( $_REQUEST['attachment_id'] ) && ( $id = intval( $_REQUEST['attachment_id'] ) ) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
+	if ( 'attachment' != $post->post_type ) {
 		wp_die( __( 'Invalid post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
+	}
+	if ( ! current_user_can( 'edit_post', $id ) ) {
 		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	}
 
 	switch ( $_REQUEST['fetch'] ) {
-		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
+		case 3:
+			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
 				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			}
 			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
 
 			// Title shouldn't ever be empty, but use filename just in case.
-			$file = get_attached_file( $post->ID );
+			$file  = get_attached_file( $post->ID );
 			$title = $post->post_title ? $post->post_title : wp_basename( $file );
 			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
 			break;
-		case 2 :
-			add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id, array( 'send' => false, 'delete' => true ));
+		case 2:
+			add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
+			echo get_media_item(
+				$id, array(
+					'send'   => false,
+					'delete' => true,
+				)
+			);
 			break;
 		default:
-			add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id);
+			add_filter( 'attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2 );
+			echo get_media_item( $id );
 			break;
 	}
 	exit;
 }
 
-check_admin_referer('media-form');
+check_admin_referer( 'media-form' );
 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
 		$post_id = 0;
+	}
 }
 
 $id = media_handle_upload( 'async-upload', $post_id );
-if ( is_wp_error($id) ) {
+if ( is_wp_error( $id ) ) {
 	echo '<div class="error-div error">
-	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
-	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
-	esc_html($id->get_error_message()) . '</div>';
+	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __( 'Dismiss' ) . '</a>
+	<strong>' . sprintf( __( '&#8220;%s&#8221; has failed to upload.' ), esc_html( $_FILES['async-upload']['name'] ) ) . '</strong><br />' .
+	esc_html( $id->get_error_message() ) . '</div>';
 	exit;
 }
 
diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index c2eca11ec3..d95ae0ded0 100644
--- a/wp-admin/comment.php
+++ b/wp-admin/comment.php
@@ -9,136 +9,143 @@
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-$parent_file = 'edit-comments.php';
+$parent_file  = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
 
 /**
  * @global string $action
  */
 global $action;
-wp_reset_vars( array('action') );
+wp_reset_vars( array( 'action' ) );
 
-if ( isset( $_POST['deletecomment'] ) )
+if ( isset( $_POST['deletecomment'] ) ) {
 	$action = 'deletecomment';
-
-if ( 'cdc' == $action )
-	$action = 'delete';
-elseif ( 'mac' == $action )
-	$action = 'approve';
-
-if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
-		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
-		$action = 'trash';
 }
 
-switch( $action ) {
+if ( 'cdc' == $action ) {
+	$action = 'delete';
+} elseif ( 'mac' == $action ) {
+	$action = 'approve';
+}
 
-case 'editcomment' :
-	$title = __('Edit Comment');
-
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' =>
-			'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-			'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-	) );
-
-	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
-	);
-
-	wp_enqueue_script('comment');
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$comment_id = absint( $_GET['c'] );
-
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
-
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
-
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
-
-	$comment = get_comment_to_edit( $comment_id );
-
-	include( ABSPATH . 'wp-admin/edit-form-comment.php' );
-
-	break;
-
-case 'delete'  :
-case 'approve' :
-case 'trash'   :
-case 'spam'    :
-
-	$title = __('Moderate Comment');
-
-	$comment_id = absint( $_GET['c'] );
-
-	if ( ! $comment = get_comment( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
-		die();
+if ( isset( $_GET['dt'] ) ) {
+	if ( 'spam' == $_GET['dt'] ) {
+		$action = 'spam';
+	} elseif ( 'trash' == $_GET['dt'] ) {
+		$action = 'trash';
 	}
+}
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
-		die();
-	}
+switch ( $action ) {
 
-	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
-		die();
- 	}
+	case 'editcomment':
+		$title = __( 'Edit Comment' );
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'overview',
+				'title'   => __( 'Overview' ),
+				'content' =>
+					  '<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
+					  '<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>',
+			)
+		);
 
-	$formaction    = $action . 'comment';
-	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
-	$nonce_action .= $comment_id;
+		get_current_screen()->set_help_sidebar(
+			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+			'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+		);
 
-?>
-<div class="wrap">
+		wp_enqueue_script( 'comment' );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-<h1><?php echo esc_html( $title ); ?></h1>
+		$comment_id = absint( $_GET['c'] );
+
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
+		}
+
+		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __( 'Sorry, you are not allowed to edit this comment.' ) );
+		}
+
+		if ( 'trash' == $comment->comment_approved ) {
+			comment_footer_die( __( 'This comment is in the Trash. Please move it out of the Trash if you want to edit it.' ) );
+		}
+
+		$comment = get_comment_to_edit( $comment_id );
+
+		include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+
+		break;
+
+	case 'delete':
+	case 'approve':
+	case 'trash':
+	case 'spam':
+		$title = __( 'Moderate Comment' );
+
+		$comment_id = absint( $_GET['c'] );
+
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
+			die();
+		}
+
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?error=2' ) );
+			die();
+		}
+
+		// No need to re-approve/re-trash/re-spam a comment.
+		if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
+			wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+			die();
+		}
+
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$formaction    = $action . 'comment';
+		$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:');
+	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');
+	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');
+	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');
+	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.');
+		case '1':
+			$message = __( 'This comment is currently approved.' );
 			break;
-		case 'spam' :
-			$message  = __('This comment is currently marked as spam.');
+		case 'spam':
+			$message = __( 'This comment is currently marked as spam.' );
 			break;
-		case 'trash' :
-			$message  = __('This comment is currently in the Trash.');
+		case 'trash':
+			$message = __( 'This comment is currently in the Trash.' );
 			break;
 	}
 	if ( $message ) {
@@ -150,18 +157,18 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 
 <table class="form-table comment-ays">
 <tr>
-<th scope="row"><?php _e('Author'); ?></th>
+<th scope="row"><?php _e( 'Author' ); ?></th>
 <td><?php comment_author( $comment ); ?></td>
 </tr>
 <?php if ( get_comment_author_email( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e('Email'); ?></th>
+<th scope="row"><?php _e( 'Email' ); ?></th>
 <td><?php comment_author_email( $comment ); ?></td>
 </tr>
 <?php } ?>
 <?php if ( get_comment_author_url( $comment ) ) { ?>
 <tr>
-<th scope="row"><?php _e('URL'); ?></th>
+<th scope="row"><?php _e( 'URL' ); ?></th>
 <td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
 </tr>
 <?php } ?>
@@ -170,163 +177,177 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
 	<td>
 	<?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>
+	</tr>
+	<tr>
 	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
 	<td>
 	<?php
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(
+			__( '%1$s at %2$s' ),
 			/* translators: comment date format. See https://secure.php.net/date */
 			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;
-		}
-	?>
-	</td>
-</tr>
-<tr>
-<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
-<td class="comment-content">
+	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 ); ?>
 	<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>
-</table>
+	</td>
+	</tr>
+	</table>
 
-<form action="comment.php" method="get" class="comment-ays-submit">
+	<form action="comment.php" method="get" class="comment-ays-submit">
 
-<p>
+	<p>
 	<?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>
+	<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 ); ?>
-<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>
+	<?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
-	break;
+	</div>
+	<?php
+		break;
 
-case 'deletecomment'    :
-case 'trashcomment'     :
-case 'untrashcomment'   :
-case 'spamcomment'      :
-case 'unspamcomment'    :
-case 'approvecomment'   :
-case 'unapprovecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
+	case 'deletecomment':
+	case 'trashcomment':
+	case 'untrashcomment':
+	case 'spamcomment':
+	case 'unspamcomment':
+	case 'approvecomment':
+	case 'unapprovecomment':
+		$comment_id = absint( $_REQUEST['c'] );
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
-	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			check_admin_referer( 'approve-comment_' . $comment_id );
+		} else {
+			check_admin_referer( 'delete-comment_' . $comment_id );
+		}
 
-	$noredir = isset($_REQUEST['noredir']);
+		$noredir = isset( $_REQUEST['noredir'] );
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+		if ( ! $comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'edit-comments.php' ) );
+		}
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+		}
 
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-	else
-		$redir = admin_url('edit-comments.php');
+		if ( '' != wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
+			$redir = wp_get_referer();
+		} elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+			$redir = wp_get_original_referer();
+		} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			$redir = admin_url( 'edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+		} else {
+			$redir = admin_url( 'edit-comments.php' );
+		}
 
-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+		$redir = remove_query_arg( array( 'spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved' ), $redir );
 
-	switch ( $action ) {
-		case 'deletecomment' :
-			wp_delete_comment( $comment );
-			$redir = add_query_arg( array('deleted' => '1'), $redir );
-			break;
-		case 'trashcomment' :
-			wp_trash_comment( $comment );
-			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
-			break;
-		case 'untrashcomment' :
-			wp_untrash_comment( $comment );
-			$redir = add_query_arg( array('untrashed' => '1'), $redir );
-			break;
-		case 'spamcomment' :
-			wp_spam_comment( $comment );
-			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
-			break;
-		case 'unspamcomment' :
-			wp_unspam_comment( $comment );
-			$redir = add_query_arg( array('unspammed' => '1'), $redir );
-			break;
-		case 'approvecomment' :
-			wp_set_comment_status( $comment, 'approve' );
-			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
-			break;
-		case 'unapprovecomment' :
-			wp_set_comment_status( $comment, 'hold' );
-			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
-			break;
-	}
+		switch ( $action ) {
+			case 'deletecomment':
+				wp_delete_comment( $comment );
+				$redir = add_query_arg( array( 'deleted' => '1' ), $redir );
+				break;
+			case 'trashcomment':
+				wp_trash_comment( $comment );
+				$redir = add_query_arg(
+					array(
+						'trashed' => '1',
+						'ids'     => $comment_id,
+					), $redir
+				);
+				break;
+			case 'untrashcomment':
+				wp_untrash_comment( $comment );
+				$redir = add_query_arg( array( 'untrashed' => '1' ), $redir );
+				break;
+			case 'spamcomment':
+				wp_spam_comment( $comment );
+				$redir = add_query_arg(
+					array(
+						'spammed' => '1',
+						'ids'     => $comment_id,
+					), $redir
+				);
+				break;
+			case 'unspamcomment':
+				wp_unspam_comment( $comment );
+				$redir = add_query_arg( array( 'unspammed' => '1' ), $redir );
+				break;
+			case 'approvecomment':
+				wp_set_comment_status( $comment, 'approve' );
+				$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+				break;
+			case 'unapprovecomment':
+				wp_set_comment_status( $comment, 'hold' );
+				$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+				break;
+		}
 
-	wp_redirect( $redir );
-	die;
+		wp_redirect( $redir );
+		die;
 
-case 'editedcomment' :
+	case 'editedcomment':
+		$comment_id      = absint( $_POST['comment_ID'] );
+		$comment_post_id = absint( $_POST['comment_post_ID'] );
 
-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
+		check_admin_referer( 'update-comment_' . $comment_id );
 
-	check_admin_referer( 'update-comment_' . $comment_id );
+		edit_comment();
 
-	edit_comment();
+		$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
 
-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+		/**
+		 * Filters the URI the user is redirected to after editing a comment in the admin.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string $location The URI the user will be redirected to.
+		 * @param int $comment_id The ID of the comment being edited.
+		 */
+		$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
+		wp_redirect( $location );
 
-	/**
-	 * Filters the URI the user is redirected to after editing a comment in the admin.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string $location The URI the user will be redirected to.
-	 * @param int $comment_id The ID of the comment being edited.
-	 */
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
+		exit();
 
-	exit();
-
-default:
-	wp_die( __('Unknown action.') );
+	default:
+		wp_die( __( 'Unknown action.' ) );
 
 } // end switch
 
diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index 7c6df4bcad..451d2abf75 100644
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -39,7 +39,8 @@ $credits = wp_credits();
 if ( ! $credits ) {
 	echo '<p class="about-description">';
 	/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
-	printf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+	printf(
+		__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
 		'https://wordpress.org/about/',
 		__( 'https://make.wordpress.org/' )
 	);
@@ -66,15 +67,16 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 		echo '<h3 class="wp-people-group">' . esc_html( $title ) . "</h3>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
+	if ( ! empty( $group_data['shuffle'] ) ) {
 		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	}
 
 	switch ( $group_data['type'] ) {
-		case 'list' :
+		case 'list':
 			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
 			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
 			break;
-		case 'libraries' :
+		case 'libraries':
 			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
 			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
 			break;
@@ -85,28 +87,32 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) {
 			foreach ( $group_data['data'] as $person_data ) {
 				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
 				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">';
-				$size = 'compact' == $group_data['type'] ? 30 : 60;
-				$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				$size *= 2;
+				$size   = 'compact' == $group_data['type'] ? 30 : 60;
+				$data   = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+				$size  *= 2;
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
 				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n";
 				echo esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
+				if ( ! $compact ) {
 					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				}
 				echo "</li>\n";
 			}
 			echo "</ul>\n";
-		break;
+			break;
 	}
 }
 
 ?>
-<p class="clear"><?php
+<p class="clear">
+<?php
 	/* translators: %s: https://make.wordpress.org/ */
-	printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
+	printf(
+		__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
 		__( 'https://make.wordpress.org/' )
 	);
-?></p>
+?>
+</p>
 
 </div>
 </div>
diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index 7326f7e83c..a813897fe9 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -44,8 +44,8 @@ class Custom_Background {
 	 * @param callable $admin_header_callback
 	 * @param callable $admin_image_div_callback Optional custom image div output callback.
 	 */
-	public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
-		$this->admin_header_callback = $admin_header_callback;
+	public function __construct( $admin_header_callback = '', $admin_image_div_callback = '' ) {
+		$this->admin_header_callback    = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;
 
 		add_action( 'admin_menu', array( $this, 'init' ) );
@@ -82,15 +82,17 @@ class Custom_Background {
 	 * @since 3.0.0
 	 */
 	public function admin_load() {
-		get_current_screen()->add_help_tab( array(
-			'id'      => 'overview',
-			'title'   => __('Overview'),
-			'content' =>
-				'<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
-				'<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
-				'<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-				'<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>'
-		) );
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'overview',
+				'title'   => __( 'Overview' ),
+				'content' =>
+					'<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
+					'<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
+					'<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
+					'<p>' . __( 'Don&#8217;t forget to click on the Save Changes button when you are finished.' ) . '</p>',
+			)
+		);
 
 		get_current_screen()->set_help_sidebar(
 			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
@@ -99,8 +101,8 @@ class Custom_Background {
 		);
 
 		wp_enqueue_media();
-		wp_enqueue_script('custom-background');
-		wp_enqueue_style('wp-color-picker');
+		wp_enqueue_script( 'custom-background' );
+		wp_enqueue_style( 'wp-color-picker' );
 	}
 
 	/**
@@ -109,22 +111,23 @@ class Custom_Background {
 	 * @since 3.0.0
 	 */
 	public function take_action() {
-		if ( empty($_POST) )
+		if ( empty( $_POST ) ) {
 			return;
+		}
 
-		if ( isset($_POST['reset-background']) ) {
-			check_admin_referer('custom-background-reset', '_wpnonce-custom-background-reset');
-			remove_theme_mod('background_image');
-			remove_theme_mod('background_image_thumb');
+		if ( isset( $_POST['reset-background'] ) ) {
+			check_admin_referer( 'custom-background-reset', '_wpnonce-custom-background-reset' );
+			remove_theme_mod( 'background_image' );
+			remove_theme_mod( 'background_image_thumb' );
 			$this->updated = true;
 			return;
 		}
 
-		if ( isset($_POST['remove-background']) ) {
+		if ( isset( $_POST['remove-background'] ) ) {
 			// @TODO: Uploaded files are not removed here.
-			check_admin_referer('custom-background-remove', '_wpnonce-custom-background-remove');
-			set_theme_mod('background_image', '');
-			set_theme_mod('background_image_thumb', '');
+			check_admin_referer( 'custom-background-remove', '_wpnonce-custom-background-remove' );
+			set_theme_mod( 'background_image', '' );
+			set_theme_mod( 'background_image_thumb', '' );
 			$this->updated = true;
 			wp_safe_redirect( $_POST['_wp_http_referer'] );
 			return;
@@ -199,13 +202,14 @@ class Custom_Background {
 			set_theme_mod( 'background_attachment', $attachment );
 		}
 
-		if ( isset($_POST['background-color']) ) {
-			check_admin_referer('custom-background');
-			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['background-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
-				set_theme_mod('background_color', $color);
-			else
-				set_theme_mod('background_color', '');
+		if ( isset( $_POST['background-color'] ) ) {
+			check_admin_referer( 'custom-background' );
+			$color = preg_replace( '/[^0-9a-fA-F]/', '', $_POST['background-color'] );
+			if ( strlen( $color ) == 6 || strlen( $color ) == 3 ) {
+				set_theme_mod( 'background_color', $color );
+			} else {
+				set_theme_mod( 'background_color', '' );
+			}
 		}
 
 		$this->updated = true;
@@ -252,17 +256,18 @@ class Custom_Background {
 		call_user_func( $this->admin_image_div_callback );
 	} else {
 		$background_styles = '';
-		if ( $bgcolor = get_background_color() )
+		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_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');"
@@ -284,12 +289,12 @@ class Custom_Background {
 
 <?php if ( get_background_image() ) : ?>
 <tr>
-<th scope="row"><?php _e('Remove Image'); ?></th>
+<th scope="row"><?php _e( 'Remove Image' ); ?></th>
 <td>
 <form method="post">
-<?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
+<?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 _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
 </form>
 </td>
 </tr>
@@ -298,20 +303,20 @@ class Custom_Background {
 <?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>
+<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 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 _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
 </form>
 </td>
 </tr>
 <?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>
+<th scope="row"><?php _e( 'Select Image' ); ?></th>
 <td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">
 	<p>
 		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
@@ -349,19 +354,46 @@ $background_position = sprintf(
 
 $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' ),
+		'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' ),
+		'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' ),
+		'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',
+		),
 	),
 );
 ?>
@@ -416,16 +448,17 @@ $background_position_options = array(
 <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' ) )
+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 ?>>
+<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 wp_nonce_field( 'custom-background' ); ?>
 <?php submit_button( null, 'primary', 'save-background-options' ); ?>
 </form>
 
@@ -439,47 +472,50 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	 * @since 3.0.0
 	 */
 	public function handle_upload() {
-		if ( empty($_FILES) )
+		if ( empty( $_FILES ) ) {
 			return;
+		}
 
-		check_admin_referer('custom-background-upload', '_wpnonce-custom-background-upload');
-		$overrides = array('test_form' => false);
+		check_admin_referer( 'custom-background-upload', '_wpnonce-custom-background-upload' );
+		$overrides = array( 'test_form' => false );
 
 		$uploaded_file = $_FILES['import'];
-		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
+		$wp_filetype   = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
+		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
 			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		}
 
-		$file = wp_handle_upload($uploaded_file, $overrides);
+		$file = wp_handle_upload( $uploaded_file, $overrides );
 
-		if ( isset($file['error']) )
+		if ( isset( $file['error'] ) ) {
 			wp_die( $file['error'] );
+		}
 
-		$url = $file['url'];
-		$type = $file['type'];
-		$file = $file['file'];
-		$filename = basename($file);
+		$url      = $file['url'];
+		$type     = $file['type'];
+		$file     = $file['file'];
+		$filename = basename( $file );
 
 		// Construct the object array
 		$object = array(
-			'post_title' => $filename,
-			'post_content' => $url,
+			'post_title'     => $filename,
+			'post_content'   => $url,
 			'post_mime_type' => $type,
-			'guid' => $url,
-			'context' => 'custom-background'
+			'guid'           => $url,
+			'context'        => 'custom-background',
 		);
 
 		// Save the data
-		$id = wp_insert_attachment($object, $file);
+		$id = wp_insert_attachment( $object, $file );
 
 		// Add the meta-data
 		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-		update_post_meta( $id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
+		update_post_meta( $id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
 
-		set_theme_mod('background_image', esc_url_raw($url));
+		set_theme_mod( 'background_image', esc_url_raw( $url ) );
 
 		$thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
-		set_theme_mod('background_image_thumb', esc_url_raw( $thumbnail[0] ) );
+		set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
 
 		/** This action is documented in wp-admin/custom-header.php */
 		do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication
@@ -512,7 +548,6 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	}
 
 	/**
-	 *
 	 * @since 3.4.0
 	 * @deprecated 3.5.0
 	 *
@@ -524,7 +559,6 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	}
 
 	/**
-	 *
 	 * @since 3.4.0
 	 * @deprecated 3.5.0
 	 *
@@ -536,21 +570,32 @@ if ( current_theme_supports( 'custom-background', 'default-color' ) )
 	}
 
 	/**
-	 *
 	 * @since 3.4.0
 	 * @deprecated 3.5.0
 	 */
 	public function wp_set_background_image() {
-		if ( ! current_user_can('edit_theme_options') || ! isset( $_POST['attachment_id'] ) ) exit;
-		$attachment_id = absint($_POST['attachment_id']);
+		if ( ! current_user_can( 'edit_theme_options' ) || ! isset( $_POST['attachment_id'] ) ) {
+			exit;
+		}
+		$attachment_id = absint( $_POST['attachment_id'] );
 		/** This filter is documented in wp-admin/includes/media.php */
-		$sizes = array_keys(apply_filters( 'image_size_names_choose', array('thumbnail' => __('Thumbnail'), 'medium' => __('Medium'), 'large' => __('Large'), 'full' => __('Full Size')) ));
-		$size = 'thumbnail';
-		if ( in_array( $_POST['size'], $sizes ) )
+		$sizes = array_keys(
+			apply_filters(
+				'image_size_names_choose', array(
+					'thumbnail' => __( 'Thumbnail' ),
+					'medium'    => __( 'Medium' ),
+					'large'     => __( 'Large' ),
+					'full'      => __( 'Full Size' ),
+				)
+			)
+		);
+		$size  = 'thumbnail';
+		if ( in_array( $_POST['size'], $sizes ) ) {
 			$size = esc_attr( $_POST['size'] );
+		}
 
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
-		$url = wp_get_attachment_image_src( $attachment_id, $size );
+		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
+		$url       = wp_get_attachment_image_src( $attachment_id, $size );
 		$thumbnail = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
 		set_theme_mod( 'background_image', esc_url_raw( $url[0] ) );
 		set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 71561332e0..c1a7896589 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -52,16 +52,16 @@ class Custom_Image_Header {
 	 * @param callable $admin_header_callback
 	 * @param callable $admin_image_div_callback Optional custom image div output callback.
 	 */
-	public function __construct($admin_header_callback, $admin_image_div_callback = '') {
-		$this->admin_header_callback = $admin_header_callback;
+	public function __construct( $admin_header_callback, $admin_image_div_callback = '' ) {
+		$this->admin_header_callback    = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;
 
 		add_action( 'admin_menu', array( $this, 'init' ) );
 
-		add_action( 'customize_save_after',         array( $this, 'customize_set_last_used' ) );
-		add_action( 'wp_ajax_custom-header-crop',   array( $this, 'ajax_header_crop'        ) );
-		add_action( 'wp_ajax_custom-header-add',    array( $this, 'ajax_header_add'         ) );
-		add_action( 'wp_ajax_custom-header-remove', array( $this, 'ajax_header_remove'      ) );
+		add_action( 'customize_save_after', array( $this, 'customize_set_last_used' ) );
+		add_action( 'wp_ajax_custom-header-crop', array( $this, 'ajax_header_crop' ) );
+		add_action( 'wp_ajax_custom-header-add', array( $this, 'ajax_header_add' ) );
+		add_action( 'wp_ajax_custom-header-remove', array( $this, 'ajax_header_remove' ) );
 	}
 
 	/**
@@ -91,32 +91,38 @@ class Custom_Image_Header {
 	 * @since 3.0.0
 	 */
 	public function help() {
-		get_current_screen()->add_help_tab( array(
-			'id'      => 'overview',
-			'title'   => __('Overview'),
-			'content' =>
-				'<p>' . __( 'This screen is used to customize the header section of your theme.') . '</p>' .
-				'<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '<p>'
-		) );
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'overview',
+				'title'   => __( 'Overview' ),
+				'content' =>
+					'<p>' . __( 'This screen is used to customize the header section of your theme.' ) . '</p>' .
+					'<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.' ) . '<p>',
+			)
+		);
 
-		get_current_screen()->add_help_tab( array(
-			'id'      => 'set-header-image',
-			'title'   => __('Header Image'),
-			'content' =>
-				'<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.' ) . '</p>' .
-				'<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the &#8220;Save Changes&#8221; button.' ) . '</p>' .
-				'<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.') . '</p>' .
-				'<p>' . __( 'If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.') . '</p>'
-		) );
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'set-header-image',
+				'title'   => __( 'Header Image' ),
+				'content' =>
+					'<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.' ) . '</p>' .
+					'<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the &#8220;Save Changes&#8221; button.' ) . '</p>' .
+					'<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.' ) . '</p>' .
+					'<p>' . __( 'If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.' ) . '</p>',
+			)
+		);
 
-		get_current_screen()->add_help_tab( array(
-			'id'      => 'set-header-text',
-			'title'   => __('Header Text'),
-			'content' =>
-				'<p>' . sprintf( __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.' ), admin_url( 'options-general.php' ) ) . '<p>' .
-				'<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-				'<p>' . __( 'Don&#8217;t forget to click &#8220;Save Changes&#8221; when you&#8217;re done!') . '</p>'
-		) );
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'set-header-text',
+				'title'   => __( 'Header Text' ),
+				'content' =>
+					'<p>' . sprintf( __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.' ), admin_url( 'options-general.php' ) ) . '<p>' .
+					'<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
+					'<p>' . __( 'Don&#8217;t forget to click &#8220;Save Changes&#8221; when you&#8217;re done!' ) . '</p>',
+			)
+		);
 
 		get_current_screen()->set_help_sidebar(
 			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
@@ -133,15 +139,17 @@ class Custom_Image_Header {
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
+		if ( ! isset( $_GET['step'] ) ) {
 			return 1;
+		}
 
 		$step = (int) $_GET['step'];
 		if ( $step < 1 || 3 < $step ||
 			( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
 			( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
-		)
+		) {
 			return 1;
+		}
 
 		return $step;
 	}
@@ -157,10 +165,11 @@ class Custom_Image_Header {
 		if ( ( 1 == $step || 3 == $step ) ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
+			if ( current_theme_supports( 'custom-header', 'header-text' ) ) {
 				wp_enqueue_script( 'wp-color-picker' );
+			}
 		} elseif ( 2 == $step ) {
-			wp_enqueue_script('imgareaselect');
+			wp_enqueue_script( 'imgareaselect' );
 		}
 	}
 
@@ -172,10 +181,11 @@ class Custom_Image_Header {
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
 			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
-			wp_enqueue_style('imgareaselect');
+		} elseif ( 2 == $step ) {
+			wp_enqueue_style( 'imgareaselect' );
+		}
 	}
 
 	/**
@@ -184,11 +194,13 @@ class Custom_Image_Header {
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
+		if ( ! current_user_can( 'edit_theme_options' ) ) {
 			return;
+		}
 
-		if ( empty( $_POST ) )
+		if ( empty( $_POST ) ) {
 			return;
+		}
 
 		$this->updated = true;
 
@@ -210,11 +222,12 @@ class Custom_Image_Header {
 		} elseif ( isset( $_POST['text-color'] ) ) {
 			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
 			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
-			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
-				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
+			$color               = preg_replace( '/[^0-9a-fA-F]/', '', $_POST['text-color'] );
+			if ( strlen( $color ) == 6 || strlen( $color ) == 3 ) {
+				set_theme_mod( 'header_textcolor', $color );
+			} elseif ( ! $color ) {
 				set_theme_mod( 'header_textcolor', 'blank' );
+			}
 		}
 
 		if ( isset( $_POST['default-header'] ) ) {
@@ -234,19 +247,20 @@ class Custom_Image_Header {
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
+		if ( ! isset( $_wp_default_headers ) ) {
 			return;
+		}
 
 		if ( ! empty( $this->default_headers ) ) {
 			return;
 		}
 
-		$this->default_headers = $_wp_default_headers;
-		$template_directory_uri = get_template_directory_uri();
+		$this->default_headers    = $_wp_default_headers;
+		$template_directory_uri   = get_template_directory_uri();
 		$stylesheet_directory_uri = get_stylesheet_directory_uri();
-		foreach ( array_keys($this->default_headers) as $header ) {
-			$this->default_headers[$header]['url'] =  sprintf( $this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri );
-			$this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
+		foreach ( array_keys( $this->default_headers ) as $header ) {
+			$this->default_headers[ $header ]['url']           = sprintf( $this->default_headers[ $header ]['url'], $template_directory_uri, $stylesheet_directory_uri );
+			$this->default_headers[ $header ]['thumbnail_url'] = sprintf( $this->default_headers[ $header ]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
 		}
 	}
 
@@ -266,7 +280,7 @@ class Custom_Image_Header {
 			$headers = $this->default_headers;
 		} else {
 			$headers = get_uploaded_header_images();
-			$type = 'uploaded';
+			$type    = 'uploaded';
 		}
 
 		if ( 1 < count( $headers ) ) {
@@ -280,14 +294,15 @@ class Custom_Image_Header {
 		echo '<div class="available-headers">';
 		foreach ( $headers as $header_key => $header ) {
 			$header_thumbnail = $header['thumbnail_url'];
-			$header_url = $header['url'];
-			$header_alt_text = empty( $header['alt_text'] ) ? '' : $header['alt_text'];
+			$header_url       = $header['url'];
+			$header_alt_text  = empty( $header['alt_text'] ) ? '' : $header['alt_text'];
 			echo '<div class="default-header">';
 			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
 			$width = '';
-			if ( !empty( $header['attachment_id'] ) )
+			if ( ! empty( $header['attachment_id'] ) ) {
 				$width = ' width="230"';
-			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'"' . $width . ' /></label>';
+			}
+			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) . '"' . $width . ' /></label>';
 			echo '</div>';
 		}
 		echo '<div class="clear"></div></div>';
@@ -300,10 +315,11 @@ class Custom_Image_Header {
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
 			$this->js_1();
-		elseif ( 2 == $step )
+		} elseif ( 2 == $step ) {
 			$this->js_2();
+		}
 	}
 
 	/**
@@ -372,7 +388,9 @@ class Custom_Image_Header {
 	 *
 	 * @since 2.6.0
 	 */
-	public function js_2() { ?>
+	public function js_2() {
+
+	?>
 <script type="text/javascript">
 	function onEndCrop( coords ) {
 		jQuery( '#x1' ).val(coords.x);
@@ -484,27 +502,30 @@ class Custom_Image_Header {
 		call_user_func( $this->admin_image_div_callback );
 	} else {
 		$custom_header = get_custom_header();
-		$header_image = get_header_image();
+		$header_image  = get_header_image();
 
 		if ( $header_image ) {
 			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
+		if ( $custom_header->width ) {
 			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
+		}
+		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() )
+		if ( display_header_text() ) {
 			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		else
+		} 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>
+		<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 } ?>
@@ -521,7 +542,7 @@ class Custom_Image_Header {
 	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' ) )
+		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
 			printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s wide.' ) . ' ',
@@ -531,8 +552,9 @@ class Custom_Image_Header {
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
+		}
 	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
 			printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s tall.' ) . ' ',
@@ -542,9 +564,10 @@ class Custom_Image_Header {
 					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' ) )
+		if ( current_theme_supports( 'custom-header', 'width' ) ) {
 			printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested width is %s.' ) . ' ',
@@ -554,7 +577,8 @@ class Custom_Image_Header {
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
-		if ( current_theme_supports( 'custom-header', 'height' ) )
+		}
+		if ( current_theme_supports( 'custom-header', 'height' ) ) {
 			printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested height is %s.' ) . ' ',
@@ -564,9 +588,11 @@ class Custom_Image_Header {
 					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>
+	<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" />
@@ -575,11 +601,15 @@ class Custom_Image_Header {
 		<?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') ) );
+		$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 />
@@ -595,7 +625,7 @@ class Custom_Image_Header {
 </tbody>
 </table>
 
-<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ) ?>">
+<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ); ?>">
 <?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
 <table class="form-table">
 <tbody>
@@ -603,44 +633,50 @@ class Custom_Image_Header {
 <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>
+	<p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ); ?></p>
 	<?php
 		$this->show_header_selector( 'uploaded' );
 	?>
 </td>
 </tr>
-	<?php endif;
-	if ( ! empty( $this->default_headers ) ) : ?>
+	<?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' ) ) : ?>
-	<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: ?>
-	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
+	<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 : ?>
+	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
 <?php endif; ?>
 	<?php
-		$this->show_header_selector( 'default' );
+	$this->show_header_selector( 'default' );
 	?>
 </td>
 </tr>
-	<?php endif;
-	if ( get_header_image() ) : ?>
+	<?php
+	endif;
+if ( get_header_image() ) :
+	?>
 <tr>
 <th scope="row"><?php _e( 'Remove Image' ); ?></th>
 <td>
-	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
+	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ); ?></p>
 	<?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
 </td>
 </tr>
-	<?php endif;
+	<?php
+	endif;
 
 	$default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
-	if ( $default_image && get_header_image() != $default_image ) : ?>
+if ( $default_image && get_header_image() != $default_image ) :
+	?>
 <tr>
 <th scope="row"><?php _e( 'Reset Image' ); ?></th>
 <td>
-	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
+	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ); ?></p>
 	<?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
 </td>
 </tr>
@@ -693,7 +729,8 @@ class Custom_Image_Header {
 </tr>
 </tbody>
 </table>
-<?php endif;
+<?php
+endif;
 
 /**
  * Fires just before the submit button in the custom header options form.
@@ -702,13 +739,15 @@ class Custom_Image_Header {
  */
 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' ); ?>
 </form>
 </div>
 
-<?php }
+<?php
+	}
 
 	/**
 	 * Display second step of custom header image page.
@@ -716,7 +755,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * @since 2.1.0
 	 */
 	public function step_2() {
-		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
+		check_admin_referer( 'custom-header-upload', '_wpnonce-custom-header-upload' );
 		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
 			wp_die(
 				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
@@ -727,41 +766,43 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 
 		if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
 			$attachment_id = absint( $_GET['file'] );
-			$file = get_attached_file( $attachment_id, true );
-			$url = wp_get_attachment_image_src( $attachment_id, 'full' );
-			$url = $url[0];
+			$file          = get_attached_file( $attachment_id, true );
+			$url           = wp_get_attachment_image_src( $attachment_id, 'full' );
+			$url           = $url[0];
 		} elseif ( isset( $_POST ) ) {
-			$data = $this->step_2_manage_upload();
+			$data          = $this->step_2_manage_upload();
 			$attachment_id = $data['attachment_id'];
-			$file = $data['file'];
-			$url = $data['url'];
+			$file          = $data['file'];
+			$url           = $data['url'];
 		}
 
 		if ( file_exists( $file ) ) {
 			list( $width, $height, $type, $attr ) = getimagesize( $file );
 		} else {
-			$data = wp_get_attachment_metadata( $attachment_id );
-			$height = isset( $data[ 'height' ] ) ? $data[ 'height' ] : 0;
-			$width = isset( $data[ 'width' ] ) ? $data[ 'width' ] : 0;
+			$data   = wp_get_attachment_metadata( $attachment_id );
+			$height = isset( $data['height'] ) ? $data['height'] : 0;
+			$width  = isset( $data['width'] ) ? $data['width'] : 0;
 			unset( $data );
 		}
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
+		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
 			$max_width = 1500;
+		}
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
+		if ( current_theme_supports( 'custom-header', 'max-width' ) ) {
 			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		}
 		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
 
 		// If flexible height isn't supported and the image is the exact right size
 		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' )
-			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
-		{
+			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) ) {
 			// Add the meta-data
-			if ( file_exists( $file ) )
+			if ( file_exists( $file ) ) {
 				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			}
 
 			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
@@ -778,15 +819,16 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 			return $this->finished();
 		} elseif ( $width > $max_width ) {
 			$oitar = $width / $max_width;
-			$image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			if ( ! $image || is_wp_error( $image ) )
+			$image = wp_crop_image( $attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace( basename( $file ), 'midsize-' . basename( $file ), $file ) );
+			if ( ! $image || is_wp_error( $image ) ) {
 				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			}
 
 			/** This filter is documented in wp-admin/custom-header.php */
 			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
 
-			$url = str_replace(basename($url), basename($image), $url);
-			$width = $width / $oitar;
+			$url    = str_replace( basename( $url ), basename( $image ), $url );
+			$width  = $width / $oitar;
 			$height = $height / $oitar;
 		} else {
 			$oitar = 1;
@@ -796,9 +838,9 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 <div class="wrap">
 <h1><?php _e( 'Crop Header Image' ); ?></h1>
 
-<form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
-	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-	<p class="hide-if-js"><strong><?php _e( 'You need JavaScript to choose a part of the image.'); ?></strong></p>
+<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 3 ) ); ?>">
+	<p class="hide-if-no-js"><?php _e( 'Choose the part of the image you want to use as your header.' ); ?></p>
+	<p class="hide-if-js"><strong><?php _e( 'You need JavaScript to choose a part of the image.' ); ?></strong></p>
 
 	<div id="crop_image" style="position: relative">
 		<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" alt="" />
@@ -813,13 +855,14 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	<?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' ) ) )
+	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>
@@ -834,22 +877,24 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * @since 3.4.0
 	 */
 	public function step_2_manage_upload() {
-		$overrides = array('test_form' => false);
+		$overrides = array( 'test_form' => false );
 
 		$uploaded_file = $_FILES['import'];
-		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
+		$wp_filetype   = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
+		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
 			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		}
 
-		$file = wp_handle_upload($uploaded_file, $overrides);
+		$file = wp_handle_upload( $uploaded_file, $overrides );
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		if ( isset( $file['error'] ) ) {
+			wp_die( $file['error'], __( 'Image Upload Error' ) );
+		}
 
-		$url = $file['url'];
-		$type = $file['type'];
-		$file = $file['file'];
-		$filename = basename($file);
+		$url      = $file['url'];
+		$type     = $file['type'];
+		$file     = $file['file'];
+		$filename = basename( $file );
 
 		// Construct the object array
 		$object = array(
@@ -857,7 +902,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 			'post_content'   => $url,
 			'post_mime_type' => $type,
 			'guid'           => $url,
-			'context'        => 'custom-header'
+			'context'        => 'custom-header',
 		);
 
 		// Save the data
@@ -892,39 +937,44 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		}
 
 		if ( $_POST['oitar'] > 1 ) {
-			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
-			$_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
-			$_POST['width'] = $_POST['width'] * $_POST['oitar'];
+			$_POST['x1']     = $_POST['x1'] * $_POST['oitar'];
+			$_POST['y1']     = $_POST['y1'] * $_POST['oitar'];
+			$_POST['width']  = $_POST['width'] * $_POST['oitar'];
 			$_POST['height'] = $_POST['height'] * $_POST['oitar'];
 		}
 
 		$attachment_id = absint( $_POST['attachment_id'] );
-		$original = get_attached_file($attachment_id);
+		$original      = get_attached_file( $attachment_id );
 
-		$dimensions = $this->get_header_dimensions( array(
-			'height' => $_POST['height'],
-			'width'  => $_POST['width'],
-		) );
-		$height = $dimensions['dst_height'];
-		$width = $dimensions['dst_width'];
+		$dimensions = $this->get_header_dimensions(
+			array(
+				'height' => $_POST['height'],
+				'width'  => $_POST['width'],
+			)
+		);
+		$height     = $dimensions['dst_height'];
+		$width      = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) )
+		if ( empty( $_POST['skip-cropping'] ) ) {
 			$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
-		elseif ( ! empty( $_POST['create-new-attachment'] ) )
+		} elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
 			$cropped = _copy_image_file( $attachment_id );
-		else
+		} else {
 			$cropped = get_attached_file( $attachment_id );
+		}
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
+		if ( ! $cropped || is_wp_error( $cropped ) ) {
 			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
 		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
 
 		$object = $this->create_attachment_object( $cropped, $attachment_id );
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
+		if ( ! empty( $_POST['create-new-attachment'] ) ) {
 			unset( $object['ID'] );
+		}
 
 		// Update the attachment
 		$attachment_id = $this->insert_attachment( $object, $cropped );
@@ -961,15 +1011,17 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
-			wp_die(__('Sorry, you are not allowed to customize headers.'));
+		if ( ! current_user_can( 'edit_theme_options' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to customize headers.' ) );
+		}
 		$step = $this->step();
-		if ( 2 == $step )
+		if ( 2 == $step ) {
 			$this->step_2();
-		elseif ( 3 == $step )
+		} elseif ( 3 == $step ) {
 			$this->step_3();
-		else
+		} else {
 			$this->step_1();
+		}
 	}
 
 	/**
@@ -1003,16 +1055,17 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * @since 3.4.0
 	 *
 	 * @param mixed $choice Which header image to select. Allows for values of 'random-default-image',
-	 * 	for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
-	 * 	among the uploaded images; the key of a default image registered for that theme; and
-	 * 	the key of an image uploaded for that theme (the attachment ID of the image).
+	 *  for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
+	 *  among the uploaded images; the key of a default image registered for that theme; and
+	 *  the key of an image uploaded for that theme (the attachment ID of the image).
 	 *  Or an array of arguments: attachment_id, url, width, height. All are required.
 	 */
 	final public function set_header_image( $choice ) {
 		if ( is_array( $choice ) || is_object( $choice ) ) {
 			$choice = (array) $choice;
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
+			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
 				return;
+			}
 
 			$choice['url'] = esc_url_raw( $choice['url'] );
 
@@ -1042,10 +1095,11 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
+			if ( isset( $this->default_headers[ $choice ] ) ) {
 				$header_image_data = $this->default_headers[ $choice ];
-			else
+			} else {
 				return;
+			}
 		}
 
 		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
@@ -1099,15 +1153,18 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * @return array dst_height and dst_width of header image.
 	 */
 	final public function get_header_dimensions( $dimensions ) {
-		$max_width = 0;
-		$width = absint( $dimensions['width'] );
-		$height = absint( $dimensions['height'] );
-		$theme_height = get_theme_support( 'custom-header', 'height' );
-		$theme_width = get_theme_support( 'custom-header', 'width' );
-		$has_flex_width = current_theme_supports( 'custom-header', 'flex-width' );
+		$max_width       = 0;
+		$width           = absint( $dimensions['width'] );
+		$height          = absint( $dimensions['height'] );
+		$theme_height    = get_theme_support( 'custom-header', 'height' );
+		$theme_width     = get_theme_support( 'custom-header', 'width' );
+		$has_flex_width  = current_theme_supports( 'custom-header', 'flex-width' );
 		$has_flex_height = current_theme_supports( 'custom-header', 'flex-height' );
-		$has_max_width = current_theme_supports( 'custom-header', 'max-width' ) ;
-		$dst = array( 'dst_height' => null, 'dst_width' => null );
+		$has_max_width   = current_theme_supports( 'custom-header', 'max-width' );
+		$dst             = array(
+			'dst_height' => null,
+			'dst_width'  => null,
+		);
 
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
 		if ( $has_flex_width ) {
@@ -1121,21 +1178,17 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 
 		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
 			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_height && $has_flex_width ) {
+		} elseif ( $has_flex_height && $has_flex_width ) {
 			$dst['dst_height'] = $height;
-		}
-		else {
+		} else {
 			$dst['dst_height'] = $theme_height;
 		}
 
 		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
 			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_width && $has_flex_height ) {
+		} elseif ( $has_flex_width && $has_flex_height ) {
 			$dst['dst_width'] = $width;
-		}
-		else {
+		} else {
 			$dst['dst_width'] = $theme_width;
 		}
 
@@ -1152,20 +1205,20 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	 * @return array Attachment object.
 	 */
 	final public function create_attachment_object( $cropped, $parent_attachment_id ) {
-		$parent = get_post( $parent_attachment_id );
+		$parent     = get_post( $parent_attachment_id );
 		$parent_url = wp_get_attachment_url( $parent->ID );
-		$url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+		$url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
 
-		$size = @getimagesize( $cropped );
+		$size       = @getimagesize( $cropped );
 		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
 
 		$object = array(
-			'ID' => $parent_attachment_id,
-			'post_title' => basename($cropped),
+			'ID'             => $parent_attachment_id,
+			'post_title'     => basename( $cropped ),
 			'post_mime_type' => $image_type,
-			'guid' => $url,
-			'context' => 'custom-header',
-			'post_parent' => $parent_attachment_id,
+			'guid'           => $url,
+			'context'        => 'custom-header',
+			'post_parent'    => $parent_attachment_id,
 		);
 
 		return $object;
@@ -1185,7 +1238,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		unset( $object['post_parent'] );
 
 		$attachment_id = wp_insert_attachment( $object, $cropped );
-		$metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
+		$metadata      = wp_generate_attachment_metadata( $attachment_id, $cropped );
 
 		// If this is a crop, save the original attachment ID as metadata.
 		if ( $parent_id ) {
@@ -1227,10 +1280,12 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 
 		$crop_details = $_POST['cropDetails'];
 
-		$dimensions = $this->get_header_dimensions( array(
-			'height' => $crop_details['height'],
-			'width'  => $crop_details['width'],
-		) );
+		$dimensions = $this->get_header_dimensions(
+			array(
+				'height' => $crop_details['height'],
+				'width'  => $crop_details['width'],
+			)
+		);
 
 		$attachment_id = absint( $_POST['id'] );
 
@@ -1264,9 +1319,10 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		$new_attachment_id = $this->insert_attachment( $object, $cropped );
 
 		$object['attachment_id'] = $new_attachment_id;
-		$object['url']           = wp_get_attachment_url( $new_attachment_id );;
-		$object['width']         = $dimensions['dst_width'];
-		$object['height']        = $dimensions['dst_height'];
+		$object['url']           = wp_get_attachment_url( $new_attachment_id );
+
+		$object['width']  = $dimensions['dst_width'];
+		$object['height'] = $dimensions['dst_height'];
 
 		wp_send_json_success( $object );
 	}
@@ -1347,7 +1403,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		}
 
 		$attachment_id = $data['attachment_id'];
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
+		$key           = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
 		update_post_meta( $attachment_id, $key, time() );
 	}
 
@@ -1368,7 +1424,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 			return $this->default_headers; // easy peasy.
 		}
 
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default             = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
 		$already_has_default = false;
 
 		foreach ( $this->default_headers as $k => $h ) {
@@ -1383,11 +1439,11 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 		}
 
 		// If the one true image isn't included in the default set, prepend it.
-		$header_images = array();
+		$header_images            = array();
 		$header_images['default'] = array(
 			'url'           => $default,
 			'thumbnail_url' => $default,
-			'description'   => 'Default'
+			'description'   => 'Default',
 		);
 
 		// The rest of the set comes after.
@@ -1404,12 +1460,12 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	public function get_uploaded_header_images() {
 		$header_images = get_uploaded_header_images();
 		$timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		$alt_text_key = '_wp_attachment_image_alt';
+		$alt_text_key  = '_wp_attachment_image_alt';
 
 		foreach ( $header_images as &$header_image ) {
-			$header_meta = get_post_meta( $header_image['attachment_id'] );
+			$header_meta               = get_post_meta( $header_image['attachment_id'] );
 			$header_image['timestamp'] = isset( $header_meta[ $timestamp_key ] ) ? $header_meta[ $timestamp_key ] : '';
-			$header_image['alt_text'] = isset( $header_meta[ $alt_text_key ] ) ? $header_meta[ $alt_text_key ] : '';
+			$header_image['alt_text']  = isset( $header_meta[ $alt_text_key ] ) ? $header_meta[ $alt_text_key ] : '';
 		}
 
 		return $header_images;
diff --git a/wp-admin/customize.php b/wp-admin/customize.php
index 7c36549e21..e54e2170bb 100644
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -51,11 +51,11 @@ if ( $wp_customize->changeset_post_id() ) {
 		 *
 		 * By opening an Ajax request, this is avoided and the changeset is published. See #39221.
 		 */
-		$nonces = $wp_customize->get_nonces();
+		$nonces       = $wp_customize->get_nonces();
 		$request_args = array(
-			'nonce' => $nonces['save'],
-			'customize_changeset_uuid' => $wp_customize->changeset_uuid(),
-			'wp_customize' => 'on',
+			'nonce'                      => $nonces['save'],
+			'customize_changeset_uuid'   => $wp_customize->changeset_uuid(),
+			'wp_customize'               => 'on',
 			'customize_changeset_status' => 'publish',
 		);
 		ob_start();
@@ -96,13 +96,13 @@ if ( ! empty( $autofocus ) && is_array( $autofocus ) ) {
 	$wp_customize->set_autofocus( wp_unslash( $autofocus ) );
 }
 
-$registered = $wp_scripts->registered;
-$wp_scripts = new WP_Scripts;
+$registered             = $wp_scripts->registered;
+$wp_scripts             = new WP_Scripts;
 $wp_scripts->registered = $registered;
 
-add_action( 'customize_controls_print_scripts',        'print_head_scripts', 20 );
-add_action( 'customize_controls_print_footer_scripts', '_wp_footer_scripts'     );
-add_action( 'customize_controls_print_styles',         'print_admin_styles', 20 );
+add_action( 'customize_controls_print_scripts', 'print_head_scripts', 20 );
+add_action( 'customize_controls_print_footer_scripts', '_wp_footer_scripts' );
+add_action( 'customize_controls_print_styles', 'print_admin_styles', 20 );
 
 /**
  * Fires when Customizer controls are initialized, before scripts are enqueued.
@@ -123,7 +123,7 @@ wp_enqueue_style( 'customize-controls' );
 do_action( 'customize_controls_enqueue_scripts' );
 
 // Let's roll.
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
 
 wp_user_settings();
 _wp_admin_html_begin();
@@ -133,7 +133,9 @@ $body_class = 'wp-core-ui wp-customizer js';
 if ( wp_is_mobile() ) :
 	$body_class .= ' mobile';
 
-	?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" /><?php
+	?>
+	<meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" />
+	<?php
 endif;
 
 if ( $wp_customize->is_ios() ) {
@@ -147,7 +149,8 @@ $body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '
 
 $admin_title = sprintf( $wp_customize->get_document_title_template(), __( 'Loading&hellip;' ) );
 
-?><title><?php echo $admin_title; ?></title>
+?>
+<title><?php echo $admin_title; ?></title>
 
 <script type="text/javascript">
 var ajaxurl = <?php echo wp_json_encode( admin_url( 'admin-ajax.php', 'relative' ) ); ?>,
@@ -202,14 +205,18 @@ do_action( 'customize_controls_print_scripts' );
 			<div class="wp-full-overlay-sidebar-content" tabindex="-1">
 				<div id="customize-info" class="accordion-section customize-info">
 					<div class="accordion-section-title">
-						<span class="preview-notice"><?php
+						<span class="preview-notice">
+						<?php
 							echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name', 'display' ) . '</strong>' );
-						?></span>
+						?>
+						</span>
 						<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
 					</div>
-					<div class="customize-panel-description"><?php
+					<div class="customize-panel-description">
+					<?php
 						_e( 'The Customizer allows you to preview changes to your site before publishing them. You can navigate to different pages on your site within the preview. Edit shortcuts are shown for some editable elements.' );
-					?></div>
+					?>
+					</div>
 				</div>
 
 				<div id="customize-theme-controls">
@@ -233,12 +240,12 @@ do_action( 'customize_controls_print_scripts' );
 							continue;
 						}
 						$active = ! empty( $settings['default'] );
-						$class = 'preview-' . $device;
+						$class  = 'preview-' . $device;
 						if ( $active ) {
 							$class .= ' active';
 						}
 						?>
-						<button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ) ?>" data-device="<?php echo esc_attr( $device ); ?>">
+						<button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ); ?>" data-device="<?php echo esc_attr( $device ); ?>">
 							<span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
 						</button>
 					<?php endforeach; ?>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 67cb14d4dc..85c04ead57 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -16,22 +16,22 @@ if ( ! current_user_can( 'edit_posts' ) ) {
 	);
 }
 
-$wp_list_table = _get_list_table('WP_Comments_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_Comments_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 
 $doaction = $wp_list_table->current_action();
 
 if ( $doaction ) {
 	check_admin_referer( 'bulk-comments' );
 
-	if ( 'delete_all' == $doaction && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
+	if ( 'delete_all' == $doaction && ! empty( $_REQUEST['pagegen_timestamp'] ) ) {
 		$comment_status = wp_unslash( $_REQUEST['comment_status'] );
-		$delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
-		$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
-		$doaction = 'delete';
+		$delete_time    = wp_unslash( $_REQUEST['pagegen_timestamp'] );
+		$comment_ids    = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
+		$doaction       = 'delete';
 	} elseif ( isset( $_REQUEST['delete_comments'] ) ) {
 		$comment_ids = $_REQUEST['delete_comments'];
-		$doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
+		$doaction    = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
 	} elseif ( isset( $_REQUEST['ids'] ) ) {
 		$comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
 	} elseif ( wp_get_referer() ) {
@@ -47,35 +47,36 @@ if ( $doaction ) {
 	wp_defer_comment_counting( true );
 
 	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
-		if ( !current_user_can( 'edit_comment', $comment_id ) )
+		if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
 			continue;
+		}
 
 		switch ( $doaction ) {
-			case 'approve' :
+			case 'approve':
 				wp_set_comment_status( $comment_id, 'approve' );
 				$approved++;
 				break;
-			case 'unapprove' :
+			case 'unapprove':
 				wp_set_comment_status( $comment_id, 'hold' );
 				$unapproved++;
 				break;
-			case 'spam' :
+			case 'spam':
 				wp_spam_comment( $comment_id );
 				$spammed++;
 				break;
-			case 'unspam' :
+			case 'unspam':
 				wp_unspam_comment( $comment_id );
 				$unspammed++;
 				break;
-			case 'trash' :
+			case 'trash':
 				wp_trash_comment( $comment_id );
 				$trashed++;
 				break;
-			case 'untrash' :
+			case 'untrash':
 				wp_untrash_comment( $comment_id );
 				$untrashed++;
 				break;
-			case 'delete' :
+			case 'delete':
 				wp_delete_comment( $comment_id );
 				$deleted++;
 				break;
@@ -104,22 +105,30 @@ if ( $doaction ) {
 
 	wp_defer_comment_counting( false );
 
-	if ( $approved )
+	if ( $approved ) {
 		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
-	if ( $unapproved )
+	}
+	if ( $unapproved ) {
 		$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
-	if ( $spammed )
+	}
+	if ( $spammed ) {
 		$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
-	if ( $unspammed )
+	}
+	if ( $unspammed ) {
 		$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
-	if ( $trashed )
+	}
+	if ( $trashed ) {
 		$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
-	if ( $untrashed )
+	}
+	if ( $untrashed ) {
 		$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
-	if ( $deleted )
+	}
+	if ( $deleted ) {
 		$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
-	if ( $trashed || $spammed )
+	}
+	if ( $trashed || $spammed ) {
 		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
+	}
 
 	wp_safe_redirect( $redirect_to );
 	exit;
@@ -130,21 +139,23 @@ if ( $doaction ) {
 
 $wp_list_table->prepare_items();
 
-wp_enqueue_script('admin-comments');
+wp_enqueue_script( 'admin-comments' );
 enqueue_comment_hotkeys_js();
 
 if ( $post_id ) {
-	$comments_count = wp_count_comments( $post_id );
+	$comments_count      = wp_count_comments( $post_id );
 	$draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' );
 	if ( $comments_count->moderated > 0 ) {
 		/* translators: 1: comments count 2: post title */
-		$title = sprintf( __( 'Comments (%1$s) on &#8220;%2$s&#8221;' ),
+		$title = sprintf(
+			__( 'Comments (%1$s) on &#8220;%2$s&#8221;' ),
 			number_format_i18n( $comments_count->moderated ),
 			$draft_or_post_title
 		);
 	} else {
 		/* translators: %s: post title */
-		$title = sprintf( __( 'Comments on &#8220;%s&#8221;' ),
+		$title = sprintf(
+			__( 'Comments on &#8220;%s&#8221;' ),
 			$draft_or_post_title
 		);
 	}
@@ -152,7 +163,8 @@ if ( $post_id ) {
 	$comments_count = wp_count_comments();
 	if ( $comments_count->moderated > 0 ) {
 		/* translators: %s: comments count */
-		$title = sprintf( __( 'Comments (%s)' ),
+		$title = sprintf(
+			__( 'Comments (%s)' ),
 			number_format_i18n( $comments_count->moderated )
 		);
 	} else {
@@ -162,23 +174,27 @@ if ( $post_id ) {
 
 add_screen_option( 'per_page' );
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'moderating-comments',
-'title'		=> __('Moderating Comments'),
-'content'	=>
-		'<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
-		'<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				 '<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>',
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'moderating-comments',
+		'title'   => __( 'Moderating Comments' ),
+		'content' =>
+					 '<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
+					 '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
+					 '<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
+					 '<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
+					 '<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
+					 '<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
@@ -188,21 +204,26 @@ get_current_screen()->set_help_sidebar(
 	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter comments list' ),
-	'heading_pagination' => __( 'Comments list navigation' ),
-	'heading_list'       => __( 'Comments list' ),
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter comments list' ),
+		'heading_pagination' => __( 'Comments list navigation' ),
+		'heading_list'       => __( 'Comments list' ),
+	)
+);
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 if ( $post_id ) {
 	/* translators: %s: link to post */
-	printf( __( 'Comments on &#8220;%s&#8221;' ),
-		sprintf( '<a href="%1$s">%2$s</a>',
+	printf(
+		__( 'Comments on &#8220;%s&#8221;' ),
+		sprintf(
+			'<a href="%1$s">%2$s</a>',
 			get_edit_post_link( $post_id ),
 			wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
 		)
@@ -210,13 +231,15 @@ if ( $post_id ) {
 } else {
 	_e( 'Comments' );
 }
-?></h1>
+?>
+</h1>
 
 <?php
-if ( isset($_REQUEST['s']) && strlen( $_REQUEST['s'] ) ) {
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
 	echo '<span class="subtitle">';
 	/* translators: %s: search keywords */
-	printf( __( 'Search results for &#8220;%s&#8221;' ),
+	printf(
+		__( 'Search results for &#8220;%s&#8221;' ),
 		wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' )
 	);
 	echo '</span>';
@@ -227,28 +250,29 @@ if ( isset($_REQUEST['s']) && strlen( $_REQUEST['s'] ) ) {
 
 <?php
 if ( isset( $_REQUEST['error'] ) ) {
-	$error = (int) $_REQUEST['error'];
+	$error     = (int) $_REQUEST['error'];
 	$error_msg = '';
 	switch ( $error ) {
-		case 1 :
+		case 1:
 			$error_msg = __( 'Invalid comment ID.' );
 			break;
-		case 2 :
+		case 2:
 			$error_msg = __( 'Sorry, you are not allowed to edit comments on this post.' );
 			break;
 	}
-	if ( $error_msg )
+	if ( $error_msg ) {
 		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+	}
 }
 
-if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
-	$approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;
-	$deleted   = isset( $_REQUEST['deleted']   ) ? (int) $_REQUEST['deleted']   : 0;
-	$trashed   = isset( $_REQUEST['trashed']   ) ? (int) $_REQUEST['trashed']   : 0;
+if ( isset( $_REQUEST['approved'] ) || isset( $_REQUEST['deleted'] ) || isset( $_REQUEST['trashed'] ) || isset( $_REQUEST['untrashed'] ) || isset( $_REQUEST['spammed'] ) || isset( $_REQUEST['unspammed'] ) || isset( $_REQUEST['same'] ) ) {
+	$approved  = isset( $_REQUEST['approved'] ) ? (int) $_REQUEST['approved'] : 0;
+	$deleted   = isset( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
+	$trashed   = isset( $_REQUEST['trashed'] ) ? (int) $_REQUEST['trashed'] : 0;
 	$untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
-	$spammed   = isset( $_REQUEST['spammed']   ) ? (int) $_REQUEST['spammed']   : 0;
+	$spammed   = isset( $_REQUEST['spammed'] ) ? (int) $_REQUEST['spammed'] : 0;
 	$unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
-	$same      = isset( $_REQUEST['same'] )      ? (int) $_REQUEST['same']      : 0;
+	$same      = isset( $_REQUEST['same'] ) ? (int) $_REQUEST['same'] : 0;
 
 	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
 		if ( $approved > 0 ) {
@@ -257,9 +281,9 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU
 		}
 
 		if ( $spammed > 0 ) {
-			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
+			$ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
 			/* translators: %s: number of comments marked as spam */
-			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
 		}
 
 		if ( $unspammed > 0 ) {
@@ -268,9 +292,9 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU
 		}
 
 		if ( $trashed > 0 ) {
-			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
+			$ids = isset( $_REQUEST['ids'] ) ? $_REQUEST['ids'] : 0;
 			/* translators: %s: number of comments moved to the Trash */
-			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", 'bulk-comments' ) ) . '">' . __( 'Undo' ) . '</a><br />';
 		}
 
 		if ( $untrashed > 0 ) {
@@ -285,13 +309,13 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU
 
 		if ( $same > 0 && $comment = get_comment( $same ) ) {
 			switch ( $comment->comment_approved ) {
-				case '1' :
-					$messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+				case '1':
+					$messages[] = __( 'This comment is already approved.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
 					break;
-				case 'trash' :
+				case 'trash':
 					$messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
 					break;
-				case 'spam' :
+				case 'spam':
 					$messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
 					break;
 			}
@@ -311,14 +335,14 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU
 <?php if ( $post_id ) : ?>
 <input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
 <?php endif; ?>
-<input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
-<input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
+<input type="hidden" name="comment_status" value="<?php echo esc_attr( $comment_status ); ?>" />
+<input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr( current_time( 'mysql', 1 ) ); ?>" />
 
-<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
-<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
-<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />
+<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg( 'total_items' ) ); ?>" />
+<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg( 'per_page' ) ); ?>" />
+<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg( 'page' ) ); ?>" />
 
-<?php if ( isset($_REQUEST['paged']) ) { ?>
+<?php if ( isset( $_REQUEST['paged'] ) ) { ?>
 	<input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
 <?php } ?>
 
@@ -329,6 +353,6 @@ if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQU
 <div id="ajax-response"></div>
 
 <?php
-wp_comment_reply('-1', true, 'detail');
+wp_comment_reply( '-1', true, 'detail' );
 wp_comment_trashnotice();
 include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 6ee5e2d558..9d66af2a45 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -7,8 +7,9 @@
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+	die( '-1' );
+}
 
 /**
  * @global string       $post_type
@@ -20,15 +21,21 @@ global $post_type, $post_type_object, $post;
 if ( is_multisite() ) {
 	add_action( 'admin_footer', '_admin_notice_post_locked' );
 } else {
-	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+	$check_users = get_users(
+		array(
+			'fields' => 'ID',
+			'number' => 2,
+		)
+	);
 
-	if ( count( $check_users ) > 1 )
+	if ( count( $check_users ) > 1 ) {
 		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	}
 
 	unset( $check_users );
 }
 
-wp_enqueue_script('post');
+wp_enqueue_script( 'post' );
 $_wp_editor_expand = $_content_editor_dfw = false;
 
 /**
@@ -44,22 +51,24 @@ if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
 	! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
 	apply_filters( 'wp_editor_expand', true, $post_type ) ) {
 
-	wp_enqueue_script('editor-expand');
+	wp_enqueue_script( 'editor-expand' );
 	$_content_editor_dfw = true;
-	$_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
+	$_wp_editor_expand   = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
 }
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 /**
  * Post ID global
+ *
  * @name $post_ID
  * @var int
  */
-$post_ID = isset($post_ID) ? (int) $post_ID : 0;
-$user_ID = isset($user_ID) ? (int) $user_ID : 0;
-$action = isset($action) ? $action : '';
+$post_ID = isset( $post_ID ) ? (int) $post_ID : 0;
+$user_ID = isset( $user_ID ) ? (int) $user_ID : 0;
+$action  = isset( $action ) ? $action : '';
 
 if ( $post_ID == get_option( 'page_for_posts' ) && empty( $post->post_content ) ) {
 	add_action( 'edit_form_after_title', '_wp_posts_page_notice' );
@@ -103,37 +112,43 @@ $viewable = is_post_type_viewable( $post_type_object );
 if ( $viewable ) {
 
 	// Preview post link.
-	$preview_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+	$preview_post_link_html = sprintf(
+		' <a target="_blank" href="%1$s">%2$s</a>',
 		esc_url( $preview_url ),
 		__( 'Preview post' )
 	);
 
 	// Scheduled post preview link.
-	$scheduled_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+	$scheduled_post_link_html = sprintf(
+		' <a target="_blank" href="%1$s">%2$s</a>',
 		esc_url( $permalink ),
 		__( 'Preview post' )
 	);
 
 	// View post link.
-	$view_post_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
+	$view_post_link_html = sprintf(
+		' <a href="%1$s">%2$s</a>',
 		esc_url( $permalink ),
 		__( 'View post' )
 	);
 
 	// Preview page link.
-	$preview_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+	$preview_page_link_html = sprintf(
+		' <a target="_blank" href="%1$s">%2$s</a>',
 		esc_url( $preview_url ),
 		__( 'Preview page' )
 	);
 
 	// Scheduled page preview link.
-	$scheduled_page_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
+	$scheduled_page_link_html = sprintf(
+		' <a target="_blank" href="%1$s">%2$s</a>',
 		esc_url( $permalink ),
 		__( 'Preview page' )
 	);
 
 	// View page link.
-	$view_page_link_html = sprintf( ' <a href="%1$s">%2$s</a>',
+	$view_page_link_html = sprintf(
+		' <a href="%1$s">%2$s</a>',
 		esc_url( $permalink ),
 		__( 'View page' )
 	);
@@ -144,31 +159,31 @@ if ( $viewable ) {
 $scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
 
 $messages['post'] = array(
-	0 => '', // Unused. Messages start at index 1.
-	1 => __( 'Post updated.' ) . $view_post_link_html,
-	2 => __( 'Custom field updated.' ),
-	3 => __( 'Custom field deleted.' ),
-	4 => __( 'Post updated.' ),
+	0  => '', // Unused. Messages start at index 1.
+	1  => __( 'Post updated.' ) . $view_post_link_html,
+	2  => __( 'Custom field updated.' ),
+	3  => __( 'Custom field deleted.' ),
+	4  => __( 'Post updated.' ),
 	/* translators: %s: date and time of the revision */
-	5 => isset($_GET['revision']) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-	6 => __( 'Post published.' ) . $view_post_link_html,
-	7 => __( 'Post saved.' ),
-	8 => __( 'Post submitted.' ) . $preview_post_link_html,
-	9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
+	5  => isset( $_GET['revision'] ) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+	6  => __( 'Post published.' ) . $view_post_link_html,
+	7  => __( 'Post saved.' ),
+	8  => __( 'Post submitted.' ) . $preview_post_link_html,
+	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(
-	0 => '', // Unused. Messages start at index 1.
-	1 => __( 'Page updated.' ) . $view_page_link_html,
-	2 => __( 'Custom field updated.' ),
-	3 => __( 'Custom field deleted.' ),
-	4 => __( 'Page updated.' ),
+	0  => '', // Unused. Messages start at index 1.
+	1  => __( 'Page updated.' ) . $view_page_link_html,
+	2  => __( 'Custom field updated.' ),
+	3  => __( 'Custom field deleted.' ),
+	4  => __( 'Page updated.' ),
 	/* translators: %s: date and time of the revision */
-	5 => isset($_GET['revision']) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-	6 => __( 'Page published.' ) . $view_page_link_html,
-	7 => __( 'Page saved.' ),
-	8 => __( 'Page submitted.' ) . $preview_page_link_html,
-	9 => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
+	5  => isset( $_GET['revision'] ) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+	6  => __( 'Page published.' ) . $view_page_link_html,
+	7  => __( 'Page saved.' ),
+	8  => __( 'Page submitted.' ) . $preview_page_link_html,
+	9  => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
 	10 => __( 'Page draft updated.' ) . $preview_page_link_html,
 );
 $messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // Hack, for now.
@@ -183,28 +198,30 @@ $messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // H
 $messages = apply_filters( 'post_updated_messages', $messages );
 
 $message = false;
-if ( isset($_GET['message']) ) {
+if ( isset( $_GET['message'] ) ) {
 	$_GET['message'] = absint( $_GET['message'] );
-	if ( isset($messages[$post_type][$_GET['message']]) )
-		$message = $messages[$post_type][$_GET['message']];
-	elseif ( !isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]) )
-		$message = $messages['post'][$_GET['message']];
+	if ( isset( $messages[ $post_type ][ $_GET['message'] ] ) ) {
+		$message = $messages[ $post_type ][ $_GET['message'] ];
+	} elseif ( ! isset( $messages[ $post_type ] ) && isset( $messages['post'][ $_GET['message'] ] ) ) {
+		$message = $messages['post'][ $_GET['message'] ];
+	}
 }
 
-$notice = false;
+$notice     = false;
 $form_extra = '';
 if ( 'auto-draft' == $post->post_status ) {
-	if ( 'edit' == $action )
+	if ( 'edit' == $action ) {
 		$post->post_title = '';
-	$autosave = false;
+	}
+	$autosave    = false;
 	$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 } else {
 	$autosave = wp_get_post_autosave( $post_ID );
 }
 
-$form_action = 'editpost';
+$form_action  = 'editpost';
 $nonce_action = 'update-post_' . $post_ID;
-$form_extra .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($post_ID) . "' />";
+$form_extra  .= "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr( $post_ID ) . "' />";
 
 // Detect if there exists an autosave newer than the post and if that autosave is different than the post
 if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
@@ -215,33 +232,37 @@ if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql
 		}
 	}
 	// If this autosave isn't different from the current post, begone.
-	if ( ! $notice )
+	if ( ! $notice ) {
 		wp_delete_post_revision( $autosave->ID );
-	unset($autosave_field, $_autosave_field);
+	}
+	unset( $autosave_field, $_autosave_field );
 }
 
-$post_type_object = get_post_type_object($post_type);
+$post_type_object = get_post_type_object( $post_type );
 
 // All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action).
 require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' );
 
 
 $publish_callback_args = null;
-if ( post_type_supports($post_type, 'revisions') && 'auto-draft' != $post->post_status ) {
+if ( post_type_supports( $post_type, 'revisions' ) && 'auto-draft' != $post->post_status ) {
 	$revisions = wp_get_post_revisions( $post_ID );
 
 	// We should aim to show the revisions meta box only when there are revisions.
 	if ( count( $revisions ) > 1 ) {
 		reset( $revisions ); // Reset pointer for key()
-		$publish_callback_args = array( 'revisions_count' => count( $revisions ), 'revision_id' => key( $revisions ) );
-		add_meta_box('revisionsdiv', __('Revisions'), 'post_revisions_meta_box', null, 'normal', 'core');
+		$publish_callback_args = array(
+			'revisions_count' => count( $revisions ),
+			'revision_id'     => key( $revisions ),
+		);
+		add_meta_box( 'revisionsdiv', __( 'Revisions' ), 'post_revisions_meta_box', null, 'normal', 'core' );
 	}
 }
 
 if ( 'attachment' == $post_type ) {
 	wp_enqueue_script( 'image-edit' );
 	wp_enqueue_style( 'imgareaselect' );
-	add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' );
+	add_meta_box( 'submitdiv', __( 'Save' ), 'attachment_submit_meta_box', null, 'side', 'core' );
 	add_action( 'edit_form_after_title', 'edit_form_image_editor' );
 
 	if ( wp_attachment_is( 'audio', $post ) ) {
@@ -251,21 +272,24 @@ if ( 'attachment' == $post_type ) {
 	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core', $publish_callback_args );
 }
 
-if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) )
+if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type, 'post-formats' ) ) {
 	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
+}
 
 // all taxonomies
 foreach ( get_object_taxonomies( $post ) as $tax_name ) {
 	$taxonomy = get_taxonomy( $tax_name );
-	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb )
+	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb ) {
 		continue;
+	}
 
 	$label = $taxonomy->labels->name;
 
-	if ( ! is_taxonomy_hierarchical( $tax_name ) )
+	if ( ! is_taxonomy_hierarchical( $tax_name ) ) {
 		$tax_meta_box_id = 'tagsdiv-' . $tax_name;
-	else
+	} else {
 		$tax_meta_box_id = $tax_name . 'div';
+	}
 
 	add_meta_box( $tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array( 'taxonomy' => $tax_name ) );
 }
@@ -274,17 +298,21 @@ if ( post_type_supports( $post_type, 'page-attributes' ) || count( get_page_temp
 	add_meta_box( 'pageparentdiv', $post_type_object->labels->attributes, 'page_attributes_meta_box', null, 'side', 'core' );
 }
 
-if ( $thumbnail_support && current_user_can( 'upload_files' ) )
-	add_meta_box('postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low');
+if ( $thumbnail_support && current_user_can( 'upload_files' ) ) {
+	add_meta_box( 'postimagediv', esc_html( $post_type_object->labels->featured_image ), 'post_thumbnail_meta_box', null, 'side', 'low' );
+}
 
-if ( post_type_supports($post_type, 'excerpt') )
-	add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', null, 'normal', 'core');
+if ( post_type_supports( $post_type, 'excerpt' ) ) {
+	add_meta_box( 'postexcerpt', __( 'Excerpt' ), 'post_excerpt_meta_box', null, 'normal', 'core' );
+}
 
-if ( post_type_supports($post_type, 'trackbacks') )
-	add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', null, 'normal', 'core');
+if ( post_type_supports( $post_type, 'trackbacks' ) ) {
+	add_meta_box( 'trackbacksdiv', __( 'Send Trackbacks' ), 'post_trackback_meta_box', null, 'normal', 'core' );
+}
 
-if ( post_type_supports($post_type, 'custom-fields') )
-	add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
+if ( post_type_supports( $post_type, 'custom-fields' ) ) {
+	add_meta_box( 'postcustom', __( 'Custom Fields' ), 'post_custom_meta_box', null, 'normal', 'core' );
+}
 
 /**
  * Fires in the middle of built-in meta box registration.
@@ -316,8 +344,9 @@ if ( in_array( get_post_status( $post ), $stati ) ) {
 	}
 }
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
-	add_meta_box('slugdiv', __('Slug'), 'post_slug_meta_box', null, 'normal', 'core');
+if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+	add_meta_box( 'slugdiv', __( 'Slug' ), 'post_slug_meta_box', null, 'normal', 'core' );
+}
 
 if ( post_type_supports( $post_type, 'author' ) && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
 	add_meta_box( 'authordiv', __( 'Author' ), 'post_author_meta_box', null, 'normal', 'core' );
@@ -361,18 +390,25 @@ do_action( 'do_meta_boxes', $post_type, 'advanced', $post );
 /** This action is documented in wp-admin/edit-form-advanced.php */
 do_action( 'do_meta_boxes', $post_type, 'side', $post );
 
-add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
+add_screen_option(
+	'layout_columns', array(
+		'max'     => 2,
+		'default' => 2,
+	)
+);
 
 if ( 'post' == $post_type ) {
-	$customize_display = '<p>' . __('The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.') . '</p>';
+	$customize_display = '<p>' . __( 'The title field and the big Post Editing Area are fixed in place, but you can reposition all the other boxes using drag and drop. You can also minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'customize-display',
-		'title'   => __('Customizing This Display'),
-		'content' => $customize_display,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'customize-display',
+			'title'   => __( 'Customizing This Display' ),
+			'content' => $customize_display,
+		)
+	);
 
-	$title_and_editor  = '<p>' . __('<strong>Title</strong> &mdash; Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.') . '</p>';
+	$title_and_editor  = '<p>' . __( '<strong>Title</strong> &mdash; Enter a title for your post. After you enter a title, you&#8217;ll see the permalink below, which you can edit.' ) . '</p>';
 	$title_and_editor .= '<p>' . __( '<strong>Post editor</strong> &mdash; Enter the text for your post. There are two modes of editing: Visual and Text. Choose the mode by clicking on the appropriate tab.' ) . '</p>';
 	$title_and_editor .= '<p>' . __( 'Visual mode gives you an editor that is similar to a word processor. Click the Toolbar Toggle button to get a second row of controls.' ) . '</p>';
 	$title_and_editor .= '<p>' . __( 'The Text mode allows you to enter HTML along with your post text. Note that &lt;p&gt; and &lt;br&gt; tags are converted to line breaks when switching to the Text editor to make it less cluttered. When you type, a single line break can be used instead of typing &lt;br&gt;, and two line breaks instead of paragraph tags. The line breaks are converted back to tags automatically.' ) . '</p>';
@@ -380,65 +416,73 @@ if ( 'post' == $post_type ) {
 	$title_and_editor .= '<p>' . __( 'You can enable distraction-free writing mode using the icon to the right. This feature is not available for old browsers or devices with small screens, and requires that the full-height editor be enabled in Screen Options.' ) . '</p>';
 	$title_and_editor .= '<p>' . __( 'Keyboard users: When you&#8217;re working in the visual editor, you can use <kbd>Alt + F10</kbd> to access the toolbar.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'title-post-editor',
-		'title'   => __('Title and Post Editor'),
-		'content' => $title_and_editor,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'title-post-editor',
+			'title'   => __( 'Title and Post Editor' ),
+			'content' => $title_and_editor,
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
-			'<p>' . sprintf(__('You can also create posts with the <a href="%s">Press This bookmarklet</a>.'), 'tools.php') . '</p>' .
-			'<p><strong>' . __('For more information:') . '</strong></p>' .
-			'<p>' . __('<a href="https://codex.wordpress.org/Posts_Add_New_Screen">Documentation on Writing and Editing Posts</a>') . '</p>' .
-			'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+		'<p>' . sprintf( __( 'You can also create posts with the <a href="%s">Press This bookmarklet</a>.' ), 'tools.php' ) . '</p>' .
+			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+			'<p>' . __( '<a href="https://codex.wordpress.org/Posts_Add_New_Screen">Documentation on Writing and Editing Posts</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 } elseif ( 'page' == $post_type ) {
-	$about_pages = '<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>' .
-		'<p>' . __('Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.') . '</p>';
+	$about_pages = '<p>' . __( 'Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.' ) . '</p>' .
+		'<p>' . __( 'Creating a Page is very similar to creating a Post, and the screens can be customized in the same way using drag and drop, the Screen Options tab, and expanding/collapsing boxes as you choose. This screen also has the distraction-free writing space, available in both the Visual and Text modes via the Fullscreen buttons. The Page editor mostly works the same as the Post editor, but there are some Page-specific features in the Page Attributes box.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'about-pages',
-		'title'   => __('About Pages'),
-		'content' => $about_pages,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'about-pages',
+			'title'   => __( 'About Pages' ),
+			'content' => $about_pages,
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __('For more information:') . '</strong></p>' .
-			'<p>' . __('<a href="https://codex.wordpress.org/Pages_Add_New_Screen">Documentation on Adding New Pages</a>') . '</p>' .
-			'<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages">Documentation on Editing Pages</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/Pages_Add_New_Screen">Documentation on Adding New Pages</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages">Documentation on Editing Pages</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 } elseif ( 'attachment' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' =>
-			'<p>' . __('This screen allows you to edit four fields for metadata in a file within the media library.') . '</p>' .
-			'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-			'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-			'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' =>
+				'<p>' . __( 'This screen allows you to edit four fields for metadata in a file within the media library.' ) . '</p>' .
+				'<p>' . __( 'For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.' ) . '</p>' .
+				'<p>' . __( 'Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.' ) . '</p>' .
+				'<p>' . __( 'Remember to click Update Media to save metadata entered or changed.' ) . '</p>',
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</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/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 }
 
 if ( 'post' == $post_type || 'page' == $post_type ) {
-	$inserting_media = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.' ) . '</p>';
+	$inserting_media  = '<p>' . __( 'You can upload and insert media (images, audio, documents, etc.) by clicking the Add Media button. You can select from the images and files already uploaded to the Media Library, or upload new media to add to your page or post. To create an image gallery, select the images to add and click the &#8220;Create a new gallery&#8221; button.' ) . '</p>';
 	$inserting_media .= '<p>' . __( 'You can also embed media from many popular websites including Twitter, YouTube, Flickr and others by pasting the media URL on its own line into the content of your post/page. Please refer to the Codex to <a href="https://codex.wordpress.org/Embeds">learn more about embeds</a>.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'		=> 'inserting-media',
-		'title'		=> __( 'Inserting Media' ),
-		'content' 	=> $inserting_media,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'inserting-media',
+			'title'   => __( 'Inserting Media' ),
+			'content' => $inserting_media,
+		)
+	);
 }
 
 if ( 'post' == $post_type ) {
-	$publish_box = '<p>' . __('Several boxes on this screen contain settings for how your content will be published, including:') . '</p>';
+	$publish_box  = '<p>' . __( 'Several boxes on this screen contain settings for how your content will be published, including:' ) . '</p>';
 	$publish_box .= '<ul><li>' .
 		__( '<strong>Publish</strong> &mdash; You can set the terms of publishing your post in the Publish box. For Status, Visibility, and Publish (immediately), click on the Edit link to reveal more options. Visibility includes options for password-protecting a post or making it stay at the top of your blog indefinitely (sticky). The Password protected option allows you to set an arbitrary password for each post. The Private option hides the post from everyone except editors and administrators. Publish (immediately) allows you to set a future or past date and time, so you can schedule a post to be published in the future or backdate a post.' ) .
 	'</li>';
@@ -454,39 +498,47 @@ if ( 'post' == $post_type ) {
 
 	$publish_box .= '</ul>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'publish-box',
-		'title'   => __('Publish Settings'),
-		'content' => $publish_box,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'publish-box',
+			'title'   => __( 'Publish Settings' ),
+			'content' => $publish_box,
+		)
+	);
 
-	$discussion_settings  = '<p>' . __('<strong>Send Trackbacks</strong> &mdash; Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.') . '</p>';
-	$discussion_settings .= '<p>' . __('<strong>Discussion</strong> &mdash; You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.') . '</p>';
+	$discussion_settings  = '<p>' . __( '<strong>Send Trackbacks</strong> &mdash; Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. Enter the URL(s) you want to send trackbacks. If you link to other WordPress sites they&#8217;ll be notified automatically using pingbacks, and this field is unnecessary.' ) . '</p>';
+	$discussion_settings .= '<p>' . __( '<strong>Discussion</strong> &mdash; You can turn comments and pings on or off, and if there are comments on the post, you can see them here and moderate them.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'discussion-settings',
-		'title'   => __('Discussion Settings'),
-		'content' => $discussion_settings,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'discussion-settings',
+			'title'   => __( 'Discussion Settings' ),
+			'content' => $discussion_settings,
+		)
+	);
 } elseif ( 'page' == $post_type ) {
-	$page_attributes = '<p>' . __('<strong>Parent</strong> &mdash; You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.') . '</p>' .
-		'<p>' . __('<strong>Template</strong> &mdash; Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.') . '</p>' .
-		'<p>' . __('<strong>Order</strong> &mdash; Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.') . '</p>';
+	$page_attributes = '<p>' . __( '<strong>Parent</strong> &mdash; You can arrange your pages in hierarchies. For example, you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how many levels you can nest pages.' ) . '</p>' .
+		'<p>' . __( '<strong>Template</strong> &mdash; Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them in this dropdown menu.' ) . '</p>' .
+		'<p>' . __( '<strong>Order</strong> &mdash; Pages are usually ordered alphabetically, but you can choose your own order by entering a number (1 for first, etc.) in this field.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id' => 'page-attributes',
-		'title' => __('Page Attributes'),
-		'content' => $page_attributes,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'page-attributes',
+			'title'   => __( 'Page Attributes' ),
+			'content' => $page_attributes,
+		)
+	);
 }
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?php
 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) {
@@ -497,7 +549,7 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create
 <hr class="wp-header-end">
 
 <?php if ( $notice ) : ?>
-<div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
+<div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice; ?></p></div>
 <?php endif; ?>
 <?php if ( $message ) : ?>
 <div id="message" class="updated notice notice-success is-dismissible"><p><?php echo $message; ?></p></div>
@@ -507,7 +559,8 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create
 	<span class="hide-if-no-sessionstorage"><?php _e( 'We&#8217;re backing up this post in your browser, just in case.' ); ?></span>
 	</p>
 </div>
-<form name="post" action="post.php" method="post" id="post"<?php
+<form name="post" action="post.php" method="post" id="post"
+<?php
 /**
  * Fires inside the post editor form tag.
  *
@@ -518,21 +571,23 @@ if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create
 do_action( 'post_edit_form_tag', $post );
 
 $referer = wp_get_referer();
-?>>
-<?php wp_nonce_field($nonce_action); ?>
-<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
-<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr( $form_action ) ?>" />
-<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr( $form_action ) ?>" />
+?>
+>
+<?php wp_nonce_field( $nonce_action ); ?>
+<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID; ?>" />
+<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr( $form_action ); ?>" />
+<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr( $form_action ); ?>" />
 <input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
-<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr( $post_type ) ?>" />
-<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr( $post->post_status) ?>" />
+<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr( $post->post_status ); ?>" />
 <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
 }
-if ( 'draft' != get_post_status( $post ) )
-	wp_original_referer_field(true, 'previous');
+if ( 'draft' != get_post_status( $post ) ) {
+	wp_original_referer_field( true, 'previous' );
+}
 
 echo $form_extra;
 
@@ -550,13 +605,14 @@ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_top', $post ); ?>
+do_action( 'edit_form_top', $post );
+?>
 
 <div id="poststuff">
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 <div id="post-body-content">
 
-<?php if ( post_type_supports($post_type, 'title') ) { ?>
+<?php if ( post_type_supports( $post_type, 'title' ) ) { ?>
 <div id="titlediv">
 <div id="titlewrap">
 	<?php
@@ -586,28 +642,29 @@ 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) : '';
+	$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;
+	if ( $has_sample_permalink ) {
+		echo $sample_permalink_html;
+	}
 	?>
 	</div>
-<?php
-}
+	<?php
+	}
 endif;
 ?>
 </div>
@@ -626,7 +683,7 @@ wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
  */
 do_action( 'edit_form_after_title', $post );
 
-if ( post_type_supports($post_type, 'editor') ) {
+if ( post_type_supports( $post_type, 'editor' ) ) {
 	$_wp_editor_expand_class = '';
 	if ( $_wp_editor_expand ) {
 		$_wp_editor_expand_class = ' wp-editor-expand';
@@ -634,40 +691,46 @@ if ( post_type_supports($post_type, 'editor') ) {
 ?>
 <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 ) );
-		}
-		echo '</span>';
-	} ?>
+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>';
+}
+	?>
 	</td>
 	<td id="content-resize-handle" class="hide-if-no-js"><br /></td>
 </tr></tbody></table>
 
 </div>
-<?php }
+<?php
+}
 /**
  * Fires after the content editor.
  *
@@ -693,8 +756,7 @@ if ( 'page' == $post_type ) {
 	 * @param WP_Post $post Post object.
 	 */
 	do_action( 'submitpage_box', $post );
-}
-else {
+} else {
 	/**
 	 * Fires before meta boxes with 'side' context are output for all post types other than 'page'.
 	 *
@@ -708,14 +770,14 @@ else {
 }
 
 
-do_meta_boxes($post_type, 'side', $post);
+do_meta_boxes( $post_type, 'side', $post );
 
 ?>
 </div>
 <div id="postbox-container-2" class="postbox-container">
 <?php
 
-do_meta_boxes(null, 'normal', $post);
+do_meta_boxes( null, 'normal', $post );
 
 if ( 'page' == $post_type ) {
 	/**
@@ -726,8 +788,7 @@ if ( 'page' == $post_type ) {
 	 * @param WP_Post $post Post object.
 	 */
 	do_action( 'edit_page_form', $post );
-}
-else {
+} else {
 	/**
 	 * Fires after 'normal' context meta boxes have been output for all post types other than 'page'.
 	 *
@@ -739,7 +800,7 @@ else {
 }
 
 
-do_meta_boxes(null, 'advanced', $post);
+do_meta_boxes( null, 'advanced', $post );
 
 ?>
 </div>
@@ -761,8 +822,9 @@ do_action( 'dbx_post_sidebar', $post );
 </div>
 
 <?php
-if ( post_type_supports( $post_type, 'comments' ) )
+if ( post_type_supports( $post_type, 'comments' ) ) {
 	wp_comment_reply();
+}
 ?>
 
 <?php if ( ! wp_is_mobile() && post_type_supports( $post_type, 'title' ) && '' === $post->post_title ) : ?>
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 18ab60a348..e043908c30 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -7,11 +7,12 @@
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+	die( '-1' );
+}
 ?>
 <form name="post" action="comment.php" method="post" id="post">
-<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
+<?php wp_nonce_field( 'update-comment_' . $comment->comment_ID ); ?>
 <div class="wrap">
 <h1><?php _e( 'Edit Comment' ); ?></h1>
 
@@ -36,7 +37,7 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 <div id="namediv" class="stuffbox">
 <div class="inside">
 <fieldset>
-<legend class="edit-comment-author"><?php _e( 'Author' ) ?></legend>
+<legend class="edit-comment-author"><?php _e( 'Author' ); ?></legend>
 <table class="form-table editcomment">
 <tbody>
 <tr>
@@ -52,7 +53,7 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 <tr>
 	<td class="first"><label for="newcomment_author_url"><?php _e( 'URL:' ); ?></label></td>
 	<td>
-		<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" />
+		<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr( $comment->comment_author_url ); ?>" />
 	</td>
 </tr>
 </tbody>
@@ -66,14 +67,21 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 <?php
 	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( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
-	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+	wp_editor(
+		$comment->comment_content, 'content', array(
+			'media_buttons' => false,
+			'tinymce'       => false,
+			'quicktags'     => $quicktags_settings,
+		)
+	);
+	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+	?>
 </div>
 </div><!-- /post-body-content -->
 
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
-<h2><?php _e( 'Status' ) ?></h2>
+<h2><?php _e( 'Status' ); ?></h2>
 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
@@ -92,13 +100,15 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 /* translators: Publish box date format, see https://secure.php.net/date */
 $datef = __( 'M j, Y @ H:i' );
 ?>
-<span id="timestamp"><?php
+<span id="timestamp">
+<?php
 printf(
 	/* translators: %s: comment date */
 	__( 'Submitted on: %s' ),
 	'<b>' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '</b>'
 );
-?></span>
+?>
+</span>
 <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><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>
@@ -109,7 +119,7 @@ printf(
 <?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  = "<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 ) );
@@ -117,29 +127,35 @@ if ( current_user_can( 'edit_post', $post_id ) ) {
 ?>
 
 <div class="misc-pub-section misc-pub-response-to">
-	<?php printf(
+	<?php
+	printf(
 		/* translators: %s: post link */
 		__( 'In response to: %s' ),
 		'<b>' . $post_link . '</b>'
-	); ?>
+	);
+	?>
 </div>
 
 <?php
 if ( $comment->comment_parent ) :
-	$parent      = get_comment( $comment->comment_parent );
+	$parent = get_comment( $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(
+		<?php
+		printf(
 			/* translators: %s: comment link */
 			__( 'In reply to: %s' ),
 			'<b><a href="' . $parent_link . '">' . $name . '</a></b>'
-		); ?>
+		);
+		?>
 	</div>
-<?php endif;
-endif; ?>
+<?php
+endif;
+endif;
+?>
 
 <?php
 	/**
@@ -159,7 +175,7 @@ endif; ?>
 
 <div id="major-publishing-actions">
 <div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=" . ( !EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "</a>\n"; ?>
+<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to Trash' ) ) . "</a>\n"; ?>
 </div>
 <div id="publishing-action">
 <?php submit_button( __( 'Update' ), 'primary large', 'save', false ); ?>
@@ -185,16 +201,16 @@ do_action( 'add_meta_boxes', 'comment', $comment );
  */
 do_action( 'add_meta_boxes_comment', $comment );
 
-do_meta_boxes(null, 'normal', $comment);
+do_meta_boxes( null, 'normal', $comment );
 
 $referer = wp_get_referer();
 ?>
 </div>
 
-<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
-<input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
+<input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
+<input type="hidden" name="p" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
-<?php wp_original_referer_field(true, 'previous'); ?>
+<?php wp_original_referer_field( true, 'previous' ); ?>
 <input type="hidden" name="noredir" value="1" />
 
 </div><!-- /post-body -->
@@ -206,4 +222,5 @@ $referer = wp_get_referer();
 <script type="text/javascript">
 try{document.post.name.focus();}catch(e){}
 </script>
-<?php endif;
+<?php
+endif;
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 3252fa40cb..d0db1df36a 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -7,28 +7,29 @@
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
-	die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+	die( '-1' );
+}
 
-if ( ! empty($link_id) ) {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
-	$submit_text = __('Update Link');
-	$form_name = 'editlink';
+if ( ! empty( $link_id ) ) {
+	$heading      = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' );
+	$submit_text  = __( 'Update Link' );
+	$form_name    = 'editlink';
 	$nonce_action = 'update-bookmark_' . $link_id;
 } else {
-	$heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
-	$submit_text = __('Add Link');
-	$form_name = 'addlink';
+	$heading      = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' );
+	$submit_text  = __( 'Add Link' );
+	$form_name    = 'addlink';
 	$nonce_action = 'add-bookmark';
 }
 
 require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' );
 
-add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', null, 'side', 'core');
-add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', null, 'normal', 'core');
-add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', null, 'normal', 'core');
-add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', null, 'normal', 'core');
-add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', null, 'normal', 'core');
+add_meta_box( 'linksubmitdiv', __( 'Save' ), 'link_submit_meta_box', null, 'side', 'core' );
+add_meta_box( 'linkcategorydiv', __( 'Categories' ), 'link_categories_meta_box', null, 'normal', 'core' );
+add_meta_box( 'linktargetdiv', __( 'Target' ), 'link_target_meta_box', null, 'normal', 'core' );
+add_meta_box( 'linkxfndiv', __( 'Link Relationship (XFN)' ), 'link_xfn_meta_box', null, 'normal', 'core' );
+add_meta_box( 'linkadvanceddiv', __( 'Advanced' ), 'link_advanced_meta_box', null, 'normal', 'core' );
 
 /** This action is documented in wp-admin/edit-form-advanced.php */
 do_action( 'add_meta_boxes', 'link', $link );
@@ -49,16 +50,23 @@ do_action( 'do_meta_boxes', 'link', 'advanced', $link );
 /** This action is documented in wp-admin/edit-form-advanced.php */
 do_action( 'do_meta_boxes', 'link', 'side', $link );
 
-add_screen_option('layout_columns', array('max' => 2, 'default' => 2) );
+add_screen_option(
+	'layout_columns', array(
+		'max'     => 2,
+		'default' => 2,
+	)
+);
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-	'<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
-	'<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
-	'<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+		'<p>' . __( 'You can add or edit links on this screen by entering information in each of the boxes. Only the link&#8217;s web address and name (the text you want to display on your site as the link) are required fields.' ) . '</p>' .
+		'<p>' . __( 'The boxes for link name, web address, and description have fixed positions, while the others may be repositioned using drag and drop. You can also hide boxes you don&#8217;t use in the Screen Options tab, or minimize boxes by clicking on the title bar of the box.' ) . '</p>' .
+		'<p>' . __( 'XFN stands for <a href="http://gmpg.org/xfn/">XHTML Friends Network</a>, which is optional. WordPress allows the generation of XFN attributes to show how you are related to the authors/owners of the site to which you are linking.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
@@ -70,16 +78,18 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <a href="link-add.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'link' ); ?></a>
 
 <hr class="wp-header-end">
 
 <?php if ( isset( $_GET['added'] ) ) : ?>
-<div id="message" class="updated notice is-dismissible"><p><?php _e('Link added.'); ?></p></div>
+<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Link added.' ); ?></p></div>
 <?php endif; ?>
 
 <form name="<?php echo esc_attr( $form_name ); ?>" id="<?php echo esc_attr( $form_name ); ?>" method="post" action="link.php">
@@ -90,33 +100,34 @@ if ( ! empty( $link_added ) ) {
 
 wp_nonce_field( $nonce_action );
 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
+wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+?>
 
 <div id="poststuff">
 
 <div id="post-body" class="metabox-holder columns-<?php echo 1 == get_current_screen()->get_columns() ? '1' : '2'; ?>">
 <div id="post-body-content">
 <div id="namediv" class="stuffbox">
-<h2><label for="link_name"><?php _ex( 'Name', 'link name' ) ?></label></h2>
+<h2><label for="link_name"><?php _ex( 'Name', 'link name' ); ?></label></h2>
 <div class="inside">
-	<input type="text" name="link_name" size="30" maxlength="255" value="<?php echo esc_attr($link->link_name); ?>" id="link_name" />
-	<p><?php _e('Example: Nifty blogging software'); ?></p>
+	<input type="text" name="link_name" size="30" maxlength="255" value="<?php echo esc_attr( $link->link_name ); ?>" id="link_name" />
+	<p><?php _e( 'Example: Nifty blogging software' ); ?></p>
 </div>
 </div>
 
 <div id="addressdiv" class="stuffbox">
-<h2><label for="link_url"><?php _e( 'Web Address' ) ?></label></h2>
+<h2><label for="link_url"><?php _e( 'Web Address' ); ?></label></h2>
 <div class="inside">
-	<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr($link->link_url); ?>" id="link_url" />
-	<p><?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?></p>
+	<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr( $link->link_url ); ?>" id="link_url" />
+	<p><?php _e( 'Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>' ); ?></p>
 </div>
 </div>
 
 <div id="descriptiondiv" class="stuffbox">
-<h2><label for="link_description"><?php _e( 'Description' ) ?></label></h2>
+<h2><label for="link_description"><?php _e( 'Description' ); ?></label></h2>
 <div class="inside">
-	<input type="text" name="link_description" size="30" maxlength="255" value="<?php echo isset($link->link_description) ? esc_attr($link->link_description) : ''; ?>" id="link_description" />
-	<p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p>
+	<input type="text" name="link_description" size="30" maxlength="255" value="<?php echo isset( $link->link_description ) ? esc_attr( $link->link_description ) : ''; ?>" id="link_description" />
+	<p><?php _e( 'This will be shown when someone hovers over the link in the blogroll, or optionally below the link.' ); ?></p>
 </div>
 </div>
 </div><!-- /post-body-content -->
@@ -133,19 +144,20 @@ $side_meta_boxes = do_meta_boxes( 'link', 'side', $link );
 <div id="postbox-container-2" class="postbox-container">
 <?php
 
-do_meta_boxes(null, 'normal', $link);
+do_meta_boxes( null, 'normal', $link );
 
-do_meta_boxes(null, 'advanced', $link);
+do_meta_boxes( null, 'advanced', $link );
 
 ?>
 </div>
 <?php
 
-if ( $link_id ) : ?>
+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 ?>" />
-<?php else: ?>
+<input type="hidden" name="cat_id" value="<?php echo (int) $cat_id; ?>" />
+<?php else : ?>
 <input type="hidden" name="action" value="add" />
 <?php endif; ?>
 
diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index f8c83feac3..9b29553c3a 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -14,7 +14,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 // Back compat hooks
 if ( 'category' == $taxonomy ) {
 	/**
- 	 * Fires before the Edit Category form.
+	 * Fires before the Edit Category form.
 	 *
 	 * @since 2.1.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.
@@ -74,16 +74,19 @@ do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
 <div id="message" class="updated">
 	<p><strong><?php echo $message; ?></strong></p>
 	<?php if ( $wp_http_referer ) { ?>
-	<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>
+	<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>
 <?php endif; ?>
 
 <div id="ajax-response"></div>
 
-<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"<?php
+<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"
+<?php
 /**
  * Fires inside the Edit Term form tag.
  *
@@ -92,10 +95,11 @@ do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
  * @since 3.7.0
  */
 do_action( "{$taxonomy}_term_edit_form_tag" );
-?>>
+?>
+>
 <input type="hidden" name="action" value="editedtag"/>
-<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_ID ) ?>"/>
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ) ?>"/>
+<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_ID ); ?>"/>
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>"/>
 <?php
 wp_original_referer_field( true, 'previous' );
 wp_nonce_field( 'update-tag_' . $tag_ID );
@@ -123,9 +127,9 @@ if ( isset( $tag->name ) ) {
 		<tr class="form-field form-required term-name-wrap">
 			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
 			<td><input name="name" id="name" type="text" value="<?php echo $tag_name_value; ?>" size="40" aria-required="true" />
-			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
+			<p class="description"><?php _e( 'The name is how it appears on your site.' ); ?></p></td>
 		</tr>
-<?php if ( !global_terms_enabled() ) { ?>
+<?php if ( ! global_terms_enabled() ) { ?>
 		<tr class="form-field term-slug-wrap">
 			<th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
 			<?php
@@ -145,10 +149,10 @@ if ( isset( $tag->name ) ) {
 			$slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : '';
 			?>
 			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
-			<p class="description"><?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></td>
+			<p class="description"><?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></td>
 		</tr>
 <?php } ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if ( is_taxonomy_hierarchical( $taxonomy ) ) : ?>
 		<tr class="form-field term-parent-wrap">
 			<th scope="row"><label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label></th>
 			<td>
@@ -167,7 +171,8 @@ if ( isset( $tag->name ) ) {
 
 				/** This filter is documented in wp-admin/edit-tags.php */
 				$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
-				wp_dropdown_categories( $dropdown_args ); ?>
+				wp_dropdown_categories( $dropdown_args );
+				?>
 				<?php if ( 'category' == $taxonomy ) : ?>
 					<p class="description"><?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 : ?>
@@ -179,7 +184,7 @@ if ( isset( $tag->name ) ) {
 		<tr class="form-field term-description-wrap">
 			<th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
 			<td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
-			<p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
+			<p class="description"><?php _e( 'The description is not prominent by default; however, some themes may show it.' ); ?></p></td>
 		</tr>
 		<?php
 		// Back compat hooks
@@ -266,7 +271,7 @@ do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 
 	<?php if ( current_user_can( 'delete_term', $tag->term_id ) ) : ?>
 		<span id="delete-link">
-			<a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ) ?>"><?php _e( 'Delete' ); ?></a>
+			<a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ); ?>"><?php _e( 'Delete' ); ?></a>
 		</span>
 	<?php endif; ?>
 
@@ -279,4 +284,5 @@ do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
 <script type="text/javascript">
 try{document.forms.edittag.name.focus();}catch(e){}
 </script>
-<?php endif;
+<?php
+endif;
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 5d1025e5eb..c49b61b2cb 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -9,13 +9,15 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! $taxnow )
+if ( ! $taxnow ) {
 	wp_die( __( 'Invalid taxonomy.' ) );
+}
 
 $tax = get_taxonomy( $taxnow );
 
-if ( ! $tax )
+if ( ! $tax ) {
 	wp_die( __( 'Invalid taxonomy.' ) );
+}
 
 if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
@@ -36,149 +38,168 @@ if ( ! current_user_can( $tax->cap->manage_terms ) ) {
  */
 global $post_type;
 
-$wp_list_table = _get_list_table('WP_Terms_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_Terms_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 
 $title = $tax->labels->name;
 
 if ( 'post' != $post_type ) {
-	$parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
+	$parent_file  = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
 } elseif ( 'link_category' == $tax->name ) {
-	$parent_file = 'link-manager.php';
+	$parent_file  = 'link-manager.php';
 	$submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {
-	$parent_file = 'edit.php';
+	$parent_file  = 'edit.php';
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
+add_screen_option(
+	'per_page', array(
+		'default' => 20,
+		'option'  => 'edit_' . $tax->name . '_per_page',
+	)
+);
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_pagination' => $tax->labels->items_list_navigation,
-	'heading_list'       => $tax->labels->items_list,
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_pagination' => $tax->labels->items_list_navigation,
+		'heading_list'       => $tax->labels->items_list,
+	)
+);
 
 $location = false;
-$referer = wp_get_referer();
+$referer  = wp_get_referer();
 if ( ! $referer ) { // For POST requests.
 	$referer = wp_unslash( $_SERVER['REQUEST_URI'] );
 }
 $referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message', 'paged' ), $referer );
 switch ( $wp_list_table->current_action() ) {
 
-case 'add-tag':
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+	case 'add-tag':
+		check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
 
-	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
-			403
-		);
-	}
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
+				403
+			);
+		}
 
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $referer );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
+		$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
+		if ( $ret && ! is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 1, $referer );
+		} else {
+			$location = add_query_arg(
+				array(
+					'error'   => true,
+					'message' => 4,
+				), $referer
+			);
+		}
 
-	break;
-
-case 'delete':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
 		break;
-	}
 
-	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+	case 'delete':
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
-			403
-		);
-	}
+		$tag_ID = (int) $_REQUEST['tag_ID'];
+		check_admin_referer( 'delete-tag_' . $tag_ID );
 
-	wp_delete_term( $tag_ID, $taxonomy );
+		if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+				403
+			);
+		}
 
-	$location = add_query_arg( 'message', 2, $referer );
-
-	// When deleting a term, prevent the action from redirecting back to a term that no longer exists.
-	$location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
-
-	break;
-
-case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
-
-	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
-			403
-		);
-	}
-
-	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
 		wp_delete_term( $tag_ID, $taxonomy );
-	}
 
-	$location = add_query_arg( 'message', 6, $referer );
+		$location = add_query_arg( 'message', 2, $referer );
 
-	break;
+		// When deleting a term, prevent the action from redirecting back to a term that no longer exists.
+		$location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
 
-case 'edit':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
 		break;
-	}
 
-	$term_id = (int) $_REQUEST['tag_ID'];
-	$term    = get_term( $term_id );
+	case 'bulk-delete':
+		check_admin_referer( 'bulk-tags' );
 
-	if ( ! $term instanceof WP_Term ) {
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
-	}
+		if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+				403
+			);
+		}
 
-	wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
-	exit;
+		$tags = (array) $_REQUEST['delete_tags'];
+		foreach ( $tags as $tag_ID ) {
+			wp_delete_term( $tag_ID, $taxonomy );
+		}
 
-case 'editedtag':
-	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+		$location = add_query_arg( 'message', 6, $referer );
 
-	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
-			403
-		);
-	}
-
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
-
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
-
-	if ( $ret && ! is_wp_error( $ret ) ) {
-		$location = add_query_arg( 'message', 3, $referer );
-	} else {
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
-	}
-	break;
-default:
-	if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
 		break;
-	}
-	check_admin_referer( 'bulk-tags' );
-	$tags = (array) $_REQUEST['delete_tags'];
-	/** This action is documented in wp-admin/edit-comments.php */
-	$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
-	break;
+
+	case 'edit':
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
+
+		$term_id = (int) $_REQUEST['tag_ID'];
+		$term    = get_term( $term_id );
+
+		if ( ! $term instanceof WP_Term ) {
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		}
+
+		wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
+		exit;
+
+	case 'editedtag':
+		$tag_ID = (int) $_POST['tag_ID'];
+		check_admin_referer( 'update-tag_' . $tag_ID );
+
+		if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+				403
+			);
+		}
+
+		$tag = get_term( $tag_ID, $taxonomy );
+		if ( ! $tag ) {
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		}
+
+		$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+
+		if ( $ret && ! is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 3, $referer );
+		} else {
+			$location = add_query_arg(
+				array(
+					'error'   => true,
+					'message' => 5,
+				), $referer
+			);
+		}
+		break;
+	default:
+		if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
+			break;
+		}
+		check_admin_referer( 'bulk-tags' );
+		$tags = (array) $_REQUEST['delete_tags'];
+		/** This action is documented in wp-admin/edit-comments.php */
+		$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
+		break;
 }
 
 if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {
@@ -210,66 +231,77 @@ if ( $pagenum > $total_pages && $total_pages > 0 ) {
 	exit;
 }
 
-wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
-	wp_enqueue_script('inline-edit-tax');
+wp_enqueue_script( 'admin-tags' );
+if ( current_user_can( $tax->cap->edit_terms ) ) {
+	wp_enqueue_script( 'inline-edit-tax' );
+}
 
-if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
-	$help ='';
-	if ( 'category' == $taxonomy )
-		$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
+if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy ) {
+	$help = '';
+	if ( 'category' == $taxonomy ) {
+		$help = '<p>' . sprintf( __( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ), 'options-writing.php' ) . '</p>';
+	} elseif ( 'link_category' == $taxonomy ) {
 		$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
-	else
+	} else {
 		$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+	}
 
-	if ( 'link_category' == $taxonomy )
+	if ( 'link_category' == $taxonomy ) {
 		$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
-	else
-		$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	} else {
+		$help .= '<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	}
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' => $help,
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' => $help,
+		)
+	);
 
 	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
-		if ( 'category' == $taxonomy )
+		if ( 'category' == $taxonomy ) {
 			$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
-		else
+		} else {
 			$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		}
 
 		$help .= '<ul>' .
 		'<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
 
-		if ( ! global_terms_enabled() )
+		if ( ! global_terms_enabled() ) {
 			$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		}
 
-		if ( 'category' == $taxonomy )
+		if ( 'category' == $taxonomy ) {
 			$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		}
 
 		$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
 		'</ul>' .
 		'<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
 
-		get_current_screen()->add_help_tab( array(
-			'id'      => 'adding-terms',
-			'title'   => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ),
-			'content' => $help,
-		) );
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'adding-terms',
+				'title'   => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ),
+				'content' => $help,
+			)
+		);
 	}
 
 	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 
-	if ( 'category' == $taxonomy )
+	if ( 'category' == $taxonomy ) {
 		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
+	} elseif ( 'link_category' == $taxonomy ) {
 		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
-	else
+	} else {
 		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>' ) . '</p>';
+	}
 
-	$help .= '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>';
+	$help .= '<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>';
 
 	get_current_screen()->set_help_sidebar( $help );
 
@@ -305,13 +337,15 @@ 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'] );
-endif; ?>
+<?php
+$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
+endif;
+?>
 <div id="ajax-response"></div>
 
 <form class="search-form wp-clearfix" method="get">
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
-<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
+<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_list_table->search_box( $tax->labels->search_items, 'tag' ); ?>
 
@@ -324,10 +358,10 @@ endif; ?>
 
 <?php
 
-if ( current_user_can($tax->cap->edit_terms) ) {
+if ( current_user_can( $tax->cap->edit_terms ) ) {
 	if ( 'category' == $taxonomy ) {
 		/**
- 		 * Fires before the Add Category form.
+		 * Fires before the Add Category form.
 		 *
 		 * @since 2.1.0
 		 * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead.
@@ -371,7 +405,8 @@ if ( current_user_can($tax->cap->edit_terms) ) {
 
 <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
+<form id="addtag" method="post" action="edit-tags.php" class="validate"
+<?php
 /**
  * Fires inside the Add Tag form tag.
  *
@@ -380,26 +415,27 @@ if ( current_user_can($tax->cap->edit_terms) ) {
  * @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'); ?>
+<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' ); ?>
 
 <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>
+	<p><?php _e( 'The name is how it appears on your site.' ); ?></p>
 </div>
 <?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>
+	<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
@@ -448,7 +484,7 @@ do_action( "{$taxonomy}_term_new_form_tag" );
 <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>
+	<p><?php _e( 'The description is not prominent by default; however, some themes may show it.' ); ?></p>
 </div>
 
 <?php
@@ -547,19 +583,20 @@ do_action( "{$taxonomy}_add_form", $taxonomy );
 		/* translators: %s: default category */
 		__( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ),
 		/** This filter is documented in wp-includes/category-template.php */
-		'<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ), '', '' ) . '</strong>'
+		'<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category' ) ), '', '' ) . '</strong>'
 	);
 	?>
 </p>
 <?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>
+<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; ?>
 </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>
+<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 endif;
+<?php
+endif;
 
 /**
  * Fires after the taxonomy list table.
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 5cb503c109..f629734c18 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -9,8 +9,9 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! $typenow )
+if ( ! $typenow ) {
 	wp_die( __( 'Invalid post type.' ) );
+}
 
 if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
@@ -28,11 +29,12 @@ if ( 'attachment' === $typenow ) {
  */
 global $post_type, $post_type_object;
 
-$post_type = $typenow;
+$post_type        = $typenow;
 $post_type_object = get_post_type_object( $post_type );
 
-if ( ! $post_type_object )
+if ( ! $post_type_object ) {
 	wp_die( __( 'Invalid post type.' ) );
+}
 
 if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 	wp_die(
@@ -42,8 +44,8 @@ if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 	);
 }
 
-$wp_list_table = _get_list_table('WP_Posts_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_Posts_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 
 // Back-compat for viewing comments of an entry
 foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
@@ -55,30 +57,32 @@ foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
 unset( $_redirect );
 
 if ( 'post' != $post_type ) {
-	$parent_file = "edit.php?post_type=$post_type";
-	$submenu_file = "edit.php?post_type=$post_type";
+	$parent_file   = "edit.php?post_type=$post_type";
+	$submenu_file  = "edit.php?post_type=$post_type";
 	$post_new_file = "post-new.php?post_type=$post_type";
 } else {
-	$parent_file = 'edit.php';
-	$submenu_file = 'edit.php';
+	$parent_file   = 'edit.php';
+	$submenu_file  = 'edit.php';
 	$post_new_file = 'post-new.php';
 }
 
 $doaction = $wp_list_table->current_action();
 
 if ( $doaction ) {
-	check_admin_referer('bulk-posts');
+	check_admin_referer( 'bulk-posts' );
 
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer() );
-	if ( ! $sendback )
+	$sendback = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'locked', 'ids' ), wp_get_referer() );
+	if ( ! $sendback ) {
 		$sendback = admin_url( $parent_file );
+	}
 	$sendback = add_query_arg( 'paged', $pagenum, $sendback );
-	if ( strpos($sendback, 'post.php') !== false )
-		$sendback = admin_url($post_new_file);
+	if ( strpos( $sendback, 'post.php' ) !== false ) {
+		$sendback = admin_url( $post_new_file );
+	}
 
 	if ( 'delete_all' == $doaction ) {
 		// Prepare for deletion of all posts with a specified post status (i.e. Empty trash).
-		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['post_status']);
+		$post_status = preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['post_status'] );
 		// Validate the post status exists.
 		if ( get_post_status_object( $post_status ) ) {
 			$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
@@ -88,11 +92,11 @@ if ( $doaction ) {
 		$post_ids = $_REQUEST['media'];
 	} elseif ( isset( $_REQUEST['ids'] ) ) {
 		$post_ids = explode( ',', $_REQUEST['ids'] );
-	} elseif ( !empty( $_REQUEST['post'] ) ) {
-		$post_ids = array_map('intval', $_REQUEST['post']);
+	} elseif ( ! empty( $_REQUEST['post'] ) ) {
+		$post_ids = array_map( 'intval', $_REQUEST['post'] );
 	}
 
-	if ( !isset( $post_ids ) ) {
+	if ( ! isset( $post_ids ) ) {
 		wp_redirect( $sendback );
 		exit;
 	}
@@ -102,63 +106,76 @@ if ( $doaction ) {
 			$trashed = $locked = 0;
 
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('Sorry, you are not allowed to move this item to the Trash.') );
+				if ( ! current_user_can( 'delete_post', $post_id ) ) {
+					wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+				}
 
 				if ( wp_check_post_lock( $post_id ) ) {
 					$locked++;
 					continue;
 				}
 
-				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to Trash.') );
+				if ( ! wp_trash_post( $post_id ) ) {
+					wp_die( __( 'Error in moving to Trash.' ) );
+				}
 
 				$trashed++;
 			}
 
-			$sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids), 'locked' => $locked ), $sendback );
+			$sendback = add_query_arg(
+				array(
+					'trashed' => $trashed,
+					'ids'     => join( ',', $post_ids ),
+					'locked'  => $locked,
+				), $sendback
+			);
 			break;
 		case 'untrash':
 			$untrashed = 0;
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('Sorry, you are not allowed to restore this item from the Trash.') );
+				if ( ! current_user_can( 'delete_post', $post_id ) ) {
+					wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+				}
 
-				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from Trash.') );
+				if ( ! wp_untrash_post( $post_id ) ) {
+					wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 
 				$untrashed++;
 			}
-			$sendback = add_query_arg('untrashed', $untrashed, $sendback);
+			$sendback = add_query_arg( 'untrashed', $untrashed, $sendback );
 			break;
 		case 'delete':
 			$deleted = 0;
 			foreach ( (array) $post_ids as $post_id ) {
-				$post_del = get_post($post_id);
+				$post_del = get_post( $post_id );
 
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __('Sorry, you are not allowed to delete this item.') );
+				if ( ! current_user_can( 'delete_post', $post_id ) ) {
+					wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+				}
 
 				if ( $post_del->post_type == 'attachment' ) {
-					if ( ! wp_delete_attachment($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( ! wp_delete_attachment( $post_id ) ) {
+						wp_die( __( 'Error in deleting.' ) );
+					}
 				} else {
-					if ( !wp_delete_post($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( ! wp_delete_post( $post_id ) ) {
+						wp_die( __( 'Error in deleting.' ) );
+					}
 				}
 				$deleted++;
 			}
-			$sendback = add_query_arg('deleted', $deleted, $sendback);
+			$sendback = add_query_arg( 'deleted', $deleted, $sendback );
 			break;
 		case 'edit':
-			if ( isset($_REQUEST['bulk_edit']) ) {
-				$done = bulk_edit_posts($_REQUEST);
+			if ( isset( $_REQUEST['bulk_edit'] ) ) {
+				$done = bulk_edit_posts( $_REQUEST );
 
-				if ( is_array($done) ) {
+				if ( is_array( $done ) ) {
 					$done['updated'] = count( $done['updated'] );
 					$done['skipped'] = count( $done['skipped'] );
-					$done['locked'] = count( $done['locked'] );
-					$sendback = add_query_arg( $done, $sendback );
+					$done['locked']  = count( $done['locked'] );
+					$sendback        = add_query_arg( $done, $sendback );
 				}
 			}
 			break;
@@ -168,107 +185,126 @@ if ( $doaction ) {
 			break;
 	}
 
-	$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
+	$sendback = remove_query_arg( array( 'action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view' ), $sendback );
 
-	wp_redirect($sendback);
+	wp_redirect( $sendback );
 	exit();
-} elseif ( ! empty($_REQUEST['_wp_http_referer']) ) {
-	wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ) );
+} elseif ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+	wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
 	exit;
 }
 
 $wp_list_table->prepare_items();
 
-wp_enqueue_script('inline-edit-post');
-wp_enqueue_script('heartbeat');
+wp_enqueue_script( 'inline-edit-post' );
+wp_enqueue_script( 'heartbeat' );
 
 $title = $post_type_object->labels->name;
 
 if ( 'post' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'overview',
-	'title'		=> __('Overview'),
-	'content'	=>
-		'<p>' . __('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.') . '</p>'
-	) );
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'screen-content',
-	'title'		=> __('Screen Content'),
-	'content'	=>
-		'<p>' . __('You can customize the display of this screen&#8217;s contents in a number of ways:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
-			'<li>' . __( 'You can filter the list of posts by post status using the text links above the posts list to only show posts with that status. The default view is to show all posts.' ) . '</li>' .
-			'<li>' . __('You can view posts in a simple title list or with an excerpt using the Screen Options tab.') . '</li>' .
-			'<li>' . __('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.') . '</li>' .
-		'</ul>'
-	) );
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'action-links',
-	'title'		=> __('Available Actions'),
-	'content'	=>
-		'<p>' . __('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.') . '</li>' .
-			'<li>' . __('<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.') . '</li>' .
-			'<li>' . __('<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.') . '</li>' .
-			'<li>' . __('<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.') . '</li>' .
-		'</ul>'
-	) );
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'bulk-actions',
-	'title'		=> __('Bulk Actions'),
-	'content'	=>
-		'<p>' . __('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.') . '</p>' .
-				'<p>' . __('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>'
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' =>
+					 '<p>' . __( 'This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.' ) . '</p>',
+		)
+	);
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'screen-content',
+			'title'   => __( 'Screen Content' ),
+			'content' =>
+					 '<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:' ) . '</p>' .
+					 '<ul>' .
+						 '<li>' . __( 'You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.' ) . '</li>' .
+						 '<li>' . __( 'You can filter the list of posts by post status using the text links above the posts list to only show posts with that status. The default view is to show all posts.' ) . '</li>' .
+						 '<li>' . __( 'You can view posts in a simple title list or with an excerpt using the Screen Options tab.' ) . '</li>' .
+						 '<li>' . __( 'You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.' ) . '</li>' .
+					 '</ul>',
+		)
+	);
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'action-links',
+			'title'   => __( 'Available Actions' ),
+			'content' =>
+					 '<p>' . __( 'Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:' ) . '</p>' .
+					 '<ul>' .
+						 '<li>' . __( '<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.' ) . '</li>' .
+						 '<li>' . __( '<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.' ) . '</li>' .
+						 '<li>' . __( '<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.' ) . '</li>' .
+						 '<li>' . __( '<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.' ) . '</li>' .
+					 '</ul>',
+		)
+	);
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'bulk-actions',
+			'title'   => __( 'Bulk Actions' ),
+			'content' =>
+					 '<p>' . __( 'You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.' ) . '</p>' .
+							 '<p>' . __( 'When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.' ) . '</p>',
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Posts_Screen">Documentation on Managing Posts</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/Posts_Screen">Documentation on Managing Posts</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 
 } elseif ( 'page' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'overview',
-	'title'		=> __('Overview'),
-	'content'	=>
-		'<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>'
-	) );
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'managing-pages',
-	'title'		=> __('Managing Pages'),
-	'content'	=>
-		'<p>' . __('Managing pages is very similar to managing posts, and the screens can be customized in the same way.') . '</p>' .
-		'<p>' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.') . '</p>'
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' =>
+					 '<p>' . __( 'Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.' ) . '</p>',
+		)
+	);
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'managing-pages',
+			'title'   => __( 'Managing Pages' ),
+			'content' =>
+					 '<p>' . __( 'Managing pages is very similar to managing posts, and the screens can be customized in the same way.' ) . '</p>' .
+					 '<p>' . __( 'You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.' ) . '</p>',
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen">Documentation on Managing Pages</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/Pages_Screen">Documentation on Managing Pages</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 
 }
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => $post_type_object->labels->filter_items_list,
-	'heading_pagination' => $post_type_object->labels->items_list_navigation,
-	'heading_list'       => $post_type_object->labels->items_list,
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => $post_type_object->labels->filter_items_list,
+		'heading_pagination' => $post_type_object->labels->items_list_navigation,
+		'heading_list'       => $post_type_object->labels->items_list,
+	)
+);
 
-add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) );
+add_screen_option(
+	'per_page', array(
+		'default' => 20,
+		'option'  => 'edit_' . $post_type . '_per_page',
+	)
+);
 
 $bulk_counts = array(
-	'updated'   => isset( $_REQUEST['updated'] )   ? absint( $_REQUEST['updated'] )   : 0,
-	'locked'    => isset( $_REQUEST['locked'] )    ? absint( $_REQUEST['locked'] )    : 0,
-	'deleted'   => isset( $_REQUEST['deleted'] )   ? absint( $_REQUEST['deleted'] )   : 0,
-	'trashed'   => isset( $_REQUEST['trashed'] )   ? absint( $_REQUEST['trashed'] )   : 0,
+	'updated'   => isset( $_REQUEST['updated'] ) ? absint( $_REQUEST['updated'] ) : 0,
+	'locked'    => isset( $_REQUEST['locked'] ) ? absint( $_REQUEST['locked'] ) : 0,
+	'deleted'   => isset( $_REQUEST['deleted'] ) ? absint( $_REQUEST['deleted'] ) : 0,
+	'trashed'   => isset( $_REQUEST['trashed'] ) ? absint( $_REQUEST['trashed'] ) : 0,
 	'untrashed' => isset( $_REQUEST['untrashed'] ) ? absint( $_REQUEST['untrashed'] ) : 0,
 );
 
-$bulk_messages = array();
+$bulk_messages         = array();
 $bulk_messages['post'] = array(
 	'updated'   => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
 	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
@@ -298,14 +334,16 @@ $bulk_messages['page'] = array(
  * @param array $bulk_counts   Array of item counts for each message, used to build internationalized strings.
  */
 $bulk_messages = apply_filters( 'bulk_post_updated_messages', $bulk_messages, $bulk_counts );
-$bulk_counts = array_filter( $bulk_counts );
+$bulk_counts   = array_filter( $bulk_counts );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $post_type_object->labels->name );
-?></h1>
+?>
+</h1>
 
 <?php
 if ( current_user_can( $post_type_object->cap->create_posts ) ) {
@@ -324,19 +362,21 @@ if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
 // If we have a bulk message to issue:
 $messages = array();
 foreach ( $bulk_counts as $message => $count ) {
-	if ( isset( $bulk_messages[ $post_type ][ $message ] ) )
+	if ( isset( $bulk_messages[ $post_type ][ $message ] ) ) {
 		$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
-	elseif ( isset( $bulk_messages['post'][ $message ] ) )
+	} elseif ( isset( $bulk_messages['post'][ $message ] ) ) {
 		$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
+	}
 
 	if ( $message == 'trashed' && isset( $_REQUEST['ids'] ) ) {
-		$ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
-		$messages[] = '<a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a>';
+		$ids        = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
+		$messages[] = '<a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", 'bulk-posts' ) ) . '">' . __( 'Undo' ) . '</a>';
 	}
 }
 
-if ( $messages )
+if ( $messages ) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>' . join( ' ', $messages ) . '</p></div>';
+}
 unset( $messages );
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] );
@@ -348,7 +388,7 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated
 
 <?php $wp_list_table->search_box( $post_type_object->labels->search_items, 'post' ); ?>
 
-<input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
+<input type="hidden" name="post_status" class="post_status_page" value="<?php echo ! empty( $_REQUEST['post_status'] ) ? esc_attr( $_REQUEST['post_status'] ) : 'all'; ?>" />
 <input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
 
 <?php if ( ! empty( $_REQUEST['author'] ) ) { ?>
@@ -364,8 +404,9 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated
 </form>
 
 <?php
-if ( $wp_list_table->has_items() )
+if ( $wp_list_table->has_items() ) {
 	$wp_list_table->inline_edit();
+}
 ?>
 
 <div id="ajax-response"></div>
diff --git a/wp-admin/export.php b/wp-admin/export.php
index c1d4d8b529..89e5d34da6 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -9,12 +9,13 @@
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('export') )
-	wp_die(__('Sorry, you are not allowed to export the content of this site.'));
+if ( ! current_user_can( 'export' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to export the content of this site.' ) );
+}
 
 /** Load WordPress export API */
 require_once( ABSPATH . 'wp-admin/includes/export.php' );
-$title = __('Export');
+$title = __( 'Export' );
 
 /**
  * Display JavaScript on the page.
@@ -25,34 +26,36 @@ function export_add_js() {
 ?>
 <script type="text/javascript">
 	jQuery(document).ready(function($){
- 		var form = $('#export-filters'),
- 			filters = form.find('.export-filters');
- 		filters.hide();
- 		form.find('input:radio').change(function() {
+		 var form = $('#export-filters'),
+			 filters = form.find('.export-filters');
+		 filters.hide();
+		 form.find('input:radio').change(function() {
 			filters.slideUp('fast');
 			switch ( $(this).val() ) {
 				case 'attachment': $('#attachment-filters').slideDown(); break;
 				case 'posts': $('#post-filters').slideDown(); break;
 				case 'pages': $('#page-filters').slideDown(); break;
 			}
- 		});
+		 });
 	});
 </script>
 <?php
 }
 add_action( 'admin_head', 'export_add_js' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.') . '</p>' .
-		'<p>' . __('Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.') . '</p>',
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'You can export a file of your site&#8217;s content in order to import it into another installation or platform. The export file will be an XML file format called WXR. Posts, pages, comments, custom fields, categories, and tags can be included. You can choose for the WXR file to include only certain posts or pages by setting the dropdown filters to limit the export by category, author, date range by month, or publishing status.' ) . '</p>' .
+			'<p>' . __( 'Once generated, your WXR file can be imported by another WordPress site or by another blogging platform able to access this format.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Export_Screen">Documentation on Export</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_Export_Screen">Documentation on Export</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 // If the 'download' URL parameter is set, a WXR export file is baked and returned.
@@ -64,41 +67,45 @@ if ( isset( $_GET['download'] ) ) {
 	} elseif ( 'posts' == $_GET['content'] ) {
 		$args['content'] = 'post';
 
-		if ( $_GET['cat'] )
+		if ( $_GET['cat'] ) {
 			$args['category'] = (int) $_GET['cat'];
+		}
 
-		if ( $_GET['post_author'] )
+		if ( $_GET['post_author'] ) {
 			$args['author'] = (int) $_GET['post_author'];
+		}
 
 		if ( $_GET['post_start_date'] || $_GET['post_end_date'] ) {
 			$args['start_date'] = $_GET['post_start_date'];
-			$args['end_date'] = $_GET['post_end_date'];
+			$args['end_date']   = $_GET['post_end_date'];
 		}
 
-		if ( $_GET['post_status'] )
+		if ( $_GET['post_status'] ) {
 			$args['status'] = $_GET['post_status'];
+		}
 	} elseif ( 'pages' == $_GET['content'] ) {
 		$args['content'] = 'page';
 
-		if ( $_GET['page_author'] )
+		if ( $_GET['page_author'] ) {
 			$args['author'] = (int) $_GET['page_author'];
+		}
 
 		if ( $_GET['page_start_date'] || $_GET['page_end_date'] ) {
 			$args['start_date'] = $_GET['page_start_date'];
-			$args['end_date'] = $_GET['page_end_date'];
+			$args['end_date']   = $_GET['page_end_date'];
 		}
 
-		if ( $_GET['page_status'] )
+		if ( $_GET['page_status'] ) {
 			$args['status'] = $_GET['page_status'];
+		}
 	} elseif ( 'attachment' == $_GET['content'] ) {
 		$args['content'] = 'attachment';
 
 		if ( $_GET['attachment_start_date'] || $_GET['attachment_end_date'] ) {
 			$args['start_date'] = $_GET['attachment_start_date'];
-			$args['end_date'] = $_GET['attachment_end_date'];
+			$args['end_date']   = $_GET['attachment_end_date'];
 		}
-	}
-	else {
+	} else {
 		$args['content'] = $_GET['content'];
 	}
 
@@ -130,20 +137,26 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 function export_date_options( $post_type = 'post' ) {
 	global $wpdb, $wp_locale;
 
-	$months = $wpdb->get_results( $wpdb->prepare( "
+	$months = $wpdb->get_results(
+		$wpdb->prepare(
+			"
 		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 		FROM $wpdb->posts
 		WHERE post_type = %s AND post_status != 'auto-draft'
 		ORDER BY post_date DESC
-	", $post_type ) );
+	", $post_type
+		)
+	);
 
 	$month_count = count( $months );
-	if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+	if ( ! $month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
 		return;
+	}
 
 	foreach ( $months as $date ) {
-		if ( 0 == $date->year )
+		if ( 0 == $date->year ) {
 			continue;
+		}
 
 		$month = zeroise( $date->month, 2 );
 		echo '<option value="' . $date->year . '-' . $month . '">' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';
@@ -154,9 +167,9 @@ function export_date_options( $post_type = 'post' ) {
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
-<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
-<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
-<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site.'); ?></p>
+<p><?php _e( 'When you click the button below WordPress will create an XML file for you to save to your computer.' ); ?></p>
+<p><?php _e( 'This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.' ); ?></p>
+<p><?php _e( 'Once you&#8217;ve saved the download file, you can use the Import function in another WordPress installation to import the content from this site.' ); ?></p>
 
 <h2><?php _e( 'Choose what to export' ); ?></h2>
 <form method="get" id="export-filters">
@@ -170,20 +183,23 @@ function export_date_options( $post_type = 'post' ) {
 <ul id="post-filters" class="export-filters">
 	<li>
 		<label><span class="label-responsive"><?php _e( 'Categories:' ); ?></span>
-		<?php wp_dropdown_categories( array( 'show_option_all' => __('All') ) ); ?>
+		<?php wp_dropdown_categories( array( 'show_option_all' => __( 'All' ) ) ); ?>
 		</label>
 	</li>
 	<li>
 		<label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
 		<?php
 		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'post'" );
-		wp_dropdown_users( array(
-			'include' => $authors,
-			'name' => 'post_author',
-			'multi' => true,
-			'show_option_all' => __( 'All' ),
-			'show' => 'display_name_with_login',
-		) ); ?>
+		wp_dropdown_users(
+			array(
+				'include'         => $authors,
+				'name'            => 'post_author',
+				'multi'           => true,
+				'show_option_all' => __( 'All' ),
+				'show'            => 'display_name_with_login',
+			)
+		);
+		?>
 		</label>
 	</li>
 	<li>
@@ -205,8 +221,10 @@ function export_date_options( $post_type = 'post' ) {
 		<label for="post-status" class="label-responsive"><?php _e( 'Status:' ); ?></label>
 		<select name="post_status" id="post-status">
 			<option value="0"><?php _e( 'All' ); ?></option>
-			<?php $post_stati = get_post_stati( array( 'internal' => false ), 'objects' );
-			foreach ( $post_stati as $status ) : ?>
+			<?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>
@@ -219,13 +237,16 @@ function export_date_options( $post_type = 'post' ) {
 		<label><span class="label-responsive"><?php _e( 'Authors:' ); ?></span>
 		<?php
 		$authors = $wpdb->get_col( "SELECT DISTINCT post_author FROM {$wpdb->posts} WHERE post_type = 'page'" );
-		wp_dropdown_users( array(
-			'include' => $authors,
-			'name' => 'page_author',
-			'multi' => true,
-			'show_option_all' => __( 'All' ),
-			'show' => 'display_name_with_login',
-		) ); ?>
+		wp_dropdown_users(
+			array(
+				'include'         => $authors,
+				'name'            => 'page_author',
+				'multi'           => true,
+				'show_option_all' => __( 'All' ),
+				'show'            => 'display_name_with_login',
+			)
+		);
+		?>
 		</label>
 	</li>
 	<li>
@@ -254,7 +275,14 @@ function export_date_options( $post_type = 'post' ) {
 	</li>
 </ul>
 
-<?php foreach ( get_post_types( array( '_builtin' => false, 'can_export' => true ), 'objects' ) as $post_type ) : ?>
+<?php
+foreach ( get_post_types(
+	array(
+		'_builtin'   => false,
+		'can_export' => true,
+	), '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; ?>
 
@@ -287,7 +315,7 @@ function export_date_options( $post_type = 'post' ) {
 do_action( 'export_filters' );
 ?>
 
-<?php submit_button( __('Download Export File') ); ?>
+<?php submit_button( __( 'Download Export File' ) ); ?>
 </form>
 </div>
 
diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php
index 28c16461b7..e3fd29ff79 100644
--- a/wp-admin/freedoms.php
+++ b/wp-admin/freedoms.php
@@ -42,12 +42,15 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 	<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?></p>
 
-	<p><?php
+	<p>
+	<?php
 
 	$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : __( 'https://wordpress.org/plugins/' );
-	$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
+	$themes_url  = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : __( 'https://wordpress.org/themes/' );
 
-	printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?></p>
+	printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' );
+	?>
+	</p>
 
 	<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
 </div>
diff --git a/wp-admin/import.php b/wp-admin/import.php
index 1aa682ae9b..48051c940e 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -6,7 +6,7 @@
  * @subpackage Administration
  */
 
-define('WP_LOAD_IMPORTERS', true);
+define( 'WP_LOAD_IMPORTERS', true );
 
 /** Load WordPress Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -15,26 +15,28 @@ if ( ! current_user_can( 'import' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to import content.' ) );
 }
 
-$title = __('Import');
+$title = __( 'Import' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
-		'<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.' ) . '</p>' .
+			'<p>' . __( 'In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Import_Screen">Documentation on Import</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_Import_Screen">Documentation on Import</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 if ( current_user_can( 'install_plugins' ) ) {
 	// List of popular importer plugins from the WordPress.org API.
 	$popular_importers = wp_get_popular_importers();
 } else {
- 	$popular_importers = array();
+	$popular_importers = array();
 }
 
 // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
@@ -59,13 +61,15 @@ $parent_file = 'tools.php';
 <h1><?php echo esc_html( $title ); ?></h1>
 <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
 	<div class="error">
-		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php
-			/* translators: %s: importer slug */
-			printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
-		?></p>
+		<p><strong><?php _e( 'ERROR:' ); ?></strong> 
+								<?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; ?>
-<p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p>
+<p><?php _e( 'If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:' ); ?></p>
 
 <?php
 // Registered (already installed) importers. They're stored in the global $wp_importers.
@@ -73,17 +77,23 @@ $importers = get_importers();
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
 foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
+	if ( isset( $importers[ $pop_importer ] ) ) {
 		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
+	}
+	if ( isset( $importers[ $pop_data['importer-id'] ] ) ) {
 		continue;
+	}
 
 	// Fill the array of registered (already installed) importers with data of the popular importers from the WordPress.org API.
-	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
+	$importers[ $pop_data['importer-id'] ] = array(
+		$pop_data['name'],
+		$pop_data['description'],
+		'install' => $pop_data['plugin-slug'],
+	);
 }
 
 if ( empty( $importers ) ) {
-	echo '<p>' . __('No importers are available.') . '</p>'; // TODO: make more helpful
+	echo '<p>' . __( 'No importers are available.' ) . '</p>'; // TODO: make more helpful
 } else {
 	uasort( $importers, '_usort_by_first_member' );
 ?>
@@ -91,7 +101,7 @@ if ( empty( $importers ) ) {
 
 	<?php
 	foreach ( $importers as $importer_id => $data ) {
-		$plugin_slug = $action = '';
+		$plugin_slug         = $action = '';
 		$is_plugin_installed = false;
 
 		if ( isset( $data['install'] ) ) {
@@ -101,14 +111,18 @@ if ( empty( $importers ) ) {
 				// Looks like an importer is installed, but not active.
 				$plugins = get_plugins( '/' . $plugin_slug );
 				if ( ! empty( $plugins ) ) {
-					$keys = array_keys( $plugins );
+					$keys        = array_keys( $plugins );
 					$plugin_file = $plugin_slug . '/' . $keys[0];
-					$url = wp_nonce_url( add_query_arg( array(
-						'action' => 'activate',
-						'plugin' => $plugin_file,
-						'from'   => 'import',
-					), admin_url( 'plugins.php' ) ), 'activate-plugin_' . $plugin_file );
-					$action = sprintf(
+					$url         = wp_nonce_url(
+						add_query_arg(
+							array(
+								'action' => 'activate',
+								'plugin' => $plugin_file,
+								'from'   => 'import',
+							), admin_url( 'plugins.php' )
+						), 'activate-plugin_' . $plugin_file
+					);
+					$action      = sprintf(
 						'<a href="%s" aria-label="%s">%s</a>',
 						esc_url( $url ),
 						/* translators: %s: Importer name */
@@ -122,11 +136,15 @@ if ( empty( $importers ) ) {
 
 			if ( empty( $action ) ) {
 				if ( is_main_site() ) {
-					$url = wp_nonce_url( add_query_arg( array(
-						'action' => 'install-plugin',
-						'plugin' => $plugin_slug,
-						'from'   => 'import',
-					), self_admin_url( 'update.php' ) ), 'install-plugin_' . $plugin_slug );
+					$url    = wp_nonce_url(
+						add_query_arg(
+							array(
+								'action' => 'install-plugin',
+								'plugin' => $plugin_slug,
+								'from'   => 'import',
+							), 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>',
 						esc_url( $url ),
@@ -145,9 +163,11 @@ if ( empty( $importers ) ) {
 				}
 			}
 		} else {
-			$url = add_query_arg( array(
-				'import' => $importer_id,
-			), self_admin_url( 'admin.php' ) );
+			$url    = add_query_arg(
+				array(
+					'import' => $importer_id,
+				), self_admin_url( 'admin.php' )
+			);
 			$action = sprintf(
 				'<a href="%1$s" aria-label="%2$s">%3$s</a>',
 				esc_url( $url ),
@@ -160,14 +180,16 @@ if ( empty( $importers ) ) {
 		}
 
 		if ( ! $is_plugin_installed && is_main_site() ) {
-			$url = add_query_arg( array(
-				'tab'       => 'plugin-information',
-				'plugin'    => $plugin_slug,
-				'from'      => 'import',
-				'TB_iframe' => 'true',
-				'width'     => 600,
-				'height'    => 550,
-			), network_admin_url( 'plugin-install.php' ) );
+			$url     = add_query_arg(
+				array(
+					'tab'       => 'plugin-information',
+					'plugin'    => $plugin_slug,
+					'from'      => 'import',
+					'TB_iframe' => 'true',
+					'width'     => 600,
+					'height'    => 550,
+				), 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>',
 				esc_url( $url ),
@@ -193,8 +215,9 @@ if ( empty( $importers ) ) {
 <?php
 }
 
-if ( current_user_can('install_plugins') )
-	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+if ( current_user_can( 'install_plugins' ) ) {
+	echo '<p>' . sprintf( __( 'If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.' ), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+}
 ?>
 
 </div>
diff --git a/wp-admin/includes/admin-filters.php b/wp-admin/includes/admin-filters.php
index 79751a4ef6..62e6c4cfc4 100644
--- a/wp-admin/includes/admin-filters.php
+++ b/wp-admin/includes/admin-filters.php
@@ -19,16 +19,16 @@ add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata'
 add_action( 'media_upload_image', 'wp_media_upload_handler' );
 add_action( 'media_upload_audio', 'wp_media_upload_handler' );
 add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_action( 'media_upload_file', 'wp_media_upload_handler' );
 
 add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
 
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass'  );
+add_action( 'post-html-upload-ui', 'media_upload_html_bypass' );
 
 add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
 add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
 add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
+add_filter( 'async_upload_file', 'get_media_item', 10, 2 );
 
 add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
 
@@ -38,33 +38,33 @@ add_filter( 'media_upload_library', 'media_upload_library' );
 add_filter( 'media_upload_tabs', 'update_gallery_tab' );
 
 // Misc hooks.
-add_action( 'admin_init', 'wp_admin_headers'         );
-add_action( 'login_init', 'wp_admin_headers'         );
-add_action( 'admin_head', 'wp_admin_canonical_url'   );
+add_action( 'admin_init', 'wp_admin_headers' );
+add_action( 'login_init', 'wp_admin_headers' );
+add_action( 'admin_head', 'wp_admin_canonical_url' );
 add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_head', 'wp_site_icon'             );
-add_action( 'admin_head', '_ipad_meta'               );
+add_action( 'admin_head', 'wp_site_icon' );
+add_action( 'admin_head', '_ipad_meta' );
 
 // Prerendering.
 if ( ! is_customize_preview() ) {
 	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
 }
 
-add_action( 'admin_print_scripts-post.php',     'wp_page_reload_on_back_button_js' );
+add_action( 'admin_print_scripts-post.php', 'wp_page_reload_on_back_button_js' );
 add_action( 'admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js' );
 
-add_action( 'update_option_home',          'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl',       'update_home_siteurl', 10, 2 );
+add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
+add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
 add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
-add_action( 'update_option_admin_email',   'wp_site_admin_email_change_notification', 10, 3 );
+add_action( 'update_option_admin_email', 'wp_site_admin_email_change_notification', 10, 3 );
 
-add_action( 'add_option_new_admin_email',    'update_option_new_admin_email', 10, 2 );
+add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
 add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
 
-add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10,  3 );
-add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 );
+add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
+add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3 );
+add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
 
 add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
 
@@ -75,19 +75,19 @@ add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' )
 add_filter( 'whitelist_options', 'option_update_filter' );
 
 // Plugin Install hooks.
-add_action( 'install_plugins_featured',               'install_dashboard' );
-add_action( 'install_plugins_upload',                 'install_plugins_upload' );
-add_action( 'install_plugins_search',                 'display_plugins_table' );
-add_action( 'install_plugins_popular',                'display_plugins_table' );
-add_action( 'install_plugins_recommended',            'display_plugins_table' );
-add_action( 'install_plugins_new',                    'display_plugins_table' );
-add_action( 'install_plugins_beta',                   'display_plugins_table' );
-add_action( 'install_plugins_favorites',              'display_plugins_table' );
+add_action( 'install_plugins_featured', 'install_dashboard' );
+add_action( 'install_plugins_upload', 'install_plugins_upload' );
+add_action( 'install_plugins_search', 'display_plugins_table' );
+add_action( 'install_plugins_popular', 'display_plugins_table' );
+add_action( 'install_plugins_recommended', 'display_plugins_table' );
+add_action( 'install_plugins_new', 'display_plugins_table' );
+add_action( 'install_plugins_beta', 'display_plugins_table' );
+add_action( 'install_plugins_favorites', 'display_plugins_table' );
 add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
 
 // Template hooks.
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
-add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
+add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
+add_action( 'user_register', array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
 
 // Theme hooks.
 add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
@@ -115,7 +115,7 @@ add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
 add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
 add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
 
-add_action( 'admin_notices', 'update_nag',      3  );
+add_action( 'admin_notices', 'update_nag', 3 );
 add_action( 'admin_notices', 'maintenance_nag', 10 );
 
 add_filter( 'update_footer', 'core_update_footer' );
diff --git a/wp-admin/includes/admin.php b/wp-admin/includes/admin.php
index ee197714ad..af4f7cc04c 100644
--- a/wp-admin/includes/admin.php
+++ b/wp-admin/includes/admin.php
@@ -7,7 +7,7 @@
  * @since 2.3.0
  */
 
-if ( ! defined('WP_ADMIN') ) {
+if ( ! defined( 'WP_ADMIN' ) ) {
 	/*
 	 * This file is being included from a file other than wp-admin/admin.php, so
 	 * some setup was skipped. Make sure the admin message catalog is loaded since
@@ -17,71 +17,71 @@ if ( ! defined('WP_ADMIN') ) {
 }
 
 /** WordPress Administration Hooks */
-require_once(ABSPATH . 'wp-admin/includes/admin-filters.php');
+require_once( ABSPATH . 'wp-admin/includes/admin-filters.php' );
 
 /** WordPress Bookmark Administration API */
-require_once(ABSPATH . 'wp-admin/includes/bookmark.php');
+require_once( ABSPATH . 'wp-admin/includes/bookmark.php' );
 
 /** WordPress Comment Administration API */
-require_once(ABSPATH . 'wp-admin/includes/comment.php');
+require_once( ABSPATH . 'wp-admin/includes/comment.php' );
 
 /** WordPress Administration File API */
-require_once(ABSPATH . 'wp-admin/includes/file.php');
+require_once( ABSPATH . 'wp-admin/includes/file.php' );
 
 /** WordPress Image Administration API */
-require_once(ABSPATH . 'wp-admin/includes/image.php');
+require_once( ABSPATH . 'wp-admin/includes/image.php' );
 
 /** WordPress Media Administration API */
-require_once(ABSPATH . 'wp-admin/includes/media.php');
+require_once( ABSPATH . 'wp-admin/includes/media.php' );
 
 /** WordPress Import Administration API */
-require_once(ABSPATH . 'wp-admin/includes/import.php');
+require_once( ABSPATH . 'wp-admin/includes/import.php' );
 
 /** WordPress Misc Administration API */
-require_once(ABSPATH . 'wp-admin/includes/misc.php');
+require_once( ABSPATH . 'wp-admin/includes/misc.php' );
 
 /** WordPress Options Administration API */
-require_once(ABSPATH . 'wp-admin/includes/options.php');
+require_once( ABSPATH . 'wp-admin/includes/options.php' );
 
 /** WordPress Plugin Administration API */
-require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 
 /** WordPress Post Administration API */
-require_once(ABSPATH . 'wp-admin/includes/post.php');
+require_once( ABSPATH . 'wp-admin/includes/post.php' );
 
 /** WordPress Administration Screen API */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-screen.php');
-require_once(ABSPATH . 'wp-admin/includes/screen.php');
+require_once( ABSPATH . 'wp-admin/includes/class-wp-screen.php' );
+require_once( ABSPATH . 'wp-admin/includes/screen.php' );
 
 /** WordPress Taxonomy Administration API */
-require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');
+require_once( ABSPATH . 'wp-admin/includes/taxonomy.php' );
 
 /** WordPress Template Administration API */
-require_once(ABSPATH . 'wp-admin/includes/template.php');
+require_once( ABSPATH . 'wp-admin/includes/template.php' );
 
 /** WordPress List Table Administration API and base class */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
-require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table-compat.php');
-require_once(ABSPATH . 'wp-admin/includes/list-table.php');
+require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table-compat.php' );
+require_once( ABSPATH . 'wp-admin/includes/list-table.php' );
 
 /** WordPress Theme Administration API */
-require_once(ABSPATH . 'wp-admin/includes/theme.php');
+require_once( ABSPATH . 'wp-admin/includes/theme.php' );
 
 /** WordPress User Administration API */
-require_once(ABSPATH . 'wp-admin/includes/user.php');
+require_once( ABSPATH . 'wp-admin/includes/user.php' );
 
 /** WordPress Site Icon API */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
+require_once( ABSPATH . 'wp-admin/includes/class-wp-site-icon.php' );
 
 /** WordPress Update Administration API */
-require_once(ABSPATH . 'wp-admin/includes/update.php');
+require_once( ABSPATH . 'wp-admin/includes/update.php' );
 
 /** WordPress Deprecated Administration API */
-require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
+require_once( ABSPATH . 'wp-admin/includes/deprecated.php' );
 
 /** WordPress Multisite support API */
 if ( is_multisite() ) {
-	require_once(ABSPATH . 'wp-admin/includes/ms-admin-filters.php');
-	require_once(ABSPATH . 'wp-admin/includes/ms.php');
-	require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php');
+	require_once( ABSPATH . 'wp-admin/includes/ms-admin-filters.php' );
+	require_once( ABSPATH . 'wp-admin/includes/ms.php' );
+	require_once( ABSPATH . 'wp-admin/includes/ms-deprecated.php' );
 }
diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php
index 230da6a958..e05ec0a273 100644
--- a/wp-admin/includes/ajax-actions.php
+++ b/wp-admin/includes/ajax-actions.php
@@ -23,12 +23,13 @@ function wp_ajax_nopriv_heartbeat() {
 	$response = array();
 
 	// screen_id is the same as $current_screen->id and the JS global 'pagenow'.
-	if ( ! empty($_POST['screen_id']) )
-		$screen_id = sanitize_key($_POST['screen_id']);
-	else
+	if ( ! empty( $_POST['screen_id'] ) ) {
+		$screen_id = sanitize_key( $_POST['screen_id'] );
+	} else {
 		$screen_id = 'front';
+	}
 
-	if ( ! empty($_POST['data']) ) {
+	if ( ! empty( $_POST['data'] ) ) {
 		$data = wp_unslash( (array) $_POST['data'] );
 
 		/**
@@ -68,7 +69,7 @@ function wp_ajax_nopriv_heartbeat() {
 	// Send the current time according to the server.
 	$response['server_time'] = time();
 
-	wp_send_json($response);
+	wp_send_json( $response );
 }
 
 //
@@ -109,7 +110,7 @@ function wp_ajax_ajax_tag_search() {
 	}
 
 	$taxonomy = sanitize_key( $_GET['tax'] );
-	$tax = get_taxonomy( $taxonomy );
+	$tax      = get_taxonomy( $taxonomy );
 	if ( ! $tax ) {
 		wp_die( 0 );
 	}
@@ -121,11 +122,12 @@ function wp_ajax_ajax_tag_search() {
 	$s = wp_unslash( $_GET['q'] );
 
 	$comma = _x( ',', 'tag delimiter' );
-	if ( ',' !== $comma )
+	if ( ',' !== $comma ) {
 		$s = str_replace( $comma, ',', $s );
+	}
 	if ( false !== strpos( $s, ',' ) ) {
 		$s = explode( ',', $s );
-		$s = $s[count( $s ) - 1];
+		$s = $s[ count( $s ) - 1 ];
 	}
 	$s = trim( $s );
 
@@ -144,11 +146,17 @@ function wp_ajax_ajax_tag_search() {
 	 * Require $term_search_min_chars chars for matching (default: 2)
 	 * ensure it's a non-negative, non-zero integer.
 	 */
-	if ( ( $term_search_min_chars == 0 ) || ( strlen( $s ) < $term_search_min_chars ) ){
+	if ( ( $term_search_min_chars == 0 ) || ( strlen( $s ) < $term_search_min_chars ) ) {
 		wp_die();
 	}
 
-	$results = get_terms( $taxonomy, array( 'name__like' => $s, 'fields' => 'names', 'hide_empty' => false ) );
+	$results = get_terms(
+		$taxonomy, array(
+			'name__like' => $s,
+			'fields'     => 'names',
+			'hide_empty' => false,
+		)
+	);
 
 	echo join( $results, "\n" );
 	wp_die();
@@ -160,33 +168,35 @@ function wp_ajax_ajax_tag_search() {
  * @since 3.1.0
  */
 function wp_ajax_wp_compression_test() {
-	if ( !current_user_can( 'manage_options' ) )
+	if ( ! current_user_can( 'manage_options' ) ) {
 		wp_die( -1 );
+	}
 
-	if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') ) {
-		update_site_option('can_compress_scripts', 0);
+	if ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' == ini_get( 'output_handler' ) ) {
+		update_site_option( 'can_compress_scripts', 0 );
 		wp_die( 0 );
 	}
 
-	if ( isset($_GET['test']) ) {
+	if ( isset( $_GET['test'] ) ) {
 		header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
 		header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
 		header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
-		header('Content-Type: application/javascript; charset=UTF-8');
-		$force_gzip = ( defined('ENFORCE_GZIP') && ENFORCE_GZIP );
-		$test_str = '"wpCompressionTest Lorem ipsum dolor sit amet consectetuer mollis sapien urna ut a. Eu nonummy condimentum fringilla tempor pretium platea vel nibh netus Maecenas. Hac molestie amet justo quis pellentesque est ultrices interdum nibh Morbi. Cras mattis pretium Phasellus ante ipsum ipsum ut sociis Suspendisse Lorem. Ante et non molestie. Porta urna Vestibulum egestas id congue nibh eu risus gravida sit. Ac augue auctor Ut et non a elit massa id sodales. Elit eu Nulla at nibh adipiscing mattis lacus mauris at tempus. Netus nibh quis suscipit nec feugiat eget sed lorem et urna. Pellentesque lacus at ut massa consectetuer ligula ut auctor semper Pellentesque. Ut metus massa nibh quam Curabitur molestie nec mauris congue. Volutpat molestie elit justo facilisis neque ac risus Ut nascetur tristique. Vitae sit lorem tellus et quis Phasellus lacus tincidunt nunc Fusce. Pharetra wisi Suspendisse mus sagittis libero lacinia Integer consequat ac Phasellus. Et urna ac cursus tortor aliquam Aliquam amet tellus volutpat Vestibulum. Justo interdum condimentum In augue congue tellus sollicitudin Quisque quis nibh."';
+		header( 'Content-Type: application/javascript; charset=UTF-8' );
+		$force_gzip = ( defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP );
+		$test_str   = '"wpCompressionTest Lorem ipsum dolor sit amet consectetuer mollis sapien urna ut a. Eu nonummy condimentum fringilla tempor pretium platea vel nibh netus Maecenas. Hac molestie amet justo quis pellentesque est ultrices interdum nibh Morbi. Cras mattis pretium Phasellus ante ipsum ipsum ut sociis Suspendisse Lorem. Ante et non molestie. Porta urna Vestibulum egestas id congue nibh eu risus gravida sit. Ac augue auctor Ut et non a elit massa id sodales. Elit eu Nulla at nibh adipiscing mattis lacus mauris at tempus. Netus nibh quis suscipit nec feugiat eget sed lorem et urna. Pellentesque lacus at ut massa consectetuer ligula ut auctor semper Pellentesque. Ut metus massa nibh quam Curabitur molestie nec mauris congue. Volutpat molestie elit justo facilisis neque ac risus Ut nascetur tristique. Vitae sit lorem tellus et quis Phasellus lacus tincidunt nunc Fusce. Pharetra wisi Suspendisse mus sagittis libero lacinia Integer consequat ac Phasellus. Et urna ac cursus tortor aliquam Aliquam amet tellus volutpat Vestibulum. Justo interdum condimentum In augue congue tellus sollicitudin Quisque quis nibh."';
 
 		if ( 1 == $_GET['test'] ) {
-		 	echo $test_str;
-		 	wp_die();
+			echo $test_str;
+			wp_die();
 		} elseif ( 2 == $_GET['test'] ) {
-			if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
+			if ( ! isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
 				wp_die( -1 );
-			if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
-				header('Content-Encoding: deflate');
+			}
+			if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) {
+				header( 'Content-Encoding: deflate' );
 				$out = gzdeflate( $test_str, 1 );
-			} elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
-				header('Content-Encoding: gzip');
+			} elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) {
+				header( 'Content-Encoding: gzip' );
 				$out = gzencode( $test_str, 1 );
 			} else {
 				wp_die( -1 );
@@ -195,10 +205,10 @@ function wp_ajax_wp_compression_test() {
 			wp_die();
 		} elseif ( 'no' == $_GET['test'] ) {
 			check_ajax_referer( 'update_can_compress_scripts' );
-			update_site_option('can_compress_scripts', 0);
+			update_site_option( 'can_compress_scripts', 0 );
 		} elseif ( 'yes' == $_GET['test'] ) {
 			check_ajax_referer( 'update_can_compress_scripts' );
-			update_site_option('can_compress_scripts', 1);
+			update_site_option( 'can_compress_scripts', 1 );
 		}
 	}
 
@@ -211,15 +221,17 @@ function wp_ajax_wp_compression_test() {
  * @since 3.1.0
  */
 function wp_ajax_imgedit_preview() {
-	$post_id = intval($_GET['postid']);
-	if ( empty($post_id) || !current_user_can('edit_post', $post_id) )
+	$post_id = intval( $_GET['postid'] );
+	if ( empty( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
 		wp_die( -1 );
+	}
 
 	check_ajax_referer( "image_editor-$post_id" );
 
 	include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
-	if ( ! stream_preview_image($post_id) )
+	if ( ! stream_preview_image( $post_id ) ) {
 		wp_die( -1 );
+	}
 
 	wp_die();
 }
@@ -242,12 +254,14 @@ function wp_ajax_oembed_cache() {
  * @since 3.4.0
  */
 function wp_ajax_autocomplete_user() {
-	if ( ! is_multisite() || ! current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) )
+	if ( ! is_multisite() || ! current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) ) {
 		wp_die( -1 );
+	}
 
 	/** This filter is documented in wp-admin/user-new.php */
-	if ( ! current_user_can( 'manage_network_users' ) && ! apply_filters( 'autocomplete_users_for_site_admins', false ) )
+	if ( ! current_user_can( 'manage_network_users' ) && ! apply_filters( 'autocomplete_users_for_site_admins', false ) ) {
 		wp_die( -1 );
+	}
 
 	$return = array();
 
@@ -274,16 +288,28 @@ function wp_ajax_autocomplete_user() {
 		$id = get_current_blog_id();
 	}
 
-	$include_blog_users = ( $type == 'search' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
-	$exclude_blog_users = ( $type == 'add' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
+	$include_blog_users = ( $type == 'search' ? get_users(
+		array(
+			'blog_id' => $id,
+			'fields'  => 'ID',
+		)
+	) : array() );
+	$exclude_blog_users = ( $type == 'add' ? get_users(
+		array(
+			'blog_id' => $id,
+			'fields'  => 'ID',
+		)
+	) : array() );
 
-	$users = get_users( array(
-		'blog_id' => false,
-		'search'  => '*' . $_REQUEST['term'] . '*',
-		'include' => $include_blog_users,
-		'exclude' => $exclude_blog_users,
-		'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
-	) );
+	$users = get_users(
+		array(
+			'blog_id'        => false,
+			'search'         => '*' . $_REQUEST['term'] . '*',
+			'include'        => $include_blog_users,
+			'exclude'        => $exclude_blog_users,
+			'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
+		)
+	);
 
 	foreach ( $users as $user ) {
 		$return[] = array(
@@ -315,9 +341,11 @@ function wp_ajax_get_community_events() {
 	$ip_changed     = false;
 
 	if ( is_wp_error( $events ) ) {
-		wp_send_json_error( array(
-			'error' => $events->get_error_message(),
-		) );
+		wp_send_json_error(
+			array(
+				'error' => $events->get_error_message(),
+			)
+		);
 	} else {
 		if ( empty( $saved_location['ip'] ) && ! empty( $events['location']['ip'] ) ) {
 			$ip_changed = true;
@@ -360,7 +388,7 @@ function wp_ajax_dashboard_widgets() {
 	}
 
 	switch ( $_GET['widget'] ) {
-		case 'dashboard_primary' :
+		case 'dashboard_primary':
 			wp_dashboard_primary();
 			break;
 	}
@@ -392,10 +420,10 @@ function wp_ajax_logged_in() {
  * @param int $delta
  */
 function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
-	$total    = isset( $_POST['_total'] )    ? (int) $_POST['_total']    : 0;
+	$total    = isset( $_POST['_total'] ) ? (int) $_POST['_total'] : 0;
 	$per_page = isset( $_POST['_per_page'] ) ? (int) $_POST['_per_page'] : 0;
-	$page     = isset( $_POST['_page'] )     ? (int) $_POST['_page']     : 0;
-	$url      = isset( $_POST['_url'] )      ? esc_url_raw( $_POST['_url'] ) : '';
+	$page     = isset( $_POST['_page'] ) ? (int) $_POST['_page'] : 0;
+	$url      = isset( $_POST['_url'] ) ? esc_url_raw( $_POST['_url'] ) : '';
 
 	// JS didn't send us everything we need to know. Just die with success message
 	if ( ! $total || ! $per_page || ! $page || ! $url ) {
@@ -414,32 +442,35 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
 
 		$counts = wp_count_comments();
 
-		$x = new WP_Ajax_Response( array(
-			'what' => 'comment',
-			// Here for completeness - not used.
-			'id' => $comment_id,
-			'supplemental' => array(
-				'status' => $comment_status,
-				'postId' => $comment ? $comment->comment_post_ID : '',
-				'time' => $time,
-				'in_moderation' => $counts->moderated,
-				'i18n_comments_text' => sprintf(
-					_n( '%s Comment', '%s Comments', $counts->approved ),
-					number_format_i18n( $counts->approved )
+		$x = new WP_Ajax_Response(
+			array(
+				'what'         => 'comment',
+				// Here for completeness - not used.
+				'id'           => $comment_id,
+				'supplemental' => array(
+					'status'               => $comment_status,
+					'postId'               => $comment ? $comment->comment_post_ID : '',
+					'time'                 => $time,
+					'in_moderation'        => $counts->moderated,
+					'i18n_comments_text'   => sprintf(
+						_n( '%s Comment', '%s Comments', $counts->approved ),
+						number_format_i18n( $counts->approved )
+					),
+					'i18n_moderation_text' => sprintf(
+						_nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
+						number_format_i18n( $counts->moderated )
+					),
+					'comment_link'         => $comment_link,
 				),
-				'i18n_moderation_text' => sprintf(
-					_nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
-					number_format_i18n( $counts->moderated )
-				),
-				'comment_link' => $comment_link,
 			)
-		) );
+		);
 		$x->send();
 	}
 
 	$total += $delta;
-	if ( $total < 0 )
+	if ( $total < 0 ) {
 		$total = 0;
+	}
 
 	// Only do the expensive stuff on a page-break, and about 1 other time per page
 	if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) {
@@ -449,17 +480,20 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
 		$parsed = parse_url( $url );
 		if ( isset( $parsed['query'] ) ) {
 			parse_str( $parsed['query'], $query_vars );
-			if ( !empty( $query_vars['comment_status'] ) )
+			if ( ! empty( $query_vars['comment_status'] ) ) {
 				$status = $query_vars['comment_status'];
-			if ( !empty( $query_vars['p'] ) )
+			}
+			if ( ! empty( $query_vars['p'] ) ) {
 				$post_id = (int) $query_vars['p'];
-			if ( ! empty( $query_vars['comment_type'] ) )
+			}
+			if ( ! empty( $query_vars['comment_type'] ) ) {
 				$type = $query_vars['comment_type'];
+			}
 		}
 
 		if ( empty( $type ) ) {
 			// Only use the comment count if not filtering by a comment_type.
-			$comment_count = wp_count_comments($post_id);
+			$comment_count = wp_count_comments( $post_id );
 
 			// We're looking for a known type of comment count.
 			if ( isset( $comment_count->$status ) ) {
@@ -470,23 +504,25 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
 	}
 
 	// The time since the last comment count.
-	$time = time();
+	$time    = time();
 	$comment = get_comment( $comment_id );
 
-	$x = new WP_Ajax_Response( array(
-		'what' => 'comment',
-		// Here for completeness - not used.
-		'id' => $comment_id,
-		'supplemental' => array(
-			'status' => $comment ? $comment->comment_approved : '',
-			'postId' => $comment ? $comment->comment_post_ID : '',
-			'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
-			'total_pages' => ceil( $total / $per_page ),
-			'total_pages_i18n' => number_format_i18n( ceil( $total / $per_page ) ),
-			'total' => $total,
-			'time' => $time
+	$x = new WP_Ajax_Response(
+		array(
+			'what'         => 'comment',
+			// Here for completeness - not used.
+			'id'           => $comment_id,
+			'supplemental' => array(
+				'status'           => $comment ? $comment->comment_approved : '',
+				'postId'           => $comment ? $comment->comment_post_ID : '',
+				'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
+				'total_pages'      => ceil( $total / $per_page ),
+				'total_pages_i18n' => number_format_i18n( ceil( $total / $per_page ) ),
+				'total'            => $total,
+				'time'             => $time,
+			),
 		)
-	) );
+	);
 	$x->send();
 }
 
@@ -501,27 +537,31 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
  * @since 3.1.0
  */
 function _wp_ajax_add_hierarchical_term() {
-	$action = $_POST['action'];
-	$taxonomy = get_taxonomy(substr($action, 4));
+	$action   = $_POST['action'];
+	$taxonomy = get_taxonomy( substr( $action, 4 ) );
 	check_ajax_referer( $action, '_ajax_nonce-add-' . $taxonomy->name );
-	if ( !current_user_can( $taxonomy->cap->edit_terms ) )
+	if ( ! current_user_can( $taxonomy->cap->edit_terms ) ) {
 		wp_die( -1 );
-	$names = explode(',', $_POST['new'.$taxonomy->name]);
-	$parent = isset($_POST['new'.$taxonomy->name.'_parent']) ? (int) $_POST['new'.$taxonomy->name.'_parent'] : 0;
-	if ( 0 > $parent )
+	}
+	$names  = explode( ',', $_POST[ 'new' . $taxonomy->name ] );
+	$parent = isset( $_POST[ 'new' . $taxonomy->name . '_parent' ] ) ? (int) $_POST[ 'new' . $taxonomy->name . '_parent' ] : 0;
+	if ( 0 > $parent ) {
 		$parent = 0;
-	if ( $taxonomy->name == 'category' )
-		$post_category = isset($_POST['post_category']) ? (array) $_POST['post_category'] : array();
-	else
-		$post_category = ( isset($_POST['tax_input']) && isset($_POST['tax_input'][$taxonomy->name]) ) ? (array) $_POST['tax_input'][$taxonomy->name] : array();
+	}
+	if ( $taxonomy->name == 'category' ) {
+		$post_category = isset( $_POST['post_category'] ) ? (array) $_POST['post_category'] : array();
+	} else {
+		$post_category = ( isset( $_POST['tax_input'] ) && isset( $_POST['tax_input'][ $taxonomy->name ] ) ) ? (array) $_POST['tax_input'][ $taxonomy->name ] : array();
+	}
 	$checked_categories = array_map( 'absint', (array) $post_category );
-	$popular_ids = wp_popular_terms_checklist($taxonomy->name, 0, 10, false);
+	$popular_ids        = wp_popular_terms_checklist( $taxonomy->name, 0, 10, false );
 
 	foreach ( $names as $cat_name ) {
-		$cat_name = trim($cat_name);
-		$category_nicename = sanitize_title($cat_name);
-		if ( '' === $category_nicename )
+		$cat_name          = trim( $cat_name );
+		$category_nicename = sanitize_title( $cat_name );
+		if ( '' === $category_nicename ) {
 			continue;
+		}
 
 		$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
 		if ( ! $cat_id || is_wp_error( $cat_id ) ) {
@@ -530,54 +570,76 @@ function _wp_ajax_add_hierarchical_term() {
 			$cat_id = $cat_id['term_id'];
 		}
 		$checked_categories[] = $cat_id;
-		if ( $parent ) // Do these all at once in a second
+		if ( $parent ) { // Do these all at once in a second
 			continue;
+		}
 
 		ob_start();
 
-		wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids ));
+		wp_terms_checklist(
+			0, array(
+				'taxonomy'             => $taxonomy->name,
+				'descendants_and_self' => $cat_id,
+				'selected_cats'        => $checked_categories,
+				'popular_cats'         => $popular_ids,
+			)
+		);
 
 		$data = ob_get_clean();
 
 		$add = array(
-			'what' => $taxonomy->name,
-			'id' => $cat_id,
-			'data' => str_replace( array("\n", "\t"), '', $data),
-			'position' => -1
+			'what'     => $taxonomy->name,
+			'id'       => $cat_id,
+			'data'     => str_replace( array( "\n", "\t" ), '', $data ),
+			'position' => -1,
 		);
 	}
 
 	if ( $parent ) { // Foncy - replace the parent and all its children
-		$parent = get_term( $parent, $taxonomy->name );
+		$parent  = get_term( $parent, $taxonomy->name );
 		$term_id = $parent->term_id;
 
 		while ( $parent->parent ) { // get the top parent
 			$parent = get_term( $parent->parent, $taxonomy->name );
-			if ( is_wp_error( $parent ) )
+			if ( is_wp_error( $parent ) ) {
 				break;
+			}
 			$term_id = $parent->term_id;
 		}
 
 		ob_start();
 
-		wp_terms_checklist( 0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids));
+		wp_terms_checklist(
+			0, array(
+				'taxonomy'             => $taxonomy->name,
+				'descendants_and_self' => $term_id,
+				'selected_cats'        => $checked_categories,
+				'popular_cats'         => $popular_ids,
+			)
+		);
 
 		$data = ob_get_clean();
 
 		$add = array(
-			'what' => $taxonomy->name,
-			'id' => $term_id,
-			'data' => str_replace( array("\n", "\t"), '', $data),
-			'position' => -1
+			'what'     => $taxonomy->name,
+			'id'       => $term_id,
+			'data'     => str_replace( array( "\n", "\t" ), '', $data ),
+			'position' => -1,
 		);
 	}
 
 	ob_start();
 
-	wp_dropdown_categories( array(
-		'taxonomy' => $taxonomy->name, 'hide_empty' => 0, 'name' => 'new'.$taxonomy->name.'_parent', 'orderby' => 'name',
-		'hierarchical' => 1, 'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;'
-	) );
+	wp_dropdown_categories(
+		array(
+			'taxonomy'         => $taxonomy->name,
+			'hide_empty'       => 0,
+			'name'             => 'new' . $taxonomy->name . '_parent',
+			'orderby'          => 'name',
+			'hierarchical'     => 1,
+			'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+		)
+	);
 
 	$sup = ob_get_clean();
 
@@ -595,43 +657,52 @@ function _wp_ajax_add_hierarchical_term() {
 function wp_ajax_delete_comment() {
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
-	if ( !$comment = get_comment( $id ) )
+	if ( ! $comment = get_comment( $id ) ) {
 		wp_die( time() );
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) )
+	}
+	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
 		wp_die( -1 );
+	}
 
 	check_ajax_referer( "delete-comment_$id" );
 	$status = wp_get_comment_status( $comment );
 
 	$delta = -1;
-	if ( isset($_POST['trash']) && 1 == $_POST['trash'] ) {
-		if ( 'trash' == $status )
+	if ( isset( $_POST['trash'] ) && 1 == $_POST['trash'] ) {
+		if ( 'trash' == $status ) {
 			wp_die( time() );
+		}
 		$r = wp_trash_comment( $comment );
-	} elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) {
-		if ( 'trash' != $status )
+	} elseif ( isset( $_POST['untrash'] ) && 1 == $_POST['untrash'] ) {
+		if ( 'trash' != $status ) {
 			wp_die( time() );
+		}
 		$r = wp_untrash_comment( $comment );
-		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) // undo trash, not in trash
+		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) { // undo trash, not in trash
 			$delta = 1;
-	} elseif ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
-		if ( 'spam' == $status )
+		}
+	} elseif ( isset( $_POST['spam'] ) && 1 == $_POST['spam'] ) {
+		if ( 'spam' == $status ) {
 			wp_die( time() );
+		}
 		$r = wp_spam_comment( $comment );
-	} elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) {
-		if ( 'spam' != $status )
+	} elseif ( isset( $_POST['unspam'] ) && 1 == $_POST['unspam'] ) {
+		if ( 'spam' != $status ) {
 			wp_die( time() );
+		}
 		$r = wp_unspam_comment( $comment );
-		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) // undo spam, not in spam
+		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) { // undo spam, not in spam
 			$delta = 1;
-	} elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) {
+		}
+	} elseif ( isset( $_POST['delete'] ) && 1 == $_POST['delete'] ) {
 		$r = wp_delete_comment( $comment );
 	} else {
 		wp_die( -1 );
 	}
 
-	if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+	if ( $r ) { // Decide if we need to send back '1' or a more complicated response including page links and comment counts
 		_wp_ajax_delete_comment_response( $comment->comment_ID, $delta );
+	}
 	wp_die( 0 );
 }
 
@@ -648,15 +719,17 @@ function wp_ajax_delete_tag() {
 		wp_die( -1 );
 	}
 
-	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
-	$tag = get_term( $tag_id, $taxonomy );
-	if ( !$tag || is_wp_error( $tag ) )
+	$taxonomy = ! empty( $_POST['taxonomy'] ) ? $_POST['taxonomy'] : 'post_tag';
+	$tag      = get_term( $tag_id, $taxonomy );
+	if ( ! $tag || is_wp_error( $tag ) ) {
 		wp_die( 1 );
+	}
 
-	if ( wp_delete_term($tag_id, $taxonomy))
+	if ( wp_delete_term( $tag_id, $taxonomy ) ) {
 		wp_die( 1 );
-	else
+	} else {
 		wp_die( 0 );
+	}
 }
 
 /**
@@ -668,17 +741,20 @@ function wp_ajax_delete_link() {
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "delete-bookmark_$id" );
-	if ( !current_user_can( 'manage_links' ) )
+	if ( ! current_user_can( 'manage_links' ) ) {
 		wp_die( -1 );
+	}
 
 	$link = get_bookmark( $id );
-	if ( !$link || is_wp_error( $link ) )
+	if ( ! $link || is_wp_error( $link ) ) {
 		wp_die( 1 );
+	}
 
-	if ( wp_delete_link( $id ) )
+	if ( wp_delete_link( $id ) ) {
 		wp_die( 1 );
-	else
+	} else {
 		wp_die( 0 );
+	}
 }
 
 /**
@@ -690,13 +766,16 @@ function wp_ajax_delete_meta() {
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "delete-meta_$id" );
-	if ( !$meta = get_metadata_by_mid( 'post', $id ) )
+	if ( ! $meta = get_metadata_by_mid( 'post', $id ) ) {
 		wp_die( 1 );
+	}
 
-	if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta',  $meta->post_id, $meta->meta_key ) )
+	if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $meta->post_id, $meta->meta_key ) ) {
 		wp_die( -1 );
-	if ( delete_meta( $meta->meta_id ) )
+	}
+	if ( delete_meta( $meta->meta_id ) ) {
 		wp_die( 1 );
+	}
 	wp_die( 0 );
 }
 
@@ -708,21 +787,25 @@ function wp_ajax_delete_meta() {
  * @param string $action Action to perform.
  */
 function wp_ajax_delete_post( $action ) {
-	if ( empty( $action ) )
+	if ( empty( $action ) ) {
 		$action = 'delete-post';
+	}
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_post', $id ) )
+	if ( ! current_user_can( 'delete_post', $id ) ) {
 		wp_die( -1 );
+	}
 
-	if ( !get_post( $id ) )
+	if ( ! get_post( $id ) ) {
 		wp_die( 1 );
+	}
 
-	if ( wp_delete_post( $id ) )
+	if ( wp_delete_post( $id ) ) {
 		wp_die( 1 );
-	else
+	} else {
 		wp_die( 0 );
+	}
 }
 
 /**
@@ -733,24 +816,29 @@ function wp_ajax_delete_post( $action ) {
  * @param string $action Action to perform.
  */
 function wp_ajax_trash_post( $action ) {
-	if ( empty( $action ) )
+	if ( empty( $action ) ) {
 		$action = 'trash-post';
+	}
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_post', $id ) )
+	if ( ! current_user_can( 'delete_post', $id ) ) {
 		wp_die( -1 );
+	}
 
-	if ( !get_post( $id ) )
+	if ( ! get_post( $id ) ) {
 		wp_die( 1 );
+	}
 
-	if ( 'trash-post' == $action )
+	if ( 'trash-post' == $action ) {
 		$done = wp_trash_post( $id );
-	else
+	} else {
 		$done = wp_untrash_post( $id );
+	}
 
-	if ( $done )
+	if ( $done ) {
 		wp_die( 1 );
+	}
 
 	wp_die( 0 );
 }
@@ -763,8 +851,9 @@ function wp_ajax_trash_post( $action ) {
  * @param string $action Action to perform.
  */
 function wp_ajax_untrash_post( $action ) {
-	if ( empty( $action ) )
+	if ( empty( $action ) ) {
 		$action = 'untrash-post';
+	}
 	wp_ajax_trash_post( $action );
 }
 
@@ -774,21 +863,25 @@ function wp_ajax_untrash_post( $action ) {
  * @param string $action
  */
 function wp_ajax_delete_page( $action ) {
-	if ( empty( $action ) )
+	if ( empty( $action ) ) {
 		$action = 'delete-page';
+	}
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_page', $id ) )
+	if ( ! current_user_can( 'delete_page', $id ) ) {
 		wp_die( -1 );
+	}
 
-	if ( ! get_post( $id ) )
+	if ( ! get_post( $id ) ) {
 		wp_die( 1 );
+	}
 
-	if ( wp_delete_post( $id ) )
+	if ( wp_delete_post( $id ) ) {
 		wp_die( 1 );
-	else
+	} else {
 		wp_die( 0 );
+	}
 }
 
 /**
@@ -799,20 +892,24 @@ function wp_ajax_delete_page( $action ) {
 function wp_ajax_dim_comment() {
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
-	if ( !$comment = get_comment( $id ) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'comment',
-			'id' => new WP_Error('invalid_comment', sprintf(__('Comment %d does not exist'), $id))
-		) );
+	if ( ! $comment = get_comment( $id ) ) {
+		$x = new WP_Ajax_Response(
+			array(
+				'what' => 'comment',
+				'id'   => new WP_Error( 'invalid_comment', sprintf( __( 'Comment %d does not exist' ), $id ) ),
+			)
+		);
 		$x->send();
 	}
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && ! current_user_can( 'moderate_comments' ) )
+	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && ! current_user_can( 'moderate_comments' ) ) {
 		wp_die( -1 );
+	}
 
 	$current = wp_get_comment_status( $comment );
-	if ( isset( $_POST['new'] ) && $_POST['new'] == $current )
+	if ( isset( $_POST['new'] ) && $_POST['new'] == $current ) {
 		wp_die( time() );
+	}
 
 	check_ajax_referer( "approve-comment_$id" );
 	if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
@@ -821,11 +918,13 @@ function wp_ajax_dim_comment() {
 		$result = wp_set_comment_status( $comment, 'hold', true );
 	}
 
-	if ( is_wp_error($result) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'comment',
-			'id' => $result
-		) );
+	if ( is_wp_error( $result ) ) {
+		$x = new WP_Ajax_Response(
+			array(
+				'what' => 'comment',
+				'id'   => $result,
+			)
+		);
 		$x->send();
 	}
 
@@ -842,20 +941,22 @@ function wp_ajax_dim_comment() {
  * @param string $action Action to perform.
  */
 function wp_ajax_add_link_category( $action ) {
-	if ( empty( $action ) )
+	if ( empty( $action ) ) {
 		$action = 'add-link-category';
+	}
 	check_ajax_referer( $action );
 	$tax = get_taxonomy( 'link_category' );
 	if ( ! current_user_can( $tax->cap->manage_terms ) ) {
 		wp_die( -1 );
 	}
-	$names = explode(',', wp_unslash( $_POST['newcat'] ) );
-	$x = new WP_Ajax_Response();
+	$names = explode( ',', wp_unslash( $_POST['newcat'] ) );
+	$x     = new WP_Ajax_Response();
 	foreach ( $names as $cat_name ) {
-		$cat_name = trim($cat_name);
-		$slug = sanitize_title($cat_name);
-		if ( '' === $slug )
+		$cat_name = trim( $cat_name );
+		$slug     = sanitize_title( $cat_name );
+		if ( '' === $slug ) {
 			continue;
+		}
 
 		$cat_id = wp_insert_term( $cat_name, 'link_category' );
 		if ( ! $cat_id || is_wp_error( $cat_id ) ) {
@@ -864,12 +965,14 @@ function wp_ajax_add_link_category( $action ) {
 			$cat_id = $cat_id['term_id'];
 		}
 		$cat_name = esc_html( $cat_name );
-		$x->add( array(
-			'what' => 'link-category',
-			'id' => $cat_id,
-			'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='" . esc_attr($cat_id) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
-			'position' => -1
-		) );
+		$x->add(
+			array(
+				'what'     => 'link-category',
+				'id'       => $cat_id,
+				'data'     => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='" . esc_attr( $cat_id ) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
+				'position' => -1,
+			)
+		);
 	}
 	$x->send();
 }
@@ -881,32 +984,36 @@ function wp_ajax_add_link_category( $action ) {
  */
 function wp_ajax_add_tag() {
 	check_ajax_referer( 'add-tag', '_wpnonce_add-tag' );
-	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
-	$tax = get_taxonomy($taxonomy);
+	$taxonomy = ! empty( $_POST['taxonomy'] ) ? $_POST['taxonomy'] : 'post_tag';
+	$tax      = get_taxonomy( $taxonomy );
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
+	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
 		wp_die( -1 );
+	}
 
 	$x = new WP_Ajax_Response();
 
-	$tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
+	$tag = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
 
-	if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
-		$message = __('An error has occurred. Please reload the page and try again.');
-		if ( is_wp_error($tag) && $tag->get_error_message() )
+	if ( ! $tag || is_wp_error( $tag ) || ( ! $tag = get_term( $tag['term_id'], $taxonomy ) ) ) {
+		$message = __( 'An error has occurred. Please reload the page and try again.' );
+		if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
 			$message = $tag->get_error_message();
+		}
 
-		$x->add( array(
-			'what' => 'taxonomy',
-			'data' => new WP_Error('error', $message )
-		) );
+		$x->add(
+			array(
+				'what' => 'taxonomy',
+				'data' => new WP_Error( 'error', $message ),
+			)
+		);
 		$x->send();
 	}
 
 	$wp_list_table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => $_POST['screen'] ) );
 
 	$level = 0;
-	if ( is_taxonomy_hierarchical($taxonomy) ) {
+	if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 		$level = count( get_ancestors( $tag->term_id, $taxonomy, 'taxonomy' ) );
 		ob_start();
 		$wp_list_table->single_row( $tag, $level );
@@ -917,15 +1024,19 @@ function wp_ajax_add_tag() {
 	$wp_list_table->single_row( $tag );
 	$parents = ob_get_clean();
 
-	$x->add( array(
-		'what' => 'taxonomy',
-		'supplemental' => compact('parents', 'noparents')
-	) );
-	$x->add( array(
-		'what' => 'term',
-		'position' => $level,
-		'supplemental' => (array) $tag
-	) );
+	$x->add(
+		array(
+			'what'         => 'taxonomy',
+			'supplemental' => compact( 'parents', 'noparents' ),
+		)
+	);
+	$x->add(
+		array(
+			'what'         => 'term',
+			'position'     => $level,
+			'supplemental' => (array) $tag,
+		)
+	);
 	$x->send();
 }
 
@@ -940,7 +1051,7 @@ function wp_ajax_get_tagcloud() {
 	}
 
 	$taxonomy = sanitize_key( $_POST['tax'] );
-	$tax = get_taxonomy( $taxonomy );
+	$tax      = get_taxonomy( $taxonomy );
 	if ( ! $tax ) {
 		wp_die( 0 );
 	}
@@ -949,24 +1060,38 @@ function wp_ajax_get_tagcloud() {
 		wp_die( -1 );
 	}
 
-	$tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
+	$tags = get_terms(
+		$taxonomy, array(
+			'number'  => 45,
+			'orderby' => 'count',
+			'order'   => 'DESC',
+		)
+	);
 
-	if ( empty( $tags ) )
+	if ( empty( $tags ) ) {
 		wp_die( $tax->labels->not_found );
+	}
 
-	if ( is_wp_error( $tags ) )
+	if ( is_wp_error( $tags ) ) {
 		wp_die( $tags->get_error_message() );
+	}
 
 	foreach ( $tags as $key => $tag ) {
 		$tags[ $key ]->link = '#';
-		$tags[ $key ]->id = $tag->term_id;
+		$tags[ $key ]->id   = $tag->term_id;
 	}
 
 	// We need raw tag names here, so don't filter the output
-	$return = wp_generate_tag_cloud( $tags, array( 'filter' => 0, 'format' => 'list' ) );
+	$return = wp_generate_tag_cloud(
+		$tags, array(
+			'filter' => 0,
+			'format' => 'list',
+		)
+	);
 
-	if ( empty($return) )
+	if ( empty( $return ) ) {
 		wp_die( 0 );
+	}
 
 	echo $return;
 
@@ -1015,17 +1140,20 @@ function wp_ajax_get_comments( $action ) {
 	$x = new WP_Ajax_Response();
 	ob_start();
 	foreach ( $wp_list_table->items as $comment ) {
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && 0 === $comment->comment_approved )
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && 0 === $comment->comment_approved ) {
 			continue;
+		}
 		get_comment( $comment );
 		$wp_list_table->single_row( $comment );
 	}
 	$comment_list_item = ob_get_clean();
 
-	$x->add( array(
-		'what' => 'comments',
-		'data' => $comment_list_item
-	) );
+	$x->add(
+		array(
+			'what' => 'comments',
+			'data' => $comment_list_item,
+		)
+	);
 	$x->send();
 }
 
@@ -1037,35 +1165,40 @@ function wp_ajax_get_comments( $action ) {
  * @param string $action Action to perform.
  */
 function wp_ajax_replyto_comment( $action ) {
-	if ( empty( $action ) )
+	if ( empty( $action ) ) {
 		$action = 'replyto-comment';
+	}
 
 	check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
 
 	$comment_post_ID = (int) $_POST['comment_post_ID'];
-	$post = get_post( $comment_post_ID );
-	if ( ! $post )
+	$post            = get_post( $comment_post_ID );
+	if ( ! $post ) {
 		wp_die( -1 );
+	}
 
-	if ( !current_user_can( 'edit_post', $comment_post_ID ) )
+	if ( ! current_user_can( 'edit_post', $comment_post_ID ) ) {
 		wp_die( -1 );
+	}
 
-	if ( empty( $post->post_status ) )
+	if ( empty( $post->post_status ) ) {
 		wp_die( 1 );
-	elseif ( in_array($post->post_status, array('draft', 'pending', 'trash') ) )
-		wp_die( __('ERROR: you are replying to a comment on a draft post.') );
+	} elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ) ) ) {
+		wp_die( __( 'ERROR: you are replying to a comment on a draft post.' ) );
+	}
 
 	$user = wp_get_current_user();
 	if ( $user->exists() ) {
-		$user_ID = $user->ID;
+		$user_ID              = $user->ID;
 		$comment_author       = wp_slash( $user->display_name );
 		$comment_author_email = wp_slash( $user->user_email );
 		$comment_author_url   = wp_slash( $user->user_url );
 		$comment_content      = trim( $_POST['content'] );
 		$comment_type         = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : '';
 		if ( current_user_can( 'unfiltered_html' ) ) {
-			if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) )
+			if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) ) {
 				$_POST['_wp_unfiltered_html_comment'] = '';
+			}
 
 			if ( wp_create_nonce( 'unfiltered-html-comment' ) != $_POST['_wp_unfiltered_html_comment'] ) {
 				kses_remove_filters(); // start with a clean slate
@@ -1076,17 +1209,19 @@ function wp_ajax_replyto_comment( $action ) {
 		wp_die( __( 'Sorry, you must be logged in to reply to a comment.' ) );
 	}
 
-	if ( '' == $comment_content )
+	if ( '' == $comment_content ) {
 		wp_die( __( 'ERROR: please type a comment.' ) );
+	}
 
 	$comment_parent = 0;
-	if ( isset( $_POST['comment_ID'] ) )
+	if ( isset( $_POST['comment_ID'] ) ) {
 		$comment_parent = absint( $_POST['comment_ID'] );
+	}
 	$comment_auto_approved = false;
-	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
+	$commentdata           = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID' );
 
 	// Automatically approve parent comment.
-	if ( !empty($_POST['approve_parent']) ) {
+	if ( ! empty( $_POST['approve_parent'] ) ) {
 		$parent = get_comment( $comment_parent );
 
 		if ( $parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID ) {
@@ -1094,8 +1229,9 @@ function wp_ajax_replyto_comment( $action ) {
 				wp_die( -1 );
 			}
 
-			if ( wp_set_comment_status( $parent, 'approve' ) )
+			if ( wp_set_comment_status( $parent, 'approve' ) ) {
 				$comment_auto_approved = true;
+			}
 		}
 	}
 
@@ -1105,10 +1241,12 @@ function wp_ajax_replyto_comment( $action ) {
 		wp_die( $comment_id->get_error_message() );
 	}
 
-	$comment = get_comment($comment_id);
-	if ( ! $comment ) wp_die( 1 );
+	$comment = get_comment( $comment_id );
+	if ( ! $comment ) {
+		wp_die( 1 );
+	}
 
-	$position = ( isset($_POST['position']) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
+	$position = ( isset( $_POST['position'] ) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
 
 	ob_start();
 	if ( isset( $_REQUEST['mode'] ) && 'dashboard' == $_REQUEST['mode'] ) {
@@ -1116,37 +1254,37 @@ function wp_ajax_replyto_comment( $action ) {
 		_wp_dashboard_recent_comments_row( $comment );
 	} else {
 		if ( isset( $_REQUEST['mode'] ) && 'single' == $_REQUEST['mode'] ) {
-			$wp_list_table = _get_list_table('WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+			$wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
 		} else {
-			$wp_list_table = _get_list_table('WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+			$wp_list_table = _get_list_table( 'WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
 		}
 		$wp_list_table->single_row( $comment );
 	}
 	$comment_list_item = ob_get_clean();
 
-	$response =  array(
-		'what' => 'comment',
-		'id' => $comment->comment_ID,
-		'data' => $comment_list_item,
-		'position' => $position
+	$response = array(
+		'what'     => 'comment',
+		'id'       => $comment->comment_ID,
+		'data'     => $comment_list_item,
+		'position' => $position,
 	);
 
-	$counts = wp_count_comments();
+	$counts                   = wp_count_comments();
 	$response['supplemental'] = array(
-		'in_moderation' => $counts->moderated,
-		'i18n_comments_text' => sprintf(
+		'in_moderation'        => $counts->moderated,
+		'i18n_comments_text'   => sprintf(
 			_n( '%s Comment', '%s Comments', $counts->approved ),
 			number_format_i18n( $counts->approved )
 		),
 		'i18n_moderation_text' => sprintf(
 			_nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
 			number_format_i18n( $counts->moderated )
-		)
+		),
 	);
 
 	if ( $comment_auto_approved ) {
 		$response['supplemental']['parent_approved'] = $parent->comment_ID;
-		$response['supplemental']['parent_post_id'] = $parent->comment_post_ID;
+		$response['supplemental']['parent_post_id']  = $parent->comment_post_ID;
 	}
 
 	$x = new WP_Ajax_Response();
@@ -1163,23 +1301,27 @@ function wp_ajax_edit_comment() {
 	check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' );
 
 	$comment_id = (int) $_POST['comment_ID'];
-	if ( ! current_user_can( 'edit_comment', $comment_id ) )
+	if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
 		wp_die( -1 );
+	}
 
-	if ( '' == $_POST['content'] )
+	if ( '' == $_POST['content'] ) {
 		wp_die( __( 'ERROR: please type a comment.' ) );
+	}
 
-	if ( isset( $_POST['status'] ) )
+	if ( isset( $_POST['status'] ) ) {
 		$_POST['comment_status'] = $_POST['status'];
+	}
 	edit_comment();
 
-	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
-	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
+	$position      = ( isset( $_POST['position'] ) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
+	$checkbox      = ( isset( $_POST['checkbox'] ) && true == $_POST['checkbox'] ) ? 1 : 0;
 	$wp_list_table = _get_list_table( $checkbox ? 'WP_Comments_List_Table' : 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
 
 	$comment = get_comment( $comment_id );
-	if ( empty( $comment->comment_ID ) )
+	if ( empty( $comment->comment_ID ) ) {
 		wp_die( -1 );
+	}
 
 	ob_start();
 	$wp_list_table->single_row( $comment );
@@ -1187,12 +1329,14 @@ function wp_ajax_edit_comment() {
 
 	$x = new WP_Ajax_Response();
 
-	$x->add( array(
-		'what' => 'edit_comment',
-		'id' => $comment->comment_ID,
-		'data' => $comment_list_item,
-		'position' => $position
-	));
+	$x->add(
+		array(
+			'what'     => 'edit_comment',
+			'id'       => $comment->comment_ID,
+			'data'     => $comment_list_item,
+			'position' => $position,
+		)
+	);
 
 	$x->send();
 }
@@ -1205,8 +1349,9 @@ function wp_ajax_edit_comment() {
 function wp_ajax_add_menu_item() {
 	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
 
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		wp_die( -1 );
+	}
 
 	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
@@ -1220,22 +1365,22 @@ function wp_ajax_add_menu_item() {
 			'custom' != $menu_item_data['menu-item-type'] &&
 			! empty( $menu_item_data['menu-item-object-id'] )
 		) {
-			switch( $menu_item_data['menu-item-type'] ) {
-				case 'post_type' :
+			switch ( $menu_item_data['menu-item-type'] ) {
+				case 'post_type':
 					$_object = get_post( $menu_item_data['menu-item-object-id'] );
-				break;
+					break;
 
-				case 'post_type_archive' :
+				case 'post_type_archive':
 					$_object = get_post_type_object( $menu_item_data['menu-item-object'] );
-				break;
+					break;
 
-				case 'taxonomy' :
+				case 'taxonomy':
 					$_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
-				break;
+					break;
 			}
 
 			$_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
-			$_menu_item = reset( $_menu_items );
+			$_menu_item  = reset( $_menu_items );
 
 			// Restore the missing menu item properties
 			$menu_item_data['menu-item-description'] = $_menu_item->description;
@@ -1245,33 +1390,35 @@ function wp_ajax_add_menu_item() {
 	}
 
 	$item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
-	if ( is_wp_error( $item_ids ) )
+	if ( is_wp_error( $item_ids ) ) {
 		wp_die( 0 );
+	}
 
 	$menu_items = array();
 
 	foreach ( (array) $item_ids as $menu_item_id ) {
 		$menu_obj = get_post( $menu_item_id );
 		if ( ! empty( $menu_obj->ID ) ) {
-			$menu_obj = wp_setup_nav_menu_item( $menu_obj );
+			$menu_obj        = wp_setup_nav_menu_item( $menu_obj );
 			$menu_obj->label = $menu_obj->title; // don't show "(pending)" in ajax-added items
-			$menu_items[] = $menu_obj;
+			$menu_items[]    = $menu_obj;
 		}
 	}
 
 	/** This filter is documented in wp-admin/includes/nav-menu.php */
 	$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu'] );
 
-	if ( ! class_exists( $walker_class_name ) )
+	if ( ! class_exists( $walker_class_name ) ) {
 		wp_die( 0 );
+	}
 
 	if ( ! empty( $menu_items ) ) {
 		$args = array(
-			'after' => '',
-			'before' => '',
-			'link_after' => '',
+			'after'       => '',
+			'before'      => '',
+			'link_after'  => '',
 			'link_before' => '',
-			'walker' => new $walker_class_name,
+			'walker'      => new $walker_class_name,
 		);
 		echo walk_nav_menu_tree( $menu_items, 0, (object) $args );
 	}
@@ -1285,39 +1432,44 @@ function wp_ajax_add_menu_item() {
  */
 function wp_ajax_add_meta() {
 	check_ajax_referer( 'add-meta', '_ajax_nonce-add-meta' );
-	$c = 0;
-	$pid = (int) $_POST['post_id'];
+	$c    = 0;
+	$pid  = (int) $_POST['post_id'];
 	$post = get_post( $pid );
 
-	if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
-		if ( !current_user_can( 'edit_post', $pid ) )
+	if ( isset( $_POST['metakeyselect'] ) || isset( $_POST['metakeyinput'] ) ) {
+		if ( ! current_user_can( 'edit_post', $pid ) ) {
 			wp_die( -1 );
-		if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
+		}
+		if ( isset( $_POST['metakeyselect'] ) && '#NONE#' == $_POST['metakeyselect'] && empty( $_POST['metakeyinput'] ) ) {
 			wp_die( 1 );
+		}
 
 		// If the post is an autodraft, save the post as a draft and then attempt to save the meta.
 		if ( $post->post_status == 'auto-draft' ) {
-			$post_data = array();
-			$post_data['action'] = 'draft'; // Warning fix
-			$post_data['post_ID'] = $pid;
-			$post_data['post_type'] = $post->post_type;
+			$post_data                = array();
+			$post_data['action']      = 'draft'; // Warning fix
+			$post_data['post_ID']     = $pid;
+			$post_data['post_type']   = $post->post_type;
 			$post_data['post_status'] = 'draft';
-			$now = current_time('timestamp', 1);
+			$now                      = current_time( 'timestamp', 1 );
 			/* translators: 1: Post creation date, 2: Post creation time */
 			$post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), date( __( 'g:i a' ), $now ) );
 
 			$pid = edit_post( $post_data );
 			if ( $pid ) {
 				if ( is_wp_error( $pid ) ) {
-					$x = new WP_Ajax_Response( array(
-						'what' => 'meta',
-						'data' => $pid
-					) );
+					$x = new WP_Ajax_Response(
+						array(
+							'what' => 'meta',
+							'data' => $pid,
+						)
+					);
 					$x->send();
 				}
 
-				if ( !$mid = add_meta( $pid ) )
+				if ( ! $mid = add_meta( $pid ) ) {
 					wp_die( __( 'Please provide a custom field value.' ) );
+				}
 			} else {
 				wp_die( 0 );
 			}
@@ -1326,45 +1478,57 @@ function wp_ajax_add_meta() {
 		}
 
 		$meta = get_metadata_by_mid( 'post', $mid );
-		$pid = (int) $meta->post_id;
+		$pid  = (int) $meta->post_id;
 		$meta = get_object_vars( $meta );
-		$x = new WP_Ajax_Response( array(
-			'what' => 'meta',
-			'id' => $mid,
-			'data' => _list_meta_row( $meta, $c ),
-			'position' => 1,
-			'supplemental' => array('postid' => $pid)
-		) );
+		$x    = new WP_Ajax_Response(
+			array(
+				'what'         => 'meta',
+				'id'           => $mid,
+				'data'         => _list_meta_row( $meta, $c ),
+				'position'     => 1,
+				'supplemental' => array( 'postid' => $pid ),
+			)
+		);
 	} else { // Update?
-		$mid = (int) key( $_POST['meta'] );
-		$key = wp_unslash( $_POST['meta'][$mid]['key'] );
-		$value = wp_unslash( $_POST['meta'][$mid]['value'] );
-		if ( '' == trim($key) )
+		$mid   = (int) key( $_POST['meta'] );
+		$key   = wp_unslash( $_POST['meta'][ $mid ]['key'] );
+		$value = wp_unslash( $_POST['meta'][ $mid ]['value'] );
+		if ( '' == trim( $key ) ) {
 			wp_die( __( 'Please provide a custom field name.' ) );
-		if ( '' == trim($value) )
+		}
+		if ( '' == trim( $value ) ) {
 			wp_die( __( 'Please provide a custom field value.' ) );
-		if ( ! $meta = get_metadata_by_mid( 'post', $mid ) )
+		}
+		if ( ! $meta = get_metadata_by_mid( 'post', $mid ) ) {
 			wp_die( 0 ); // if meta doesn't exist
+		}
 		if ( is_protected_meta( $meta->meta_key, 'post' ) || is_protected_meta( $key, 'post' ) ||
 			! current_user_can( 'edit_post_meta', $meta->post_id, $meta->meta_key ) ||
-			! current_user_can( 'edit_post_meta', $meta->post_id, $key ) )
+			! current_user_can( 'edit_post_meta', $meta->post_id, $key ) ) {
 			wp_die( -1 );
+		}
 		if ( $meta->meta_value != $value || $meta->meta_key != $key ) {
-			if ( !$u = update_metadata_by_mid( 'post', $mid, $value, $key ) )
+			if ( ! $u = update_metadata_by_mid( 'post', $mid, $value, $key ) ) {
 				wp_die( 0 ); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+			}
 		}
 
-		$x = new WP_Ajax_Response( array(
-			'what' => 'meta',
-			'id' => $mid, 'old_id' => $mid,
-			'data' => _list_meta_row( array(
-				'meta_key' => $key,
-				'meta_value' => $value,
-				'meta_id' => $mid
-			), $c ),
-			'position' => 0,
-			'supplemental' => array('postid' => $meta->post_id)
-		) );
+		$x = new WP_Ajax_Response(
+			array(
+				'what'         => 'meta',
+				'id'           => $mid,
+				'old_id'       => $mid,
+				'data'         => _list_meta_row(
+					array(
+						'meta_key'   => $key,
+						'meta_value' => $value,
+						'meta_id'    => $mid,
+					), $c
+				),
+				'position'     => 0,
+				'supplemental' => array( 'postid' => $meta->post_id ),
+			)
+		);
 	}
 	$x->send();
 }
@@ -1382,36 +1546,41 @@ function wp_ajax_add_user( $action ) {
 	}
 
 	check_ajax_referer( $action );
-	if ( ! current_user_can('create_users') )
+	if ( ! current_user_can( 'create_users' ) ) {
 		wp_die( -1 );
+	}
 	if ( ! $user_id = edit_user() ) {
 		wp_die( 0 );
 	} elseif ( is_wp_error( $user_id ) ) {
-		$x = new WP_Ajax_Response( array(
-			'what' => 'user',
-			'id' => $user_id
-		) );
+		$x = new WP_Ajax_Response(
+			array(
+				'what' => 'user',
+				'id'   => $user_id,
+			)
+		);
 		$x->send();
 	}
 	$user_object = get_userdata( $user_id );
 
-	$wp_list_table = _get_list_table('WP_Users_List_Table');
+	$wp_list_table = _get_list_table( 'WP_Users_List_Table' );
 
 	$role = current( $user_object->roles );
 
-	$x = new WP_Ajax_Response( array(
-		'what' => 'user',
-		'id' => $user_id,
-		'data' => $wp_list_table->single_row( $user_object, '', $role ),
-		'supplemental' => array(
-			'show-link' => sprintf(
-				/* translators: %s: the new user */
-				__( 'User %s added' ),
-				'<a href="#user-' . $user_id . '">' . $user_object->user_login . '</a>'
+	$x = new WP_Ajax_Response(
+		array(
+			'what'         => 'user',
+			'id'           => $user_id,
+			'data'         => $wp_list_table->single_row( $user_object, '', $role ),
+			'supplemental' => array(
+				'show-link' => sprintf(
+					/* translators: %s: the new user */
+					__( 'User %s added' ),
+					'<a href="#user-' . $user_id . '">' . $user_object->user_login . '</a>'
+				),
+				'role'      => $role,
 			),
-			'role' => $role,
 		)
-	) );
+	);
 	$x->send();
 }
 
@@ -1422,26 +1591,29 @@ function wp_ajax_add_user( $action ) {
  */
 function wp_ajax_closed_postboxes() {
 	check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' );
-	$closed = isset( $_POST['closed'] ) ? explode( ',', $_POST['closed']) : array();
-	$closed = array_filter($closed);
+	$closed = isset( $_POST['closed'] ) ? explode( ',', $_POST['closed'] ) : array();
+	$closed = array_filter( $closed );
 
-	$hidden = isset( $_POST['hidden'] ) ? explode( ',', $_POST['hidden']) : array();
-	$hidden = array_filter($hidden);
+	$hidden = isset( $_POST['hidden'] ) ? explode( ',', $_POST['hidden'] ) : array();
+	$hidden = array_filter( $hidden );
 
 	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
+	if ( $page != sanitize_key( $page ) ) {
 		wp_die( 0 );
+	}
 
-	if ( ! $user = wp_get_current_user() )
+	if ( ! $user = wp_get_current_user() ) {
 		wp_die( -1 );
+	}
 
-	if ( is_array($closed) )
-		update_user_option($user->ID, "closedpostboxes_$page", $closed, true);
+	if ( is_array( $closed ) ) {
+		update_user_option( $user->ID, "closedpostboxes_$page", $closed, true );
+	}
 
-	if ( is_array($hidden) ) {
-		$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu') ); // postboxes that are always shown
-		update_user_option($user->ID, "metaboxhidden_$page", $hidden, true);
+	if ( is_array( $hidden ) ) {
+		$hidden = array_diff( $hidden, array( 'submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu' ) ); // postboxes that are always shown
+		update_user_option( $user->ID, "metaboxhidden_$page", $hidden, true );
 	}
 
 	wp_die( 1 );
@@ -1456,11 +1628,13 @@ function wp_ajax_hidden_columns() {
 	check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
 	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
+	if ( $page != sanitize_key( $page ) ) {
 		wp_die( 0 );
+	}
 
-	if ( ! $user = wp_get_current_user() )
+	if ( ! $user = wp_get_current_user() ) {
 		wp_die( -1 );
+	}
 
 	$hidden = ! empty( $_POST['hidden'] ) ? explode( ',', $_POST['hidden'] ) : array();
 	update_user_option( $user->ID, "manage{$page}columnshidden", $hidden, true );
@@ -1476,8 +1650,9 @@ function wp_ajax_hidden_columns() {
 function wp_ajax_update_welcome_panel() {
 	check_ajax_referer( 'welcome-panel-nonce', 'welcomepanelnonce' );
 
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		wp_die( -1 );
+	}
 
 	update_user_meta( get_current_user_id(), 'show_welcome_panel', empty( $_POST['visible'] ) ? 0 : 1 );
 
@@ -1490,43 +1665,48 @@ function wp_ajax_update_welcome_panel() {
  * @since 3.1.0
  */
 function wp_ajax_menu_get_metabox() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		wp_die( -1 );
+	}
 
 	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
 	if ( isset( $_POST['item-type'] ) && 'post_type' == $_POST['item-type'] ) {
-		$type = 'posttype';
+		$type     = 'posttype';
 		$callback = 'wp_nav_menu_item_post_type_meta_box';
-		$items = (array) get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+		$items    = (array) get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
 	} elseif ( isset( $_POST['item-type'] ) && 'taxonomy' == $_POST['item-type'] ) {
-		$type = 'taxonomy';
+		$type     = 'taxonomy';
 		$callback = 'wp_nav_menu_item_taxonomy_meta_box';
-		$items = (array) get_taxonomies( array( 'show_ui' => true ), 'object' );
+		$items    = (array) get_taxonomies( array( 'show_ui' => true ), 'object' );
 	}
 
-	if ( ! empty( $_POST['item-object'] ) && isset( $items[$_POST['item-object']] ) ) {
+	if ( ! empty( $_POST['item-object'] ) && isset( $items[ $_POST['item-object'] ] ) ) {
 		$menus_meta_box_object = $items[ $_POST['item-object'] ];
 
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
 		$item = apply_filters( 'nav_menu_meta_box_object', $menus_meta_box_object );
 		ob_start();
-		call_user_func_array($callback, array(
-			null,
-			array(
-				'id' => 'add-' . $item->name,
-				'title' => $item->labels->name,
-				'callback' => $callback,
-				'args' => $item,
+		call_user_func_array(
+			$callback, array(
+				null,
+				array(
+					'id'       => 'add-' . $item->name,
+					'title'    => $item->labels->name,
+					'callback' => $callback,
+					'args'     => $item,
+				),
 			)
-		));
+		);
 
 		$markup = ob_get_clean();
 
-		echo wp_json_encode(array(
-			'replace-id' => $type . '-' . $item->name,
-			'markup' => $markup,
-		));
+		echo wp_json_encode(
+			array(
+				'replace-id' => $type . '-' . $item->name,
+				'markup'     => $markup,
+			)
+		);
 	}
 
 	wp_die();
@@ -1558,8 +1738,9 @@ function wp_ajax_wp_link_ajax() {
 
 	$results = _WP_Editors::wp_link_query( $args );
 
-	if ( ! isset( $results ) )
+	if ( ! isset( $results ) ) {
 		wp_die( 0 );
+	}
 
 	echo wp_json_encode( $results );
 	echo "\n";
@@ -1573,11 +1754,13 @@ function wp_ajax_wp_link_ajax() {
  * @since 3.1.0
  */
 function wp_ajax_menu_locations_save() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		wp_die( -1 );
+	}
 	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-	if ( ! isset( $_POST['menu-locations'] ) )
+	if ( ! isset( $_POST['menu-locations'] ) ) {
 		wp_die( 0 );
+	}
 	set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
 	wp_die( 1 );
 }
@@ -1589,25 +1772,30 @@ function wp_ajax_menu_locations_save() {
  */
 function wp_ajax_meta_box_order() {
 	check_ajax_referer( 'meta-box-order' );
-	$order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false;
+	$order        = isset( $_POST['order'] ) ? (array) $_POST['order'] : false;
 	$page_columns = isset( $_POST['page_columns'] ) ? $_POST['page_columns'] : 'auto';
 
-	if ( $page_columns != 'auto' )
+	if ( $page_columns != 'auto' ) {
 		$page_columns = (int) $page_columns;
+	}
 
 	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
+	if ( $page != sanitize_key( $page ) ) {
 		wp_die( 0 );
+	}
 
-	if ( ! $user = wp_get_current_user() )
+	if ( ! $user = wp_get_current_user() ) {
 		wp_die( -1 );
+	}
 
-	if ( $order )
-		update_user_option($user->ID, "meta-box-order_$page", $order, true);
+	if ( $order ) {
+		update_user_option( $user->ID, "meta-box-order_$page", $order, true );
+	}
 
-	if ( $page_columns )
-		update_user_option($user->ID, "screen_layout_$page", $page_columns, true);
+	if ( $page_columns ) {
+		update_user_option( $user->ID, "screen_layout_$page", $page_columns, true );
+	}
 
 	wp_die( 1 );
 }
@@ -1618,8 +1806,9 @@ function wp_ajax_meta_box_order() {
  * @since 3.1.0
  */
 function wp_ajax_menu_quick_search() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		wp_die( -1 );
+	}
 
 	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
@@ -1635,7 +1824,7 @@ function wp_ajax_menu_quick_search() {
  */
 function wp_ajax_get_permalink() {
 	check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
-	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
+	$post_id = isset( $_POST['post_id'] ) ? intval( $_POST['post_id'] ) : 0;
 	wp_die( get_preview_post_link( $post_id ) );
 }
 
@@ -1646,9 +1835,9 @@ function wp_ajax_get_permalink() {
  */
 function wp_ajax_sample_permalink() {
 	check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
-	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-	$title = isset($_POST['new_title'])? $_POST['new_title'] : '';
-	$slug = isset($_POST['new_slug'])? $_POST['new_slug'] : null;
+	$post_id = isset( $_POST['post_id'] ) ? intval( $_POST['post_id'] ) : 0;
+	$title   = isset( $_POST['new_title'] ) ? $_POST['new_title'] : '';
+	$slug    = isset( $_POST['new_slug'] ) ? $_POST['new_slug'] : null;
 	wp_die( get_sample_permalink_html( $post_id, $title, $slug ) );
 }
 
@@ -1664,21 +1853,24 @@ function wp_ajax_inline_save() {
 
 	check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
 
-	if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) )
+	if ( ! isset( $_POST['post_ID'] ) || ! ( $post_ID = (int) $_POST['post_ID'] ) ) {
 		wp_die();
+	}
 
 	if ( 'page' == $_POST['post_type'] ) {
-		if ( ! current_user_can( 'edit_page', $post_ID ) )
+		if ( ! current_user_can( 'edit_page', $post_ID ) ) {
 			wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
+		}
 	} else {
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 	}
 
 	if ( $last = wp_check_post_lock( $post_ID ) ) {
-		$last_user = get_userdata( $last );
+		$last_user      = get_userdata( $last );
 		$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
-		printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ),	esc_html( $last_user_name ) );
+		printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ), esc_html( $last_user_name ) );
 		wp_die();
 	}
 
@@ -1687,7 +1879,7 @@ function wp_ajax_inline_save() {
 	$post = get_post( $post_ID, ARRAY_A );
 
 	// Since it's coming from the database.
-	$post = wp_slash($post);
+	$post = wp_slash( $post );
 
 	$data['content'] = $post['post_content'];
 	$data['excerpt'] = $post['post_excerpt'];
@@ -1695,8 +1887,9 @@ function wp_ajax_inline_save() {
 	// Rename.
 	$data['user_ID'] = get_current_user_id();
 
-	if ( isset($data['post_parent']) )
+	if ( isset( $data['post_parent'] ) ) {
 		$data['parent_id'] = $data['post_parent'];
+	}
 
 	// Status.
 	if ( isset( $data['keep_private'] ) && 'private' == $data['keep_private'] ) {
@@ -1706,10 +1899,12 @@ function wp_ajax_inline_save() {
 		$data['post_status'] = $data['_status'];
 	}
 
-	if ( empty($data['comment_status']) )
+	if ( empty( $data['comment_status'] ) ) {
 		$data['comment_status'] = 'closed';
-	if ( empty($data['ping_status']) )
+	}
+	if ( empty( $data['ping_status'] ) ) {
 		$data['ping_status'] = 'closed';
+	}
 
 	// Exclude terms from taxonomies that are not supposed to appear in Quick Edit.
 	if ( ! empty( $data['tax_input'] ) ) {
@@ -1725,7 +1920,7 @@ function wp_ajax_inline_save() {
 	// Hack: wp_unique_post_slug() doesn't work for drafts, so we will fake that our post is published.
 	if ( ! empty( $data['post_name'] ) && in_array( $post['post_status'], array( 'draft', 'pending' ) ) ) {
 		$post['post_status'] = 'publish';
-		$data['post_name'] = wp_unique_post_slug( $data['post_name'], $post['ID'], $post['post_status'], $post['post_type'], $post['post_parent'] );
+		$data['post_name']   = wp_unique_post_slug( $data['post_name'], $post['ID'], $post['post_status'], $post['post_type'], $post['post_parent'] );
 	}
 
 	// Update the post.
@@ -1761,9 +1956,10 @@ function wp_ajax_inline_save_tax() {
 	check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
 
 	$taxonomy = sanitize_key( $_POST['taxonomy'] );
-	$tax = get_taxonomy( $taxonomy );
-	if ( ! $tax )
+	$tax      = get_taxonomy( $taxonomy );
+	if ( ! $tax ) {
 		wp_die( 0 );
+	}
 
 	if ( ! isset( $_POST['tax_ID'] ) || ! ( $id = (int) $_POST['tax_ID'] ) ) {
 		wp_die( -1 );
@@ -1775,27 +1971,29 @@ function wp_ajax_inline_save_tax() {
 
 	$wp_list_table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => 'edit-' . $taxonomy ) );
 
-	$tag = get_term( $id, $taxonomy );
+	$tag                  = get_term( $id, $taxonomy );
 	$_POST['description'] = $tag->description;
 
-	$updated = wp_update_term($id, $taxonomy, $_POST);
-	if ( $updated && !is_wp_error($updated) ) {
+	$updated = wp_update_term( $id, $taxonomy, $_POST );
+	if ( $updated && ! is_wp_error( $updated ) ) {
 		$tag = get_term( $updated['term_id'], $taxonomy );
-		if ( !$tag || is_wp_error( $tag ) ) {
-			if ( is_wp_error($tag) && $tag->get_error_message() )
+		if ( ! $tag || is_wp_error( $tag ) ) {
+			if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
 				wp_die( $tag->get_error_message() );
+			}
 			wp_die( __( 'Item not updated.' ) );
 		}
 	} else {
-		if ( is_wp_error($updated) && $updated->get_error_message() )
+		if ( is_wp_error( $updated ) && $updated->get_error_message() ) {
 			wp_die( $updated->get_error_message() );
+		}
 		wp_die( __( 'Item not updated.' ) );
 	}
-	$level = 0;
+	$level  = 0;
 	$parent = $tag->parent;
 	while ( $parent > 0 ) {
 		$parent_tag = get_term( $parent, $taxonomy );
-		$parent = $parent_tag->parent;
+		$parent     = $parent_tag->parent;
 		$level++;
 	}
 	$wp_list_table->single_row( $tag, $level );
@@ -1815,14 +2013,15 @@ function wp_ajax_find_posts() {
 	$post_types = get_post_types( array( 'public' => true ), 'objects' );
 	unset( $post_types['attachment'] );
 
-	$s = wp_unslash( $_POST['ps'] );
+	$s    = wp_unslash( $_POST['ps'] );
 	$args = array(
-		'post_type' => array_keys( $post_types ),
-		'post_status' => 'any',
+		'post_type'      => array_keys( $post_types ),
+		'post_status'    => 'any',
 		'posts_per_page' => 50,
 	);
-	if ( '' !== $s )
+	if ( '' !== $s ) {
 		$args['s'] = $s;
+	}
 
 	$posts = get_posts( $args );
 
@@ -1830,25 +2029,25 @@ function wp_ajax_find_posts() {
 		wp_send_json_error( __( 'No items found.' ) );
 	}
 
-	$html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th class="no-break">'.__('Type').'</th><th class="no-break">'.__('Date').'</th><th class="no-break">'.__('Status').'</th></tr></thead><tbody>';
-	$alt = '';
+	$html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>' . __( 'Title' ) . '</th><th class="no-break">' . __( 'Type' ) . '</th><th class="no-break">' . __( 'Date' ) . '</th><th class="no-break">' . __( 'Status' ) . '</th></tr></thead><tbody>';
+	$alt  = '';
 	foreach ( $posts as $post ) {
 		$title = trim( $post->post_title ) ? $post->post_title : __( '(no title)' );
-		$alt = ( 'alternate' == $alt ) ? '' : 'alternate';
+		$alt   = ( 'alternate' == $alt ) ? '' : 'alternate';
 
 		switch ( $post->post_status ) {
-			case 'publish' :
-			case 'private' :
-				$stat = __('Published');
+			case 'publish':
+			case 'private':
+				$stat = __( 'Published' );
 				break;
-			case 'future' :
-				$stat = __('Scheduled');
+			case 'future':
+				$stat = __( 'Scheduled' );
 				break;
-			case 'pending' :
-				$stat = __('Pending Review');
+			case 'pending':
+				$stat = __( 'Pending Review' );
 				break;
-			case 'draft' :
-				$stat = __('Draft');
+			case 'draft':
+				$stat = __( 'Draft' );
 				break;
 		}
 
@@ -1856,11 +2055,11 @@ function wp_ajax_find_posts() {
 			$time = '';
 		} else {
 			/* translators: date format in table columns, see https://secure.php.net/date */
-			$time = mysql2date(__('Y/m/d'), $post->post_date);
+			$time = mysql2date( __( 'Y/m/d' ), $post->post_date );
 		}
 
-		$html .= '<tr class="' . trim( 'found-posts ' . $alt ) . '"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="' . esc_attr($post->ID) . '"></td>';
-		$html .= '<td><label for="found-'.$post->ID.'">' . esc_html( $title ) . '</label></td><td class="no-break">' . esc_html( $post_types[$post->post_type]->labels->singular_name ) . '</td><td class="no-break">'.esc_html( $time ) . '</td><td class="no-break">' . esc_html( $stat ). ' </td></tr>' . "\n\n";
+		$html .= '<tr class="' . trim( 'found-posts ' . $alt ) . '"><td class="found-radio"><input type="radio" id="found-' . $post->ID . '" name="found_post_id" value="' . esc_attr( $post->ID ) . '"></td>';
+		$html .= '<td><label for="found-' . $post->ID . '">' . esc_html( $title ) . '</label></td><td class="no-break">' . esc_html( $post_types[ $post->post_type ]->labels->singular_name ) . '</td><td class="no-break">' . esc_html( $time ) . '</td><td class="no-break">' . esc_html( $stat ) . ' </td></tr>' . "\n\n";
 	}
 
 	$html .= '</tbody></table>';
@@ -1876,28 +2075,30 @@ function wp_ajax_find_posts() {
 function wp_ajax_widgets_order() {
 	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
 
-	if ( !current_user_can('edit_theme_options') )
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		wp_die( -1 );
+	}
 
 	unset( $_POST['savewidgets'], $_POST['action'] );
 
 	// Save widgets order for all sidebars.
-	if ( is_array($_POST['sidebars']) ) {
+	if ( is_array( $_POST['sidebars'] ) ) {
 		$sidebars = array();
 		foreach ( wp_unslash( $_POST['sidebars'] ) as $key => $val ) {
 			$sb = array();
-			if ( !empty($val) ) {
-				$val = explode(',', $val);
+			if ( ! empty( $val ) ) {
+				$val = explode( ',', $val );
 				foreach ( $val as $k => $v ) {
-					if ( strpos($v, 'widget-') === false )
+					if ( strpos( $v, 'widget-' ) === false ) {
 						continue;
+					}
 
-					$sb[$k] = substr($v, strpos($v, '_') + 1);
+					$sb[ $k ] = substr( $v, strpos( $v, '_' ) + 1 );
 				}
 			}
-			$sidebars[$key] = $sb;
+			$sidebars[ $key ] = $sb;
 		}
-		wp_set_sidebars_widgets($sidebars);
+		wp_set_sidebars_widgets( $sidebars );
 		wp_die( 1 );
 	}
 
@@ -1918,8 +2119,9 @@ function wp_ajax_save_widget() {
 
 	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
 
-	if ( !current_user_can('edit_theme_options') || !isset($_POST['id_base']) )
+	if ( ! current_user_can( 'edit_theme_options' ) || ! isset( $_POST['id_base'] ) ) {
 		wp_die( -1 );
+	}
 
 	unset( $_POST['savewidgets'], $_POST['action'] );
 
@@ -1940,43 +2142,51 @@ function wp_ajax_save_widget() {
 	/** This action is documented in wp-admin/widgets.php */
 	do_action( 'sidebar_admin_setup' );
 
-	$id_base = wp_unslash( $_POST['id_base'] );
-	$widget_id = wp_unslash( $_POST['widget-id'] );
-	$sidebar_id = $_POST['sidebar'];
-	$multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
-	$settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false;
-	$error = '<p>' . __('An error has occurred. Please reload the page and try again.') . '</p>';
+	$id_base      = wp_unslash( $_POST['id_base'] );
+	$widget_id    = wp_unslash( $_POST['widget-id'] );
+	$sidebar_id   = $_POST['sidebar'];
+	$multi_number = ! empty( $_POST['multi_number'] ) ? (int) $_POST['multi_number'] : 0;
+	$settings     = isset( $_POST[ 'widget-' . $id_base ] ) && is_array( $_POST[ 'widget-' . $id_base ] ) ? $_POST[ 'widget-' . $id_base ] : false;
+	$error        = '<p>' . __( 'An error has occurred. Please reload the page and try again.' ) . '</p>';
 
 	$sidebars = wp_get_sidebars_widgets();
-	$sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array();
+	$sidebar  = isset( $sidebars[ $sidebar_id ] ) ? $sidebars[ $sidebar_id ] : array();
 
 	// Delete.
-	if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+	if ( isset( $_POST['delete_widget'] ) && $_POST['delete_widget'] ) {
 
-		if ( !isset($wp_registered_widgets[$widget_id]) )
+		if ( ! isset( $wp_registered_widgets[ $widget_id ] ) ) {
 			wp_die( $error );
+		}
 
-		$sidebar = array_diff( $sidebar, array($widget_id) );
-		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+		$sidebar = array_diff( $sidebar, array( $widget_id ) );
+		$_POST   = array(
+			'sidebar'            => $sidebar_id,
+			'widget-' . $id_base => array(),
+			'the-widget-id'      => $widget_id,
+			'delete_widget'      => '1',
+		);
 
 		/** This action is documented in wp-admin/widgets.php */
 		do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base );
 
-	} elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) {
-		if ( !$multi_number )
+	} elseif ( $settings && preg_match( '/__i__|%i%/', key( $settings ) ) ) {
+		if ( ! $multi_number ) {
 			wp_die( $error );
+		}
 
 		$_POST[ 'widget-' . $id_base ] = array( $multi_number => reset( $settings ) );
-		$widget_id = $id_base . '-' . $multi_number;
-		$sidebar[] = $widget_id;
+		$widget_id                     = $id_base . '-' . $multi_number;
+		$sidebar[]                     = $widget_id;
 	}
 	$_POST['widget-id'] = $sidebar;
 
 	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
 
 		if ( $name == $id_base ) {
-			if ( !is_callable( $control['callback'] ) )
+			if ( ! is_callable( $control['callback'] ) ) {
 				continue;
+			}
 
 			ob_start();
 				call_user_func_array( $control['callback'], $control['params'] );
@@ -1985,18 +2195,20 @@ function wp_ajax_save_widget() {
 		}
 	}
 
-	if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
-		$sidebars[$sidebar_id] = $sidebar;
-		wp_set_sidebars_widgets($sidebars);
+	if ( isset( $_POST['delete_widget'] ) && $_POST['delete_widget'] ) {
+		$sidebars[ $sidebar_id ] = $sidebar;
+		wp_set_sidebars_widgets( $sidebars );
 		echo "deleted:$widget_id";
 		wp_die();
 	}
 
-	if ( !empty($_POST['add_new']) )
+	if ( ! empty( $_POST['add_new'] ) ) {
 		wp_die();
+	}
 
-	if ( $form = $wp_registered_widget_controls[$widget_id] )
+	if ( $form = $wp_registered_widget_controls[ $widget_id ] ) {
 		call_user_func_array( $form['callback'], $form['params'] );
+	}
 
 	wp_die();
 }
@@ -2036,13 +2248,13 @@ function wp_ajax_delete_inactive_widgets() {
 	$sidebars_widgets = wp_get_sidebars_widgets();
 
 	foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
-		$pieces = explode( '-', $widget_id );
+		$pieces       = explode( '-', $widget_id );
 		$multi_number = array_pop( $pieces );
-		$id_base = implode( '-', $pieces );
-		$widget = get_option( 'widget_' . $id_base );
-		unset( $widget[$multi_number] );
+		$id_base      = implode( '-', $pieces );
+		$widget       = get_option( 'widget_' . $id_base );
+		unset( $widget[ $multi_number ] );
 		update_option( 'widget_' . $id_base, $widget );
-		unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+		unset( $sidebars_widgets['wp_inactive_widgets'][ $key ] );
 	}
 
 	wp_set_sidebars_widgets( $sidebars_widgets );
@@ -2064,13 +2276,15 @@ function wp_ajax_upload_attachment() {
 	 */
 
 	if ( ! current_user_can( 'upload_files' ) ) {
-		echo wp_json_encode( array(
-			'success' => false,
-			'data'    => array(
-				'message'  => __( 'Sorry, you are not allowed to upload files.' ),
-				'filename' => $_FILES['async-upload']['name'],
+		echo wp_json_encode(
+			array(
+				'success' => false,
+				'data'    => array(
+					'message'  => __( 'Sorry, you are not allowed to upload files.' ),
+					'filename' => $_FILES['async-upload']['name'],
+				),
 			)
-		) );
+		);
 
 		wp_die();
 	}
@@ -2078,13 +2292,15 @@ function wp_ajax_upload_attachment() {
 	if ( isset( $_REQUEST['post_id'] ) ) {
 		$post_id = $_REQUEST['post_id'];
 		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			echo wp_json_encode( array(
-				'success' => false,
-				'data'    => array(
-					'message'  => __( 'Sorry, you are not allowed to attach files to this post.' ),
-					'filename' => $_FILES['async-upload']['name'],
+			echo wp_json_encode(
+				array(
+					'success' => false,
+					'data'    => array(
+						'message'  => __( 'Sorry, you are not allowed to attach files to this post.' ),
+						'filename' => $_FILES['async-upload']['name'],
+					),
 				)
-			) );
+			);
 
 			wp_die();
 		}
@@ -2098,13 +2314,15 @@ function wp_ajax_upload_attachment() {
 	if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
 		$wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'] );
 		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
-			echo wp_json_encode( array(
-				'success' => false,
-				'data'    => array(
-					'message'  => __( 'The uploaded file is not a valid image. Please try again.' ),
-					'filename' => $_FILES['async-upload']['name'],
+			echo wp_json_encode(
+				array(
+					'success' => false,
+					'data'    => array(
+						'message'  => __( 'The uploaded file is not a valid image. Please try again.' ),
+						'filename' => $_FILES['async-upload']['name'],
+					),
 				)
-			) );
+			);
 
 			wp_die();
 		}
@@ -2113,32 +2331,39 @@ function wp_ajax_upload_attachment() {
 	$attachment_id = media_handle_upload( 'async-upload', $post_id, $post_data );
 
 	if ( is_wp_error( $attachment_id ) ) {
-		echo wp_json_encode( array(
-			'success' => false,
-			'data'    => array(
-				'message'  => $attachment_id->get_error_message(),
-				'filename' => $_FILES['async-upload']['name'],
+		echo wp_json_encode(
+			array(
+				'success' => false,
+				'data'    => array(
+					'message'  => $attachment_id->get_error_message(),
+					'filename' => $_FILES['async-upload']['name'],
+				),
 			)
-		) );
+		);
 
 		wp_die();
 	}
 
 	if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) {
-		if ( 'custom-background' === $post_data['context'] )
+		if ( 'custom-background' === $post_data['context'] ) {
 			update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', $post_data['theme'] );
+		}
 
-		if ( 'custom-header' === $post_data['context'] )
+		if ( 'custom-header' === $post_data['context'] ) {
 			update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', $post_data['theme'] );
+		}
 	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) )
+	if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) ) {
 		wp_die();
+	}
 
-	echo wp_json_encode( array(
-		'success' => true,
-		'data'    => $attachment,
-	) );
+	echo wp_json_encode(
+		array(
+			'success' => true,
+			'data'    => $attachment,
+		)
+	);
 
 	wp_die();
 }
@@ -2149,29 +2374,30 @@ function wp_ajax_upload_attachment() {
  * @since 3.1.0
  */
 function wp_ajax_image_editor() {
-	$attachment_id = intval($_POST['postid']);
-	if ( empty($attachment_id) || !current_user_can('edit_post', $attachment_id) )
+	$attachment_id = intval( $_POST['postid'] );
+	if ( empty( $attachment_id ) || ! current_user_can( 'edit_post', $attachment_id ) ) {
 		wp_die( -1 );
+	}
 
 	check_ajax_referer( "image_editor-$attachment_id" );
 	include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
 
 	$msg = false;
 	switch ( $_POST['do'] ) {
-		case 'save' :
-			$msg = wp_save_image($attachment_id);
-			$msg = wp_json_encode($msg);
+		case 'save':
+			$msg = wp_save_image( $attachment_id );
+			$msg = wp_json_encode( $msg );
 			wp_die( $msg );
 			break;
-		case 'scale' :
-			$msg = wp_save_image($attachment_id);
+		case 'scale':
+			$msg = wp_save_image( $attachment_id );
 			break;
-		case 'restore' :
-			$msg = wp_restore_image($attachment_id);
+		case 'restore':
+			$msg = wp_restore_image( $attachment_id );
 			break;
 	}
 
-	wp_image_editor($attachment_id, $msg);
+	wp_image_editor( $attachment_id, $msg );
 	wp_die();
 }
 
@@ -2184,15 +2410,17 @@ function wp_ajax_set_post_thumbnail() {
 	$json = ! empty( $_REQUEST['json'] ); // New-style request
 
 	$post_ID = intval( $_POST['post_id'] );
-	if ( ! current_user_can( 'edit_post', $post_ID ) )
+	if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 		wp_die( -1 );
+	}
 
 	$thumbnail_id = intval( $_POST['thumbnail_id'] );
 
-	if ( $json )
+	if ( $json ) {
 		check_ajax_referer( "update-post_$post_ID" );
-	else
+	} else {
 		check_ajax_referer( "set_post_thumbnail-$post_ID" );
+	}
 
 	if ( $thumbnail_id == '-1' ) {
 		if ( delete_post_thumbnail( $post_ID ) ) {
@@ -2316,10 +2544,11 @@ function wp_ajax_wp_fullscreen_save_post() {
 
 	$post = null;
 
-	if ( $post_id )
+	if ( $post_id ) {
 		$post = get_post( $post_id );
+	}
 
-	check_ajax_referer('update-post_' . $post_id, '_wpnonce');
+	check_ajax_referer( 'update-post_' . $post_id, '_wpnonce' );
 
 	$post_id = edit_post();
 
@@ -2336,10 +2565,10 @@ function wp_ajax_wp_fullscreen_save_post() {
 	}
 
 	if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) {
-		$last_user = get_userdata( $last_id );
-		$last_edited = sprintf( __('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), $last_date, $last_time );
+		$last_user   = get_userdata( $last_id );
+		$last_edited = sprintf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), $last_date, $last_time );
 	} else {
-		$last_edited = sprintf( __('Last edited on %1$s at %2$s'), $last_date, $last_time );
+		$last_edited = sprintf( __( 'Last edited on %1$s at %2$s' ), $last_date, $last_time );
 	}
 
 	wp_send_json_success( array( 'last_edited' => $last_edited ) );
@@ -2351,20 +2580,24 @@ function wp_ajax_wp_fullscreen_save_post() {
  * @since 3.1.0
  */
 function wp_ajax_wp_remove_post_lock() {
-	if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) )
+	if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) ) {
 		wp_die( 0 );
+	}
 	$post_id = (int) $_POST['post_ID'];
-	if ( ! $post = get_post( $post_id ) )
+	if ( ! $post = get_post( $post_id ) ) {
 		wp_die( 0 );
+	}
 
 	check_ajax_referer( 'update-post_' . $post_id );
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
 		wp_die( -1 );
+	}
 
 	$active_lock = array_map( 'absint', explode( ':', $_POST['active_post_lock'] ) );
-	if ( $active_lock[1] != get_current_user_id() )
+	if ( $active_lock[1] != get_current_user_id() ) {
 		wp_die( 0 );
+	}
 
 	/**
 	 * Filters the post lock window duration.
@@ -2386,18 +2619,20 @@ function wp_ajax_wp_remove_post_lock() {
  */
 function wp_ajax_dismiss_wp_pointer() {
 	$pointer = $_POST['pointer'];
-	if ( $pointer != sanitize_key( $pointer ) )
+	if ( $pointer != sanitize_key( $pointer ) ) {
 		wp_die( 0 );
+	}
 
-//	check_ajax_referer( 'dismiss-pointer_' . $pointer );
+	//  check_ajax_referer( 'dismiss-pointer_' . $pointer );
 
 	$dismissed = array_filter( explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) ) );
 
-	if ( in_array( $pointer, $dismissed ) )
+	if ( in_array( $pointer, $dismissed ) ) {
 		wp_die( 0 );
+	}
 
 	$dismissed[] = $pointer;
-	$dismissed = implode( ',', $dismissed );
+	$dismissed   = implode( ',', $dismissed );
 
 	update_user_meta( get_current_user_id(), 'dismissed_wp_pointers', $dismissed );
 	wp_die( 1 );
@@ -2409,23 +2644,29 @@ function wp_ajax_dismiss_wp_pointer() {
  * @since 3.5.0
  */
 function wp_ajax_get_attachment() {
-	if ( ! isset( $_REQUEST['id'] ) )
+	if ( ! isset( $_REQUEST['id'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
+	if ( ! $id = absint( $_REQUEST['id'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! $post = get_post( $id ) )
+	if ( ! $post = get_post( $id ) ) {
 		wp_send_json_error();
+	}
 
-	if ( 'attachment' != $post->post_type )
+	if ( 'attachment' != $post->post_type ) {
 		wp_send_json_error();
+	}
 
-	if ( ! current_user_can( 'upload_files' ) )
+	if ( ! current_user_can( 'upload_files' ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) )
+	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) {
 		wp_send_json_error();
+	}
 
 	wp_send_json_success( $attachment );
 }
@@ -2436,13 +2677,23 @@ function wp_ajax_get_attachment() {
  * @since 3.5.0
  */
 function wp_ajax_query_attachments() {
-	if ( ! current_user_can( 'upload_files' ) )
+	if ( ! current_user_can( 'upload_files' ) ) {
 		wp_send_json_error();
+	}
 
 	$query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
-	$keys = array(
-		's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type',
-		'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum'
+	$keys  = array(
+		's',
+		'order',
+		'orderby',
+		'posts_per_page',
+		'paged',
+		'post_mime_type',
+		'post_parent',
+		'post__in',
+		'post__not_in',
+		'year',
+		'monthnum',
 	);
 	foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) {
 		if ( $t->query_var && isset( $query[ $t->query_var ] ) ) {
@@ -2450,7 +2701,7 @@ function wp_ajax_query_attachments() {
 		}
 	}
 
-	$query = array_intersect_key( $query, array_flip( $keys ) );
+	$query              = array_intersect_key( $query, array_flip( $keys ) );
 	$query['post_type'] = 'attachment';
 	if ( MEDIA_TRASH
 		&& ! empty( $_REQUEST['query']['post_status'] )
@@ -2460,8 +2711,9 @@ function wp_ajax_query_attachments() {
 		$query['post_status'] = 'inherit';
 	}
 
-	if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) )
+	if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) ) {
 		$query['post_status'] .= ',private';
+	}
 
 	// Filter query clauses to include filenames.
 	if ( isset( $query['s'] ) ) {
@@ -2493,37 +2745,46 @@ function wp_ajax_query_attachments() {
  * @since 3.5.0
  */
 function wp_ajax_save_attachment() {
-	if ( ! isset( $_REQUEST['id'] ) || ! isset( $_REQUEST['changes'] ) )
+	if ( ! isset( $_REQUEST['id'] ) || ! isset( $_REQUEST['changes'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
+	if ( ! $id = absint( $_REQUEST['id'] ) ) {
 		wp_send_json_error();
+	}
 
 	check_ajax_referer( 'update-post_' . $id, 'nonce' );
 
-	if ( ! current_user_can( 'edit_post', $id ) )
+	if ( ! current_user_can( 'edit_post', $id ) ) {
 		wp_send_json_error();
+	}
 
 	$changes = $_REQUEST['changes'];
 	$post    = get_post( $id, ARRAY_A );
 
-	if ( 'attachment' != $post['post_type'] )
+	if ( 'attachment' != $post['post_type'] ) {
 		wp_send_json_error();
+	}
 
-	if ( isset( $changes['parent'] ) )
+	if ( isset( $changes['parent'] ) ) {
 		$post['post_parent'] = $changes['parent'];
+	}
 
-	if ( isset( $changes['title'] ) )
+	if ( isset( $changes['title'] ) ) {
 		$post['post_title'] = $changes['title'];
+	}
 
-	if ( isset( $changes['caption'] ) )
+	if ( isset( $changes['caption'] ) ) {
 		$post['post_excerpt'] = $changes['caption'];
+	}
 
-	if ( isset( $changes['description'] ) )
+	if ( isset( $changes['description'] ) ) {
 		$post['post_content'] = $changes['description'];
+	}
 
-	if ( MEDIA_TRASH && isset( $changes['status'] ) )
+	if ( MEDIA_TRASH && isset( $changes['status'] ) ) {
 		$post['post_status'] = $changes['status'];
+	}
 
 	if ( isset( $changes['alt'] ) ) {
 		$alt = wp_unslash( $changes['alt'] );
@@ -2542,7 +2803,7 @@ function wp_ajax_save_attachment() {
 		}
 		foreach ( wp_get_attachment_id3_keys( (object) $post, 'edit' ) as $key => $label ) {
 			if ( isset( $changes[ $key ] ) ) {
-				$changed = true;
+				$changed         = true;
 				$id3data[ $key ] = sanitize_text_field( wp_unslash( $changes[ $key ] ) );
 			}
 		}
@@ -2567,25 +2828,30 @@ function wp_ajax_save_attachment() {
  * @since 3.5.0
  */
 function wp_ajax_save_attachment_compat() {
-	if ( ! isset( $_REQUEST['id'] ) )
+	if ( ! isset( $_REQUEST['id'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
+	if ( ! $id = absint( $_REQUEST['id'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( empty( $_REQUEST['attachments'] ) || empty( $_REQUEST['attachments'][ $id ] ) )
+	if ( empty( $_REQUEST['attachments'] ) || empty( $_REQUEST['attachments'][ $id ] ) ) {
 		wp_send_json_error();
+	}
 	$attachment_data = $_REQUEST['attachments'][ $id ];
 
 	check_ajax_referer( 'update-post_' . $id, 'nonce' );
 
-	if ( ! current_user_can( 'edit_post', $id ) )
+	if ( ! current_user_can( 'edit_post', $id ) ) {
 		wp_send_json_error();
+	}
 
 	$post = get_post( $id, ARRAY_A );
 
-	if ( 'attachment' != $post['post_type'] )
+	if ( 'attachment' != $post['post_type'] ) {
 		wp_send_json_error();
+	}
 
 	/** This filter is documented in wp-admin/includes/media.php */
 	$post = apply_filters( 'attachment_fields_to_save', $post, $attachment_data );
@@ -2598,12 +2864,14 @@ function wp_ajax_save_attachment_compat() {
 	wp_update_post( $post );
 
 	foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
-		if ( isset( $attachment_data[ $taxonomy ] ) )
+		if ( isset( $attachment_data[ $taxonomy ] ) ) {
 			wp_set_object_terms( $id, array_map( 'trim', preg_split( '/,+/', $attachment_data[ $taxonomy ] ) ), $taxonomy, false );
+		}
 	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) )
+	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) {
 		wp_send_json_error();
+	}
 
 	wp_send_json_success( $attachment );
 }
@@ -2614,31 +2882,43 @@ function wp_ajax_save_attachment_compat() {
  * @since 3.5.0
  */
 function wp_ajax_save_attachment_order() {
-	if ( ! isset( $_REQUEST['post_id'] ) )
+	if ( ! isset( $_REQUEST['post_id'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! $post_id = absint( $_REQUEST['post_id'] ) )
+	if ( ! $post_id = absint( $_REQUEST['post_id'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( empty( $_REQUEST['attachments'] ) )
+	if ( empty( $_REQUEST['attachments'] ) ) {
 		wp_send_json_error();
+	}
 
 	check_ajax_referer( 'update-post_' . $post_id, 'nonce' );
 
 	$attachments = $_REQUEST['attachments'];
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
 		wp_send_json_error();
+	}
 
 	foreach ( $attachments as $attachment_id => $menu_order ) {
-		if ( ! current_user_can( 'edit_post', $attachment_id ) )
+		if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
 			continue;
-		if ( ! $attachment = get_post( $attachment_id ) )
+		}
+		if ( ! $attachment = get_post( $attachment_id ) ) {
 			continue;
-		if ( 'attachment' != $attachment->post_type )
+		}
+		if ( 'attachment' != $attachment->post_type ) {
 			continue;
+		}
 
-		wp_update_post( array( 'ID' => $attachment_id, 'menu_order' => $menu_order ) );
+		wp_update_post(
+			array(
+				'ID'         => $attachment_id,
+				'menu_order' => $menu_order,
+			)
+		);
 	}
 
 	wp_send_json_success();
@@ -2660,28 +2940,35 @@ function wp_ajax_send_attachment_to_editor() {
 
 	$id = intval( $attachment['id'] );
 
-	if ( ! $post = get_post( $id ) )
+	if ( ! $post = get_post( $id ) ) {
 		wp_send_json_error();
+	}
 
-	if ( 'attachment' != $post->post_type )
+	if ( 'attachment' != $post->post_type ) {
 		wp_send_json_error();
+	}
 
 	if ( current_user_can( 'edit_post', $id ) ) {
 		// If this attachment is unattached, attach it. Primarily a back compat thing.
 		if ( 0 == $post->post_parent && $insert_into_post_id = intval( $_POST['post_id'] ) ) {
-			wp_update_post( array( 'ID' => $id, 'post_parent' => $insert_into_post_id ) );
+			wp_update_post(
+				array(
+					'ID'          => $id,
+					'post_parent' => $insert_into_post_id,
+				)
+			);
 		}
 	}
 
 	$url = empty( $attachment['url'] ) ? '' : $attachment['url'];
-	$rel = ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url );
+	$rel = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $id ) == $url );
 
 	remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' );
 
 	if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
 		$align = isset( $attachment['align'] ) ? $attachment['align'] : 'none';
-		$size = isset( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
-		$alt = isset( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
+		$size  = isset( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
+		$alt   = isset( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
 
 		// No whitespace-only captions.
 		$caption = isset( $attachment['post_excerpt'] ) ? $attachment['post_excerpt'] : '';
@@ -2690,12 +2977,12 @@ function wp_ajax_send_attachment_to_editor() {
 		}
 
 		$title = ''; // We no longer insert title tags into <img> tags, as they are redundant.
-		$html = get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt );
-	} elseif ( wp_attachment_is( 'video', $post ) || wp_attachment_is( 'audio', $post )  ) {
+		$html  = get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt );
+	} elseif ( wp_attachment_is( 'video', $post ) || wp_attachment_is( 'audio', $post ) ) {
 		$html = stripslashes_deep( $_POST['html'] );
 	} else {
 		$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
-		$rel = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized
+		$rel  = $rel ? ' rel="attachment wp-att-' . $id . '"' : ''; // Hard-coded string, $id is already sanitized
 
 		if ( ! empty( $url ) ) {
 			$html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';
@@ -2728,22 +3015,26 @@ function wp_ajax_send_link_to_editor() {
 
 	check_ajax_referer( 'media-send-to-editor', 'nonce' );
 
-	if ( ! $src = wp_unslash( $_POST['src'] ) )
+	if ( ! $src = wp_unslash( $_POST['src'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! strpos( $src, '://' ) )
+	if ( ! strpos( $src, '://' ) ) {
 		$src = 'http://' . $src;
+	}
 
-	if ( ! $src = esc_url_raw( $src ) )
+	if ( ! $src = esc_url_raw( $src ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) )
+	if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) ) {
 		$link_text = wp_basename( $src );
+	}
 
 	$post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 );
 
 	// Ping WordPress for an embed.
-	$check_embed = $wp_embed->run_shortcode( '[embed]'. $src .'[/embed]' );
+	$check_embed = $wp_embed->run_shortcode( '[embed]' . $src . '[/embed]' );
 
 	// Fallback that WordPress creates when no oEmbed was found.
 	$fallback = $wp_embed->maybe_make_link( $src );
@@ -2760,8 +3051,9 @@ function wp_ajax_send_link_to_editor() {
 	// Figure out what filter to run:
 	$type = 'file';
 	if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
-		&& ( 'audio' == $ext_type || 'video' == $ext_type ) )
+		&& ( 'audio' == $ext_type || 'video' == $ext_type ) ) {
 			$type = $ext_type;
+	}
 
 	/** This filter is documented in wp-admin/includes/media.php */
 	$html = apply_filters( "{$type}_send_to_editor_url", $html, $src, $link_text );
@@ -2781,12 +3073,12 @@ function wp_ajax_heartbeat() {
 		wp_send_json_error();
 	}
 
-	$response = $data = array();
+	$response    = $data = array();
 	$nonce_state = wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' );
 
 	// screen_id is the same as $current_screen->id and the JS global 'pagenow'.
 	if ( ! empty( $_POST['screen_id'] ) ) {
-		$screen_id = sanitize_key($_POST['screen_id']);
+		$screen_id = sanitize_key( $_POST['screen_id'] );
 	} else {
 		$screen_id = 'front';
 	}
@@ -2854,15 +3146,18 @@ function wp_ajax_heartbeat() {
 function wp_ajax_get_revision_diffs() {
 	require ABSPATH . 'wp-admin/includes/revision.php';
 
-	if ( ! $post = get_post( (int) $_REQUEST['post_id'] ) )
+	if ( ! $post = get_post( (int) $_REQUEST['post_id'] ) ) {
 		wp_send_json_error();
+	}
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
 		wp_send_json_error();
+	}
 
 	// Really just pre-loading the cache here.
-	if ( ! $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) ) )
+	if ( ! $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) ) ) {
 		wp_send_json_error();
+	}
 
 	$return = array();
 	@set_time_limit( 0 );
@@ -2871,7 +3166,7 @@ function wp_ajax_get_revision_diffs() {
 		list( $compare_from, $compare_to ) = explode( ':', $compare_key ); // from:to
 
 		$return[] = array(
-			'id' => $compare_key,
+			'id'     => $compare_key,
 			'fields' => wp_get_revision_ui_diff( $post, $compare_from, $compare_to ),
 		);
 	}
@@ -2900,10 +3195,12 @@ function wp_ajax_save_user_color_scheme() {
 	$previous_color_scheme = get_user_meta( get_current_user_id(), 'admin_color', true );
 	update_user_meta( get_current_user_id(), 'admin_color', $color_scheme );
 
-	wp_send_json_success( array(
-		'previousScheme' => 'admin-color-' . $previous_color_scheme,
-		'currentScheme'  => 'admin-color-' . $color_scheme
-	) );
+	wp_send_json_success(
+		array(
+			'previousScheme' => 'admin-color-' . $previous_color_scheme,
+			'currentScheme'  => 'admin-color-' . $color_scheme,
+		)
+	);
 }
 
 /**
@@ -2921,10 +3218,12 @@ function wp_ajax_query_themes() {
 		wp_send_json_error();
 	}
 
-	$args = wp_parse_args( wp_unslash( $_REQUEST['request'] ), array(
-		'per_page' => 20,
-		'fields'   => $theme_field_defaults
-	) );
+	$args = wp_parse_args(
+		wp_unslash( $_REQUEST['request'] ), array(
+			'per_page' => 20,
+			'fields'   => $theme_field_defaults,
+		)
+	);
 
 	if ( isset( $args['browse'] ) && 'favorites' === $args['browse'] && ! isset( $args['user'] ) ) {
 		$user = get_user_option( 'wporg_favorites' );
@@ -2946,38 +3245,53 @@ function wp_ajax_query_themes() {
 
 	$update_php = network_admin_url( 'update.php?action=install-theme' );
 	foreach ( $api->themes as &$theme ) {
-		$theme->install_url = add_query_arg( array(
-			'theme'    => $theme->slug,
-			'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug )
-		), $update_php );
+		$theme->install_url = add_query_arg(
+			array(
+				'theme'    => $theme->slug,
+				'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
+			), $update_php
+		);
 
 		if ( current_user_can( 'switch_themes' ) ) {
 			if ( is_multisite() ) {
-				$theme->activate_url = add_query_arg( array(
-					'action'   => 'enable',
-					'_wpnonce' => wp_create_nonce( 'enable-theme_' . $theme->slug ),
-					'theme'    => $theme->slug,
-				), network_admin_url( 'themes.php' ) );
+				$theme->activate_url = add_query_arg(
+					array(
+						'action'   => 'enable',
+						'_wpnonce' => wp_create_nonce( 'enable-theme_' . $theme->slug ),
+						'theme'    => $theme->slug,
+					), network_admin_url( 'themes.php' )
+				);
 			} else {
-				$theme->activate_url = add_query_arg( array(
-					'action'     => 'activate',
-					'_wpnonce'   => wp_create_nonce( 'switch-theme_' . $theme->slug ),
-					'stylesheet' => $theme->slug,
-				), admin_url( 'themes.php' ) );
+				$theme->activate_url = add_query_arg(
+					array(
+						'action'     => 'activate',
+						'_wpnonce'   => wp_create_nonce( 'switch-theme_' . $theme->slug ),
+						'stylesheet' => $theme->slug,
+					), admin_url( 'themes.php' )
+				);
 			}
 		}
 
 		if ( ! is_multisite() && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$theme->customize_url = add_query_arg( array(
-				'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
-			), wp_customize_url( $theme->slug ) );
+			$theme->customize_url = add_query_arg(
+				array(
+					'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
+				), wp_customize_url( $theme->slug )
+			);
 		}
 
 		$theme->name        = wp_kses( $theme->name, $themes_allowedtags );
 		$theme->author      = wp_kses( $theme->author, $themes_allowedtags );
 		$theme->version     = wp_kses( $theme->version, $themes_allowedtags );
 		$theme->description = wp_kses( $theme->description, $themes_allowedtags );
-		$theme->stars       = wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings, 'echo' => false ) );
+		$theme->stars       = wp_star_rating(
+			array(
+				'rating' => $theme->rating,
+				'type'   => 'percent',
+				'number' => $theme->num_ratings,
+				'echo'   => false,
+			)
+		);
 		$theme->num_ratings = number_format_i18n( $theme->num_ratings );
 		$theme->preview_url = set_url_scheme( $theme->preview_url );
 	}
@@ -3001,7 +3315,7 @@ function wp_ajax_parse_embed() {
 	if ( empty( $_POST['shortcode'] ) ) {
 		wp_send_json_error();
 	}
-	$post_id = isset( $_POST[ 'post_ID' ] ) ? intval( $_POST[ 'post_ID' ] ) : 0;
+	$post_id = isset( $_POST['post_ID'] ) ? intval( $_POST['post_ID'] ) : 0;
 	if ( $post_id > 0 ) {
 		$post = get_post( $post_id );
 		if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
@@ -3024,7 +3338,7 @@ function wp_ajax_parse_embed() {
 		$url = '';
 	}
 
-	$parsed = false;
+	$parsed                         = false;
 	$wp_embed->return_false_on_fail = true;
 
 	if ( 0 === $post_id ) {
@@ -3040,7 +3354,7 @@ function wp_ajax_parse_embed() {
 		// Admin is ssl and the user pasted non-ssl URL.
 		// Check if the provider supports ssl embeds and use that for the preview.
 		$ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode );
-		$parsed = $wp_embed->run_shortcode( $ssl_shortcode );
+		$parsed        = $wp_embed->run_shortcode( $ssl_shortcode );
 
 		if ( ! $parsed ) {
 			$no_ssl_support = true;
@@ -3061,14 +3375,16 @@ function wp_ajax_parse_embed() {
 	}
 
 	if ( ! $parsed ) {
-		wp_send_json_error( array(
-			'type' => 'not-embeddable',
-			'message' => sprintf( __( '%s failed to embed.' ), '<code>' . esc_html( $url ) . '</code>' ),
-		) );
+		wp_send_json_error(
+			array(
+				'type'    => 'not-embeddable',
+				'message' => sprintf( __( '%s failed to embed.' ), '<code>' . esc_html( $url ) . '</code>' ),
+			)
+		);
 	}
 
 	if ( has_shortcode( $parsed, 'audio' ) || has_shortcode( $parsed, 'video' ) ) {
-		$styles = '';
+		$styles     = '';
 		$mce_styles = wpview_media_sandbox_styles();
 		foreach ( $mce_styles as $style ) {
 			$styles .= sprintf( '<link rel="stylesheet" href="%s"/>', $style );
@@ -3090,15 +3406,17 @@ function wp_ajax_parse_embed() {
 	if ( ! empty( $no_ssl_support ) || ( is_ssl() && ( preg_match( '%<(iframe|script|embed) [^>]*src="http://%', $parsed ) ||
 		preg_match( '%<link [^>]*href="http://%', $parsed ) ) ) ) {
 		// Admin is ssl and the embed is not. Iframes, scripts, and other "active content" will be blocked.
-		wp_send_json_error( array(
-			'type' => 'not-ssl',
-			'message' => __( 'This preview is unavailable in the editor.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'type'    => 'not-ssl',
+				'message' => __( 'This preview is unavailable in the editor.' ),
+			)
+		);
 	}
 
 	$return = array(
 		'body' => $parsed,
-		'attr' => $wp_embed->last_attr
+		'attr' => $wp_embed->last_attr,
 	);
 
 	if ( strpos( $parsed, 'class="wp-embedded-content' ) ) {
@@ -3108,7 +3426,7 @@ function wp_ajax_parse_embed() {
 			$script_src = includes_url( 'js/wp-embed.min.js' );
 		}
 
-		$return['head'] = '<script src="' . $script_src . '"></script>';
+		$return['head']    = '<script src="' . $script_src . '"></script>';
 		$return['sandbox'] = true;
 	}
 
@@ -3143,16 +3461,18 @@ function wp_ajax_parse_media_shortcode() {
 		setup_postdata( $post );
 	}
 
-	$parsed = do_shortcode( $shortcode  );
+	$parsed = do_shortcode( $shortcode );
 
 	if ( empty( $parsed ) ) {
-		wp_send_json_error( array(
-			'type' => 'no-items',
-			'message' => __( 'No items found.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'type'    => 'no-items',
+				'message' => __( 'No items found.' ),
+			)
+		);
 	}
 
-	$head = '';
+	$head   = '';
 	$styles = wpview_media_sandbox_styles();
 
 	foreach ( $styles as $style ) {
@@ -3175,10 +3495,12 @@ function wp_ajax_parse_media_shortcode() {
 		wp_print_scripts( array( 'mediaelement-vimeo', 'wp-mediaelement' ) );
 	}
 
-	wp_send_json_success( array(
-		'head' => $head,
-		'body' => ob_get_clean()
-	) );
+	wp_send_json_success(
+		array(
+			'head' => $head,
+			'body' => ob_get_clean(),
+		)
+	);
 }
 
 /**
@@ -3197,9 +3519,11 @@ function wp_ajax_destroy_sessions() {
 	}
 
 	if ( ! $user ) {
-		wp_send_json_error( array(
-			'message' => __( 'Could not log out user sessions. Please try again.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'message' => __( 'Could not log out user sessions. Please try again.' ),
+			)
+		);
 	}
 
 	$sessions = WP_Session_Tokens::get_instance( $user->ID );
@@ -3268,7 +3592,6 @@ function wp_ajax_crop_image() {
 			break;
 
 		default:
-
 			/**
 			 * Fires before a cropped image is saved.
 			 *
@@ -3300,7 +3623,7 @@ function wp_ajax_crop_image() {
 			);
 
 			$attachment_id = wp_insert_attachment( $object, $cropped );
-			$metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
+			$metadata      = wp_generate_attachment_metadata( $attachment_id, $cropped );
 
 			/**
 			 * Filters the cropped image attachment metadata.
@@ -3371,11 +3694,13 @@ function wp_ajax_install_theme() {
 	check_ajax_referer( 'updates' );
 
 	if ( empty( $_POST['slug'] ) ) {
-		wp_send_json_error( array(
-			'slug'         => '',
-			'errorCode'    => 'no_theme_specified',
-			'errorMessage' => __( 'No theme specified.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'slug'         => '',
+				'errorCode'    => 'no_theme_specified',
+				'errorMessage' => __( 'No theme specified.' ),
+			)
+		);
 	}
 
 	$slug = sanitize_key( wp_unslash( $_POST['slug'] ) );
@@ -3393,10 +3718,12 @@ function wp_ajax_install_theme() {
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	include_once( ABSPATH . 'wp-admin/includes/theme.php' );
 
-	$api = themes_api( 'theme_information', array(
-		'slug'   => $slug,
-		'fields' => array( 'sections' => false ),
-	) );
+	$api = themes_api(
+		'theme_information', array(
+			'slug'   => $slug,
+			'fields' => array( 'sections' => false ),
+		)
+	);
 
 	if ( is_wp_error( $api ) ) {
 		$status['errorMessage'] = $api->get_error_message();
@@ -3440,24 +3767,30 @@ function wp_ajax_install_theme() {
 
 	if ( current_user_can( 'switch_themes' ) ) {
 		if ( is_multisite() ) {
-			$status['activateUrl'] = add_query_arg( array(
-				'action'   => 'enable',
-				'_wpnonce' => wp_create_nonce( 'enable-theme_' . $slug ),
-				'theme'    => $slug,
-			), network_admin_url( 'themes.php' ) );
+			$status['activateUrl'] = add_query_arg(
+				array(
+					'action'   => 'enable',
+					'_wpnonce' => wp_create_nonce( 'enable-theme_' . $slug ),
+					'theme'    => $slug,
+				), network_admin_url( 'themes.php' )
+			);
 		} else {
-			$status['activateUrl'] = add_query_arg( array(
-				'action'     => 'activate',
-				'_wpnonce'   => wp_create_nonce( 'switch-theme_' . $slug ),
-				'stylesheet' => $slug,
-			), admin_url( 'themes.php' ) );
+			$status['activateUrl'] = add_query_arg(
+				array(
+					'action'     => 'activate',
+					'_wpnonce'   => wp_create_nonce( 'switch-theme_' . $slug ),
+					'stylesheet' => $slug,
+				), admin_url( 'themes.php' )
+			);
 		}
 	}
 
 	if ( ! is_multisite() && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-		$status['customizeUrl'] = add_query_arg( array(
-			'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
-		), wp_customize_url( $slug ) );
+		$status['customizeUrl'] = add_query_arg(
+			array(
+				'return' => urlencode( network_admin_url( 'theme-install.php', 'relative' ) ),
+			), wp_customize_url( $slug )
+		);
 	}
 
 	/*
@@ -3480,11 +3813,13 @@ function wp_ajax_update_theme() {
 	check_ajax_referer( 'updates' );
 
 	if ( empty( $_POST['slug'] ) ) {
-		wp_send_json_error( array(
-			'slug'         => '',
-			'errorCode'    => 'no_theme_specified',
-			'errorMessage' => __( 'No theme specified.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'slug'         => '',
+				'errorCode'    => 'no_theme_specified',
+				'errorMessage' => __( 'No theme specified.' ),
+			)
+		);
 	}
 
 	$stylesheet = preg_replace( '/[^A-z0-9_\-]/', '', wp_unslash( $_POST['slug'] ) );
@@ -3573,11 +3908,13 @@ function wp_ajax_delete_theme() {
 	check_ajax_referer( 'updates' );
 
 	if ( empty( $_POST['slug'] ) ) {
-		wp_send_json_error( array(
-			'slug'         => '',
-			'errorCode'    => 'no_theme_specified',
-			'errorMessage' => __( 'No theme specified.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'slug'         => '',
+				'errorCode'    => 'no_theme_specified',
+				'errorMessage' => __( 'No theme specified.' ),
+			)
+		);
 	}
 
 	$stylesheet = preg_replace( '/[^A-z0-9_\-]/', '', wp_unslash( $_POST['slug'] ) );
@@ -3643,11 +3980,13 @@ function wp_ajax_install_plugin() {
 	check_ajax_referer( 'updates' );
 
 	if ( empty( $_POST['slug'] ) ) {
-		wp_send_json_error( array(
-			'slug'         => '',
-			'errorCode'    => 'no_plugin_specified',
-			'errorMessage' => __( 'No plugin specified.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'slug'         => '',
+				'errorCode'    => 'no_plugin_specified',
+				'errorMessage' => __( 'No plugin specified.' ),
+			)
+		);
 	}
 
 	$status = array(
@@ -3663,12 +4002,14 @@ function wp_ajax_install_plugin() {
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
 
-	$api = plugins_api( 'plugin_information', array(
-		'slug'   => sanitize_key( wp_unslash( $_POST['slug'] ) ),
-		'fields' => array(
-			'sections' => false,
-		),
-	) );
+	$api = plugins_api(
+		'plugin_information', array(
+			'slug'   => sanitize_key( wp_unslash( $_POST['slug'] ) ),
+			'fields' => array(
+				'sections' => false,
+			),
+		)
+	);
 
 	if ( is_wp_error( $api ) ) {
 		$status['errorMessage'] = $api->get_error_message();
@@ -3711,17 +4052,19 @@ function wp_ajax_install_plugin() {
 	}
 
 	$install_status = install_plugin_install_status( $api );
-	$pagenow = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
+	$pagenow        = isset( $_POST['pagenow'] ) ? sanitize_key( $_POST['pagenow'] ) : '';
 
 	// If installation request is coming from import page, do not return network activation link.
 	$plugins_url = ( 'import' === $pagenow ) ? admin_url( 'plugins.php' ) : network_admin_url( 'plugins.php' );
 
 	if ( current_user_can( 'activate_plugin', $install_status['file'] ) && is_plugin_inactive( $install_status['file'] ) ) {
-		$status['activateUrl'] = add_query_arg( array(
-			'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $install_status['file'] ),
-			'action'   => 'activate',
-			'plugin'   => $install_status['file'],
-		), $plugins_url );
+		$status['activateUrl'] = add_query_arg(
+			array(
+				'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $install_status['file'] ),
+				'action'   => 'activate',
+				'plugin'   => $install_status['file'],
+			), $plugins_url
+		);
 	}
 
 	if ( is_multisite() && current_user_can( 'manage_network_plugins' ) && 'import' !== $pagenow ) {
@@ -3744,11 +4087,13 @@ function wp_ajax_update_plugin() {
 	check_ajax_referer( 'updates' );
 
 	if ( empty( $_POST['plugin'] ) || empty( $_POST['slug'] ) ) {
-		wp_send_json_error( array(
-			'slug'         => '',
-			'errorCode'    => 'no_plugin_specified',
-			'errorMessage' => __( 'No plugin specified.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'slug'         => '',
+				'errorCode'    => 'no_plugin_specified',
+				'errorMessage' => __( 'No plugin specified.' ),
+			)
+		);
 	}
 
 	$plugin = plugin_basename( sanitize_text_field( wp_unslash( $_POST['plugin'] ) ) );
@@ -3849,11 +4194,13 @@ function wp_ajax_delete_plugin() {
 	check_ajax_referer( 'updates' );
 
 	if ( empty( $_POST['slug'] ) || empty( $_POST['plugin'] ) ) {
-		wp_send_json_error( array(
-			'slug'         => '',
-			'errorCode'    => 'no_plugin_specified',
-			'errorMessage' => __( 'No plugin specified.' ),
-		) );
+		wp_send_json_error(
+			array(
+				'slug'         => '',
+				'errorCode'    => 'no_plugin_specified',
+				'errorMessage' => __( 'No plugin specified.' ),
+			)
+		);
 	}
 
 	$plugin = plugin_basename( sanitize_text_field( wp_unslash( $_POST['plugin'] ) ) );
@@ -3925,9 +4272,11 @@ function wp_ajax_search_plugins() {
 	}
 
 	/** @var WP_Plugins_List_Table $wp_list_table */
-	$wp_list_table = _get_list_table( 'WP_Plugins_List_Table', array(
-		'screen' => get_current_screen(),
-	) );
+	$wp_list_table = _get_list_table(
+		'WP_Plugins_List_Table', array(
+			'screen' => get_current_screen(),
+		)
+	);
 
 	$status = array();
 
@@ -3937,10 +4286,14 @@ function wp_ajax_search_plugins() {
 	}
 
 	// Set the correct requester, so pagination works.
-	$_SERVER['REQUEST_URI'] = add_query_arg( array_diff_key( $_POST, array(
-		'_ajax_nonce' => null,
-		'action'      => null,
-	) ), network_admin_url( 'plugins.php', 'relative' ) );
+	$_SERVER['REQUEST_URI'] = add_query_arg(
+		array_diff_key(
+			$_POST, array(
+				'_ajax_nonce' => null,
+				'action'      => null,
+			)
+		), network_admin_url( 'plugins.php', 'relative' )
+	);
 
 	$GLOBALS['s'] = wp_unslash( $_POST['s'] );
 
@@ -3968,9 +4321,11 @@ 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(
-		'screen' => get_current_screen(),
-	) );
+	$wp_list_table = _get_list_table(
+		'WP_Plugin_Install_List_Table', array(
+			'screen' => get_current_screen(),
+		)
+	);
 
 	$status = array();
 
@@ -3980,10 +4335,14 @@ function wp_ajax_search_install_plugins() {
 	}
 
 	// Set the correct requester, so pagination works.
-	$_SERVER['REQUEST_URI'] = add_query_arg( array_diff_key( $_POST, array(
-		'_ajax_nonce' => null,
-		'action'      => null,
-	) ), network_admin_url( 'plugin-install.php', 'relative' ) );
+	$_SERVER['REQUEST_URI'] = add_query_arg(
+		array_diff_key(
+			$_POST, array(
+				'_ajax_nonce' => null,
+				'action'      => null,
+			)
+		), network_admin_url( 'plugin-install.php', 'relative' )
+	);
 
 	$wp_list_table->prepare_items();
 
@@ -4004,16 +4363,20 @@ function wp_ajax_search_install_plugins() {
 function wp_ajax_edit_theme_plugin_file() {
 	$r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) ); // Validation of args is done in wp_edit_theme_plugin_file().
 	if ( is_wp_error( $r ) ) {
-		wp_send_json_error( array_merge(
-			array(
-				'code' => $r->get_error_code(),
-				'message' => $r->get_error_message(),
-			),
-			(array) $r->get_error_data()
-		) );
+		wp_send_json_error(
+			array_merge(
+				array(
+					'code'    => $r->get_error_code(),
+					'message' => $r->get_error_message(),
+				),
+				(array) $r->get_error_data()
+			)
+		);
 	} else {
-		wp_send_json_success( array(
-			'message' => __( 'File edited successfully.' ),
-		) );
+		wp_send_json_success(
+			array(
+				'message' => __( 'File edited successfully.' ),
+			)
+		);
 	}
 }
diff --git a/wp-admin/includes/bookmark.php b/wp-admin/includes/bookmark.php
index 0f7365ee24..285d716c2a 100644
--- a/wp-admin/includes/bookmark.php
+++ b/wp-admin/includes/bookmark.php
@@ -34,15 +34,16 @@ function edit_link( $link_id = 0 ) {
 		);
 	}
 
-	$_POST['link_url'] = esc_html( $_POST['link_url'] );
-	$_POST['link_url'] = esc_url($_POST['link_url']);
-	$_POST['link_name'] = esc_html( $_POST['link_name'] );
+	$_POST['link_url']   = esc_html( $_POST['link_url'] );
+	$_POST['link_url']   = esc_url( $_POST['link_url'] );
+	$_POST['link_name']  = esc_html( $_POST['link_name'] );
 	$_POST['link_image'] = esc_html( $_POST['link_image'] );
-	$_POST['link_rss'] = esc_url($_POST['link_rss']);
-	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
+	$_POST['link_rss']   = esc_url( $_POST['link_rss'] );
+	if ( ! isset( $_POST['link_visible'] ) || 'N' != $_POST['link_visible'] ) {
 		$_POST['link_visible'] = 'Y';
+	}
 
-	if ( !empty( $link_id ) ) {
+	if ( ! empty( $link_id ) ) {
 		$_POST['link_id'] = $link_id;
 		return wp_update_link( $_POST );
 	} else {
@@ -59,15 +60,17 @@ function edit_link( $link_id = 0 ) {
  */
 function get_default_link_to_edit() {
 	$link = new stdClass;
-	if ( isset( $_GET['linkurl'] ) )
+	if ( isset( $_GET['linkurl'] ) ) {
 		$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
-	else
+	} else {
 		$link->link_url = '';
+	}
 
-	if ( isset( $_GET['name'] ) )
+	if ( isset( $_GET['name'] ) ) {
 		$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
-	else
+	} else {
 		$link->link_name = '';
+	}
 
 	$link->link_visible = 'Y';
 
@@ -122,7 +125,7 @@ function wp_delete_link( $link_id ) {
  * @return array The requested link's categories
  */
 function wp_get_link_cats( $link_id = 0 ) {
-	$cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') );
+	$cats = wp_get_object_terms( $link_id, 'link_category', array( 'fields' => 'ids' ) );
 	return array_unique( $cats );
 }
 
@@ -152,10 +155,15 @@ function get_link_to_edit( $link ) {
 function wp_insert_link( $linkdata, $wp_error = false ) {
 	global $wpdb;
 
-	$defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
+	$defaults = array(
+		'link_id'     => 0,
+		'link_name'   => '',
+		'link_url'    => '',
+		'link_rating' => 0,
+	);
 
 	$args = wp_parse_args( $linkdata, $defaults );
-	$r = wp_unslash( sanitize_bookmark( $args, 'db' ) );
+	$r    = wp_unslash( sanitize_bookmark( $args, 'db' ) );
 
 	$link_id   = $r['link_id'];
 	$link_name = $r['link_name'];
@@ -249,8 +257,9 @@ function wp_insert_link( $linkdata, $wp_error = false ) {
  */
 function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
 	// If $link_categories isn't already an array, make it one:
-	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) )
+	if ( ! is_array( $link_categories ) || 0 == count( $link_categories ) ) {
 		$link_categories = array( get_option( 'default_link_category' ) );
+	}
 
 	$link_categories = array_map( 'intval', $link_categories );
 	$link_categories = array_unique( $link_categories );
@@ -277,13 +286,14 @@ function wp_update_link( $linkdata ) {
 	$link = wp_slash( $link );
 
 	// Passed link category list overwrites existing category list if not empty.
-	if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] ) && 0 != count( $linkdata['link_category'] ) )
+	if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] ) && 0 != count( $linkdata['link_category'] ) ) {
 		$link_cats = $linkdata['link_category'];
-	else
+	} else {
 		$link_cats = $link['link_category'];
+	}
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$linkdata = array_merge( $link, $linkdata );
+	$linkdata                  = array_merge( $link, $linkdata );
 	$linkdata['link_category'] = $link_cats;
 
 	return wp_insert_link( $linkdata );
@@ -299,8 +309,9 @@ function wp_update_link( $linkdata ) {
  */
 function wp_link_manager_disabled_message() {
 	global $pagenow;
-	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow )
+	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow ) {
 		return;
+	}
 
 	add_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
 	$really_can_manage_links = current_user_can( 'manage_links' );
diff --git a/wp-admin/includes/class-automatic-upgrader-skin.php b/wp-admin/includes/class-automatic-upgrader-skin.php
index dd37da96db..571068d691 100644
--- a/wp-admin/includes/class-automatic-upgrader-skin.php
+++ b/wp-admin/includes/class-automatic-upgrader-skin.php
@@ -50,7 +50,6 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_upgrade_messages() {
@@ -58,7 +57,6 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
 	}
 
 	/**
-	 *
 	 * @param string|array|WP_Error $data
 	 */
 	public function feedback( $data ) {
@@ -69,30 +67,35 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
+		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
 			$string = $this->upgrader->strings[ $string ];
+		}
 
 		if ( strpos( $string, '%' ) !== false ) {
 			$args = func_get_args();
 			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
+			if ( ! empty( $args ) ) {
 				$string = vsprintf( $string, $args );
+			}
 		}
 
 		$string = trim( $string );
 
 		// 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(
-			'a' => array(
-				'href' => true
-			),
-			'br' => true,
-			'em' => true,
-			'strong' => true,
-		) );
+		$string = wp_kses(
+			$string, array(
+				'a'      => array(
+					'href' => true,
+				),
+				'br'     => true,
+				'em'     => true,
+				'strong' => true,
+			)
+		);
 
-		if ( empty( $string ) )
+		if ( empty( $string ) ) {
 			return;
+		}
 
 		$this->messages[] = $string;
 	}
@@ -107,7 +110,8 @@ class Automatic_Upgrader_Skin extends WP_Upgrader_Skin {
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
+		if ( ! empty( $output ) ) {
 			$this->feedback( $output );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-bulk-plugin-upgrader-skin.php b/wp-admin/includes/class-bulk-plugin-upgrader-skin.php
index 34dcbd441f..bb85e88be2 100644
--- a/wp-admin/includes/class-bulk-plugin-upgrader-skin.php
+++ b/wp-admin/includes/class-bulk-plugin-upgrader-skin.php
@@ -20,23 +20,21 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
 
 	public function add_strings() {
 		parent::add_strings();
-		$this->upgrader->strings['skin_before_update_header'] = __('Updating Plugin %1$s (%2$d/%3$d)');
+		$this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)' );
 	}
 
 	/**
-	 *
 	 * @param string $title
 	 */
-	public function before($title = '') {
-		parent::before($this->plugin_info['Title']);
+	public function before( $title = '' ) {
+		parent::before( $this->plugin_info['Title'] );
 	}
 
 	/**
-	 *
 	 * @param string $title
 	 */
-	public function after($title = '') {
-		parent::after($this->plugin_info['Title']);
+	public function after( $title = '' ) {
+		parent::after( $this->plugin_info['Title'] );
 		$this->decrement_update_count( 'plugin' );
 	}
 
@@ -44,12 +42,13 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
+		$update_actions = array(
 			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>',
 		);
-		if ( ! current_user_can( 'activate_plugins' ) )
+		if ( ! current_user_can( 'activate_plugins' ) ) {
 			unset( $update_actions['plugins_page'] );
+		}
 
 		/**
 		 * Filters the list of action links available following bulk plugin updates.
@@ -61,7 +60,8 @@ class Bulk_Plugin_Upgrader_Skin extends Bulk_Upgrader_Skin {
 		 */
 		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty( $update_actions ) ) {
+			$this->feedback( implode( ' | ', (array) $update_actions ) );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-bulk-theme-upgrader-skin.php b/wp-admin/includes/class-bulk-theme-upgrader-skin.php
index 85ee6f2e54..8f01c314a3 100644
--- a/wp-admin/includes/class-bulk-theme-upgrader-skin.php
+++ b/wp-admin/includes/class-bulk-theme-upgrader-skin.php
@@ -20,23 +20,21 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
 
 	public function add_strings() {
 		parent::add_strings();
-		$this->upgrader->strings['skin_before_update_header'] = __('Updating Theme %1$s (%2$d/%3$d)');
+		$this->upgrader->strings['skin_before_update_header'] = __( 'Updating Theme %1$s (%2$d/%3$d)' );
 	}
 
 	/**
-	 *
 	 * @param string $title
 	 */
-	public function before($title = '') {
-		parent::before( $this->theme_info->display('Name') );
+	public function before( $title = '' ) {
+		parent::before( $this->theme_info->display( 'Name' ) );
 	}
 
 	/**
-	 *
 	 * @param string $title
 	 */
-	public function after($title = '') {
-		parent::after( $this->theme_info->display('Name') );
+	public function after( $title = '' ) {
+		parent::after( $this->theme_info->display( 'Name' ) );
 		$this->decrement_update_count( 'theme' );
 	}
 
@@ -44,12 +42,13 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
-			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+		$update_actions = array(
+			'themes_page'  => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
+			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>',
 		);
-		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
+		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
 			unset( $update_actions['themes_page'] );
+		}
 
 		/**
 		 * Filters the list of action links available following bulk theme updates.
@@ -61,7 +60,8 @@ class Bulk_Theme_Upgrader_Skin extends Bulk_Upgrader_Skin {
 		 */
 		$update_actions = apply_filters( 'update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty( $update_actions ) ) {
+			$this->feedback( implode( ' | ', (array) $update_actions ) );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-bulk-upgrader-skin.php b/wp-admin/includes/class-bulk-upgrader-skin.php
index 6541de925b..2b2ebd00d5 100644
--- a/wp-admin/includes/class-bulk-upgrader-skin.php
+++ b/wp-admin/includes/class-bulk-upgrader-skin.php
@@ -23,52 +23,56 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 	public $error = false;
 
 	/**
-	 *
 	 * @param array $args
 	 */
-	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '' );
-		$args = wp_parse_args($args, $defaults);
+	public function __construct( $args = array() ) {
+		$defaults = array(
+			'url'   => '',
+			'nonce' => '',
+		);
+		$args     = wp_parse_args( $args, $defaults );
 
-		parent::__construct($args);
+		parent::__construct( $args );
 	}
 
 	/**
 	 */
 	public function add_strings() {
-		$this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
+		$this->upgrader->strings['skin_upgrade_start'] = __( 'The update process is starting. This process may take a while on some hosts, so please be patient.' );
 		/* translators: 1: Title of an update, 2: Error message */
-		$this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: %2$s');
+		$this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while updating %1$s: %2$s' );
 		/* translators: 1: Title of an update */
-		$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
+		$this->upgrader->strings['skin_update_failed'] = __( 'The update of %1$s failed.' );
 		/* translators: 1: Title of an update */
 		$this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' );
-		$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
+		$this->upgrader->strings['skin_upgrade_end']       = __( 'All updates have been completed.' );
 	}
 
 	/**
-	 *
 	 * @param string $string
 	 */
-	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
-			$string = $this->upgrader->strings[$string];
+	public function feedback( $string ) {
+		if ( isset( $this->upgrader->strings[ $string ] ) ) {
+			$string = $this->upgrader->strings[ $string ];
+		}
 
-		if ( strpos($string, '%') !== false ) {
+		if ( strpos( $string, '%' ) !== false ) {
 			$args = func_get_args();
-			$args = array_splice($args, 1);
+			$args = array_splice( $args, 1 );
 			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
-				$string = vsprintf($string, $args);
+				$args   = array_map( 'strip_tags', $args );
+				$args   = array_map( 'esc_html', $args );
+				$string = vsprintf( $string, $args );
 			}
 		}
-		if ( empty($string) )
+		if ( empty( $string ) ) {
 			return;
-		if ( $this->in_loop )
+		}
+		if ( $this->in_loop ) {
 			echo "$string<br />\n";
-		else
+		} else {
 			echo "<p>$string</p>\n";
+		}
 	}
 
 	/**
@@ -84,65 +88,64 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 	}
 
 	/**
-	 *
 	 * @param string|WP_Error $error
 	 */
-	public function error($error) {
-		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
-			$this->error = $this->upgrader->strings[$error];
+	public function error( $error ) {
+		if ( is_string( $error ) && isset( $this->upgrader->strings[ $error ] ) ) {
+			$this->error = $this->upgrader->strings[ $error ];
+		}
 
-		if ( is_wp_error($error) ) {
+		if ( is_wp_error( $error ) ) {
 			$messages = array();
 			foreach ( $error->get_error_messages() as $emessage ) {
-				if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
+				if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) {
 					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
-				else
+				} else {
 					$messages[] = $emessage;
+				}
 			}
-			$this->error = implode(', ', $messages);
+			$this->error = implode( ', ', $messages );
 		}
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
 	}
 
 	/**
 	 */
 	public function bulk_header() {
-		$this->feedback('skin_upgrade_start');
+		$this->feedback( 'skin_upgrade_start' );
 	}
 
 	/**
 	 */
 	public function bulk_footer() {
-		$this->feedback('skin_upgrade_end');
+		$this->feedback( 'skin_upgrade_end' );
 	}
 
 	/**
-	 *
 	 * @param string $title
 	 */
-	public function before($title = '') {
+	public function before( $title = '' ) {
 		$this->in_loop = true;
 		printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
+		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
 		// This progress messages div gets moved via JavaScript when clicking on "Show details.".
-		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
+		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
 		$this->flush_output();
 	}
 
 	/**
-	 *
 	 * @param string $title
 	 */
-	public function after($title = '') {
+	public function after( $title = '' ) {
 		echo '</p></div>';
 		if ( $this->error || ! $this->result ) {
 			if ( $this->error ) {
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
+				echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
 			} else {
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '</p></div>';
+				echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>';
 			}
 
-			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
+			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
 		}
 		if ( $this->result && ! is_wp_error( $this->result ) ) {
 			if ( ! $this->error ) {
@@ -152,7 +155,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 					'</p></div>';
 			}
 
-			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
 		}
 
 		$this->reset();
@@ -163,7 +166,7 @@ class Bulk_Upgrader_Skin extends WP_Upgrader_Skin {
 	 */
 	public function reset() {
 		$this->in_loop = false;
-		$this->error = false;
+		$this->error   = false;
 	}
 
 	/**
diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php
index 195e5885e5..0bbf43303f 100644
--- a/wp-admin/includes/class-core-upgrader.php
+++ b/wp-admin/includes/class-core-upgrader.php
@@ -26,15 +26,15 @@ class Core_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 */
 	public function upgrade_strings() {
-		$this->strings['up_to_date'] = __('WordPress is at the latest version.');
-		$this->strings['locked'] = __('Another update is currently in progress.');
-		$this->strings['no_package'] = __('Update package not available.');
+		$this->strings['up_to_date'] = __( 'WordPress is at the latest version.' );
+		$this->strings['locked']     = __( 'Another update is currently in progress.' );
+		$this->strings['no_package'] = __( 'Update package not available.' );
 		/* translators: %s: package URL */
-		$this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
-		$this->strings['copy_failed'] = __('Could not copy files.');
-		$this->strings['copy_failed_space'] = __('Could not copy files. You may have run out of disk space.' );
-		$this->strings['start_rollback'] = __( 'Attempting to roll back to previous version.' );
+		$this->strings['downloading_package']   = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['unpack_package']        = __( 'Unpacking the update&#8230;' );
+		$this->strings['copy_failed']           = __( 'Could not copy files.' );
+		$this->strings['copy_failed_space']     = __( 'Could not copy files. You may have run out of disk space.' );
+		$this->strings['start_rollback']        = __( 'Attempting to roll back to previous version.' );
 		$this->strings['rollback_was_required'] = __( 'Due to an error during updating, WordPress has rolled back to your previous version.' );
 	}
 
@@ -66,10 +66,10 @@ class Core_Upgrader extends WP_Upgrader {
 
 		$start_time = time();
 
-		$defaults = array(
-			'pre_check_md5'    => true,
-			'attempt_rollback' => false,
-			'do_rollback'      => false,
+		$defaults    = array(
+			'pre_check_md5'                => true,
+			'attempt_rollback'             => false,
+			'do_rollback'                  => false,
 			'allow_relaxed_file_ownership' => false,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -78,21 +78,23 @@ class Core_Upgrader extends WP_Upgrader {
 		$this->upgrade_strings();
 
 		// Is an update available?
-		if ( !isset( $current->response ) || $current->response == 'latest' )
-			return new WP_Error('up_to_date', $this->strings['up_to_date']);
+		if ( ! isset( $current->response ) || $current->response == 'latest' ) {
+			return new WP_Error( 'up_to_date', $this->strings['up_to_date'] );
+		}
 
 		$res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] );
 		if ( ! $res || is_wp_error( $res ) ) {
 			return $res;
 		}
 
-		$wp_dir = trailingslashit($wp_filesystem->abspath());
+		$wp_dir = trailingslashit( $wp_filesystem->abspath() );
 
 		$partial = true;
-		if ( $parsed_args['do_rollback'] )
+		if ( $parsed_args['do_rollback'] ) {
 			$partial = false;
-		elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() )
+		} elseif ( $parsed_args['pre_check_md5'] && ! $this->check_files() ) {
 			$partial = false;
+		}
 
 		/*
 		 * If partial update is returned from the API, use that, unless we're doing
@@ -100,17 +102,18 @@ class Core_Upgrader extends WP_Upgrader {
 		 * the new_bundled zip. Don't though if the constant is set to skip bundled items.
 		 * If the API returns a no_content zip, go with it. Finally, default to the full zip.
 		 */
-		if ( $parsed_args['do_rollback'] && $current->packages->rollback )
+		if ( $parsed_args['do_rollback'] && $current->packages->rollback ) {
 			$to_download = 'rollback';
-		elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial )
+		} elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial ) {
 			$to_download = 'partial';
-		elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
-			&& ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) )
+		} elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
+			&& ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
 			$to_download = 'new_bundled';
-		elseif ( $current->packages->no_content )
+		} elseif ( $current->packages->no_content ) {
 			$to_download = 'no_content';
-		else
+		} else {
 			$to_download = 'full';
+		}
 
 		// Lock to prevent multiple Core Updates occurring
 		$lock = WP_Upgrader::create_lock( 'core_updater', 15 * MINUTE_IN_SECONDS );
@@ -131,12 +134,12 @@ class Core_Upgrader extends WP_Upgrader {
 		}
 
 		// Copy update-core.php from the new version into place.
-		if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
-			$wp_filesystem->delete($working_dir, true);
+		if ( ! $wp_filesystem->copy( $working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true ) ) {
+			$wp_filesystem->delete( $working_dir, true );
 			WP_Upgrader::release_lock( 'core_updater' );
 			return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
 		}
-		$wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
+		$wp_filesystem->chmod( $wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE );
 
 		require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
 
@@ -157,12 +160,13 @@ class Core_Upgrader extends WP_Upgrader {
 				 * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
 				 * do_rollback allows for update_core() to trigger a rollback if needed.
 				 */
-				if ( false !== strpos( $error_code, 'do_rollback' ) )
+				if ( false !== strpos( $error_code, 'do_rollback' ) ) {
 					$try_rollback = true;
-				elseif ( false !== strpos( $error_code, '__copy_dir' ) )
+				} elseif ( false !== strpos( $error_code, '__copy_dir' ) ) {
 					$try_rollback = true;
-				elseif ( 'disk_full' === $error_code )
+				} elseif ( 'disk_full' === $error_code ) {
 					$try_rollback = true;
+				}
 			}
 
 			if ( $try_rollback ) {
@@ -175,12 +179,22 @@ class Core_Upgrader extends WP_Upgrader {
 				$rollback_result = $this->upgrade( $current, array_merge( $parsed_args, array( 'do_rollback' => true ) ) );
 
 				$original_result = $result;
-				$result = new WP_Error( 'rollback_was_required', $this->strings['rollback_was_required'], (object) array( 'update' => $original_result, 'rollback' => $rollback_result ) );
+				$result          = new WP_Error(
+					'rollback_was_required', $this->strings['rollback_was_required'], (object) array(
+						'update'   => $original_result,
+						'rollback' => $rollback_result,
+					)
+				);
 			}
 		}
 
 		/** 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' );
@@ -191,7 +205,7 @@ class Core_Upgrader extends WP_Upgrader {
 				'success'          => true,
 				'fs_method'        => $wp_filesystem->method,
 				'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ),
-				'fs_method_direct' => !empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '',
+				'fs_method_direct' => ! empty( $GLOBALS['_wp_filesystem_direct_method'] ) ? $GLOBALS['_wp_filesystem_direct_method'] : '',
 				'time_taken'       => time() - $start_time,
 				'reported'         => $wp_version,
 				'attempted'        => $current->version,
@@ -236,8 +250,8 @@ class Core_Upgrader extends WP_Upgrader {
 	public static function should_update_to_version( $offered_ver ) {
 		include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
 
-		$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version  ), 0, 2 ) ); // x.y
-		$new_branch     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y
+		$current_branch                 = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y
+		$new_branch                     = implode( '.', array_slice( preg_split( '/[.-]/', $offered_ver ), 0, 2 ) ); // x.y
 		$current_is_development_version = (bool) strpos( $wp_version, '-' );
 
 		// Defaults:
@@ -255,34 +269,39 @@ class Core_Upgrader extends WP_Upgrader {
 				$upgrade_dev = $upgrade_minor = $upgrade_major = true;
 			} elseif ( 'minor' === WP_AUTO_UPDATE_CORE ) {
 				// Only minor updates for core
-				$upgrade_dev = $upgrade_major = false;
+				$upgrade_dev   = $upgrade_major = false;
 				$upgrade_minor = true;
 			}
 		}
 
 		// 1: If we're already on that version, not much point in updating?
-		if ( $offered_ver == $wp_version )
+		if ( $offered_ver == $wp_version ) {
 			return false;
+		}
 
 		// 2: If we're running a newer version, that's a nope
-		if ( version_compare( $wp_version, $offered_ver, '>' ) )
+		if ( version_compare( $wp_version, $offered_ver, '>' ) ) {
 			return false;
+		}
 
 		$failure_data = get_site_option( 'auto_core_update_failed' );
 		if ( $failure_data ) {
 			// If this was a critical update failure, cannot update.
-			if ( ! empty( $failure_data['critical'] ) )
+			if ( ! empty( $failure_data['critical'] ) ) {
 				return false;
+			}
 
 			// Don't claim we can update on update-core.php if we have a non-critical failure logged.
-			if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) )
+			if ( $wp_version == $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) {
 				return false;
+			}
 
 			// Cannot update if we're retrying the same A to B update that caused a non-critical failure.
 			// Some non-critical failures do allow retries, like download_failed.
 			// 3.7.1 => 3.7.2 resulted in files_not_writable, if we are still on 3.7.1 and still trying to update to 3.7.2.
-			if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] )
+			if ( empty( $failure_data['retry'] ) && $wp_version == $failure_data['current'] && $offered_ver == $failure_data['attempted'] ) {
 				return false;
+			}
 		}
 
 		// 3: 3.7-alpha-25000 -> 3.7-alpha-25678 -> 3.7-beta1 -> 3.7-beta2
@@ -296,8 +315,9 @@ class Core_Upgrader extends WP_Upgrader {
 			 * @param bool $upgrade_dev Whether to enable automatic updates for
 			 *                          development versions.
 			 */
-			if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) )
+			if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) ) {
 				return false;
+			}
 			// Else fall through to minor + major branches below.
 		}
 
@@ -346,15 +366,18 @@ class Core_Upgrader extends WP_Upgrader {
 
 		$checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
 
-		if ( ! is_array( $checksums ) )
+		if ( ! is_array( $checksums ) ) {
 			return false;
+		}
 
 		foreach ( $checksums as $file => $checksum ) {
 			// Skip files which get updated
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
+			if ( 'wp-content' == substr( $file, 0, 10 ) ) {
 				continue;
-			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum )
+			}
+			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) {
 				return false;
+			}
 		}
 
 		return true;
diff --git a/wp-admin/includes/class-file-upload-upgrader.php b/wp-admin/includes/class-file-upload-upgrader.php
index a182b62ccd..c3d8a79552 100644
--- a/wp-admin/includes/class-file-upload-upgrader.php
+++ b/wp-admin/includes/class-file-upload-upgrader.php
@@ -52,28 +52,33 @@ class File_Upload_Upgrader {
 	 */
 	public function __construct( $form, $urlholder ) {
 
-		if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
-			wp_die(__('Please select a file'));
+		if ( empty( $_FILES[ $form ]['name'] ) && empty( $_GET[ $urlholder ] ) ) {
+			wp_die( __( 'Please select a file' ) );
+		}
 
 		//Handle a newly uploaded file, Else assume it's already been uploaded
-		if ( ! empty($_FILES) ) {
-			$overrides = array( 'test_form' => false, 'test_type' => false );
-			$file = wp_handle_upload( $_FILES[$form], $overrides );
+		if ( ! empty( $_FILES ) ) {
+			$overrides = array(
+				'test_form' => false,
+				'test_type' => false,
+			);
+			$file      = wp_handle_upload( $_FILES[ $form ], $overrides );
 
-			if ( isset( $file['error'] ) )
+			if ( isset( $file['error'] ) ) {
 				wp_die( $file['error'] );
+			}
 
-			$this->filename = $_FILES[$form]['name'];
-			$this->package = $file['file'];
+			$this->filename = $_FILES[ $form ]['name'];
+			$this->package  = $file['file'];
 
 			// Construct the object array
 			$object = array(
-				'post_title' => $this->filename,
-				'post_content' => $file['url'],
+				'post_title'     => $this->filename,
+				'post_content'   => $file['url'],
 				'post_mime_type' => $file['type'],
-				'guid' => $file['url'],
-				'context' => 'upgrader',
-				'post_status' => 'private'
+				'guid'           => $file['url'],
+				'context'        => 'upgrader',
+				'post_status'    => 'private',
 			);
 
 			// Save the data.
@@ -82,22 +87,24 @@ class File_Upload_Upgrader {
 			// Schedule a cleanup for 2 hours from now in case of failed installation.
 			wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
 
-		} elseif ( is_numeric( $_GET[$urlholder] ) ) {
+		} elseif ( is_numeric( $_GET[ $urlholder ] ) ) {
 			// Numeric Package = previously uploaded file, see above.
-			$this->id = (int) $_GET[$urlholder];
+			$this->id   = (int) $_GET[ $urlholder ];
 			$attachment = get_post( $this->id );
-			if ( empty($attachment) )
-				wp_die(__('Please select a file'));
+			if ( empty( $attachment ) ) {
+				wp_die( __( 'Please select a file' ) );
+			}
 
 			$this->filename = $attachment->post_title;
-			$this->package = get_attached_file( $attachment->ID );
+			$this->package  = get_attached_file( $attachment->ID );
 		} else {
 			// Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
-			if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
+			if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) {
 				wp_die( $uploads['error'] );
+			}
 
 			$this->filename = sanitize_file_name( $_GET[ $urlholder ] );
-			$this->package = $uploads['basedir'] . '/' . $this->filename;
+			$this->package  = $uploads['basedir'] . '/' . $this->filename;
 
 			if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
 				wp_die( __( 'Please select a file' ) );
@@ -113,11 +120,12 @@ class File_Upload_Upgrader {
 	 * @return bool Whether the cleanup was successful.
 	 */
 	public function cleanup() {
-		if ( $this->id )
+		if ( $this->id ) {
 			wp_delete_attachment( $this->id );
 
-		elseif ( file_exists( $this->package ) )
+		} elseif ( file_exists( $this->package ) ) {
 			return @unlink( $this->package );
+		}
 
 		return true;
 	}
diff --git a/wp-admin/includes/class-language-pack-upgrader-skin.php b/wp-admin/includes/class-language-pack-upgrader-skin.php
index 9efc877ef0..4fa1f29d38 100644
--- a/wp-admin/includes/class-language-pack-upgrader-skin.php
+++ b/wp-admin/includes/class-language-pack-upgrader-skin.php
@@ -16,21 +16,25 @@
  * @see WP_Upgrader_Skin
  */
 class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
-	public $language_update = null;
-	public $done_header = false;
-	public $done_footer = false;
+	public $language_update        = null;
+	public $done_header            = false;
+	public $done_footer            = false;
 	public $display_footer_actions = true;
 
 	/**
-	 *
 	 * @param array $args
 	 */
 	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false );
-		$args = wp_parse_args( $args, $defaults );
+		$defaults = array(
+			'url'                => '',
+			'nonce'              => '',
+			'title'              => __( 'Update Translations' ),
+			'skip_header_footer' => false,
+		);
+		$args     = wp_parse_args( $args, $defaults );
 		if ( $args['skip_header_footer'] ) {
-			$this->done_header = true;
-			$this->done_footer = true;
+			$this->done_header            = true;
+			$this->done_footer            = true;
 			$this->display_footer_actions = false;
 		}
 		parent::__construct( $args );
@@ -47,7 +51,6 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
 	}
 
 	/**
-	 *
 	 * @param string|WP_Error $error
 	 */
 	public function error( $error ) {
@@ -66,7 +69,7 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
 	 */
 	public function bulk_footer() {
 		$this->decrement_update_count( 'translation' );
-		$update_actions = array();
+		$update_actions                 = array();
 		$update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>';
 
 		/**
@@ -78,7 +81,8 @@ class Language_Pack_Upgrader_Skin extends WP_Upgrader_Skin {
 		 */
 		$update_actions = apply_filters( 'update_translations_complete_actions', $update_actions );
 
-		if ( $update_actions && $this->display_footer_actions )
+		if ( $update_actions && $this->display_footer_actions ) {
 			$this->feedback( implode( ' | ', $update_actions ) );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-language-pack-upgrader.php b/wp-admin/includes/class-language-pack-upgrader.php
index 404c4a2771..6eff004b8a 100644
--- a/wp-admin/includes/class-language-pack-upgrader.php
+++ b/wp-admin/includes/class-language-pack-upgrader.php
@@ -94,9 +94,11 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		if ( $upgrader && $upgrader->skin instanceof Automatic_Upgrader_Skin ) {
 			$skin = $upgrader->skin;
 		} else {
-			$skin = new Language_Pack_Upgrader_Skin( array(
-				'skip_header_footer' => true,
-			) );
+			$skin = new Language_Pack_Upgrader_Skin(
+				array(
+					'skip_header_footer' => true,
+				)
+			);
 		}
 
 		$lp_upgrader = new Language_Pack_Upgrader( $skin );
@@ -110,13 +112,13 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 	 */
 	public function upgrade_strings() {
 		$this->strings['starting_upgrade'] = __( 'Some of your translations need updating. Sit tight for a few more seconds while we update them as well.' );
-		$this->strings['up_to_date'] = __( 'The translations are up to date.' );
-		$this->strings['no_package'] = __( 'Update package not available.' );
+		$this->strings['up_to_date']       = __( 'The translations are up to date.' );
+		$this->strings['no_package']       = __( 'Update package not available.' );
 		/* translators: %s: package URL */
 		$this->strings['downloading_package'] = sprintf( __( 'Downloading translation from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package'] = __( 'Unpacking the update&#8230;' );
-		$this->strings['process_failed'] = __( 'Translation update failed.' );
-		$this->strings['process_success'] = __( 'Translation updated successfully.' );
+		$this->strings['unpack_package']      = __( 'Unpacking the update&#8230;' );
+		$this->strings['process_failed']      = __( 'Translation update failed.' );
+		$this->strings['process_success']     = __( 'Translation updated successfully.' );
 	}
 
 	/**
@@ -163,7 +165,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 	public function bulk_upgrade( $language_updates = array(), $args = array() ) {
 		global $wp_filesystem;
 
-		$defaults = array(
+		$defaults    = array(
 			'clear_update_cache' => true,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -171,8 +173,9 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		$this->init();
 		$this->upgrade_strings();
 
-		if ( ! $language_updates )
+		if ( ! $language_updates ) {
 			$language_updates = wp_get_translation_updates();
+		}
 
 		if ( empty( $language_updates ) ) {
 			$this->skin->header();
@@ -183,8 +186,9 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 			return true;
 		}
 
-		if ( 'upgrader_process_complete' == current_filter() )
+		if ( 'upgrader_process_complete' == current_filter() ) {
 			$this->skin->feedback( 'starting_upgrade' );
+		}
 
 		// Remove any existing upgrade filters from the plugin/theme upgraders #WP29425 & #WP29230
 		remove_all_filters( 'upgrader_pre_install' );
@@ -205,7 +209,7 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 
 		$results = array();
 
-		$this->update_count = count( $language_updates );
+		$this->update_count   = count( $language_updates );
 		$this->update_current = 0;
 
 		/*
@@ -213,9 +217,11 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		 * as we then may need to create a /plugins or /themes directory inside of it.
 		 */
 		$remote_destination = $wp_filesystem->find_folder( WP_LANG_DIR );
-		if ( ! $wp_filesystem->exists( $remote_destination ) )
-			if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
+		if ( ! $wp_filesystem->exists( $remote_destination ) ) {
+			if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {
 				return new WP_Error( 'mkdir_failed_lang_dir', $this->strings['mkdir_failed'], $remote_destination );
+			}
+		}
 
 		$language_updates_results = array();
 
@@ -224,24 +230,25 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 			$this->skin->language_update = $language_update;
 
 			$destination = WP_LANG_DIR;
-			if ( 'plugin' == $language_update->type )
+			if ( 'plugin' == $language_update->type ) {
 				$destination .= '/plugins';
-			elseif ( 'theme' == $language_update->type )
+			} elseif ( 'theme' == $language_update->type ) {
 				$destination .= '/themes';
+			}
 
 			$this->update_current++;
 
 			$options = array(
-				'package' => $language_update->package,
-				'destination' => $destination,
-				'clear_destination' => false,
+				'package'                     => $language_update->package,
+				'destination'                 => $destination,
+				'clear_destination'           => false,
 				'abort_if_destination_exists' => false, // We expect the destination to exist.
-				'clear_working' => true,
-				'is_multi' => true,
-				'hook_extra' => array(
+				'clear_working'               => true,
+				'is_multi'                    => true,
+				'hook_extra'                  => array(
 					'language_update_type' => $language_update->type,
-					'language_update' => $language_update,
-				)
+					'language_update'      => $language_update,
+				),
 			);
 
 			$result = $this->run( $options );
@@ -268,12 +275,14 @@ 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 );
@@ -311,8 +320,9 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 	public function check_package( $source, $remote_source ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $source ) )
+		if ( is_wp_error( $source ) ) {
 			return $source;
+		}
 
 		// Check that the folder contains a valid language.
 		$files = $wp_filesystem->dirlist( $remote_source );
@@ -320,16 +330,19 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 		// Check to see if a .po and .mo exist in the folder.
 		$po = $mo = false;
 		foreach ( (array) $files as $file => $filedata ) {
-			if ( '.po' == substr( $file, -3 ) )
+			if ( '.po' == substr( $file, -3 ) ) {
 				$po = true;
-			elseif ( '.mo' == substr( $file, -3 ) )
+			} elseif ( '.mo' == substr( $file, -3 ) ) {
 				$mo = true;
+			}
 		}
 
 		if ( ! $mo || ! $po ) {
-			return new WP_Error( 'incompatible_archive_pomo', $this->strings['incompatible_archive'],
+			return new WP_Error(
+				'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.' ),
+				sprintf(
+					__( 'The language pack is missing either the %1$s or %2$s files.' ),
 					'<code>.po</code>',
 					'<code>.mo</code>'
 				)
@@ -354,14 +367,16 @@ class Language_Pack_Upgrader extends WP_Upgrader {
 
 			case 'theme':
 				$theme = wp_get_theme( $update->slug );
-				if ( $theme->exists() )
+				if ( $theme->exists() ) {
 					return $theme->Get( 'Name' );
+				}
 				break;
 			case 'plugin':
 				$plugin_data = get_plugins( '/' . $update->slug );
 				$plugin_data = reset( $plugin_data );
-				if ( $plugin_data )
+				if ( $plugin_data ) {
 					return $plugin_data['Name'];
+				}
 				break;
 		}
 		return '';
diff --git a/wp-admin/includes/class-plugin-installer-skin.php b/wp-admin/includes/class-plugin-installer-skin.php
index 66f406227b..300d6684d9 100644
--- a/wp-admin/includes/class-plugin-installer-skin.php
+++ b/wp-admin/includes/class-plugin-installer-skin.php
@@ -20,24 +20,30 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 	public $type;
 
 	/**
-	 *
 	 * @param array $args
 	 */
-	public function __construct($args = array()) {
-		$defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
-		$args = wp_parse_args($args, $defaults);
+	public function __construct( $args = array() ) {
+		$defaults = array(
+			'type'   => 'web',
+			'url'    => '',
+			'plugin' => '',
+			'nonce'  => '',
+			'title'  => '',
+		);
+		$args     = wp_parse_args( $args, $defaults );
 
 		$this->type = $args['type'];
-		$this->api = isset($args['api']) ? $args['api'] : array();
+		$this->api  = isset( $args['api'] ) ? $args['api'] : array();
 
-		parent::__construct($args);
+		parent::__construct( $args );
 	}
 
 	/**
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+		if ( ! empty( $this->api ) ) {
+			$this->upgrader->strings['process_success'] = sprintf( __( 'Successfully installed the plugin <strong>%1$s %2$s</strong>.' ), $this->api->name, $this->api->version );
+		}
 	}
 
 	/**
@@ -47,11 +53,11 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 
 		$install_actions = array();
 
-		$from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
+		$from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins';
 
 		if ( 'import' == $from ) {
 			$install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
-		} else if ( 'press-this' == $from ) {
+		} elseif ( 'press-this' == $from ) {
 			$install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=press-this&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Return to Press This' ) . '</a>';
 		} else {
 			$install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
@@ -72,7 +78,7 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
 			$install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>';
 		}
 
-		if ( ! $this->result || is_wp_error($this->result) ) {
+		if ( ! $this->result || is_wp_error( $this->result ) ) {
 			unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
 		} elseif ( ! current_user_can( 'activate_plugin', $plugin_file ) ) {
 			unset( $install_actions['activate_plugin'] );
diff --git a/wp-admin/includes/class-plugin-upgrader-skin.php b/wp-admin/includes/class-plugin-upgrader-skin.php
index ba8c30fbc4..036166a2b0 100644
--- a/wp-admin/includes/class-plugin-upgrader-skin.php
+++ b/wp-admin/includes/class-plugin-upgrader-skin.php
@@ -16,43 +16,48 @@
  * @see WP_Upgrader_Skin
  */
 class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
-	public $plugin = '';
-	public $plugin_active = false;
+	public $plugin                = '';
+	public $plugin_active         = false;
 	public $plugin_network_active = false;
 
 	/**
-	 *
 	 * @param array $args
 	 */
 	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
-		$args = wp_parse_args($args, $defaults);
+		$defaults = array(
+			'url'    => '',
+			'plugin' => '',
+			'nonce'  => '',
+			'title'  => __( 'Update Plugin' ),
+		);
+		$args     = wp_parse_args( $args, $defaults );
 
 		$this->plugin = $args['plugin'];
 
-		$this->plugin_active = is_plugin_active( $this->plugin );
+		$this->plugin_active         = is_plugin_active( $this->plugin );
 		$this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
 
-		parent::__construct($args);
+		parent::__construct( $args );
 	}
 
 	/**
 	 */
 	public function after() {
 		$this->plugin = $this->upgrader->plugin_info();
-		if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
+		if ( ! empty( $this->plugin ) && ! is_wp_error( $this->result ) && $this->plugin_active ) {
 			// Currently used only when JS is off for a single plugin update?
 			echo '<iframe title="' . esc_attr__( 'Update progress' ) . '" style="border:0;overflow:hidden" width="100%" height="170" src="' . wp_nonce_url( 'update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ) . '"></iframe>';
 		}
 
 		$this->decrement_update_count( 'plugin' );
 
-		$update_actions =  array(
-			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
-			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
+		$update_actions = array(
+			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
+			'plugins_page'    => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
 		);
-		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugin', $this->plugin ) )
+		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugin', $this->plugin ) ) {
 			unset( $update_actions['activate_plugin'] );
+		}
 
 		/**
 		 * Filters the list of action links available following a single plugin update.
@@ -64,7 +69,8 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
 		 */
 		$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty( $update_actions ) ) {
+			$this->feedback( implode( ' | ', (array) $update_actions ) );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php
index 3c05353bc1..c7bdc58799 100644
--- a/wp-admin/includes/class-plugin-upgrader.php
+++ b/wp-admin/includes/class-plugin-upgrader.php
@@ -44,16 +44,16 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 */
 	public function upgrade_strings() {
-		$this->strings['up_to_date'] = __('The plugin is at the latest version.');
-		$this->strings['no_package'] = __('Update package not available.');
+		$this->strings['up_to_date'] = __( 'The plugin is at the latest version.' );
+		$this->strings['no_package'] = __( 'Update package not available.' );
 		/* translators: %s: package URL */
-		$this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
-		$this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
-		$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
-		$this->strings['process_failed'] = __('Plugin update failed.');
-		$this->strings['process_success'] = __('Plugin updated successfully.');
-		$this->strings['process_bulk_success'] = __('Plugins updated successfully.');
+		$this->strings['downloading_package']  = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
+		$this->strings['unpack_package']       = __( 'Unpacking the update&#8230;' );
+		$this->strings['remove_old']           = __( 'Removing the old version of the plugin&#8230;' );
+		$this->strings['remove_old_failed']    = __( 'Could not remove the old plugin.' );
+		$this->strings['process_failed']       = __( 'Plugin update failed.' );
+		$this->strings['process_success']      = __( 'Plugin updated successfully.' );
+		$this->strings['process_bulk_success'] = __( 'Plugins updated successfully.' );
 	}
 
 	/**
@@ -62,14 +62,14 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 */
 	public function install_strings() {
-		$this->strings['no_package'] = __('Installation package not available.');
+		$this->strings['no_package'] = __( 'Installation package not available.' );
 		/* translators: %s: package URL */
 		$this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package'] = __('Unpacking the package&#8230;');
-		$this->strings['installing_package'] = __('Installing the plugin&#8230;');
-		$this->strings['no_files'] = __('The plugin contains no files.');
-		$this->strings['process_failed'] = __('Plugin installation failed.');
-		$this->strings['process_success'] = __('Plugin installed successfully.');
+		$this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
+		$this->strings['installing_package']  = __( 'Installing the plugin&#8230;' );
+		$this->strings['no_files']            = __( 'The plugin contains no files.' );
+		$this->strings['process_failed']      = __( 'Plugin installation failed.' );
+		$this->strings['process_success']     = __( 'Plugin installed successfully.' );
 	}
 
 	/**
@@ -89,7 +89,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 */
 	public function install( $package, $args = array() ) {
 
-		$defaults = array(
+		$defaults    = array(
 			'clear_update_cache' => true,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -97,28 +97,31 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array($this, 'check_package') );
+		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
 		if ( $parsed_args['clear_update_cache'] ) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
 			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
 		}
 
-		$this->run( array(
-			'package' => $package,
-			'destination' => WP_PLUGIN_DIR,
-			'clear_destination' => false, // Do not overwrite files.
-			'clear_working' => true,
-			'hook_extra' => array(
-				'type' => 'plugin',
-				'action' => 'install',
+		$this->run(
+			array(
+				'package'           => $package,
+				'destination'       => WP_PLUGIN_DIR,
+				'clear_destination' => false, // Do not overwrite files.
+				'clear_working'     => true,
+				'hook_extra'        => array(
+					'type'   => 'plugin',
+					'action' => 'install',
+				),
 			)
-		) );
+		);
 
 		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
-		remove_filter('upgrader_source_selection', array($this, 'check_package') );
+		remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error( $this->result ) ) {
 			return $this->result;
+		}
 
 		// Force refresh of plugin update information
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
@@ -143,7 +146,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 */
 	public function upgrade( $plugin, $args = array() ) {
 
-		$defaults = array(
+		$defaults    = array(
 			'clear_update_cache' => true,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -152,10 +155,10 @@ class Plugin_Upgrader extends WP_Upgrader {
 		$this->upgrade_strings();
 
 		$current = get_site_transient( 'update_plugins' );
-		if ( !isset( $current->response[ $plugin ] ) ) {
+		if ( ! isset( $current->response[ $plugin ] ) ) {
 			$this->skin->before();
-			$this->skin->set_result(false);
-			$this->skin->error('up_to_date');
+			$this->skin->set_result( false );
+			$this->skin->error( 'up_to_date' );
 			$this->skin->after();
 			return false;
 		}
@@ -163,33 +166,36 @@ class Plugin_Upgrader extends WP_Upgrader {
 		// Get the URL to the zip file
 		$r = $current->response[ $plugin ];
 
-		add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
-		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
+		add_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ), 10, 2 );
+		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
 		//'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
 		if ( $parsed_args['clear_update_cache'] ) {
 			// Clear cache so wp_update_plugins() knows about the new plugin.
 			add_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9, 0 );
 		}
 
-		$this->run( array(
-			'package' => $r->package,
-			'destination' => WP_PLUGIN_DIR,
-			'clear_destination' => true,
-			'clear_working' => true,
-			'hook_extra' => array(
-				'plugin' => $plugin,
-				'type' => 'plugin',
-				'action' => 'update',
-			),
-		) );
+		$this->run(
+			array(
+				'package'           => $r->package,
+				'destination'       => WP_PLUGIN_DIR,
+				'clear_destination' => true,
+				'clear_working'     => true,
+				'hook_extra'        => array(
+					'plugin' => $plugin,
+					'type'   => 'plugin',
+					'action' => 'update',
+				),
+			)
+		);
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
 		remove_action( 'upgrader_process_complete', 'wp_clean_plugins_cache', 9 );
-		remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
-		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
+		remove_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ) );
+		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) );
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error( $this->result ) ) {
 			return $this->result;
+		}
 
 		// Force refresh of plugin update information
 		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
@@ -214,7 +220,7 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 */
 	public function bulk_upgrade( $plugins, $args = array() ) {
 
-		$defaults = array(
+		$defaults    = array(
 			'clear_update_cache' => true,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -225,12 +231,12 @@ class Plugin_Upgrader extends WP_Upgrader {
 
 		$current = get_site_transient( 'update_plugins' );
 
-		add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
+		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
 
 		$this->skin->header();
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array(WP_CONTENT_DIR, WP_PLUGIN_DIR) );
+		$res = $this->fs_connect( array( WP_CONTENT_DIR, WP_PLUGIN_DIR ) );
 		if ( ! $res ) {
 			$this->skin->footer();
 			return false;
@@ -245,70 +251,77 @@ class Plugin_Upgrader extends WP_Upgrader {
 		 * @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		 */
 		$maintenance = ( is_multisite() && ! empty( $plugins ) );
-		foreach ( $plugins as $plugin )
-			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
-		if ( $maintenance )
-			$this->maintenance_mode(true);
+		foreach ( $plugins as $plugin ) {
+			$maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin ] ) );
+		}
+		if ( $maintenance ) {
+			$this->maintenance_mode( true );
+		}
 
 		$results = array();
 
-		$this->update_count = count($plugins);
+		$this->update_count   = count( $plugins );
 		$this->update_current = 0;
 		foreach ( $plugins as $plugin ) {
 			$this->update_current++;
-			$this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true);
+			$this->skin->plugin_info = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin, false, true );
 
-			if ( !isset( $current->response[ $plugin ] ) ) {
-				$this->skin->set_result('up_to_date');
+			if ( ! isset( $current->response[ $plugin ] ) ) {
+				$this->skin->set_result( 'up_to_date' );
 				$this->skin->before();
-				$this->skin->feedback('up_to_date');
+				$this->skin->feedback( 'up_to_date' );
 				$this->skin->after();
-				$results[$plugin] = true;
+				$results[ $plugin ] = true;
 				continue;
 			}
 
 			// Get the URL to the zip file.
 			$r = $current->response[ $plugin ];
 
-			$this->skin->plugin_active = is_plugin_active($plugin);
+			$this->skin->plugin_active = is_plugin_active( $plugin );
 
-			$result = $this->run( array(
-				'package' => $r->package,
-				'destination' => WP_PLUGIN_DIR,
-				'clear_destination' => true,
-				'clear_working' => true,
-				'is_multi' => true,
-				'hook_extra' => array(
-					'plugin' => $plugin
+			$result = $this->run(
+				array(
+					'package'           => $r->package,
+					'destination'       => WP_PLUGIN_DIR,
+					'clear_destination' => true,
+					'clear_working'     => true,
+					'is_multi'          => true,
+					'hook_extra'        => array(
+						'plugin' => $plugin,
+					),
 				)
-			) );
+			);
 
-			$results[$plugin] = $this->result;
+			$results[ $plugin ] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
+			if ( false === $result ) {
 				break;
+			}
 		} //end foreach $plugins
 
-		$this->maintenance_mode(false);
+		$this->maintenance_mode( false );
 
 		// Force refresh of plugin update information.
 		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();
 
 		$this->skin->footer();
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
+		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) );
 
 		return $results;
 	}
@@ -327,19 +340,21 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 * @return string|WP_Error The source as passed, or a WP_Error object
 	 *                         if no plugins were found.
 	 */
-	public function check_package($source) {
+	public function check_package( $source ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
+		if ( is_wp_error( $source ) ) {
 			return $source;
+		}
 
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source );
+		if ( ! is_dir( $working_directory ) ) { // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
+		}
 
 		// Check the folder contains at least 1 valid plugin.
 		$plugins_found = false;
-		$files = glob( $working_directory . '*.php' );
+		$files         = glob( $working_directory . '*.php' );
 		if ( $files ) {
 			foreach ( $files as $file ) {
 				$info = get_plugin_data( $file, false, false );
@@ -350,8 +365,9 @@ class Plugin_Upgrader extends WP_Upgrader {
 			}
 		}
 
-		if ( ! $plugins_found )
+		if ( ! $plugins_found ) {
 			return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+		}
 
 		return $source;
 	}
@@ -366,16 +382,19 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 * @return string|false The full path to the main plugin file, or false.
 	 */
 	public function plugin_info() {
-		if ( ! is_array($this->result) )
+		if ( ! is_array( $this->result ) ) {
 			return false;
-		if ( empty($this->result['destination_name']) )
+		}
+		if ( empty( $this->result['destination_name'] ) ) {
 			return false;
+		}
 
-		$plugin = get_plugins('/' . $this->result['destination_name']); //Ensure to pass with leading slash
-		if ( empty($plugin) )
+		$plugin = get_plugins( '/' . $this->result['destination_name'] ); //Ensure to pass with leading slash
+		if ( empty( $plugin ) ) {
 			return false;
+		}
 
-		$pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
+		$pluginfiles = array_keys( $plugin ); //Assume the requested plugin is the first in the list
 
 		return $this->result['destination_name'] . '/' . $pluginfiles[0];
 	}
@@ -392,22 +411,25 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 * @param array          $plugin Plugin package arguments.
 	 * @return bool|WP_Error The passed in $return param or WP_Error.
 	 */
-	public function deactivate_plugin_before_upgrade($return, $plugin) {
+	public function deactivate_plugin_before_upgrade( $return, $plugin ) {
 
-		if ( is_wp_error($return) ) //Bypass.
+		if ( is_wp_error( $return ) ) { //Bypass.
 			return $return;
+		}
 
 		// When in cron (background updates) don't deactivate the plugin, as we require a browser to reactivate it
-		if ( wp_doing_cron() )
+		if ( wp_doing_cron() ) {
 			return $return;
+		}
 
-		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
-			return new WP_Error('bad_request', $this->strings['bad_request']);
+		$plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
+		if ( empty( $plugin ) ) {
+			return new WP_Error( 'bad_request', $this->strings['bad_request'] );
+		}
 
-		if ( is_plugin_active($plugin) ) {
+		if ( is_plugin_active( $plugin ) ) {
 			//Deactivate the plugin silently, Prevent deactivation hooks from running.
-			deactivate_plugins($plugin, true);
+			deactivate_plugins( $plugin, true );
 		}
 
 		return $return;
@@ -422,37 +444,42 @@ class Plugin_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 *
 	 * @global WP_Filesystem_Base $wp_filesystem Subclass
-     *
+	 *
 	 * @param bool|WP_Error $removed
 	 * @param string        $local_destination
 	 * @param string        $remote_destination
 	 * @param array         $plugin
 	 * @return WP_Error|bool
 	 */
-	public function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
+	public function delete_old_plugin( $removed, $local_destination, $remote_destination, $plugin ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($removed) )
+		if ( is_wp_error( $removed ) ) {
 			return $removed; //Pass errors through.
+		}
 
-		$plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
-		if ( empty($plugin) )
-			return new WP_Error('bad_request', $this->strings['bad_request']);
+		$plugin = isset( $plugin['plugin'] ) ? $plugin['plugin'] : '';
+		if ( empty( $plugin ) ) {
+			return new WP_Error( 'bad_request', $this->strings['bad_request'] );
+		}
 
-		$plugins_dir = $wp_filesystem->wp_plugins_dir();
-		$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
+		$plugins_dir     = $wp_filesystem->wp_plugins_dir();
+		$this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin ) );
 
-		if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished.
+		if ( ! $wp_filesystem->exists( $this_plugin_dir ) ) { //If it's already vanished.
 			return $removed;
+		}
 
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder
-			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
-		else
-			$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+		if ( strpos( $plugin, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
+			$deleted = $wp_filesystem->delete( $this_plugin_dir, true );
+		} else {
+			$deleted = $wp_filesystem->delete( $plugins_dir . $plugin );
+		}
 
-		if ( ! $deleted )
-			return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+		if ( ! $deleted ) {
+			return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'] );
+		}
 
 		return true;
 	}
diff --git a/wp-admin/includes/class-theme-installer-skin.php b/wp-admin/includes/class-theme-installer-skin.php
index 3d39492226..32302fea5d 100644
--- a/wp-admin/includes/class-theme-installer-skin.php
+++ b/wp-admin/includes/class-theme-installer-skin.php
@@ -20,53 +20,63 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 	public $type;
 
 	/**
-	 *
 	 * @param array $args
 	 */
-	public function __construct($args = array()) {
-		$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
-		$args = wp_parse_args($args, $defaults);
+	public function __construct( $args = array() ) {
+		$defaults = array(
+			'type'  => 'web',
+			'url'   => '',
+			'theme' => '',
+			'nonce' => '',
+			'title' => '',
+		);
+		$args     = wp_parse_args( $args, $defaults );
 
 		$this->type = $args['type'];
-		$this->api = isset($args['api']) ? $args['api'] : array();
+		$this->api  = isset( $args['api'] ) ? $args['api'] : array();
 
-		parent::__construct($args);
+		parent::__construct( $args );
 	}
 
 	/**
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		if ( ! empty( $this->api ) ) {
+			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version );
+		}
 	}
 
 	/**
 	 */
 	public function after() {
-		if ( empty($this->upgrader->result['destination_name']) )
+		if ( empty( $this->upgrader->result['destination_name'] ) ) {
 			return;
+		}
 
 		$theme_info = $this->upgrader->theme_info();
-		if ( empty( $theme_info ) )
+		if ( empty( $theme_info ) ) {
 			return;
+		}
 
-		$name       = $theme_info->display('Name');
+		$name       = $theme_info->display( 'Name' );
 		$stylesheet = $this->upgrader->result['destination_name'];
 		$template   = $theme_info->get_template();
 
-		$activate_link = add_query_arg( array(
-			'action'     => 'activate',
-			'template'   => urlencode( $template ),
-			'stylesheet' => urlencode( $stylesheet ),
-		), admin_url('themes.php') );
+		$activate_link = add_query_arg(
+			array(
+				'action'     => 'activate',
+				'template'   => urlencode( $template ),
+				'stylesheet' => urlencode( $stylesheet ),
+			), admin_url( 'themes.php' )
+		);
 		$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
 
 		$install_actions = array();
 
 		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$customize_url = add_query_arg(
+			$customize_url              = add_query_arg(
 				array(
-					'theme' => urlencode( $stylesheet ),
+					'theme'  => urlencode( $stylesheet ),
 					'return' => urlencode( admin_url( 'web' === $this->type ? 'theme-install.php' : 'themes.php' ) ),
 				),
 				admin_url( 'customize.php' )
@@ -75,16 +85,19 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 		}
 		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 
-		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
+		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) {
 			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		}
 
-		if ( $this->type == 'web' )
+		if ( $this->type == 'web' ) {
 			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
-		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
+		} elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) {
 			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		}
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
+		if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) {
 			unset( $install_actions['activate'], $install_actions['preview'] );
+		}
 
 		/**
 		 * Filters the list of action links available following a single theme installation.
@@ -97,7 +110,8 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin {
 		 * @param WP_Theme $theme_info      Theme object.
 		 */
 		$install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info );
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty( $install_actions ) ) {
+			$this->feedback( implode( ' | ', (array) $install_actions ) );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-theme-upgrader-skin.php b/wp-admin/includes/class-theme-upgrader-skin.php
index f92375745f..b5f03017ca 100644
--- a/wp-admin/includes/class-theme-upgrader-skin.php
+++ b/wp-admin/includes/class-theme-upgrader-skin.php
@@ -19,16 +19,20 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 	public $theme = '';
 
 	/**
-	 *
 	 * @param array $args
 	 */
-	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
-		$args = wp_parse_args($args, $defaults);
+	public function __construct( $args = array() ) {
+		$defaults = array(
+			'url'   => '',
+			'theme' => '',
+			'nonce' => '',
+			'title' => __( 'Update Theme' ),
+		);
+		$args     = wp_parse_args( $args, $defaults );
 
 		$this->theme = $args['theme'];
 
-		parent::__construct($args);
+		parent::__construct( $args );
 	}
 
 	/**
@@ -38,27 +42,29 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 
 		$update_actions = array();
 		if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
-			$name       = $theme_info->display('Name');
+			$name       = $theme_info->display( 'Name' );
 			$stylesheet = $this->upgrader->result['destination_name'];
 			$template   = $theme_info->get_template();
 
-			$activate_link = add_query_arg( array(
-				'action'     => 'activate',
-				'template'   => urlencode( $template ),
-				'stylesheet' => urlencode( $stylesheet ),
-			), admin_url('themes.php') );
+			$activate_link = add_query_arg(
+				array(
+					'action'     => 'activate',
+					'template'   => urlencode( $template ),
+					'stylesheet' => urlencode( $stylesheet ),
+				), admin_url( 'themes.php' )
+			);
 			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
 
 			$customize_url = add_query_arg(
 				array(
-					'theme' => urlencode( $stylesheet ),
+					'theme'  => urlencode( $stylesheet ),
 					'return' => urlencode( admin_url( 'themes.php' ) ),
 				),
 				admin_url( 'customize.php' )
 			);
 			if ( get_stylesheet() == $stylesheet ) {
 				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-					$update_actions['preview']  = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) . '</span></a>';
+					$update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) . '</span></a>';
 				}
 			} elseif ( current_user_can( 'switch_themes' ) ) {
 				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
@@ -67,8 +73,9 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
+			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) {
 				unset( $update_actions['preview'], $update_actions['activate'] );
+			}
 		}
 
 		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
@@ -83,7 +90,8 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 		 */
 		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty( $update_actions ) ) {
+			$this->feedback( implode( ' | ', (array) $update_actions ) );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php
index 7e46b5f5a2..390398a8d4 100644
--- a/wp-admin/includes/class-theme-upgrader.php
+++ b/wp-admin/includes/class-theme-upgrader.php
@@ -43,15 +43,15 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 */
 	public function upgrade_strings() {
-		$this->strings['up_to_date'] = __('The theme is at the latest version.');
-		$this->strings['no_package'] = __('Update package not available.');
+		$this->strings['up_to_date'] = __( 'The theme is at the latest version.' );
+		$this->strings['no_package'] = __( 'Update package not available.' );
 		/* translators: %s: package URL */
 		$this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package'] = __('Unpacking the update&#8230;');
-		$this->strings['remove_old'] = __('Removing the old version of the theme&#8230;');
-		$this->strings['remove_old_failed'] = __('Could not remove the old theme.');
-		$this->strings['process_failed'] = __('Theme update failed.');
-		$this->strings['process_success'] = __('Theme updated successfully.');
+		$this->strings['unpack_package']      = __( 'Unpacking the update&#8230;' );
+		$this->strings['remove_old']          = __( 'Removing the old version of the theme&#8230;' );
+		$this->strings['remove_old_failed']   = __( 'Could not remove the old theme.' );
+		$this->strings['process_failed']      = __( 'Theme update failed.' );
+		$this->strings['process_success']     = __( 'Theme updated successfully.' );
 	}
 
 	/**
@@ -60,23 +60,23 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @since 2.8.0
 	 */
 	public function install_strings() {
-		$this->strings['no_package'] = __('Installation package not available.');
+		$this->strings['no_package'] = __( 'Installation package not available.' );
 		/* translators: %s: package URL */
 		$this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
-		$this->strings['unpack_package'] = __('Unpacking the package&#8230;');
-		$this->strings['installing_package'] = __('Installing the theme&#8230;');
-		$this->strings['no_files'] = __('The theme contains no files.');
-		$this->strings['process_failed'] = __('Theme installation failed.');
-		$this->strings['process_success'] = __('Theme installed successfully.');
+		$this->strings['unpack_package']      = __( 'Unpacking the package&#8230;' );
+		$this->strings['installing_package']  = __( 'Installing the theme&#8230;' );
+		$this->strings['no_files']            = __( 'The theme contains no files.' );
+		$this->strings['process_failed']      = __( 'Theme installation failed.' );
+		$this->strings['process_success']     = __( 'Theme installed successfully.' );
 		/* translators: 1: theme name, 2: version */
-		$this->strings['process_success_specific'] = __('Successfully installed the theme <strong>%1$s %2$s</strong>.');
-		$this->strings['parent_theme_search'] = __('This theme requires a parent theme. Checking if it is installed&#8230;');
+		$this->strings['process_success_specific'] = __( 'Successfully installed the theme <strong>%1$s %2$s</strong>.' );
+		$this->strings['parent_theme_search']      = __( 'This theme requires a parent theme. Checking if it is installed&#8230;' );
 		/* translators: 1: theme name, 2: version */
-		$this->strings['parent_theme_prepare_install'] = __('Preparing to install <strong>%1$s %2$s</strong>&#8230;');
+		$this->strings['parent_theme_prepare_install'] = __( 'Preparing to install <strong>%1$s %2$s</strong>&#8230;' );
 		/* translators: 1: theme name, 2: version */
-		$this->strings['parent_theme_currently_installed'] = __('The parent theme, <strong>%1$s %2$s</strong>, is currently installed.');
+		$this->strings['parent_theme_currently_installed'] = __( 'The parent theme, <strong>%1$s %2$s</strong>, is currently installed.' );
 		/* translators: 1: theme name, 2: version */
-		$this->strings['parent_theme_install_success'] = __('Successfully installed the parent theme, <strong>%1$s %2$s</strong>.');
+		$this->strings['parent_theme_install_success'] = __( 'Successfully installed the parent theme, <strong>%1$s %2$s</strong>.' );
 		/* translators: %s: theme name */
 		$this->strings['parent_theme_not_found'] = sprintf( __( '<strong>The parent theme could not be found.</strong> You will need to install the parent theme, %s, before you can use this child theme.' ), '<strong>%s</strong>' );
 	}
@@ -97,56 +97,68 @@ class Theme_Upgrader extends WP_Upgrader {
 		// Check to see if we need to install a parent theme
 		$theme_info = $this->theme_info();
 
-		if ( ! $theme_info->parent() )
+		if ( ! $theme_info->parent() ) {
 			return $install_result;
+		}
 
 		$this->skin->feedback( 'parent_theme_search' );
 
 		if ( ! $theme_info->parent()->errors() ) {
-			$this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display('Name'), $theme_info->parent()->display('Version') );
+			$this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display( 'Name' ), $theme_info->parent()->display( 'Version' ) );
 			// We already have the theme, fall through.
 			return $install_result;
 		}
 
 		// We don't have the parent theme, let's install it.
-		$api = themes_api('theme_information', array('slug' => $theme_info->get('Template'), 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+		$api = themes_api(
+			'theme_information', array(
+				'slug'   => $theme_info->get( 'Template' ),
+				'fields' => array(
+					'sections' => false,
+					'tags'     => false,
+				),
+			)
+		); //Save on a bit of bandwidth.
 
-		if ( ! $api || is_wp_error($api) ) {
-			$this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
+		if ( ! $api || is_wp_error( $api ) ) {
+			$this->skin->feedback( 'parent_theme_not_found', $theme_info->get( 'Template' ) );
 			// Don't show activate or preview actions after installation
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+			add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) );
 			return $install_result;
 		}
 
 		// Backup required data we're going to override:
-		$child_api = $this->skin->api;
+		$child_api             = $this->skin->api;
 		$child_success_message = $this->strings['process_success'];
 
 		// Override them
-		$this->skin->api = $api;
+		$this->skin->api                           = $api;
 		$this->strings['process_success_specific'] = $this->strings['parent_theme_install_success'];//, $api->name, $api->version);
 
-		$this->skin->feedback('parent_theme_prepare_install', $api->name, $api->version);
+		$this->skin->feedback( 'parent_theme_prepare_install', $api->name, $api->version );
 
-		add_filter('install_theme_complete_actions', '__return_false', 999); // Don't show any actions after installing the theme.
+		add_filter( 'install_theme_complete_actions', '__return_false', 999 ); // Don't show any actions after installing the theme.
 
 		// Install the parent theme
-		$parent_result = $this->run( array(
-			'package' => $api->download_link,
-			'destination' => get_theme_root(),
-			'clear_destination' => false, //Do not overwrite files.
-			'clear_working' => true
-		) );
+		$parent_result = $this->run(
+			array(
+				'package'           => $api->download_link,
+				'destination'       => get_theme_root(),
+				'clear_destination' => false, //Do not overwrite files.
+				'clear_working'     => true,
+			)
+		);
 
-		if ( is_wp_error($parent_result) )
-			add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
+		if ( is_wp_error( $parent_result ) ) {
+			add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) );
+		}
 
 		// Start cleaning up after the parents installation
-		remove_filter('install_theme_complete_actions', '__return_false', 999);
+		remove_filter( 'install_theme_complete_actions', '__return_false', 999 );
 
 		// Reset child's result and data
-		$this->result = $child_result;
-		$this->skin->api = $child_api;
+		$this->result                     = $child_result;
+		$this->skin->api                  = $child_api;
 		$this->strings['process_success'] = $child_success_message;
 
 		return $install_result;
@@ -165,7 +177,7 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @return array
 	 */
 	public function hide_activate_preview_actions( $actions ) {
-		unset($actions['activate'], $actions['preview']);
+		unset( $actions['activate'], $actions['preview'] );
 		return $actions;
 	}
 
@@ -187,7 +199,7 @@ class Theme_Upgrader extends WP_Upgrader {
 	 */
 	public function install( $package, $args = array() ) {
 
-		$defaults = array(
+		$defaults    = array(
 			'clear_update_cache' => true,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -195,30 +207,33 @@ class Theme_Upgrader extends WP_Upgrader {
 		$this->init();
 		$this->install_strings();
 
-		add_filter('upgrader_source_selection', array($this, 'check_package') );
-		add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
+		add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
+		add_filter( 'upgrader_post_install', array( $this, 'check_parent_theme_filter' ), 10, 3 );
 		if ( $parsed_args['clear_update_cache'] ) {
 			// Clear cache so wp_update_themes() knows about the new theme.
 			add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
 		}
 
-		$this->run( array(
-			'package' => $package,
-			'destination' => get_theme_root(),
-			'clear_destination' => false, //Do not overwrite files.
-			'clear_working' => true,
-			'hook_extra' => array(
-				'type' => 'theme',
-				'action' => 'install',
-			),
-		) );
+		$this->run(
+			array(
+				'package'           => $package,
+				'destination'       => get_theme_root(),
+				'clear_destination' => false, //Do not overwrite files.
+				'clear_working'     => true,
+				'hook_extra'        => array(
+					'type'   => 'theme',
+					'action' => 'install',
+				),
+			)
+		);
 
 		remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
-		remove_filter('upgrader_source_selection', array($this, 'check_package') );
-		remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
+		remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
+		remove_filter( 'upgrader_post_install', array( $this, 'check_parent_theme_filter' ) );
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error( $this->result ) ) {
 			return $this->result;
+		}
 
 		// Refresh the Theme Update information
 		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
@@ -243,7 +258,7 @@ class Theme_Upgrader extends WP_Upgrader {
 	 */
 	public function upgrade( $theme, $args = array() ) {
 
-		$defaults = array(
+		$defaults    = array(
 			'clear_update_cache' => true,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -253,9 +268,9 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		// Is an update available?
 		$current = get_site_transient( 'update_themes' );
-		if ( !isset( $current->response[ $theme ] ) ) {
+		if ( ! isset( $current->response[ $theme ] ) ) {
 			$this->skin->before();
-			$this->skin->set_result(false);
+			$this->skin->set_result( false );
 			$this->skin->error( 'up_to_date' );
 			$this->skin->after();
 			return false;
@@ -263,33 +278,36 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		$r = $current->response[ $theme ];
 
-		add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
-		add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
-		add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
+		add_filter( 'upgrader_pre_install', array( $this, 'current_before' ), 10, 2 );
+		add_filter( 'upgrader_post_install', array( $this, 'current_after' ), 10, 2 );
+		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ), 10, 4 );
 		if ( $parsed_args['clear_update_cache'] ) {
 			// Clear cache so wp_update_themes() knows about the new theme.
 			add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
 		}
 
-		$this->run( array(
-			'package' => $r['package'],
-			'destination' => get_theme_root( $theme ),
-			'clear_destination' => true,
-			'clear_working' => true,
-			'hook_extra' => array(
-				'theme' => $theme,
-				'type' => 'theme',
-				'action' => 'update',
-			),
-		) );
+		$this->run(
+			array(
+				'package'           => $r['package'],
+				'destination'       => get_theme_root( $theme ),
+				'clear_destination' => true,
+				'clear_working'     => true,
+				'hook_extra'        => array(
+					'theme'  => $theme,
+					'type'   => 'theme',
+					'action' => 'update',
+				),
+			)
+		);
 
 		remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
-		remove_filter('upgrader_pre_install', array($this, 'current_before'));
-		remove_filter('upgrader_post_install', array($this, 'current_after'));
-		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
+		remove_filter( 'upgrader_pre_install', array( $this, 'current_before' ) );
+		remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) );
+		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) );
 
-		if ( ! $this->result || is_wp_error($this->result) )
+		if ( ! $this->result || is_wp_error( $this->result ) ) {
 			return $this->result;
+		}
 
 		wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
 
@@ -313,7 +331,7 @@ class Theme_Upgrader extends WP_Upgrader {
 	 */
 	public function bulk_upgrade( $themes, $args = array() ) {
 
-		$defaults = array(
+		$defaults    = array(
 			'clear_update_cache' => true,
 		);
 		$parsed_args = wp_parse_args( $args, $defaults );
@@ -324,14 +342,14 @@ class Theme_Upgrader extends WP_Upgrader {
 
 		$current = get_site_transient( 'update_themes' );
 
-		add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
-		add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
-		add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
+		add_filter( 'upgrader_pre_install', array( $this, 'current_before' ), 10, 2 );
+		add_filter( 'upgrader_post_install', array( $this, 'current_after' ), 10, 2 );
+		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ), 10, 4 );
 
 		$this->skin->header();
 
 		// Connect to the Filesystem first.
-		$res = $this->fs_connect( array(WP_CONTENT_DIR) );
+		$res = $this->fs_connect( array( WP_CONTENT_DIR ) );
 		if ( ! $res ) {
 			$this->skin->footer();
 			return false;
@@ -344,71 +362,78 @@ class Theme_Upgrader extends WP_Upgrader {
 		// - a theme with an update available is currently in use.
 		// @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
 		$maintenance = ( is_multisite() && ! empty( $themes ) );
-		foreach ( $themes as $theme )
+		foreach ( $themes as $theme ) {
 			$maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
-		if ( $maintenance )
-			$this->maintenance_mode(true);
+		}
+		if ( $maintenance ) {
+			$this->maintenance_mode( true );
+		}
 
 		$results = array();
 
-		$this->update_count = count($themes);
+		$this->update_count   = count( $themes );
 		$this->update_current = 0;
 		foreach ( $themes as $theme ) {
 			$this->update_current++;
 
-			$this->skin->theme_info = $this->theme_info($theme);
+			$this->skin->theme_info = $this->theme_info( $theme );
 
-			if ( !isset( $current->response[ $theme ] ) ) {
-				$this->skin->set_result(true);
+			if ( ! isset( $current->response[ $theme ] ) ) {
+				$this->skin->set_result( true );
 				$this->skin->before();
 				$this->skin->feedback( 'up_to_date' );
 				$this->skin->after();
-				$results[$theme] = true;
+				$results[ $theme ] = true;
 				continue;
 			}
 
 			// Get the URL to the zip file
 			$r = $current->response[ $theme ];
 
-			$result = $this->run( array(
-				'package' => $r['package'],
-				'destination' => get_theme_root( $theme ),
-				'clear_destination' => true,
-				'clear_working' => true,
-				'is_multi' => true,
-				'hook_extra' => array(
-					'theme' => $theme
-				),
-			) );
+			$result = $this->run(
+				array(
+					'package'           => $r['package'],
+					'destination'       => get_theme_root( $theme ),
+					'clear_destination' => true,
+					'clear_working'     => true,
+					'is_multi'          => true,
+					'hook_extra'        => array(
+						'theme' => $theme,
+					),
+				)
+			);
 
-			$results[$theme] = $this->result;
+			$results[ $theme ] = $this->result;
 
 			// Prevent credentials auth screen from displaying multiple times
-			if ( false === $result )
+			if ( false === $result ) {
 				break;
+			}
 		} //end foreach $plugins
 
-		$this->maintenance_mode(false);
+		$this->maintenance_mode( false );
 
 		// Refresh the Theme Update information
 		wp_clean_themes_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' => 'theme',
-			'bulk' => true,
-			'themes' => $themes,
-		) );
+		do_action(
+			'upgrader_process_complete', $this, array(
+				'action' => 'update',
+				'type'   => 'theme',
+				'bulk'   => true,
+				'themes' => $themes,
+			)
+		);
 
 		$this->skin->bulk_footer();
 
 		$this->skin->footer();
 
 		// Cleanup our hooks, in case something else does a upgrade on this connection.
-		remove_filter('upgrader_pre_install', array($this, 'current_before'));
-		remove_filter('upgrader_post_install', array($this, 'current_after'));
-		remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
+		remove_filter( 'upgrader_pre_install', array( $this, 'current_before' ) );
+		remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) );
+		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) );
 
 		return $results;
 	}
@@ -430,30 +455,41 @@ class Theme_Upgrader extends WP_Upgrader {
 	public function check_package( $source ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error($source) )
+		if ( is_wp_error( $source ) ) {
 			return $source;
+		}
 
 		// Check the folder contains a valid theme
-		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit(WP_CONTENT_DIR), $source);
-		if ( ! is_dir($working_directory) ) // Sanity check, if the above fails, let's not prevent installation.
+		$working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source );
+		if ( ! is_dir( $working_directory ) ) { // Sanity check, if the above fails, let's not prevent installation.
 			return $source;
+		}
 
 		// 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'],
+			return new WP_Error(
+				'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
 				/* translators: %s: style.css */
-				sprintf( __( 'The theme is missing the %s stylesheet.' ),
+				sprintf(
+					__( 'The theme is missing the %s stylesheet.' ),
 					'<code>style.css</code>'
 				)
 			);
 		}
 
-		$info = get_file_data( $working_directory . 'style.css', array( 'Name' => 'Theme Name', 'Template' => 'Template' ) );
+		$info = get_file_data(
+			$working_directory . 'style.css', array(
+				'Name'     => 'Theme Name',
+				'Template' => 'Template',
+			)
+		);
 
 		if ( empty( $info['Name'] ) ) {
-			return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
+			return new WP_Error(
+				'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.' ),
+				sprintf(
+					__( 'The %s stylesheet doesn&#8217;t contain a valid theme header.' ),
 					'<code>style.css</code>'
 				)
 			);
@@ -461,9 +497,11 @@ 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'],
+			return new WP_Error(
+				'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
 				/* translators: %s: index.php */
-				sprintf( __( 'The theme is missing the %s file.' ),
+				sprintf(
+					__( 'The theme is missing the %s file.' ),
 					'<code>index.php</code>'
 				)
 			);
@@ -484,17 +522,20 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @param array          $theme
 	 * @return bool|WP_Error
 	 */
-	public function current_before($return, $theme) {
-		if ( is_wp_error($return) )
+	public function current_before( $return, $theme ) {
+		if ( is_wp_error( $return ) ) {
 			return $return;
+		}
 
-		$theme = isset($theme['theme']) ? $theme['theme'] : '';
+		$theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) //If not current
+		if ( $theme != get_stylesheet() ) { //If not current
 			return $return;
+		}
 		//Change to maintenance mode now.
-		if ( ! $this->bulk )
-			$this->maintenance_mode(true);
+		if ( ! $this->bulk ) {
+			$this->maintenance_mode( true );
+		}
 
 		return $return;
 	}
@@ -511,14 +552,16 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @param array          $theme
 	 * @return bool|WP_Error
 	 */
-	public function current_after($return, $theme) {
-		if ( is_wp_error($return) )
+	public function current_after( $return, $theme ) {
+		if ( is_wp_error( $return ) ) {
 			return $return;
+		}
 
-		$theme = isset($theme['theme']) ? $theme['theme'] : '';
+		$theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
 
-		if ( $theme != get_stylesheet() ) // If not current
+		if ( $theme != get_stylesheet() ) { // If not current
 			return $return;
+		}
 
 		// Ensure stylesheet name hasn't changed after the upgrade:
 		if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
@@ -528,8 +571,9 @@ class Theme_Upgrader extends WP_Upgrader {
 		}
 
 		//Time to remove maintenance mode
-		if ( ! $this->bulk )
-			$this->maintenance_mode(false);
+		if ( ! $this->bulk ) {
+			$this->maintenance_mode( false );
+		}
 		return $return;
 	}
 
@@ -552,17 +596,20 @@ class Theme_Upgrader extends WP_Upgrader {
 	public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
 		global $wp_filesystem;
 
-		if ( is_wp_error( $removed ) )
+		if ( is_wp_error( $removed ) ) {
 			return $removed; // Pass errors through.
+		}
 
-		if ( ! isset( $theme['theme'] ) )
+		if ( ! isset( $theme['theme'] ) ) {
 			return $removed;
+		}
 
-		$theme = $theme['theme'];
+		$theme      = $theme['theme'];
 		$themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) );
 		if ( $wp_filesystem->exists( $themes_dir . $theme ) ) {
-			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) )
+			if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) ) {
 				return false;
+			}
 		}
 
 		return true;
@@ -579,13 +626,14 @@ class Theme_Upgrader extends WP_Upgrader {
 	 * @return WP_Theme|false The theme's info object, or false `$theme` is not supplied
 	 *                        and the last result isn't set.
 	 */
-	public function theme_info($theme = null) {
+	public function theme_info( $theme = null ) {
 
-		if ( empty($theme) ) {
-			if ( !empty($this->result['destination_name']) )
+		if ( empty( $theme ) ) {
+			if ( ! empty( $this->result['destination_name'] ) ) {
 				$theme = $this->result['destination_name'];
-			else
+			} else {
 				return false;
+			}
 		}
 		return wp_get_theme( $theme );
 	}
diff --git a/wp-admin/includes/class-walker-category-checklist.php b/wp-admin/includes/class-walker-category-checklist.php
index cd5e1572c6..d8719debf4 100644
--- a/wp-admin/includes/class-walker-category-checklist.php
+++ b/wp-admin/includes/class-walker-category-checklist.php
@@ -18,7 +18,10 @@
  */
 class Walker_Category_Checklist extends Walker {
 	public $tree_type = 'category';
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
+	public $db_fields = array(
+		'parent' => 'parent',
+		'id'     => 'term_id',
+	); //TODO: decouple this
 
 	/**
 	 * Starts the list before the elements are added.
@@ -32,7 +35,7 @@ class Walker_Category_Checklist extends Walker {
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat("\t", $depth);
+		$indent  = str_repeat( "\t", $depth );
 		$output .= "$indent<ul class='children'>\n";
 	}
 
@@ -48,7 +51,7 @@ class Walker_Category_Checklist extends Walker {
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
 	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat("\t", $depth);
+		$indent  = str_repeat( "\t", $depth );
 		$output .= "$indent</ul>\n";
 	}
 
@@ -79,13 +82,13 @@ class Walker_Category_Checklist extends Walker {
 		}
 
 		$args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats'];
-		$class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
+		$class                = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
 
 		$args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats'];
 
 		if ( ! empty( $args['list_only'] ) ) {
 			$aria_checked = 'false';
-			$inner_class = 'category';
+			$inner_class  = 'category';
 
 			if ( in_array( $category->term_id, $args['selected_cats'] ) ) {
 				$inner_class .= ' selected';
@@ -100,7 +103,7 @@ class Walker_Category_Checklist extends Walker {
 		} else {
 			/** This filter is documented in wp-includes/category-template.php */
 			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
-				'<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' .
+				'<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="' . $name . '[]" id="in-' . $taxonomy . '-' . $category->term_id . '"' .
 				checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
 				disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
 				esc_html( apply_filters( 'the_category', $category->name, '', '' ) ) . '</label>';
diff --git a/wp-admin/includes/class-walker-nav-menu-checklist.php b/wp-admin/includes/class-walker-nav-menu-checklist.php
index a4d8018dcc..881e9e7192 100644
--- a/wp-admin/includes/class-walker-nav-menu-checklist.php
+++ b/wp-admin/includes/class-walker-nav-menu-checklist.php
@@ -15,7 +15,6 @@
  */
 class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
 	/**
-	 *
 	 * @param array $fields
 	 */
 	public function __construct( $fields = false ) {
@@ -36,7 +35,7 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
 	 * @param array  $args   Not used.
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat( "\t", $depth );
+		$indent  = str_repeat( "\t", $depth );
 		$output .= "\n$indent<ul class='children'>\n";
 	}
 
@@ -52,7 +51,7 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
 	 * @param array  $args   Not used.
 	 */
 	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat( "\t", $depth );
+		$indent  = str_repeat( "\t", $depth );
 		$output .= "\n$indent</ul>";
 	}
 
@@ -74,9 +73,9 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
 	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
 		global $_nav_menu_placeholder;
 
-		$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-		$possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
-		$possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
+		$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
+		$possible_object_id    = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
+		$possible_db_id        = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
 
 		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
 
@@ -84,34 +83,36 @@ class Walker_Nav_Menu_Checklist extends Walker_Nav_Menu {
 		$output .= '<label class="menu-item-title">';
 		$output .= '<input type="checkbox" class="menu-item-checkbox';
 
-		if ( ! empty( $item->front_or_home ) )
+		if ( ! empty( $item->front_or_home ) ) {
 			$output .= ' add-to-top';
+		}
 
-		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
+		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="' . esc_attr( $item->object_id ) . '" /> ';
 
 		if ( ! empty( $item->label ) ) {
 			$title = $item->label;
 		} elseif ( isset( $item->post_type ) ) {
 			/** This filter is documented in wp-includes/post-template.php */
 			$title = apply_filters( 'the_title', $item->post_title, $item->ID );
-			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
+			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title ) {
 				$title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+			}
 		}
 
 		$output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
- 		$output .= '</label>';
+		$output .= '</label>';
 
 		// Menu item hidden fields
 		$output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
-		$output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="'. esc_attr( $item->target ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="'. esc_attr( $item->attr_title ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="'. esc_attr( implode( ' ', $item->classes ) ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="'. esc_attr( $item->xfn ) .'" />';
+		$output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="' . esc_attr( $item->object ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="' . esc_attr( $item->menu_item_parent ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="' . esc_attr( $item->type ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="' . esc_attr( $item->title ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="' . esc_attr( $item->url ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="' . esc_attr( $item->target ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="' . esc_attr( $item->attr_title ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="' . esc_attr( implode( ' ', $item->classes ) ) . '" />';
+		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="' . esc_attr( $item->xfn ) . '" />';
 	}
 
 } // Walker_Nav_Menu_Checklist
diff --git a/wp-admin/includes/class-walker-nav-menu-edit.php b/wp-admin/includes/class-walker-nav-menu-edit.php
index 36ced4034d..d53c0c8988 100644
--- a/wp-admin/includes/class-walker-nav-menu-edit.php
+++ b/wp-admin/includes/class-walker-nav-menu-edit.php
@@ -60,7 +60,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 		$_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
 
 		ob_start();
-		$item_id = esc_attr( $item->ID );
+		$item_id      = esc_attr( $item->ID );
 		$removed_args = array(
 			'action',
 			'customlink-tab',
@@ -73,11 +73,12 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 		$original_title = false;
 		if ( 'taxonomy' == $item->type ) {
 			$original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-			if ( is_wp_error( $original_title ) )
+			if ( is_wp_error( $original_title ) ) {
 				$original_title = false;
+			}
 		} elseif ( 'post_type' == $item->type ) {
 			$original_object = get_post( $item->object_id );
-			$original_title = get_the_title( $original_object->ID );
+			$original_title  = get_the_title( $original_object->ID );
 		} elseif ( 'post_type_archive' == $item->type ) {
 			$original_object = get_post_type_object( $item->object );
 			if ( $original_object ) {
@@ -88,7 +89,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 		$classes = array(
 			'menu-item menu-item-depth-' . $depth,
 			'menu-item-' . esc_attr( $item->object ),
-			'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
+			'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive' ),
 		);
 
 		$title = $item->title;
@@ -100,52 +101,59 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 		} elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
 			$classes[] = 'pending';
 			/* translators: %s: title of menu item in draft status */
-			$title = sprintf( __('%s (Pending)'), $item->title );
+			$title = sprintf( __( '%s (Pending)' ), $item->title );
 		}
 
 		$title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
 
 		$submenu_text = '';
-		if ( 0 == $depth )
+		if ( 0 == $depth ) {
 			$submenu_text = 'style="display: none;"';
+		}
 
 		?>
-		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
+		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode( ' ', $classes ); ?>">
 			<div class="menu-item-bar">
 				<div class="menu-item-handle">
 					<span class="item-title"><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></span>
 					<span class="item-controls">
 						<span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
 						<span class="item-order hide-if-js">
-							<a href="<?php
+							<a href="
+							<?php
 								echo wp_nonce_url(
 									add_query_arg(
 										array(
-											'action' => 'move-up-menu-item',
+											'action'    => 'move-up-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) )
 									),
 									'move-menu_item'
 								);
-							?>" class="item-move-up" aria-label="<?php esc_attr_e( 'Move up' ) ?>">&#8593;</a>
+							?>
+							" class="item-move-up" aria-label="<?php esc_attr_e( 'Move up' ); ?>">&#8593;</a>
 							|
-							<a href="<?php
+							<a href="
+							<?php
 								echo wp_nonce_url(
 									add_query_arg(
 										array(
-											'action' => 'move-down-menu-item',
+											'action'    => 'move-down-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) )
 									),
 									'move-menu_item'
 								);
-							?>" class="item-move-down" aria-label="<?php esc_attr_e( 'Move down' ) ?>">&#8595;</a>
+							?>
+							" class="item-move-down" aria-label="<?php esc_attr_e( 'Move down' ); ?>">&#8595;</a>
 						</span>
-						<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>
+						<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>
 			</div>
@@ -180,7 +188,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 				<p class="field-css-classes description description-thin">
 					<label for="edit-menu-item-classes-<?php echo $item_id; ?>">
 						<?php _e( 'CSS Classes (optional)' ); ?><br />
-						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
+						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode( ' ', $item->classes ) ); ?>" />
 					</label>
 				</p>
 				<p class="field-xfn description description-thin">
@@ -193,7 +201,7 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 					<label for="edit-menu-item-description-<?php echo $item_id; ?>">
 						<?php _e( 'Description' ); ?><br />
 						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
-						<span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
+						<span class="description"><?php _e( 'The description will be displayed in the menu if the current theme supports it.' ); ?></span>
 					</label>
 				</p>
 
@@ -209,21 +217,34 @@ class Walker_Nav_Menu_Edit extends Walker_Nav_Menu {
 				<div class="menu-item-actions description-wide submitbox">
 					<?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
 						<p class="link-to-original">
-							<?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
+							<?php printf( __( 'Original: %s' ), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
 						</p>
 					<?php endif; ?>
-					<a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
-					echo wp_nonce_url(
+					<a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="
+																						<?php
+																						echo wp_nonce_url(
+																							add_query_arg(
+																								array(
+																									'action'    => 'delete-menu-item',
+																									'menu-item' => $item_id,
+																								),
+																								admin_url( 'nav-menus.php' )
+																							),
+																							'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(
 						add_query_arg(
 							array(
-								'action' => 'delete-menu-item',
-								'menu-item' => $item_id,
-							),
-							admin_url( 'nav-menus.php' )
-						),
-						'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( add_query_arg( array( 'edit-menu-item' => $item_id, 'cancel' => time() ), admin_url( 'nav-menus.php' ) ) );
-						?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
+								'edit-menu-item' => $item_id,
+								'cancel'         => time(),
+							), admin_url( 'nav-menus.php' )
+						)
+					);
+						?>
+						#menu-item-settings-<?php echo $item_id; ?>"><?php _e( 'Cancel' ); ?></a>
 				</div>
 
 				<input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
diff --git a/wp-admin/includes/class-wp-ajax-upgrader-skin.php b/wp-admin/includes/class-wp-ajax-upgrader-skin.php
index 073ed3b8a9..8ea2b67570 100644
--- a/wp-admin/includes/class-wp-ajax-upgrader-skin.php
+++ b/wp-admin/includes/class-wp-ajax-upgrader-skin.php
@@ -95,7 +95,7 @@ class WP_Ajax_Upgrader_Skin extends Automatic_Upgrader_Skin {
 
 			// Count existing errors to generate an unique error code.
 			$errors_count = count( $this->errors->get_error_codes() );
-			$this->errors->add( 'unknown_upgrade_error_' . $errors_count + 1 , $string );
+			$this->errors->add( 'unknown_upgrade_error_' . $errors_count + 1, $string );
 		} elseif ( is_wp_error( $errors ) ) {
 			foreach ( $errors->get_error_codes() as $error_code ) {
 				$this->errors->add( $error_code, $errors->get_error_message( $error_code ), $errors->get_error_data( $error_code ) );
diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php
index 048ab1ceff..565b5845ae 100644
--- a/wp-admin/includes/class-wp-automatic-updater.php
+++ b/wp-admin/includes/class-wp-automatic-updater.php
@@ -29,11 +29,13 @@ class WP_Automatic_Updater {
 	 */
 	public function is_disabled() {
 		// Background updates are disabled if you don't want file changes.
-		if ( ! wp_is_file_mod_allowed( 'automatic_updater' ) )
+		if ( ! wp_is_file_mod_allowed( 'automatic_updater' ) ) {
 			return true;
+		}
 
-		if ( wp_installing() )
+		if ( wp_installing() ) {
 			return true;
+		}
 
 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
 		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
@@ -71,10 +73,11 @@ class WP_Automatic_Updater {
 	 */
 	public function is_vcs_checkout( $context ) {
 		$context_dirs = array( untrailingslashit( $context ) );
-		if ( $context !== ABSPATH )
+		if ( $context !== ABSPATH ) {
 			$context_dirs[] = untrailingslashit( ABSPATH );
+		}
 
-		$vcs_dirs = array( '.svn', '.git', '.hg', '.bzr' );
+		$vcs_dirs   = array( '.svn', '.git', '.hg', '.bzr' );
 		$check_dirs = array();
 
 		foreach ( $context_dirs as $context_dir ) {
@@ -83,10 +86,11 @@ class WP_Automatic_Updater {
 				$check_dirs[] = $context_dir;
 
 				// Once we've hit '/' or 'C:\', we need to stop. dirname will keep returning the input here.
-				if ( $context_dir == dirname( $context_dir ) )
+				if ( $context_dir == dirname( $context_dir ) ) {
 					break;
+				}
 
-			// Continue one level at a time.
+				// Continue one level at a time.
 			} while ( $context_dir = dirname( $context_dir ) );
 		}
 
@@ -95,8 +99,9 @@ class WP_Automatic_Updater {
 		// Search all directories we've found for evidence of version control.
 		foreach ( $vcs_dirs as $vcs_dir ) {
 			foreach ( $check_dirs as $check_dir ) {
-				if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) )
+				if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) ) {
 					break 2;
+				}
 			}
 		}
 
@@ -131,8 +136,9 @@ class WP_Automatic_Updater {
 		// Used to see if WP_Filesystem is set up to allow unattended updates.
 		$skin = new Automatic_Upgrader_Skin;
 
-		if ( $this->is_disabled() )
+		if ( $this->is_disabled() ) {
 			return false;
+		}
 
 		// Only relax the filesystem checks when the update doesn't include new files
 		$allow_relaxed_file_ownership = false;
@@ -142,16 +148,18 @@ class WP_Automatic_Updater {
 
 		// If we can't do an auto core update, we may still be able to email the user.
 		if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership ) || $this->is_vcs_checkout( $context ) ) {
-			if ( 'core' == $type )
+			if ( 'core' == $type ) {
 				$this->send_core_update_notification_email( $item );
+			}
 			return false;
 		}
 
 		// Next up, is this an item we can update?
-		if ( 'core' == $type )
+		if ( 'core' == $type ) {
 			$update = Core_Upgrader::should_update_to_version( $item->current );
-		else
+		} else {
 			$update = ! empty( $item->autoupdate );
+		}
 
 		/**
 		 * Filters whether to automatically update core, a plugin, a theme, or a language.
@@ -175,8 +183,9 @@ class WP_Automatic_Updater {
 		$update = apply_filters( "auto_update_{$type}", $update, $item );
 
 		if ( ! $update ) {
-			if ( 'core' == $type )
+			if ( 'core' == $type ) {
 				$this->send_core_update_notification_email( $item );
+			}
 			return false;
 		}
 
@@ -185,13 +194,15 @@ class WP_Automatic_Updater {
 			global $wpdb;
 
 			$php_compat = version_compare( phpversion(), $item->php_version, '>=' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
 				$mysql_compat = true;
-			else
+			} else {
 				$mysql_compat = version_compare( $wpdb->db_version(), $item->mysql_version, '>=' );
+			}
 
-			if ( ! $php_compat || ! $mysql_compat )
+			if ( ! $php_compat || ! $mysql_compat ) {
 				return false;
+			}
 		}
 
 		return true;
@@ -208,8 +219,9 @@ class WP_Automatic_Updater {
 		$notified = get_site_option( 'auto_core_update_notified' );
 
 		// Don't notify if we've already notified the same email address of the same version.
-		if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
+		if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current ) {
 			return false;
+		}
 
 		// See if we need to notify users of a core update.
 		$notify = ! empty( $item->notify_email );
@@ -233,8 +245,9 @@ class WP_Automatic_Updater {
 		 * @param bool   $notify Whether the site administrator is notified.
 		 * @param object $item   The update offer.
 		 */
-		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) )
+		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) ) {
 			return false;
+		}
 
 		$this->send_email( 'manual', $item );
 		return true;
@@ -275,8 +288,9 @@ class WP_Automatic_Updater {
 		}
 
 		// Determine whether we can and should perform this update.
-		if ( ! $this->should_update( $type, $item, $context ) )
+		if ( ! $this->should_update( $type, $item, $context ) ) {
 			return false;
+		}
 
 		/**
 		 * Fires immediately prior to an auto-update.
@@ -298,19 +312,19 @@ class WP_Automatic_Updater {
 				break;
 			case 'theme':
 				$upgrader_item = $item->theme;
-				$theme = wp_get_theme( $upgrader_item );
-				$item_name = $theme->Get( 'Name' );
+				$theme         = wp_get_theme( $upgrader_item );
+				$item_name     = $theme->Get( 'Name' );
 				$skin->feedback( __( 'Updating theme: %s' ), $item_name );
 				break;
 			case 'plugin':
 				$upgrader_item = $item->plugin;
-				$plugin_data = get_plugin_data( $context . '/' . $upgrader_item );
-				$item_name = $plugin_data['Name'];
+				$plugin_data   = get_plugin_data( $context . '/' . $upgrader_item );
+				$item_name     = $plugin_data['Name'];
 				$skin->feedback( __( 'Updating plugin: %s' ), $item_name );
 				break;
 			case 'translation':
 				$language_item_name = $upgrader->get_name_for_update( $item );
-				$item_name = sprintf( __( 'Translations for %s' ), $language_item_name );
+				$item_name          = sprintf( __( 'Translations for %s' ), $language_item_name );
 				$skin->feedback( sprintf( __( 'Updating translations for %1$s (%2$s)&#8230;' ), $language_item_name, $item->language ) );
 				break;
 		}
@@ -321,15 +335,17 @@ class WP_Automatic_Updater {
 		}
 
 		// Boom, This sites about to get a whole new splash of paint!
-		$upgrade_result = $upgrader->upgrade( $upgrader_item, array(
-			'clear_update_cache' => false,
-			// Always use partial builds if possible for core updates.
-			'pre_check_md5'      => false,
-			// Only available for core updates.
-			'attempt_rollback'   => true,
-			// Allow relaxed file ownership in some scenarios
-			'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
-		) );
+		$upgrade_result = $upgrader->upgrade(
+			$upgrader_item, array(
+				'clear_update_cache'           => false,
+				// Always use partial builds if possible for core updates.
+				'pre_check_md5'                => false,
+				// Only available for core updates.
+				'attempt_rollback'             => true,
+				// Allow relaxed file ownership in some scenarios
+				'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership,
+			)
+		);
 
 		// If the filesystem is unavailable, false is returned.
 		if ( false === $upgrade_result ) {
@@ -354,7 +370,7 @@ class WP_Automatic_Updater {
 			'item'     => $item,
 			'result'   => $upgrade_result,
 			'name'     => $item_name,
-			'messages' => $skin->get_upgrade_messages()
+			'messages' => $skin->get_upgrade_messages(),
 		);
 
 		return $upgrade_result;
@@ -366,14 +382,17 @@ class WP_Automatic_Updater {
 	 * @since 3.7.0
 	 */
 	public function run() {
-		if ( $this->is_disabled() )
+		if ( $this->is_disabled() ) {
 			return;
+		}
 
-		if ( ! is_main_network() || ! is_main_site() )
+		if ( ! is_main_network() || ! is_main_site() ) {
 			return;
+		}
 
-		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) )
+		if ( ! WP_Upgrader::create_lock( 'auto_updater' ) ) {
 			return;
+		}
 
 		// Don't automatically run these thins, as we'll handle it ourselves
 		remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
@@ -384,7 +403,7 @@ class WP_Automatic_Updater {
 		// Next, Plugins
 		wp_update_plugins(); // Check for Plugin updates
 		$plugin_updates = get_site_transient( 'update_plugins' );
-		if ( $plugin_updates && !empty( $plugin_updates->response ) ) {
+		if ( $plugin_updates && ! empty( $plugin_updates->response ) ) {
 			foreach ( $plugin_updates->response as $plugin ) {
 				$this->update( 'plugin', $plugin );
 			}
@@ -395,7 +414,7 @@ class WP_Automatic_Updater {
 		// Next, those themes we all love
 		wp_update_themes();  // Check for Theme updates
 		$theme_updates = get_site_transient( 'update_themes' );
-		if ( $theme_updates && !empty( $theme_updates->response ) ) {
+		if ( $theme_updates && ! empty( $theme_updates->response ) ) {
 			foreach ( $theme_updates->response as $theme ) {
 				$this->update( 'theme', (object) $theme );
 			}
@@ -407,8 +426,9 @@ class WP_Automatic_Updater {
 		wp_version_check(); // Check for Core updates
 		$core_update = find_core_auto_update();
 
-		if ( $core_update )
+		if ( $core_update ) {
 			$this->update( 'core', $core_update );
+		}
 
 		// Clean up, and check for any pending translations
 		// (Core_Upgrader checks for core updates)
@@ -456,11 +476,13 @@ class WP_Automatic_Updater {
 			 *                                  install is a development version.
 			 *                                  Return false to avoid the email.
 			 */
-			if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) )
+			if ( apply_filters( 'automatic_updates_send_debug_email', $development_version ) ) {
 				$this->send_debug_email();
+			}
 
-			if ( ! empty( $this->update_results['core'] ) )
+			if ( ! empty( $this->update_results['core'] ) ) {
 				$this->after_core_update( $this->update_results['core'][0] );
+			}
 
 			/**
 			 * Fires after all automatic updates have run.
@@ -503,7 +525,7 @@ class WP_Automatic_Updater {
 			$critical = true;
 		} elseif ( $error_code === 'rollback_was_required' && is_wp_error( $result->get_error_data()->rollback ) ) {
 			// A rollback is only critical if it failed too.
-			$critical = true;
+			$critical        = true;
 			$rollback_result = $result->get_error_data()->rollback;
 		} elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
 			$critical = true;
@@ -538,29 +560,33 @@ class WP_Automatic_Updater {
 		 * In fact, let's schedule a special update for an hour from now. (It's possible
 		 * the issue could actually be on WordPress.org's side.) If that one fails, then email.
 		 */
-		$send = true;
-  		$transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
-  		if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
-  			wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
-  			$send = false;
-  		}
-
-  		$n = get_site_option( 'auto_core_update_notified' );
-		// Don't notify if we've already notified the same email address of the same version of the same notification type.
-		if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current )
+		$send               = true;
+		$transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
+		if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
+			wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
 			$send = false;
+		}
 
-		update_site_option( 'auto_core_update_failed', array(
-			'attempted'  => $core_update->current,
-			'current'    => $wp_version,
-			'error_code' => $error_code,
-			'error_data' => $result->get_error_data(),
-			'timestamp'  => time(),
-			'retry'      => in_array( $error_code, $transient_failures ),
-		) );
+		$n = get_site_option( 'auto_core_update_notified' );
+		// Don't notify if we've already notified the same email address of the same version of the same notification type.
+		if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current ) {
+			$send = false;
+		}
 
-		if ( $send )
+		update_site_option(
+			'auto_core_update_failed', array(
+				'attempted'  => $core_update->current,
+				'current'    => $wp_version,
+				'error_code' => $error_code,
+				'error_data' => $result->get_error_data(),
+				'timestamp'  => time(),
+				'retry'      => in_array( $error_code, $transient_failures ),
+			)
+		);
+
+		if ( $send ) {
 			$this->send_email( 'fail', $core_update, $result );
+		}
 	}
 
 	/**
@@ -573,17 +599,20 @@ class WP_Automatic_Updater {
 	 * @param mixed  $result      Optional. The result for the core update. Can be WP_Error.
 	 */
 	protected function send_email( $type, $core_update, $result = null ) {
-		update_site_option( 'auto_core_update_notified', array(
-			'type'      => $type,
-			'email'     => get_site_option( 'admin_email' ),
-			'version'   => $core_update->current,
-			'timestamp' => time(),
-		) );
+		update_site_option(
+			'auto_core_update_notified', array(
+				'type'      => $type,
+				'email'     => get_site_option( 'admin_email' ),
+				'version'   => $core_update->current,
+				'timestamp' => time(),
+			)
+		);
 
 		$next_user_core_update = get_preferred_from_update_core();
 		// If the update transient is empty, use the update we just performed
-		if ( ! $next_user_core_update )
+		if ( ! $next_user_core_update ) {
 			$next_user_core_update = $core_update;
+		}
 		$newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
 
 		/**
@@ -597,27 +626,28 @@ class WP_Automatic_Updater {
 		 * @param object $core_update The update offer that was attempted.
 		 * @param mixed  $result      The result for the core update. Can be WP_Error.
 		 */
-		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) )
+		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) ) {
 			return;
+		}
 
 		switch ( $type ) {
-			case 'success' : // We updated.
+			case 'success': // We updated.
 				/* translators: 1: Site name, 2: WordPress version number. */
 				$subject = __( '[%1$s] Your site has updated to WordPress %2$s' );
 				break;
 
-			case 'fail' :   // We tried to update but couldn't.
-			case 'manual' : // We can't update (and made no attempt).
+			case 'fail':   // We tried to update but couldn't.
+			case 'manual': // We can't update (and made no attempt).
 				/* translators: 1: Site name, 2: WordPress version number. */
 				$subject = __( '[%1$s] WordPress %2$s is available. Please update!' );
 				break;
 
-			case 'critical' : // We tried to update, started to copy files, then things went wrong.
+			case 'critical': // We tried to update, started to copy files, then things went wrong.
 				/* translators: 1: Site name. */
 				$subject = __( '[%1$s] URGENT: Your site may be down due to a failed update' );
 				break;
 
-			default :
+			default:
 				return;
 		}
 
@@ -628,16 +658,17 @@ class WP_Automatic_Updater {
 		$body = '';
 
 		switch ( $type ) {
-			case 'success' :
+			case 'success':
 				$body .= sprintf( __( 'Howdy! Your site at %1$s has been updated automatically to WordPress %2$s.' ), home_url(), $core_update->current );
 				$body .= "\n\n";
-				if ( ! $newer_version_available )
+				if ( ! $newer_version_available ) {
 					$body .= __( 'No further action is needed on your part.' ) . ' ';
+				}
 
 				// Can only reference the About screen if their update was successful.
 				list( $about_version ) = explode( '-', $core_update->current, 2 );
-				$body .= sprintf( __( "For more on version %s, see the About WordPress screen:" ), $about_version );
-				$body .= "\n" . admin_url( 'about.php' );
+				$body                 .= sprintf( __( 'For more on version %s, see the About WordPress screen:' ), $about_version );
+				$body                 .= "\n" . admin_url( 'about.php' );
 
 				if ( $newer_version_available ) {
 					$body .= "\n\n" . sprintf( __( 'WordPress %s is also now available.' ), $next_user_core_update->current ) . ' ';
@@ -647,26 +678,28 @@ class WP_Automatic_Updater {
 
 				break;
 
-			case 'fail' :
-			case 'manual' :
+			case 'fail':
+			case 'manual':
 				$body .= sprintf( __( 'Please update your site at %1$s to WordPress %2$s.' ), home_url(), $next_user_core_update->current );
 
 				$body .= "\n\n";
 
 				// Don't show this message if there is a newer version available.
 				// Potential for confusion, and also not useful for them to know at this point.
-				if ( 'fail' == $type && ! $newer_version_available )
+				if ( 'fail' == $type && ! $newer_version_available ) {
 					$body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
+				}
 
 				$body .= __( 'Updating is easy and only takes a few moments:' );
 				$body .= "\n" . network_admin_url( 'update-core.php' );
 				break;
 
-			case 'critical' :
-				if ( $newer_version_available )
+			case 'critical':
+				if ( $newer_version_available ) {
 					$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update WordPress to version %2$s.' ), home_url(), $core_update->current );
-				else
+				} else {
 					$body .= sprintf( __( 'Your site at %1$s experienced a critical failure while trying to update to the latest version of WordPress, %2$s.' ), home_url(), $core_update->current );
+				}
 
 				$body .= "\n\n" . __( "This means your site may be offline or broken. Don't panic; this can be fixed." );
 
@@ -678,7 +711,7 @@ class WP_Automatic_Updater {
 		$critical_support = 'critical' === $type && ! empty( $core_update->support_email );
 		if ( $critical_support ) {
 			// Support offer if available.
-			$body .= "\n\n" . sprintf( __( "The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working." ), $core_update->support_email );
+			$body .= "\n\n" . sprintf( __( 'The WordPress team is willing to help you. Forward this email to %s and the team will work with you to make sure your site is working.' ), $core_update->support_email );
 		} else {
 			// Add a note about the support forums.
 			$body .= "\n\n" . __( 'If you experience any issues or need support, the volunteers in the WordPress.org support forums may be able to help.' );
@@ -691,7 +724,7 @@ class WP_Automatic_Updater {
 		}
 
 		if ( $critical_support ) {
-			$body .= " " . __( "If you reach out to us, we'll also ensure you'll never have this problem again." );
+			$body .= ' ' . __( "If you reach out to us, we'll also ensure you'll never have this problem again." );
 		}
 
 		// If things are successful and we're now on the latest, mention plugins and themes if any are out of date.
@@ -710,28 +743,33 @@ class WP_Automatic_Updater {
 
 			// If we had a rollback and we're still critical, then the rollback failed too.
 			// Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
-			if ( 'rollback_was_required' == $result->get_error_code() )
+			if ( 'rollback_was_required' == $result->get_error_code() ) {
 				$errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
-			else
+			} else {
 				$errors = array( $result );
+			}
 
 			foreach ( $errors as $error ) {
-				if ( ! is_wp_error( $error ) )
+				if ( ! is_wp_error( $error ) ) {
 					continue;
+				}
 				$error_code = $error->get_error_code();
-				$body .= "\n\n" . sprintf( __( "Error code: %s" ), $error_code );
-				if ( 'rollback_was_required' == $error_code )
+				$body      .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
+				if ( 'rollback_was_required' == $error_code ) {
 					continue;
-				if ( $error->get_error_message() )
+				}
+				if ( $error->get_error_message() ) {
 					$body .= "\n" . $error->get_error_message();
+				}
 				$error_data = $error->get_error_data();
-				if ( $error_data )
+				if ( $error_data ) {
 					$body .= "\n" . implode( ', ', (array) $error_data );
+				}
 			}
 			$body .= "\n";
 		}
 
-		$to  = get_site_option( 'admin_email' );
+		$to      = get_site_option( 'admin_email' );
 		$headers = '';
 
 		$email = compact( 'to', 'subject', 'body', 'headers' );
@@ -767,10 +805,11 @@ class WP_Automatic_Updater {
 	 */
 	protected function send_debug_email() {
 		$update_count = 0;
-		foreach ( $this->update_results as $type => $updates )
+		foreach ( $this->update_results as $type => $updates ) {
 			$update_count += count( $updates );
+		}
 
-		$body = array();
+		$body     = array();
 		$failures = 0;
 
 		$body[] = sprintf( __( 'WordPress site: %s' ), network_home_url( '/' ) );
@@ -789,8 +828,9 @@ class WP_Automatic_Updater {
 
 		// Plugins, Themes, Translations
 		foreach ( array( 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) )
+			if ( ! isset( $this->update_results[ $type ] ) ) {
 				continue;
+			}
 			$success_items = wp_list_filter( $this->update_results[ $type ], array( 'result' => true ) );
 			if ( $success_items ) {
 				$messages = array(
@@ -825,8 +865,9 @@ class WP_Automatic_Updater {
 
 		$site_title = wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
 		if ( $failures ) {
-			$body[] = trim( __(
-"BETA TESTING?
+			$body[] = trim(
+				__(
+					"BETA TESTING?
 =============
 
 This debugging email is sent when you are using a development version of WordPress.
@@ -835,7 +876,9 @@ If you think these failures might be due to a bug in WordPress, could you report
  * Open a thread in the support forums: https://wordpress.org/support/forum/alphabeta
  * Or, if you're comfortable writing a bug report: https://core.trac.wordpress.org/
 
-Thanks! -- The WordPress Team" ) );
+Thanks! -- The WordPress Team"
+				)
+			);
 			$body[] = '';
 
 			$subject = sprintf( __( '[%s] There were failures during background updates' ), $site_title );
@@ -843,27 +886,34 @@ Thanks! -- The WordPress Team" ) );
 			$subject = sprintf( __( '[%s] Background updates have finished' ), $site_title );
 		}
 
-		$body[] = trim( __(
-'UPDATE LOG
-==========' ) );
+		$body[] = trim(
+			__(
+				'UPDATE LOG
+=========='
+			)
+		);
 		$body[] = '';
 
 		foreach ( array( 'core', 'plugin', 'theme', 'translation' ) as $type ) {
-			if ( ! isset( $this->update_results[ $type ] ) )
+			if ( ! isset( $this->update_results[ $type ] ) ) {
 				continue;
+			}
 			foreach ( $this->update_results[ $type ] as $update ) {
 				$body[] = $update->name;
 				$body[] = str_repeat( '-', strlen( $update->name ) );
-				foreach ( $update->messages as $message )
-					$body[] = "  " . html_entity_decode( str_replace( '&#8230;', '...', $message ) );
+				foreach ( $update->messages as $message ) {
+					$body[] = '  ' . html_entity_decode( str_replace( '&#8230;', '...', $message ) );
+				}
 				if ( is_wp_error( $update->result ) ) {
 					$results = array( 'update' => $update->result );
 					// If we rolled back, we want to know an error that occurred then too.
-					if ( 'rollback_was_required' === $update->result->get_error_code() )
+					if ( 'rollback_was_required' === $update->result->get_error_code() ) {
 						$results = (array) $update->result->get_error_data();
+					}
 					foreach ( $results as $result_type => $result ) {
-						if ( ! is_wp_error( $result ) )
+						if ( ! is_wp_error( $result ) ) {
 							continue;
+						}
 
 						if ( 'rollback' === $result_type ) {
 							/* translators: 1: Error code, 2: Error message. */
@@ -873,8 +923,9 @@ Thanks! -- The WordPress Team" ) );
 							$body[] = '  ' . sprintf( __( 'Error: [%1$s] %2$s' ), $result->get_error_code(), $result->get_error_message() );
 						}
 
-						if ( $result->get_error_data() )
+						if ( $result->get_error_data() ) {
 							$body[] = '         ' . implode( ', ', (array) $result->get_error_data() );
+						}
 					}
 				}
 				$body[] = '';
@@ -885,7 +936,7 @@ Thanks! -- The WordPress Team" ) );
 			'to'      => get_site_option( 'admin_email' ),
 			'subject' => $subject,
 			'body'    => implode( "\n", $body ),
-			'headers' => ''
+			'headers' => '',
 		);
 
 		/**
diff --git a/wp-admin/includes/class-wp-comments-list-table.php b/wp-admin/includes/class-wp-comments-list-table.php
index f87ce81e2b..071313903e 100644
--- a/wp-admin/includes/class-wp-comments-list-table.php
+++ b/wp-admin/includes/class-wp-comments-list-table.php
@@ -45,17 +45,19 @@ class WP_Comments_List_Table extends WP_List_Table {
 			add_filter( 'comment_author', array( $this, 'floated_admin_avatar' ), 10, 2 );
 		}
 
-		parent::__construct( array(
-			'plural' => 'comments',
-			'singular' => 'comment',
-			'ajax' => true,
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural'   => 'comments',
+				'singular' => 'comment',
+				'ajax'     => true,
+				'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 	}
 
 	public function floated_admin_avatar( $name, $comment_ID ) {
 		$comment = get_comment( $comment_ID );
-		$avatar = get_avatar( $comment, 32, 'mystery' );
+		$avatar  = get_avatar( $comment, 32, 'mystery' );
 		return "$avatar $name";
 	}
 
@@ -63,11 +65,10 @@ class WP_Comments_List_Table extends WP_List_Table {
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can('edit_posts');
+		return current_user_can( 'edit_posts' );
 	}
 
 	/**
-	 *
 	 * @global int    $post_id
 	 * @global string $comment_status
 	 * @global string $search
@@ -77,10 +78,11 @@ class WP_Comments_List_Table extends WP_List_Table {
 		global $post_id, $comment_status, $search, $comment_type;
 
 		$comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
-		if ( !in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) )
+		if ( ! in_array( $comment_status, array( 'all', 'moderated', 'approved', 'spam', 'trash' ) ) ) {
 			$comment_status = 'all';
+		}
 
-		$comment_type = !empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
+		$comment_type = ! empty( $_REQUEST['comment_type'] ) ? $_REQUEST['comment_type'] : '';
 
 		$search = ( isset( $_REQUEST['s'] ) ) ? $_REQUEST['s'] : '';
 
@@ -89,7 +91,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 		$user_id = ( isset( $_REQUEST['user_id'] ) ) ? $_REQUEST['user_id'] : '';
 
 		$orderby = ( isset( $_REQUEST['orderby'] ) ) ? $_REQUEST['orderby'] : '';
-		$order = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : '';
+		$order   = ( isset( $_REQUEST['order'] ) ) ? $_REQUEST['order'] : '';
 
 		$comments_per_page = $this->get_per_page( $comment_status );
 
@@ -97,8 +99,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 		if ( isset( $_REQUEST['number'] ) ) {
 			$number = (int) $_REQUEST['number'];
-		}
-		else {
+		} else {
 			$number = $comments_per_page + min( 8, $comments_per_page ); // Grab a few extra
 		}
 
@@ -116,20 +117,20 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 		$status_map = array(
 			'moderated' => 'hold',
-			'approved' => 'approve',
-			'all' => '',
+			'approved'  => 'approve',
+			'all'       => '',
 		);
 
 		$args = array(
-			'status' => isset( $status_map[$comment_status] ) ? $status_map[$comment_status] : $comment_status,
-			'search' => $search,
-			'user_id' => $user_id,
-			'offset' => $start,
-			'number' => $number,
-			'post_id' => $post_id,
-			'type' => $comment_type,
-			'orderby' => $orderby,
-			'order' => $order,
+			'status'    => isset( $status_map[ $comment_status ] ) ? $status_map[ $comment_status ] : $comment_status,
+			'search'    => $search,
+			'user_id'   => $user_id,
+			'offset'    => $start,
+			'number'    => $number,
+			'post_id'   => $post_id,
+			'type'      => $comment_type,
+			'orderby'   => $orderby,
+			'order'     => $order,
 			'post_type' => $post_type,
 		);
 
@@ -137,7 +138,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 		if ( is_array( $_comments ) ) {
 			update_comment_cache( $_comments );
 
-			$this->items = array_slice( $_comments, 0, $comments_per_page );
+			$this->items       = array_slice( $_comments, 0, $comments_per_page );
 			$this->extra_items = array_slice( $_comments, $comments_per_page );
 
 			$_comment_post_ids = array_unique( wp_list_pluck( $_comments, 'comment_post_ID' ) );
@@ -145,20 +146,25 @@ class WP_Comments_List_Table extends WP_List_Table {
 			$this->pending_count = get_pending_comments_num( $_comment_post_ids );
 		}
 
-		$total_comments = get_comments( array_merge( $args, array(
-			'count' => true,
-			'offset' => 0,
-			'number' => 0
-		) ) );
+		$total_comments = get_comments(
+			array_merge(
+				$args, array(
+					'count'  => true,
+					'offset' => 0,
+					'number' => 0,
+				)
+			)
+		);
 
-		$this->set_pagination_args( array(
-			'total_items' => $total_comments,
-			'per_page' => $comments_per_page,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $total_comments,
+				'per_page'    => $comments_per_page,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @param string $comment_status
 	 * @return int
 	 */
@@ -176,7 +182,6 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $comment_status
 	 */
 	public function no_items() {
@@ -190,7 +195,6 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global int $post_id
 	 * @global string $comment_status
 	 * @global string $comment_type
@@ -203,7 +207,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 		$stati = array(
 			/* translators: %s: all comments count */
-			'all' => _nx_noop(
+			'all'       => _nx_noop(
 				'All <span class="count">(%s)</span>',
 				'All <span class="count">(%s)</span>',
 				'comments'
@@ -217,33 +221,35 @@ class WP_Comments_List_Table extends WP_List_Table {
 			),
 
 			/* translators: %s: approved comments count */
-			'approved' => _nx_noop(
+			'approved'  => _nx_noop(
 				'Approved <span class="count">(%s)</span>',
 				'Approved <span class="count">(%s)</span>',
 				'comments'
 			),
 
 			/* translators: %s: spam comments count */
-			'spam' => _nx_noop(
+			'spam'      => _nx_noop(
 				'Spam <span class="count">(%s)</span>',
 				'Spam <span class="count">(%s)</span>',
 				'comments'
 			),
 
 			/* translators: %s: trashed comments count */
-			'trash' => _nx_noop(
+			'trash'     => _nx_noop(
 				'Trash <span class="count">(%s)</span>',
 				'Trash <span class="count">(%s)</span>',
 				'comments'
-			)
+			),
 		);
 
-		if ( !EMPTY_TRASH_DAYS )
-			unset($stati['trash']);
+		if ( ! EMPTY_TRASH_DAYS ) {
+			unset( $stati['trash'] );
+		}
 
 		$link = admin_url( 'edit-comments.php' );
-		if ( !empty($comment_type) && 'all' != $comment_type )
+		if ( ! empty( $comment_type ) && 'all' != $comment_type ) {
 			$link = add_query_arg( 'comment_type', $comment_type, $link );
+		}
 
 		foreach ( $stati as $status => $label ) {
 			$current_link_attributes = '';
@@ -252,11 +258,13 @@ class WP_Comments_List_Table extends WP_List_Table {
 				$current_link_attributes = ' class="current" aria-current="page"';
 			}
 
-			if ( !isset( $num_comments->$status ) )
+			if ( ! isset( $num_comments->$status ) ) {
 				$num_comments->$status = 10;
+			}
 			$link = add_query_arg( 'comment_status', $status, $link );
-			if ( $post_id )
+			if ( $post_id ) {
 				$link = add_query_arg( 'p', absint( $post_id ), $link );
+			}
 			/*
 			// I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark
 			if ( !empty( $_REQUEST['s'] ) )
@@ -264,7 +272,8 @@ class WP_Comments_List_Table extends WP_List_Table {
 			*/
 			$status_links[ $status ] = "<a href='$link'$current_link_attributes>" . sprintf(
 				translate_nooped_plural( $label, $num_comments->$status ),
-				sprintf( '<span class="%s-count">%s</span>',
+				sprintf(
+					'<span class="%s-count">%s</span>',
 					( 'moderated' === $status ) ? 'pending' : $status,
 					number_format_i18n( $num_comments->$status )
 				)
@@ -283,7 +292,6 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $comment_status
 	 *
 	 * @return array
@@ -292,12 +300,15 @@ class WP_Comments_List_Table extends WP_List_Table {
 		global $comment_status;
 
 		$actions = array();
-		if ( in_array( $comment_status, array( 'all', 'approved' ) ) )
+		if ( in_array( $comment_status, array( 'all', 'approved' ) ) ) {
 			$actions['unapprove'] = __( 'Unapprove' );
-		if ( in_array( $comment_status, array( 'all', 'moderated' ) ) )
+		}
+		if ( in_array( $comment_status, array( 'all', 'moderated' ) ) ) {
 			$actions['approve'] = __( 'Approve' );
-		if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) )
+		}
+		if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) ) {
 			$actions['spam'] = _x( 'Mark as Spam', 'comment' );
+		}
 
 		if ( 'trash' === $comment_status ) {
 			$actions['untrash'] = __( 'Restore' );
@@ -305,16 +316,16 @@ class WP_Comments_List_Table extends WP_List_Table {
 			$actions['unspam'] = _x( 'Not Spam', 'comment' );
 		}
 
-		if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || !EMPTY_TRASH_DAYS )
+		if ( in_array( $comment_status, array( 'trash', 'spam' ) ) || ! EMPTY_TRASH_DAYS ) {
 			$actions['delete'] = __( 'Delete Permanently' );
-		else
+		} else {
 			$actions['trash'] = __( 'Move to Trash' );
+		}
 
 		return $actions;
 	}
 
 	/**
-	 *
 	 * @global string $comment_status
 	 * @global string $comment_type
 	 *
@@ -330,43 +341,46 @@ class WP_Comments_List_Table extends WP_List_Table {
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' === $which ) {
+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>
+	<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 array $comment_types An array of comment types. Accepts 'Comments', 'Pings'.
-				 */
-				$comment_types = apply_filters( 'admin_comment_types_dropdown', array(
-					'comment' => __( 'Comments' ),
-					'pings' => __( 'Pings' ),
-				) );
+		/**
+		 * Filters the comment types dropdown menu.
+		 *
+		 * @since 2.7.0
+		 *
+		 * @param array $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";
-			?>
-			</select>
+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' ) );
-		}
+	/**
+	 * 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.
 		 *
@@ -382,14 +396,14 @@ class WP_Comments_List_Table extends WP_List_Table {
 	 * @return string|false
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
 			return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
 
 	/**
-	 *
 	 * @global int $post_id
 	 *
 	 * @return array
@@ -399,10 +413,11 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 		$columns = array();
 
-		if ( $this->checkbox )
+		if ( $this->checkbox ) {
 			$columns['cb'] = '<input type="checkbox" />';
+		}
 
-		$columns['author'] = __( 'Author' );
+		$columns['author']  = __( 'Author' );
 		$columns['comment'] = _x( 'Comment', 'column name' );
 
 		if ( ! $post_id ) {
@@ -416,14 +431,13 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
 		return array(
 			'author'   => 'comment_author',
 			'response' => 'comment_post_ID',
-			'date'     => 'comment_date'
+			'date'     => 'comment_date',
 		);
 	}
 
@@ -441,7 +455,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 	/**
 	 */
 	public function display() {
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
 
 		$this->display_tablenav( 'top' );
 
@@ -507,54 +521,58 @@ class WP_Comments_List_Table extends WP_List_Table {
 		unset( $GLOBALS['post'], $GLOBALS['comment'] );
 	}
 
- 	/**
- 	 * Generate and display row actions links.
- 	 *
- 	 * @since 4.3.0
- 	 *
- 	 * @global string $comment_status Status for the current listed comments.
- 	 *
- 	 * @param WP_Comment $comment     The comment object.
- 	 * @param string     $column_name Current column name.
- 	 * @param string     $primary     Primary column name.
- 	 * @return string|void Comment row actions output.
- 	 */
- 	protected function handle_row_actions( $comment, $column_name, $primary ) {
- 		global $comment_status;
+	/**
+	 * Generate and display row actions links.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @global string $comment_status Status for the current listed comments.
+	 *
+	 * @param WP_Comment $comment     The comment object.
+	 * @param string     $column_name Current column name.
+	 * @param string     $primary     Primary column name.
+	 * @return string|void Comment row actions output.
+	 */
+	protected function handle_row_actions( $comment, $column_name, $primary ) {
+		global $comment_status;
 
 		if ( $primary !== $column_name ) {
 			return '';
 		}
 
- 		if ( ! $this->user_can ) {
- 			return;
+		if ( ! $this->user_can ) {
+			return;
 		}
 
 		$the_comment_status = wp_get_comment_status( $comment );
 
 		$out = '';
 
-		$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
+		$del_nonce     = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
 		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
 
 		$url = "comment.php?c=$comment->comment_ID";
 
-		$approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" );
+		$approve_url   = esc_url( $url . "&action=approvecomment&$approve_nonce" );
 		$unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" );
-		$spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" );
-		$unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" );
-		$trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" );
-		$untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" );
-		$delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
+		$spam_url      = esc_url( $url . "&action=spamcomment&$del_nonce" );
+		$unspam_url    = esc_url( $url . "&action=unspamcomment&$del_nonce" );
+		$trash_url     = esc_url( $url . "&action=trashcomment&$del_nonce" );
+		$untrash_url   = esc_url( $url . "&action=untrashcomment&$del_nonce" );
+		$delete_url    = esc_url( $url . "&action=deletecomment&$del_nonce" );
 
 		// Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
 		$actions = array(
-			'approve' => '', 'unapprove' => '',
-			'reply' => '',
+			'approve'   => '',
+			'unapprove' => '',
+			'reply'     => '',
 			'quickedit' => '',
-			'edit' => '',
-			'spam' => '', 'unspam' => '',
-			'trash' => '', 'untrash' => '', 'delete' => ''
+			'edit'      => '',
+			'spam'      => '',
+			'unspam'    => '',
+			'trash'     => '',
+			'untrash'   => '',
+			'delete'    => '',
 		);
 
 		// Not looking at all comments.
@@ -565,7 +583,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 				$actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved' class='vim-a vim-destructive' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
 			}
 		} else {
-			$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+			$actions['approve']   = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
 			$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
 		}
 
@@ -579,14 +597,14 @@ class WP_Comments_List_Table extends WP_List_Table {
 			$actions['untrash'] = "<a href='$untrash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1' class='vim-z vim-destructive' aria-label='" . esc_attr__( 'Restore this comment from the Trash' ) . "'>" . __( 'Restore' ) . '</a>';
 		}
 
-		if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) {
+		if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || ! EMPTY_TRASH_DAYS ) {
 			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::delete=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( 'Delete Permanently' ) . '</a>';
 		} else {
 			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
 		}
 
 		if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
-			$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>". __( 'Edit' ) . '</a>';
+			$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>" . __( 'Edit' ) . '</a>';
 
 			$format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" aria-label="%s" href="#">%s</a>';
 
@@ -598,20 +616,21 @@ class WP_Comments_List_Table extends WP_List_Table {
 		/** This filter is documented in wp-admin/includes/dashboard.php */
 		$actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
 
-		$i = 0;
+		$i    = 0;
 		$out .= '<div class="row-actions">';
 		foreach ( $actions as $action => $link ) {
 			++$i;
 			( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span when not added with ajax
-			if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() )
+			if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() ) {
 				$action .= ' hide-if-no-js';
-			elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
-				if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
+			} elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
+				if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) {
 					$action .= ' approve';
-				else
+				} else {
 					$action .= ' unapprove';
+				}
 			}
 
 			$out .= "<span class='$action'>$sep$link</span>";
@@ -624,11 +643,11 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
 	public function column_cb( $comment ) {
-		if ( $this->user_can ) { ?>
+		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
@@ -647,7 +666,7 @@ class WP_Comments_List_Table extends WP_List_Table {
 			$parent = get_comment( $comment->comment_parent );
 			if ( $parent ) {
 				$parent_link = esc_url( get_comment_link( $parent ) );
-				$name = get_comment_author( $parent );
+				$name        = get_comment_author( $parent );
 				printf(
 					/* translators: %s: comment link */
 					__( 'In reply to %s.' ),
@@ -657,12 +676,15 @@ class WP_Comments_List_Table extends WP_List_Table {
 		}
 
 		comment_text( $comment );
-		if ( $this->user_can ) { ?>
+		if ( $this->user_can ) {
+		?>
 		<div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
-		<textarea class="comment" rows="1" cols="1"><?php
+		<textarea class="comment" rows="1" cols="1">
+		<?php
 			/** This filter is documented in wp-admin/includes/comment.php */
 			echo esc_textarea( apply_filters( 'comment_edit_pre', $comment->comment_content ) );
-		?></textarea>
+		?>
+		</textarea>
 		<div class="author-email"><?php echo esc_attr( $comment->comment_author_email ); ?></div>
 		<div class="author"><?php echo esc_attr( $comment->comment_author ); ?></div>
 		<div class="author-url"><?php echo esc_attr( $comment->comment_author_url ); ?></div>
@@ -673,7 +695,6 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $comment_status
 	 *
 	 * @param WP_Comment $comment The comment object.
@@ -688,7 +709,9 @@ class WP_Comments_List_Table extends WP_List_Table {
 			$author_url_display = wp_html_excerpt( $author_url_display, 49, '&hellip;' );
 		}
 
-		echo "<strong>"; comment_author( $comment ); echo '</strong><br />';
+		echo '<strong>';
+		comment_author( $comment );
+		echo '</strong><br />';
 		if ( ! empty( $author_url_display ) ) {
 			printf( '<a href="%s">%s</a><br />', esc_url( $author_url ), esc_html( $author_url_display ) );
 		}
@@ -705,7 +728,12 @@ class WP_Comments_List_Table extends WP_List_Table {
 
 			$author_ip = get_comment_author_IP( $comment );
 			if ( $author_ip ) {
-				$author_ip_url = add_query_arg( array( 's' => $author_ip, 'mode' => 'detail' ), admin_url( 'edit-comments.php' ) );
+				$author_ip_url = add_query_arg(
+					array(
+						's'    => $author_ip,
+						'mode' => 'detail',
+					), admin_url( 'edit-comments.php' )
+				);
 				if ( 'spam' === $comment_status ) {
 					$author_ip_url = add_query_arg( 'comment_status', 'spam', $author_ip_url );
 				}
@@ -715,19 +743,19 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
 	public function column_date( $comment ) {
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(
+			__( '%1$s at %2$s' ),
 			/* translators: comment date format. See https://secure.php.net/date */
 			get_comment_date( __( 'Y/m/d' ), $comment ),
 			get_comment_date( __( 'g:i a' ), $comment )
 		);
 
 		echo '<div class="submitted-on">';
-		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty( $comment->comment_post_ID ) ) {
 			printf(
 				'<a href="%s">%s</a>',
 				esc_url( get_comment_link( $comment ) ),
@@ -740,7 +768,6 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @param WP_Comment $comment The comment object.
 	 */
 	public function column_response( $comment ) {
@@ -750,15 +777,15 @@ class WP_Comments_List_Table extends WP_List_Table {
 			return;
 		}
 
-		if ( isset( $this->pending_count[$post->ID] ) ) {
-			$pending_comments = $this->pending_count[$post->ID];
+		if ( isset( $this->pending_count[ $post->ID ] ) ) {
+			$pending_comments = $this->pending_count[ $post->ID ];
 		} else {
 			$_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
-			$pending_comments = $this->pending_count[$post->ID] = $_pending_count_temp[$post->ID];
+			$pending_comments    = $this->pending_count[ $post->ID ] = $_pending_count_temp[ $post->ID ];
 		}
 
 		if ( current_user_can( 'edit_post', $post->ID ) ) {
-			$post_link = "<a href='" . get_edit_post_link( $post->ID ) . "' class='comments-edit-item-link'>";
+			$post_link  = "<a href='" . get_edit_post_link( $post->ID ) . "' class='comments-edit-item-link'>";
 			$post_link .= esc_html( get_the_title( $post->ID ) ) . '</a>';
 		} else {
 			$post_link = esc_html( get_the_title( $post->ID ) );
@@ -778,7 +805,6 @@ class WP_Comments_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @param WP_Comment $comment     The comment object.
 	 * @param string     $column_name The custom column's name.
 	 */
diff --git a/wp-admin/includes/class-wp-community-events.php b/wp-admin/includes/class-wp-community-events.php
index 79c4a85adb..410f9b6237 100644
--- a/wp-admin/includes/class-wp-community-events.php
+++ b/wp-admin/includes/class-wp-community-events.php
@@ -95,8 +95,8 @@ class WP_Community_Events {
 		// include an unmodified $wp_version
 		include( ABSPATH . WPINC . '/version.php' );
 
-		$api_url      = 'http://api.wordpress.org/events/1.0/';
-		$request_args = $this->get_request_args( $location_search, $timezone );
+		$api_url                    = 'http://api.wordpress.org/events/1.0/';
+		$request_args               = $this->get_request_args( $location_search, $timezone );
 		$request_args['user-agent'] = 'WordPress/' . $wp_version . '; ' . home_url( '/' );
 
 		if ( wp_http_supports( array( 'ssl' ) ) ) {
@@ -203,7 +203,7 @@ class WP_Community_Events {
 
 		// Wrap the args in an array compatible with the second parameter of `wp_remote_get()`.
 		return array(
-			'body' => $args
+			'body' => $args,
 		);
 	}
 
@@ -339,7 +339,7 @@ class WP_Community_Events {
 
 		if ( isset( $location['ip'] ) ) {
 			$key = 'community-events-' . md5( $location['ip'] );
-		} else if ( isset( $location['latitude'], $location['longitude'] ) ) {
+		} elseif ( isset( $location['latitude'], $location['longitude'] ) ) {
 			$key = 'community-events-' . md5( $location['latitude'] . $location['longitude'] );
 		}
 
@@ -463,11 +463,13 @@ class WP_Community_Events {
 			return;
 		}
 
-		error_log( sprintf(
-			'%s: %s. Details: %s',
-			__METHOD__,
-			trim( $message, '.' ),
-			wp_json_encode( $details )
-		) );
+		error_log(
+			sprintf(
+				'%s: %s. Details: %s',
+				__METHOD__,
+				trim( $message, '.' ),
+				wp_json_encode( $details )
+			)
+		);
 	}
 }
diff --git a/wp-admin/includes/class-wp-filesystem-base.php b/wp-admin/includes/class-wp-filesystem-base.php
index 31fa1ebb96..c518408ec9 100644
--- a/wp-admin/includes/class-wp-filesystem-base.php
+++ b/wp-admin/includes/class-wp-filesystem-base.php
@@ -53,10 +53,11 @@ class WP_Filesystem_Base {
 	 * @return string The location of the remote path.
 	 */
 	public function abspath() {
-		$folder = $this->find_folder(ABSPATH);
+		$folder = $this->find_folder( ABSPATH );
 		// Perhaps the FTP folder is rooted at the WordPress install, Check for wp-includes folder in root, Could have some false positives, but rare.
-		if ( ! $folder && $this->is_dir( '/' . WPINC ) )
+		if ( ! $folder && $this->is_dir( '/' . WPINC ) ) {
 			$folder = '/';
+		}
 		return $folder;
 	}
 
@@ -68,7 +69,7 @@ class WP_Filesystem_Base {
 	 * @return string The location of the remote path.
 	 */
 	public function wp_content_dir() {
-		return $this->find_folder(WP_CONTENT_DIR);
+		return $this->find_folder( WP_CONTENT_DIR );
 	}
 
 	/**
@@ -79,7 +80,7 @@ class WP_Filesystem_Base {
 	 * @return string The location of the remote path.
 	 */
 	public function wp_plugins_dir() {
-		return $this->find_folder(WP_PLUGIN_DIR);
+		return $this->find_folder( WP_PLUGIN_DIR );
 	}
 
 	/**
@@ -94,8 +95,9 @@ class WP_Filesystem_Base {
 		$theme_root = get_theme_root( $theme );
 
 		// Account for relative theme roots
-		if ( '/themes' == $theme_root || ! is_dir( $theme_root ) )
+		if ( '/themes' == $theme_root || ! is_dir( $theme_root ) ) {
 			$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 
 		return $this->find_folder( $theme_root );
 	}
@@ -108,7 +110,7 @@ class WP_Filesystem_Base {
 	 * @return string The location of the remote path.
 	 */
 	public function wp_lang_dir() {
-		return $this->find_folder(WP_LANG_DIR);
+		return $this->find_folder( WP_LANG_DIR );
 	}
 
 	/**
@@ -128,7 +130,7 @@ class WP_Filesystem_Base {
 	 * @return string The location of the remote path.
 	 */
 	public function find_base_dir( $base = '.', $echo = false ) {
-		_deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+		_deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
 		$this->verbose = $echo;
 		return $this->abspath();
 	}
@@ -149,7 +151,7 @@ class WP_Filesystem_Base {
 	 * @return string The location of the remote path.
 	 */
 	public function get_base_dir( $base = '.', $echo = false ) {
-		_deprecated_function(__FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
+		_deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
 		$this->verbose = $echo;
 		return $this->abspath();
 	}
@@ -166,29 +168,33 @@ class WP_Filesystem_Base {
 	 * @return string|false The location of the remote path, false on failure.
 	 */
 	public function find_folder( $folder ) {
-		if ( isset( $this->cache[ $folder ] ) )
+		if ( isset( $this->cache[ $folder ] ) ) {
 			return $this->cache[ $folder ];
+		}
 
-		if ( stripos($this->method, 'ftp') !== false ) {
+		if ( stripos( $this->method, 'ftp' ) !== false ) {
 			$constant_overrides = array(
-				'FTP_BASE' => ABSPATH,
+				'FTP_BASE'        => ABSPATH,
 				'FTP_CONTENT_DIR' => WP_CONTENT_DIR,
-				'FTP_PLUGIN_DIR' => WP_PLUGIN_DIR,
-				'FTP_LANG_DIR' => WP_LANG_DIR
+				'FTP_PLUGIN_DIR'  => WP_PLUGIN_DIR,
+				'FTP_LANG_DIR'    => WP_LANG_DIR,
 			);
 
 			// Direct matches ( folder = CONSTANT/ )
 			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
+				if ( ! defined( $constant ) ) {
 					continue;
-				if ( $folder === $dir )
+				}
+				if ( $folder === $dir ) {
 					return trailingslashit( constant( $constant ) );
+				}
 			}
 
 			// Prefix Matches ( folder = CONSTANT/subdir )
 			foreach ( $constant_overrides as $constant => $dir ) {
-				if ( ! defined( $constant ) )
+				if ( ! defined( $constant ) ) {
 					continue;
+				}
 				if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir
 					$potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );
 					$potential_folder = trailingslashit( $potential_folder );
@@ -200,23 +206,25 @@ class WP_Filesystem_Base {
 				}
 			}
 		} elseif ( 'direct' == $this->method ) {
-			$folder = str_replace('\\', '/', $folder); // Windows path sanitisation
-			return trailingslashit($folder);
+			$folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation
+			return trailingslashit( $folder );
 		}
 
-		$folder = preg_replace('|^([a-z]{1}):|i', '', $folder); // Strip out windows drive letter if it's there.
-		$folder = str_replace('\\', '/', $folder); // Windows path sanitisation
+		$folder = preg_replace( '|^([a-z]{1}):|i', '', $folder ); // Strip out windows drive letter if it's there.
+		$folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation
 
-		if ( isset($this->cache[ $folder ] ) )
+		if ( isset( $this->cache[ $folder ] ) ) {
 			return $this->cache[ $folder ];
+		}
 
-		if ( $this->exists($folder) ) { // Folder exists at that absolute path.
-			$folder = trailingslashit($folder);
+		if ( $this->exists( $folder ) ) { // Folder exists at that absolute path.
+			$folder                 = trailingslashit( $folder );
 			$this->cache[ $folder ] = $folder;
 			return $folder;
 		}
-		if ( $return = $this->search_for_folder($folder) )
+		if ( $return = $this->search_for_folder( $folder ) ) {
 			$this->cache[ $folder ] = $return;
+		}
 		return $return;
 	}
 
@@ -233,26 +241,28 @@ class WP_Filesystem_Base {
 	 * @return string|false The location of the remote path, false to cease looping.
 	 */
 	public function search_for_folder( $folder, $base = '.', $loop = false ) {
-		if ( empty( $base ) || '.' == $base )
-			$base = trailingslashit($this->cwd());
+		if ( empty( $base ) || '.' == $base ) {
+			$base = trailingslashit( $this->cwd() );
+		}
 
-		$folder = untrailingslashit($folder);
+		$folder = untrailingslashit( $folder );
 
 		if ( $this->verbose ) {
 			/* translators: 1: folder to locate, 2: folder to start searching from */
 			printf( "\n" . __( 'Looking for %1$s in %2$s' ) . "<br/>\n", $folder, $base );
 		}
 
-		$folder_parts = explode('/', $folder);
+		$folder_parts     = explode( '/', $folder );
 		$folder_part_keys = array_keys( $folder_parts );
-		$last_index = array_pop( $folder_part_keys );
-		$last_path = $folder_parts[ $last_index ];
+		$last_index       = array_pop( $folder_part_keys );
+		$last_path        = $folder_parts[ $last_index ];
 
 		$files = $this->dirlist( $base );
 
 		foreach ( $folder_parts as $index => $key ) {
-			if ( $index == $last_index )
+			if ( $index == $last_index ) {
 				continue; // We want this to be caught by the next code block.
+			}
 
 			/*
 			 * Working from /home/ to /user/ to /wordpress/ see if that file exists within
@@ -261,10 +271,10 @@ class WP_Filesystem_Base {
 			 * folder level, and see if that matches, and so on. If it reaches the end, and still
 			 * cant find it, it'll return false for the entire function.
 			 */
-			if ( isset($files[ $key ]) ){
+			if ( isset( $files[ $key ] ) ) {
 
 				// Let's try that folder:
-				$newdir = trailingslashit(path_join($base, $key));
+				$newdir = trailingslashit( path_join( $base, $key ) );
 				if ( $this->verbose ) {
 					/* translators: %s: directory name */
 					printf( "\n" . __( 'Changing to %s' ) . "<br/>\n", $newdir );
@@ -272,25 +282,27 @@ class WP_Filesystem_Base {
 
 				// Only search for the remaining path tokens in the directory, not the full path again.
 				$newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
-				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) )
+				if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop ) ) {
 					return $ret;
+				}
 			}
 		}
 
 		// Only check this as a last resort, to prevent locating the incorrect install.
 		// All above procedures will fail quickly if this is the right branch to take.
-		if (isset( $files[ $last_path ] ) ) {
+		if ( isset( $files[ $last_path ] ) ) {
 			if ( $this->verbose ) {
 				/* translators: %s: directory name */
-				printf( "\n" . __( 'Found %s' ) . "<br/>\n",  $base . $last_path );
+				printf( "\n" . __( 'Found %s' ) . "<br/>\n", $base . $last_path );
 			}
-			return trailingslashit($base . $last_path);
+			return trailingslashit( $base . $last_path );
 		}
 
 		// Prevent this function from looping again.
 		// No need to proceed if we've just searched in /
-		if ( $loop || '/' == $base )
+		if ( $loop || '/' == $base ) {
 			return false;
+		}
 
 		// As an extra last resort, Change back to / if the folder wasn't found.
 		// This comes into effect when the CWD is /home/user/ but WP is at /var/www/....
@@ -310,45 +322,46 @@ class WP_Filesystem_Base {
 	 * @param string $file String filename.
 	 * @return string The *nix-style representation of permissions.
 	 */
-	public function gethchmod( $file ){
+	public function gethchmod( $file ) {
 		$perms = intval( $this->getchmod( $file ), 8 );
-		if (($perms & 0xC000) == 0xC000) // Socket
+		if ( ( $perms & 0xC000 ) == 0xC000 ) { // Socket
 			$info = 's';
-		elseif (($perms & 0xA000) == 0xA000) // Symbolic Link
+		} elseif ( ( $perms & 0xA000 ) == 0xA000 ) { // Symbolic Link
 			$info = 'l';
-		elseif (($perms & 0x8000) == 0x8000) // Regular
+		} elseif ( ( $perms & 0x8000 ) == 0x8000 ) { // Regular
 			$info = '-';
-		elseif (($perms & 0x6000) == 0x6000) // Block special
+		} elseif ( ( $perms & 0x6000 ) == 0x6000 ) { // Block special
 			$info = 'b';
-		elseif (($perms & 0x4000) == 0x4000) // Directory
+		} elseif ( ( $perms & 0x4000 ) == 0x4000 ) { // Directory
 			$info = 'd';
-		elseif (($perms & 0x2000) == 0x2000) // Character special
+		} elseif ( ( $perms & 0x2000 ) == 0x2000 ) { // Character special
 			$info = 'c';
-		elseif (($perms & 0x1000) == 0x1000) // FIFO pipe
+		} elseif ( ( $perms & 0x1000 ) == 0x1000 ) { // FIFO pipe
 			$info = 'p';
-		else // Unknown
+		} else { // Unknown
 			$info = 'u';
+		}
 
 		// Owner
-		$info .= (($perms & 0x0100) ? 'r' : '-');
-		$info .= (($perms & 0x0080) ? 'w' : '-');
-		$info .= (($perms & 0x0040) ?
-					(($perms & 0x0800) ? 's' : 'x' ) :
-					(($perms & 0x0800) ? 'S' : '-'));
+		$info .= ( ( $perms & 0x0100 ) ? 'r' : '-' );
+		$info .= ( ( $perms & 0x0080 ) ? 'w' : '-' );
+		$info .= ( ( $perms & 0x0040 ) ?
+					( ( $perms & 0x0800 ) ? 's' : 'x' ) :
+					( ( $perms & 0x0800 ) ? 'S' : '-' ) );
 
 		// Group
-		$info .= (($perms & 0x0020) ? 'r' : '-');
-		$info .= (($perms & 0x0010) ? 'w' : '-');
-		$info .= (($perms & 0x0008) ?
-					(($perms & 0x0400) ? 's' : 'x' ) :
-					(($perms & 0x0400) ? 'S' : '-'));
+		$info .= ( ( $perms & 0x0020 ) ? 'r' : '-' );
+		$info .= ( ( $perms & 0x0010 ) ? 'w' : '-' );
+		$info .= ( ( $perms & 0x0008 ) ?
+					( ( $perms & 0x0400 ) ? 's' : 'x' ) :
+					( ( $perms & 0x0400 ) ? 'S' : '-' ) );
 
 		// World
-		$info .= (($perms & 0x0004) ? 'r' : '-');
-		$info .= (($perms & 0x0002) ? 'w' : '-');
-		$info .= (($perms & 0x0001) ?
-					(($perms & 0x0200) ? 't' : 'x' ) :
-					(($perms & 0x0200) ? 'T' : '-'));
+		$info .= ( ( $perms & 0x0004 ) ? 'r' : '-' );
+		$info .= ( ( $perms & 0x0002 ) ? 'w' : '-' );
+		$info .= ( ( $perms & 0x0001 ) ?
+					( ( $perms & 0x0200 ) ? 't' : 'x' ) :
+					( ( $perms & 0x0200 ) ? 'T' : '-' ) );
 		return $info;
 	}
 
@@ -368,7 +381,7 @@ class WP_Filesystem_Base {
 	 *
 	 * Converts '-rw-r--r--' to 0644
 	 * From "info at rvgate dot nl"'s comment on the PHP documentation for chmod()
- 	 *
+	 *
 	 * @link https://secure.php.net/manual/en/function.chmod.php#49614
 	 *
 	 * @since 2.5.0
@@ -378,20 +391,25 @@ class WP_Filesystem_Base {
 	 */
 	public function getnumchmodfromh( $mode ) {
 		$realmode = '';
-		$legal =  array('', 'w', 'r', 'x', '-');
-		$attarray = preg_split('//', $mode);
+		$legal    = array( '', 'w', 'r', 'x', '-' );
+		$attarray = preg_split( '//', $mode );
 
 		for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
-			if ($key = array_search($attarray[$i], $legal)) {
-				$realmode .= $legal[$key];
+			if ( $key = array_search( $attarray[ $i ], $legal ) ) {
+				$realmode .= $legal[ $key ];
 			}
 		}
 
-		$mode = str_pad($realmode, 10, '-', STR_PAD_LEFT);
-		$trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1');
-		$mode = strtr($mode,$trans);
+		$mode  = str_pad( $realmode, 10, '-', STR_PAD_LEFT );
+		$trans = array(
+			'-' => '0',
+			'r' => '4',
+			'w' => '2',
+			'x' => '1',
+		);
+		$mode  = strtr( $mode, $trans );
 
-		$newmode = $mode[0];
+		$newmode  = $mode[0];
 		$newmode .= $mode[1] + $mode[2] + $mode[3];
 		$newmode .= $mode[4] + $mode[5] + $mode[6];
 		$newmode .= $mode[7] + $mode[8] + $mode[9];
@@ -539,7 +557,7 @@ class WP_Filesystem_Base {
 	 *
 	 * @since 2.5.0
 	 * @abstract
-	 * 
+	 *
 	 * @param string $file Path to the file.
 	 * @return string|bool Username of the user or false on error.
 	 */
diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php
index 42c8fe235f..f7d6cb159f 100644
--- a/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/wp-admin/includes/class-wp-filesystem-direct.php
@@ -18,10 +18,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * constructor
 	 *
-	 *
 	 * @param mixed $arg ignored argument
 	 */
-	public function __construct($arg) {
+	public function __construct( $arg ) {
 		$this->method = 'direct';
 		$this->errors = new WP_Error();
 	}
@@ -29,29 +28,26 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Reads entire file into a string
 	 *
-	 *
 	 * @param string $file Name of the file to read.
 	 * @return string|bool The function returns the read data or false on failure.
 	 */
-	public function get_contents($file) {
-		return @file_get_contents($file);
+	public function get_contents( $file ) {
+		return @file_get_contents( $file );
 	}
 
 	/**
 	 * Reads entire file into an array
 	 *
-	 *
 	 * @param string $file Path to the file.
 	 * @return array|bool the file contents in an array or false on failure.
 	 */
-	public function get_contents_array($file) {
-		return @file($file);
+	public function get_contents_array( $file ) {
+		return @file( $file );
 	}
 
 	/**
 	 * Write a string to a file
 	 *
-	 *
 	 * @param string $file     Remote path to the file where to write the data.
 	 * @param string $contents The data to write.
 	 * @param int    $mode     Optional. The file permissions as octal number, usually 0644.
@@ -60,8 +56,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	 */
 	public function put_contents( $file, $contents, $mode = false ) {
 		$fp = @fopen( $file, 'wb' );
-		if ( ! $fp )
+		if ( ! $fp ) {
 			return false;
+		}
 
 		mbstring_binary_safe_encoding();
 
@@ -73,8 +70,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 
 		fclose( $fp );
 
-		if ( $data_length !== $bytes_written )
+		if ( $data_length !== $bytes_written ) {
 			return false;
+		}
 
 		$this->chmod( $file, $mode );
 
@@ -84,7 +82,6 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Gets the current working directory
 	 *
-	 *
 	 * @return string|bool the current working directory on success, or false on failure.
 	 */
 	public function cwd() {
@@ -94,35 +91,37 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Change directory
 	 *
-	 *
 	 * @param string $dir The new current directory.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	public function chdir($dir) {
-		return @chdir($dir);
+	public function chdir( $dir ) {
+		return @chdir( $dir );
 	}
 
 	/**
 	 * Changes file group
 	 *
-	 *
 	 * @param string $file      Path to the file.
 	 * @param mixed  $group     A group name or number.
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Default false.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	public function chgrp($file, $group, $recursive = false) {
-		if ( ! $this->exists($file) )
+	public function chgrp( $file, $group, $recursive = false ) {
+		if ( ! $this->exists( $file ) ) {
 			return false;
-		if ( ! $recursive )
-			return @chgrp($file, $group);
-		if ( ! $this->is_dir($file) )
-			return @chgrp($file, $group);
+		}
+		if ( ! $recursive ) {
+			return @chgrp( $file, $group );
+		}
+		if ( ! $this->is_dir( $file ) ) {
+			return @chgrp( $file, $group );
+		}
 		// Is a directory, and we want recursive
-		$file = trailingslashit($file);
-		$filelist = $this->dirlist($file);
-		foreach ($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
+		$file     = trailingslashit( $file );
+		$filelist = $this->dirlist( $file );
+		foreach ( $filelist as $filename ) {
+			$this->chgrp( $file . $filename, $group, $recursive );
+		}
 
 		return true;
 	}
@@ -130,30 +129,32 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Changes filesystem permissions
 	 *
-	 *
 	 * @param string $file      Path to the file.
 	 * @param int    $mode      Optional. The permissions as octal number, usually 0644 for files,
 	 *                          0755 for dirs. Default false.
 	 * @param bool   $recursive Optional. If set True changes file group recursively. Default false.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	public function chmod($file, $mode = false, $recursive = false) {
+	public function chmod( $file, $mode = false, $recursive = false ) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+			if ( $this->is_file( $file ) ) {
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			} elseif ( $this->is_dir( $file ) ) {
 				$mode = FS_CHMOD_DIR;
-			else
+			} else {
 				return false;
+			}
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return @chmod($file, $mode);
+		if ( ! $recursive || ! $this->is_dir( $file ) ) {
+			return @chmod( $file, $mode );
+		}
 		// Is a directory, and we want recursive
-		$file = trailingslashit($file);
-		$filelist = $this->dirlist($file);
-		foreach ( (array)$filelist as $filename => $filemeta)
-			$this->chmod($file . $filename, $mode, $recursive);
+		$file     = trailingslashit( $file );
+		$filelist = $this->dirlist( $file );
+		foreach ( (array) $filelist as $filename => $filemeta ) {
+			$this->chmod( $file . $filename, $mode, $recursive );
+		}
 
 		return true;
 	}
@@ -161,24 +162,26 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Changes file owner
 	 *
-	 *
 	 * @param string $file      Path to the file.
 	 * @param mixed  $owner     A user name or number.
 	 * @param bool   $recursive Optional. If set True changes file owner recursively.
 	 *                          Default false.
 	 * @return bool Returns true on success or false on failure.
 	 */
-	public function chown($file, $owner, $recursive = false) {
-		if ( ! $this->exists($file) )
+	public function chown( $file, $owner, $recursive = false ) {
+		if ( ! $this->exists( $file ) ) {
 			return false;
-		if ( ! $recursive )
-			return @chown($file, $owner);
-		if ( ! $this->is_dir($file) )
-			return @chown($file, $owner);
+		}
+		if ( ! $recursive ) {
+			return @chown( $file, $owner );
+		}
+		if ( ! $this->is_dir( $file ) ) {
+			return @chown( $file, $owner );
+		}
 		// Is a directory, and we want recursive
-		$filelist = $this->dirlist($file);
-		foreach ($filelist as $filename) {
-			$this->chown($file . '/' . $filename, $owner, $recursive);
+		$filelist = $this->dirlist( $file );
+		foreach ( $filelist as $filename ) {
+			$this->chown( $file . '/' . $filename, $owner, $recursive );
 		}
 		return true;
 	}
@@ -186,17 +189,18 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	/**
 	 * Gets file owner
 	 *
-	 *
 	 * @param string $file Path to the file.
 	 * @return string|bool Username of the user or false on error.
 	 */
-	public function owner($file) {
-		$owneruid = @fileowner($file);
-		if ( ! $owneruid )
+	public function owner( $file ) {
+		$owneruid = @fileowner( $file );
+		if ( ! $owneruid ) {
 			return false;
-		if ( ! function_exists('posix_getpwuid') )
+		}
+		if ( ! function_exists( 'posix_getpwuid' ) ) {
 			return $owneruid;
-		$ownerarray = posix_getpwuid($owneruid);
+		}
+		$ownerarray = posix_getpwuid( $owneruid );
 		return $ownerarray['name'];
 	}
 
@@ -205,64 +209,66 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	 *
 	 * FIXME does not handle errors in fileperms()
 	 *
-	 *
 	 * @param string $file Path to the file.
 	 * @return string Mode of the file (last 3 digits).
 	 */
-	public function getchmod($file) {
+	public function getchmod( $file ) {
 		return substr( decoct( @fileperms( $file ) ), -3 );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string|false
 	 */
-	public function group($file) {
-		$gid = @filegroup($file);
-		if ( ! $gid )
+	public function group( $file ) {
+		$gid = @filegroup( $file );
+		if ( ! $gid ) {
 			return false;
-		if ( ! function_exists('posix_getgrgid') )
+		}
+		if ( ! function_exists( 'posix_getgrgid' ) ) {
 			return $gid;
-		$grouparray = posix_getgrgid($gid);
+		}
+		$grouparray = posix_getgrgid( $gid );
 		return $grouparray['name'];
 	}
 
 	/**
-	 *
 	 * @param string $source
 	 * @param string $destination
 	 * @param bool   $overwrite
 	 * @param int    $mode
 	 * @return bool
 	 */
-	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+		if ( ! $overwrite && $this->exists( $destination ) ) {
 			return false;
+		}
 
-		$rtval = copy($source, $destination);
-		if ( $mode )
-			$this->chmod($destination, $mode);
+		$rtval = copy( $source, $destination );
+		if ( $mode ) {
+			$this->chmod( $destination, $mode );
+		}
 		return $rtval;
 	}
 
 	/**
-	 *
 	 * @param string $source
 	 * @param string $destination
 	 * @param bool $overwrite
 	 * @return bool
 	 */
-	public function move($source, $destination, $overwrite = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+	public function move( $source, $destination, $overwrite = false ) {
+		if ( ! $overwrite && $this->exists( $destination ) ) {
 			return false;
+		}
 
 		// Try using rename first. if that fails (for example, source is read only) try copy.
-		if ( @rename($source, $destination) )
+		if ( @rename( $source, $destination ) ) {
 			return true;
+		}
 
-		if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
-			$this->delete($source);
+		if ( $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) {
+			$this->delete( $source );
 			return true;
 		} else {
 			return false;
@@ -270,220 +276,225 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param bool $recursive
 	 * @param string $type
 	 * @return bool
 	 */
-	public function delete($file, $recursive = false, $type = false) {
-		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+	public function delete( $file, $recursive = false, $type = false ) {
+		if ( empty( $file ) ) { // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
+		}
 		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
 
-		if ( 'f' == $type || $this->is_file($file) )
-			return @unlink($file);
-		if ( ! $recursive && $this->is_dir($file) )
-			return @rmdir($file);
+		if ( 'f' == $type || $this->is_file( $file ) ) {
+			return @unlink( $file );
+		}
+		if ( ! $recursive && $this->is_dir( $file ) ) {
+			return @rmdir( $file );
+		}
 
 		// At this point it's a folder, and we're in recursive mode
-		$file = trailingslashit($file);
-		$filelist = $this->dirlist($file, true);
+		$file     = trailingslashit( $file );
+		$filelist = $this->dirlist( $file, true );
 
 		$retval = true;
 		if ( is_array( $filelist ) ) {
 			foreach ( $filelist as $filename => $fileinfo ) {
-				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
+				if ( ! $this->delete( $file . $filename, $recursive, $fileinfo['type'] ) ) {
 					$retval = false;
+				}
 			}
 		}
 
-		if ( file_exists($file) && ! @rmdir($file) )
+		if ( file_exists( $file ) && ! @rmdir( $file ) ) {
 			$retval = false;
+		}
 
 		return $retval;
 	}
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function exists($file) {
-		return @file_exists($file);
+	public function exists( $file ) {
+		return @file_exists( $file );
 	}
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_file($file) {
-		return @is_file($file);
+	public function is_file( $file ) {
+		return @is_file( $file );
 	}
 	/**
-	 *
 	 * @param string $path
 	 * @return bool
 	 */
-	public function is_dir($path) {
-		return @is_dir($path);
+	public function is_dir( $path ) {
+		return @is_dir( $path );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_readable($file) {
-		return @is_readable($file);
+	public function is_readable( $file ) {
+		return @is_readable( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_writable($file) {
-		return @is_writable($file);
+	public function is_writable( $file ) {
+		return @is_writable( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function atime($file) {
-		return @fileatime($file);
+	public function atime( $file ) {
+		return @fileatime( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function mtime($file) {
-		return @filemtime($file);
+	public function mtime( $file ) {
+		return @filemtime( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function size($file) {
-		return @filesize($file);
+	public function size( $file ) {
+		return @filesize( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param int $time
 	 * @param int $atime
 	 * @return bool
 	 */
-	public function touch($file, $time = 0, $atime = 0) {
-		if ($time == 0)
+	public function touch( $file, $time = 0, $atime = 0 ) {
+		if ( $time == 0 ) {
 			$time = time();
-		if ($atime == 0)
+		}
+		if ( $atime == 0 ) {
 			$atime = time();
-		return @touch($file, $time, $atime);
+		}
+		return @touch( $file, $time, $atime );
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param mixed  $chmod
 	 * @param mixed  $chown
 	 * @param mixed  $chgrp
 	 * @return bool
 	 */
-	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
+	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
-		$path = untrailingslashit($path);
-		if ( empty($path) )
+		$path = untrailingslashit( $path );
+		if ( empty( $path ) ) {
 			return false;
+		}
 
-		if ( ! $chmod )
+		if ( ! $chmod ) {
 			$chmod = FS_CHMOD_DIR;
+		}
 
-		if ( ! @mkdir($path) )
+		if ( ! @mkdir( $path ) ) {
 			return false;
-		$this->chmod($path, $chmod);
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
+		}
+		$this->chmod( $path, $chmod );
+		if ( $chown ) {
+			$this->chown( $path, $chown );
+		}
+		if ( $chgrp ) {
+			$this->chgrp( $path, $chgrp );
+		}
 		return true;
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool $recursive
 	 * @return bool
 	 */
-	public function rmdir($path, $recursive = false) {
-		return $this->delete($path, $recursive);
+	public function rmdir( $path, $recursive = false ) {
+		return $this->delete( $path, $recursive );
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool $include_hidden
 	 * @param bool $recursive
 	 * @return bool|array
 	 */
-	public function dirlist($path, $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
-			$limit_file = basename($path);
-			$path = dirname($path);
+	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
+		if ( $this->is_file( $path ) ) {
+			$limit_file = basename( $path );
+			$path       = dirname( $path );
 		} else {
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
+		if ( ! $this->is_dir( $path ) ) {
 			return false;
+		}
 
-		$dir = @dir($path);
-		if ( ! $dir )
+		$dir = @dir( $path );
+		if ( ! $dir ) {
 			return false;
+		}
 
 		$ret = array();
 
-		while (false !== ($entry = $dir->read()) ) {
-			$struc = array();
+		while ( false !== ( $entry = $dir->read() ) ) {
+			$struc         = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
 				continue;
+			}
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
 				continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file)
+			if ( $limit_file && $struc['name'] != $limit_file ) {
 				continue;
+			}
 
-			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
-			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
-			$struc['owner']    	= $this->owner($path.'/'.$entry);
-			$struc['group']    	= $this->group($path.'/'.$entry);
-			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+			$struc['perms']       = $this->gethchmod( $path . '/' . $entry );
+			$struc['permsn']      = $this->getnumchmodfromh( $struc['perms'] );
+			$struc['number']      = false;
+			$struc['owner']       = $this->owner( $path . '/' . $entry );
+			$struc['group']       = $this->group( $path . '/' . $entry );
+			$struc['size']        = $this->size( $path . '/' . $entry );
+			$struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
+			$struc['lastmod']     = date( 'M j', $struc['lastmodunix'] );
+			$struc['time']        = date( 'h:i:s', $struc['lastmodunix'] );
+			$struc['type']        = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
+				if ( $recursive ) {
+					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+				} else {
 					$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;
 		}
 		$dir->close();
-		unset($dir);
+		unset( $dir );
 		return $ret;
 	}
 }
diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 52e4357394..36648e1844 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -17,7 +17,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	public $link;
 
 	/**
-	 *
 	 * @param array $opt
 	 */
 	public function __construct( $opt = '' ) {
@@ -25,66 +24,76 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		$this->errors = new WP_Error();
 
 		// Check if possible to use ftp functions.
-		if ( ! extension_loaded('ftp') ) {
-			$this->errors->add('no_ftp_ext', __('The ftp PHP extension is not available'));
+		if ( ! extension_loaded( 'ftp' ) ) {
+			$this->errors->add( 'no_ftp_ext', __( 'The ftp PHP extension is not available' ) );
 			return;
 		}
 
 		// This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
 
-		if ( ! defined('FS_TIMEOUT') )
-			define('FS_TIMEOUT', 240);
+		if ( ! defined( 'FS_TIMEOUT' ) ) {
+			define( 'FS_TIMEOUT', 240 );
+		}
 
-		if ( empty($opt['port']) )
+		if ( empty( $opt['port'] ) ) {
 			$this->options['port'] = 21;
-		else
+		} else {
 			$this->options['port'] = $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
+		if ( empty( $opt['hostname'] ) ) {
+			$this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) );
+		} else {
 			$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
-		if ( empty($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
+		if ( empty( $opt['username'] ) ) {
+			$this->errors->add( 'empty_username', __( 'FTP username is required' ) );
+		} else {
 			$this->options['username'] = $opt['username'];
+		}
 
-		if ( empty($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
+		if ( empty( $opt['password'] ) ) {
+			$this->errors->add( 'empty_password', __( 'FTP password is required' ) );
+		} else {
 			$this->options['password'] = $opt['password'];
+		}
 
 		$this->options['ssl'] = false;
-		if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
+		if ( isset( $opt['connection_type'] ) && 'ftps' == $opt['connection_type'] ) {
 			$this->options['ssl'] = true;
+		}
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function connect() {
-		if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-			$this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
-		else
-			$this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
+		if ( isset( $this->options['ssl'] ) && $this->options['ssl'] && function_exists( 'ftp_ssl_connect' ) ) {
+			$this->link = @ftp_ssl_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT );
+		} else {
+			$this->link = @ftp_connect( $this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT );
+		}
 
 		if ( ! $this->link ) {
-			$this->errors->add( 'connect',
+			$this->errors->add(
+				'connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
+				sprintf(
+					__( 'Failed to connect to FTP Server %s' ),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( ! @ftp_login( $this->link,$this->options['username'], $this->options['password'] ) ) {
-			$this->errors->add( 'auth',
+		if ( ! @ftp_login( $this->link, $this->options['username'], $this->options['password'] ) ) {
+			$this->errors->add(
+				'auth',
 				/* translators: %s: username */
-				sprintf( __( 'Username/Password incorrect for %s' ),
+				sprintf(
+					__( 'Username/Password incorrect for %s' ),
 					$this->options['username']
 				)
 			);
@@ -93,8 +102,9 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 
 		// Set the Connection to use Passive FTP
 		@ftp_pasv( $this->link, true );
-		if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
-			@ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
+		if ( @ftp_get_option( $this->link, FTP_TIMEOUT_SEC ) < FS_TIMEOUT ) {
+			@ftp_set_option( $this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT );
+		}
 
 		return true;
 	}
@@ -109,8 +119,8 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	 *                      or if the file couldn't be retrieved.
 	 */
 	public function get_contents( $file ) {
-		$tempfile = wp_tempnam($file);
-		$temp = fopen($tempfile, 'w+');
+		$tempfile = wp_tempnam( $file );
+		$temp     = fopen( $tempfile, 'w+' );
 
 		if ( ! $temp ) {
 			unlink( $tempfile );
@@ -126,33 +136,32 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 		fseek( $temp, 0 ); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temp) )
-			$contents .= fread($temp, 8192);
+		while ( ! feof( $temp ) ) {
+			$contents .= fread( $temp, 8192 );
+		}
 
-		fclose($temp);
-		unlink($tempfile);
+		fclose( $temp );
+		unlink( $tempfile );
 		return $contents;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return array
 	 */
-	public function get_contents_array($file) {
-		return explode("\n", $this->get_contents($file));
+	public function get_contents_array( $file ) {
+		return explode( "\n", $this->get_contents( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param string $contents
 	 * @param bool|int $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
-		$tempfile = wp_tempnam($file);
-		$temp = fopen( $tempfile, 'wb+' );
+	public function put_contents( $file, $contents, $mode = false ) {
+		$tempfile = wp_tempnam( $file );
+		$temp     = fopen( $tempfile, 'wb+' );
 
 		if ( ! $temp ) {
 			unlink( $tempfile );
@@ -161,7 +170,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 
 		mbstring_binary_safe_encoding();
 
-		$data_length = strlen( $contents );
+		$data_length   = strlen( $contents );
 		$bytes_written = fwrite( $temp, $contents );
 
 		reset_mbstring_encoding();
@@ -176,334 +185,331 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 
 		$ret = @ftp_fput( $this->link, $file, $temp, FTP_BINARY );
 
-		fclose($temp);
-		unlink($tempfile);
+		fclose( $temp );
+		unlink( $tempfile );
 
-		$this->chmod($file, $mode);
+		$this->chmod( $file, $mode );
 
 		return $ret;
 	}
 
 	/**
-	 *
 	 * @return string
 	 */
 	public function cwd() {
-		$cwd = @ftp_pwd($this->link);
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+		$cwd = @ftp_pwd( $this->link );
+		if ( $cwd ) {
+			$cwd = trailingslashit( $cwd );
+		}
 		return $cwd;
 	}
 
 	/**
-	 *
 	 * @param string $dir
 	 * @return bool
 	 */
-	public function chdir($dir) {
-		return @ftp_chdir($this->link, $dir);
+	public function chdir( $dir ) {
+		return @ftp_chdir( $this->link, $dir );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param int $mode
 	 * @param bool $recursive
 	 * @return bool
 	 */
-	public function chmod($file, $mode = false, $recursive = false) {
+	public function chmod( $file, $mode = false, $recursive = false ) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+			if ( $this->is_file( $file ) ) {
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			} elseif ( $this->is_dir( $file ) ) {
 				$mode = FS_CHMOD_DIR;
-			else
+			} else {
 				return false;
+			}
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir($file) ) {
-			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+		if ( $recursive && $this->is_dir( $file ) ) {
+			$filelist = $this->dirlist( $file );
+			foreach ( (array) $filelist as $filename => $filemeta ) {
+				$this->chmod( $file . '/' . $filename, $mode, $recursive );
+			}
 		}
 
 		// chmod the file or directory
-		if ( ! function_exists('ftp_chmod') )
-			return (bool)@ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
-		return (bool)@ftp_chmod($this->link, $mode, $file);
+		if ( ! function_exists( 'ftp_chmod' ) ) {
+			return (bool) @ftp_site( $this->link, sprintf( 'CHMOD %o %s', $mode, $file ) );
+		}
+		return (bool) @ftp_chmod( $this->link, $mode, $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string
 	 */
-	public function owner($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['owner'];
+	public function owner( $file ) {
+		$dir = $this->dirlist( $file );
+		return $dir[ $file ]['owner'];
 	}
 	/**
-	 *
 	 * @param string $file
 	 * @return string
 	 */
-	public function getchmod($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['permsn'];
+	public function getchmod( $file ) {
+		$dir = $this->dirlist( $file );
+		return $dir[ $file ]['permsn'];
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string
 	 */
-	public function group($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['group'];
+	public function group( $file ) {
+		$dir = $this->dirlist( $file );
+		return $dir[ $file ]['group'];
 	}
 
 	/**
-	 *
 	 * @param string $source
 	 * @param string $destination
 	 * @param bool   $overwrite
 	 * @param string|bool $mode
 	 * @return bool
 	 */
-	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+		if ( ! $overwrite && $this->exists( $destination ) ) {
 			return false;
-		$content = $this->get_contents($source);
-		if ( false === $content )
+		}
+		$content = $this->get_contents( $source );
+		if ( false === $content ) {
 			return false;
-		return $this->put_contents($destination, $content, $mode);
+		}
+		return $this->put_contents( $destination, $content, $mode );
 	}
 
 	/**
-	 *
 	 * @param string $source
 	 * @param string $destination
 	 * @param bool $overwrite
 	 * @return bool
 	 */
-	public function move($source, $destination, $overwrite = false) {
-		return ftp_rename($this->link, $source, $destination);
+	public function move( $source, $destination, $overwrite = false ) {
+		return ftp_rename( $this->link, $source, $destination );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param bool $recursive
 	 * @param string $type
 	 * @return bool
 	 */
-	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
+	public function delete( $file, $recursive = false, $type = false ) {
+		if ( empty( $file ) ) {
 			return false;
-		if ( 'f' == $type || $this->is_file($file) )
-			return @ftp_delete($this->link, $file);
-		if ( !$recursive )
-			return @ftp_rmdir($this->link, $file);
+		}
+		if ( 'f' == $type || $this->is_file( $file ) ) {
+			return @ftp_delete( $this->link, $file );
+		}
+		if ( ! $recursive ) {
+			return @ftp_rmdir( $this->link, $file );
+		}
 
-		$filelist = $this->dirlist( trailingslashit($file) );
-		if ( !empty($filelist) )
-			foreach ( $filelist as $delete_file )
-				$this->delete( trailingslashit($file) . $delete_file['name'], $recursive, $delete_file['type'] );
-		return @ftp_rmdir($this->link, $file);
+		$filelist = $this->dirlist( trailingslashit( $file ) );
+		if ( ! empty( $filelist ) ) {
+			foreach ( $filelist as $delete_file ) {
+				$this->delete( trailingslashit( $file ) . $delete_file['name'], $recursive, $delete_file['type'] );
+			}
+		}
+		return @ftp_rmdir( $this->link, $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function exists($file) {
-		$list = @ftp_nlist($this->link, $file);
+	public function exists( $file ) {
+		$list = @ftp_nlist( $this->link, $file );
 
 		if ( empty( $list ) && $this->is_dir( $file ) ) {
 			return true; // File is an empty directory.
 		}
 
-		return !empty($list); //empty list = no file, so invert.
+		return ! empty( $list ); //empty list = no file, so invert.
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_file($file) {
-		return $this->exists($file) && !$this->is_dir($file);
+	public function is_file( $file ) {
+		return $this->exists( $file ) && ! $this->is_dir( $file );
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @return bool
 	 */
-	public function is_dir($path) {
-		$cwd = $this->cwd();
-		$result = @ftp_chdir($this->link, trailingslashit($path) );
+	public function is_dir( $path ) {
+		$cwd    = $this->cwd();
+		$result = @ftp_chdir( $this->link, trailingslashit( $path ) );
 		if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
-			@ftp_chdir($this->link, $cwd);
+			@ftp_chdir( $this->link, $cwd );
 			return true;
 		}
 		return false;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_readable($file) {
+	public function is_readable( $file ) {
 		return true;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_writable($file) {
+	public function is_writable( $file ) {
 		return true;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function atime($file) {
+	public function atime( $file ) {
 		return false;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function mtime($file) {
-		return ftp_mdtm($this->link, $file);
+	public function mtime( $file ) {
+		return ftp_mdtm( $this->link, $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function size($file) {
-		return ftp_size($this->link, $file);
+	public function size( $file ) {
+		return ftp_size( $this->link, $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function touch($file, $time = 0, $atime = 0) {
+	public function touch( $file, $time = 0, $atime = 0 ) {
 		return false;
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param mixed $chmod
 	 * @param mixed $chown
 	 * @param mixed $chgrp
 	 * @return bool
 	 */
-	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-		$path = untrailingslashit($path);
-		if ( empty($path) )
+	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+		$path = untrailingslashit( $path );
+		if ( empty( $path ) ) {
 			return false;
+		}
 
-		if ( !@ftp_mkdir($this->link, $path) )
+		if ( ! @ftp_mkdir( $this->link, $path ) ) {
 			return false;
-		$this->chmod($path, $chmod);
+		}
+		$this->chmod( $path, $chmod );
 		return true;
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool $recursive
 	 * @return bool
 	 */
-	public function rmdir($path, $recursive = false) {
-		return $this->delete($path, $recursive);
+	public function rmdir( $path, $recursive = false ) {
+		return $this->delete( $path, $recursive );
 	}
 
 	/**
-	 *
 	 * @staticvar bool $is_windows
 	 * @param string $line
 	 * @return array
 	 */
-	public function parselisting($line) {
+	public function parselisting( $line ) {
 		static $is_windows = null;
-		if ( is_null($is_windows) )
-			$is_windows = stripos( ftp_systype($this->link), 'win') !== false;
+		if ( is_null( $is_windows ) ) {
+			$is_windows = stripos( ftp_systype( $this->link ), 'win' ) !== false;
+		}
 
-		if ( $is_windows && preg_match('/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer) ) {
+		if ( $is_windows && preg_match( '/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/', $line, $lucifer ) ) {
 			$b = array();
-			if ( $lucifer[3] < 70 )
-				$lucifer[3] +=2000;
-			else
+			if ( $lucifer[3] < 70 ) {
+				$lucifer[3] += 2000;
+			} else {
 				$lucifer[3] += 1900; // 4digit year fix
-			$b['isdir'] = ( $lucifer[7] == '<DIR>');
-			if ( $b['isdir'] )
+			}
+			$b['isdir'] = ( $lucifer[7] == '<DIR>' );
+			if ( $b['isdir'] ) {
 				$b['type'] = 'd';
-			else
+			} else {
 				$b['type'] = 'f';
-			$b['size'] = $lucifer[7];
-			$b['month'] = $lucifer[1];
-			$b['day'] = $lucifer[2];
-			$b['year'] = $lucifer[3];
-			$b['hour'] = $lucifer[4];
+			}
+			$b['size']   = $lucifer[7];
+			$b['month']  = $lucifer[1];
+			$b['day']    = $lucifer[2];
+			$b['year']   = $lucifer[3];
+			$b['hour']   = $lucifer[4];
 			$b['minute'] = $lucifer[5];
-			$b['time'] = @mktime($lucifer[4] + (strcasecmp($lucifer[6], "PM") == 0 ? 12 : 0), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3]);
-			$b['am/pm'] = $lucifer[6];
-			$b['name'] = $lucifer[8];
-		} elseif ( !$is_windows && $lucifer = preg_split('/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY)) {
+			$b['time']   = @mktime( $lucifer[4] + ( strcasecmp( $lucifer[6], 'PM' ) == 0 ? 12 : 0 ), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3] );
+			$b['am/pm']  = $lucifer[6];
+			$b['name']   = $lucifer[8];
+		} elseif ( ! $is_windows && $lucifer = preg_split( '/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY ) ) {
 			//echo $line."\n";
-			$lcount = count($lucifer);
-			if ( $lcount < 8 )
+			$lcount = count( $lucifer );
+			if ( $lcount < 8 ) {
 				return '';
-			$b = array();
-			$b['isdir'] = $lucifer[0]{0} === 'd';
+			}
+			$b           = array();
+			$b['isdir']  = $lucifer[0]{0} === 'd';
 			$b['islink'] = $lucifer[0]{0} === 'l';
-			if ( $b['isdir'] )
+			if ( $b['isdir'] ) {
 				$b['type'] = 'd';
-			elseif ( $b['islink'] )
+			} elseif ( $b['islink'] ) {
 				$b['type'] = 'l';
-			else
+			} else {
 				$b['type'] = 'f';
-			$b['perms'] = $lucifer[0];
+			}
+			$b['perms']  = $lucifer[0];
 			$b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
 			$b['number'] = $lucifer[1];
-			$b['owner'] = $lucifer[2];
-			$b['group'] = $lucifer[3];
-			$b['size'] = $lucifer[4];
+			$b['owner']  = $lucifer[2];
+			$b['group']  = $lucifer[3];
+			$b['size']   = $lucifer[4];
 			if ( $lcount == 8 ) {
-				sscanf($lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day']);
-				sscanf($lucifer[6], '%d:%d', $b['hour'], $b['minute']);
-				$b['time'] = @mktime($b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year']);
+				sscanf( $lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day'] );
+				sscanf( $lucifer[6], '%d:%d', $b['hour'], $b['minute'] );
+				$b['time'] = @mktime( $b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year'] );
 				$b['name'] = $lucifer[7];
 			} else {
 				$b['month'] = $lucifer[5];
-				$b['day'] = $lucifer[6];
-				if ( preg_match('/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2) ) {
-					$b['year'] = date("Y");
-					$b['hour'] = $l2[1];
+				$b['day']   = $lucifer[6];
+				if ( preg_match( '/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2 ) ) {
+					$b['year']   = date( 'Y' );
+					$b['hour']   = $l2[1];
 					$b['minute'] = $l2[2];
 				} else {
-					$b['year'] = $lucifer[7];
-					$b['hour'] = 0;
+					$b['year']   = $lucifer[7];
+					$b['hour']   = 0;
 					$b['minute'] = 0;
 				}
-				$b['time'] = strtotime( sprintf('%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute']) );
+				$b['time'] = strtotime( sprintf( '%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute'] ) );
 				$b['name'] = $lucifer[8];
 			}
 		}
@@ -517,54 +523,60 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool $include_hidden
 	 * @param bool $recursive
 	 * @return bool|array
 	 */
-	public function dirlist($path = '.', $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
-			$limit_file = basename($path);
-			$path = dirname($path) . '/';
+	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
+		if ( $this->is_file( $path ) ) {
+			$limit_file = basename( $path );
+			$path       = dirname( $path ) . '/';
 		} else {
 			$limit_file = false;
 		}
 
-		$pwd = @ftp_pwd($this->link);
-		if ( ! @ftp_chdir($this->link, $path) ) // Cant change to folder = folder doesn't exist
+		$pwd = @ftp_pwd( $this->link );
+		if ( ! @ftp_chdir( $this->link, $path ) ) { // Cant change to folder = folder doesn't exist
 			return false;
-		$list = @ftp_rawlist($this->link, '-a', false);
-		@ftp_chdir($this->link, $pwd);
+		}
+		$list = @ftp_rawlist( $this->link, '-a', false );
+		@ftp_chdir( $this->link, $pwd );
 
-		if ( empty($list) ) // Empty array = non-existent folder (real folder will show . at least)
+		if ( empty( $list ) ) { // Empty array = non-existent folder (real folder will show . at least)
 			return false;
+		}
 
 		$dirlist = array();
 		foreach ( $list as $k => $v ) {
-			$entry = $this->parselisting($v);
-			if ( empty($entry) )
+			$entry = $this->parselisting( $v );
+			if ( empty( $entry ) ) {
 				continue;
+			}
 
-			if ( '.' == $entry['name'] || '..' == $entry['name'] )
+			if ( '.' == $entry['name'] || '..' == $entry['name'] ) {
 				continue;
+			}
 
-			if ( ! $include_hidden && '.' == $entry['name'][0] )
+			if ( ! $include_hidden && '.' == $entry['name'][0] ) {
 				continue;
+			}
 
-			if ( $limit_file && $entry['name'] != $limit_file)
+			if ( $limit_file && $entry['name'] != $limit_file ) {
 				continue;
+			}
 
 			$dirlist[ $entry['name'] ] = $entry;
 		}
 
 		$ret = array();
-		foreach ( (array)$dirlist as $struc ) {
+		foreach ( (array) $dirlist as $struc ) {
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
+				if ( $recursive ) {
+					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+				} else {
 					$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;
@@ -575,7 +587,8 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	/**
 	 */
 	public function __destruct() {
-		if ( $this->link )
-			ftp_close($this->link);
+		if ( $this->link ) {
+			ftp_close( $this->link );
+		}
 	}
 }
diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index 3366554453..45f1235ce6 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -20,10 +20,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 	public $ftp;
 
 	/**
-	 *
 	 * @param array $opt
 	 */
-	public function __construct( $opt  = '' ) {
+	public function __construct( $opt = '' ) {
 		$this->method = 'ftpsockets';
 		$this->errors = new WP_Error();
 
@@ -33,42 +32,48 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		}
 		$this->ftp = new ftp();
 
-		if ( empty($opt['port']) )
+		if ( empty( $opt['port'] ) ) {
 			$this->options['port'] = 21;
-		else
+		} else {
 			$this->options['port'] = (int) $opt['port'];
+		}
 
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('FTP hostname is required'));
-		else
+		if ( empty( $opt['hostname'] ) ) {
+			$this->errors->add( 'empty_hostname', __( 'FTP hostname is required' ) );
+		} else {
 			$this->options['hostname'] = $opt['hostname'];
+		}
 
 		// Check if the options provided are OK.
-		if ( empty ($opt['username']) )
-			$this->errors->add('empty_username', __('FTP username is required'));
-		else
+		if ( empty( $opt['username'] ) ) {
+			$this->errors->add( 'empty_username', __( 'FTP username is required' ) );
+		} else {
 			$this->options['username'] = $opt['username'];
+		}
 
-		if ( empty ($opt['password']) )
-			$this->errors->add('empty_password', __('FTP password is required'));
-		else
+		if ( empty( $opt['password'] ) ) {
+			$this->errors->add( 'empty_password', __( 'FTP password is required' ) );
+		} else {
 			$this->options['password'] = $opt['password'];
+		}
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function connect() {
-		if ( ! $this->ftp )
+		if ( ! $this->ftp ) {
 			return false;
+		}
 
-		$this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
+		$this->ftp->setTimeout( FS_CONNECT_TIMEOUT );
 
 		if ( ! $this->ftp->SetServer( $this->options['hostname'], $this->options['port'] ) ) {
-			$this->errors->add( 'connect',
+			$this->errors->add(
+				'connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
+				sprintf(
+					__( 'Failed to connect to FTP Server %s' ),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
@@ -76,9 +81,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		}
 
 		if ( ! $this->ftp->connect() ) {
-			$this->errors->add( 'connect',
+			$this->errors->add(
+				'connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to FTP Server %s' ),
+				sprintf(
+					__( 'Failed to connect to FTP Server %s' ),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
@@ -86,9 +93,11 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		}
 
 		if ( ! $this->ftp->login( $this->options['username'], $this->options['password'] ) ) {
-			$this->errors->add( 'auth',
+			$this->errors->add(
+				'auth',
 				/* translators: %s: username */
-				sprintf( __( 'Username/Password incorrect for %s' ),
+				sprintf(
+					__( 'Username/Password incorrect for %s' ),
 					$this->options['username']
 				)
 			);
@@ -111,8 +120,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 	 *                      or if the file doesn't exist.
 	 */
 	public function get_contents( $file ) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists( $file ) ) {
 			return false;
+		}
 
 		$temp = wp_tempnam( $file );
 
@@ -123,9 +133,9 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
 		mbstring_binary_safe_encoding();
 
-		if ( ! $this->ftp->fget($temphandle, $file) ) {
-			fclose($temphandle);
-			unlink($temp);
+		if ( ! $this->ftp->fget( $temphandle, $file ) ) {
+			fclose( $temphandle );
+			unlink( $temp );
 
 			reset_mbstring_encoding();
 
@@ -137,34 +147,33 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
 		$contents = '';
 
-		while ( ! feof($temphandle) )
-			$contents .= fread($temphandle, 8192);
+		while ( ! feof( $temphandle ) ) {
+			$contents .= fread( $temphandle, 8192 );
+		}
 
-		fclose($temphandle);
-		unlink($temp);
+		fclose( $temphandle );
+		unlink( $temp );
 		return $contents;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return array
 	 */
-	public function get_contents_array($file) {
-		return explode("\n", $this->get_contents($file) );
+	public function get_contents_array( $file ) {
+		return explode( "\n", $this->get_contents( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param string $contents
 	 * @param int|bool $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
+	public function put_contents( $file, $contents, $mode = false ) {
 		$temp = wp_tempnam( $file );
-		if ( ! $temphandle = @fopen($temp, 'w+') ) {
-			unlink($temp);
+		if ( ! $temphandle = @fopen( $temp, 'w+' ) ) {
+			unlink( $temp );
 			return false;
 		}
 
@@ -183,146 +192,144 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 
 		fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
 
-		$ret = $this->ftp->fput($file, $temphandle);
+		$ret = $this->ftp->fput( $file, $temphandle );
 
 		reset_mbstring_encoding();
 
-		fclose($temphandle);
-		unlink($temp);
+		fclose( $temphandle );
+		unlink( $temp );
 
-		$this->chmod($file, $mode);
+		$this->chmod( $file, $mode );
 
 		return $ret;
 	}
 
 	/**
-	 *
 	 * @return string
 	 */
 	public function cwd() {
 		$cwd = $this->ftp->pwd();
-		if ( $cwd )
-			$cwd = trailingslashit($cwd);
+		if ( $cwd ) {
+			$cwd = trailingslashit( $cwd );
+		}
 		return $cwd;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function chdir($file) {
-		return $this->ftp->chdir($file);
+	public function chdir( $file ) {
+		return $this->ftp->chdir( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param int|bool $mode
 	 * @param bool $recursive
 	 * @return bool
 	 */
-	public function chmod($file, $mode = false, $recursive = false ) {
+	public function chmod( $file, $mode = false, $recursive = false ) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+			if ( $this->is_file( $file ) ) {
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			} elseif ( $this->is_dir( $file ) ) {
 				$mode = FS_CHMOD_DIR;
-			else
+			} else {
 				return false;
+			}
 		}
 
 		// chmod any sub-objects if recursive.
-		if ( $recursive && $this->is_dir($file) ) {
-			$filelist = $this->dirlist($file);
-			foreach ( (array)$filelist as $filename => $filemeta )
-				$this->chmod($file . '/' . $filename, $mode, $recursive);
+		if ( $recursive && $this->is_dir( $file ) ) {
+			$filelist = $this->dirlist( $file );
+			foreach ( (array) $filelist as $filename => $filemeta ) {
+				$this->chmod( $file . '/' . $filename, $mode, $recursive );
+			}
 		}
 
 		// chmod the file or directory
-		return $this->ftp->chmod($file, $mode);
+		return $this->ftp->chmod( $file, $mode );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string
 	 */
-	public function owner($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['owner'];
+	public function owner( $file ) {
+		$dir = $this->dirlist( $file );
+		return $dir[ $file ]['owner'];
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string
 	 */
-	public function getchmod($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['permsn'];
+	public function getchmod( $file ) {
+		$dir = $this->dirlist( $file );
+		return $dir[ $file ]['permsn'];
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string
 	 */
-	public function group($file) {
-		$dir = $this->dirlist($file);
-		return $dir[$file]['group'];
+	public function group( $file ) {
+		$dir = $this->dirlist( $file );
+		return $dir[ $file ]['group'];
 	}
 
 	/**
-	 *
 	 * @param string   $source
 	 * @param string   $destination
 	 * @param bool     $overwrite
 	 * @param int|bool $mode
 	 * @return bool
 	 */
-	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+		if ( ! $overwrite && $this->exists( $destination ) ) {
 			return false;
+		}
 
-		$content = $this->get_contents($source);
-		if ( false === $content )
+		$content = $this->get_contents( $source );
+		if ( false === $content ) {
 			return false;
+		}
 
-		return $this->put_contents($destination, $content, $mode);
+		return $this->put_contents( $destination, $content, $mode );
 	}
 
 	/**
-	 *
 	 * @param string $source
 	 * @param string $destination
 	 * @param bool   $overwrite
 	 * @return bool
 	 */
-	public function move($source, $destination, $overwrite = false ) {
-		return $this->ftp->rename($source, $destination);
+	public function move( $source, $destination, $overwrite = false ) {
+		return $this->ftp->rename( $source, $destination );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param bool   $recursive
 	 * @param string $type
 	 * @return bool
 	 */
-	public function delete($file, $recursive = false, $type = false) {
-		if ( empty($file) )
+	public function delete( $file, $recursive = false, $type = false ) {
+		if ( empty( $file ) ) {
 			return false;
-		if ( 'f' == $type || $this->is_file($file) )
-			return $this->ftp->delete($file);
-		if ( !$recursive )
-			return $this->ftp->rmdir($file);
+		}
+		if ( 'f' == $type || $this->is_file( $file ) ) {
+			return $this->ftp->delete( $file );
+		}
+		if ( ! $recursive ) {
+			return $this->ftp->rmdir( $file );
+		}
 
-		return $this->ftp->mdel($file);
+		return $this->ftp->mdel( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
@@ -333,141 +340,136 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 			return true; // File is an empty directory.
 		}
 
-		return !empty( $list ); //empty list = no file, so invert.
+		return ! empty( $list ); //empty list = no file, so invert.
 		// Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_file($file) {
-		if ( $this->is_dir($file) )
+	public function is_file( $file ) {
+		if ( $this->is_dir( $file ) ) {
 			return false;
-		if ( $this->exists($file) )
-			return true;
-		return false;
-	}
-
-	/**
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_dir($path) {
-		$cwd = $this->cwd();
-		if ( $this->chdir($path) ) {
-			$this->chdir($cwd);
+		}
+		if ( $this->exists( $file ) ) {
 			return true;
 		}
 		return false;
 	}
 
 	/**
-	 *
-	 * @param string $file
+	 * @param string $path
 	 * @return bool
 	 */
-	public function is_readable($file) {
-		return true;
-	}
-
-	/**
-	 *
-	 * @param string $file
-	 * @return bool
-	 */
-	public function is_writable($file) {
-		return true;
-	}
-
-	/**
-	 *
-	 * @param string $file
-	 * @return bool
-	 */
-	public function atime($file) {
+	public function is_dir( $path ) {
+		$cwd = $this->cwd();
+		if ( $this->chdir( $path ) ) {
+			$this->chdir( $cwd );
+			return true;
+		}
 		return false;
 	}
 
 	/**
-	 *
 	 * @param string $file
-	 * @return int
+	 * @return bool
 	 */
-	public function mtime($file) {
-		return $this->ftp->mdtm($file);
+	public function is_readable( $file ) {
+		return true;
+	}
+
+	/**
+	 * @param string $file
+	 * @return bool
+	 */
+	public function is_writable( $file ) {
+		return true;
+	}
+
+	/**
+	 * @param string $file
+	 * @return bool
+	 */
+	public function atime( $file ) {
+		return false;
 	}
 
 	/**
 	 * @param string $file
 	 * @return int
 	 */
-	public function size($file) {
-		return $this->ftp->filesize($file);
+	public function mtime( $file ) {
+		return $this->ftp->mdtm( $file );
+	}
+
+	/**
+	 * @param string $file
+	 * @return int
+	 */
+	public function size( $file ) {
+		return $this->ftp->filesize( $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param int $time
 	 * @param int $atime
 	 * @return bool
 	 */
-	public function touch($file, $time = 0, $atime = 0 ) {
+	public function touch( $file, $time = 0, $atime = 0 ) {
 		return false;
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param mixed  $chmod
 	 * @param mixed  $chown
 	 * @param mixed  $chgrp
 	 * @return bool
 	 */
-	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
-		$path = untrailingslashit($path);
-		if ( empty($path) )
+	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+		$path = untrailingslashit( $path );
+		if ( empty( $path ) ) {
 			return false;
+		}
 
-		if ( ! $this->ftp->mkdir($path) )
+		if ( ! $this->ftp->mkdir( $path ) ) {
 			return false;
-		if ( ! $chmod )
+		}
+		if ( ! $chmod ) {
 			$chmod = FS_CHMOD_DIR;
-		$this->chmod($path, $chmod);
+		}
+		$this->chmod( $path, $chmod );
 		return true;
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool $recursive
 	 * @return bool
 	 */
-	public function rmdir($path, $recursive = false ) {
-		return $this->delete($path, $recursive);
+	public function rmdir( $path, $recursive = false ) {
+		return $this->delete( $path, $recursive );
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool   $include_hidden
 	 * @param bool   $recursive
 	 * @return bool|array
 	 */
-	public function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
-		if ( $this->is_file($path) ) {
-			$limit_file = basename($path);
-			$path = dirname($path) . '/';
+	public function dirlist( $path = '.', $include_hidden = true, $recursive = false ) {
+		if ( $this->is_file( $path ) ) {
+			$limit_file = basename( $path );
+			$path       = dirname( $path ) . '/';
 		} else {
 			$limit_file = false;
 		}
 
 		mbstring_binary_safe_encoding();
 
-		$list = $this->ftp->dirlist($path);
+		$list = $this->ftp->dirlist( $path );
 		if ( empty( $list ) && ! $this->exists( $path ) ) {
 
 			reset_mbstring_encoding();
@@ -478,25 +480,30 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 		$ret = array();
 		foreach ( $list as $struc ) {
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
 				continue;
+			}
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
 				continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file )
+			if ( $limit_file && $struc['name'] != $limit_file ) {
 				continue;
+			}
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
+				if ( $recursive ) {
+					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+				} else {
 					$struc['files'] = array();
+				}
 			}
 
 			// Replace symlinks formatted as "source -> target" with just the source name
-			if ( $struc['islink'] )
+			if ( $struc['islink'] ) {
 				$struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+			}
 
 			// Add the Octal representation of the file permissions
 			$struc['permsn'] = $this->getnumchmodfromh( $struc['perms'] );
diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index 9e1a4f537e..82101beacd 100644
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -46,7 +46,6 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 	public $keys = false;
 
 	/**
-	 *
 	 * @param array $opt
 	 */
 	public function __construct( $opt = '' ) {
@@ -54,11 +53,11 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		$this->errors = new WP_Error();
 
 		//Check if possible to use ssh2 functions.
-		if ( ! extension_loaded('ssh2') ) {
-			$this->errors->add('no_ssh2_ext', __('The ssh2 PHP extension is not available'));
+		if ( ! extension_loaded( 'ssh2' ) ) {
+			$this->errors->add( 'no_ssh2_ext', __( 'The ssh2 PHP extension is not available' ) );
 			return;
 		}
-		if ( !function_exists('stream_get_contents') ) {
+		if ( ! function_exists( 'stream_get_contents' ) ) {
 			$this->errors->add(
 				'ssh2_php_requirement',
 				sprintf(
@@ -71,76 +70,85 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 		}
 
 		// Set defaults:
-		if ( empty($opt['port']) )
+		if ( empty( $opt['port'] ) ) {
 			$this->options['port'] = 22;
-		else
+		} else {
 			$this->options['port'] = $opt['port'];
-
-		if ( empty($opt['hostname']) )
-			$this->errors->add('empty_hostname', __('SSH2 hostname is required'));
-		else
-			$this->options['hostname'] = $opt['hostname'];
-
-		// Check if the options provided are OK.
-		if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) {
-			$this->options['public_key'] = $opt['public_key'];
-			$this->options['private_key'] = $opt['private_key'];
-
-			$this->options['hostkey'] = array('hostkey' => 'ssh-rsa');
-
-			$this->keys = true;
-		} elseif ( empty ($opt['username']) ) {
-			$this->errors->add('empty_username', __('SSH2 username is required'));
 		}
 
-		if ( !empty($opt['username']) )
-			$this->options['username'] = $opt['username'];
+		if ( empty( $opt['hostname'] ) ) {
+			$this->errors->add( 'empty_hostname', __( 'SSH2 hostname is required' ) );
+		} else {
+			$this->options['hostname'] = $opt['hostname'];
+		}
 
-		if ( empty ($opt['password']) ) {
+		// Check if the options provided are OK.
+		if ( ! empty( $opt['public_key'] ) && ! empty( $opt['private_key'] ) ) {
+			$this->options['public_key']  = $opt['public_key'];
+			$this->options['private_key'] = $opt['private_key'];
+
+			$this->options['hostkey'] = array( 'hostkey' => 'ssh-rsa' );
+
+			$this->keys = true;
+		} elseif ( empty( $opt['username'] ) ) {
+			$this->errors->add( 'empty_username', __( 'SSH2 username is required' ) );
+		}
+
+		if ( ! empty( $opt['username'] ) ) {
+			$this->options['username'] = $opt['username'];
+		}
+
+		if ( empty( $opt['password'] ) ) {
 			// Password can be blank if we are using keys.
-			if ( !$this->keys )
-				$this->errors->add('empty_password', __('SSH2 password is required'));
+			if ( ! $this->keys ) {
+				$this->errors->add( 'empty_password', __( 'SSH2 password is required' ) );
+			}
 		} else {
 			$this->options['password'] = $opt['password'];
 		}
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function connect() {
 		if ( ! $this->keys ) {
-			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
+			$this->link = @ssh2_connect( $this->options['hostname'], $this->options['port'] );
 		} else {
-			$this->link = @ssh2_connect($this->options['hostname'], $this->options['port'], $this->options['hostkey']);
+			$this->link = @ssh2_connect( $this->options['hostname'], $this->options['port'], $this->options['hostkey'] );
 		}
 
 		if ( ! $this->link ) {
-			$this->errors->add( 'connect',
+			$this->errors->add(
+				'connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to connect to SSH2 Server %s' ),
+				sprintf(
+					__( 'Failed to connect to SSH2 Server %s' ),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
 			return false;
 		}
 
-		if ( !$this->keys ) {
-			if ( ! @ssh2_auth_password($this->link, $this->options['username'], $this->options['password']) ) {
-				$this->errors->add( 'auth',
+		if ( ! $this->keys ) {
+			if ( ! @ssh2_auth_password( $this->link, $this->options['username'], $this->options['password'] ) ) {
+				$this->errors->add(
+					'auth',
 					/* translators: %s: username */
-					sprintf( __( 'Username/Password incorrect for %s' ),
+					sprintf(
+						__( 'Username/Password incorrect for %s' ),
 						$this->options['username']
 					)
 				);
 				return false;
 			}
 		} else {
-			if ( ! @ssh2_auth_pubkey_file($this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
-				$this->errors->add( 'auth',
+			if ( ! @ssh2_auth_pubkey_file( $this->link, $this->options['username'], $this->options['public_key'], $this->options['private_key'], $this->options['password'] ) ) {
+				$this->errors->add(
+					'auth',
 					/* translators: %s: username */
-					sprintf( __( 'Public and Private keys incorrect for %s' ),
+					sprintf(
+						__( 'Public and Private keys incorrect for %s' ),
 						$this->options['username']
 					)
 				);
@@ -150,9 +158,11 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
 		$this->sftp_link = ssh2_sftp( $this->link );
 		if ( ! $this->sftp_link ) {
-			$this->errors->add( 'connect',
+			$this->errors->add(
+				'connect',
 				/* translators: %s: hostname:port */
-				sprintf( __( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %s' ),
+				sprintf(
+					__( 'Failed to initialize a SFTP subsystem session with the SSH2 Server %s' ),
 					$this->options['hostname'] . ':' . $this->options['port']
 				)
 			);
@@ -170,7 +180,6 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 	 * this, the path is converted to /./ which is semantically the same as /
 	 * See https://bugs.php.net/bug.php?id=64169 for more details.
 	 *
-	 *
 	 * @since 4.4.0
 	 *
 	 * @param string $path The File/Directory path on the remote server to return
@@ -184,20 +193,22 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 	}
 
 	/**
-	 *
 	 * @param string $command
 	 * @param bool $returnbool
 	 * @return bool|string True on success, false on failure. String if the command was executed, `$returnbool`
 	 *                     is false (default), and data from the resulting stream was retrieved.
 	 */
 	public function run_command( $command, $returnbool = false ) {
-		if ( ! $this->link )
+		if ( ! $this->link ) {
 			return false;
+		}
 
-		if ( ! ($stream = ssh2_exec($this->link, $command)) ) {
-			$this->errors->add( 'command',
+		if ( ! ( $stream = ssh2_exec( $this->link, $command ) ) ) {
+			$this->errors->add(
+				'command',
 				/* translators: %s: command */
-				sprintf( __( 'Unable to perform command: %s'),
+				sprintf(
+					__( 'Unable to perform command: %s' ),
 					$command
 				)
 			);
@@ -207,16 +218,16 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 			$data = stream_get_contents( $stream );
 			fclose( $stream );
 
-			if ( $returnbool )
-				return ( $data === false ) ? false : '' != trim($data);
-			else
+			if ( $returnbool ) {
+				return ( $data === false ) ? false : '' != trim( $data );
+			} else {
 				return $data;
+			}
 		}
 		return false;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string|false
 	 */
@@ -225,34 +236,32 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return array
 	 */
-	public function get_contents_array($file) {
+	public function get_contents_array( $file ) {
 		return file( $this->sftp_path( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string   $file
 	 * @param string   $contents
 	 * @param bool|int $mode
 	 * @return bool
 	 */
-	public function put_contents($file, $contents, $mode = false ) {
+	public function put_contents( $file, $contents, $mode = false ) {
 		$ret = file_put_contents( $this->sftp_path( $file ), $contents );
 
-		if ( $ret !== strlen( $contents ) )
+		if ( $ret !== strlen( $contents ) ) {
 			return false;
+		}
 
-		$this->chmod($file, $mode);
+		$this->chmod( $file, $mode );
 
 		return true;
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function cwd() {
@@ -264,336 +273,340 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 	}
 
 	/**
-	 *
 	 * @param string $dir
 	 * @return bool|string
 	 */
-	public function chdir($dir) {
-		return $this->run_command('cd ' . $dir, true);
+	public function chdir( $dir ) {
+		return $this->run_command( 'cd ' . $dir, true );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param string $group
 	 * @param bool   $recursive
 	 *
 	 * @return bool
 	 */
-	public function chgrp($file, $group, $recursive = false ) {
-		if ( ! $this->exists($file) )
+	public function chgrp( $file, $group, $recursive = false ) {
+		if ( ! $this->exists( $file ) ) {
 			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true);
-		return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
+		}
+		if ( ! $recursive || ! $this->is_dir( $file ) ) {
+			return $this->run_command( sprintf( 'chgrp %s %s', escapeshellarg( $group ), escapeshellarg( $file ) ), true );
+		}
+		return $this->run_command( sprintf( 'chgrp -R %s %s', escapeshellarg( $group ), escapeshellarg( $file ) ), true );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param int    $mode
 	 * @param bool   $recursive
 	 * @return bool|string
 	 */
-	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $this->exists($file) )
+	public function chmod( $file, $mode = false, $recursive = false ) {
+		if ( ! $this->exists( $file ) ) {
 			return false;
-
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
-		return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
+		if ( ! $mode ) {
+			if ( $this->is_file( $file ) ) {
+				$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir( $file ) ) {
+				$mode = FS_CHMOD_DIR;
+			} else {
+				return false;
+			}
+		}
+
+		if ( ! $recursive || ! $this->is_dir( $file ) ) {
+			return $this->run_command( sprintf( 'chmod %o %s', $mode, escapeshellarg( $file ) ), true );
+		}
+		return $this->run_command( sprintf( 'chmod -R %o %s', $mode, escapeshellarg( $file ) ), true );
 	}
 
 	/**
 	 * Change the ownership of a file / folder.
 	 *
-	 *
 	 * @param string     $file      Path to the file.
 	 * @param string|int $owner     A user name or number.
 	 * @param bool       $recursive Optional. If set True changes file owner recursivly. Default False.
 	 * @return bool True on success or false on failure.
 	 */
 	public function chown( $file, $owner, $recursive = false ) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists( $file ) ) {
 			return false;
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
-		return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
+		}
+		if ( ! $recursive || ! $this->is_dir( $file ) ) {
+			return $this->run_command( sprintf( 'chown %s %s', escapeshellarg( $owner ), escapeshellarg( $file ) ), true );
+		}
+		return $this->run_command( sprintf( 'chown -R %s %s', escapeshellarg( $owner ), escapeshellarg( $file ) ), true );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string|false
 	 */
-	public function owner($file) {
+	public function owner( $file ) {
 		$owneruid = @fileowner( $this->sftp_path( $file ) );
-		if ( ! $owneruid )
+		if ( ! $owneruid ) {
 			return false;
-		if ( ! function_exists('posix_getpwuid') )
+		}
+		if ( ! function_exists( 'posix_getpwuid' ) ) {
 			return $owneruid;
-		$ownerarray = posix_getpwuid($owneruid);
+		}
+		$ownerarray = posix_getpwuid( $owneruid );
 		return $ownerarray['name'];
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string
 	 */
-	public function getchmod($file) {
+	public function getchmod( $file ) {
 		return substr( decoct( @fileperms( $this->sftp_path( $file ) ) ), -3 );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return string|false
 	 */
-	public function group($file) {
+	public function group( $file ) {
 		$gid = @filegroup( $this->sftp_path( $file ) );
-		if ( ! $gid )
+		if ( ! $gid ) {
 			return false;
-		if ( ! function_exists('posix_getgrgid') )
+		}
+		if ( ! function_exists( 'posix_getgrgid' ) ) {
 			return $gid;
-		$grouparray = posix_getgrgid($gid);
+		}
+		$grouparray = posix_getgrgid( $gid );
 		return $grouparray['name'];
 	}
 
 	/**
-	 *
 	 * @param string   $source
 	 * @param string   $destination
 	 * @param bool     $overwrite
 	 * @param int|bool $mode
 	 * @return bool
 	 */
-	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+	public function copy( $source, $destination, $overwrite = false, $mode = false ) {
+		if ( ! $overwrite && $this->exists( $destination ) ) {
 			return false;
-		$content = $this->get_contents($source);
-		if ( false === $content)
+		}
+		$content = $this->get_contents( $source );
+		if ( false === $content ) {
 			return false;
-		return $this->put_contents($destination, $content, $mode);
+		}
+		return $this->put_contents( $destination, $content, $mode );
 	}
 
 	/**
-	 *
 	 * @param string $source
 	 * @param string $destination
 	 * @param bool   $overwrite
 	 * @return bool
 	 */
-	public function move($source, $destination, $overwrite = false) {
+	public function move( $source, $destination, $overwrite = false ) {
 		return @ssh2_sftp_rename( $this->sftp_link, $source, $destination );
 	}
 
 	/**
-	 *
 	 * @param string      $file
 	 * @param bool        $recursive
 	 * @param string|bool $type
 	 * @return bool
 	 */
-	public function delete($file, $recursive = false, $type = false) {
-		if ( 'f' == $type || $this->is_file($file) )
-			return ssh2_sftp_unlink($this->sftp_link, $file);
-		if ( ! $recursive )
-			return ssh2_sftp_rmdir($this->sftp_link, $file);
-		$filelist = $this->dirlist($file);
-		if ( is_array($filelist) ) {
-			foreach ( $filelist as $filename => $fileinfo) {
-				$this->delete($file . '/' . $filename, $recursive, $fileinfo['type']);
+	public function delete( $file, $recursive = false, $type = false ) {
+		if ( 'f' == $type || $this->is_file( $file ) ) {
+			return ssh2_sftp_unlink( $this->sftp_link, $file );
+		}
+		if ( ! $recursive ) {
+			return ssh2_sftp_rmdir( $this->sftp_link, $file );
+		}
+		$filelist = $this->dirlist( $file );
+		if ( is_array( $filelist ) ) {
+			foreach ( $filelist as $filename => $fileinfo ) {
+				$this->delete( $file . '/' . $filename, $recursive, $fileinfo['type'] );
 			}
 		}
-		return ssh2_sftp_rmdir($this->sftp_link, $file);
+		return ssh2_sftp_rmdir( $this->sftp_link, $file );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function exists($file) {
+	public function exists( $file ) {
 		return file_exists( $this->sftp_path( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_file($file) {
+	public function is_file( $file ) {
 		return is_file( $this->sftp_path( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @return bool
 	 */
-	public function is_dir($path) {
+	public function is_dir( $path ) {
 		return is_dir( $this->sftp_path( $path ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_readable($file) {
+	public function is_readable( $file ) {
 		return is_readable( $this->sftp_path( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return bool
 	 */
-	public function is_writable($file) {
+	public function is_writable( $file ) {
 		// PHP will base it's writable checks on system_user === file_owner, not ssh_user === file_owner
 		return true;
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function atime($file) {
+	public function atime( $file ) {
 		return fileatime( $this->sftp_path( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function mtime($file) {
+	public function mtime( $file ) {
 		return filemtime( $this->sftp_path( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @return int
 	 */
-	public function size($file) {
+	public function size( $file ) {
 		return filesize( $this->sftp_path( $file ) );
 	}
 
 	/**
-	 *
 	 * @param string $file
 	 * @param int    $time
 	 * @param int    $atime
 	 */
-	public function touch($file, $time = 0, $atime = 0) {
+	public function touch( $file, $time = 0, $atime = 0 ) {
 		//Not implemented.
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param mixed  $chmod
 	 * @param mixed  $chown
 	 * @param mixed  $chgrp
 	 * @return bool
 	 */
-	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
-		$path = untrailingslashit($path);
-		if ( empty($path) )
+	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
+		$path = untrailingslashit( $path );
+		if ( empty( $path ) ) {
 			return false;
+		}
 
-		if ( ! $chmod )
+		if ( ! $chmod ) {
 			$chmod = FS_CHMOD_DIR;
-		if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
+		}
+		if ( ! ssh2_sftp_mkdir( $this->sftp_link, $path, $chmod, true ) ) {
 			return false;
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
+		}
+		if ( $chown ) {
+			$this->chown( $path, $chown );
+		}
+		if ( $chgrp ) {
+			$this->chgrp( $path, $chgrp );
+		}
 		return true;
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool   $recursive
 	 * @return bool
 	 */
-	public function rmdir($path, $recursive = false) {
-		return $this->delete($path, $recursive);
+	public function rmdir( $path, $recursive = false ) {
+		return $this->delete( $path, $recursive );
 	}
 
 	/**
-	 *
 	 * @param string $path
 	 * @param bool   $include_hidden
 	 * @param bool   $recursive
 	 * @return bool|array
 	 */
-	public function dirlist($path, $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
-			$limit_file = basename($path);
-			$path = dirname($path);
+	public function dirlist( $path, $include_hidden = true, $recursive = false ) {
+		if ( $this->is_file( $path ) ) {
+			$limit_file = basename( $path );
+			$path       = dirname( $path );
 		} else {
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
+		if ( ! $this->is_dir( $path ) ) {
 			return false;
+		}
 
 		$ret = array();
 		$dir = @dir( $this->sftp_path( $path ) );
 
-		if ( ! $dir )
+		if ( ! $dir ) {
 			return false;
+		}
 
-		while (false !== ($entry = $dir->read()) ) {
-			$struc = array();
+		while ( false !== ( $entry = $dir->read() ) ) {
+			$struc         = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
 				continue; //Do not care about these folders.
+			}
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
 				continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file )
+			if ( $limit_file && $struc['name'] != $limit_file ) {
 				continue;
+			}
 
-			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
-			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
-			$struc['owner']    	= $this->owner($path.'/'.$entry);
-			$struc['group']    	= $this->group($path.'/'.$entry);
-			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+			$struc['perms']       = $this->gethchmod( $path . '/' . $entry );
+			$struc['permsn']      = $this->getnumchmodfromh( $struc['perms'] );
+			$struc['number']      = false;
+			$struc['owner']       = $this->owner( $path . '/' . $entry );
+			$struc['group']       = $this->group( $path . '/' . $entry );
+			$struc['size']        = $this->size( $path . '/' . $entry );
+			$struc['lastmodunix'] = $this->mtime( $path . '/' . $entry );
+			$struc['lastmod']     = date( 'M j', $struc['lastmodunix'] );
+			$struc['time']        = date( 'h:i:s', $struc['lastmodunix'] );
+			$struc['type']        = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
+				if ( $recursive ) {
+					$struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
+				} else {
 					$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;
 		}
 		$dir->close();
-		unset($dir);
+		unset( $dir );
 		return $ret;
 	}
 }
diff --git a/wp-admin/includes/class-wp-importer.php b/wp-admin/includes/class-wp-importer.php
index c5d400b77b..e9dc496536 100644
--- a/wp-admin/includes/class-wp-importer.php
+++ b/wp-admin/includes/class-wp-importer.php
@@ -5,7 +5,6 @@
 class WP_Importer {
 	/**
 	 * Class Constructor
-	 *
 	 */
 	public function __construct() {}
 
@@ -23,22 +22,22 @@ class WP_Importer {
 
 		$hashtable = array();
 
-		$limit = 100;
+		$limit  = 100;
 		$offset = 0;
 
 		// Grab all posts in chunks
 		do {
 			$meta_key = $importer_name . '_' . $bid . '_permalink';
-			$sql = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = %s LIMIT %d,%d", $meta_key, $offset, $limit );
-			$results = $wpdb->get_results( $sql );
+			$sql      = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = %s LIMIT %d,%d", $meta_key, $offset, $limit );
+			$results  = $wpdb->get_results( $sql );
 
 			// Increment offset
 			$offset = ( $limit + $offset );
 
-			if ( !empty( $results ) ) {
+			if ( ! empty( $results ) ) {
 				foreach ( $results as $r ) {
 					// Set permalinks into array
-					$hashtable[$r->meta_value] = intval( $r->post_id );
+					$hashtable[ $r->meta_value ] = intval( $r->post_id );
 				}
 			}
 		} while ( count( $results ) == $limit );
@@ -65,12 +64,13 @@ class WP_Importer {
 
 		// Get count of permalinks
 		$meta_key = $importer_name . '_' . $bid . '_permalink';
-		$sql = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = '%s'", $meta_key );
+		$sql      = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = '%s'", $meta_key );
 
 		$result = $wpdb->get_results( $sql );
 
-		if ( !empty( $result ) )
+		if ( ! empty( $result ) ) {
 			$count = intval( $result[0]->cnt );
+		}
 
 		// Unset to save memory.
 		unset( $results );
@@ -91,26 +91,26 @@ class WP_Importer {
 
 		$hashtable = array();
 
-		$limit = 100;
+		$limit  = 100;
 		$offset = 0;
 
 		// Grab all comments in chunks
 		do {
-			$sql = $wpdb->prepare( "SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit );
+			$sql     = $wpdb->prepare( "SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit );
 			$results = $wpdb->get_results( $sql );
 
 			// Increment offset
 			$offset = ( $limit + $offset );
 
-			if ( !empty( $results ) ) {
+			if ( ! empty( $results ) ) {
 				foreach ( $results as $r ) {
 					// Explode comment_agent key
 					list ( $ca_bid, $source_comment_id ) = explode( '-', $r->comment_agent );
-					$source_comment_id = intval( $source_comment_id );
+					$source_comment_id                   = intval( $source_comment_id );
 
 					// Check if this comment came from this blog
 					if ( $bid == $ca_bid ) {
-						$hashtable[$source_comment_id] = intval( $r->comment_ID );
+						$hashtable[ $source_comment_id ] = intval( $r->comment_ID );
 					}
 				}
 			}
@@ -123,7 +123,6 @@ class WP_Importer {
 	}
 
 	/**
-	 *
 	 * @param int $blog_id
 	 * @return int|void
 	 */
@@ -132,32 +131,38 @@ class WP_Importer {
 			$blog_id = (int) $blog_id;
 		} else {
 			$blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
-			if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
+			if ( ( ! $parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
 				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
 				exit();
 			}
 			if ( empty( $parsed['path'] ) ) {
 				$parsed['path'] = '/';
 			}
-			$blogs = get_sites( array( 'domain' => $parsed['host'], 'number' => 1, 'path' => $parsed['path'] ) );
+			$blogs = get_sites(
+				array(
+					'domain' => $parsed['host'],
+					'number' => 1,
+					'path'   => $parsed['path'],
+				)
+			);
 			if ( ! $blogs ) {
 				fwrite( STDERR, "Error: Could not find blog\n" );
 				exit();
 			}
-			$blog = array_shift( $blogs );
+			$blog    = array_shift( $blogs );
 			$blog_id = (int) $blog->blog_id;
 		}
 
 		if ( function_exists( 'is_multisite' ) ) {
-			if ( is_multisite() )
+			if ( is_multisite() ) {
 				switch_to_blog( $blog_id );
+			}
 		}
 
 		return $blog_id;
 	}
 
 	/**
-	 *
 	 * @param int $user_id
 	 * @return int|void
 	 */
@@ -168,7 +173,7 @@ class WP_Importer {
 			$user_id = (int) username_exists( $user_id );
 		}
 
-		if ( !$user_id || !wp_set_current_user( $user_id ) ) {
+		if ( ! $user_id || ! wp_set_current_user( $user_id ) ) {
 			fwrite( STDERR, "Error: can not find user\n" );
 			exit();
 		}
@@ -201,11 +206,13 @@ class WP_Importer {
 		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
 
 		$headers = array();
-		$args = array();
-		if ( true === $head )
+		$args    = array();
+		if ( true === $head ) {
 			$args['method'] = 'HEAD';
-		if ( !empty( $username ) && !empty( $password ) )
+		}
+		if ( ! empty( $username ) && ! empty( $password ) ) {
 			$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		}
 
 		$args['headers'] = $headers;
 
@@ -278,42 +285,42 @@ function get_cli_args( $param, $required = false ) {
 	$out = array();
 
 	$last_arg = null;
-	$return = null;
+	$return   = null;
 
 	$il = sizeof( $args );
 
 	for ( $i = 1, $il; $i < $il; $i++ ) {
-		if ( (bool) preg_match( "/^--(.+)/", $args[$i], $match ) ) {
-			$parts = explode( "=", $match[1] );
-			$key = preg_replace( "/[^a-z0-9]+/", "", $parts[0] );
+		if ( (bool) preg_match( '/^--(.+)/', $args[ $i ], $match ) ) {
+			$parts = explode( '=', $match[1] );
+			$key   = preg_replace( '/[^a-z0-9]+/', '', $parts[0] );
 
 			if ( isset( $parts[1] ) ) {
-				$out[$key] = $parts[1];
+				$out[ $key ] = $parts[1];
 			} else {
-				$out[$key] = true;
+				$out[ $key ] = true;
 			}
 
 			$last_arg = $key;
-		} elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
+		} elseif ( (bool) preg_match( '/^-([a-zA-Z0-9]+)/', $args[ $i ], $match ) ) {
 			for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
-				$key = $match[1]{$j};
-				$out[$key] = true;
+				$key         = $match[1]{$j};
+				$out[ $key ] = true;
 			}
 
 			$last_arg = $key;
 		} elseif ( $last_arg !== null ) {
-			$out[$last_arg] = $args[$i];
+			$out[ $last_arg ] = $args[ $i ];
 		}
 	}
 
 	// Check array for specified param
-	if ( isset( $out[$param] ) ) {
+	if ( isset( $out[ $param ] ) ) {
 		// Set return value
-		$return = $out[$param];
+		$return = $out[ $param ];
 	}
 
 	// Check for missing required param
-	if ( !isset( $out[$param] ) && $required ) {
+	if ( ! isset( $out[ $param ] ) && $required ) {
 		// Display message and exit
 		echo "\"$param\" parameter is required but was not specified\n";
 		exit();
diff --git a/wp-admin/includes/class-wp-internal-pointers.php b/wp-admin/includes/class-wp-internal-pointers.php
index 94796c1ee5..814ba37cc8 100644
--- a/wp-admin/includes/class-wp-internal-pointers.php
+++ b/wp-admin/includes/class-wp-internal-pointers.php
@@ -47,8 +47,9 @@ final class WP_Internal_Pointers {
 		);
 
 		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
+		if ( empty( $registered_pointers[ $hook_suffix ] ) ) {
 			return;
+		}
 
 		$pointers = (array) $registered_pointers[ $hook_suffix ];
 
@@ -76,8 +77,9 @@ final class WP_Internal_Pointers {
 		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
 			if ( isset( $caps_required[ $pointer ] ) ) {
 				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
+					if ( ! current_user_can( $cap ) ) {
 						continue 2;
+					}
 				}
 			}
 
@@ -86,8 +88,9 @@ final class WP_Internal_Pointers {
 			$got_pointers = true;
 		}
 
-		if ( ! $got_pointers )
+		if ( ! $got_pointers ) {
 			return;
+		}
 
 		// Add pointers script and style to queue
 		wp_enqueue_style( 'wp-pointer' );
@@ -106,8 +109,9 @@ final class WP_Internal_Pointers {
 	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
 	 */
 	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
+		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) ) {
 			return;
+		}
 
 		?>
 		<script type="text/javascript">
diff --git a/wp-admin/includes/class-wp-links-list-table.php b/wp-admin/includes/class-wp-links-list-table.php
index 0c241215a2..ae83ae2f5e 100644
--- a/wp-admin/includes/class-wp-links-list-table.php
+++ b/wp-admin/includes/class-wp-links-list-table.php
@@ -27,14 +27,15 @@ class WP_Links_List_Table extends WP_List_Table {
 	 * @param array $args An associative array of arguments.
 	 */
 	public function __construct( $args = array() ) {
-		parent::__construct( array(
-			'plural' => 'bookmarks',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural' => 'bookmarks',
+				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
@@ -42,7 +43,6 @@ class WP_Links_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global int    $cat_id
 	 * @global string $s
 	 * @global string $orderby
@@ -53,16 +53,23 @@ class WP_Links_List_Table extends WP_List_Table {
 
 		wp_reset_vars( array( 'action', 'cat_id', 'link_id', 'orderby', 'order', 's' ) );
 
-		$args = array( 'hide_invisible' => 0, 'hide_empty' => 0 );
+		$args = array(
+			'hide_invisible' => 0,
+			'hide_empty'     => 0,
+		);
 
-		if ( 'all' != $cat_id )
+		if ( 'all' != $cat_id ) {
 			$args['category'] = $cat_id;
-		if ( !empty( $s ) )
+		}
+		if ( ! empty( $s ) ) {
 			$args['search'] = $s;
-		if ( !empty( $orderby ) )
+		}
+		if ( ! empty( $orderby ) ) {
 			$args['orderby'] = $orderby;
-		if ( !empty( $order ) )
+		}
+		if ( ! empty( $order ) ) {
 			$args['order'] = $order;
+		}
 
 		$this->items = get_bookmarks( $args );
 	}
@@ -74,38 +81,37 @@ class WP_Links_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_bulk_actions() {
-		$actions = array();
+		$actions           = array();
 		$actions['delete'] = __( 'Delete' );
 
 		return $actions;
 	}
 
 	/**
-	 *
 	 * @global int $cat_id
 	 * @param string $which
 	 */
 	protected function extra_tablenav( $which ) {
 		global $cat_id;
 
-		if ( 'top' != $which )
+		if ( 'top' != $which ) {
 			return;
+		}
 ?>
 		<div class="alignleft actions">
 <?php
 			$dropdown_options = array(
-				'selected' => $cat_id,
-				'name' => 'cat_id',
-				'taxonomy' => 'link_category',
+				'selected'        => $cat_id,
+				'name'            => 'cat_id',
+				'taxonomy'        => 'link_category',
 				'show_option_all' => get_taxonomy( 'link_category' )->labels->all_items,
-				'hide_empty' => true,
-				'hierarchical' => 1,
-				'show_count' => 0,
-				'orderby' => 'name',
+				'hide_empty'      => true,
+				'hierarchical'    => 1,
+				'show_count'      => 0,
+				'orderby'         => 'name',
 			);
 
 			echo '<label class="screen-reader-text" for="cat_id">' . __( 'Filter by category' ) . '</label>';
@@ -117,7 +123,6 @@ class WP_Links_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
@@ -128,12 +133,11 @@ class WP_Links_List_Table extends WP_List_Table {
 			'categories' => __( 'Categories' ),
 			'rel'        => __( 'Relationship' ),
 			'visible'    => __( 'Visible' ),
-			'rating'     => __( 'Rating' )
+			'rating'     => __( 'Rating' ),
 		);
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
@@ -141,7 +145,7 @@ class WP_Links_List_Table extends WP_List_Table {
 			'name'    => 'name',
 			'url'     => 'url',
 			'visible' => 'visible',
-			'rating'  => 'rating'
+			'rating'  => 'rating',
 		);
 	}
 
@@ -179,7 +183,8 @@ class WP_Links_List_Table extends WP_List_Table {
 	 */
 	public function column_name( $link ) {
 		$edit_link = get_edit_bookmark_link( $link );
-		printf( '<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
+		printf(
+			'<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong>',
 			$edit_link,
 			/* translators: %s: link name */
 			esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $link->link_name ) ),
@@ -285,12 +290,12 @@ class WP_Links_List_Table extends WP_List_Table {
 
 	public function display_rows() {
 		foreach ( $this->items as $link ) {
-			$link = sanitize_bookmark( $link );
-			$link->link_name = esc_attr( $link->link_name );
+			$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 ) ?>
+			<?php $this->single_row_columns( $link ); ?>
 		</tr>
 <?php
 		}
@@ -313,9 +318,9 @@ class WP_Links_List_Table extends WP_List_Table {
 
 		$edit_link = get_edit_bookmark_link( $link );
 
-		$actions = array();
-		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
-		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id) . "' onclick=\"if ( confirm( '" . 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;\">" . __('Delete') . "</a>";
+		$actions           = array();
+		$actions['edit']   = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ) . "' onclick=\"if ( confirm( '" . 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;\">" . __( 'Delete' ) . '</a>';
 		return $this->row_actions( $actions );
 	}
 }
diff --git a/wp-admin/includes/class-wp-list-table-compat.php b/wp-admin/includes/class-wp-list-table-compat.php
index b52e04c77d..eb9ea2cfe3 100644
--- a/wp-admin/includes/class-wp-list-table-compat.php
+++ b/wp-admin/includes/class-wp-list-table-compat.php
@@ -17,32 +17,31 @@ class _WP_List_Table_Compat extends WP_List_Table {
 	public $_columns;
 
 	public function __construct( $screen, $columns = array() ) {
-		if ( is_string( $screen ) )
+		if ( is_string( $screen ) ) {
 			$screen = convert_to_screen( $screen );
+		}
 
 		$this->_screen = $screen;
 
-		if ( !empty( $columns ) ) {
+		if ( ! empty( $columns ) ) {
 			$this->_columns = $columns;
 			add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
 		}
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_column_info() {
-		$columns = get_column_headers( $this->_screen );
-		$hidden = get_hidden_columns( $this->_screen );
+		$columns  = get_column_headers( $this->_screen );
+		$hidden   = get_hidden_columns( $this->_screen );
 		$sortable = array();
-		$primary = $this->get_default_primary_column_name();
+		$primary  = $this->get_default_primary_column_name();
 
 		return array( $columns, $hidden, $sortable, $primary );
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php
index 84d9d781bd..ef6b633a3a 100644
--- a/wp-admin/includes/class-wp-list-table.php
+++ b/wp-admin/includes/class-wp-list-table.php
@@ -91,10 +91,24 @@ class WP_List_Table {
 	 *
 	 * @var array
 	 */
-	protected $compat_methods = array( 'set_pagination_args', 'get_views', 'get_bulk_actions', 'bulk_actions',
-		'row_actions', 'months_dropdown', 'view_switcher', 'comments_bubble', 'get_items_per_page', 'pagination',
-		'get_sortable_columns', 'get_column_info', 'get_table_classes', 'display_tablenav', 'extra_tablenav',
-		'single_row_columns' );
+	protected $compat_methods = array(
+		'set_pagination_args',
+		'get_views',
+		'get_bulk_actions',
+		'bulk_actions',
+		'row_actions',
+		'months_dropdown',
+		'view_switcher',
+		'comments_bubble',
+		'get_items_per_page',
+		'pagination',
+		'get_sortable_columns',
+		'get_column_info',
+		'get_table_classes',
+		'display_tablenav',
+		'extra_tablenav',
+		'single_row_columns',
+	);
 
 	/**
 	 * Constructor.
@@ -122,21 +136,24 @@ class WP_List_Table {
 	 * }
 	 */
 	public function __construct( $args = array() ) {
-		$args = wp_parse_args( $args, array(
-			'plural' => '',
-			'singular' => '',
-			'ajax' => false,
-			'screen' => null,
-		) );
+		$args = wp_parse_args(
+			$args, array(
+				'plural'   => '',
+				'singular' => '',
+				'ajax'     => false,
+				'screen'   => null,
+			)
+		);
 
 		$this->screen = convert_to_screen( $args['screen'] );
 
 		add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
 
-		if ( !$args['plural'] )
+		if ( ! $args['plural'] ) {
 			$args['plural'] = $this->screen->base;
+		}
 
-		$args['plural'] = sanitize_key( $args['plural'] );
+		$args['plural']   = sanitize_key( $args['plural'] );
 		$args['singular'] = sanitize_key( $args['singular'] );
 
 		$this->_args = $args;
@@ -149,7 +166,7 @@ class WP_List_Table {
 		if ( empty( $this->modes ) ) {
 			$this->modes = array(
 				'list'    => __( 'List View' ),
-				'excerpt' => __( 'Excerpt View' )
+				'excerpt' => __( 'Excerpt View' ),
 			);
 		}
 	}
@@ -238,6 +255,7 @@ class WP_List_Table {
 
 	/**
 	 * Prepares the list of items for displaying.
+	 *
 	 * @uses WP_List_Table::set_pagination_args()
 	 *
 	 * @since 3.1.0
@@ -255,14 +273,17 @@ class WP_List_Table {
 	 * @param array|string $args Array or string of arguments with information about the pagination.
 	 */
 	protected function set_pagination_args( $args ) {
-		$args = wp_parse_args( $args, array(
-			'total_items' => 0,
-			'total_pages' => 0,
-			'per_page' => 0,
-		) );
+		$args = wp_parse_args(
+			$args, array(
+				'total_items' => 0,
+				'total_pages' => 0,
+				'per_page'    => 0,
+			)
+		);
 
-		if ( !$args['total_pages'] && $args['per_page'] > 0 )
+		if ( ! $args['total_pages'] && $args['per_page'] > 0 ) {
 			$args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
+		}
 
 		// Redirect if page number is invalid and headers are not already sent.
 		if ( ! headers_sent() && ! wp_doing_ajax() && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
@@ -287,8 +308,8 @@ class WP_List_Table {
 			return $this->get_pagenum();
 		}
 
-		if ( isset( $this->_pagination_args[$key] ) ) {
-			return $this->_pagination_args[$key];
+		if ( isset( $this->_pagination_args[ $key ] ) ) {
+			return $this->_pagination_args[ $key ];
 		}
 	}
 
@@ -300,7 +321,7 @@ class WP_List_Table {
 	 * @return bool
 	 */
 	public function has_items() {
-		return !empty( $this->items );
+		return ! empty( $this->items );
 	}
 
 	/**
@@ -321,19 +342,24 @@ class WP_List_Table {
 	 * @param string $input_id ID attribute value for the search input field.
 	 */
 	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && !$this->has_items() )
+		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
 			return;
+		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) )
+		if ( ! empty( $_REQUEST['orderby'] ) ) {
 			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		if ( ! empty( $_REQUEST['order'] ) )
+		}
+		if ( ! empty( $_REQUEST['order'] ) ) {
 			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		if ( ! empty( $_REQUEST['post_mime_type'] ) )
+		}
+		if ( ! empty( $_REQUEST['post_mime_type'] ) ) {
 			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr( $_REQUEST['post_mime_type'] ) . '" />';
-		if ( ! empty( $_REQUEST['detached'] ) )
+		}
+		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>
@@ -374,8 +400,9 @@ class WP_List_Table {
 		 */
 		$views = apply_filters( "views_{$this->screen->id}", $views );
 
-		if ( empty( $views ) )
+		if ( empty( $views ) ) {
 			return;
+		}
 
 		$this->screen->render_screen_reader_content( 'heading_views' );
 
@@ -384,7 +411,7 @@ class WP_List_Table {
 			$views[ $class ] = "\t<li class='$class'>$view";
 		}
 		echo implode( " |</li>\n", $views ) . "</li>\n";
-		echo "</ul>";
+		echo '</ul>';
 	}
 
 	/**
@@ -423,13 +450,14 @@ class WP_List_Table {
 			 * @param array $actions An array of the available bulk actions.
 			 */
 			$this->_actions = apply_filters( "bulk_actions-{$this->screen->id}", $this->_actions );
-			$two = '';
+			$two            = '';
 		} else {
 			$two = '2';
 		}
 
-		if ( empty( $this->_actions ) )
+		if ( empty( $this->_actions ) ) {
 			return;
+		}
 
 		echo '<label for="bulk-action-selector-' . esc_attr( $which ) . '" class="screen-reader-text">' . __( 'Select bulk action' ) . '</label>';
 		echo '<select name="action' . $two . '" id="bulk-action-selector-' . esc_attr( $which ) . "\">\n";
@@ -455,14 +483,17 @@ class WP_List_Table {
 	 * @return string|false The action name or False if no action was selected
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) )
+		if ( isset( $_REQUEST['filter_action'] ) && ! empty( $_REQUEST['filter_action'] ) ) {
 			return false;
+		}
 
-		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] )
+		if ( isset( $_REQUEST['action'] ) && -1 != $_REQUEST['action'] ) {
 			return $_REQUEST['action'];
+		}
 
-		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
+		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) {
 			return $_REQUEST['action2'];
+		}
 
 		return false;
 	}
@@ -478,16 +509,17 @@ class WP_List_Table {
 	 */
 	protected function row_actions( $actions, $always_visible = false ) {
 		$action_count = count( $actions );
-		$i = 0;
+		$i            = 0;
 
-		if ( !$action_count )
+		if ( ! $action_count ) {
 			return '';
+		}
 
 		$out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
 		foreach ( $actions as $action => $link ) {
 			++$i;
 			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
-			$out .= "<span class='$action'>$link$sep</span>";
+			$out                          .= "<span class='$action'>$link$sep</span>";
 		}
 		$out .= '</div>';
 
@@ -528,13 +560,17 @@ class WP_List_Table {
 			$extra_checks = $wpdb->prepare( ' AND post_status = %s', $_GET['post_status'] );
 		}
 
-		$months = $wpdb->get_results( $wpdb->prepare( "
+		$months = $wpdb->get_results(
+			$wpdb->prepare(
+				"
 			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 			FROM $wpdb->posts
 			WHERE post_type = %s
 			$extra_checks
 			ORDER BY post_date DESC
-		", $post_type ) );
+		", $post_type
+			)
+		);
 
 		/**
 		 * Filters the 'Months' drop-down results.
@@ -548,8 +584,9 @@ class WP_List_Table {
 
 		$month_count = count( $months );
 
-		if ( !$month_count || ( 1 == $month_count && 0 == $months[0]->month ) )
+		if ( ! $month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
 			return;
+		}
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
@@ -557,20 +594,22 @@ class WP_List_Table {
 		<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;
+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
@@ -588,17 +627,18 @@ class WP_List_Table {
 		<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
-				);
-			}
+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
@@ -616,39 +656,58 @@ class WP_List_Table {
 		$approved_comments = get_comments_number();
 
 		$approved_comments_number = number_format_i18n( $approved_comments );
-		$pending_comments_number = number_format_i18n( $pending_comments );
+		$pending_comments_number  = number_format_i18n( $pending_comments );
 
 		$approved_only_phrase = sprintf( _n( '%s comment', '%s comments', $approved_comments ), $approved_comments_number );
-		$approved_phrase = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
-		$pending_phrase = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
+		$approved_phrase      = sprintf( _n( '%s approved comment', '%s approved comments', $approved_comments ), $approved_comments_number );
+		$pending_phrase       = sprintf( _n( '%s pending comment', '%s pending comments', $pending_comments ), $pending_comments_number );
 
 		// No comments at all.
 		if ( ! $approved_comments && ! $pending_comments ) {
-			printf( '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
+			printf(
+				'<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">%s</span>',
 				__( 'No comments' )
 			);
-		// Approved comments have different display depending on some conditions.
+			// Approved comments have different display depending on some conditions.
 		} elseif ( $approved_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'approved' ), admin_url( 'edit-comments.php' ) ) ),
+			printf(
+				'<a href="%s" class="post-com-count post-com-count-approved"><span class="comment-count-approved" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(
+					add_query_arg(
+						array(
+							'p'              => $post_id,
+							'comment_status' => 'approved',
+						), admin_url( 'edit-comments.php' )
+					)
+				),
 				$approved_comments_number,
 				$pending_comments ? $approved_phrase : $approved_only_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf(
+				'<span class="post-com-count post-com-count-no-comments"><span class="comment-count comment-count-no-comments" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$approved_comments_number,
 				$pending_comments ? __( 'No approved comments' ) : __( 'No comments' )
 			);
 		}
 
 		if ( $pending_comments ) {
-			printf( '<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-				esc_url( add_query_arg( array( 'p' => $post_id, 'comment_status' => 'moderated' ), admin_url( 'edit-comments.php' ) ) ),
+			printf(
+				'<a href="%s" class="post-com-count post-com-count-pending"><span class="comment-count-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
+				esc_url(
+					add_query_arg(
+						array(
+							'p'              => $post_id,
+							'comment_status' => 'moderated',
+						), admin_url( 'edit-comments.php' )
+					)
+				),
 				$pending_comments_number,
 				$pending_phrase
 			);
 		} else {
-			printf( '<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+			printf(
+				'<span class="post-com-count post-com-count-pending post-com-count-no-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
 				$pending_comments_number,
 				$approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
 			);
@@ -665,8 +724,9 @@ class WP_List_Table {
 	public function get_pagenum() {
 		$pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0;
 
-		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
+		if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] ) {
 			$pagenum = $this->_pagination_args['total_pages'];
+		}
 
 		return max( 1, $pagenum );
 	}
@@ -682,8 +742,9 @@ class WP_List_Table {
 	 */
 	protected function get_items_per_page( $option, $default = 20 ) {
 		$per_page = (int) get_user_option( $option );
-		if ( empty( $per_page ) || $per_page < 1 )
+		if ( empty( $per_page ) || $per_page < 1 ) {
 			$per_page = $default;
+		}
 
 		/**
 		 * Filters the number of items to be displayed on each page of the list table.
@@ -713,8 +774,8 @@ class WP_List_Table {
 			return;
 		}
 
-		$total_items = $this->_pagination_args['total_items'];
-		$total_pages = $this->_pagination_args['total_pages'];
+		$total_items     = $this->_pagination_args['total_items'];
+		$total_pages     = $this->_pagination_args['total_pages'];
 		$infinite_scroll = false;
 		if ( isset( $this->_pagination_args['infinite_scroll'] ) ) {
 			$infinite_scroll = $this->_pagination_args['infinite_scroll'];
@@ -726,7 +787,7 @@ class WP_List_Table {
 
 		$output = '<span class="displaying-num">' . sprintf( _n( '%s item', '%s items', $total_items ), number_format_i18n( $total_items ) ) . '</span>';
 
-		$current = $this->get_pagenum();
+		$current              = $this->get_pagenum();
 		$removable_query_args = wp_removable_query_args();
 
 		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
@@ -740,17 +801,17 @@ class WP_List_Table {
 
 		$disable_first = $disable_last = $disable_prev = $disable_next = false;
 
- 		if ( $current == 1 ) {
+		if ( $current == 1 ) {
 			$disable_first = true;
-			$disable_prev = true;
- 		}
+			$disable_prev  = true;
+		}
 		if ( $current == 2 ) {
 			$disable_first = true;
 		}
- 		if ( $current == $total_pages ) {
+		if ( $current == $total_pages ) {
 			$disable_last = true;
 			$disable_next = true;
- 		}
+		}
 		if ( $current == $total_pages - 1 ) {
 			$disable_last = true;
 		}
@@ -758,7 +819,8 @@ class WP_List_Table {
 		if ( $disable_first ) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&laquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+			$page_links[] = sprintf(
+				"<a class='first-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
 				esc_url( remove_query_arg( 'paged', $current_url ) ),
 				__( 'First page' ),
 				'&laquo;'
@@ -768,8 +830,9 @@ class WP_List_Table {
 		if ( $disable_prev ) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&lsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', max( 1, $current-1 ), $current_url ) ),
+			$page_links[] = sprintf(
+				"<a class='prev-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url( add_query_arg( 'paged', max( 1, $current - 1 ), $current_url ) ),
 				__( 'Previous page' ),
 				'&lsaquo;'
 			);
@@ -779,20 +842,22 @@ class WP_List_Table {
 			$html_current_page  = $current;
 			$total_pages_before = '<span class="screen-reader-text">' . __( 'Current Page' ) . '</span><span id="table-paging" class="paging-input"><span class="tablenav-paging-text">';
 		} else {
-			$html_current_page = sprintf( "%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' /><span class='tablenav-paging-text'>",
+			$html_current_page = sprintf(
+				"%s<input class='current-page' id='current-page-selector' type='text' name='paged' value='%s' size='%d' aria-describedby='table-paging' /><span class='tablenav-paging-text'>",
 				'<label for="current-page-selector" class="screen-reader-text">' . __( 'Current Page' ) . '</label>',
 				$current,
 				strlen( $total_pages )
 			);
 		}
 		$html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
-		$page_links[] = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
+		$page_links[]     = $total_pages_before . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . $total_pages_after;
 
 		if ( $disable_next ) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&rsaquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
-				esc_url( add_query_arg( 'paged', min( $total_pages, $current+1 ), $current_url ) ),
+			$page_links[] = sprintf(
+				"<a class='next-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+				esc_url( add_query_arg( 'paged', min( $total_pages, $current + 1 ), $current_url ) ),
 				__( 'Next page' ),
 				'&rsaquo;'
 			);
@@ -801,7 +866,8 @@ class WP_List_Table {
 		if ( $disable_last ) {
 			$page_links[] = '<span class="tablenav-pages-navspan" aria-hidden="true">&raquo;</span>';
 		} else {
-			$page_links[] = sprintf( "<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
+			$page_links[] = sprintf(
+				"<a class='last-page' href='%s'><span class='screen-reader-text'>%s</span><span aria-hidden='true'>%s</span></a>",
 				esc_url( add_query_arg( 'paged', $total_pages, $current_url ) ),
 				__( 'Last page' ),
 				'&raquo;'
@@ -862,7 +928,7 @@ class WP_List_Table {
 	 */
 	protected function get_default_primary_column_name() {
 		$columns = $this->get_columns();
-		$column = '';
+		$column  = '';
 
 		if ( empty( $columns ) ) {
 			return $column;
@@ -918,7 +984,7 @@ class WP_List_Table {
 		 * @param string $default Column name default for the specific list table, e.g. 'name'.
 		 * @param string $context Screen ID for specific list table, e.g. 'plugins'.
 		 */
-		$column  = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
+		$column = apply_filters( 'list_table_primary_column', $default, $this->screen->id );
 
 		if ( empty( $column ) || ! isset( $columns[ $column ] ) ) {
 			$column = $default;
@@ -948,7 +1014,7 @@ class WP_List_Table {
 		}
 
 		$columns = get_column_headers( $this->screen );
-		$hidden = get_hidden_columns( $this->screen );
+		$hidden  = get_hidden_columns( $this->screen );
 
 		$sortable_columns = $this->get_sortable_columns();
 		/**
@@ -965,17 +1031,19 @@ class WP_List_Table {
 
 		$sortable = array();
 		foreach ( $_sortable as $id => $data ) {
-			if ( empty( $data ) )
+			if ( empty( $data ) ) {
 				continue;
+			}
 
 			$data = (array) $data;
-			if ( !isset( $data[1] ) )
+			if ( ! isset( $data[1] ) ) {
 				$data[1] = false;
+			}
 
-			$sortable[$id] = $data;
+			$sortable[ $id ] = $data;
 		}
 
-		$primary = $this->get_primary_column_name();
+		$primary               = $this->get_primary_column_name();
 		$this->_column_headers = array( $columns, $hidden, $sortable, $primary );
 
 		return $this->_column_headers;
@@ -990,7 +1058,7 @@ class WP_List_Table {
 	 */
 	public function get_column_count() {
 		list ( $columns, $hidden ) = $this->get_column_info();
-		$hidden = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
+		$hidden                    = array_intersect( array_keys( $columns ), array_filter( $hidden ) );
 		return count( $columns ) - count( $hidden );
 	}
 
@@ -1023,7 +1091,7 @@ class WP_List_Table {
 
 		if ( ! empty( $columns['cb'] ) ) {
 			static $cb_counter = 1;
-			$columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
+			$columns['cb']     = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
 				. '<input id="cb-select-all-' . $cb_counter . '" type="checkbox" />';
 			$cb_counter++;
 		}
@@ -1035,24 +1103,25 @@ class WP_List_Table {
 				$class[] = 'hidden';
 			}
 
-			if ( 'cb' === $column_key )
+			if ( 'cb' === $column_key ) {
 				$class[] = 'check-column';
-			elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) )
+			} elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) ) {
 				$class[] = 'num';
+			}
 
 			if ( $column_key === $primary ) {
 				$class[] = 'column-primary';
 			}
 
-			if ( isset( $sortable[$column_key] ) ) {
-				list( $orderby, $desc_first ) = $sortable[$column_key];
+			if ( isset( $sortable[ $column_key ] ) ) {
+				list( $orderby, $desc_first ) = $sortable[ $column_key ];
 
 				if ( $current_orderby === $orderby ) {
-					$order = 'asc' === $current_order ? 'desc' : 'asc';
+					$order   = 'asc' === $current_order ? 'desc' : 'asc';
 					$class[] = 'sorted';
 					$class[] = $current_order;
 				} else {
-					$order = $desc_first ? 'desc' : 'asc';
+					$order   = $desc_first ? 'desc' : 'asc';
 					$class[] = 'sortable';
 					$class[] = $desc_first ? 'asc' : 'desc';
 				}
@@ -1060,12 +1129,13 @@ class WP_List_Table {
 				$column_display_name = '<a href="' . esc_url( add_query_arg( compact( 'orderby', 'order' ), $current_url ) ) . '"><span>' . $column_display_name . '</span><span class="sorting-indicator"></span></a>';
 			}
 
-			$tag = ( 'cb' === $column_key ) ? 'td' : 'th';
+			$tag   = ( 'cb' === $column_key ) ? 'td' : 'th';
 			$scope = ( 'th' === $tag ) ? 'scope="col"' : '';
-			$id = $with_id ? "id='$column_key'" : '';
+			$id    = $with_id ? "id='$column_key'" : '';
 
-			if ( !empty( $class ) )
+			if ( ! empty( $class ) ) {
 				$class = "class='" . join( ' ', $class ) . "'";
+			}
 
 			echo "<$tag $scope $id $class>$column_display_name</$tag>";
 		}
@@ -1090,10 +1160,13 @@ class WP_List_Table {
 	</tr>
 	</thead>
 
-	<tbody id="the-list"<?php
-		if ( $singular ) {
-			echo " data-wp-lists='list:$singular'";
-		} ?>>
+	<tbody id="the-list"
+	<?php
+	if ( $singular ) {
+		echo " data-wp-lists='list:$singular'";
+	}
+		?>
+		>
 		<?php $this->display_rows_or_placeholder(); ?>
 	</tbody>
 
@@ -1132,11 +1205,12 @@ class WP_List_Table {
 		?>
 	<div class="tablenav <?php echo esc_attr( $which ); ?>">
 
-		<?php if ( $this->has_items() ): ?>
+		<?php if ( $this->has_items() ) : ?>
 		<div class="alignleft actions bulkactions">
 			<?php $this->bulk_actions( $which ); ?>
 		</div>
-		<?php endif;
+		<?php
+		endif;
 		$this->extra_tablenav( $which );
 		$this->pagination( $which );
 ?>
@@ -1176,8 +1250,9 @@ class WP_List_Table {
 	 * @since 3.1.0
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $item )
+		foreach ( $this->items as $item ) {
 			$this->single_row( $item );
+		}
 	}
 
 	/**
@@ -1194,14 +1269,12 @@ class WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @param object $item
 	 * @param string $column_name
 	 */
 	protected function column_default( $item, $column_name ) {}
 
 	/**
-	 *
 	 * @param object $item
 	 */
 	protected function column_cb( $item ) {}
@@ -1248,12 +1321,12 @@ class WP_List_Table {
 				echo "<td $attributes>";
 				echo call_user_func( array( $this, 'column_' . $column_name ), $item );
 				echo $this->handle_row_actions( $item, $column_name, $primary );
-				echo "</td>";
+				echo '</td>';
 			} else {
 				echo "<td $attributes>";
 				echo $this->column_default( $item, $column_name );
 				echo $this->handle_row_actions( $item, $column_name, $primary );
-				echo "</td>";
+				echo '</td>';
 			}
 		}
 	}
@@ -1270,7 +1343,7 @@ class WP_List_Table {
 	 */
 	protected function handle_row_actions( $item, $column_name, $primary ) {
 		return $column_name === $primary ? '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>' : '';
- 	}
+	}
 
 	/**
 	 * Handle an incoming ajax request (called from admin-ajax.php)
@@ -1298,7 +1371,7 @@ class WP_List_Table {
 			);
 		}
 		if ( isset( $this->_pagination_args['total_pages'] ) ) {
-			$response['total_pages'] = $this->_pagination_args['total_pages'];
+			$response['total_pages']      = $this->_pagination_args['total_pages'];
 			$response['total_pages_i18n'] = number_format_i18n( $this->_pagination_args['total_pages'] );
 		}
 
@@ -1307,7 +1380,6 @@ class WP_List_Table {
 
 	/**
 	 * Send required variables to JavaScript land
-	 *
 	 */
 	public function _js_vars() {
 		$args = array(
@@ -1315,7 +1387,7 @@ class WP_List_Table {
 			'screen' => array(
 				'id'   => $this->screen->id,
 				'base' => $this->screen->base,
-			)
+			),
 		);
 
 		printf( "<script type='text/javascript'>list_args = %s;</script>\n", wp_json_encode( $args ) );
diff --git a/wp-admin/includes/class-wp-media-list-table.php b/wp-admin/includes/class-wp-media-list-table.php
index 118a5ac0d8..70cb1a951f 100644
--- a/wp-admin/includes/class-wp-media-list-table.php
+++ b/wp-admin/includes/class-wp-media-list-table.php
@@ -42,25 +42,25 @@ class WP_Media_List_Table extends WP_List_Table {
 
 		$this->modes = array(
 			'list' => __( 'List View' ),
-			'grid' => __( 'Grid View' )
+			'grid' => __( 'Grid View' ),
 		);
 
-		parent::__construct( array(
-			'plural' => 'media',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural' => 'media',
+				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can('upload_files');
+		return current_user_can( 'upload_files' );
 	}
 
 	/**
-	 *
 	 * @global WP_Query $wp_query
 	 * @global array    $post_mime_types
 	 * @global array    $avail_post_mime_types
@@ -71,15 +71,17 @@ class WP_Media_List_Table extends WP_List_Table {
 
 		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
 
- 		$this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
+		$this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
 
- 		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
 
-		$this->set_pagination_args( array(
-			'total_items' => $wp_query->found_posts,
-			'total_pages' => $wp_query->max_num_pages,
-			'per_page' => $wp_query->query_vars['posts_per_page'],
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $wp_query->found_posts,
+				'total_pages' => $wp_query->max_num_pages,
+				'per_page'    => $wp_query->query_vars['posts_per_page'],
+			)
+		);
 	}
 
 	/**
@@ -112,7 +114,7 @@ class WP_Media_List_Table extends WP_List_Table {
 				false
 			);
 
-			$type_links[$mime_type] = sprintf(
+			$type_links[ $mime_type ] = sprintf(
 				'<option value="post_mime_type:%s"%s>%s</option>',
 				esc_attr( $mime_type ),
 				$selected,
@@ -121,7 +123,7 @@ class WP_Media_List_Table extends WP_List_Table {
 		}
 		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . __( 'Unattached' ) . '</option>';
 
-		if ( $this->is_trash || ( defined( 'MEDIA_TRASH') && MEDIA_TRASH ) ) {
+		if ( $this->is_trash || ( defined( 'MEDIA_TRASH' ) && MEDIA_TRASH ) ) {
 			$type_links['trash'] = sprintf(
 				'<option value="trash"%s>%s</option>',
 				selected( 'trash' === $filter, true, false ),
@@ -132,7 +134,6 @@ class WP_Media_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_bulk_actions() {
@@ -140,7 +141,7 @@ class WP_Media_List_Table extends WP_List_Table {
 		if ( MEDIA_TRASH ) {
 			if ( $this->is_trash ) {
 				$actions['untrash'] = __( 'Restore' );
-				$actions['delete'] = __( 'Delete Permanently' );
+				$actions['delete']  = __( 'Delete Permanently' );
 			} else {
 				$actions['trash'] = _x( 'Trash', 'verb' );
 			}
@@ -148,8 +149,9 @@ class WP_Media_List_Table extends WP_List_Table {
 			$actions['delete'] = __( 'Delete Permanently' );
 		}
 
-		if ( $this->detached )
+		if ( $this->detached ) {
 			$actions['attach'] = __( 'Attach' );
+		}
 
 		return $actions;
 	}
@@ -164,43 +166,45 @@ class WP_Media_List_Table extends WP_List_Table {
 ?>
 		<div class="actions">
 <?php
-		if ( ! is_singular() ) {
-			if ( ! $this->is_trash ) {
-				$this->months_dropdown( 'attachment' );
-			}
+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
 	}
 
 	/**
-	 *
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) ) {
 			return 'attach';
+		}
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) ) {
 			return 'detach';
+		}
 
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
 			return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function has_items() {
@@ -247,32 +251,31 @@ class WP_Media_List_Table extends WP_List_Table {
 		$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>
+		<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
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
-		$posts_columns = array();
+		$posts_columns       = array();
 		$posts_columns['cb'] = '<input type="checkbox" />';
 		/* translators: column name */
-		$posts_columns['title'] = _x( 'File', 'column name' );
+		$posts_columns['title']  = _x( 'File', 'column name' );
 		$posts_columns['author'] = __( 'Author' );
 
 		$taxonomies = get_taxonomies_for_attachments( 'objects' );
@@ -301,10 +304,11 @@ class WP_Media_List_Table extends WP_List_Table {
 		}
 
 		/* translators: column name */
-		if ( !$this->detached ) {
+		if ( ! $this->detached ) {
 			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) )
+			if ( post_type_supports( 'attachment', 'comments' ) ) {
 				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+			}
 		}
 		/* translators: column name */
 		$posts_columns['date'] = _x( 'Date', 'column name' );
@@ -321,7 +325,6 @@ class WP_Media_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
@@ -342,12 +345,16 @@ class WP_Media_List_Table extends WP_List_Table {
 	 * @param WP_Post $post The current WP_Post object.
 	 */
 	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>
+		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
+		}
 	}
 
 	/**
@@ -360,8 +367,8 @@ class WP_Media_List_Table extends WP_List_Table {
 	public function column_title( $post ) {
 		list( $mime ) = explode( '/', $post->post_mime_type );
 
-		$title = _draft_or_post_title();
-		$thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+		$title      = _draft_or_post_title();
+		$thumb      = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
 		$link_start = $link_end = '';
 
 		if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
@@ -379,9 +386,11 @@ class WP_Media_List_Table extends WP_List_Table {
 		<strong<?php echo $class; ?>>
 			<?php
 			echo $link_start;
-			if ( $thumb ) : ?>
+			if ( $thumb ) :
+			?>
 				<span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
-			<?php endif;
+			<?php
+			endif;
 			echo $title . $link_end;
 			_media_states( $post );
 			?>
@@ -404,8 +413,9 @@ class WP_Media_List_Table extends WP_List_Table {
 	 * @param WP_Post $post The current WP_Post object.
 	 */
 	public function column_author( $post ) {
-		printf( '<a href="%s">%s</a>',
-			esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+		printf(
+			'<a href="%s">%s</a>',
+			esc_url( add_query_arg( array( 'author' => get_the_author_meta( 'ID' ) ), 'upload.php' ) ),
 			get_the_author()
 		);
 	}
@@ -433,7 +443,7 @@ class WP_Media_List_Table extends WP_List_Table {
 			$h_time = __( 'Unpublished' );
 		} else {
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post, false );
+			$time   = get_post_time( 'G', true, $post, false );
 			if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
 				if ( $t_diff < 0 ) {
 					$h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
@@ -465,26 +475,30 @@ class WP_Media_List_Table extends WP_List_Table {
 		}
 
 		if ( $parent ) {
-			$title = _draft_or_post_title( $post->post_parent );
+			$title       = _draft_or_post_title( $post->post_parent );
 			$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
+					<?php echo $title; ?></a></strong>
+								<?php
 			} elseif ( $parent_type && current_user_can( 'read_post', $post->post_parent ) ) {
 ?>
-				<strong><?php echo $title ?></strong><?php
+				<strong><?php echo $title; ?></strong>
+									<?php
 			} else {
 				_e( '(Private post)' );
 			}
 
-			if ( $user_can_edit ):
-				$detach_url = add_query_arg( array(
-					'parent_post_id' => $post->post_parent,
-					'media[]' => $post->ID,
-					'_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
-				), 'upload.php' );
+			if ( $user_can_edit ) :
+				$detach_url = add_query_arg(
+					array(
+						'parent_post_id' => $post->post_parent,
+						'media[]'        => $post->ID,
+						'_wpnonce'       => wp_create_nonce( 'bulk-' . $this->_args['plural'] ),
+					), 'upload.php'
+				);
 				printf(
 					'<br /><a href="%s" class="hide-if-no-js detach-from-parent" aria-label="%s">%s</a>',
 					$detach_url,
@@ -494,8 +508,10 @@ class WP_Media_List_Table extends WP_List_Table {
 				);
 			endif;
 		} else {
-			_e( '(Unattached)' ); ?>
-			<?php if ( $user_can_edit ) {
+			_e( '(Unattached)' );
+			?>
+			<?php
+			if ( $user_can_edit ) {
 				$title = _draft_or_post_title( $post->post_parent );
 				printf(
 					'<br /><a href="#the-list" onclick="findPosts.open( \'media[]\', \'%s\' ); return false;" class="hide-if-no-js aria-button-if-js" aria-label="%s">%s</a>',
@@ -553,11 +569,12 @@ class WP_Media_List_Table extends WP_List_Table {
 			if ( is_array( $terms ) ) {
 				$out = array();
 				foreach ( $terms as $t ) {
-					$posts_in_term_qv = array();
+					$posts_in_term_qv             = array();
 					$posts_in_term_qv['taxonomy'] = $taxonomy;
-					$posts_in_term_qv['term'] = $t->slug;
+					$posts_in_term_qv['term']     = $t->slug;
 
-					$out[] = sprintf( '<a href="%s">%s</a>',
+					$out[] = sprintf(
+						'<a href="%s">%s</a>',
 						esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ),
 						esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
 					);
@@ -585,7 +602,6 @@ class WP_Media_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global WP_Post $post
 	 */
 	public function display_rows() {
@@ -596,9 +612,10 @@ class WP_Media_List_Table extends WP_List_Table {
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		add_filter( 'the_title','esc_html' );
+		add_filter( 'the_title', 'esc_html' );
 
-		while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 			if (
 				( $this->is_trash && $post->post_status != 'trash' )
 				|| ( ! $this->is_trash && $post->post_status === 'trash' )
@@ -654,7 +671,7 @@ class WP_Media_List_Table extends WP_List_Table {
 						_x( 'Trash', 'verb' )
 					);
 				} else {
-					$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+					$delete_ays        = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
 						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
@@ -682,9 +699,8 @@ class WP_Media_List_Table extends WP_List_Table {
 					__( 'Attach' )
 				);
 			}
-		}
-		else {
-			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
+		} else {
+			if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
 				$actions['edit'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
 					get_edit_post_link( $post->ID ),
@@ -712,7 +728,7 @@ class WP_Media_List_Table extends WP_List_Table {
 					);
 				}
 				if ( $this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH ) {
-					$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
+					$delete_ays        = ( ! $this->is_trash && ! MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = sprintf(
 						'<a href="%s" class="submitdelete aria-button-if-js"%s aria-label="%s">%s</a>',
 						wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ),
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 f639b36ecf..1741d515f8 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -39,17 +39,18 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			'archived' => array( 'site-archived', __( 'Archived' ) ),
 			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
 			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-			'mature'   => array( 'site-mature', __( 'Mature' ) )
+			'mature'   => array( 'site-mature', __( 'Mature' ) ),
 		);
 
-		parent::__construct( array(
-			'plural' => 'sites',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural' => 'sites',
+				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
@@ -79,22 +80,24 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 
 		$pagenum = $this->get_pagenum();
 
-		$s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : '';
+		$s    = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
 		$wild = '';
-		if ( false !== strpos($s, '*') ) {
+		if ( false !== strpos( $s, '*' ) ) {
 			$wild = '*';
-			$s = trim($s, '*');
+			$s    = trim( $s, '*' );
 		}
 
 		/*
 		 * If the network is large and a search is not being performed, show only
 		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
-		if ( !$s && wp_is_large_network() ) {
-			if ( !isset($_REQUEST['orderby']) )
+		if ( ! $s && wp_is_large_network() ) {
+			if ( ! isset( $_REQUEST['orderby'] ) ) {
 				$_GET['orderby'] = $_REQUEST['orderby'] = '';
-			if ( !isset($_REQUEST['order']) )
+			}
+			if ( ! isset( $_REQUEST['order'] ) ) {
 				$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			}
 		}
 
 		$args = array(
@@ -103,14 +106,14 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			'network_id' => get_current_network_id(),
 		);
 
-		if ( empty($s) ) {
+		if ( empty( $s ) ) {
 			// Nothing to do.
 		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
 					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
 					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
 					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
 			// IPv4 address
-			$sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
+			$sql          = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
 			$reg_blog_ids = $wpdb->get_col( $sql );
 
 			if ( $reg_blog_ids ) {
@@ -146,7 +149,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		$args['orderby'] = $order_by;
 
 		if ( $order_by ) {
-			$args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+			$args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? 'DESC' : 'ASC';
 		}
 
 		if ( wp_is_large_network() ) {
@@ -171,16 +174,22 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			$this->items = array_slice( $_sites, 0, $per_page );
 		}
 
-		$total_sites = get_sites( array_merge( $args, array(
-			'count' => true,
-			'offset' => 0,
-			'number' => 0,
-		) ) );
+		$total_sites = get_sites(
+			array_merge(
+				$args, array(
+					'count'  => true,
+					'offset' => 0,
+					'number' => 0,
+				)
+			)
+		);
 
-		$this->set_pagination_args( array(
-			'total_items' => $total_sites,
-			'per_page' => $per_page,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $total_sites,
+				'per_page'    => $per_page,
+			)
+		);
 	}
 
 	/**
@@ -190,14 +199,14 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) )
+		if ( current_user_can( 'delete_sites' ) ) {
 			$actions['delete'] = __( 'Delete' );
-		$actions['spam'] = _x( 'Mark as Spam', 'site' );
+		}
+		$actions['spam']    = _x( 'Mark as Spam', 'site' );
 		$actions['notspam'] = _x( 'Not Spam', 'site' );
 
 		return $actions;
@@ -213,8 +222,9 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 
 		parent::pagination( $which );
 
-		if ( 'top' === $which )
+		if ( 'top' === $which ) {
 			$this->view_switcher( $mode );
+		}
 	}
 
 	/**
@@ -266,11 +276,14 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		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 endif;
+			<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
+		endif;
 	}
 
 	/**
@@ -296,7 +309,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 	public function column_blogname( $blog ) {
 		global $mode;
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname    = untrailingslashit( $blog['domain'] . $blog['path'] );
 		$blog_states = array();
 		reset( $this->status_list );
 
@@ -308,11 +321,11 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		$blog_state = '';
 		if ( ! empty( $blog_states ) ) {
 			$state_count = count( $blog_states );
-			$i = 0;
+			$i           = 0;
 			$blog_state .= ' &mdash; ';
 			foreach ( $blog_states as $state ) {
 				++$i;
-				$sep = ( $i == $state_count ) ? '' : ', ';
+				$sep         = ( $i == $state_count ) ? '' : ', ';
 				$blog_state .= "<span class='post-state'>$state$sep</span>";
 			}
 		}
@@ -393,7 +406,12 @@ 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 = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
+			$blog_users = get_users(
+				array(
+					'blog_id' => $blog['blog_id'],
+					'fields'  => 'ID',
+				)
+			);
 			$user_count = count( $blog_users );
 			unset( $blog_users );
 			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
@@ -449,12 +467,11 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $mode
 	 */
 	public function display_rows() {
 		foreach ( $this->items as $blog ) {
-			$blog = $blog->to_array();
+			$blog  = $blog->to_array();
 			$class = '';
 			reset( $this->status_list );
 
@@ -502,19 +519,23 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 
 		// Preordered.
 		$actions = array(
-			'edit' => '', 'backend' => '',
-			'activate' => '', 'deactivate' => '',
-			'archive' => '', 'unarchive' => '',
-			'spam' => '', 'unspam' => '',
-			'delete' => '',
-			'visit' => '',
+			'edit'       => '',
+			'backend'    => '',
+			'activate'   => '',
+			'deactivate' => '',
+			'archive'    => '',
+			'unarchive'  => '',
+			'spam'       => '',
+			'unspam'     => '',
+			'delete'     => '',
+			'visit'      => '',
 		);
 
-		$actions['edit']	= '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
-		$actions['backend']	= "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
+		$actions['edit']    = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
+		$actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
 		if ( get_network()->site_id != $blog['blog_id'] ) {
 			if ( $blog['deleted'] == '1' ) {
-				$actions['activate']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
+				$actions['activate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
 			} else {
 				$actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
 			}
@@ -522,13 +543,13 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			if ( $blog['archived'] == '1' ) {
 				$actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
 			} else {
-				$actions['archive']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
+				$actions['archive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
 			}
 
 			if ( $blog['spam'] == '1' ) {
 				$actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
 			} else {
-				$actions['spam']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
+				$actions['spam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
 			}
 
 			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
@@ -536,7 +557,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			}
 		}
 
-		$actions['visit']	= "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='bookmark'>" . __( 'Visit' ) . '</a>';
+		$actions['visit'] = "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='bookmark'>" . __( 'Visit' ) . '</a>';
 
 		/**
 		 * Filters the action links displayed for each site in the Sites list table.
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 c90d6d5d69..ea6969f51c 100644
--- a/wp-admin/includes/class-wp-ms-themes-list-table.php
+++ b/wp-admin/includes/class-wp-ms-themes-list-table.php
@@ -37,25 +37,28 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	public function __construct( $args = array() ) {
 		global $status, $page;
 
-		parent::__construct( array(
-			'plural' => 'themes',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural' => 'themes',
+				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 
 		$status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
-		if ( !in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) )
+		if ( ! in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) {
 			$status = 'all';
+		}
 
 		$page = $this->get_pagenum();
 
 		$this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
 
-		if ( $this->is_site_themes )
+		if ( $this->is_site_themes ) {
 			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		}
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_table_classes() {
@@ -64,18 +67,17 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_themes )
+		if ( $this->is_site_themes ) {
 			return current_user_can( 'manage_sites' );
-		else
+		} else {
 			return current_user_can( 'manage_network_themes' );
+		}
 	}
 
 	/**
-	 *
 	 * @global string $status
 	 * @global array $totals
 	 * @global int $page
@@ -97,20 +99,20 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			 *
 			 * @param array $all An array of WP_Theme objects to display in the list table.
 			 */
-			'all' => apply_filters( 'all_themes', wp_get_themes() ),
-			'search' => array(),
-			'enabled' => array(),
+			'all'      => apply_filters( 'all_themes', wp_get_themes() ),
+			'search'   => array(),
+			'enabled'  => array(),
 			'disabled' => array(),
-			'upgrade' => array(),
-			'broken' => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
+			'upgrade'  => array(),
+			'broken'   => $this->is_site_themes ? array() : wp_get_themes( array( 'errors' => true ) ),
 		);
 
 		if ( $this->is_site_themes ) {
 			$themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
-			$allowed_where = 'site';
+			$allowed_where   = 'site';
 		} else {
 			$themes_per_page = $this->get_items_per_page( 'themes_network_per_page' );
-			$allowed_where = 'network';
+			$allowed_where   = 'network';
 		}
 
 		$maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
@@ -123,24 +125,26 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 
 			if ( $maybe_update && isset( $current->response[ $key ] ) ) {
 				$themes['all'][ $key ]->update = true;
-				$themes['upgrade'][ $key ] = $themes['all'][ $key ];
+				$themes['upgrade'][ $key ]     = $themes['all'][ $key ];
 			}
 
-			$filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
+			$filter                    = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
 			$themes[ $filter ][ $key ] = $themes['all'][ $key ];
 		}
 
 		if ( $s ) {
-			$status = 'search';
+			$status           = 'search';
 			$themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
 		}
 
 		$totals = array();
-		foreach ( $themes as $type => $list )
+		foreach ( $themes as $type => $list ) {
 			$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $themes[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if ( empty( $themes[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) {
 			$status = 'all';
+		}
 
 		$this->items = $themes[ $status ];
 		WP_Theme::sort_by_name( $this->items );
@@ -148,14 +152,16 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		$this->has_items = ! empty( $themes['all'] );
 		$total_this_page = $totals[ $status ];
 
-		wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-			'themes' => $totals,
-			'totals' => wp_get_update_data(),
-		) );
+		wp_localize_script(
+			'updates', '_wpUpdatesItemCounts', array(
+				'themes' => $totals,
+				'totals' => wp_get_update_data(),
+			)
+		);
 
 		if ( $orderby ) {
 			$orderby = ucfirst( $orderby );
-			$order = strtoupper( $order );
+			$order   = strtoupper( $order );
 
 			if ( $orderby === 'Name' ) {
 				if ( 'ASC' === $order ) {
@@ -168,13 +174,16 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 
 		$start = ( $page - 1 ) * $themes_per_page;
 
-		if ( $total_this_page > $themes_per_page )
+		if ( $total_this_page > $themes_per_page ) {
 			$this->items = array_slice( $this->items, $start, $themes_per_page, true );
+		}
 
-		$this->set_pagination_args( array(
-			'total_items' => $total_this_page,
-			'per_page' => $themes_per_page,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $total_this_page,
+				'per_page'    => $themes_per_page,
+			)
+		);
 	}
 
 	/**
@@ -184,20 +193,24 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	 */
 	public function _search_callback( $theme ) {
 		static $term = null;
-		if ( is_null( $term ) )
+		if ( is_null( $term ) ) {
 			$term = wp_unslash( $_REQUEST['s'] );
+		}
 
 		foreach ( array( 'Name', 'Description', 'Author', 'Author', 'AuthorURI' ) as $field ) {
 			// Don't mark up; Do translate.
-			if ( false !== stripos( $theme->display( $field, false, true ), $term ) )
+			if ( false !== stripos( $theme->display( $field, false, true ), $term ) ) {
 				return true;
+			}
 		}
 
-		if ( false !== stripos( $theme->get_stylesheet(), $term ) )
+		if ( false !== stripos( $theme->get_stylesheet(), $term ) ) {
 			return true;
+		}
 
-		if ( false !== stripos( $theme->get_template(), $term ) )
+		if ( false !== stripos( $theme->get_template(), $term ) ) {
 			return true;
+		}
 
 		return false;
 	}
@@ -216,13 +229,15 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		$a = $theme_a[ $orderby ];
 		$b = $theme_b[ $orderby ];
 
-		if ( $a == $b )
+		if ( $a == $b ) {
 			return 0;
+		}
 
-		if ( 'DESC' === $order )
+		if ( 'DESC' === $order ) {
 			return ( $a < $b ) ? 1 : -1;
-		else
+		} else {
 			return ( $a < $b ) ? -1 : 1;
+		}
 	}
 
 	/**
@@ -236,7 +251,6 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
@@ -248,12 +262,11 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
 		return array(
-			'name'         => 'name',
+			'name' => 'name',
 		);
 	}
 
@@ -269,7 +282,6 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array $totals
 	 * @global string $status
 	 * @return array
@@ -279,8 +291,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+			if ( ! $count ) {
 				continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -295,19 +308,21 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 				case 'upgrade':
 					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
 					break;
-				case 'broken' :
+				case 'broken':
 					$text = _n( 'Broken <span class="count">(%s)</span>', 'Broken <span class="count">(%s)</span>', $count );
 					break;
 			}
 
-			if ( $this->is_site_themes )
+			if ( $this->is_site_themes ) {
 				$url = 'site-themes.php?id=' . $this->site_id;
-			else
+			} else {
 				$url = 'themes.php';
+			}
 
 			if ( 'search' != $type ) {
-				$status_links[$type] = sprintf( "<a href='%s'%s>%s</a>",
-					esc_url( add_query_arg('theme_status', $type, $url) ),
+				$status_links[ $type ] = sprintf(
+					"<a href='%s'%s>%s</a>",
+					esc_url( add_query_arg( 'theme_status', $type, $url ) ),
 					( $type === $status ) ? ' class="current" aria-current="page"' : '',
 					sprintf( $text, number_format_i18n( $count ) )
 				);
@@ -326,15 +341,19 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		global $status;
 
 		$actions = array();
-		if ( 'enabled' != $status )
+		if ( 'enabled' != $status ) {
 			$actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
-		if ( 'disabled' != $status )
+		}
+		if ( 'disabled' != $status ) {
 			$actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
+		}
 		if ( ! $this->is_site_themes ) {
-			if ( current_user_can( 'update_themes' ) )
+			if ( current_user_can( 'update_themes' ) ) {
 				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_themes' ) )
+			}
+			if ( current_user_can( 'delete_themes' ) ) {
 				$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 		return $actions;
 	}
@@ -342,8 +361,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	/**
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $theme )
+		foreach ( $this->items as $theme ) {
 			$this->single_row( $theme );
+		}
 	}
 
 	/**
@@ -354,10 +374,10 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 	 * @param WP_Theme $theme The current WP_Theme object.
 	 */
 	public function column_cb( $theme ) {
-		$checkbox_id = 'checkbox_' . md5( $theme->get('Name') );
+		$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
 		?>
-		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ) ?>" id="<?php echo $checkbox_id ?>" />
-		<label class="screen-reader-text" for="<?php echo $checkbox_id ?>" ><?php _e( 'Select' ) ?>  <?php echo $theme->display( 'Name' ) ?></label>
+		<input type="checkbox" name="checked[]" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" id="<?php echo $checkbox_id; ?>" />
+		<label class="screen-reader-text" for="<?php echo $checkbox_id; ?>" ><?php _e( 'Select' ); ?>  <?php echo $theme->display( 'Name' ); ?></label>
 		<?php
 	}
 
@@ -378,31 +398,33 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		$context = $status;
 
 		if ( $this->is_site_themes ) {
-			$url = "site-themes.php?id={$this->site_id}&amp;";
+			$url     = "site-themes.php?id={$this->site_id}&amp;";
 			$allowed = $theme->is_allowed( 'site', $this->site_id );
 		} else {
-			$url = 'themes.php?';
+			$url     = 'themes.php?';
 			$allowed = $theme->is_allowed( 'network' );
 		}
 
 		// Pre-order.
 		$actions = array(
-			'enable' => '',
+			'enable'  => '',
 			'disable' => '',
-			'delete' => ''
+			'delete'  => '',
 		);
 
 		$stylesheet = $theme->get_stylesheet();
-		$theme_key = urlencode( $stylesheet );
+		$theme_key  = urlencode( $stylesheet );
 
 		if ( ! $allowed ) {
 			if ( ! $theme->errors() ) {
-				$url = add_query_arg( array(
-					'action' => 'enable',
-					'theme'  => $theme_key,
-					'paged'  => $page,
-					's'      => $s,
-				), $url );
+				$url = add_query_arg(
+					array(
+						'action' => 'enable',
+						'theme'  => $theme_key,
+						'paged'  => $page,
+						's'      => $s,
+					), $url
+				);
 
 				if ( $this->is_site_themes ) {
 					/* translators: %s: theme name */
@@ -412,19 +434,22 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 					$aria_label = sprintf( __( 'Network Enable %s' ), $theme->display( 'Name' ) );
 				}
 
-				$actions['enable'] = sprintf( '<a href="%s" class="edit" aria-label="%s">%s</a>',
+				$actions['enable'] = sprintf(
+					'<a href="%s" class="edit" aria-label="%s">%s</a>',
 					esc_url( wp_nonce_url( $url, 'enable-theme_' . $stylesheet ) ),
 					esc_attr( $aria_label ),
 					( $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' ) )
 				);
 			}
 		} else {
-			$url = add_query_arg( array(
-				'action' => 'disable',
-				'theme'  => $theme_key,
-				'paged'  => $page,
-				's'      => $s,
-			), $url );
+			$url = add_query_arg(
+				array(
+					'action' => 'disable',
+					'theme'  => $theme_key,
+					'paged'  => $page,
+					's'      => $s,
+				), $url
+			);
 
 			if ( $this->is_site_themes ) {
 				/* translators: %s: theme name */
@@ -434,7 +459,8 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 				$aria_label = sprintf( __( 'Network Disable %s' ), $theme->display( 'Name' ) );
 			}
 
-			$actions['disable'] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+			$actions['disable'] = sprintf(
+				'<a href="%s" aria-label="%s">%s</a>',
 				esc_url( wp_nonce_url( $url, 'disable-theme_' . $stylesheet ) ),
 				esc_attr( $aria_label ),
 				( $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' ) )
@@ -442,18 +468,21 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		}
 
 		if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
-			$url = add_query_arg( array(
-				'action'       => 'delete-selected',
-				'checked[]'    => $theme_key,
-				'theme_status' => $context,
-				'paged'        => $page,
-				's'            => $s,
-			), 'themes.php' );
+			$url = add_query_arg(
+				array(
+					'action'       => 'delete-selected',
+					'checked[]'    => $theme_key,
+					'theme_status' => $context,
+					'paged'        => $page,
+					's'            => $s,
+				), 'themes.php'
+			);
 
 			/* translators: %s: theme name */
 			$aria_label = sprintf( _x( 'Delete %s', 'theme' ), $theme->display( 'Name' ) );
 
-			$actions['delete'] = sprintf( '<a href="%s" class="delete" aria-label="%s">%s</a>',
+			$actions['delete'] = sprintf(
+				'<a href="%s" class="delete" aria-label="%s">%s</a>',
 				esc_url( wp_nonce_url( $url, 'bulk-themes' ) ),
 				esc_attr( $aria_label ),
 				__( 'Delete' )
@@ -526,8 +555,9 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		}
 
 		$class = ! $allowed ? 'inactive' : 'active';
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) ) {
 			$class .= ' update';
+		}
 
 		echo "<div class='theme-description'><p>" . $theme->display( 'Description' ) . "</p></div>
 			<div class='$class second theme-version-author-uri'>";
@@ -535,16 +565,17 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 		$stylesheet = $theme->get_stylesheet();
 		$theme_meta = array();
 
-		if ( $theme->get('Version') ) {
-			$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display('Version') );
+		if ( $theme->get( 'Version' ) ) {
+			$theme_meta[] = sprintf( __( 'Version %s' ), $theme->display( 'Version' ) );
 		}
-		$theme_meta[] = sprintf( __( 'By %s' ), $theme->display('Author') );
+		$theme_meta[] = sprintf( __( 'By %s' ), $theme->display( 'Author' ) );
 
-		if ( $theme->get('ThemeURI') ) {
+		if ( $theme->get( 'ThemeURI' ) ) {
 			/* translators: %s: theme name */
 			$aria_label = sprintf( __( 'Visit %s homepage' ), $theme->display( 'Name' ) );
 
-			$theme_meta[] = sprintf( '<a href="%s" aria-label="%s">%s</a>',
+			$theme_meta[] = sprintf(
+				'<a href="%s" aria-label="%s">%s</a>',
 				$theme->display( 'ThemeURI' ),
 				esc_attr( $aria_label ),
 				__( 'Visit Theme Site' )
@@ -618,7 +649,6 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 					break;
 
 				case 'name':
-
 					$active_theme_label = '';
 
 					/* The presence of the site_id property means that this is a subsite view and a label for the active theme needs to be added */
@@ -632,7 +662,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 						}
 
 						/* In case this is a child theme, label it properly */
-						if ( $stylesheet !== $template && $item->get_stylesheet() === $stylesheet) {
+						if ( $stylesheet !== $template && $item->get_stylesheet() === $stylesheet ) {
 							$active_theme_label = ' &mdash; ' . __( 'Active Child Theme' );
 						}
 					}
@@ -641,7 +671,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 
 					$this->column_name( $item );
 
-					echo "</td>";
+					echo '</td>';
 					break;
 
 				case 'description':
@@ -657,7 +687,7 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 
 					$this->column_default( $item, $column_name );
 
-					echo "</td>";
+					echo '</td>';
 					break;
 			}
 		}
@@ -685,17 +715,19 @@ class WP_MS_Themes_List_Table extends WP_List_Table {
 			$class .= ' update';
 		}
 
-		printf( '<tr class="%s" data-slug="%s">',
+		printf(
+			'<tr class="%s" data-slug="%s">',
 			esc_attr( $class ),
 			esc_attr( $stylesheet )
 		);
 
 		$this->single_row_columns( $theme );
 
-		echo "</tr>";
+		echo '</tr>';
 
-		if ( $this->is_site_themes )
+		if ( $this->is_site_themes ) {
 			remove_action( "after_theme_row_$stylesheet", 'wp_theme_update_row' );
+		}
 
 		/**
 		 * Fires after each row in the Multisite themes list table.
diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php
index 42cea7eb6f..1c2eaf07e2 100644
--- a/wp-admin/includes/class-wp-ms-users-list-table.php
+++ b/wp-admin/includes/class-wp-ms-users-list-table.php
@@ -17,7 +17,6 @@
  */
 class WP_MS_Users_List_Table extends WP_List_Table {
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
@@ -25,7 +24,6 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $usersearch
 	 * @global string $role
 	 * @global wpdb   $wpdb
@@ -43,22 +41,22 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		$paged = $this->get_pagenum();
 
 		$args = array(
-			'number' => $users_per_page,
-			'offset' => ( $paged-1 ) * $users_per_page,
-			'search' => $usersearch,
+			'number'  => $users_per_page,
+			'offset'  => ( $paged - 1 ) * $users_per_page,
+			'search'  => $usersearch,
 			'blog_id' => 0,
-			'fields' => 'all_with_meta'
+			'fields'  => 'all_with_meta',
 		);
 
 		if ( wp_is_large_network( 'users' ) ) {
 			$args['search'] = ltrim( $args['search'], '*' );
-		} else if ( '' !== $args['search'] ) {
+		} elseif ( '' !== $args['search'] ) {
 			$args['search'] = trim( $args['search'], '*' );
 			$args['search'] = '*' . $args['search'] . '*';
 		}
 
 		if ( $role === 'super' ) {
-			$logins = implode( "', '", get_super_admins() );
+			$logins          = implode( "', '", get_super_admins() );
 			$args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
 		}
 
@@ -67,19 +65,23 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		 * show only the latest users with no paging in order to avoid
 		 * expensive count queries.
 		 */
-		if ( !$usersearch && wp_is_large_network( 'users' ) ) {
-			if ( !isset($_REQUEST['orderby']) )
+		if ( ! $usersearch && wp_is_large_network( 'users' ) ) {
+			if ( ! isset( $_REQUEST['orderby'] ) ) {
 				$_GET['orderby'] = $_REQUEST['orderby'] = 'id';
-			if ( !isset($_REQUEST['order']) )
+			}
+			if ( ! isset( $_REQUEST['order'] ) ) {
 				$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			}
 			$args['count_total'] = false;
 		}
 
-		if ( isset( $_REQUEST['orderby'] ) )
+		if ( isset( $_REQUEST['orderby'] ) ) {
 			$args['orderby'] = $_REQUEST['orderby'];
+		}
 
-		if ( isset( $_REQUEST['order'] ) )
+		if ( isset( $_REQUEST['order'] ) ) {
 			$args['order'] = $_REQUEST['order'];
+		}
 
 		if ( ! empty( $_REQUEST['mode'] ) ) {
 			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
@@ -96,21 +98,23 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 
 		$this->items = $wp_user_search->get_results();
 
-		$this->set_pagination_args( array(
-			'total_items' => $wp_user_search->get_total(),
-			'per_page' => $users_per_page,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $wp_user_search->get_total(),
+				'per_page'    => $users_per_page,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_users' ) )
+		if ( current_user_can( 'delete_users' ) ) {
 			$actions['delete'] = __( 'Delete' );
-		$actions['spam'] = _x( 'Mark as Spam', 'user' );
+		}
+		$actions['spam']    = _x( 'Mark as Spam', 'user' );
 		$actions['notspam'] = _x( 'Not Spam', 'user' );
 
 		return $actions;
@@ -123,22 +127,21 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $role
 	 * @return array
 	 */
 	protected function get_views() {
 		global $role;
 
-		$total_users = get_user_count();
+		$total_users  = get_user_count();
 		$super_admins = get_super_admins();
 		$total_admins = count( $super_admins );
 
 		$current_link_attributes = $role !== 'super' ? ' class="current" aria-current="page"' : '';
-		$role_links = array();
-		$role_links['all'] = "<a href='" . network_admin_url( 'users.php' ) . "'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
+		$role_links              = array();
+		$role_links['all']       = "<a href='" . network_admin_url( 'users.php' ) . "'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
 		$current_link_attributes = $role === 'super' ? ' class="current" aria-current="page"' : '';
-		$role_links['super'] = "<a href='" . network_admin_url( 'users.php?role=super' ) . "'$current_link_attributes>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
+		$role_links['super']     = "<a href='" . network_admin_url( 'users.php?role=super' ) . "'$current_link_attributes>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
 
 		return $role_links;
 	}
@@ -151,7 +154,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	protected function pagination( $which ) {
 		global $mode;
 
-		parent::pagination ( $which );
+		parent::pagination( $which );
 
 		if ( 'top' === $which ) {
 			$this->view_switcher( $mode );
@@ -159,7 +162,6 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
@@ -169,7 +171,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 			'name'       => __( 'Name' ),
 			'email'      => __( 'Email' ),
 			'registered' => _x( 'Registered', 'user' ),
-			'blogs'      => __( 'Sites' )
+			'blogs'      => __( 'Sites' ),
 		);
 		/**
 		 * Filters the columns displayed in the Network Admin Users list table.
@@ -183,7 +185,6 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
@@ -208,7 +209,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		}
 		?>
 		<label class="screen-reader-text" for="blog_<?php echo $user->ID; ?>"><?php echo sprintf( __( 'Select %s' ), $user->user_login ); ?></label>
-		<input type="checkbox" id="blog_<?php echo $user->ID ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ) ?>" />
+		<input type="checkbox" id="blog_<?php echo $user->ID; ?>" name="allusers[]" value="<?php echo esc_attr( $user->ID ); ?>" />
 		<?php
 	}
 
@@ -232,13 +233,13 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 	 */
 	public function column_username( $user ) {
 		$super_admins = get_super_admins();
-		$avatar	= get_avatar( $user->user_email, 32 );
+		$avatar       = get_avatar( $user->user_email, 32 );
 
 		echo $avatar;
 
 		if ( current_user_can( 'edit_user', $user->ID ) ) {
 			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
-			$edit = "<a href=\"{$edit_link}\">{$user->user_login}</a>";
+			$edit      = "<a href=\"{$edit_link}\">{$user->user_login}</a>";
 		} else {
 			$edit = $user->user_login;
 		}
@@ -338,12 +339,12 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 				continue;
 			}
 
-			$path	= ( $val->path === '/' ) ? '' : $val->path;
+			$path = ( $val->path === '/' ) ? '' : $val->path;
 			echo '<span class="site-' . $val->site_id . '" >';
-			echo '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . str_replace( '.' . get_network()->domain, '', $val->domain . $path ) . '</a>';
+			echo '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) . '">' . str_replace( '.' . get_network()->domain, '', $val->domain . $path ) . '</a>';
 			echo ' <small class="row-actions">';
-			$actions = array();
-			$actions['edit'] = '<a href="'. esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) .'">' . __( 'Edit' ) . '</a>';
+			$actions         = array();
+			$actions['edit'] = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) . '">' . __( 'Edit' ) . '</a>';
 
 			$class = '';
 			if ( $val->spam == 1 ) {
@@ -373,7 +374,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 			 */
 			$actions = apply_filters( 'ms_user_list_site_actions', $actions, $val->userblog_id );
 
-			$i=0;
+			$i            = 0;
 			$action_count = count( $actions );
 			foreach ( $actions as $action => $link ) {
 				++$i;
@@ -401,7 +402,10 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		foreach ( $this->items as $user ) {
 			$class = '';
 
-			$status_list = array( 'spam' => 'site-spammed', 'deleted' => 'site-deleted' );
+			$status_list = array(
+				'spam'    => 'site-spammed',
+				'deleted' => 'site-deleted',
+			);
 
 			foreach ( $status_list as $status => $col ) {
 				if ( $user->$status ) {
@@ -448,7 +452,7 @@ class WP_MS_Users_List_Table extends WP_List_Table {
 		$actions = array();
 
 		if ( current_user_can( 'edit_user', $user->ID ) ) {
-			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
+			$edit_link       = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user->ID ) ) );
 			$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
 		}
 
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 9bcf652f61..c755f96fbd 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -17,18 +17,17 @@
  */
 class WP_Plugin_Install_List_Table extends WP_List_Table {
 
-	public $order = 'ASC';
+	public $order   = 'ASC';
 	public $orderby = null;
-	public $groups = array();
+	public $groups  = array();
 
 	private $error;
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can('install_plugins');
+		return current_user_can( 'install_plugins' );
 	}
 
 	/**
@@ -79,7 +78,6 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array  $tabs
 	 * @global string $tab
 	 * @global int    $paged
@@ -138,21 +136,22 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
+		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) ) {
 			$tab = key( $tabs );
+		}
 
 		$installed_plugins = $this->get_installed_plugins();
 
 		$args = array(
-			'page' => $paged,
-			'per_page' => $per_page,
-			'fields' => array(
-				'last_updated' => true,
-				'icons' => true,
-				'active_installs' => true
+			'page'              => $paged,
+			'per_page'          => $per_page,
+			'fields'            => array(
+				'last_updated'    => true,
+				'icons'           => true,
+				'active_installs' => true,
 			),
 			// Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
-			'locale' => get_user_locale(),
+			'locale'            => get_user_locale(),
 			'installed_plugins' => array_keys( $installed_plugins ),
 		);
 
@@ -177,7 +176,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 			case 'featured':
 				$args['fields']['group'] = true;
-				$this->orderby = 'group';
+				$this->orderby           = 'group';
 				// No break!
 			case 'popular':
 			case 'new':
@@ -194,10 +193,11 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				} else {
 					$user = get_user_option( 'wporg_favorites' );
 				}
-				if ( $user )
+				if ( $user ) {
 					$args['user'] = $user;
-				else
+				} else {
 					$args = false;
+				}
 
 				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
 				break;
@@ -219,8 +219,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		 */
 		$args = apply_filters( "install_plugins_table_api_args_{$tab}", $args );
 
-		if ( !$args )
+		if ( ! $args ) {
 			return;
+		}
 
 		$api = plugins_api( 'query_plugins', $args );
 
@@ -235,10 +236,12 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			uasort( $this->items, array( $this, 'order_callback' ) );
 		}
 
-		$this->set_pagination_args( array(
-			'total_items' => $api->info['results'],
-			'per_page' => $args['per_page'],
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $api->info['results'],
+				'per_page'    => $args['per_page'],
+			)
+		);
 
 		if ( isset( $api->info['groups'] ) ) {
 			$this->groups = $api->info['groups'];
@@ -257,10 +260,12 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				$js_plugins['upgrade'] = array_values( $upgrade_plugins );
 			}
 
-			wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-				'plugins' => $js_plugins,
-				'totals'  => wp_get_update_data(),
-			) );
+			wp_localize_script(
+				'updates', '_wpUpdatesItemCounts', array(
+					'plugins' => $js_plugins,
+					'totals'  => wp_get_update_data(),
+				)
+			);
 		}
 	}
 
@@ -274,11 +279,10 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 		<?php } else { ?>
 			<div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
 		<?php
-		}
+}
 	}
 
 	/**
-	 *
 	 * @global array $tabs
 	 * @global string $tab
 	 *
@@ -289,9 +293,9 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 		$display_tabs = array();
 		foreach ( (array) $tabs as $action => $text ) {
-			$current_link_attributes = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
-			$href = self_admin_url('plugin-install.php?tab=' . $action);
-			$display_tabs['plugin-install-'.$action] = "<a href='$href'$current_link_attributes>$text</a>";
+			$current_link_attributes                     = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
+			$href                                        = self_admin_url( 'plugin-install.php?tab=' . $action );
+			$display_tabs[ 'plugin-install-' . $action ] = "<a href='$href'$current_link_attributes>$text</a>";
 		}
 		// No longer a real tab.
 		unset( $display_tabs['plugin-install-upload'] );
@@ -375,7 +379,8 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 					 *
 					 * @since 2.7.0
 					 */
-					do_action( 'install_plugins_table_header' ); ?>
+					do_action( 'install_plugins_table_header' );
+					?>
 				</div>
 				<?php $this->pagination( $which ); ?>
 				<br class="clear" />
@@ -386,7 +391,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				<br class="clear" />
 			</div>
 		<?php
-		}
+}
 	}
 
 	/**
@@ -430,16 +435,28 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 	public function display_rows() {
 		$plugins_allowedtags = array(
-			'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
-			'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
-			'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
-			'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
+			'a'       => array(
+				'href'   => array(),
+				'title'  => array(),
+				'target' => array(),
+			),
+			'abbr'    => array( 'title' => array() ),
+			'acronym' => array( 'title' => array() ),
+			'code'    => array(),
+			'pre'     => array(),
+			'em'      => array(),
+			'strong'  => array(),
+			'ul'      => array(),
+			'ol'      => array(),
+			'li'      => array(),
+			'p'       => array(),
+			'br'      => array(),
 		);
 
 		$plugins_group_titles = array(
 			'Performance' => _x( 'Performance', 'Plugin installer group title' ),
-			'Social'      => _x( 'Social',      'Plugin installer group title' ),
-			'Tools'       => _x( 'Tools',       'Plugin installer group title' ),
+			'Social'      => _x( 'Social', 'Plugin installer group title' ),
+			'Tools'       => _x( 'Tools', 'Plugin installer group title' ),
 		);
 
 		$group = null;
@@ -475,7 +492,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 
 			// Remove any HTML from the description.
 			$description = strip_tags( $plugin['short_description'] );
-			$version = wp_kses( $plugin['version'], $plugins_allowedtags );
+			$version     = wp_kses( $plugin['version'], $plugins_allowedtags );
 
 			$name = strip_tags( $title . ' ' . $version );
 
@@ -509,17 +526,19 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 						if ( is_plugin_active( $status['file'] ) ) {
 							$action_links[] = '<button type="button" class="button button-disabled" disabled="disabled">' . _x( 'Active', 'plugin' ) . '</button>';
 						} elseif ( current_user_can( 'activate_plugin', $status['file'] ) ) {
-							$button_text  = __( 'Activate' );
+							$button_text = __( 'Activate' );
 							/* translators: %s: Plugin name */
 							$button_label = _x( 'Activate %s', 'plugin' );
-							$activate_url = add_query_arg( array(
-								'_wpnonce'    => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
-								'action'      => 'activate',
-								'plugin'      => $status['file'],
-							), network_admin_url( 'plugins.php' ) );
+							$activate_url = add_query_arg(
+								array(
+									'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
+									'action'   => 'activate',
+									'plugin'   => $status['file'],
+								), network_admin_url( 'plugins.php' )
+							);
 
 							if ( is_network_admin() ) {
-								$button_text  = __( 'Network Activate' );
+								$button_text = __( 'Network Activate' );
 								/* translators: %s: Plugin name */
 								$button_label = _x( 'Network Activate %s', 'plugin' );
 								$activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
@@ -538,17 +557,19 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 				}
 			}
 
-			$details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-								'&amp;TB_iframe=true&amp;width=600&amp;height=550' );
+			$details_link = self_admin_url(
+				'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
+				'&amp;TB_iframe=true&amp;width=600&amp;height=550'
+			);
 
 			/* translators: 1: Plugin name and version. */
 			$action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
 
-			if ( !empty( $plugin['icons']['svg'] ) ) {
+			if ( ! empty( $plugin['icons']['svg'] ) ) {
 				$plugin_icon_url = $plugin['icons']['svg'];
-			} elseif ( !empty( $plugin['icons']['2x'] ) ) {
+			} elseif ( ! empty( $plugin['icons']['2x'] ) ) {
 				$plugin_icon_url = $plugin['icons']['2x'];
-			} elseif ( !empty( $plugin['icons']['1x'] ) ) {
+			} elseif ( ! empty( $plugin['icons']['1x'] ) ) {
 				$plugin_icon_url = $plugin['icons']['1x'];
 			} else {
 				$plugin_icon_url = $plugin['icons']['default'];
@@ -572,15 +593,15 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 					<h3>
 						<a href="<?php echo esc_url( $details_link ); ?>" class="thickbox open-plugin-details-modal">
 						<?php echo $title; ?>
-						<img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
+						<img src="<?php echo esc_attr( $plugin_icon_url ); ?>" class="plugin-icon" alt="">
 						</a>
 					</h3>
 				</div>
 				<div class="action-links">
 					<?php
-						if ( $action_links ) {
-							echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
-						}
+					if ( $action_links ) {
+						echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
+					}
 					?>
 				</div>
 				<div class="desc column-description">
@@ -590,7 +611,15 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 			</div>
 			<div class="plugin-card-bottom">
 				<div class="vers column-rating">
-					<?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
+					<?php
+					wp_star_rating(
+						array(
+							'rating' => $plugin['rating'],
+							'type'   => 'percent',
+							'number' => $plugin['num_ratings'],
+						)
+					);
+?>
 					<span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
 				</div>
 				<div class="column-updated">
diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index cbd9eed838..4ae764547a 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -32,17 +32,21 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	public function __construct( $args = array() ) {
 		global $status, $page;
 
-		parent::__construct( array(
-			'plural' => 'plugins',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural' => 'plugins',
+				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
+		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) {
 			$status = $_REQUEST['plugin_status'];
+		}
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if ( isset( $_REQUEST['s'] ) ) {
+			$_SERVER['REQUEST_URI'] = add_query_arg( 's', wp_unslash( $_REQUEST['s'] ) );
+		}
 
 		$page = $this->get_pagenum();
 	}
@@ -58,11 +62,10 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can('activate_plugins');
+		return current_user_can( 'activate_plugins' );
 	}
 
 	/**
-	 *
 	 * @global string $status
 	 * @global array  $plugins
 	 * @global array  $totals
@@ -122,15 +125,16 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
+			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) {
 				$plugins['dropins'] = get_dropins();
+			}
 
 			if ( current_user_can( 'update_plugins' ) ) {
 				$current = get_site_transient( 'update_plugins' );
 				foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
 					if ( isset( $current->response[ $plugin_file ] ) ) {
 						$plugins['all'][ $plugin_file ]['update'] = true;
-						$plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+						$plugins['upgrade'][ $plugin_file ]       = $plugins['all'][ $plugin_file ];
 					}
 				}
 			}
@@ -164,7 +168,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		foreach ( $recently_activated as $key => $time ) {
 			if ( $time + WEEK_IN_SECONDS < time() ) {
-				unset( $recently_activated[$key] );
+				unset( $recently_activated[ $key ] );
 			}
 		}
 
@@ -184,7 +188,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
 				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
 					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
 				}
-
 			} elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
 				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
@@ -226,21 +229,23 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		}
 
 		if ( strlen( $s ) ) {
-			$status = 'search';
+			$status            = 'search';
 			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
+		foreach ( $plugins as $type => $list ) {
 			$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if ( empty( $plugins[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) {
 			$status = 'all';
+		}
 
 		$this->items = array();
 		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
 			// Translate, Don't Apply Markup, Sanitize HTML
-			$this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
+			$this->items[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
 		}
 
 		$total_this_page = $totals[ $status ];
@@ -250,10 +255,12 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			$js_plugins[ $key ] = array_keys( (array) $list );
 		}
 
-		wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-			'plugins' => $js_plugins,
-			'totals'  => wp_get_update_data(),
-		) );
+		wp_localize_script(
+			'updates', '_wpUpdatesItemCounts', array(
+				'plugins' => $js_plugins,
+				'totals'  => wp_get_update_data(),
+			)
+		);
 
 		if ( ! $orderby ) {
 			$orderby = 'Name';
@@ -269,13 +276,16 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		$start = ( $page - 1 ) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
+		if ( $total_this_page > $plugins_per_page ) {
 			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		}
 
-		$this->set_pagination_args( array(
-			'total_items' => $total_this_page,
-			'per_page' => $plugins_per_page,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $total_this_page,
+				'per_page'    => $plugins_per_page,
+			)
+		);
 	}
 
 	/**
@@ -306,11 +316,12 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	public function _order_callback( $plugin_a, $plugin_b ) {
 		global $orderby, $order;
 
-		$a = $plugin_a[$orderby];
-		$b = $plugin_b[$orderby];
+		$a = $plugin_a[ $orderby ];
+		$b = $plugin_b[ $orderby ];
 
-		if ( $a == $b )
+		if ( $a == $b ) {
 			return 0;
+		}
 
 		if ( 'DESC' === $order ) {
 			return strcasecmp( $b, $a );
@@ -320,7 +331,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array $plugins
 	 */
 	public function no_items() {
@@ -335,10 +345,11 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
+		} elseif ( ! empty( $plugins['all'] ) ) {
 			_e( 'No plugins found.' );
-		else
+		} else {
 			_e( 'You do not appear to have any plugins available at this time.' );
+		}
 	}
 
 	/**
@@ -372,7 +383,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $status
 	 * @return array
 	 */
@@ -380,7 +390,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		global $status;
 
 		return array(
-			'cb'          => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
+			'cb'          => ! in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
 			'name'        => __( 'Plugin' ),
 			'description' => __( 'Description' ),
 		);
@@ -394,7 +404,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array $totals
 	 * @global string $status
 	 * @return array
@@ -404,8 +413,9 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+			if ( ! $count ) {
 				continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -432,11 +442,12 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			}
 
 			if ( 'search' !== $type ) {
-				$status_links[$type] = sprintf( "<a href='%s'%s>%s</a>",
-					add_query_arg('plugin_status', $type, 'plugins.php'),
+				$status_links[ $type ] = sprintf(
+					"<a href='%s'%s>%s</a>",
+					add_query_arg( 'plugin_status', $type, 'plugins.php' ),
 					( $type === $status ) ? ' class="current" aria-current="page"' : '',
 					sprintf( $text, number_format_i18n( $count ) )
-					);
+				);
 			}
 		}
 
@@ -444,7 +455,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global string $status
 	 * @return array
 	 */
@@ -453,17 +463,21 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		$actions = array();
 
-		if ( 'active' != $status )
+		if ( 'active' != $status ) {
 			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		}
 
-		if ( 'inactive' != $status && 'recent' != $status )
+		if ( 'inactive' != $status && 'recent' != $status ) {
 			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		}
 
-		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
+		if ( ! is_multisite() || $this->screen->in_admin( 'network' ) ) {
+			if ( current_user_can( 'update_plugins' ) ) {
 				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
+			}
+			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) {
 				$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -476,8 +490,9 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	public function bulk_actions( $which = '' ) {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
 			return;
+		}
 
 		parent::bulk_actions( $which );
 	}
@@ -489,8 +504,9 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	protected function extra_tablenav( $which ) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
+		if ( ! in_array( $status, array( 'recently_activated', 'mustuse', 'dropins' ) ) ) {
 			return;
+		}
 
 		echo '<div class="alignleft actions">';
 
@@ -498,12 +514,14 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			submit_button( __( 'Clear List' ), '', 'clear-recent-list', false );
 		} elseif ( 'top' === $which && 'mustuse' === $status ) {
 			/* translators: %s: mu-plugins directory name */
-			echo '<p>' . sprintf( __( 'Files in the %s directory are executed automatically.' ),
+			echo '<p>' . sprintf(
+				__( 'Files in the %s directory are executed automatically.' ),
 				'<code>' . str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) . '</code>'
 			) . '</p>';
 		} elseif ( 'top' === $which && 'dropins' === $status ) {
 			/* translators: %s: wp-content directory name */
-			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
+			echo '<p>' . sprintf(
+				__( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
 				'<code>' . str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '</code>'
 			) . '</p>';
 		}
@@ -514,24 +532,26 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
+		if ( isset( $_POST['clear-recent-list'] ) ) {
 			return 'clear-recent-list';
+		}
 
 		return parent::current_action();
 	}
 
 	/**
-	 *
 	 * @global string $status
 	 */
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
 			return;
+		}
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
+		foreach ( $this->items as $plugin_file => $plugin_data ) {
 			$this->single_row( array( $plugin_file, $plugin_data ) );
+		}
 	}
 
 	/**
@@ -546,52 +566,55 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		global $status, $page, $s, $totals;
 
 		list( $plugin_file, $plugin_data ) = $item;
-		$context = $status;
-		$screen = $this->screen;
+		$context                           = $status;
+		$screen                            = $this->screen;
 
 		// Pre-order.
 		$actions = array(
 			'deactivate' => '',
-			'activate' => '',
-			'details' => '',
-			'delete' => '',
+			'activate'   => '',
+			'details'    => '',
+			'delete'     => '',
 		);
 
 		// Do not restrict by default
 		$restrict_network_active = false;
-		$restrict_network_only = false;
+		$restrict_network_only   = false;
 
 		if ( 'mustuse' === $context ) {
 			$is_active = true;
 		} elseif ( 'dropins' === $context ) {
-			$dropins = _get_dropins();
+			$dropins     = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
+			if ( $plugin_file != $plugin_data['Name'] ) {
 				$plugin_name .= '<br/>' . $plugin_data['Name'];
+			}
 			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
-				$is_active = true;
+				$is_active   = true;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
 			} elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
-				$is_active = true;
+				$is_active   = true;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
 			} else {
-				$is_active = false;
+				$is_active   = false;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __( 'Inactive:' ) . '</span></strong> ' .
 					/* translators: 1: drop-in constant name, 2: wp-config.php */
-					sprintf( __( 'Requires %1$s in %2$s file.' ),
+					sprintf(
+						__( 'Requires %1$s in %2$s file.' ),
 						"<code>define('" . $dropins[ $plugin_file ][1] . "', true);</code>",
 						'<code>wp-config.php</code>'
 					) . '</p>';
 			}
-			if ( $plugin_data['Description'] )
+			if ( $plugin_data['Description'] ) {
 				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			}
 		} else {
 			if ( $screen->in_admin( 'network' ) ) {
 				$is_active = is_plugin_active_for_network( $plugin_file );
 			} else {
-				$is_active = is_plugin_active( $plugin_file );
+				$is_active               = is_plugin_active( $plugin_file );
 				$restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );
-				$restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
+				$restrict_network_only   = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
 			}
 
 			if ( $screen->in_admin( 'network' ) ) {
@@ -599,7 +622,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					if ( current_user_can( 'manage_network_plugins' ) ) {
 						/* translators: %s: plugin name */
 						$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( _x( 'Network Deactivate %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
-						}
+					}
 				} else {
 					if ( current_user_can( 'manage_network_plugins' ) ) {
 						/* translators: %s: plugin name */
@@ -635,9 +658,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . urlencode( $plugin_file ) . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( _x( 'Delete %s', 'plugin' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
 					}
 				} // end if $is_active
-
 			} // end if $screen->in_admin( 'network' )
-
 		} // end if $context
 
 		$actions = array_filter( $actions );
@@ -715,12 +736,12 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		}
 
-		$class = $is_active ? 'active' : 'inactive';
-		$checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
+		$class       = $is_active ? 'active' : 'inactive';
+		$checkbox_id = 'checkbox_' . md5( $plugin_data['Name'] );
 		if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
 			$checkbox = '';
 		} else {
-			$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
+			$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . '</label>'
 				. "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
 		}
 		if ( 'dropins' != $context ) {
@@ -728,11 +749,13 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
 			$class .= ' update';
+		}
 
 		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
-		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
+		printf(
+			'<tr class="%s" data-slug="%s" data-plugin="%s">',
 			esc_attr( $class ),
 			esc_attr( $plugin_slug ),
 			esc_attr( $plugin_file )
@@ -753,7 +776,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 				case 'name':
 					echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
 					echo $this->row_actions( $actions, true );
-					echo "</td>";
+					echo '</td>';
 					break;
 				case 'description':
 					$classes = 'column-description desc';
@@ -763,26 +786,34 @@ class WP_Plugins_List_Table extends WP_List_Table {
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
+					if ( ! empty( $plugin_data['Version'] ) ) {
 						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
-					if ( !empty( $plugin_data['Author'] ) ) {
+					}
+					if ( ! empty( $plugin_data['Author'] ) ) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
+						if ( ! empty( $plugin_data['AuthorURI'] ) ) {
 							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						}
 						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
 					}
 
 					// Details link using API info, if available
 					if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
-							esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
-								'&TB_iframe=true&width=600&height=550' ) ),
+						$plugin_meta[] = sprintf(
+							'<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+							esc_url(
+								network_admin_url(
+									'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
+									'&TB_iframe=true&width=600&height=550'
+								)
+							),
 							esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
 							esc_attr( $plugin_name ),
 							__( 'View details' )
 						);
 					} elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s">%s</a>',
+						$plugin_meta[] = sprintf(
+							'<a href="%s">%s</a>',
 							esc_url( $plugin_data['PluginURI'] ),
 							__( 'Visit plugin site' )
 						);
@@ -805,7 +836,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					$plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
 					echo implode( ' | ', $plugin_meta );
 
-					echo "</div></td>";
+					echo '</div></td>';
 					break;
 				default:
 					$classes = "$column_name column-$column_name $class";
@@ -823,11 +854,11 @@ class WP_Plugins_List_Table extends WP_List_Table {
 					 */
 					do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
 
-					echo "</td>";
+					echo '</td>';
 			}
 		}
 
-		echo "</tr>";
+		echo '</tr>';
 
 		/**
 		 * Fires after each row in the Plugins list table.
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 719d65537e..f49d039778 100644
--- a/wp-admin/includes/class-wp-post-comments-list-table.php
+++ b/wp-admin/includes/class-wp-post-comments-list-table.php
@@ -18,14 +18,13 @@
 class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_column_info() {
 		return array(
 			array(
-				'author'   => __( 'Author' ),
-				'comment'  => _x( 'Comment', 'column name' ),
+				'author'  => __( 'Author' ),
+				'comment' => _x( 'Comment', 'column name' ),
 			),
 			array(),
 			array(),
@@ -34,40 +33,42 @@ class WP_Post_Comments_List_Table extends WP_Comments_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		$classes = parent::get_table_classes();
+		$classes   = parent::get_table_classes();
 		$classes[] = 'wp-list-table';
 		$classes[] = 'comments-box';
 		return $classes;
 	}
 
 	/**
-	 *
 	 * @param bool $output_empty
 	 */
 	public function display( $output_empty = false ) {
 		$singular = $this->_args['singular'];
 
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		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 ( ! $output_empty ) {
+	<tbody id="the-comment-list"
+	<?php
+	if ( $singular ) {
+		echo " data-wp-lists='list:$singular'";
+	}
+		?>
+		>
+		<?php
+		if ( ! $output_empty ) {
 			$this->display_rows_or_placeholder();
-		} ?>
+		}
+		?>
 	</tbody>
 </table>
 <?php
 	}
 
 	/**
-	 *
 	 * @param bool $comment_status
 	 * @return int
 	 */
diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php
index a707d20ed1..f642efad1c 100644
--- a/wp-admin/includes/class-wp-posts-list-table.php
+++ b/wp-admin/includes/class-wp-posts-list-table.php
@@ -74,31 +74,41 @@ class WP_Posts_List_Table extends WP_List_Table {
 	public function __construct( $args = array() ) {
 		global $post_type_object, $wpdb;
 
-		parent::__construct( array(
-			'plural' => 'posts',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural' => 'posts',
+				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 
 		$post_type        = $this->screen->post_type;
 		$post_type_object = get_post_type_object( $post_type );
 
-		$exclude_states   = get_post_stati( array(
-			'show_in_admin_all_list' => false,
-		) );
-		$this->user_posts_count = intval( $wpdb->get_var( $wpdb->prepare( "
+		$exclude_states         = get_post_stati(
+			array(
+				'show_in_admin_all_list' => false,
+			)
+		);
+		$this->user_posts_count = intval(
+			$wpdb->get_var(
+				$wpdb->prepare(
+					"
 			SELECT COUNT( 1 )
 			FROM $wpdb->posts
 			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()
+				)
+			)
+		);
 
 		if ( $this->user_posts_count && ! current_user_can( $post_type_object->cap->edit_others_posts ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) ) {
 			$_GET['author'] = get_current_user_id();
 		}
 
 		if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
-			$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
+			$sticky_posts             = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
 			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
 		}
 	}
@@ -115,7 +125,6 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
@@ -123,7 +132,6 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array    $avail_post_stati
 	 * @global WP_Query $wp_query
 	 * @global int      $per_page
@@ -138,10 +146,10 @@ class WP_Posts_List_Table extends WP_List_Table {
 		$this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
 
 		$post_type = $this->screen->post_type;
-		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
+		$per_page  = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
 
 		/** This filter is documented in wp-admin/includes/post.php */
- 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
 
 		if ( $this->hierarchical_display ) {
 			$total_items = $wp_query->post_count;
@@ -150,7 +158,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 		} else {
 			$post_counts = (array) wp_count_posts( $post_type, 'readable' );
 
-			if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'] , $avail_post_stati ) ) {
+			if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'], $avail_post_stati ) ) {
 				$total_items = $post_counts[ $_REQUEST['post_status'] ];
 			} elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
 				$total_items = $this->sticky_posts_count;
@@ -175,14 +183,15 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
 
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,
-			'per_page' => $per_page
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $total_items,
+				'per_page'    => $per_page,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function has_items() {
@@ -192,10 +201,11 @@ class WP_Posts_List_Table extends WP_List_Table {
 	/**
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
 			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
-		else
+		} else {
 			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		}
 	}
 
 	/**
@@ -253,7 +263,6 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array $locked_post_status This seems to be deprecated.
 	 * @global array $avail_post_stati
 	 * @return array
@@ -263,17 +272,18 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
+		if ( ! empty( $locked_post_status ) ) {
 			return array();
+		}
 
 		$status_links = array();
-		$num_posts = wp_count_posts( $post_type, 'readable' );
-		$total_posts = array_sum( (array) $num_posts );
-		$class = '';
+		$num_posts    = wp_count_posts( $post_type, 'readable' );
+		$total_posts  = array_sum( (array) $num_posts );
+		$class        = '';
 
 		$current_user_id = get_current_user_id();
-		$all_args = array( 'post_type' => $post_type );
-		$mine = '';
+		$all_args        = array( 'post_type' => $post_type );
+		$mine            = '';
 
 		// Subtract post types that are not included in the admin all list.
 		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
@@ -287,7 +297,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 			$mine_args = array(
 				'post_type' => $post_type,
-				'author' => $current_user_id
+				'author'    => $current_user_id,
 			);
 
 			$mine_inner_html = sprintf(
@@ -303,7 +313,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 			$mine = $this->get_edit_link( $mine_args, $mine_inner_html, $class );
 
 			$all_args['all_posts'] = 1;
-			$class = '';
+			$class                 = '';
 		}
 
 		if ( empty( $class ) && ( $this->is_base_request() || isset( $_REQUEST['all_posts'] ) ) ) {
@@ -325,7 +335,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 			$status_links['mine'] = $mine;
 		}
 
-		foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
+		foreach ( get_post_stati( array( 'show_in_admin_status_list' => true ), 'objects' ) as $status ) {
 			$class = '';
 
 			$status_name = $status->name;
@@ -334,13 +344,13 @@ class WP_Posts_List_Table extends WP_List_Table {
 				continue;
 			}
 
-			if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
+			if ( isset( $_REQUEST['post_status'] ) && $status_name === $_REQUEST['post_status'] ) {
 				$class = 'current';
 			}
 
 			$status_args = array(
 				'post_status' => $status_name,
-				'post_type' => $post_type,
+				'post_type'   => $post_type,
 			);
 
 			$status_label = sprintf(
@@ -355,8 +365,8 @@ class WP_Posts_List_Table extends WP_List_Table {
 			$class = ! empty( $_REQUEST['show_sticky'] ) ? 'current' : '';
 
 			$sticky_args = array(
-				'post_type'	=> $post_type,
-				'show_sticky' => 1
+				'post_type'   => $post_type,
+				'show_sticky' => 1,
 			);
 
 			$sticky_inner_html = sprintf(
@@ -370,11 +380,11 @@ class WP_Posts_List_Table extends WP_List_Table {
 			);
 
 			$sticky_link = array(
-				'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+				'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class ),
 			);
 
 			// Sticky comes after Publish, or if not listed, after All.
-			$split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
+			$split        = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
 			$status_links = array_merge( array_slice( $status_links, 0, $split ), $sticky_link, array_slice( $status_links, $split ) );
 		}
 
@@ -382,11 +392,10 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_bulk_actions() {
-		$actions = array();
+		$actions       = array();
 		$post_type_obj = get_post_type_object( $this->screen->post_type );
 
 		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
@@ -435,11 +444,11 @@ class WP_Posts_List_Table extends WP_List_Table {
 		if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
 			$dropdown_options = array(
 				'show_option_all' => get_taxonomy( 'category' )->labels->all_items,
-				'hide_empty' => 0,
-				'hierarchical' => 1,
-				'show_count' => 0,
-				'orderby' => 'name',
-				'selected' => $cat
+				'hide_empty'      => 0,
+				'hierarchical'    => 1,
+				'show_count'      => 0,
+				'orderby'         => 'name',
+				'selected'        => $cat,
 			);
 
 			echo '<label class="screen-reader-text" for="cat">' . __( 'Filter by category' ) . '</label>';
@@ -454,40 +463,40 @@ class WP_Posts_List_Table extends WP_List_Table {
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' === $which && !is_singular() ) {
-			ob_start();
+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
@@ -503,18 +512,17 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
 			return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_table_classes() {
@@ -522,7 +530,6 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
@@ -557,19 +564,21 @@ class WP_Posts_List_Table extends WP_List_Table {
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
+			if ( 'category' === $taxonomy ) {
 				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
+			} elseif ( 'post_tag' === $taxonomy ) {
 				$column_key = 'tags';
-			else
+			} else {
 				$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
-		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
+		$post_status = ! empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
+		if ( post_type_supports( $post_type, 'comments' ) && ! in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
 			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		}
 
 		$posts_columns['date'] = __( 'Date' );
 
@@ -609,7 +618,6 @@ class WP_Posts_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
@@ -617,7 +625,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 			'title'    => 'title',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true )
+			'date'     => array( 'date', true ),
 		);
 	}
 
@@ -630,8 +638,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
+		if ( empty( $posts ) ) {
 			$posts = $wp_query->posts;
+		}
 
 		add_filter( 'the_title', 'esc_html' );
 
@@ -650,13 +659,15 @@ class WP_Posts_List_Table extends WP_List_Table {
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
+		foreach ( $posts as $a_post ) {
 			$post_ids[] = $a_post->ID;
+		}
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		foreach ( $posts as $post )
+		foreach ( $posts as $post ) {
 			$this->single_row( $post, $level );
+		}
 	}
 
 	/**
@@ -674,8 +685,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 		if ( ! $pages ) {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
-			if ( ! $pages )
+			if ( ! $pages ) {
 				return;
+			}
 		}
 
 		/*
@@ -688,7 +700,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 		if ( empty( $_REQUEST['s'] ) ) {
 
 			$top_level_pages = array();
-			$children_pages = array();
+			$children_pages  = array();
 
 			foreach ( $pages as $page ) {
 
@@ -699,43 +711,47 @@ class WP_Posts_List_Table extends WP_List_Table {
 					clean_post_cache( $page );
 				}
 
-				if ( 0 == $page->post_parent )
+				if ( 0 == $page->post_parent ) {
 					$top_level_pages[] = $page;
-				else
+				} else {
 					$children_pages[ $page->post_parent ][] = $page;
+				}
 			}
 
 			$pages = &$top_level_pages;
 		}
 
-		$count = 0;
-		$start = ( $pagenum - 1 ) * $per_page;
-		$end = $start + $per_page;
+		$count      = 0;
+		$start      = ( $pagenum - 1 ) * $per_page;
+		$end        = $start + $per_page;
 		$to_display = array();
 
 		foreach ( $pages as $page ) {
-			if ( $count >= $end )
+			if ( $count >= $end ) {
 				break;
+			}
 
 			if ( $count >= $start ) {
-				$to_display[$page->ID] = $level;
+				$to_display[ $page->ID ] = $level;
 			}
 
 			$count++;
 
-			if ( isset( $children_pages ) )
+			if ( isset( $children_pages ) ) {
 				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			}
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
-		if ( isset( $children_pages ) && $count < $end ){
-			foreach ( $children_pages as $orphans ){
+		if ( isset( $children_pages ) && $count < $end ) {
+			foreach ( $children_pages as $orphans ) {
 				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
+					if ( $count >= $end ) {
 						break;
+					}
 
 					if ( $count >= $start ) {
-						$to_display[$op->ID] = 0;
+						$to_display[ $op->ID ] = 0;
 					}
 
 					$count++;
@@ -772,20 +788,22 @@ class WP_Posts_List_Table extends WP_List_Table {
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
 	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
+		if ( ! isset( $children_pages[ $parent ] ) ) {
 			return;
+		}
 
 		$start = ( $pagenum - 1 ) * $per_page;
-		$end = $start + $per_page;
+		$end   = $start + $per_page;
 
-		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
+		foreach ( $children_pages[ $parent ] as $page ) {
+			if ( $count >= $end ) {
 				break;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $page->post_parent > 0 ) {
 				$my_parents = array();
-				$my_parent = $page->post_parent;
+				$my_parent  = $page->post_parent;
 				while ( $my_parent ) {
 					// Get the ID from the list or the attribute if my_parent is an object
 					$parent_id = $my_parent;
@@ -793,21 +811,22 @@ class WP_Posts_List_Table extends WP_List_Table {
 						$parent_id = $my_parent->ID;
 					}
 
-					$my_parent = get_post( $parent_id );
+					$my_parent    = get_post( $parent_id );
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
+					if ( ! $my_parent->post_parent ) {
 						break;
+					}
 					$my_parent = $my_parent->post_parent;
 				}
 				$num_parents = count( $my_parents );
 				while ( $my_parent = array_pop( $my_parents ) ) {
-					$to_display[$my_parent->ID] = $level - $num_parents;
+					$to_display[ $my_parent->ID ] = $level - $num_parents;
 					$num_parents--;
 				}
 			}
 
 			if ( $count >= $start ) {
-				$to_display[$page->ID] = $level;
+				$to_display[ $page->ID ] = $level;
 			}
 
 			$count++;
@@ -815,7 +834,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
 		}
 
-		unset( $children_pages[$parent] ); //required in order to keep track of orphans
+		unset( $children_pages[ $parent ] ); //required in order to keep track of orphans
 	}
 
 	/**
@@ -826,22 +845,28 @@ class WP_Posts_List_Table extends WP_List_Table {
 	 * @param WP_Post $post The current WP_Post object.
 	 */
 	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>
+		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">
 				<span class="locked-indicator-icon" aria-hidden="true"></span>
-				<span class="screen-reader-text"><?php
+				<span class="screen-reader-text">
+				<?php
 				printf(
 					/* translators: %s: post title */
 					__( '&#8220;%s&#8221; is locked' ),
 					_draft_or_post_title()
 				);
-				?></span>
+				?>
+				</span>
 			</div>
-		<?php endif;
+		<?php
+		endif;
 	}
 
 	/**
@@ -899,9 +924,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 			$lock_holder = wp_check_post_lock( $post->ID );
 
 			if ( $lock_holder ) {
-				$lock_holder = get_userdata( $lock_holder );
+				$lock_holder   = get_userdata( $lock_holder );
 				$locked_avatar = get_avatar( $lock_holder->ID, 18 );
-				$locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+				$locked_text   = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
 			} else {
 				$locked_avatar = $locked_text = '';
 			}
@@ -910,7 +935,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 		}
 
 		$pad = str_repeat( '&#8212; ', $this->current_level );
-		echo "<strong>";
+		echo '<strong>';
 
 		$format = get_post_format( $post->ID );
 		if ( $format ) {
@@ -920,7 +945,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 			$format_args = array(
 				'post_format' => $format,
-				'post_type' => $post->post_type
+				'post_type'   => $post->post_type,
 			);
 
 			echo $this->get_edit_link( $format_args, $label . ':', $format_class );
@@ -972,12 +997,12 @@ class WP_Posts_List_Table extends WP_List_Table {
 		global $mode;
 
 		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$t_time = $h_time = __( 'Unpublished' );
+			$t_time    = $h_time = __( 'Unpublished' );
 			$time_diff = 0;
 		} else {
 			$t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post );
+			$time   = get_post_time( 'G', true, $post );
 
 			$time_diff = time() - $time;
 
@@ -1050,7 +1075,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 		?>
 		<div class="post-com-count-wrapper">
 		<?php
-			$pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
+			$pending_comments = isset( $this->comment_pending_count[ $post->ID ] ) ? $this->comment_pending_count[ $post->ID ] : 0;
 
 			$this->comments_bubble( $post->ID, $pending_comments );
 		?>
@@ -1068,7 +1093,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 	public function column_author( $post ) {
 		$args = array(
 			'post_type' => $post->post_type,
-			'author' => get_the_author_meta( 'ID' )
+			'author'    => get_the_author_meta( 'ID' ),
 		);
 		echo $this->get_edit_link( $args, get_the_author() );
 	}
@@ -1093,7 +1118,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 		}
 		if ( $taxonomy ) {
 			$taxonomy_object = get_taxonomy( $taxonomy );
-			$terms = get_the_terms( $post->ID, $taxonomy );
+			$terms           = get_the_terms( $post->ID, $taxonomy );
 			if ( is_array( $terms ) ) {
 				$out = array();
 				foreach ( $terms as $t ) {
@@ -1105,7 +1130,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 						$posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
 					} else {
 						$posts_in_term_qv['taxonomy'] = $taxonomy;
-						$posts_in_term_qv['term'] = $t->slug;
+						$posts_in_term_qv['term']     = $t->slug;
 					}
 
 					$label = esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) );
@@ -1171,7 +1196,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 	public function single_row( $post, $level = 0 ) {
 		$global_post = get_post();
 
-		$post = get_post( $post );
+		$post                = get_post( $post );
 		$this->current_level = $level;
 
 		$GLOBALS['post'] = $post;
@@ -1185,10 +1210,10 @@ class WP_Posts_List_Table extends WP_List_Table {
 		}
 
 		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+			$count    = count( get_post_ancestors( $post->ID ) );
+			$classes .= ' level-' . $count;
 		} else {
-		    $classes .= ' level-0';
+			$classes .= ' level-0';
 		}
 	?>
 		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
@@ -1225,9 +1250,9 @@ class WP_Posts_List_Table extends WP_List_Table {
 		}
 
 		$post_type_object = get_post_type_object( $post->post_type );
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
-		$actions = array();
-		$title = _draft_or_post_title();
+		$can_edit_post    = current_user_can( 'edit_post', $post->ID );
+		$actions          = array();
+		$title            = _draft_or_post_title();
 
 		if ( $can_edit_post && 'trash' != $post->post_status ) {
 			$actions['edit'] = sprintf(
@@ -1277,7 +1302,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 		if ( is_post_type_viewable( $post_type_object ) ) {
 			if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
 				if ( $can_edit_post ) {
-					$preview_link = get_preview_post_link( $post );
+					$preview_link    = get_preview_post_link( $post );
 					$actions['view'] = sprintf(
 						'<a href="%s" rel="bookmark" aria-label="%s">%s</a>',
 						esc_url( $preview_link ),
@@ -1344,12 +1369,12 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 		$screen = $this->screen;
 
-		$post = get_default_post_to_edit( $screen->post_type );
+		$post             = get_default_post_to_edit( $screen->post_type );
 		$post_type_object = get_post_type_object( $screen->post_type );
 
-		$taxonomy_names = get_object_taxonomies( $screen->post_type );
+		$taxonomy_names          = get_object_taxonomies( $screen->post_type );
 		$hierarchical_taxonomies = array();
-		$flat_taxonomies = array();
+		$flat_taxonomies         = array();
 		foreach ( $taxonomy_names as $taxonomy_name ) {
 
 			$taxonomy = get_taxonomy( $taxonomy_name );
@@ -1369,31 +1394,44 @@ class WP_Posts_List_Table extends WP_List_Table {
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
+			if ( $taxonomy->hierarchical ) {
 				$hierarchical_taxonomies[] = $taxonomy;
-			else
+			} else {
 				$flat_taxonomies[] = $taxonomy;
+			}
 		}
 
-		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
-		$can_publish = current_user_can( $post_type_object->cap->publish_posts );
-		$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
+		$m            = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
+		$can_publish  = current_user_can( $post_type_object->cap->publish_posts );
+		$core_columns = array(
+			'cb'         => true,
+			'date'       => true,
+			'title'      => true,
+			'categories' => true,
+			'tags'       => true,
+			'comments'   => true,
+			'author'     => true,
+		);
 
 	?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<?php
-		$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
+		$hclass              = count( $hierarchical_taxonomies ) ? 'post' : 'page';
 		$inline_edit_classes = "inline-edit-row inline-edit-row-$hclass";
 		$bulk_edit_classes   = "bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}";
 		$quick_edit_classes  = "quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
 
 		$bulk = 0;
-		while ( $bulk < 2 ) { ?>
+		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">
+		<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>
@@ -1401,7 +1439,8 @@ class WP_Posts_List_Table extends WP_List_Table {
 	<?php
 
 	if ( post_type_supports( $screen->post_type, 'title' ) ) :
-		if ( $bulk ) : ?>
+		if ( $bulk ) :
+		?>
 			<div id="bulk-title-div">
 				<div id="bulk-titles"></div>
 			</div>
@@ -1418,63 +1457,69 @@ class WP_Posts_List_Table extends WP_List_Table {
 				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
 			</label>
 
-	<?php endif; // $bulk
-	endif; // post_type_supports title ?>
+	<?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 endif; // $bulk
+	<?php
+	endif; // $bulk
 
-		if ( post_type_supports( $screen->post_type, 'author' ) ) :
-			$authors_dropdown = '';
+if ( post_type_supports( $screen->post_type, 'author' ) ) :
+	$authors_dropdown = '';
 
-			if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
-				$users_opt = array(
-					'hide_if_only_one_author' => false,
-					'who' => 'authors',
-					'name' => 'post_author',
-					'class'=> 'authors',
-					'multi' => 1,
-					'echo' => 0,
-					'show' => 'display_name_with_login',
-				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+	if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
+		$users_opt = array(
+			'hide_if_only_one_author' => false,
+			'who'                     => 'authors',
+			'name'                    => 'post_author',
+			'class'                   => 'authors',
+			'multi'                   => 1,
+			'echo'                    => 0,
+			'show'                    => 'display_name_with_login',
+		);
+		if ( $bulk ) {
+			$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+		}
 
-				if ( $authors = wp_dropdown_users( $users_opt ) ) :
-					$authors_dropdown  = '<label class="inline-edit-author">';
-					$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
-					$authors_dropdown .= $authors;
-					$authors_dropdown .= '</label>';
-				endif;
-			endif; // authors
+		if ( $authors = wp_dropdown_users( $users_opt ) ) :
+			$authors_dropdown  = '<label class="inline-edit-author">';
+			$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+			$authors_dropdown .= $authors;
+			$authors_dropdown .= '</label>';
+		endif;
+	endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php
+	if ( ! $bulk ) {
+		echo $authors_dropdown;}
 	endif; // post_type_supports author
 
-	if ( !$bulk && $can_publish ) :
+if ( ! $bulk && $can_publish ) :
 	?>
 
-			<div class="inline-edit-group wp-clearfix">
-				<label class="alignleft">
-					<span class="title"><?php _e( 'Password' ); ?></span>
-					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
-				</label>
+		<div class="inline-edit-group wp-clearfix">
+			<label class="alignleft">
+				<span class="title"><?php _e( 'Password' ); ?></span>
+				<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
+			</label>
 
-				<em class="alignleft inline-edit-or">
-					<?php
-					/* translators: Between password field and private checkbox on post quick edit interface */
-					_e( '&ndash;OR&ndash;' );
-					?>
+			<em class="alignleft inline-edit-or">
+				<?php
+				/* translators: Between password field and private checkbox on post quick edit interface */
+				_e( '&ndash;OR&ndash;' );
+				?>
 				</em>
 				<label class="alignleft inline-edit-private">
-					<input type="checkbox" name="keep_private" value="private" />
-					<span class="checkbox-title"><?php _e( 'Private' ); ?></span>
+				<input type="checkbox" name="keep_private" value="private" />
+				<span class="checkbox-title"><?php _e( 'Private' ); ?></span>
 				</label>
 			</div>
 
@@ -1482,16 +1527,16 @@ class WP_Posts_List_Table extends WP_List_Table {
 
 		</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 ) : ?>
 
-			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
+			<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 ) ) ?>
+			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name ); ?>-checklist">
+				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>
 			</ul>
 
 	<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
@@ -1503,55 +1548,58 @@ class WP_Posts_List_Table extends WP_List_Table {
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-			echo $authors_dropdown;
+	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>
+		<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',
-		);
+	$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 );
-	?>
-			</label>
+	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>
+				<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
+		endif; // !$bulk
 		endif; // page-attributes
 	?>
 
@@ -1562,35 +1610,38 @@ class WP_Posts_List_Table extends WP_List_Table {
 <?php	if ( $bulk ) : ?>
 				<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
 <?php	endif; // $bulk ?>
-                <?php
+				<?php
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
-				$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
-                ?>
+				$default_title = apply_filters( 'default_page_template_title', __( 'Default Template' ), 'quick-edit' );
+				?>
 				<option value="default"><?php echo esc_html( $default_title ); ?></option>
-				<?php page_template_dropdown( '', $screen->post_type ) ?>
+				<?php page_template_dropdown( '', $screen->post_type ); ?>
 			</select>
 		</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 ) ) :
+		<?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>
+				<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 endforeach; //$flat_taxonomies as $taxonomy ?>
 
-	<?php endif; // count( $flat_taxonomies ) && !$bulk  ?>
+	<?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' ) ) : ?>
@@ -1630,8 +1681,10 @@ class WP_Posts_List_Table extends WP_List_Table {
 			<?php endif; ?>
 			</div>
 
-	<?php endif; // $bulk
-	endif; // post_type_supports comments or pings ?>
+	<?php
+	endif; // $bulk
+	endif; // post_type_supports comments or pings
+	?>
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="inline-edit-status alignleft">
@@ -1644,7 +1697,7 @@ class WP_Posts_List_Table extends WP_List_Table {
 						<option value="publish"><?php _e( 'Published' ); ?></option>
 						<option value="future"><?php _e( 'Scheduled' ); ?></option>
 	<?php if ( $bulk ) : ?>
-						<option value="private"><?php _e( 'Private' ) ?></option>
+						<option value="private"><?php _e( 'Private' ); ?></option>
 	<?php endif; // $bulk ?>
 					<?php endif; ?>
 						<option value="pending"><?php _e( 'Pending Review' ); ?></option>
@@ -1710,47 +1763,50 @@ class WP_Posts_List_Table extends WP_List_Table {
 	<?php
 		list( $columns ) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
-
-			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 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, '' );
-			}
-
+	foreach ( $columns as $column_name => $column_display_name ) {
+		if ( isset( $core_columns[ $column_name ] ) ) {
+			continue;
 		}
+
+		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 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 if ( ! $bulk ) {
+			<?php
+			if ( ! $bulk ) {
 				wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
 				?>
 				<button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>
 				<span class="spinner"></span>
-			<?php } else {
+			<?php
+			} else {
 				submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false );
-			} ?>
+			}
+			?>
 			<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
 			<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
 			<?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>
diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php
index 0146b56cbf..0277970e0b 100644
--- a/wp-admin/includes/class-wp-screen.php
+++ b/wp-admin/includes/class-wp-screen.php
@@ -108,6 +108,7 @@ final class WP_Screen {
 	/**
 	 * The taxonomy associated with the screen, if any.
 	 * The 'edit-tags.php?taxonomy=category' screen has a taxonomy of 'category'.
+	 *
 	 * @since 3.3.0
 	 * @var string
 	 */
@@ -129,7 +130,7 @@ final class WP_Screen {
 	 */
 	private $_help_sidebar = '';
 
- 	/**
+	/**
 	 * The accessible hidden headings and text associated with the screen, if any.
 	 *
 	 * @since 4.4.0
@@ -191,7 +192,7 @@ final class WP_Screen {
 	 * @global string $hook_suffix
 	 *
 	 * @param string|WP_Screen $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen.
-	 * 	                                  Defaults to the current $hook_suffix global.
+	 *                                    Defaults to the current $hook_suffix global.
 	 * @return WP_Screen Screen object.
 	 */
 	public static function get( $hook_name = '' ) {
@@ -200,34 +201,36 @@ final class WP_Screen {
 		}
 
 		$post_type = $taxonomy = null;
-		$in_admin = false;
-		$action = '';
+		$in_admin  = false;
+		$action    = '';
 
-		if ( $hook_name )
+		if ( $hook_name ) {
 			$id = $hook_name;
-		else
+		} else {
 			$id = $GLOBALS['hook_suffix'];
+		}
 
 		// For those pesky meta boxes.
 		if ( $hook_name && post_type_exists( $hook_name ) ) {
 			$post_type = $id;
-			$id = 'post'; // changes later. ends up being $base.
+			$id        = 'post'; // changes later. ends up being $base.
 		} else {
-			if ( '.php' == substr( $id, -4 ) )
+			if ( '.php' == substr( $id, -4 ) ) {
 				$id = substr( $id, 0, -4 );
+			}
 
 			if ( 'post-new' == $id || 'link-add' == $id || 'media-new' == $id || 'user-new' == $id ) {
-				$id = substr( $id, 0, -4 );
+				$id     = substr( $id, 0, -4 );
 				$action = 'add';
 			}
 		}
 
 		if ( ! $post_type && $hook_name ) {
 			if ( '-network' == substr( $id, -8 ) ) {
-				$id = substr( $id, 0, -8 );
+				$id       = substr( $id, 0, -8 );
 				$in_admin = 'network';
 			} elseif ( '-user' == substr( $id, -5 ) ) {
-				$id = substr( $id, 0, -5 );
+				$id       = substr( $id, 0, -5 );
 				$in_admin = 'user';
 			}
 
@@ -235,58 +238,66 @@ final class WP_Screen {
 			if ( 'edit-comments' != $id && 'edit-tags' != $id && 'edit-' == substr( $id, 0, 5 ) ) {
 				$maybe = substr( $id, 5 );
 				if ( taxonomy_exists( $maybe ) ) {
-					$id = 'edit-tags';
+					$id       = 'edit-tags';
 					$taxonomy = $maybe;
 				} elseif ( post_type_exists( $maybe ) ) {
-					$id = 'edit';
+					$id        = 'edit';
 					$post_type = $maybe;
 				}
 			}
 
-			if ( ! $in_admin )
+			if ( ! $in_admin ) {
 				$in_admin = 'site';
+			}
 		} else {
-			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN )
+			if ( defined( 'WP_NETWORK_ADMIN' ) && WP_NETWORK_ADMIN ) {
 				$in_admin = 'network';
-			elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN )
+			} elseif ( defined( 'WP_USER_ADMIN' ) && WP_USER_ADMIN ) {
 				$in_admin = 'user';
-			else
+			} else {
 				$in_admin = 'site';
+			}
 		}
 
-		if ( 'index' == $id )
+		if ( 'index' == $id ) {
 			$id = 'dashboard';
-		elseif ( 'front' == $id )
+		} elseif ( 'front' == $id ) {
 			$in_admin = false;
+		}
 
 		$base = $id;
 
 		// If this is the current screen, see if we can be more accurate for post types and taxonomies.
 		if ( ! $hook_name ) {
-			if ( isset( $_REQUEST['post_type'] ) )
+			if ( isset( $_REQUEST['post_type'] ) ) {
 				$post_type = post_type_exists( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : false;
-			if ( isset( $_REQUEST['taxonomy'] ) )
+			}
+			if ( isset( $_REQUEST['taxonomy'] ) ) {
 				$taxonomy = taxonomy_exists( $_REQUEST['taxonomy'] ) ? $_REQUEST['taxonomy'] : false;
+			}
 
 			switch ( $base ) {
-				case 'post' :
-					if ( isset( $_GET['post'] ) )
+				case 'post':
+					if ( isset( $_GET['post'] ) ) {
 						$post_id = (int) $_GET['post'];
-					elseif ( isset( $_POST['post_ID'] ) )
+					} elseif ( isset( $_POST['post_ID'] ) ) {
 						$post_id = (int) $_POST['post_ID'];
-					else
+					} else {
 						$post_id = 0;
+					}
 
 					if ( $post_id ) {
 						$post = get_post( $post_id );
-						if ( $post )
+						if ( $post ) {
 							$post_type = $post->post_type;
+						}
 					}
 					break;
-				case 'edit-tags' :
-				case 'term' :
-					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) )
+				case 'edit-tags':
+				case 'term':
+					if ( null === $post_type && is_object_in_taxonomy( 'post', $taxonomy ? $taxonomy : 'post_tag' ) ) {
 						$post_type = 'post';
+					}
 					break;
 				case 'upload':
 					$post_type = 'attachment';
@@ -295,25 +306,29 @@ final class WP_Screen {
 		}
 
 		switch ( $base ) {
-			case 'post' :
-				if ( null === $post_type )
+			case 'post':
+				if ( null === $post_type ) {
 					$post_type = 'post';
+				}
 				$id = $post_type;
 				break;
-			case 'edit' :
-				if ( null === $post_type )
+			case 'edit':
+				if ( null === $post_type ) {
 					$post_type = 'post';
+				}
 				$id .= '-' . $post_type;
 				break;
-			case 'edit-tags' :
-			case 'term' :
-				if ( null === $taxonomy )
+			case 'edit-tags':
+			case 'term':
+				if ( null === $taxonomy ) {
 					$taxonomy = 'post_tag';
+				}
 				// The edit-tags ID does not contain the post type. Look for it in the request.
 				if ( null === $post_type ) {
 					$post_type = 'post';
-					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+					if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
 						$post_type = $_REQUEST['post_type'];
+					}
 				}
 
 				$id = 'edit-' . $taxonomy;
@@ -330,11 +345,12 @@ final class WP_Screen {
 
 		if ( isset( self::$_registry[ $id ] ) ) {
 			$screen = self::$_registry[ $id ];
-			if ( $screen === get_current_screen() )
+			if ( $screen === get_current_screen() ) {
 				return $screen;
+			}
 		} else {
-			$screen = new WP_Screen();
-			$screen->id     = $id;
+			$screen     = new WP_Screen();
+			$screen->id = $id;
 		}
 
 		$screen->base       = $base;
@@ -363,8 +379,8 @@ final class WP_Screen {
 	public function set_current_screen() {
 		global $current_screen, $taxnow, $typenow;
 		$current_screen = $this;
-		$taxnow = $this->taxonomy;
-		$typenow = $this->post_type;
+		$taxnow         = $this->taxonomy;
+		$typenow        = $this->post_type;
 
 		/**
 		 * Fires after the current screen has been set.
@@ -393,8 +409,9 @@ final class WP_Screen {
 	 * @return bool True if the screen is in the indicated admin, false otherwise.
 	 */
 	public function in_admin( $admin = null ) {
-		if ( empty( $admin ) )
+		if ( empty( $admin ) ) {
 			return (bool) $this->in_admin;
+		}
 
 		return ( $admin == $this->in_admin );
 	}
@@ -422,9 +439,9 @@ final class WP_Screen {
 	 * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
 	 */
 	public function set_parentage( $parent_file ) {
-		$this->parent_file = $parent_file;
+		$this->parent_file         = $parent_file;
 		list( $this->parent_base ) = explode( '?', $parent_file );
-		$this->parent_base = str_replace( '.php', '', $this->parent_base );
+		$this->parent_base         = str_replace( '.php', '', $this->parent_base );
 	}
 
 	/**
@@ -482,11 +499,13 @@ final class WP_Screen {
 	 * @return string The option value if set, null otherwise.
 	 */
 	public function get_option( $option, $key = false ) {
-		if ( ! isset( $this->_options[ $option ] ) )
+		if ( ! isset( $this->_options[ $option ] ) ) {
 			return null;
+		}
 		if ( $key ) {
-			if ( isset( $this->_options[ $option ][ $key ] ) )
+			if ( isset( $this->_options[ $option ][ $key ] ) ) {
 				return $this->_options[ $option ][ $key ];
+			}
 			return null;
 		}
 		return $this->_options[ $option ];
@@ -533,8 +552,9 @@ final class WP_Screen {
 	 * @return array Help tab arguments.
 	 */
 	public function get_help_tab( $id ) {
-		if ( ! isset( $this->_help_tabs[ $id ] ) )
+		if ( ! isset( $this->_help_tabs[ $id ] ) ) {
 			return null;
+		}
 		return $this->_help_tabs[ $id ];
 	}
 
@@ -563,13 +583,14 @@ final class WP_Screen {
 			'callback' => false,
 			'priority' => 10,
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args     = wp_parse_args( $args, $defaults );
 
 		$args['id'] = sanitize_html_class( $args['id'] );
 
 		// Ensure we have an ID and title.
-		if ( ! $args['id'] || ! $args['title'] )
+		if ( ! $args['id'] || ! $args['title'] ) {
 			return;
+		}
 
 		// Allows for overriding an existing tab with that ID.
 		$this->_help_tabs[ $args['id'] ] = $args;
@@ -635,7 +656,7 @@ final class WP_Screen {
 		return $this->columns;
 	}
 
- 	/**
+	/**
 	 * Get the accessible hidden headings and text used in the screen.
 	 *
 	 * @since 4.4.0
@@ -685,7 +706,7 @@ final class WP_Screen {
 			'heading_pagination' => __( 'Items list navigation' ),
 			'heading_list'       => __( 'Items list' ),
 		);
-		$content = wp_parse_args( $content, $defaults );
+		$content  = wp_parse_args( $content, $defaults );
 
 		$this->_screen_reader_content = $content;
 	}
@@ -734,7 +755,6 @@ final class WP_Screen {
 		 * @param string    $old_help  Help text that appears on the screen.
 		 * @param string    $screen_id Screen ID.
 		 * @param WP_Screen $this      Current WP_Screen instance.
-		 *
 		 */
 		$old_help = apply_filters( 'contextual_help', $old_help, $this->id, $this );
 
@@ -751,29 +771,33 @@ final class WP_Screen {
 			 * @param string $old_help_default Default contextual help text.
 			 */
 			$default_help = apply_filters( 'default_contextual_help', '' );
-			if ( $default_help )
+			if ( $default_help ) {
 				$old_help = '<p>' . $default_help . '</p>';
+			}
 		}
 
 		if ( $old_help ) {
-			$this->add_help_tab( array(
-				'id'      => 'old-contextual-help',
-				'title'   => __('Overview'),
-				'content' => $old_help,
-			) );
+			$this->add_help_tab(
+				array(
+					'id'      => 'old-contextual-help',
+					'title'   => __( 'Overview' ),
+					'content' => $old_help,
+				)
+			);
 		}
 
 		$help_sidebar = $this->get_help_sidebar();
 
 		$help_class = 'hidden';
-		if ( ! $help_sidebar )
+		if ( ! $help_sidebar ) {
 			$help_class .= ' no-sidebar';
+		}
 
 		// Time to render!
 		?>
 		<div id="screen-meta" class="metabox-prefs">
 
-			<div id="contextual-help-wrap" class="<?php echo esc_attr( $help_class ); ?>" tabindex="-1" aria-label="<?php esc_attr_e('Contextual Help Tab'); ?>">
+			<div id="contextual-help-wrap" class="<?php echo esc_attr( $help_class ); ?>" tabindex="-1" aria-label="<?php esc_attr_e( 'Contextual Help Tab' ); ?>">
 				<div id="contextual-help-back"></div>
 				<div id="contextual-help-columns">
 					<div class="contextual-help-tabs">
@@ -806,7 +830,7 @@ final class WP_Screen {
 					<div class="contextual-help-tabs-wrap">
 						<?php
 						$classes = 'help-tab-content active';
-						foreach ( $this->get_help_tabs() as $tab ):
+						foreach ( $this->get_help_tabs() as $tab ) :
 							$panel_id = "tab-panel-{$tab['id']}";
 							?>
 
@@ -816,8 +840,9 @@ final class WP_Screen {
 								echo $tab['content'];
 
 								// If it exists, fire tab callback.
-								if ( ! empty( $tab['callback'] ) )
+								if ( ! empty( $tab['callback'] ) ) {
 									call_user_func_array( $tab['callback'], array( $this, $tab ) );
+								}
 								?>
 							</div>
 						<?php
@@ -844,33 +869,39 @@ final class WP_Screen {
 		 */
 		$columns = apply_filters( 'screen_layout_columns', array(), $this->id, $this );
 
-		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) )
-			$this->add_option( 'layout_columns', array('max' => $columns[ $this->id ] ) );
+		if ( ! empty( $columns ) && isset( $columns[ $this->id ] ) ) {
+			$this->add_option( 'layout_columns', array( 'max' => $columns[ $this->id ] ) );
+		}
 
 		if ( $this->get_option( 'layout_columns' ) ) {
-			$this->columns = (int) get_user_option("screen_layout_$this->id");
+			$this->columns = (int) get_user_option( "screen_layout_$this->id" );
 
-			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) )
+			if ( ! $this->columns && $this->get_option( 'layout_columns', 'default' ) ) {
 				$this->columns = $this->get_option( 'layout_columns', 'default' );
+			}
 		}
-		$GLOBALS[ 'screen_layout_columns' ] = $this->columns; // Set the global for back-compat.
+		$GLOBALS['screen_layout_columns'] = $this->columns; // Set the global for back-compat.
 
 		// Add screen options
-		if ( $this->show_screen_options() )
+		if ( $this->show_screen_options() ) {
 			$this->render_screen_options();
+		}
 		?>
 		</div>
 		<?php
-		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() )
+		if ( ! $this->get_help_tabs() && ! $this->show_screen_options() ) {
 			return;
+		}
 		?>
 		<div id="screen-meta-links">
 		<?php if ( $this->get_help_tabs() ) : ?>
 			<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 endif;
-		if ( $this->show_screen_options() ) : ?>
+		<?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>
@@ -880,7 +911,6 @@ final class WP_Screen {
 	}
 
 	/**
-	 *
 	 * @global array $wp_meta_boxes
 	 *
 	 * @return bool
@@ -888,8 +918,9 @@ final class WP_Screen {
 	public function show_screen_options() {
 		global $wp_meta_boxes;
 
-		if ( is_bool( $this->_show_screen_options ) )
+		if ( is_bool( $this->_show_screen_options ) ) {
 			return $this->_show_screen_options;
+		}
 
 		$columns = get_column_headers( $this );
 
@@ -897,13 +928,13 @@ final class WP_Screen {
 
 		switch ( $this->base ) {
 			case 'widgets':
-				$nonce = wp_create_nonce( 'widgets-access' );
-				$this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on&_wpnonce=' . urlencode( $nonce ) . '">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off&_wpnonce=' . urlencode( $nonce ) . '">' . __('Disable accessibility mode') . "</a></p>\n";
+				$nonce                  = wp_create_nonce( 'widgets-access' );
+				$this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on&_wpnonce=' . urlencode( $nonce ) . '">' . __( 'Enable accessibility mode' ) . '</a><a id="access-off" href="widgets.php?widgets-access=off&_wpnonce=' . urlencode( $nonce ) . '">' . __( 'Disable accessibility mode' ) . "</a></p>\n";
 				break;
-			case 'post' :
-				$expand = '<fieldset class="editor-expand hidden"><legend>' . __( 'Additional settings' ) . '</legend><label for="editor-expand-toggle">';
-				$expand .= '<input type="checkbox" id="editor-expand-toggle"' . checked( get_user_setting( 'editor_expand', 'on' ), 'on', false ) . ' />';
-				$expand .= __( 'Enable full-height editor and distraction-free functionality.' ) . '</label></fieldset>';
+			case 'post':
+				$expand                 = '<fieldset class="editor-expand hidden"><legend>' . __( 'Additional settings' ) . '</legend><label for="editor-expand-toggle">';
+				$expand                .= '<input type="checkbox" id="editor-expand-toggle"' . checked( get_user_setting( 'editor_expand', 'on' ), 'on', false ) . ' />';
+				$expand                .= __( 'Enable full-height editor and distraction-free functionality.' ) . '</label></fieldset>';
 				$this->_screen_settings = $expand;
 				break;
 			default:
@@ -924,8 +955,9 @@ final class WP_Screen {
 		 */
 		$this->_screen_settings = apply_filters( 'screen_settings', $this->_screen_settings, $this );
 
-		if ( $this->_screen_settings || $this->_options )
+		if ( $this->_screen_settings || $this->_options ) {
 			$show_screen = true;
+		}
 
 		/**
 		 * Filters whether to show the Screen Options tab.
@@ -950,22 +982,24 @@ final class WP_Screen {
 	 * }
 	 */
 	public function render_screen_options( $options = array() ) {
-		$options = wp_parse_args( $options, array(
-			'wrap' => true,
-		) );
+		$options = wp_parse_args(
+			$options, array(
+				'wrap' => true,
+			)
+		);
 
 		$wrapper_start = $wrapper_end = $form_start = $form_end = '';
 
 		// Output optional wrapper.
 		if ( $options['wrap'] ) {
 			$wrapper_start = '<div id="screen-options-wrap" class="hidden" tabindex="-1" aria-label="' . esc_attr__( 'Screen Options Tab' ) . '">';
-			$wrapper_end = '</div>';
+			$wrapper_end   = '</div>';
 		}
 
 		// Don't output the form and nonce for the widgets accessibility mode links.
 		if ( 'widgets' !== $this->base ) {
 			$form_start = "\n<form id='adv-settings' method='post'>\n";
-			$form_end = "\n" . wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false, false ) . "\n</form>\n";
+			$form_end   = "\n" . wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false, false ) . "\n</form>\n";
 		}
 
 		echo $wrapper_start . $form_start;
@@ -1014,20 +1048,20 @@ final class WP_Screen {
 		<?php
 			meta_box_prefs( $this );
 
-			if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
-				if ( isset( $_GET['welcome'] ) ) {
-					$welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
-					update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
-				} else {
-					$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
-					if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
-						$welcome_checked = false;
-					}
+		if ( 'dashboard' === $this->id && has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) {
+			if ( isset( $_GET['welcome'] ) ) {
+				$welcome_checked = empty( $_GET['welcome'] ) ? 0 : 1;
+				update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
+			} else {
+				$welcome_checked = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
+				if ( 2 == $welcome_checked && wp_get_current_user()->user_email != get_option( 'admin_email' ) ) {
+					$welcome_checked = false;
 				}
-				echo '<label for="wp_welcome_panel-hide">';
-				echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
-				echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
 			}
+			echo '<label for="wp_welcome_panel-hide">';
+			echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
+			echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
+		}
 		?>
 		</fieldset>
 		<?php
@@ -1092,20 +1126,22 @@ final class WP_Screen {
 		}
 
 		$screen_layout_columns = $this->get_columns();
-		$num = $this->get_option( 'layout_columns', 'max' );
+		$num                   = $this->get_option( 'layout_columns', 'max' );
 
 		?>
 		<fieldset class='columns-prefs'>
-		<legend class="screen-layout"><?php _e( 'Layout' ); ?></legend><?php
-			for ( $i = 1; $i <= $num; ++$i ):
-				?>
-				<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 ) ); ?>
+		<legend class="screen-layout"><?php _e( 'Layout' ); ?></legend>
+												<?php
+												for ( $i = 1; $i <= $num; ++$i ) :
+													?>
+													<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 ) ); ?>
 				</label>
 				<?php
-			endfor; ?>
+			endfor;
+			?>
 		</fieldset>
 		<?php
 	}
@@ -1189,7 +1225,12 @@ final class WP_Screen {
 			return;
 		}
 
-		$view_mode_post_types = get_post_types( array( 'hierarchical' => false, 'show_ui' => true ) );
+		$view_mode_post_types = get_post_types(
+			array(
+				'hierarchical' => false,
+				'show_ui'      => true,
+			)
+		);
 
 		/**
 		 * Filters the post types that have different view mode options.
diff --git a/wp-admin/includes/class-wp-site-icon.php b/wp-admin/includes/class-wp-site-icon.php
index 518ebf4041..47c48572f3 100644
--- a/wp-admin/includes/class-wp-site-icon.php
+++ b/wp-admin/includes/class-wp-site-icon.php
@@ -20,7 +20,7 @@ class WP_Site_Icon {
 	 * @since 4.3.0
 	 * @var int
 	 */
-	public $min_size  = 512;
+	public $min_size = 512;
 
 	/**
 	 * The size to which to crop the image so that we can display it in the UI nicely.
@@ -96,7 +96,7 @@ class WP_Site_Icon {
 			'post_content'   => $url,
 			'post_mime_type' => $image_type,
 			'guid'           => $url,
-			'context'        => 'site-icon'
+			'context'        => 'site-icon',
 		);
 
 		return $object;
diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php
index cb2b1694a6..c3df053e35 100644
--- a/wp-admin/includes/class-wp-terms-list-table.php
+++ b/wp-admin/includes/class-wp-terms-list-table.php
@@ -38,32 +38,36 @@ class WP_Terms_List_Table extends WP_List_Table {
 	public function __construct( $args = array() ) {
 		global $post_type, $taxonomy, $action, $tax;
 
-		parent::__construct( array(
-			'plural' => 'tags',
-			'singular' => 'tag',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'plural'   => 'tags',
+				'singular' => 'tag',
+				'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 
 		$action    = $this->screen->action;
 		$post_type = $this->screen->post_type;
 		$taxonomy  = $this->screen->taxonomy;
 
-		if ( empty( $taxonomy ) )
+		if ( empty( $taxonomy ) ) {
 			$taxonomy = 'post_tag';
+		}
 
-		if ( ! taxonomy_exists( $taxonomy ) )
+		if ( ! taxonomy_exists( $taxonomy ) ) {
 			wp_die( __( 'Invalid taxonomy.' ) );
+		}
 
 		$tax = get_taxonomy( $taxonomy );
 
 		// @todo Still needed? Maybe just the show_ui part.
-		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) )
+		if ( empty( $post_type ) || ! in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) ) {
 			$post_type = 'post';
+		}
 
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
@@ -105,30 +109,33 @@ class WP_Terms_List_Table extends WP_List_Table {
 			$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page );
 		}
 
-		$search = !empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
+		$search = ! empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
 
 		$args = array(
 			'search' => $search,
-			'page' => $this->get_pagenum(),
+			'page'   => $this->get_pagenum(),
 			'number' => $tags_per_page,
 		);
 
-		if ( !empty( $_REQUEST['orderby'] ) )
+		if ( ! empty( $_REQUEST['orderby'] ) ) {
 			$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		}
 
-		if ( !empty( $_REQUEST['order'] ) )
+		if ( ! empty( $_REQUEST['order'] ) ) {
 			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		}
 
 		$this->callback_args = $args;
 
-		$this->set_pagination_args( array(
-			'total_items' => wp_count_terms( $this->screen->taxonomy, compact( 'search' ) ),
-			'per_page' => $tags_per_page,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => wp_count_terms( $this->screen->taxonomy, compact( 'search' ) ),
+				'per_page'    => $tags_per_page,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function has_items() {
@@ -143,7 +150,6 @@ class WP_Terms_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_bulk_actions() {
@@ -157,18 +163,17 @@ class WP_Terms_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
+		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) ) {
 			return 'bulk-delete';
+		}
 
 		return parent::current_action();
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
@@ -189,7 +194,6 @@ class WP_Terms_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	protected function get_sortable_columns() {
@@ -198,7 +202,7 @@ class WP_Terms_List_Table extends WP_List_Table {
 			'description' => 'description',
 			'slug'        => 'slug',
 			'posts'       => 'count',
-			'links'       => 'count'
+			'links'       => 'count',
 		);
 	}
 
@@ -207,12 +211,14 @@ class WP_Terms_List_Table extends WP_List_Table {
 	public function display_rows_or_placeholder() {
 		$taxonomy = $this->screen->taxonomy;
 
-		$args = wp_parse_args( $this->callback_args, array(
-			'page' => 1,
-			'number' => 20,
-			'search' => '',
-			'hide_empty' => 0
-		) );
+		$args = wp_parse_args(
+			$this->callback_args, array(
+				'page'       => 1,
+				'number'     => 20,
+				'search'     => '',
+				'hide_empty' => 0,
+			)
+		);
 
 		$page = $args['page'];
 
@@ -268,22 +274,25 @@ class WP_Terms_List_Table extends WP_List_Table {
 
 		foreach ( $terms as $key => $term ) {
 
-			if ( $count >= $end )
+			if ( $count >= $end ) {
 				break;
+			}
 
-			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) )
+			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) ) {
 				continue;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
 				$my_parents = $parent_ids = array();
-				$p = $term->parent;
+				$p          = $term->parent;
 				while ( $p ) {
-					$my_parent = get_term( $p, $taxonomy );
+					$my_parent    = get_term( $p, $taxonomy );
 					$my_parents[] = $my_parent;
-					$p = $my_parent->parent;
-					if ( in_array( $p, $parent_ids ) ) // Prevent parent loops.
+					$p            = $my_parent->parent;
+					if ( in_array( $p, $parent_ids ) ) { // Prevent parent loops.
 						break;
+					}
 					$parent_ids[] = $p;
 				}
 				unset( $parent_ids );
@@ -303,10 +312,11 @@ class WP_Terms_List_Table extends WP_List_Table {
 
 			++$count;
 
-			unset( $terms[$key] );
+			unset( $terms[ $key ] );
 
-			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
+			if ( isset( $children[ $term->term_id ] ) && empty( $_REQUEST['s'] ) ) {
 				$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			}
 		}
 	}
 
@@ -317,7 +327,7 @@ class WP_Terms_List_Table extends WP_List_Table {
 	 */
 	public function single_row( $tag, $level = 0 ) {
 		global $taxonomy;
- 		$tag = sanitize_term( $tag, $taxonomy );
+		$tag = sanitize_term( $tag, $taxonomy );
 
 		$this->level = $level;
 
@@ -418,8 +428,8 @@ class WP_Terms_List_Table extends WP_List_Table {
 		}
 
 		$taxonomy = $this->screen->taxonomy;
-		$tax = get_taxonomy( $taxonomy );
-		$uri = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+		$tax      = get_taxonomy( $taxonomy );
+		$uri      = wp_doing_ajax() ? wp_get_referer() : $_SERVER['REQUEST_URI'];
 
 		$edit_link = add_query_arg(
 			'wp_http_referer',
@@ -521,22 +531,28 @@ class WP_Terms_List_Table extends WP_List_Table {
 		$tax = get_taxonomy( $this->screen->taxonomy );
 
 		$ptype_object = get_post_type_object( $this->screen->post_type );
-		if ( ! $ptype_object->show_ui )
+		if ( ! $ptype_object->show_ui ) {
 			return $count;
+		}
 
 		if ( $tax->query_var ) {
 			$args = array( $tax->query_var => $tag->slug );
 		} else {
-			$args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
+			$args = array(
+				'taxonomy' => $tax->name,
+				'term'     => $tag->slug,
+			);
 		}
 
-		if ( 'post' != $this->screen->post_type )
+		if ( 'post' != $this->screen->post_type ) {
 			$args['post_type'] = $this->screen->post_type;
+		}
 
-		if ( 'attachment' === $this->screen->post_type )
-			return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		if ( 'attachment' === $this->screen->post_type ) {
+			return "<a href='" . esc_url( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		}
 
-		return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
+		return "<a href='" . esc_url( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
 	}
 
 	/**
@@ -545,8 +561,9 @@ class WP_Terms_List_Table extends WP_List_Table {
 	 */
 	public function column_links( $tag ) {
 		$count = number_format_i18n( $tag->count );
-		if ( $count )
+		if ( $count ) {
 			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
+		}
 		return $count;
 	}
 
@@ -579,8 +596,9 @@ class WP_Terms_List_Table extends WP_List_Table {
 	public function inline_edit() {
 		$tax = get_taxonomy( $this->screen->taxonomy );
 
-		if ( ! current_user_can( $tax->cap->edit_terms ) )
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
 			return;
+		}
 ?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
@@ -593,7 +611,7 @@ 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>
@@ -602,18 +620,25 @@ class WP_Terms_List_Table extends WP_List_Table {
 			</div></fieldset>
 	<?php
 
-		$core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
+		$core_columns = array(
+			'cb'          => true,
+			'description' => true,
+			'name'        => true,
+			'slug'        => true,
+			'posts'       => true,
+		);
 
 		list( $columns ) = $this->get_column_info();
 
-		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 );
+	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 );
+	}
+
 	?>
 
 		<div class="inline-edit-save submit">
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 d02d56b5b8..6d107d8d8a 100644
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -20,7 +20,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	public $features = array();
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
@@ -28,7 +27,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array  $tabs
 	 * @global string $tab
 	 * @global int    $paged
@@ -41,30 +39,32 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		global $tabs, $tab, $paged, $type, $theme_field_defaults;
 		wp_reset_vars( array( 'tab' ) );
 
-		$search_terms = array();
+		$search_terms  = array();
 		$search_string = '';
-		if ( ! empty( $_REQUEST['s'] ) ){
+		if ( ! empty( $_REQUEST['s'] ) ) {
 			$search_string = strtolower( wp_unslash( $_REQUEST['s'] ) );
-			$search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
+			$search_terms  = array_unique( array_filter( array_map( 'trim', explode( ',', $search_string ) ) ) );
 		}
 
-		if ( ! empty( $_REQUEST['features'] ) )
+		if ( ! empty( $_REQUEST['features'] ) ) {
 			$this->features = $_REQUEST['features'];
+		}
 
 		$paged = $this->get_pagenum();
 
 		$per_page = 36;
 
 		// These are the tabs which are shown on the page,
-		$tabs = array();
+		$tabs              = array();
 		$tabs['dashboard'] = __( 'Search' );
-		if ( 'search' === $tab )
-			$tabs['search']	= __( 'Search Results' );
-		$tabs['upload'] = __( 'Upload' );
+		if ( 'search' === $tab ) {
+			$tabs['search'] = __( 'Search Results' );
+		}
+		$tabs['upload']   = __( 'Upload' );
 		$tabs['featured'] = _x( 'Featured', 'themes' );
 		//$tabs['popular']  = _x( 'Popular', 'themes' );
-		$tabs['new']      = _x( 'Latest', 'themes' );
-		$tabs['updated']  = _x( 'Recently Updated', 'themes' );
+		$tabs['new']     = _x( 'Latest', 'themes' );
+		$tabs['updated'] = _x( 'Recently Updated', 'themes' );
 
 		$nonmenu_tabs = array( 'theme-information' ); // Valid actions to perform which do not have a Menu item.
 
@@ -82,10 +82,15 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		$nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) )
+		if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) ) {
 			$tab = key( $tabs );
+		}
 
-		$args = array( 'page' => $paged, 'per_page' => $per_page, 'fields' => $theme_field_defaults );
+		$args = array(
+			'page'     => $paged,
+			'per_page' => $per_page,
+			'fields'   => $theme_field_defaults,
+		);
 
 		switch ( $tab ) {
 			case 'search':
@@ -103,8 +108,8 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 				}
 
 				if ( ! empty( $this->features ) ) {
-					$args['tag'] = $this->features;
-					$_REQUEST['s'] = implode( ',', $this->features );
+					$args['tag']      = $this->features;
+					$_REQUEST['s']    = implode( ',', $this->features );
 					$_REQUEST['type'] = 'tag';
 				}
 
@@ -112,7 +117,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 				break;
 
 			case 'featured':
-			// case 'popular':
+				// case 'popular':
 			case 'new':
 			case 'updated':
 				$args['browse'] = $tab;
@@ -136,21 +141,25 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		 */
 		$args = apply_filters( "install_themes_table_api_args_{$tab}", $args );
 
-		if ( ! $args )
+		if ( ! $args ) {
 			return;
+		}
 
 		$api = themes_api( 'query_themes', $args );
 
-		if ( is_wp_error( $api ) )
+		if ( is_wp_error( $api ) ) {
 			wp_die( $api->get_error_message() . '</p> <p><a href="#" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a>' );
+		}
 
 		$this->items = $api->themes;
 
-		$this->set_pagination_args( array(
-			'total_items' => $api->info['results'],
-			'per_page' => $args['per_page'],
-			'infinite_scroll' => true,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items'     => $api->info['results'],
+				'per_page'        => $args['per_page'],
+				'infinite_scroll' => true,
+			)
+		);
 	}
 
 	/**
@@ -160,7 +169,6 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	}
 
 	/**
-	 *
 	 * @global array $tabs
 	 * @global string $tab
 	 * @return array
@@ -170,9 +178,9 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
 		$display_tabs = array();
 		foreach ( (array) $tabs as $action => $text ) {
-			$current_link_attributes = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
-			$href = self_admin_url('theme-install.php?tab=' . $action);
-			$display_tabs['theme-install-'.$action] = "<a href='$href'$current_link_attributes>$text</a>";
+			$current_link_attributes                    = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
+			$href                                       = self_admin_url( 'theme-install.php?tab=' . $action );
+			$display_tabs[ 'theme-install-' . $action ] = "<a href='$href'$current_link_attributes>$text</a>";
 		}
 
 		return $display_tabs;
@@ -181,7 +189,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' );
+		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
 		<div class="tablenav top themes">
 			<div class="alignleft actions">
@@ -212,10 +220,13 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		$themes = $this->items;
 		foreach ( $themes as $theme ) {
 				?>
-				<div class="available-theme installable-theme"><?php
+				<div class="available-theme installable-theme">
+				<?php
 					$this->single_row( $theme );
-				?></div>
-		<?php } // end foreach $theme_names
+				?>
+				</div>
+		<?php
+		} // end foreach $theme_names
 
 		$this->theme_installer();
 	}
@@ -246,29 +257,36 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	public function single_row( $theme ) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) )
+		if ( empty( $theme ) ) {
 			return;
+		}
 
-		$name   = wp_kses( $theme->name,   $themes_allowedtags );
+		$name   = wp_kses( $theme->name, $themes_allowedtags );
 		$author = wp_kses( $theme->author, $themes_allowedtags );
 
-		$preview_title = sprintf( __('Preview &#8220;%s&#8221;'), $name );
-		$preview_url   = add_query_arg( array(
-			'tab'   => 'theme-information',
-			'theme' => $theme->slug,
-		), self_admin_url( 'theme-install.php' ) );
+		$preview_title = sprintf( __( 'Preview &#8220;%s&#8221;' ), $name );
+		$preview_url   = add_query_arg(
+			array(
+				'tab'   => 'theme-information',
+				'theme' => $theme->slug,
+			), self_admin_url( 'theme-install.php' )
+		);
 
 		$actions = array();
 
-		$install_url = add_query_arg( array(
-			'action' => 'install-theme',
-			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		$install_url = add_query_arg(
+			array(
+				'action' => 'install-theme',
+				'theme'  => $theme->slug,
+			), self_admin_url( 'update.php' )
+		);
 
-		$update_url = add_query_arg( array(
-			'action' => 'upgrade-theme',
-			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		$update_url = add_query_arg(
+			array(
+				'action' => 'upgrade-theme',
+				'theme'  => $theme->slug,
+			), self_admin_url( 'update.php' )
+		);
 
 		$status = $this->_get_theme_status( $theme );
 
@@ -309,10 +327,10 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
 		<div class="action-links">
 			<ul>
-				<?php foreach ( $actions as $action ): ?>
+				<?php foreach ( $actions as $action ) : ?>
 					<li><?php echo $action; ?></li>
 				<?php endforeach; ?>
-				<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
+				<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e( 'Details' ); ?></a></li>
 			</ul>
 		</div>
 
@@ -375,48 +393,63 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 	public function install_theme_info( $theme ) {
 		global $themes_allowedtags;
 
-		if ( empty( $theme ) )
+		if ( empty( $theme ) ) {
 			return;
+		}
 
-		$name   = wp_kses( $theme->name,   $themes_allowedtags );
+		$name   = wp_kses( $theme->name, $themes_allowedtags );
 		$author = wp_kses( $theme->author, $themes_allowedtags );
 
-		$install_url = add_query_arg( array(
-			'action' => 'install-theme',
-			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		$install_url = add_query_arg(
+			array(
+				'action' => 'install-theme',
+				'theme'  => $theme->slug,
+			), self_admin_url( 'update.php' )
+		);
 
-		$update_url = add_query_arg( array(
-			'action' => 'upgrade-theme',
-			'theme'  => $theme->slug,
-		), self_admin_url( 'update.php' ) );
+		$update_url = add_query_arg(
+			array(
+				'action' => 'upgrade-theme',
+				'theme'  => $theme->slug,
+			), self_admin_url( 'update.php' )
+		);
 
 		$status = $this->_get_theme_status( $theme );
 
 		?>
-		<div class="install-theme-info"><?php
-			switch ( $status ) {
-				case 'update_available':
-					echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
-					break;
-				case 'newer_installed':
-				case 'latest_installed':
-					echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
-					break;
-				case 'install':
-				default:
-					echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
-					break;
-			} ?>
+		<div class="install-theme-info">
+		<?php
+		switch ( $status ) {
+			case 'update_available':
+				echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+				break;
+			case 'newer_installed':
+			case 'latest_installed':
+				echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+				break;
+			case 'install':
+			default:
+				echo '<a class="theme-install button button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+				break;
+		}
+			?>
 			<h3 class="theme-name"><?php echo $name; ?></h3>
 			<span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
-			<?php if ( isset( $theme->screenshot_url ) ): ?>
+			<?php if ( isset( $theme->screenshot_url ) ) : ?>
 				<img class="theme-screenshot" src="<?php echo esc_url( $theme->screenshot_url ); ?>" alt="" />
 			<?php endif; ?>
 			<div class="theme-details">
-				<?php wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings ) ); ?>
+				<?php
+				wp_star_rating(
+					array(
+						'rating' => $theme->rating,
+						'type'   => 'percent',
+						'number' => $theme->num_ratings,
+					)
+				);
+				?>
 				<div class="theme-version">
-					<strong><?php _e('Version:') ?> </strong>
+					<strong><?php _e( 'Version:' ); ?> </strong>
 					<?php echo wp_kses( $theme->version, $themes_allowedtags ); ?>
 				</div>
 				<div class="theme-description">
@@ -456,12 +489,13 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 
 		$installed_theme = wp_get_theme( $theme->slug );
 		if ( $installed_theme->exists() ) {
-			if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
+			if ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '=' ) ) {
 				$status = 'latest_installed';
-			elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
+			} elseif ( version_compare( $installed_theme->get( 'Version' ), $theme->version, '>' ) ) {
 				$status = 'newer_installed';
-			else
+			} else {
 				$status = 'update_available';
+			}
 		}
 
 		return $status;
diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php
index a0e008d947..c0f86135ae 100644
--- a/wp-admin/includes/class-wp-themes-list-table.php
+++ b/wp-admin/includes/class-wp-themes-list-table.php
@@ -18,7 +18,7 @@
 class WP_Themes_List_Table extends WP_List_Table {
 
 	protected $search_terms = array();
-	public $features = array();
+	public $features        = array();
 
 	/**
 	 * Constructor.
@@ -30,14 +30,15 @@ class WP_Themes_List_Table extends WP_List_Table {
 	 * @param array $args An associative array of arguments.
 	 */
 	public function __construct( $args = array() ) {
-		parent::__construct( array(
-			'ajax' => true,
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'ajax'   => true,
+				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 	}
 
 	/**
-	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
@@ -50,16 +51,19 @@ class WP_Themes_List_Table extends WP_List_Table {
 	public function prepare_items() {
 		$themes = wp_get_themes( array( 'allowed' => true ) );
 
-		if ( ! empty( $_REQUEST['s'] ) )
+		if ( ! empty( $_REQUEST['s'] ) ) {
 			$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		}
 
-		if ( ! empty( $_REQUEST['features'] ) )
+		if ( ! empty( $_REQUEST['features'] ) ) {
 			$this->features = $_REQUEST['features'];
+		}
 
 		if ( $this->search_terms || $this->features ) {
 			foreach ( $themes as $key => $theme ) {
-				if ( ! $this->search_theme( $theme ) )
+				if ( ! $this->search_theme( $theme ) ) {
 					unset( $themes[ $key ] );
+				}
 			}
 		}
 
@@ -67,17 +71,19 @@ class WP_Themes_List_Table extends WP_List_Table {
 		WP_Theme::sort_by_name( $themes );
 
 		$per_page = 36;
-		$page = $this->get_pagenum();
+		$page     = $this->get_pagenum();
 
 		$start = ( $page - 1 ) * $per_page;
 
 		$this->items = array_slice( $themes, $start, $per_page, true );
 
-		$this->set_pagination_args( array(
-			'total_items' => count( $themes ),
-			'per_page' => $per_page,
-			'infinite_scroll' => true,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items'     => count( $themes ),
+				'per_page'        => $per_page,
+				'infinite_scroll' => true,
+			)
+		);
 	}
 
 	/**
@@ -115,8 +121,9 @@ class WP_Themes_List_Table extends WP_List_Table {
 	 * @param string $which
 	 */
 	public function tablenav( $which = 'top' ) {
-		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
+		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) {
 			return;
+		}
 		?>
 		<div class="tablenav themes <?php echo $which; ?>">
 			<?php $this->pagination( $which ); ?>
@@ -129,7 +136,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' );
+		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
 		<?php $this->tablenav( 'top' ); ?>
 
@@ -142,7 +149,6 @@ class WP_Themes_List_Table extends WP_List_Table {
 	}
 
 	/**
-	 *
 	 * @return array
 	 */
 	public function get_columns() {
@@ -166,18 +172,20 @@ class WP_Themes_List_Table extends WP_List_Table {
 	public function display_rows() {
 		$themes = $this->items;
 
-		foreach ( $themes as $theme ):
-			?><div class="available-theme"><?php
+		foreach ( $themes as $theme ) :
+			?>
+			<div class="available-theme">
+			<?php
 
 			$template   = $theme->get_template();
 			$stylesheet = $theme->get_stylesheet();
-			$title      = $theme->display('Name');
-			$version    = $theme->display('Version');
-			$author     = $theme->display('Author');
+			$title      = $theme->display( 'Name' );
+			$version    = $theme->display( 'Version' );
+			$author     = $theme->display( 'Author' );
 
-			$activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
+			$activate_link = wp_nonce_url( 'themes.php?action=activate&amp;template=' . urlencode( $template ) . '&amp;stylesheet=' . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
 
-			$actions = array();
+			$actions             = array();
 			$actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="'
 				. esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
 
@@ -186,13 +194,14 @@ class WP_Themes_List_Table extends WP_List_Table {
 					. __( 'Live Preview' ) . '</a>';
 			}
 
-			if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
+			if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) {
 				$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
 					. '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
 					. "' );" . '">' . __( 'Delete' ) . '</a>';
+			}
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
-			$actions       = apply_filters( 'theme_action_links', $actions, $theme, 'all' );
+			$actions = apply_filters( 'theme_action_links', $actions, $theme, 'all' );
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
 			$actions       = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, 'all' );
@@ -216,10 +225,10 @@ class WP_Themes_List_Table extends WP_List_Table {
 			<div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
 			<div class="action-links">
 				<ul>
-					<?php foreach ( $actions as $action ): ?>
+					<?php foreach ( $actions as $action ) : ?>
 						<li><?php echo $action; ?></li>
 					<?php endforeach; ?>
-					<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
+					<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e( 'Details' ); ?></a></li>
 				</ul>
 				<?php echo $delete_action; ?>
 
@@ -227,13 +236,17 @@ class WP_Themes_List_Table extends WP_List_Table {
 			</div>
 
 			<div class="themedetaildiv hide-if-js">
-				<p><strong><?php _e('Version:'); ?></strong> <?php echo $version; ?></p>
-				<p><?php echo $theme->display('Description'); ?></p>
-				<?php if ( $theme->parent() ) {
-					printf( ' <p class="howto">' . __( 'This <a href="%1$s">child theme</a> requires its parent theme, %2$s.' ) . '</p>',
+				<p><strong><?php _e( 'Version:' ); ?></strong> <?php echo $version; ?></p>
+				<p><?php echo $theme->display( 'Description' ); ?></p>
+				<?php
+				if ( $theme->parent() ) {
+					printf(
+						' <p class="howto">' . __( 'This <a href="%1$s">child theme</a> requires its parent theme, %2$s.' ) . '</p>',
 						__( 'https://codex.wordpress.org/Child_Themes' ),
-						$theme->parent()->display( 'Name' ) );
-				} ?>
+						$theme->parent()->display( 'Name' )
+					);
+				}
+				?>
 			</div>
 
 			</div>
@@ -248,14 +261,16 @@ class WP_Themes_List_Table extends WP_List_Table {
 	public function search_theme( $theme ) {
 		// Search the features
 		foreach ( $this->features as $word ) {
-			if ( ! in_array( $word, $theme->get('Tags') ) )
+			if ( ! in_array( $word, $theme->get( 'Tags' ) ) ) {
 				return false;
+			}
 		}
 
 		// Match all phrases
 		foreach ( $this->search_terms as $word ) {
-			if ( in_array( $word, $theme->get('Tags') ) )
+			if ( in_array( $word, $theme->get( 'Tags' ) ) ) {
 				continue;
+			}
 
 			foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
 				// Don't mark up; Do translate.
@@ -264,11 +279,13 @@ class WP_Themes_List_Table extends WP_List_Table {
 				}
 			}
 
-			if ( false !== stripos( $theme->get_stylesheet(), $word ) )
+			if ( false !== stripos( $theme->get_stylesheet(), $word ) ) {
 				continue;
+			}
 
-			if ( false !== stripos( $theme->get_template(), $word ) )
+			if ( false !== stripos( $theme->get_template(), $word ) ) {
 				continue;
+			}
 
 			return false;
 		}
@@ -287,14 +304,15 @@ class WP_Themes_List_Table extends WP_List_Table {
 		$search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
 
 		$args = array(
-			'search' => $search_string,
-			'features' => $this->features,
-			'paged' => $this->get_pagenum(),
+			'search'      => $search_string,
+			'features'    => $this->features,
+			'paged'       => $this->get_pagenum(),
 			'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
 		);
 
-		if ( is_array( $extra_args ) )
+		if ( is_array( $extra_args ) ) {
 			$args = array_merge( $args, $extra_args );
+		}
 
 		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
 		parent::_js_vars();
diff --git a/wp-admin/includes/class-wp-upgrader-skin.php b/wp-admin/includes/class-wp-upgrader-skin.php
index ad4d8de8c9..9465ed3401 100644
--- a/wp-admin/includes/class-wp-upgrader-skin.php
+++ b/wp-admin/includes/class-wp-upgrader-skin.php
@@ -25,25 +25,29 @@ class WP_Upgrader_Skin {
 	 * @since 2.8.0
 	 * @var string|bool|WP_Error
 	 */
-	public $result = false;
+	public $result  = false;
 	public $options = array();
 
 	/**
-	 *
 	 * @param array $args
 	 */
-	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
-		$this->options = wp_parse_args($args, $defaults);
+	public function __construct( $args = array() ) {
+		$defaults      = array(
+			'url'     => '',
+			'nonce'   => '',
+			'title'   => '',
+			'context' => false,
+		);
+		$this->options = wp_parse_args( $args, $defaults );
 	}
 
 	/**
-	 *
 	 * @param WP_Upgrader $upgrader
 	 */
-	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
+	public function set_upgrader( &$upgrader ) {
+		if ( is_object( $upgrader ) ) {
 			$this->upgrader =& $upgrader;
+		}
 		$this->add_strings();
 	}
 
@@ -84,8 +88,8 @@ class WP_Upgrader_Skin {
 		if ( ! $context ) {
 			$context = $this->options['context'];
 		}
-		if ( !empty($this->options['nonce']) ) {
-			$url = wp_nonce_url($url, $this->options['nonce']);
+		if ( ! empty( $this->options['nonce'] ) ) {
+			$url = wp_nonce_url( $url, $this->options['nonce'] );
 		}
 
 		$extra_fields = array();
@@ -115,44 +119,46 @@ class WP_Upgrader_Skin {
 	}
 
 	/**
-	 *
 	 * @param string|WP_Error $errors
 	 */
-	public function error($errors) {
-		if ( ! $this->done_header )
+	public function error( $errors ) {
+		if ( ! $this->done_header ) {
 			$this->header();
-		if ( is_string($errors) ) {
-			$this->feedback($errors);
-		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
+		}
+		if ( is_string( $errors ) ) {
+			$this->feedback( $errors );
+		} elseif ( is_wp_error( $errors ) && $errors->get_error_code() ) {
 			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
-				else
-					$this->feedback($message);
+				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
+					$this->feedback( $message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+				} else {
+					$this->feedback( $message );
+				}
 			}
 		}
 	}
 
 	/**
-	 *
 	 * @param string $string
 	 */
-	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
-			$string = $this->upgrader->strings[$string];
+	public function feedback( $string ) {
+		if ( isset( $this->upgrader->strings[ $string ] ) ) {
+			$string = $this->upgrader->strings[ $string ];
+		}
 
-		if ( strpos($string, '%') !== false ) {
+		if ( strpos( $string, '%' ) !== false ) {
 			$args = func_get_args();
-			$args = array_splice($args, 1);
+			$args = array_splice( $args, 1 );
 			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
-				$string = vsprintf($string, $args);
+				$args   = array_map( 'strip_tags', $args );
+				$args   = array_map( 'esc_html', $args );
+				$string = vsprintf( $string, $args );
 			}
 		}
-		if ( empty($string) )
+		if ( empty( $string ) ) {
 			return;
-		show_message($string);
+		}
+		show_message( $string );
 	}
 
 	/**
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 71591d60a3..b7e5365f9e 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -120,10 +120,11 @@ class WP_Upgrader {
 	 *                               instance.
 	 */
 	public function __construct( $skin = null ) {
-		if ( null == $skin )
+		if ( null == $skin ) {
 			$this->skin = new WP_Upgrader_Skin();
-		else
+		} else {
 			$this->skin = $skin;
+		}
 	}
 
 	/**
@@ -135,7 +136,7 @@ class WP_Upgrader {
 	 * @since 2.8.0
 	 */
 	public function init() {
-		$this->skin->set_upgrader($this);
+		$this->skin->set_upgrader( $this );
 		$this->generic_strings();
 	}
 
@@ -145,26 +146,26 @@ class WP_Upgrader {
 	 * @since 2.8.0
 	 */
 	public function generic_strings() {
-		$this->strings['bad_request'] = __('Invalid data provided.');
-		$this->strings['fs_unavailable'] = __('Could not access filesystem.');
-		$this->strings['fs_error'] = __('Filesystem error.');
-		$this->strings['fs_no_root_dir'] = __('Unable to locate WordPress root directory.');
-		$this->strings['fs_no_content_dir'] = __('Unable to locate WordPress content directory (wp-content).');
-		$this->strings['fs_no_plugins_dir'] = __('Unable to locate WordPress plugin directory.');
-		$this->strings['fs_no_themes_dir'] = __('Unable to locate WordPress theme directory.');
+		$this->strings['bad_request']       = __( 'Invalid data provided.' );
+		$this->strings['fs_unavailable']    = __( 'Could not access filesystem.' );
+		$this->strings['fs_error']          = __( 'Filesystem error.' );
+		$this->strings['fs_no_root_dir']    = __( 'Unable to locate WordPress root directory.' );
+		$this->strings['fs_no_content_dir'] = __( 'Unable to locate WordPress content directory (wp-content).' );
+		$this->strings['fs_no_plugins_dir'] = __( 'Unable to locate WordPress plugin directory.' );
+		$this->strings['fs_no_themes_dir']  = __( 'Unable to locate WordPress theme directory.' );
 		/* translators: %s: directory name */
-		$this->strings['fs_no_folder'] = __('Unable to locate needed folder (%s).');
+		$this->strings['fs_no_folder'] = __( 'Unable to locate needed folder (%s).' );
 
-		$this->strings['download_failed'] = __('Download failed.');
-		$this->strings['installing_package'] = __('Installing the latest version&#8230;');
-		$this->strings['no_files'] = __('The package contains no files.');
-		$this->strings['folder_exists'] = __('Destination folder already exists.');
-		$this->strings['mkdir_failed'] = __('Could not create directory.');
-		$this->strings['incompatible_archive'] = __('The package could not be installed.');
-		$this->strings['files_not_writable'] = __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' );
+		$this->strings['download_failed']      = __( 'Download failed.' );
+		$this->strings['installing_package']   = __( 'Installing the latest version&#8230;' );
+		$this->strings['no_files']             = __( 'The package contains no files.' );
+		$this->strings['folder_exists']        = __( 'Destination folder already exists.' );
+		$this->strings['mkdir_failed']         = __( 'Could not create directory.' );
+		$this->strings['incompatible_archive'] = __( 'The package could not be installed.' );
+		$this->strings['files_not_writable']   = __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' );
 
-		$this->strings['maintenance_start'] = __('Enabling Maintenance mode&#8230;');
-		$this->strings['maintenance_end'] = __('Disabling Maintenance mode&#8230;');
+		$this->strings['maintenance_start'] = __( 'Enabling Maintenance mode&#8230;' );
+		$this->strings['maintenance_end']   = __( 'Disabling Maintenance mode&#8230;' );
 	}
 
 	/**
@@ -190,40 +191,48 @@ class WP_Upgrader {
 
 		if ( ! WP_Filesystem( $credentials, $directories[0], $allow_relaxed_file_ownership ) ) {
 			$error = true;
-			if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
+			if ( is_object( $wp_filesystem ) && $wp_filesystem->errors->get_error_code() ) {
 				$error = $wp_filesystem->errors;
+			}
 			// Failed to connect, Error and request again
 			$this->skin->request_filesystem_credentials( $error, $directories[0], $allow_relaxed_file_ownership );
 			return false;
 		}
 
-		if ( ! is_object($wp_filesystem) )
-			return new WP_Error('fs_unavailable', $this->strings['fs_unavailable'] );
+		if ( ! is_object( $wp_filesystem ) ) {
+			return new WP_Error( 'fs_unavailable', $this->strings['fs_unavailable'] );
+		}
 
-		if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-			return new WP_Error('fs_error', $this->strings['fs_error'], $wp_filesystem->errors);
+		if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+			return new WP_Error( 'fs_error', $this->strings['fs_error'], $wp_filesystem->errors );
+		}
 
-		foreach ( (array)$directories as $dir ) {
+		foreach ( (array) $directories as $dir ) {
 			switch ( $dir ) {
 				case ABSPATH:
-					if ( ! $wp_filesystem->abspath() )
-						return new WP_Error('fs_no_root_dir', $this->strings['fs_no_root_dir']);
+					if ( ! $wp_filesystem->abspath() ) {
+						return new WP_Error( 'fs_no_root_dir', $this->strings['fs_no_root_dir'] );
+					}
 					break;
 				case WP_CONTENT_DIR:
-					if ( ! $wp_filesystem->wp_content_dir() )
-						return new WP_Error('fs_no_content_dir', $this->strings['fs_no_content_dir']);
+					if ( ! $wp_filesystem->wp_content_dir() ) {
+						return new WP_Error( 'fs_no_content_dir', $this->strings['fs_no_content_dir'] );
+					}
 					break;
 				case WP_PLUGIN_DIR:
-					if ( ! $wp_filesystem->wp_plugins_dir() )
-						return new WP_Error('fs_no_plugins_dir', $this->strings['fs_no_plugins_dir']);
+					if ( ! $wp_filesystem->wp_plugins_dir() ) {
+						return new WP_Error( 'fs_no_plugins_dir', $this->strings['fs_no_plugins_dir'] );
+					}
 					break;
 				case get_theme_root():
-					if ( ! $wp_filesystem->wp_themes_dir() )
-						return new WP_Error('fs_no_themes_dir', $this->strings['fs_no_themes_dir']);
+					if ( ! $wp_filesystem->wp_themes_dir() ) {
+						return new WP_Error( 'fs_no_themes_dir', $this->strings['fs_no_themes_dir'] );
+					}
 					break;
 				default:
-					if ( ! $wp_filesystem->find_folder($dir) )
+					if ( ! $wp_filesystem->find_folder( $dir ) ) {
 						return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ) );
+					}
 					break;
 			}
 		}
@@ -252,21 +261,25 @@ class WP_Upgrader {
 		 * @param WP_Upgrader $this    The WP_Upgrader instance.
 		 */
 		$reply = apply_filters( 'upgrader_pre_download', false, $package, $this );
-		if ( false !== $reply )
+		if ( false !== $reply ) {
 			return $reply;
+		}
 
-		if ( ! preg_match('!^(http|https|ftp)://!i', $package) && file_exists($package) ) //Local file or remote?
+		if ( ! preg_match( '!^(http|https|ftp)://!i', $package ) && file_exists( $package ) ) { //Local file or remote?
 			return $package; //must be a local file..
+		}
 
-		if ( empty($package) )
-			return new WP_Error('no_package', $this->strings['no_package']);
+		if ( empty( $package ) ) {
+			return new WP_Error( 'no_package', $this->strings['no_package'] );
+		}
 
-		$this->skin->feedback('downloading_package', $package);
+		$this->skin->feedback( 'downloading_package', $package );
 
-		$download_file = download_url($package);
+		$download_file = download_url( $package );
 
-		if ( is_wp_error($download_file) )
-			return new WP_Error('download_failed', $this->strings['download_failed'], $download_file->get_error_message());
+		if ( is_wp_error( $download_file ) ) {
+			return new WP_Error( 'download_failed', $this->strings['download_failed'], $download_file->get_error_message() );
+		}
 
 		return $download_file;
 	}
@@ -286,33 +299,36 @@ class WP_Upgrader {
 	public function unpack_package( $package, $delete_package = true ) {
 		global $wp_filesystem;
 
-		$this->skin->feedback('unpack_package');
+		$this->skin->feedback( 'unpack_package' );
 
 		$upgrade_folder = $wp_filesystem->wp_content_dir() . 'upgrade/';
 
 		//Clean up contents of upgrade directory beforehand.
-		$upgrade_files = $wp_filesystem->dirlist($upgrade_folder);
-		if ( !empty($upgrade_files) ) {
-			foreach ( $upgrade_files as $file )
-				$wp_filesystem->delete($upgrade_folder . $file['name'], true);
+		$upgrade_files = $wp_filesystem->dirlist( $upgrade_folder );
+		if ( ! empty( $upgrade_files ) ) {
+			foreach ( $upgrade_files as $file ) {
+				$wp_filesystem->delete( $upgrade_folder . $file['name'], true );
+			}
 		}
 
 		// We need a working directory - Strip off any .tmp or .zip suffixes
 		$working_dir = $upgrade_folder . basename( basename( $package, '.tmp' ), '.zip' );
 
 		// Clean up working directory
-		if ( $wp_filesystem->is_dir($working_dir) )
-			$wp_filesystem->delete($working_dir, true);
+		if ( $wp_filesystem->is_dir( $working_dir ) ) {
+			$wp_filesystem->delete( $working_dir, true );
+		}
 
 		// Unzip package to working directory
 		$result = unzip_file( $package, $working_dir );
 
 		// Once extracted, delete the package if required.
-		if ( $delete_package )
-			unlink($package);
+		if ( $delete_package ) {
+			unlink( $package );
+		}
 
-		if ( is_wp_error($result) ) {
-			$wp_filesystem->delete($working_dir, true);
+		if ( is_wp_error( $result ) ) {
+			$wp_filesystem->delete( $working_dir, true );
 			if ( 'incompatible_archive' == $result->get_error_code() ) {
 				return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $result->get_error_data() );
 			}
@@ -432,19 +448,19 @@ class WP_Upgrader {
 		global $wp_filesystem, $wp_theme_directories;
 
 		$defaults = array(
-			'source' => '', // Please always pass this
-			'destination' => '', // and this
-			'clear_destination' => false,
-			'clear_working' => false,
+			'source'                      => '', // Please always pass this
+			'destination'                 => '', // and this
+			'clear_destination'           => false,
+			'clear_working'               => false,
 			'abort_if_destination_exists' => true,
-			'hook_extra' => array()
+			'hook_extra'                  => array(),
 		);
 
-		$args = wp_parse_args($args, $defaults);
+		$args = wp_parse_args( $args, $defaults );
 
 		// These were previously extract()'d.
-		$source = $args['source'];
-		$destination = $args['destination'];
+		$source            = $args['source'];
+		$destination       = $args['destination'];
 		$clear_destination = $args['clear_destination'];
 
 		@set_time_limit( 300 );
@@ -473,10 +489,10 @@ class WP_Upgrader {
 		}
 
 		//Retain the Original source and destinations
-		$remote_source = $args['source'];
+		$remote_source     = $args['source'];
 		$local_destination = $destination;
 
-		$source_files = array_keys( $wp_filesystem->dirlist( $remote_source ) );
+		$source_files       = array_keys( $wp_filesystem->dirlist( $remote_source ) );
 		$remote_destination = $wp_filesystem->find_folder( $local_destination );
 
 		//Locate which directory to copy to the new folder, This is based on the actual folder holding the files.
@@ -525,12 +541,12 @@ class WP_Upgrader {
 
 		if ( in_array( $destination, $protected_directories ) ) {
 			$remote_destination = trailingslashit( $remote_destination ) . trailingslashit( basename( $source ) );
-			$destination = trailingslashit( $destination ) . trailingslashit( basename( $source ) );
+			$destination        = trailingslashit( $destination ) . trailingslashit( basename( $source ) );
 		}
 
 		if ( $clear_destination ) {
 			// We're going to clear the destination if there's something there.
-			$this->skin->feedback('remove_old');
+			$this->skin->feedback( 'remove_old' );
 
 			$removed = $this->clear_destination( $remote_destination );
 
@@ -549,13 +565,13 @@ class WP_Upgrader {
 			if ( is_wp_error( $removed ) ) {
 				return $removed;
 			}
-		} elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists($remote_destination) ) {
+		} elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists( $remote_destination ) ) {
 			//If we're not clearing the destination folder and something exists there already, Bail.
 			//But first check to see if there are actually any files in the folder.
-			$_files = $wp_filesystem->dirlist($remote_destination);
-			if ( ! empty($_files) ) {
-				$wp_filesystem->delete($remote_source, true); //Clear out the source files.
-				return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+			$_files = $wp_filesystem->dirlist( $remote_destination );
+			if ( ! empty( $_files ) ) {
+				$wp_filesystem->delete( $remote_source, true ); //Clear out the source files.
+				return new WP_Error( 'folder_exists', $this->strings['folder_exists'], $remote_destination );
 			}
 		}
 
@@ -566,8 +582,8 @@ class WP_Upgrader {
 			}
 		}
 		// Copy new version of item into place.
-		$result = copy_dir($source, $remote_destination);
-		if ( is_wp_error($result) ) {
+		$result = copy_dir( $source, $remote_destination );
+		if ( is_wp_error( $result ) ) {
 			if ( $args['clear_working'] ) {
 				$wp_filesystem->delete( $remote_source, true );
 			}
@@ -579,7 +595,7 @@ class WP_Upgrader {
 			$wp_filesystem->delete( $remote_source, true );
 		}
 
-		$destination_name = basename( str_replace($local_destination, '', $destination) );
+		$destination_name = basename( str_replace( $local_destination, '', $destination ) );
 		if ( '.' == $destination_name ) {
 			$destination_name = '';
 		}
@@ -597,7 +613,7 @@ class WP_Upgrader {
 		 */
 		$res = apply_filters( 'upgrader_post_install', true, $args['hook_extra'], $this->result );
 
-		if ( is_wp_error($res) ) {
+		if ( is_wp_error( $res ) ) {
 			$this->result = $res;
 			return $res;
 		}
@@ -642,13 +658,13 @@ class WP_Upgrader {
 	public function run( $options ) {
 
 		$defaults = array(
-			'package' => '', // Please always pass this.
-			'destination' => '', // And this
-			'clear_destination' => false,
+			'package'                     => '', // Please always pass this.
+			'destination'                 => '', // And this
+			'clear_destination'           => false,
 			'abort_if_destination_exists' => true, // Abort if the Destination directory exists, Pass clear_destination as false please
-			'clear_working' => true,
-			'is_multi' => false,
-			'hook_extra' => array() // Pass any extra $hook_extra args here, this will be passed to any hooked filters.
+			'clear_working'               => true,
+			'is_multi'                    => false,
+			'hook_extra'                  => array(), // Pass any extra $hook_extra args here, this will be passed to any hooked filters.
 		);
 
 		$options = wp_parse_args( $options, $defaults );
@@ -701,8 +717,8 @@ class WP_Upgrader {
 
 		$this->skin->before();
 
-		if ( is_wp_error($res) ) {
-			$this->skin->error($res);
+		if ( is_wp_error( $res ) ) {
+			$this->skin->error( $res );
 			$this->skin->after();
 			if ( ! $options['is_multi'] ) {
 				$this->skin->footer();
@@ -715,8 +731,8 @@ class WP_Upgrader {
 		 * of the file if the package is a local file)
 		 */
 		$download = $this->download_package( $options['package'] );
-		if ( is_wp_error($download) ) {
-			$this->skin->error($download);
+		if ( is_wp_error( $download ) ) {
+			$this->skin->error( $download );
 			$this->skin->after();
 			if ( ! $options['is_multi'] ) {
 				$this->skin->footer();
@@ -728,8 +744,8 @@ class WP_Upgrader {
 
 		// Unzips the file into a temporary directory.
 		$working_dir = $this->unpack_package( $download, $delete_package );
-		if ( is_wp_error($working_dir) ) {
-			$this->skin->error($working_dir);
+		if ( is_wp_error( $working_dir ) ) {
+			$this->skin->error( $working_dir );
 			$this->skin->after();
 			if ( ! $options['is_multi'] ) {
 				$this->skin->footer();
@@ -738,22 +754,24 @@ class WP_Upgrader {
 		}
 
 		// With the given options, this installs it to the destination directory.
-		$result = $this->install_package( array(
-			'source' => $working_dir,
-			'destination' => $options['destination'],
-			'clear_destination' => $options['clear_destination'],
-			'abort_if_destination_exists' => $options['abort_if_destination_exists'],
-			'clear_working' => $options['clear_working'],
-			'hook_extra' => $options['hook_extra']
-		) );
+		$result = $this->install_package(
+			array(
+				'source'                      => $working_dir,
+				'destination'                 => $options['destination'],
+				'clear_destination'           => $options['clear_destination'],
+				'abort_if_destination_exists' => $options['abort_if_destination_exists'],
+				'clear_working'               => $options['clear_working'],
+				'hook_extra'                  => $options['hook_extra'],
+			)
+		);
 
-		$this->skin->set_result($result);
-		if ( is_wp_error($result) ) {
-			$this->skin->error($result);
-			$this->skin->feedback('process_failed');
+		$this->skin->set_result( $result );
+		if ( is_wp_error( $result ) ) {
+			$this->skin->error( $result );
+			$this->skin->feedback( 'process_failed' );
 		} else {
 			// Installation succeeded.
-			$this->skin->feedback('process_success');
+			$this->skin->feedback( 'process_success' );
 		}
 
 		$this->skin->after();
@@ -813,28 +831,28 @@ class WP_Upgrader {
 		global $wp_filesystem;
 		$file = $wp_filesystem->abspath() . '.maintenance';
 		if ( $enable ) {
-			$this->skin->feedback('maintenance_start');
+			$this->skin->feedback( 'maintenance_start' );
 			// Create maintenance file to signal that we are upgrading
 			$maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
-			$wp_filesystem->delete($file);
-			$wp_filesystem->put_contents($file, $maintenance_string, FS_CHMOD_FILE);
+			$wp_filesystem->delete( $file );
+			$wp_filesystem->put_contents( $file, $maintenance_string, FS_CHMOD_FILE );
 		} elseif ( ! $enable && $wp_filesystem->exists( $file ) ) {
-			$this->skin->feedback('maintenance_end');
-			$wp_filesystem->delete($file);
+			$this->skin->feedback( 'maintenance_end' );
+			$wp_filesystem->delete( $file );
 		}
 	}
 
 	/**
- 	 * Creates a lock using WordPress options.
- 	 *
- 	 * @since 4.5.0
- 	 * @static
- 	 *
- 	 * @param string $lock_name       The name of this unique lock.
- 	 * @param int    $release_timeout Optional. The duration in seconds to respect an existing lock.
+	 * Creates a lock using WordPress options.
+	 *
+	 * @since 4.5.0
+	 * @static
+	 *
+	 * @param string $lock_name       The name of this unique lock.
+	 * @param int    $release_timeout Optional. The duration in seconds to respect an existing lock.
 	 *                                Default: 1 hour.
- 	 * @return bool False if a lock couldn't be created or if the lock is still valid. True otherwise.
- 	 */
+	 * @return bool False if a lock couldn't be created or if the lock is still valid. True otherwise.
+	 */
 	public static function create_lock( $lock_name, $release_timeout = null ) {
 		global $wpdb;
 		if ( ! $release_timeout ) {
@@ -871,16 +889,16 @@ class WP_Upgrader {
 	}
 
 	/**
- 	 * Releases an upgrader lock.
- 	 *
- 	 * @since 4.5.0
- 	 * @static
+	 * Releases an upgrader lock.
+	 *
+	 * @since 4.5.0
+	 * @static
 	 *
 	 * @see WP_Upgrader::create_lock()
- 	 *
- 	 * @param string $lock_name The name of this unique lock.
+	 *
+	 * @param string $lock_name The name of this unique lock.
 	 * @return bool True if the lock was successfully released. False on failure.
- 	 */
+	 */
 	public static function release_lock( $lock_name ) {
 		return delete_option( $lock_name . '.lock' );
 	}
diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 8dd579383b..90e244208c 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -43,30 +43,34 @@ class WP_Users_List_Table extends WP_List_Table {
 	 * @param array $args An associative array of arguments.
 	 */
 	public function __construct( $args = array() ) {
-		parent::__construct( array(
-			'singular' => 'user',
-			'plural'   => 'users',
-			'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+		parent::__construct(
+			array(
+				'singular' => 'user',
+				'plural'   => 'users',
+				'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
+			)
+		);
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users )
+		if ( $this->is_site_users ) {
 			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		}
 	}
 
 	/**
 	 * Check the current user's permissions.
 	 *
- 	 * @since 3.1.0
+	 * @since 3.1.0
 	 *
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users )
+		if ( $this->is_site_users ) {
 			return current_user_can( 'manage_sites' );
-		else
+		} else {
 			return current_user_can( 'list_users' );
+		}
 	}
 
 	/**
@@ -84,40 +88,44 @@ class WP_Users_List_Table extends WP_List_Table {
 
 		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
 
-		$per_page = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
+		$per_page       = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
 		$users_per_page = $this->get_items_per_page( $per_page );
 
 		$paged = $this->get_pagenum();
 
 		if ( 'none' === $role ) {
 			$args = array(
-				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
+				'number'  => $users_per_page,
+				'offset'  => ( $paged - 1 ) * $users_per_page,
 				'include' => wp_get_users_with_no_role( $this->site_id ),
-				'search' => $usersearch,
-				'fields' => 'all_with_meta'
+				'search'  => $usersearch,
+				'fields'  => 'all_with_meta',
 			);
 		} else {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
-				'role' => $role,
+				'offset' => ( $paged - 1 ) * $users_per_page,
+				'role'   => $role,
 				'search' => $usersearch,
-				'fields' => 'all_with_meta'
+				'fields' => 'all_with_meta',
 			);
 		}
 
-		if ( '' !== $args['search'] )
+		if ( '' !== $args['search'] ) {
 			$args['search'] = '*' . $args['search'] . '*';
+		}
 
-		if ( $this->is_site_users )
+		if ( $this->is_site_users ) {
 			$args['blog_id'] = $this->site_id;
+		}
 
-		if ( isset( $_REQUEST['orderby'] ) )
+		if ( isset( $_REQUEST['orderby'] ) ) {
 			$args['orderby'] = $_REQUEST['orderby'];
+		}
 
-		if ( isset( $_REQUEST['order'] ) )
+		if ( isset( $_REQUEST['order'] ) ) {
 			$args['order'] = $_REQUEST['order'];
+		}
 
 		/**
 		 * Filters the query arguments used to retrieve users for the current users list table.
@@ -134,10 +142,12 @@ class WP_Users_List_Table extends WP_List_Table {
 
 		$this->items = $wp_user_search->get_results();
 
-		$this->set_pagination_args( array(
-			'total_items' => $wp_user_search->get_total(),
-			'per_page' => $users_per_page,
-		) );
+		$this->set_pagination_args(
+			array(
+				'total_items' => $wp_user_search->get_total(),
+				'per_page'    => $users_per_page,
+			)
+		);
 	}
 
 	/**
@@ -173,21 +183,22 @@ class WP_Users_List_Table extends WP_List_Table {
 			$users_of_blog = count_users( 'time', $this->site_id );
 			restore_current_blog();
 		} else {
-			$url = 'users.php';
+			$url           = 'users.php';
 			$users_of_blog = count_users();
 		}
 
 		$total_users = $users_of_blog['total_users'];
 		$avail_roles =& $users_of_blog['avail_roles'];
-		unset($users_of_blog);
+		unset( $users_of_blog );
 
 		$current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
 
-		$role_links = array();
+		$role_links        = array();
 		$role_links['all'] = "<a href='$url'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
 		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( !isset($avail_roles[$this_role]) )
+			if ( ! isset( $avail_roles[ $this_role ] ) ) {
 				continue;
+			}
 
 			$current_link_attributes = '';
 
@@ -197,11 +208,11 @@ class WP_Users_List_Table extends WP_List_Table {
 
 			$name = translate_user_role( $name );
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
-			$role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
+			$name                     = sprintf( __( '%1$s <span class="count">(%2$s)</span>' ), $name, number_format_i18n( $avail_roles[ $this_role ] ) );
+			$role_links[ $this_role ] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
 		}
 
-		if ( ! empty( $avail_roles['none' ] ) ) {
+		if ( ! empty( $avail_roles['none'] ) ) {
 
 			$current_link_attributes = '';
 
@@ -211,7 +222,7 @@ class WP_Users_List_Table extends WP_List_Table {
 
 			$name = __( 'No role' );
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
+			$name               = sprintf( __( '%1$s <span class="count">(%2$s)</span>' ), $name, number_format_i18n( $avail_roles['none'] ) );
 			$role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$current_link_attributes>$name</a>";
 
 		}
@@ -230,11 +241,13 @@ class WP_Users_List_Table extends WP_List_Table {
 		$actions = array();
 
 		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) )
+			if ( current_user_can( 'remove_users' ) ) {
 				$actions['remove'] = __( 'Remove' );
+			}
 		} else {
-			if ( current_user_can( 'delete_users' ) )
+			if ( current_user_can( 'delete_users' ) ) {
 				$actions['delete'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -249,14 +262,14 @@ class WP_Users_List_Table extends WP_List_Table {
 	 *                      or below the table ("bottom").
 	 */
 	protected function extra_tablenav( $which ) {
-		$id = 'bottom' === $which ? 'new_role2' : 'new_role';
+		$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>
-		<select name="<?php echo $id ?>" id="<?php echo $id ?>">
-			<option value=""><?php _e( 'Change role to&hellip;' ) ?></option>
+		<label class="screen-reader-text" for="<?php echo $id; ?>"><?php _e( 'Change role to&hellip;' ); ?></label>
+		<select name="<?php echo $id; ?>" id="<?php echo $id; ?>">
+			<option value=""><?php _e( 'Change role to&hellip;' ); ?></option>
 			<?php wp_dropdown_roles(); ?>
 		</select>
 	<?php
@@ -321,11 +334,12 @@ class WP_Users_List_Table extends WP_List_Table {
 			'name'     => __( 'Name' ),
 			'email'    => __( 'Email' ),
 			'role'     => __( 'Role' ),
-			'posts'    => __( 'Posts' )
+			'posts'    => __( 'Posts' ),
 		);
 
-		if ( $this->is_site_users )
+		if ( $this->is_site_users ) {
 			unset( $c['posts'] );
+		}
 
 		return $c;
 	}
@@ -353,8 +367,9 @@ class WP_Users_List_Table extends WP_List_Table {
 	 */
 	public function display_rows() {
 		// Query the post counts for this page
-		if ( ! $this->is_site_users )
+		if ( ! $this->is_site_users ) {
 			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		}
 
 		foreach ( $this->items as $userid => $user_object ) {
 			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
@@ -380,18 +395,19 @@ class WP_Users_List_Table extends WP_List_Table {
 			$user_object = get_userdata( (int) $user_object );
 		}
 		$user_object->filter = 'display';
-		$email = $user_object->user_email;
+		$email               = $user_object->user_email;
 
-		if ( $this->is_site_users )
+		if ( $this->is_site_users ) {
 			$url = "site-users.php?id={$this->site_id}&amp;";
-		else
+		} else {
 			$url = 'users.php?';
+		}
 
 		$user_roles = $this->get_role_list( $user_object );
 
 		// Set up the hover actions for this user
-		$actions = array();
-		$checkbox = '';
+		$actions     = array();
+		$checkbox    = '';
 		$super_admin = '';
 
 		if ( is_multisite() && current_user_can( 'manage_network_users' ) ) {
@@ -405,17 +421,19 @@ class WP_Users_List_Table extends WP_List_Table {
 			// Set up the user editing link
 			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );
 
-			if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
-				$edit = "<strong><a href=\"{$edit_link}\">{$user_object->user_login}</a>{$super_admin}</strong><br />";
+			if ( current_user_can( 'edit_user', $user_object->ID ) ) {
+				$edit            = "<strong><a href=\"{$edit_link}\">{$user_object->user_login}</a>{$super_admin}</strong><br />";
 				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
 			} else {
 				$edit = "<strong>{$user_object->user_login}{$super_admin}</strong><br />";
 			}
 
-			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
-			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			if ( ! is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) ) {
+				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . '</a>';
+			}
+			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) ) {
+				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . '</a>';
+			}
 
 			// Add a link to the user's author archive, if not empty.
 			$author_posts_url = get_author_posts_url( $user_object->ID );
@@ -528,7 +546,7 @@ class WP_Users_List_Table extends WP_List_Table {
 				if ( $primary === $column_name ) {
 					$r .= $this->row_actions( $actions );
 				}
-				$r .= "</td>";
+				$r .= '</td>';
 			}
 		}
 		$r .= '</tr>';
diff --git a/wp-admin/includes/comment.php b/wp-admin/includes/comment.php
index 87e0a25d53..543cc8b2c3 100644
--- a/wp-admin/includes/comment.php
+++ b/wp-admin/includes/comment.php
@@ -32,11 +32,14 @@ function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
 		$date_field = 'comment_date_gmt';
 	}
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+	return $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT comment_post_ID FROM $wpdb->comments
 			WHERE comment_author = %s AND $date_field = %s",
 			stripslashes( $comment_author ),
 			stripslashes( $comment_date )
-	) );
+		)
+	);
 }
 
 /**
@@ -45,40 +48,47 @@ function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
+		wp_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
+	}
 
-	if ( isset( $_POST['newcomment_author'] ) )
+	if ( isset( $_POST['newcomment_author'] ) ) {
 		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
+	}
+	if ( isset( $_POST['newcomment_author_email'] ) ) {
 		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
+	}
+	if ( isset( $_POST['newcomment_author_url'] ) ) {
 		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
+	}
+	if ( isset( $_POST['comment_status'] ) ) {
 		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
+	}
+	if ( isset( $_POST['content'] ) ) {
 		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
+	}
+	if ( isset( $_POST['comment_ID'] ) ) {
 		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	}
 
-	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+	foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
+		if ( ! empty( $_POST[ 'hidden_' . $timeunit ] ) && $_POST[ 'hidden_' . $timeunit ] != $_POST[ $timeunit ] ) {
 			$_POST['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty ( $_POST['edit_date'] ) ) {
-		$aa = $_POST['aa'];
-		$mm = $_POST['mm'];
-		$jj = $_POST['jj'];
-		$hh = $_POST['hh'];
-		$mn = $_POST['mn'];
-		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
+	if ( ! empty( $_POST['edit_date'] ) ) {
+		$aa                    = $_POST['aa'];
+		$mm                    = $_POST['mm'];
+		$jj                    = $_POST['jj'];
+		$hh                    = $_POST['hh'];
+		$mn                    = $_POST['mn'];
+		$ss                    = $_POST['ss'];
+		$jj                    = ( $jj > 31 ) ? 31 : $jj;
+		$hh                    = ( $hh > 23 ) ? $hh - 24 : $hh;
+		$mn                    = ( $mn > 59 ) ? $mn - 60 : $mn;
+		$ss                    = ( $ss > 59 ) ? $ss - 60 : $ss;
 		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
 	}
 
@@ -94,10 +104,11 @@ function edit_comment() {
  * @return WP_Comment|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
+	if ( ! $comment = get_comment( $id ) ) {
 		return false;
+	}
 
-	$comment->comment_ID = (int) $comment->comment_ID;
+	$comment->comment_ID      = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
 
 	$comment->comment_content = format_to_edit( $comment->comment_content );
@@ -110,10 +121,10 @@ function get_comment_to_edit( $id ) {
 	 */
 	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
 
-	$comment->comment_author = format_to_edit( $comment->comment_author );
+	$comment->comment_author       = format_to_edit( $comment->comment_author );
 	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url = format_to_edit( $comment->comment_author_url );
-	$comment->comment_author_url = esc_url($comment->comment_author_url);
+	$comment->comment_author_url   = format_to_edit( $comment->comment_author_url );
+	$comment->comment_author_url   = esc_url( $comment->comment_author_url );
 
 	return $comment;
 }
@@ -132,33 +143,37 @@ function get_pending_comments_num( $post_id ) {
 	global $wpdb;
 
 	$single = false;
-	if ( !is_array($post_id) ) {
+	if ( ! is_array( $post_id ) ) {
 		$post_id_array = (array) $post_id;
-		$single = true;
+		$single        = true;
 	} else {
 		$post_id_array = $post_id;
 	}
-	$post_id_array = array_map('intval', $post_id_array);
-	$post_id_in = "'" . implode("', '", $post_id_array) . "'";
+	$post_id_array = array_map( 'intval', $post_id_array );
+	$post_id_in    = "'" . implode( "', '", $post_id_array ) . "'";
 
 	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
 
 	if ( $single ) {
-		if ( empty($pending) )
+		if ( empty( $pending ) ) {
 			return 0;
-		else
-			return absint($pending[0]['num_comments']);
+		} else {
+			return absint( $pending[0]['num_comments'] );
+		}
 	}
 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
-		$pending_keyed[$id] = 0;
+	foreach ( $post_id_array as $id ) {
+		$pending_keyed[ $id ] = 0;
+	}
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
-			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
+	if ( ! empty( $pending ) ) {
+		foreach ( $pending as $pend ) {
+			$pending_keyed[ $pend['comment_post_ID'] ] = absint( $pend['num_comments'] );
+		}
+	}
 
 	return $pending_keyed;
 }
@@ -180,8 +195,9 @@ function floated_admin_avatar( $name ) {
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
+	if ( 'true' == get_user_option( 'comment_shortcuts' ) ) {
 		wp_enqueue_script( 'jquery-table-hotkeys' );
+	}
 }
 
 /**
@@ -193,4 +209,4 @@ function comment_footer_die( $msg ) {
 	echo "<div class='wrap'><p>$msg</p></div>";
 	include( ABSPATH . 'wp-admin/admin-footer.php' );
 	die;
-}
\ No newline at end of file
+}
diff --git a/wp-admin/includes/continents-cities.php b/wp-admin/includes/continents-cities.php
index 2b9d2f2350..f1768dab8b 100644
--- a/wp-admin/includes/continents-cities.php
+++ b/wp-admin/includes/continents-cities.php
@@ -9,541 +9,541 @@
  * @since 2.8.0
  */
 
-__('Africa', 'continents-cities');
-__('Abidjan', 'continents-cities');
-__('Accra', 'continents-cities');
-__('Addis Ababa', 'continents-cities');
-__('Algiers', 'continents-cities');
-__('Asmara', 'continents-cities');
-__('Asmera', 'continents-cities');
-__('Bamako', 'continents-cities');
-__('Bangui', 'continents-cities');
-__('Banjul', 'continents-cities');
-__('Bissau', 'continents-cities');
-__('Blantyre', 'continents-cities');
-__('Brazzaville', 'continents-cities');
-__('Bujumbura', 'continents-cities');
-__('Cairo', 'continents-cities');
-__('Casablanca', 'continents-cities');
-__('Ceuta', 'continents-cities');
-__('Conakry', 'continents-cities');
-__('Dakar', 'continents-cities');
-__('Dar es Salaam', 'continents-cities');
-__('Djibouti', 'continents-cities');
-__('Douala', 'continents-cities');
-__('El Aaiun', 'continents-cities');
-__('Freetown', 'continents-cities');
-__('Gaborone', 'continents-cities');
-__('Harare', 'continents-cities');
-__('Johannesburg', 'continents-cities');
-__('Juba', 'continents-cities');
-__('Kampala', 'continents-cities');
-__('Khartoum', 'continents-cities');
-__('Kigali', 'continents-cities');
-__('Kinshasa', 'continents-cities');
-__('Lagos', 'continents-cities');
-__('Libreville', 'continents-cities');
-__('Lome', 'continents-cities');
-__('Luanda', 'continents-cities');
-__('Lubumbashi', 'continents-cities');
-__('Lusaka', 'continents-cities');
-__('Malabo', 'continents-cities');
-__('Maputo', 'continents-cities');
-__('Maseru', 'continents-cities');
-__('Mbabane', 'continents-cities');
-__('Mogadishu', 'continents-cities');
-__('Monrovia', 'continents-cities');
-__('Nairobi', 'continents-cities');
-__('Ndjamena', 'continents-cities');
-__('Niamey', 'continents-cities');
-__('Nouakchott', 'continents-cities');
-__('Ouagadougou', 'continents-cities');
-__('Porto-Novo', 'continents-cities');
-__('Sao Tome', 'continents-cities');
-__('Timbuktu', 'continents-cities');
-__('Tripoli', 'continents-cities');
-__('Tunis', 'continents-cities');
-__('Windhoek', 'continents-cities');
+__( 'Africa', 'continents-cities' );
+__( 'Abidjan', 'continents-cities' );
+__( 'Accra', 'continents-cities' );
+__( 'Addis Ababa', 'continents-cities' );
+__( 'Algiers', 'continents-cities' );
+__( 'Asmara', 'continents-cities' );
+__( 'Asmera', 'continents-cities' );
+__( 'Bamako', 'continents-cities' );
+__( 'Bangui', 'continents-cities' );
+__( 'Banjul', 'continents-cities' );
+__( 'Bissau', 'continents-cities' );
+__( 'Blantyre', 'continents-cities' );
+__( 'Brazzaville', 'continents-cities' );
+__( 'Bujumbura', 'continents-cities' );
+__( 'Cairo', 'continents-cities' );
+__( 'Casablanca', 'continents-cities' );
+__( 'Ceuta', 'continents-cities' );
+__( 'Conakry', 'continents-cities' );
+__( 'Dakar', 'continents-cities' );
+__( 'Dar es Salaam', 'continents-cities' );
+__( 'Djibouti', 'continents-cities' );
+__( 'Douala', 'continents-cities' );
+__( 'El Aaiun', 'continents-cities' );
+__( 'Freetown', 'continents-cities' );
+__( 'Gaborone', 'continents-cities' );
+__( 'Harare', 'continents-cities' );
+__( 'Johannesburg', 'continents-cities' );
+__( 'Juba', 'continents-cities' );
+__( 'Kampala', 'continents-cities' );
+__( 'Khartoum', 'continents-cities' );
+__( 'Kigali', 'continents-cities' );
+__( 'Kinshasa', 'continents-cities' );
+__( 'Lagos', 'continents-cities' );
+__( 'Libreville', 'continents-cities' );
+__( 'Lome', 'continents-cities' );
+__( 'Luanda', 'continents-cities' );
+__( 'Lubumbashi', 'continents-cities' );
+__( 'Lusaka', 'continents-cities' );
+__( 'Malabo', 'continents-cities' );
+__( 'Maputo', 'continents-cities' );
+__( 'Maseru', 'continents-cities' );
+__( 'Mbabane', 'continents-cities' );
+__( 'Mogadishu', 'continents-cities' );
+__( 'Monrovia', 'continents-cities' );
+__( 'Nairobi', 'continents-cities' );
+__( 'Ndjamena', 'continents-cities' );
+__( 'Niamey', 'continents-cities' );
+__( 'Nouakchott', 'continents-cities' );
+__( 'Ouagadougou', 'continents-cities' );
+__( 'Porto-Novo', 'continents-cities' );
+__( 'Sao Tome', 'continents-cities' );
+__( 'Timbuktu', 'continents-cities' );
+__( 'Tripoli', 'continents-cities' );
+__( 'Tunis', 'continents-cities' );
+__( 'Windhoek', 'continents-cities' );
 
-__('America', 'continents-cities');
-__('Adak', 'continents-cities');
-__('Anchorage', 'continents-cities');
-__('Anguilla', 'continents-cities');
-__('Antigua', 'continents-cities');
-__('Araguaina', 'continents-cities');
-__('Argentina', 'continents-cities');
-__('Buenos Aires', 'continents-cities');
-__('Catamarca', 'continents-cities');
-__('ComodRivadavia', 'continents-cities');
-__('Cordoba', 'continents-cities');
-__('Jujuy', 'continents-cities');
-__('La Rioja', 'continents-cities');
-__('Mendoza', 'continents-cities');
-__('Rio Gallegos', 'continents-cities');
-__('Salta', 'continents-cities');
-__('San Juan', 'continents-cities');
-__('San Luis', 'continents-cities');
-__('Tucuman', 'continents-cities');
-__('Ushuaia', 'continents-cities');
-__('Aruba', 'continents-cities');
-__('Asuncion', 'continents-cities');
-__('Atikokan', 'continents-cities');
-__('Atka', 'continents-cities');
-__('Bahia', 'continents-cities');
-__('Bahia Banderas', 'continents-cities');
-__('Barbados', 'continents-cities');
-__('Belem', 'continents-cities');
-__('Belize', 'continents-cities');
-__('Blanc-Sablon', 'continents-cities');
-__('Boa Vista', 'continents-cities');
-__('Bogota', 'continents-cities');
-__('Boise', 'continents-cities');
-__('Buenos Aires', 'continents-cities');
-__('Cambridge Bay', 'continents-cities');
-__('Campo Grande', 'continents-cities');
-__('Cancun', 'continents-cities');
-__('Caracas', 'continents-cities');
-__('Catamarca', 'continents-cities');
-__('Cayenne', 'continents-cities');
-__('Cayman', 'continents-cities');
-__('Chicago', 'continents-cities');
-__('Chihuahua', 'continents-cities');
-__('Coral Harbour', 'continents-cities');
-__('Cordoba', 'continents-cities');
-__('Costa Rica', 'continents-cities');
-__('Creston', 'continents-cities');
-__('Cuiaba', 'continents-cities');
-__('Curacao', 'continents-cities');
-__('Danmarkshavn', 'continents-cities');
-__('Dawson', 'continents-cities');
-__('Dawson Creek', 'continents-cities');
-__('Denver', 'continents-cities');
-__('Detroit', 'continents-cities');
-__('Dominica', 'continents-cities');
-__('Edmonton', 'continents-cities');
-__('Eirunepe', 'continents-cities');
-__('El Salvador', 'continents-cities');
-__('Ensenada', 'continents-cities');
-__('Fort Nelson', 'continents-cities');
-__('Fort Wayne', 'continents-cities');
-__('Fortaleza', 'continents-cities');
-__('Glace Bay', 'continents-cities');
-__('Godthab', 'continents-cities');
-__('Goose Bay', 'continents-cities');
-__('Grand Turk', 'continents-cities');
-__('Grenada', 'continents-cities');
-__('Guadeloupe', 'continents-cities');
-__('Guatemala', 'continents-cities');
-__('Guayaquil', 'continents-cities');
-__('Guyana', 'continents-cities');
-__('Halifax', 'continents-cities');
-__('Havana', 'continents-cities');
-__('Hermosillo', 'continents-cities');
-__('Indiana', 'continents-cities');
-__('Indianapolis', 'continents-cities');
-__('Knox', 'continents-cities');
-__('Marengo', 'continents-cities');
-__('Petersburg', 'continents-cities');
-__('Tell City', 'continents-cities');
-__('Vevay', 'continents-cities');
-__('Vincennes', 'continents-cities');
-__('Winamac', 'continents-cities');
-__('Indianapolis', 'continents-cities');
-__('Inuvik', 'continents-cities');
-__('Iqaluit', 'continents-cities');
-__('Jamaica', 'continents-cities');
-__('Jujuy', 'continents-cities');
-__('Juneau', 'continents-cities');
-__('Kentucky', 'continents-cities');
-__('Louisville', 'continents-cities');
-__('Monticello', 'continents-cities');
-__('Knox IN', 'continents-cities');
-__('Kralendijk', 'continents-cities');
-__('La Paz', 'continents-cities');
-__('Lima', 'continents-cities');
-__('Los Angeles', 'continents-cities');
-__('Louisville', 'continents-cities');
-__('Lower Princes', 'continents-cities');
-__('Maceio', 'continents-cities');
-__('Managua', 'continents-cities');
-__('Manaus', 'continents-cities');
-__('Marigot', 'continents-cities');
-__('Martinique', 'continents-cities');
-__('Matamoros', 'continents-cities');
-__('Mazatlan', 'continents-cities');
-__('Mendoza', 'continents-cities');
-__('Menominee', 'continents-cities');
-__('Merida', 'continents-cities');
-__('Metlakatla', 'continents-cities');
-__('Mexico City', 'continents-cities');
-__('Miquelon', 'continents-cities');
-__('Moncton', 'continents-cities');
-__('Monterrey', 'continents-cities');
-__('Montevideo', 'continents-cities');
-__('Montreal', 'continents-cities');
-__('Montserrat', 'continents-cities');
-__('Nassau', 'continents-cities');
-__('New York', 'continents-cities');
-__('Nipigon', 'continents-cities');
-__('Nome', 'continents-cities');
-__('Noronha', 'continents-cities');
-__('North Dakota', 'continents-cities');
-__('Beulah', 'continents-cities');
-__('Center', 'continents-cities');
-__('New Salem', 'continents-cities');
-__('Ojinaga', 'continents-cities');
-__('Panama', 'continents-cities');
-__('Pangnirtung', 'continents-cities');
-__('Paramaribo', 'continents-cities');
-__('Phoenix', 'continents-cities');
-__('Port of Spain', 'continents-cities');
-__('Port-au-Prince', 'continents-cities');
-__('Porto Acre', 'continents-cities');
-__('Porto Velho', 'continents-cities');
-__('Puerto Rico', 'continents-cities');
-__('Rainy River', 'continents-cities');
-__('Rankin Inlet', 'continents-cities');
-__('Recife', 'continents-cities');
-__('Regina', 'continents-cities');
-__('Resolute', 'continents-cities');
-__('Rio Branco', 'continents-cities');
-__('Rosario', 'continents-cities');
-__('Santa Isabel', 'continents-cities');
-__('Santarem', 'continents-cities');
-__('Santiago', 'continents-cities');
-__('Santo Domingo', 'continents-cities');
-__('Sao Paulo', 'continents-cities');
-__('Scoresbysund', 'continents-cities');
-__('Shiprock', 'continents-cities');
-__('Sitka', 'continents-cities');
-__('St Barthelemy', 'continents-cities');
-__('St Johns', 'continents-cities');
-__('St Kitts', 'continents-cities');
-__('St Lucia', 'continents-cities');
-__('St Thomas', 'continents-cities');
-__('St Vincent', 'continents-cities');
-__('Swift Current', 'continents-cities');
-__('Tegucigalpa', 'continents-cities');
-__('Thule', 'continents-cities');
-__('Thunder Bay', 'continents-cities');
-__('Tijuana', 'continents-cities');
-__('Toronto', 'continents-cities');
-__('Tortola', 'continents-cities');
-__('Vancouver', 'continents-cities');
-__('Virgin', 'continents-cities');
-__('Whitehorse', 'continents-cities');
-__('Winnipeg', 'continents-cities');
-__('Yakutat', 'continents-cities');
-__('Yellowknife', 'continents-cities');
+__( 'America', 'continents-cities' );
+__( 'Adak', 'continents-cities' );
+__( 'Anchorage', 'continents-cities' );
+__( 'Anguilla', 'continents-cities' );
+__( 'Antigua', 'continents-cities' );
+__( 'Araguaina', 'continents-cities' );
+__( 'Argentina', 'continents-cities' );
+__( 'Buenos Aires', 'continents-cities' );
+__( 'Catamarca', 'continents-cities' );
+__( 'ComodRivadavia', 'continents-cities' );
+__( 'Cordoba', 'continents-cities' );
+__( 'Jujuy', 'continents-cities' );
+__( 'La Rioja', 'continents-cities' );
+__( 'Mendoza', 'continents-cities' );
+__( 'Rio Gallegos', 'continents-cities' );
+__( 'Salta', 'continents-cities' );
+__( 'San Juan', 'continents-cities' );
+__( 'San Luis', 'continents-cities' );
+__( 'Tucuman', 'continents-cities' );
+__( 'Ushuaia', 'continents-cities' );
+__( 'Aruba', 'continents-cities' );
+__( 'Asuncion', 'continents-cities' );
+__( 'Atikokan', 'continents-cities' );
+__( 'Atka', 'continents-cities' );
+__( 'Bahia', 'continents-cities' );
+__( 'Bahia Banderas', 'continents-cities' );
+__( 'Barbados', 'continents-cities' );
+__( 'Belem', 'continents-cities' );
+__( 'Belize', 'continents-cities' );
+__( 'Blanc-Sablon', 'continents-cities' );
+__( 'Boa Vista', 'continents-cities' );
+__( 'Bogota', 'continents-cities' );
+__( 'Boise', 'continents-cities' );
+__( 'Buenos Aires', 'continents-cities' );
+__( 'Cambridge Bay', 'continents-cities' );
+__( 'Campo Grande', 'continents-cities' );
+__( 'Cancun', 'continents-cities' );
+__( 'Caracas', 'continents-cities' );
+__( 'Catamarca', 'continents-cities' );
+__( 'Cayenne', 'continents-cities' );
+__( 'Cayman', 'continents-cities' );
+__( 'Chicago', 'continents-cities' );
+__( 'Chihuahua', 'continents-cities' );
+__( 'Coral Harbour', 'continents-cities' );
+__( 'Cordoba', 'continents-cities' );
+__( 'Costa Rica', 'continents-cities' );
+__( 'Creston', 'continents-cities' );
+__( 'Cuiaba', 'continents-cities' );
+__( 'Curacao', 'continents-cities' );
+__( 'Danmarkshavn', 'continents-cities' );
+__( 'Dawson', 'continents-cities' );
+__( 'Dawson Creek', 'continents-cities' );
+__( 'Denver', 'continents-cities' );
+__( 'Detroit', 'continents-cities' );
+__( 'Dominica', 'continents-cities' );
+__( 'Edmonton', 'continents-cities' );
+__( 'Eirunepe', 'continents-cities' );
+__( 'El Salvador', 'continents-cities' );
+__( 'Ensenada', 'continents-cities' );
+__( 'Fort Nelson', 'continents-cities' );
+__( 'Fort Wayne', 'continents-cities' );
+__( 'Fortaleza', 'continents-cities' );
+__( 'Glace Bay', 'continents-cities' );
+__( 'Godthab', 'continents-cities' );
+__( 'Goose Bay', 'continents-cities' );
+__( 'Grand Turk', 'continents-cities' );
+__( 'Grenada', 'continents-cities' );
+__( 'Guadeloupe', 'continents-cities' );
+__( 'Guatemala', 'continents-cities' );
+__( 'Guayaquil', 'continents-cities' );
+__( 'Guyana', 'continents-cities' );
+__( 'Halifax', 'continents-cities' );
+__( 'Havana', 'continents-cities' );
+__( 'Hermosillo', 'continents-cities' );
+__( 'Indiana', 'continents-cities' );
+__( 'Indianapolis', 'continents-cities' );
+__( 'Knox', 'continents-cities' );
+__( 'Marengo', 'continents-cities' );
+__( 'Petersburg', 'continents-cities' );
+__( 'Tell City', 'continents-cities' );
+__( 'Vevay', 'continents-cities' );
+__( 'Vincennes', 'continents-cities' );
+__( 'Winamac', 'continents-cities' );
+__( 'Indianapolis', 'continents-cities' );
+__( 'Inuvik', 'continents-cities' );
+__( 'Iqaluit', 'continents-cities' );
+__( 'Jamaica', 'continents-cities' );
+__( 'Jujuy', 'continents-cities' );
+__( 'Juneau', 'continents-cities' );
+__( 'Kentucky', 'continents-cities' );
+__( 'Louisville', 'continents-cities' );
+__( 'Monticello', 'continents-cities' );
+__( 'Knox IN', 'continents-cities' );
+__( 'Kralendijk', 'continents-cities' );
+__( 'La Paz', 'continents-cities' );
+__( 'Lima', 'continents-cities' );
+__( 'Los Angeles', 'continents-cities' );
+__( 'Louisville', 'continents-cities' );
+__( 'Lower Princes', 'continents-cities' );
+__( 'Maceio', 'continents-cities' );
+__( 'Managua', 'continents-cities' );
+__( 'Manaus', 'continents-cities' );
+__( 'Marigot', 'continents-cities' );
+__( 'Martinique', 'continents-cities' );
+__( 'Matamoros', 'continents-cities' );
+__( 'Mazatlan', 'continents-cities' );
+__( 'Mendoza', 'continents-cities' );
+__( 'Menominee', 'continents-cities' );
+__( 'Merida', 'continents-cities' );
+__( 'Metlakatla', 'continents-cities' );
+__( 'Mexico City', 'continents-cities' );
+__( 'Miquelon', 'continents-cities' );
+__( 'Moncton', 'continents-cities' );
+__( 'Monterrey', 'continents-cities' );
+__( 'Montevideo', 'continents-cities' );
+__( 'Montreal', 'continents-cities' );
+__( 'Montserrat', 'continents-cities' );
+__( 'Nassau', 'continents-cities' );
+__( 'New York', 'continents-cities' );
+__( 'Nipigon', 'continents-cities' );
+__( 'Nome', 'continents-cities' );
+__( 'Noronha', 'continents-cities' );
+__( 'North Dakota', 'continents-cities' );
+__( 'Beulah', 'continents-cities' );
+__( 'Center', 'continents-cities' );
+__( 'New Salem', 'continents-cities' );
+__( 'Ojinaga', 'continents-cities' );
+__( 'Panama', 'continents-cities' );
+__( 'Pangnirtung', 'continents-cities' );
+__( 'Paramaribo', 'continents-cities' );
+__( 'Phoenix', 'continents-cities' );
+__( 'Port of Spain', 'continents-cities' );
+__( 'Port-au-Prince', 'continents-cities' );
+__( 'Porto Acre', 'continents-cities' );
+__( 'Porto Velho', 'continents-cities' );
+__( 'Puerto Rico', 'continents-cities' );
+__( 'Rainy River', 'continents-cities' );
+__( 'Rankin Inlet', 'continents-cities' );
+__( 'Recife', 'continents-cities' );
+__( 'Regina', 'continents-cities' );
+__( 'Resolute', 'continents-cities' );
+__( 'Rio Branco', 'continents-cities' );
+__( 'Rosario', 'continents-cities' );
+__( 'Santa Isabel', 'continents-cities' );
+__( 'Santarem', 'continents-cities' );
+__( 'Santiago', 'continents-cities' );
+__( 'Santo Domingo', 'continents-cities' );
+__( 'Sao Paulo', 'continents-cities' );
+__( 'Scoresbysund', 'continents-cities' );
+__( 'Shiprock', 'continents-cities' );
+__( 'Sitka', 'continents-cities' );
+__( 'St Barthelemy', 'continents-cities' );
+__( 'St Johns', 'continents-cities' );
+__( 'St Kitts', 'continents-cities' );
+__( 'St Lucia', 'continents-cities' );
+__( 'St Thomas', 'continents-cities' );
+__( 'St Vincent', 'continents-cities' );
+__( 'Swift Current', 'continents-cities' );
+__( 'Tegucigalpa', 'continents-cities' );
+__( 'Thule', 'continents-cities' );
+__( 'Thunder Bay', 'continents-cities' );
+__( 'Tijuana', 'continents-cities' );
+__( 'Toronto', 'continents-cities' );
+__( 'Tortola', 'continents-cities' );
+__( 'Vancouver', 'continents-cities' );
+__( 'Virgin', 'continents-cities' );
+__( 'Whitehorse', 'continents-cities' );
+__( 'Winnipeg', 'continents-cities' );
+__( 'Yakutat', 'continents-cities' );
+__( 'Yellowknife', 'continents-cities' );
 
-__('Antarctica', 'continents-cities');
-__('Casey', 'continents-cities');
-__('Davis', 'continents-cities');
-__('DumontDUrville', 'continents-cities');
-__('Macquarie', 'continents-cities');
-__('Mawson', 'continents-cities');
-__('McMurdo', 'continents-cities');
-__('Palmer', 'continents-cities');
-__('Rothera', 'continents-cities');
-__('South Pole', 'continents-cities');
-__('Syowa', 'continents-cities');
-__('Troll', 'continents-cities');
-__('Vostok', 'continents-cities');
+__( 'Antarctica', 'continents-cities' );
+__( 'Casey', 'continents-cities' );
+__( 'Davis', 'continents-cities' );
+__( 'DumontDUrville', 'continents-cities' );
+__( 'Macquarie', 'continents-cities' );
+__( 'Mawson', 'continents-cities' );
+__( 'McMurdo', 'continents-cities' );
+__( 'Palmer', 'continents-cities' );
+__( 'Rothera', 'continents-cities' );
+__( 'South Pole', 'continents-cities' );
+__( 'Syowa', 'continents-cities' );
+__( 'Troll', 'continents-cities' );
+__( 'Vostok', 'continents-cities' );
 
-__('Arctic', 'continents-cities');
-__('Longyearbyen', 'continents-cities');
+__( 'Arctic', 'continents-cities' );
+__( 'Longyearbyen', 'continents-cities' );
 
-__('Asia', 'continents-cities');
-__('Aden', 'continents-cities');
-__('Almaty', 'continents-cities');
-__('Amman', 'continents-cities');
-__('Anadyr', 'continents-cities');
-__('Aqtau', 'continents-cities');
-__('Aqtobe', 'continents-cities');
-__('Ashgabat', 'continents-cities');
-__('Ashkhabad', 'continents-cities');
-__('Baghdad', 'continents-cities');
-__('Bahrain', 'continents-cities');
-__('Baku', 'continents-cities');
-__('Bangkok', 'continents-cities');
-__('Barnaul', 'continents-cities');
-__('Beirut', 'continents-cities');
-__('Bishkek', 'continents-cities');
-__('Brunei', 'continents-cities');
-__('Calcutta', 'continents-cities');
-__('Chita', 'continents-cities');
-__('Choibalsan', 'continents-cities');
-__('Chongqing', 'continents-cities');
-__('Chungking', 'continents-cities');
-__('Colombo', 'continents-cities');
-__('Dacca', 'continents-cities');
-__('Damascus', 'continents-cities');
-__('Dhaka', 'continents-cities');
-__('Dili', 'continents-cities');
-__('Dubai', 'continents-cities');
-__('Dushanbe', 'continents-cities');
-__('Gaza', 'continents-cities');
-__('Harbin', 'continents-cities');
-__('Hebron', 'continents-cities');
-__('Ho Chi Minh', 'continents-cities');
-__('Hong Kong', 'continents-cities');
-__('Hovd', 'continents-cities');
-__('Irkutsk', 'continents-cities');
-__('Istanbul', 'continents-cities');
-__('Jakarta', 'continents-cities');
-__('Jayapura', 'continents-cities');
-__('Jerusalem', 'continents-cities');
-__('Kabul', 'continents-cities');
-__('Kamchatka', 'continents-cities');
-__('Karachi', 'continents-cities');
-__('Kashgar', 'continents-cities');
-__('Kathmandu', 'continents-cities');
-__('Katmandu', 'continents-cities');
-__('Khandyga', 'continents-cities');
-__('Kolkata', 'continents-cities');
-__('Krasnoyarsk', 'continents-cities');
-__('Kuala Lumpur', 'continents-cities');
-__('Kuching', 'continents-cities');
-__('Kuwait', 'continents-cities');
-__('Macao', 'continents-cities');
-__('Macau', 'continents-cities');
-__('Magadan', 'continents-cities');
-__('Makassar', 'continents-cities');
-__('Manila', 'continents-cities');
-__('Muscat', 'continents-cities');
-__('Nicosia', 'continents-cities');
-__('Novokuznetsk', 'continents-cities');
-__('Novosibirsk', 'continents-cities');
-__('Omsk', 'continents-cities');
-__('Oral', 'continents-cities');
-__('Phnom Penh', 'continents-cities');
-__('Pontianak', 'continents-cities');
-__('Pyongyang', 'continents-cities');
-__('Qatar', 'continents-cities');
-__('Qyzylorda', 'continents-cities');
-__('Rangoon', 'continents-cities');
-__('Riyadh', 'continents-cities');
-__('Saigon', 'continents-cities');
-__('Sakhalin', 'continents-cities');
-__('Samarkand', 'continents-cities');
-__('Seoul', 'continents-cities');
-__('Shanghai', 'continents-cities');
-__('Singapore', 'continents-cities');
-__('Srednekolymsk', 'continents-cities');
-__('Taipei', 'continents-cities');
-__('Tashkent', 'continents-cities');
-__('Tbilisi', 'continents-cities');
-__('Tehran', 'continents-cities');
-__('Tel Aviv', 'continents-cities');
-__('Thimbu', 'continents-cities');
-__('Thimphu', 'continents-cities');
-__('Tokyo', 'continents-cities');
-__('Tomsk', 'continents-cities');
-__('Ujung Pandang', 'continents-cities');
-__('Ulaanbaatar', 'continents-cities');
-__('Ulan Bator', 'continents-cities');
-__('Urumqi', 'continents-cities');
-__('Ust-Nera', 'continents-cities');
-__('Vientiane', 'continents-cities');
-__('Vladivostok', 'continents-cities');
-__('Yakutsk', 'continents-cities');
-__('Yekaterinburg', 'continents-cities');
-__('Yerevan', 'continents-cities');
+__( 'Asia', 'continents-cities' );
+__( 'Aden', 'continents-cities' );
+__( 'Almaty', 'continents-cities' );
+__( 'Amman', 'continents-cities' );
+__( 'Anadyr', 'continents-cities' );
+__( 'Aqtau', 'continents-cities' );
+__( 'Aqtobe', 'continents-cities' );
+__( 'Ashgabat', 'continents-cities' );
+__( 'Ashkhabad', 'continents-cities' );
+__( 'Baghdad', 'continents-cities' );
+__( 'Bahrain', 'continents-cities' );
+__( 'Baku', 'continents-cities' );
+__( 'Bangkok', 'continents-cities' );
+__( 'Barnaul', 'continents-cities' );
+__( 'Beirut', 'continents-cities' );
+__( 'Bishkek', 'continents-cities' );
+__( 'Brunei', 'continents-cities' );
+__( 'Calcutta', 'continents-cities' );
+__( 'Chita', 'continents-cities' );
+__( 'Choibalsan', 'continents-cities' );
+__( 'Chongqing', 'continents-cities' );
+__( 'Chungking', 'continents-cities' );
+__( 'Colombo', 'continents-cities' );
+__( 'Dacca', 'continents-cities' );
+__( 'Damascus', 'continents-cities' );
+__( 'Dhaka', 'continents-cities' );
+__( 'Dili', 'continents-cities' );
+__( 'Dubai', 'continents-cities' );
+__( 'Dushanbe', 'continents-cities' );
+__( 'Gaza', 'continents-cities' );
+__( 'Harbin', 'continents-cities' );
+__( 'Hebron', 'continents-cities' );
+__( 'Ho Chi Minh', 'continents-cities' );
+__( 'Hong Kong', 'continents-cities' );
+__( 'Hovd', 'continents-cities' );
+__( 'Irkutsk', 'continents-cities' );
+__( 'Istanbul', 'continents-cities' );
+__( 'Jakarta', 'continents-cities' );
+__( 'Jayapura', 'continents-cities' );
+__( 'Jerusalem', 'continents-cities' );
+__( 'Kabul', 'continents-cities' );
+__( 'Kamchatka', 'continents-cities' );
+__( 'Karachi', 'continents-cities' );
+__( 'Kashgar', 'continents-cities' );
+__( 'Kathmandu', 'continents-cities' );
+__( 'Katmandu', 'continents-cities' );
+__( 'Khandyga', 'continents-cities' );
+__( 'Kolkata', 'continents-cities' );
+__( 'Krasnoyarsk', 'continents-cities' );
+__( 'Kuala Lumpur', 'continents-cities' );
+__( 'Kuching', 'continents-cities' );
+__( 'Kuwait', 'continents-cities' );
+__( 'Macao', 'continents-cities' );
+__( 'Macau', 'continents-cities' );
+__( 'Magadan', 'continents-cities' );
+__( 'Makassar', 'continents-cities' );
+__( 'Manila', 'continents-cities' );
+__( 'Muscat', 'continents-cities' );
+__( 'Nicosia', 'continents-cities' );
+__( 'Novokuznetsk', 'continents-cities' );
+__( 'Novosibirsk', 'continents-cities' );
+__( 'Omsk', 'continents-cities' );
+__( 'Oral', 'continents-cities' );
+__( 'Phnom Penh', 'continents-cities' );
+__( 'Pontianak', 'continents-cities' );
+__( 'Pyongyang', 'continents-cities' );
+__( 'Qatar', 'continents-cities' );
+__( 'Qyzylorda', 'continents-cities' );
+__( 'Rangoon', 'continents-cities' );
+__( 'Riyadh', 'continents-cities' );
+__( 'Saigon', 'continents-cities' );
+__( 'Sakhalin', 'continents-cities' );
+__( 'Samarkand', 'continents-cities' );
+__( 'Seoul', 'continents-cities' );
+__( 'Shanghai', 'continents-cities' );
+__( 'Singapore', 'continents-cities' );
+__( 'Srednekolymsk', 'continents-cities' );
+__( 'Taipei', 'continents-cities' );
+__( 'Tashkent', 'continents-cities' );
+__( 'Tbilisi', 'continents-cities' );
+__( 'Tehran', 'continents-cities' );
+__( 'Tel Aviv', 'continents-cities' );
+__( 'Thimbu', 'continents-cities' );
+__( 'Thimphu', 'continents-cities' );
+__( 'Tokyo', 'continents-cities' );
+__( 'Tomsk', 'continents-cities' );
+__( 'Ujung Pandang', 'continents-cities' );
+__( 'Ulaanbaatar', 'continents-cities' );
+__( 'Ulan Bator', 'continents-cities' );
+__( 'Urumqi', 'continents-cities' );
+__( 'Ust-Nera', 'continents-cities' );
+__( 'Vientiane', 'continents-cities' );
+__( 'Vladivostok', 'continents-cities' );
+__( 'Yakutsk', 'continents-cities' );
+__( 'Yekaterinburg', 'continents-cities' );
+__( 'Yerevan', 'continents-cities' );
 
-__('Atlantic', 'continents-cities');
-__('Azores', 'continents-cities');
-__('Bermuda', 'continents-cities');
-__('Canary', 'continents-cities');
-__('Cape Verde', 'continents-cities');
-__('Faeroe', 'continents-cities');
-__('Faroe', 'continents-cities');
-__('Jan Mayen', 'continents-cities');
-__('Madeira', 'continents-cities');
-__('Reykjavik', 'continents-cities');
-__('South Georgia', 'continents-cities');
-__('St Helena', 'continents-cities');
-__('Stanley', 'continents-cities');
+__( 'Atlantic', 'continents-cities' );
+__( 'Azores', 'continents-cities' );
+__( 'Bermuda', 'continents-cities' );
+__( 'Canary', 'continents-cities' );
+__( 'Cape Verde', 'continents-cities' );
+__( 'Faeroe', 'continents-cities' );
+__( 'Faroe', 'continents-cities' );
+__( 'Jan Mayen', 'continents-cities' );
+__( 'Madeira', 'continents-cities' );
+__( 'Reykjavik', 'continents-cities' );
+__( 'South Georgia', 'continents-cities' );
+__( 'St Helena', 'continents-cities' );
+__( 'Stanley', 'continents-cities' );
 
-__('Australia', 'continents-cities');
-__('ACT', 'continents-cities');
-__('Adelaide', 'continents-cities');
-__('Brisbane', 'continents-cities');
-__('Broken Hill', 'continents-cities');
-__('Canberra', 'continents-cities');
-__('Currie', 'continents-cities');
-__('Darwin', 'continents-cities');
-__('Eucla', 'continents-cities');
-__('Hobart', 'continents-cities');
-__('LHI', 'continents-cities');
-__('Lindeman', 'continents-cities');
-__('Lord Howe', 'continents-cities');
-__('Melbourne', 'continents-cities');
-__('NSW', 'continents-cities');
-__('North', 'continents-cities');
-__('Perth', 'continents-cities');
-__('Queensland', 'continents-cities');
-__('South', 'continents-cities');
-__('Sydney', 'continents-cities');
-__('Tasmania', 'continents-cities');
-__('Victoria', 'continents-cities');
-__('West', 'continents-cities');
-__('Yancowinna', 'continents-cities');
+__( 'Australia', 'continents-cities' );
+__( 'ACT', 'continents-cities' );
+__( 'Adelaide', 'continents-cities' );
+__( 'Brisbane', 'continents-cities' );
+__( 'Broken Hill', 'continents-cities' );
+__( 'Canberra', 'continents-cities' );
+__( 'Currie', 'continents-cities' );
+__( 'Darwin', 'continents-cities' );
+__( 'Eucla', 'continents-cities' );
+__( 'Hobart', 'continents-cities' );
+__( 'LHI', 'continents-cities' );
+__( 'Lindeman', 'continents-cities' );
+__( 'Lord Howe', 'continents-cities' );
+__( 'Melbourne', 'continents-cities' );
+__( 'NSW', 'continents-cities' );
+__( 'North', 'continents-cities' );
+__( 'Perth', 'continents-cities' );
+__( 'Queensland', 'continents-cities' );
+__( 'South', 'continents-cities' );
+__( 'Sydney', 'continents-cities' );
+__( 'Tasmania', 'continents-cities' );
+__( 'Victoria', 'continents-cities' );
+__( 'West', 'continents-cities' );
+__( 'Yancowinna', 'continents-cities' );
 
-__('Etc', 'continents-cities');
-__('GMT', 'continents-cities');
-__('GMT+0', 'continents-cities');
-__('GMT+1', 'continents-cities');
-__('GMT+10', 'continents-cities');
-__('GMT+11', 'continents-cities');
-__('GMT+12', 'continents-cities');
-__('GMT+2', 'continents-cities');
-__('GMT+3', 'continents-cities');
-__('GMT+4', 'continents-cities');
-__('GMT+5', 'continents-cities');
-__('GMT+6', 'continents-cities');
-__('GMT+7', 'continents-cities');
-__('GMT+8', 'continents-cities');
-__('GMT+9', 'continents-cities');
-__('GMT-0', 'continents-cities');
-__('GMT-1', 'continents-cities');
-__('GMT-10', 'continents-cities');
-__('GMT-11', 'continents-cities');
-__('GMT-12', 'continents-cities');
-__('GMT-13', 'continents-cities');
-__('GMT-14', 'continents-cities');
-__('GMT-2', 'continents-cities');
-__('GMT-3', 'continents-cities');
-__('GMT-4', 'continents-cities');
-__('GMT-5', 'continents-cities');
-__('GMT-6', 'continents-cities');
-__('GMT-7', 'continents-cities');
-__('GMT-8', 'continents-cities');
-__('GMT-9', 'continents-cities');
-__('GMT0', 'continents-cities');
-__('Greenwich', 'continents-cities');
-__('UCT', 'continents-cities');
-__('UTC', 'continents-cities');
-__('Universal', 'continents-cities');
-__('Zulu', 'continents-cities');
+__( 'Etc', 'continents-cities' );
+__( 'GMT', 'continents-cities' );
+__( 'GMT+0', 'continents-cities' );
+__( 'GMT+1', 'continents-cities' );
+__( 'GMT+10', 'continents-cities' );
+__( 'GMT+11', 'continents-cities' );
+__( 'GMT+12', 'continents-cities' );
+__( 'GMT+2', 'continents-cities' );
+__( 'GMT+3', 'continents-cities' );
+__( 'GMT+4', 'continents-cities' );
+__( 'GMT+5', 'continents-cities' );
+__( 'GMT+6', 'continents-cities' );
+__( 'GMT+7', 'continents-cities' );
+__( 'GMT+8', 'continents-cities' );
+__( 'GMT+9', 'continents-cities' );
+__( 'GMT-0', 'continents-cities' );
+__( 'GMT-1', 'continents-cities' );
+__( 'GMT-10', 'continents-cities' );
+__( 'GMT-11', 'continents-cities' );
+__( 'GMT-12', 'continents-cities' );
+__( 'GMT-13', 'continents-cities' );
+__( 'GMT-14', 'continents-cities' );
+__( 'GMT-2', 'continents-cities' );
+__( 'GMT-3', 'continents-cities' );
+__( 'GMT-4', 'continents-cities' );
+__( 'GMT-5', 'continents-cities' );
+__( 'GMT-6', 'continents-cities' );
+__( 'GMT-7', 'continents-cities' );
+__( 'GMT-8', 'continents-cities' );
+__( 'GMT-9', 'continents-cities' );
+__( 'GMT0', 'continents-cities' );
+__( 'Greenwich', 'continents-cities' );
+__( 'UCT', 'continents-cities' );
+__( 'UTC', 'continents-cities' );
+__( 'Universal', 'continents-cities' );
+__( 'Zulu', 'continents-cities' );
 
-__('Europe', 'continents-cities');
-__('Amsterdam', 'continents-cities');
-__('Andorra', 'continents-cities');
-__('Astrakhan', 'continents-cities');
-__('Athens', 'continents-cities');
-__('Belfast', 'continents-cities');
-__('Belgrade', 'continents-cities');
-__('Berlin', 'continents-cities');
-__('Bratislava', 'continents-cities');
-__('Brussels', 'continents-cities');
-__('Bucharest', 'continents-cities');
-__('Budapest', 'continents-cities');
-__('Busingen', 'continents-cities');
-__('Chisinau', 'continents-cities');
-__('Copenhagen', 'continents-cities');
-__('Dublin', 'continents-cities');
-__('Gibraltar', 'continents-cities');
-__('Guernsey', 'continents-cities');
-__('Helsinki', 'continents-cities');
-__('Isle of Man', 'continents-cities');
-__('Istanbul', 'continents-cities');
-__('Jersey', 'continents-cities');
-__('Kaliningrad', 'continents-cities');
-__('Kiev', 'continents-cities');
-__('Kirov', 'continents-cities');
-__('Lisbon', 'continents-cities');
-__('Ljubljana', 'continents-cities');
-__('London', 'continents-cities');
-__('Luxembourg', 'continents-cities');
-__('Madrid', 'continents-cities');
-__('Malta', 'continents-cities');
-__('Mariehamn', 'continents-cities');
-__('Minsk', 'continents-cities');
-__('Monaco', 'continents-cities');
-__('Moscow', 'continents-cities');
-__('Nicosia', 'continents-cities');
-__('Oslo', 'continents-cities');
-__('Paris', 'continents-cities');
-__('Podgorica', 'continents-cities');
-__('Prague', 'continents-cities');
-__('Riga', 'continents-cities');
-__('Rome', 'continents-cities');
-__('Samara', 'continents-cities');
-__('San Marino', 'continents-cities');
-__('Sarajevo', 'continents-cities');
-__('Simferopol', 'continents-cities');
-__('Skopje', 'continents-cities');
-__('Sofia', 'continents-cities');
-__('Stockholm', 'continents-cities');
-__('Tallinn', 'continents-cities');
-__('Tirane', 'continents-cities');
-__('Tiraspol', 'continents-cities');
-__('Ulyanovsk', 'continents-cities');
-__('Uzhgorod', 'continents-cities');
-__('Vaduz', 'continents-cities');
-__('Vatican', 'continents-cities');
-__('Vienna', 'continents-cities');
-__('Vilnius', 'continents-cities');
-__('Volgograd', 'continents-cities');
-__('Warsaw', 'continents-cities');
-__('Zagreb', 'continents-cities');
-__('Zaporozhye', 'continents-cities');
-__('Zurich', 'continents-cities');
+__( 'Europe', 'continents-cities' );
+__( 'Amsterdam', 'continents-cities' );
+__( 'Andorra', 'continents-cities' );
+__( 'Astrakhan', 'continents-cities' );
+__( 'Athens', 'continents-cities' );
+__( 'Belfast', 'continents-cities' );
+__( 'Belgrade', 'continents-cities' );
+__( 'Berlin', 'continents-cities' );
+__( 'Bratislava', 'continents-cities' );
+__( 'Brussels', 'continents-cities' );
+__( 'Bucharest', 'continents-cities' );
+__( 'Budapest', 'continents-cities' );
+__( 'Busingen', 'continents-cities' );
+__( 'Chisinau', 'continents-cities' );
+__( 'Copenhagen', 'continents-cities' );
+__( 'Dublin', 'continents-cities' );
+__( 'Gibraltar', 'continents-cities' );
+__( 'Guernsey', 'continents-cities' );
+__( 'Helsinki', 'continents-cities' );
+__( 'Isle of Man', 'continents-cities' );
+__( 'Istanbul', 'continents-cities' );
+__( 'Jersey', 'continents-cities' );
+__( 'Kaliningrad', 'continents-cities' );
+__( 'Kiev', 'continents-cities' );
+__( 'Kirov', 'continents-cities' );
+__( 'Lisbon', 'continents-cities' );
+__( 'Ljubljana', 'continents-cities' );
+__( 'London', 'continents-cities' );
+__( 'Luxembourg', 'continents-cities' );
+__( 'Madrid', 'continents-cities' );
+__( 'Malta', 'continents-cities' );
+__( 'Mariehamn', 'continents-cities' );
+__( 'Minsk', 'continents-cities' );
+__( 'Monaco', 'continents-cities' );
+__( 'Moscow', 'continents-cities' );
+__( 'Nicosia', 'continents-cities' );
+__( 'Oslo', 'continents-cities' );
+__( 'Paris', 'continents-cities' );
+__( 'Podgorica', 'continents-cities' );
+__( 'Prague', 'continents-cities' );
+__( 'Riga', 'continents-cities' );
+__( 'Rome', 'continents-cities' );
+__( 'Samara', 'continents-cities' );
+__( 'San Marino', 'continents-cities' );
+__( 'Sarajevo', 'continents-cities' );
+__( 'Simferopol', 'continents-cities' );
+__( 'Skopje', 'continents-cities' );
+__( 'Sofia', 'continents-cities' );
+__( 'Stockholm', 'continents-cities' );
+__( 'Tallinn', 'continents-cities' );
+__( 'Tirane', 'continents-cities' );
+__( 'Tiraspol', 'continents-cities' );
+__( 'Ulyanovsk', 'continents-cities' );
+__( 'Uzhgorod', 'continents-cities' );
+__( 'Vaduz', 'continents-cities' );
+__( 'Vatican', 'continents-cities' );
+__( 'Vienna', 'continents-cities' );
+__( 'Vilnius', 'continents-cities' );
+__( 'Volgograd', 'continents-cities' );
+__( 'Warsaw', 'continents-cities' );
+__( 'Zagreb', 'continents-cities' );
+__( 'Zaporozhye', 'continents-cities' );
+__( 'Zurich', 'continents-cities' );
 
-__('Indian', 'continents-cities');
-__('Antananarivo', 'continents-cities');
-__('Chagos', 'continents-cities');
-__('Christmas', 'continents-cities');
-__('Cocos', 'continents-cities');
-__('Comoro', 'continents-cities');
-__('Kerguelen', 'continents-cities');
-__('Mahe', 'continents-cities');
-__('Maldives', 'continents-cities');
-__('Mauritius', 'continents-cities');
-__('Mayotte', 'continents-cities');
-__('Reunion', 'continents-cities');
+__( 'Indian', 'continents-cities' );
+__( 'Antananarivo', 'continents-cities' );
+__( 'Chagos', 'continents-cities' );
+__( 'Christmas', 'continents-cities' );
+__( 'Cocos', 'continents-cities' );
+__( 'Comoro', 'continents-cities' );
+__( 'Kerguelen', 'continents-cities' );
+__( 'Mahe', 'continents-cities' );
+__( 'Maldives', 'continents-cities' );
+__( 'Mauritius', 'continents-cities' );
+__( 'Mayotte', 'continents-cities' );
+__( 'Reunion', 'continents-cities' );
 
-__('Pacific', 'continents-cities');
-__('Apia', 'continents-cities');
-__('Auckland', 'continents-cities');
-__('Bougainville', 'continents-cities');
-__('Chatham', 'continents-cities');
-__('Chuuk', 'continents-cities');
-__('Easter', 'continents-cities');
-__('Efate', 'continents-cities');
-__('Enderbury', 'continents-cities');
-__('Fakaofo', 'continents-cities');
-__('Fiji', 'continents-cities');
-__('Funafuti', 'continents-cities');
-__('Galapagos', 'continents-cities');
-__('Gambier', 'continents-cities');
-__('Guadalcanal', 'continents-cities');
-__('Guam', 'continents-cities');
-__('Honolulu', 'continents-cities');
-__('Johnston', 'continents-cities');
-__('Kiritimati', 'continents-cities');
-__('Kosrae', 'continents-cities');
-__('Kwajalein', 'continents-cities');
-__('Majuro', 'continents-cities');
-__('Marquesas', 'continents-cities');
-__('Midway', 'continents-cities');
-__('Nauru', 'continents-cities');
-__('Niue', 'continents-cities');
-__('Norfolk', 'continents-cities');
-__('Noumea', 'continents-cities');
-__('Pago Pago', 'continents-cities');
-__('Palau', 'continents-cities');
-__('Pitcairn', 'continents-cities');
-__('Pohnpei', 'continents-cities');
-__('Ponape', 'continents-cities');
-__('Port Moresby', 'continents-cities');
-__('Rarotonga', 'continents-cities');
-__('Saipan', 'continents-cities');
-__('Samoa', 'continents-cities');
-__('Tahiti', 'continents-cities');
-__('Tarawa', 'continents-cities');
-__('Tongatapu', 'continents-cities');
-__('Truk', 'continents-cities');
-__('Wake', 'continents-cities');
-__('Wallis', 'continents-cities');
-__('Yap', 'continents-cities');
+__( 'Pacific', 'continents-cities' );
+__( 'Apia', 'continents-cities' );
+__( 'Auckland', 'continents-cities' );
+__( 'Bougainville', 'continents-cities' );
+__( 'Chatham', 'continents-cities' );
+__( 'Chuuk', 'continents-cities' );
+__( 'Easter', 'continents-cities' );
+__( 'Efate', 'continents-cities' );
+__( 'Enderbury', 'continents-cities' );
+__( 'Fakaofo', 'continents-cities' );
+__( 'Fiji', 'continents-cities' );
+__( 'Funafuti', 'continents-cities' );
+__( 'Galapagos', 'continents-cities' );
+__( 'Gambier', 'continents-cities' );
+__( 'Guadalcanal', 'continents-cities' );
+__( 'Guam', 'continents-cities' );
+__( 'Honolulu', 'continents-cities' );
+__( 'Johnston', 'continents-cities' );
+__( 'Kiritimati', 'continents-cities' );
+__( 'Kosrae', 'continents-cities' );
+__( 'Kwajalein', 'continents-cities' );
+__( 'Majuro', 'continents-cities' );
+__( 'Marquesas', 'continents-cities' );
+__( 'Midway', 'continents-cities' );
+__( 'Nauru', 'continents-cities' );
+__( 'Niue', 'continents-cities' );
+__( 'Norfolk', 'continents-cities' );
+__( 'Noumea', 'continents-cities' );
+__( 'Pago Pago', 'continents-cities' );
+__( 'Palau', 'continents-cities' );
+__( 'Pitcairn', 'continents-cities' );
+__( 'Pohnpei', 'continents-cities' );
+__( 'Ponape', 'continents-cities' );
+__( 'Port Moresby', 'continents-cities' );
+__( 'Rarotonga', 'continents-cities' );
+__( 'Saipan', 'continents-cities' );
+__( 'Samoa', 'continents-cities' );
+__( 'Tahiti', 'continents-cities' );
+__( 'Tarawa', 'continents-cities' );
+__( 'Tongatapu', 'continents-cities' );
+__( 'Truk', 'continents-cities' );
+__( 'Wake', 'continents-cities' );
+__( 'Wallis', 'continents-cities' );
+__( 'Yap', 'continents-cities' );
diff --git a/wp-admin/includes/credits.php b/wp-admin/includes/credits.php
index 9be0447402..d558e9c812 100644
--- a/wp-admin/includes/credits.php
+++ b/wp-admin/includes/credits.php
@@ -26,7 +26,7 @@ function wp_credits() {
 		|| false !== strpos( $wp_version, '-' )
 		|| ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
 	) {
-		$url = "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}";
+		$url     = "http://api.wordpress.org/core/credits/1.1/?version={$wp_version}&locale={$locale}";
 		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
 
 		if ( wp_http_supports( array( 'ssl' ) ) ) {
@@ -35,13 +35,15 @@ function wp_credits() {
 
 		$response = wp_remote_get( $url, $options );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
 			return false;
+		}
 
 		$results = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $results ) )
+		if ( ! is_array( $results ) ) {
 			return false;
+		}
 
 		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
 	}
diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index a6aaa879d3..0da446d491 100644
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -20,7 +20,7 @@
 function wp_dashboard_setup() {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks;
 	$wp_dashboard_control_callbacks = array();
-	$screen = get_current_screen();
+	$screen                         = get_current_screen();
 
 	/* Register Widgets and Controls */
 
@@ -28,18 +28,21 @@ function wp_dashboard_setup() {
 
 	if ( $response && $response['upgrade'] ) {
 		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
+		if ( $response['insecure'] ) {
 			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
-		else
+		} else {
 			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		}
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
+	if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
 		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	}
 
-	if ( is_network_admin() )
+	if ( is_network_admin() ) {
 		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	}
 
 	// Activity Widget
 	if ( is_blog_admin() ) {
@@ -109,11 +112,11 @@ function wp_dashboard_setup() {
 	}
 
 	foreach ( $dashboard_widgets as $widget_id ) {
-		$name = empty( $wp_registered_widgets[$widget_id]['all_link'] ) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __('View all') . '</a>';
-		wp_add_dashboard_widget( $widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback'] );
+		$name = empty( $wp_registered_widgets[ $widget_id ]['all_link'] ) ? $wp_registered_widgets[ $widget_id ]['name'] : $wp_registered_widgets[ $widget_id ]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __( 'View all' ) . '</a>';
+		wp_add_dashboard_widget( $widget_id, $name, $wp_registered_widgets[ $widget_id ]['callback'], $wp_registered_widget_controls[ $widget_id ]['callback'] );
 	}
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) {
+	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset( $_POST['widget_id'] ) ) {
 		check_admin_referer( 'edit-dashboard-widget_' . $_POST['widget_id'], 'dashboard-widget-nonce' );
 		ob_start(); // hack - but the same hack wp-admin/widgets.php uses
 		wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
@@ -152,18 +155,18 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_
 
 	if ( is_null( $callback_args ) ) {
 		$callback_args = $private_callback_args;
-	} else if ( is_array( $callback_args ) ) {
+	} elseif ( is_array( $callback_args ) ) {
 		$callback_args = array_merge( $callback_args, $private_callback_args );
 	}
 
 	if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) {
-		$wp_dashboard_control_callbacks[$widget_id] = $control_callback;
+		$wp_dashboard_control_callbacks[ $widget_id ] = $control_callback;
 		if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
-			list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
+			list($url)    = explode( '#', add_query_arg( 'edit', false ), 2 );
 			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
-			$callback = '_wp_dashboard_control_callback';
+			$callback     = '_wp_dashboard_control_callback';
 		} else {
-			list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
+			list($url)    = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
 			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
 		}
 	}
@@ -171,12 +174,14 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_
 	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
+	if ( in_array( $widget_id, $side_widgets ) ) {
 		$location = 'side';
+	}
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
+	if ( 'dashboard_browser_nag' === $widget_id ) {
 		$priority = 'high';
+	}
 
 	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
@@ -194,8 +199,8 @@ function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
 	echo '<form method="post" class="dashboard-widget-control-form wp-clearfix">';
 	wp_dashboard_trigger_widget_control( $meta_box['id'] );
 	wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
-	echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
-	submit_button( __('Submit') );
+	echo '<input type="hidden" name="widget_id" value="' . esc_attr( $meta_box['id'] ) . '" />';
+	submit_button( __( 'Submit' ) );
 	echo '</form>';
 }
 
@@ -205,8 +210,8 @@ function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
  * @since 2.5.0
  */
 function wp_dashboard() {
-	$screen = get_current_screen();
-	$columns = absint( $screen->get_columns() );
+	$screen      = get_current_screen();
+	$columns     = absint( $screen->get_columns() );
 	$columns_css = '';
 	if ( $columns ) {
 		$columns_css = " columns-$columns";
@@ -259,14 +264,13 @@ function wp_dashboard_right_now() {
 			} else {
 				$text = _n( '%s Page', '%s Pages', $num_posts->publish );
 			}
-			$text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
+			$text             = sprintf( $text, number_format_i18n( $num_posts->publish ) );
 			$post_type_object = get_post_type_object( $post_type );
 			if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
 				printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
 			} else {
 				printf( '<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text );
 			}
-
 		}
 	}
 	// Comments
@@ -282,11 +286,13 @@ function wp_dashboard_right_now() {
 		/* translators: %s: number of comments in moderation */
 		$aria_label = sprintf( _nx( '%s comment in moderation', '%s comments in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
 		?>
-		<li class="comment-mod-count<?php
-			if ( ! $num_comm->moderated ) {
-				echo ' hidden';
-			}
-		?>"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e( $aria_label ); ?>"><?php echo $text; ?></a></li>
+		<li class="comment-mod-count
+		<?php
+		if ( ! $num_comm->moderated ) {
+			echo ' hidden';
+		}
+		?>
+		"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e( $aria_label ); ?>"><?php echo $text; ?></a></li>
 		<?php
 	}
 
@@ -338,7 +344,7 @@ function wp_dashboard_right_now() {
 		 *
 		 * @param string $content Default text.
 		 */
-		$content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+		$content    = apply_filters( 'privacy_on_link_text', __( 'Search Engines Discouraged' ) );
 		$title_attr = '' === $title ? '' : " title='$title'";
 
 		echo "<p><a href='options-reading.php'$title_attr>$content</a></p>";
@@ -372,11 +378,13 @@ function wp_dashboard_right_now() {
 
 	$actions = ob_get_clean();
 
-	if ( !empty( $actions ) ) : ?>
+	if ( ! empty( $actions ) ) :
+	?>
 	<div class="sub">
 		<?php echo $actions; ?>
 	</div>
-	<?php endif;
+	<?php
+	endif;
 }
 
 /**
@@ -384,10 +392,12 @@ function wp_dashboard_right_now() {
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if ( current_user_can( 'create_sites' ) ) {
+		$actions['create-site'] = '<a href="' . network_admin_url( 'site-new.php' ) . '">' . __( 'Create a New Site' ) . '</a>';
+	}
+	if ( current_user_can( 'create_users' ) ) {
+		$actions['create-user'] = '<a href="' . network_admin_url( 'user-new.php' ) . '">' . __( 'Create a New User' ) . '</a>';
+	}
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
@@ -426,7 +436,7 @@ function wp_network_dashboard_right_now() {
 		do_action( 'wpmuadminresult', '' );
 	?>
 
-	<form action="<?php echo network_admin_url('users.php'); ?>" method="get">
+	<form action="<?php echo network_admin_url( 'users.php' ); ?>" method="get">
 		<p>
 			<label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
@@ -434,7 +444,7 @@ function wp_network_dashboard_right_now() {
 		</p>
 	</form>
 
-	<form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
+	<form action="<?php echo network_admin_url( 'sites.php' ); ?>" method="get">
 		<p>
 			<label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
@@ -484,11 +494,12 @@ function wp_dashboard_quick_press( $error_msg = false ) {
 			$post->post_title = ''; // Remove the auto draft title
 		}
 	} else {
-		$post = get_default_post_to_edit( 'post' , true);
+		$post    = get_default_post_to_edit( 'post', true );
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) )
+		if ( in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) {
 			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		}
 	}
 
 	$post_ID = (int) $post->ID;
@@ -545,7 +556,7 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
 			'author'         => get_current_user_id(),
 			'posts_per_page' => 4,
 			'orderby'        => 'modified',
-			'order'          => 'DESC'
+			'order'          => 'DESC',
 		);
 
 		/**
@@ -560,18 +571,18 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
 		$drafts = get_posts( $query_args );
 		if ( ! $drafts ) {
 			return;
- 		}
- 	}
+		}
+	}
 
 	echo '<div class="drafts">';
 	if ( count( $drafts ) > 3 ) {
 		echo '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '">' . __( 'View all drafts' ) . "</a></p>\n";
- 	}
+	}
 	echo '<h2 class="hide-if-no-js">' . __( 'Your Recent Drafts' ) . "</h2>\n<ul>";
 
 	$drafts = array_slice( $drafts, 0, 3 );
 	foreach ( $drafts as $draft ) {
-		$url = get_edit_post_link( $draft->ID );
+		$url   = get_edit_post_link( $draft->ID );
 		$title = _draft_or_post_title( $draft->ID );
 		echo "<li>\n";
 		/* translators: %s: post title */
@@ -579,9 +590,9 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
 		echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( __( 'F j, Y' ), $draft ) . '</time></div>';
 		if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
 			echo '<p>' . $the_content . '</p>';
- 		}
+		}
 		echo "</li>\n";
- 	}
+	}
 	echo "</ul>\n</div>";
 }
 
@@ -602,8 +613,8 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 	if ( $comment->comment_post_ID > 0 ) {
 
 		$comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
-		$comment_post_url = get_the_permalink( $comment->comment_post_ID );
-		$comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
+		$comment_post_url   = get_the_permalink( $comment->comment_post_ID );
+		$comment_post_link  = "<a href='$comment_post_url'>$comment_post_title</a>";
 	} else {
 		$comment_post_link = '';
 	}
@@ -612,28 +623,30 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 	if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
 		// Pre-order it: Approve | Reply | Edit | Spam | Trash.
 		$actions = array(
-			'approve' => '', 'unapprove' => '',
-			'reply' => '',
-			'edit' => '',
-			'spam' => '',
-			'trash' => '', 'delete' => '',
-			'view' => '',
+			'approve'   => '',
+			'unapprove' => '',
+			'reply'     => '',
+			'edit'      => '',
+			'spam'      => '',
+			'trash'     => '',
+			'delete'    => '',
+			'view'      => '',
 		);
 
-		$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
+		$del_nonce     = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
 		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
 
-		$approve_url = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
+		$approve_url   = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
 		$unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-		$spam_url = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+		$spam_url      = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+		$trash_url     = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+		$delete_url    = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
 
-		$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+		$actions['approve']   = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
 		$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>". __( 'Edit' ) . '</a>';
-		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\'' . $comment->comment_ID . '\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" aria-label="' . esc_attr__( 'Reply to this comment' ) . '" href="#">' . __( 'Reply' ) . '</a>';
-		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+		$actions['edit']      = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>" . __( 'Edit' ) . '</a>';
+		$actions['reply']     = '<a onclick="window.commentReply && commentReply.open(\'' . $comment->comment_ID . '\',\'' . $comment->comment_post_ID . '\');return false;" class="vim-r hide-if-no-js" aria-label="' . esc_attr__( 'Reply to this comment' ) . '" href="#">' . __( 'Reply' ) . '</a>';
+		$actions['spam']      = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
 
 		if ( ! EMPTY_TRASH_DAYS ) {
 			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( 'Delete Permanently' ) . '</a>';
@@ -654,12 +667,12 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 		 *                            'Delete', and 'Trash'.
 		 * @param WP_Comment $comment The comment object.
 		 */
-		$actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
+		$actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
 
 		$i = 0;
 		foreach ( $actions as $action => $link ) {
 			++$i;
-			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+			( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span
 			if ( 'reply' == $action || 'quickedit' == $action ) {
@@ -678,41 +691,41 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 
 			<?php echo get_avatar( $comment, 50, 'mystery' ); ?>
 
-			<?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?>
+			<?php if ( ! $comment->comment_type || 'comment' == $comment->comment_type ) : ?>
 
 			<div class="dashboard-comment-wrap has-row-actions">
 			<p class="comment-meta">
 			<?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
 			else :
 				switch ( $comment->comment_type ) {
-					case 'pingback' :
+					case 'pingback':
 						$type = __( 'Pingback' );
 						break;
-					case 'trackback' :
+					case 'trackback':
 						$type = __( 'Trackback' );
 						break;
-					default :
+					default:
 						$type = ucwords( $comment->comment_type );
 				}
 				$type = esc_html( $type );
@@ -721,22 +734,22 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 			<p class="comment-meta">
 			<?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>
@@ -761,24 +774,28 @@ function wp_dashboard_site_activity() {
 
 	echo '<div id="activity-widget">';
 
-	$future_posts = wp_dashboard_recent_posts( array(
-		'max'     => 5,
-		'status'  => 'future',
-		'order'   => 'ASC',
-		'title'   => __( 'Publishing Soon' ),
-		'id'      => 'future-posts',
-	) );
-	$recent_posts = wp_dashboard_recent_posts( array(
-		'max'     => 5,
-		'status'  => 'publish',
-		'order'   => 'DESC',
-		'title'   => __( 'Recently Published' ),
-		'id'      => 'published-posts',
-	) );
+	$future_posts = wp_dashboard_recent_posts(
+		array(
+			'max'    => 5,
+			'status' => 'future',
+			'order'  => 'ASC',
+			'title'  => __( 'Publishing Soon' ),
+			'id'     => 'future-posts',
+		)
+	);
+	$recent_posts = wp_dashboard_recent_posts(
+		array(
+			'max'    => 5,
+			'status' => 'publish',
+			'order'  => 'DESC',
+			'title'  => __( 'Recently Published' ),
+			'id'     => 'published-posts',
+		)
+	);
 
 	$recent_comments = wp_dashboard_recent_comments();
 
-	if ( !$future_posts && !$recent_posts && !$recent_comments ) {
+	if ( ! $future_posts && ! $recent_posts && ! $recent_comments ) {
 		echo '<div class="no-activity">';
 		echo '<p class="smiley" aria-hidden="true"></p>';
 		echo '<p>' . __( 'No activity yet!' ) . '</p>';
@@ -824,7 +841,7 @@ function wp_dashboard_recent_posts( $args ) {
 	 * @param array $query_args The arguments passed to WP_Query to produce the list of posts.
 	 */
 	$query_args = apply_filters( 'dashboard_recent_posts_query_args', $query_args );
-	$posts = new WP_Query( $query_args );
+	$posts      = new WP_Query( $query_args );
 
 	if ( $posts->have_posts() ) {
 
@@ -894,24 +911,27 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 
 	$comments_query = array(
 		'number' => $total_items * 5,
-		'offset' => 0
+		'offset' => 0,
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
+	if ( ! current_user_can( 'edit_posts' ) ) {
 		$comments_query['status'] = 'approve';
+	}
 
 	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
 		if ( ! is_array( $possible ) ) {
 			break;
 		}
 		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) {
 				continue;
+			}
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
+			if ( count( $comments ) == $total_items ) {
 				break 2;
+			}
 		}
 		$comments_query['offset'] += $comments_query['number'];
-		$comments_query['number'] = $total_items * 10;
+		$comments_query['number']  = $total_items * 10;
 	}
 
 	if ( $comments ) {
@@ -919,8 +939,9 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 		echo '<h3>' . __( 'Recent Comments' ) . '</h3>';
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
+		foreach ( $comments as $comment ) {
 			_wp_dashboard_recent_comments_row( $comment );
+		}
 		echo '</ul>';
 
 		if ( current_user_can( 'edit_posts' ) ) {
@@ -949,7 +970,7 @@ function wp_dashboard_rss_output( $widget_id ) {
 	$widgets = get_option( 'dashboard_widget_options' );
 	echo '<div class="rss-widget">';
 	wp_widget_rss_output( $widgets[ $widget_id ] );
-	echo "</div>";
+	echo '</div>';
 }
 
 /**
@@ -968,19 +989,19 @@ function wp_dashboard_rss_output( $widget_id ) {
  * @return bool False on failure. True on success.
  */
 function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
-	$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><div class="hide-if-js notice notice-error inline"><p>' . __( 'This widget requires JavaScript.' ) . '</p></div>';
+	$loading    = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><div class="hide-if-js notice notice-error inline"><p>' . __( 'This widget requires JavaScript.' ) . '</p></div>';
 	$doing_ajax = wp_doing_ajax();
 
-	if ( empty($check_urls) ) {
+	if ( empty( $check_urls ) ) {
 		$widgets = get_option( 'dashboard_widget_options' );
-		if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
+		if ( empty( $widgets[ $widget_id ]['url'] ) && ! $doing_ajax ) {
 			echo $loading;
 			return false;
 		}
-		$check_urls = array( $widgets[$widget_id]['url'] );
+		$check_urls = array( $widgets[ $widget_id ]['url'] );
 	}
 
-	$locale = get_user_locale();
+	$locale    = get_user_locale();
 	$cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
 	if ( false !== ( $output = get_transient( $cache_key ) ) ) {
 		echo $output;
@@ -1019,8 +1040,13 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar
 function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
 	global $wp_dashboard_control_callbacks;
 
-	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( 'id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id] ) );
+	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(
+				'id'       => $widget_control_id,
+				'callback' => $wp_dashboard_control_callbacks[ $widget_control_id ],
+			)
+		);
 	}
 }
 
@@ -1036,38 +1062,40 @@ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
  * @param array $form_inputs
  */
 function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
+	if ( ! $widget_options = get_option( 'dashboard_widget_options' ) ) {
 		$widget_options = array();
+	}
 
-	if ( !isset($widget_options[$widget_id]) )
-		$widget_options[$widget_id] = array();
+	if ( ! isset( $widget_options[ $widget_id ] ) ) {
+		$widget_options[ $widget_id ] = array();
+	}
 
-	$number = 1; // Hack to use wp_widget_rss_form()
-	$widget_options[$widget_id]['number'] = $number;
+	$number                                 = 1; // Hack to use wp_widget_rss_form()
+	$widget_options[ $widget_id ]['number'] = $number;
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
-		$_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
-		$widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
-		$widget_options[$widget_id]['number'] = $number;
+	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset( $_POST['widget-rss'][ $number ] ) ) {
+		$_POST['widget-rss'][ $number ]         = wp_unslash( $_POST['widget-rss'][ $number ] );
+		$widget_options[ $widget_id ]           = wp_widget_rss_process( $_POST['widget-rss'][ $number ] );
+		$widget_options[ $widget_id ]['number'] = $number;
 
 		// Title is optional. If black, fill it if possible.
-		if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
-			$rss = fetch_feed($widget_options[$widget_id]['url']);
-			if ( is_wp_error($rss) ) {
-				$widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
+		if ( ! $widget_options[ $widget_id ]['title'] && isset( $_POST['widget-rss'][ $number ]['title'] ) ) {
+			$rss = fetch_feed( $widget_options[ $widget_id ]['url'] );
+			if ( is_wp_error( $rss ) ) {
+				$widget_options[ $widget_id ]['title'] = htmlentities( __( 'Unknown Feed' ) );
 			} else {
-				$widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
+				$widget_options[ $widget_id ]['title'] = htmlentities( strip_tags( $rss->get_title() ) );
 				$rss->__destruct();
-				unset($rss);
+				unset( $rss );
 			}
 		}
 		update_option( 'dashboard_widget_options', $widget_options );
-		$locale = get_user_locale();
+		$locale    = get_user_locale();
 		$cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
 		delete_transient( $cache_key );
 	}
 
-	wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
+	wp_widget_rss_form( $widget_options[ $widget_id ], $form_inputs );
 }
 
 
@@ -1206,15 +1234,18 @@ function wp_print_community_events_templates() {
 	?>
 
 	<script id="tmpl-community-events-attend-event-near" type="text/template">
-		<?php printf(
+		<?php
+		printf(
 			/* translators: %s: the name of a city */
 			__( 'Attend an upcoming event near %s.' ),
 			'<strong>{{ data.location.description }}</strong>'
-		); ?>
+		);
+		?>
 	</script>
 
 	<script id="tmpl-community-events-could-not-locate" type="text/template">
-		<?php printf(
+		<?php
+		printf(
 			/* translators: %s is the name of the city we couldn't locate.
 			 * Replace the examples with cities in your locale, but test
 			 * that they match the expected location before including them.
@@ -1222,7 +1253,8 @@ function wp_print_community_events_templates() {
 			 */
 			__( 'We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
 			'<em>{{data.unknownCity}}</em>'
-		); ?>
+		);
+		?>
 	</script>
 
 	<script id="tmpl-community-events-event-list" type="text/template">
@@ -1249,19 +1281,23 @@ function wp_print_community_events_templates() {
 	<script id="tmpl-community-events-no-upcoming-events" type="text/template">
 		<li class="event-none">
 			<# if ( data.location.description ) { #>
-				<?php printf(
+				<?php
+				printf(
 					/* translators: 1: the city the user searched for, 2: meetup organization documentation URL */
 					__( 'There aren&#8217;t any events scheduled near %1$s at the moment. Would you like to <a href="%2$s">organize one</a>?' ),
 					'{{ data.location.description }}',
 					__( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' )
-				); ?>
+				);
+				?>
 
 			<# } else { #>
-				<?php printf(
+				<?php
+				printf(
 					/* translators: %s: meetup organization documentation URL */
 					__( 'There aren&#8217;t any events scheduled near you at the moment. Would you like to <a href="%s">organize one</a>?' ),
 					__( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' )
-				); ?>
+				);
+				?>
 			<# } #>
 		</li>
 	</script>
@@ -1276,7 +1312,7 @@ function wp_print_community_events_templates() {
  */
 function wp_dashboard_primary() {
 	$feeds = array(
-		'news' => array(
+		'news'   => array(
 
 			/**
 			 * Filters the primary link URL for the 'WordPress News' dashboard widget.
@@ -1285,7 +1321,7 @@ function wp_dashboard_primary() {
 			 *
 			 * @param string $link The widget's primary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_primary_link', __( 'https://wordpress.org/news/' ) ),
+			'link'         => apply_filters( 'dashboard_primary_link', __( 'https://wordpress.org/news/' ) ),
 
 			/**
 			 * Filters the primary feed URL for the 'WordPress News' dashboard widget.
@@ -1294,7 +1330,7 @@ function wp_dashboard_primary() {
 			 *
 			 * @param string $url The widget's primary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
+			'url'          => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
 
 			/**
 			 * Filters the primary link title for the 'WordPress News' dashboard widget.
@@ -1318,7 +1354,7 @@ function wp_dashboard_primary() {
 			 *
 			 * @param string $link The widget's secondary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
+			'link'         => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
 
 			/**
 			 * Filters the secondary feed URL for the 'WordPress News' dashboard widget.
@@ -1327,7 +1363,7 @@ function wp_dashboard_primary() {
 			 *
 			 * @param string $url The widget's secondary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
+			'url'          => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
 
 			/**
 			 * Filters the secondary link title for the 'WordPress News' dashboard widget.
@@ -1349,7 +1385,7 @@ function wp_dashboard_primary() {
 			'show_summary' => 0,
 			'show_author'  => 0,
 			'show_date'    => 0,
-		)
+		),
 	);
 
 	wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_primary_output', $feeds );
@@ -1369,7 +1405,7 @@ function wp_dashboard_primary_output( $widget_id, $feeds ) {
 		$args['type'] = $type;
 		echo '<div class="rss-widget">';
 			wp_widget_rss_output( $args['url'], $args );
-		echo "</div>";
+		echo '</div>';
 	}
 }
 
@@ -1383,18 +1419,20 @@ function wp_dashboard_primary_output( $widget_id, $feeds ) {
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
  */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
+	if ( ! is_multisite() || ! current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) ) {
 		return true;
+	}
 
 	$quota = get_space_allowed();
-	$used = get_space_used();
+	$used  = get_space_used();
 
-	if ( $used > $quota )
+	if ( $used > $quota ) {
 		$percentused = '100';
-	else
+	} else {
 		$percentused = ( $used / $quota ) * 100;
-	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
-	$used = round( $used, 2 );
+	}
+	$used_class  = ( $percentused >= 70 ) ? ' warning' : '';
+	$used        = round( $used, 2 );
 	$percentused = number_format( $percentused );
 
 	?>
@@ -1402,7 +1440,8 @@ function wp_dashboard_quota() {
 	<div class="mu-storage">
 	<ul>
 		<li class="storage-count">
-			<?php $text = sprintf(
+			<?php
+			$text = sprintf(
 				/* translators: %s: number of megabytes */
 				__( '%s MB Space Allowed' ),
 				number_format_i18n( $quota )
@@ -1412,9 +1451,11 @@ function wp_dashboard_quota() {
 				esc_url( admin_url( 'upload.php' ) ),
 				$text,
 				__( 'Manage Uploads' )
-			); ?>
+			);
+			?>
 		</li><li class="storage-count <?php echo $used_class; ?>">
-			<?php $text = sprintf(
+			<?php
+			$text = sprintf(
 				/* translators: 1: number of megabytes, 2: percentage */
 				__( '%1$s MB (%2$s%%) Space Used' ),
 				number_format_i18n( $used, 2 ),
@@ -1425,7 +1466,8 @@ function wp_dashboard_quota() {
 				esc_url( admin_url( 'upload.php' ) ),
 				$text,
 				__( 'Manage Uploads' )
-			); ?>
+			);
+			?>
 		</li>
 	</ul>
 	</div>
@@ -1434,35 +1476,38 @@ function wp_dashboard_quota() {
 
 // Display Browser Nag Meta Box
 function wp_dashboard_browser_nag() {
-	$notice = '';
+	$notice   = '';
 	$response = wp_check_browser_version();
 
 	if ( $response ) {
 		if ( $response['insecure'] ) {
 			/* translators: %s: browser name and link */
-			$msg = sprintf( __( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ),
+			$msg = sprintf(
+				__( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ),
 				sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
 			);
 		} else {
 			/* translators: %s: browser name and link */
-			$msg = sprintf( __( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ),
+			$msg = sprintf(
+				__( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ),
 				sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
 			);
 		}
 
 		$browser_nag_class = '';
-		if ( !empty( $response['img_src'] ) ) {
-			$img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
+		if ( ! empty( $response['img_src'] ) ) {
+			$img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) ) ? $response['img_src_ssl'] : $response['img_src'];
 
-			$notice .= '<div class="alignright browser-icon"><a href="' . esc_attr($response['update_url']) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
+			$notice           .= '<div class="alignright browser-icon"><a href="' . esc_attr( $response['update_url'] ) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
 			$browser_nag_class = ' has-browser-icon';
 		}
 		$notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
 
 		$browsehappy = 'https://browsehappy.com/';
-		$locale = get_user_locale();
-		if ( 'en_US' !== $locale )
+		$locale      = get_user_locale();
+		if ( 'en_US' !== $locale ) {
 			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		}
 
 		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
 		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
@@ -1470,13 +1515,13 @@ function wp_dashboard_browser_nag() {
 	}
 
 	/**
-	* Filters the notice output for the 'Browse Happy' nag meta box.
-	*
-	* @since 3.2.0
-	*
-	* @param string $notice   The notice content.
-	* @param array  $response An array containing web browser information.
-	*/
+	 * Filters the notice output for the 'Browse Happy' nag meta box.
+	 *
+	 * @since 3.2.0
+	 *
+	 * @param string $notice   The notice content.
+	 * @param array  $response An array containing web browser information.
+	 */
 	echo apply_filters( 'browse-happy-notice', $notice, $response );
 }
 
@@ -1489,8 +1534,9 @@ function wp_dashboard_browser_nag() {
 function dashboard_browser_nag_class( $classes ) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
+	if ( $response && $response['insecure'] ) {
 		$classes[] = 'browser-insecure';
+	}
 
 	return $classes;
 }
@@ -1503,19 +1549,20 @@ function dashboard_browser_nag_class( $classes ) {
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
+	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
 		return false;
+	}
 
 	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
 
-	if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+	if ( false === ( $response = get_site_transient( 'browser_' . $key ) ) ) {
 		// include an unmodified $wp_version
 		include( ABSPATH . WPINC . '/version.php' );
 
-		$url = 'http://api.wordpress.org/core/browse-happy/1.1/';
+		$url     = 'http://api.wordpress.org/core/browse-happy/1.1/';
 		$options = array(
 			'body'       => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
-			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
+			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
 		);
 
 		if ( wp_http_supports( array( 'ssl' ) ) ) {
@@ -1524,8 +1571,9 @@ function wp_check_browser_version() {
 
 		$response = wp_remote_post( $url, $options );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
 			return false;
+		}
 
 		/**
 		 * Response should be an array with:
@@ -1541,8 +1589,9 @@ function wp_check_browser_version() {
 		 */
 		$response = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $response ) )
+		if ( ! is_array( $response ) ) {
 			return false;
+		}
 
 		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
 	}
@@ -1598,16 +1647,20 @@ function wp_welcome_panel() {
 		<h3><?php _e( 'More Actions' ); ?></h3>
 		<ul>
 		<?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
-			<li><div class="welcome-icon welcome-widgets-menus"><?php
-				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' ) );
-				} elseif ( current_theme_supports( 'widgets' ) ) {
-					echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
-				} else {
-					echo '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
-				}
-			?></div></li>
+			<li><div class="welcome-icon welcome-widgets-menus">
+			<?php
+			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' )
+				);
+			} elseif ( current_theme_supports( 'widgets' ) ) {
+				echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
+			} else {
+				echo '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
+			}
+			?>
+			</div></li>
 		<?php endif; ?>
 		<?php if ( current_user_can( 'manage_options' ) ) : ?>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
diff --git a/wp-admin/includes/edit-tag-messages.php b/wp-admin/includes/edit-tag-messages.php
index 8c34f0e3aa..6dc5e7ab71 100644
--- a/wp-admin/includes/edit-tag-messages.php
+++ b/wp-admin/includes/edit-tag-messages.php
@@ -55,4 +55,4 @@ if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
 	} elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) {
 		$message = $messages['_item'][ $msg ];
 	}
-}
\ No newline at end of file
+}
diff --git a/wp-admin/includes/export.php b/wp-admin/includes/export.php
index f8d327bdf4..e60eed04ea 100644
--- a/wp-admin/includes/export.php
+++ b/wp-admin/includes/export.php
@@ -56,10 +56,15 @@ define( 'WXR_VERSION', '1.2' );
 function export_wp( $args = array() ) {
 	global $wpdb, $post;
 
-	$defaults = array( 'content' => 'all', 'author' => false, 'category' => false,
-		'start_date' => false, 'end_date' => false, 'status' => false,
+	$defaults = array(
+		'content'    => 'all',
+		'author'     => false,
+		'category'   => false,
+		'start_date' => false,
+		'end_date'   => false,
+		'status'     => false,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 
 	/**
 	 * Fires at the beginning of an export, before any headers are sent.
@@ -74,8 +79,8 @@ function export_wp( $args = array() ) {
 	if ( ! empty( $sitename ) ) {
 		$sitename .= '.';
 	}
-	$date = date( 'Y-m-d' );
-	$wp_filename = $sitename . 'wordpress.' . $date . '.xml';
+	$date        = date( 'Y-m-d' );
+	$wp_filename = $sitename . 'WordPress.' . $date . '.xml';
 	/**
 	 * Filters the export filename.
 	 *
@@ -93,38 +98,43 @@ function export_wp( $args = array() ) {
 
 	if ( 'all' != $args['content'] && post_type_exists( $args['content'] ) ) {
 		$ptype = get_post_type_object( $args['content'] );
-		if ( ! $ptype->can_export )
+		if ( ! $ptype->can_export ) {
 			$args['content'] = 'post';
+		}
 
 		$where = $wpdb->prepare( "{$wpdb->posts}.post_type = %s", $args['content'] );
 	} else {
 		$post_types = get_post_types( array( 'can_export' => true ) );
-		$esses = array_fill( 0, count($post_types), '%s' );
-		$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
+		$esses      = array_fill( 0, count( $post_types ), '%s' );
+		$where      = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
 	}
 
-	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) )
+	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) ) {
 		$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
-	else
+	} else {
 		$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
+	}
 
 	$join = '';
 	if ( $args['category'] && 'post' == $args['content'] ) {
 		if ( $term = term_exists( $args['category'], 'category' ) ) {
-			$join = "INNER JOIN {$wpdb->term_relationships} ON ({$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id)";
+			$join   = "INNER JOIN {$wpdb->term_relationships} ON ({$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id)";
 			$where .= $wpdb->prepare( " AND {$wpdb->term_relationships}.term_taxonomy_id = %d", $term['term_taxonomy_id'] );
 		}
 	}
 
 	if ( 'post' == $args['content'] || 'page' == $args['content'] || 'attachment' == $args['content'] ) {
-		if ( $args['author'] )
+		if ( $args['author'] ) {
 			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+		}
 
-		if ( $args['start_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+		if ( $args['start_date'] ) {
+			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime( $args['start_date'] ) ) );
+		}
 
-		if ( $args['end_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
+		if ( $args['end_date'] ) {
+			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime( '+1 month', strtotime( $args['end_date'] ) ) ) );
+		}
 	}
 
 	// Grab a snapshot of post IDs, just in case it changes during the export.
@@ -136,30 +146,32 @@ function export_wp( $args = array() ) {
 	 */
 	$cats = $tags = $terms = array();
 	if ( isset( $term ) && $term ) {
-		$cat = get_term( $term['term_id'], 'category' );
+		$cat  = get_term( $term['term_id'], 'category' );
 		$cats = array( $cat->term_id => $cat );
 		unset( $term, $cat );
 	} elseif ( 'all' == $args['content'] ) {
 		$categories = (array) get_categories( array( 'get' => 'all' ) );
-		$tags = (array) get_tags( array( 'get' => 'all' ) );
+		$tags       = (array) get_tags( array( 'get' => 'all' ) );
 
 		$custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
-		$custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
+		$custom_terms      = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
 
 		// Put categories in order with no child going before its parent.
 		while ( $cat = array_shift( $categories ) ) {
-			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
-				$cats[$cat->term_id] = $cat;
-			else
+			if ( $cat->parent == 0 || isset( $cats[ $cat->parent ] ) ) {
+				$cats[ $cat->term_id ] = $cat;
+			} else {
 				$categories[] = $cat;
+			}
 		}
 
 		// Put terms in order with no child going before its parent.
 		while ( $t = array_shift( $custom_terms ) ) {
-			if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
-				$terms[$t->term_id] = $t;
-			else
+			if ( $t->parent == 0 || isset( $terms[ $t->parent ] ) ) {
+				$terms[ $t->term_id ] = $t;
+			} else {
 				$custom_terms[] = $t;
+			}
 		}
 
 		unset( $categories, $custom_taxonomies, $custom_terms );
@@ -192,11 +204,12 @@ function export_wp( $args = array() ) {
 	 */
 	function wxr_site_url() {
 		// Multisite: the base URL.
-		if ( is_multisite() )
+		if ( is_multisite() ) {
 			return network_home_url();
-		// WordPress (single site): the blog URL.
-		else
+		} // WordPress (single site): the blog URL.
+		else {
 			return get_bloginfo_rss( 'url' );
+		}
 	}
 
 	/**
@@ -207,8 +220,9 @@ function export_wp( $args = array() ) {
 	 * @param object $category Category Object
 	 */
 	function wxr_cat_name( $category ) {
-		if ( empty( $category->name ) )
+		if ( empty( $category->name ) ) {
 			return;
+		}
 
 		echo '<wp:cat_name>' . wxr_cdata( $category->name ) . "</wp:cat_name>\n";
 	}
@@ -221,8 +235,9 @@ function export_wp( $args = array() ) {
 	 * @param object $category Category Object
 	 */
 	function wxr_category_description( $category ) {
-		if ( empty( $category->description ) )
+		if ( empty( $category->description ) ) {
 			return;
+		}
 
 		echo '<wp:category_description>' . wxr_cdata( $category->description ) . "</wp:category_description>\n";
 	}
@@ -235,8 +250,9 @@ function export_wp( $args = array() ) {
 	 * @param object $tag Tag Object
 	 */
 	function wxr_tag_name( $tag ) {
-		if ( empty( $tag->name ) )
+		if ( empty( $tag->name ) ) {
 			return;
+		}
 
 		echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . "</wp:tag_name>\n";
 	}
@@ -249,8 +265,9 @@ function export_wp( $args = array() ) {
 	 * @param object $tag Tag Object
 	 */
 	function wxr_tag_description( $tag ) {
-		if ( empty( $tag->description ) )
+		if ( empty( $tag->description ) ) {
 			return;
+		}
 
 		echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . "</wp:tag_description>\n";
 	}
@@ -263,8 +280,9 @@ function export_wp( $args = array() ) {
 	 * @param object $term Term Object
 	 */
 	function wxr_term_name( $term ) {
-		if ( empty( $term->name ) )
+		if ( empty( $term->name ) ) {
 			return;
+		}
 
 		echo '<wp:term_name>' . wxr_cdata( $term->name ) . "</wp:term_name>\n";
 	}
@@ -277,8 +295,9 @@ function export_wp( $args = array() ) {
 	 * @param object $term Term Object
 	 */
 	function wxr_term_description( $term ) {
-		if ( empty( $term->description ) )
+		if ( empty( $term->description ) ) {
 			return;
+		}
 
 		echo "\t\t<wp:term_description>" . wxr_cdata( $term->description ) . "</wp:term_description>\n";
 	}
@@ -326,17 +345,18 @@ function export_wp( $args = array() ) {
 	function wxr_authors_list( array $post_ids = null ) {
 		global $wpdb;
 
-		if ( !empty( $post_ids ) ) {
+		if ( ! empty( $post_ids ) ) {
 			$post_ids = array_map( 'absint', $post_ids );
-			$and = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')';
+			$and      = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')';
 		} else {
 			$and = '';
 		}
 
 		$authors = array();
 		$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
-		foreach ( (array) $results as $result )
+		foreach ( (array) $results as $result ) {
 			$authors[] = get_userdata( $result->post_author );
+		}
 
 		$authors = array_filter( $authors );
 
@@ -359,8 +379,9 @@ function export_wp( $args = array() ) {
 	 */
 	function wxr_nav_menu_terms() {
 		$nav_menus = wp_get_nav_menus();
-		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
+		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) ) {
 			return;
+		}
 
 		foreach ( $nav_menus as $menu ) {
 			echo "\t<wp:term>";
@@ -381,8 +402,9 @@ function export_wp( $args = array() ) {
 		$post = get_post();
 
 		$taxonomies = get_object_taxonomies( $post->post_type );
-		if ( empty( $taxonomies ) )
+		if ( empty( $taxonomies ) ) {
 			return;
+		}
 		$terms = wp_get_object_terms( $post->ID, $taxonomies );
 
 		foreach ( (array) $terms as $term ) {
@@ -391,19 +413,19 @@ function export_wp( $args = array() ) {
 	}
 
 	/**
-	 *
 	 * @param bool   $return_me
 	 * @param string $meta_key
 	 * @return bool
 	 */
 	function wxr_filter_postmeta( $return_me, $meta_key ) {
-		if ( '_edit_lock' == $meta_key )
+		if ( '_edit_lock' == $meta_key ) {
 			$return_me = true;
+		}
 		return $return_me;
 	}
 	add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 );
 
-	echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . "\" ?>\n";
+	echo '<?xml version="1.0" encoding="' . get_bloginfo( 'charset' ) . "\" ?>\n";
 
 	?>
 <!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your site. -->
@@ -448,19 +470,23 @@ function export_wp( $args = array() ) {
 	<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>
-		<wp:category_parent><?php echo wxr_cdata( $c->parent ? $cats[$c->parent]->slug : '' ); ?></wp:category_parent>
-		<?php wxr_cat_name( $c );
+		<wp:category_parent><?php echo wxr_cdata( $c->parent ? $cats[ $c->parent ]->slug : '' ); ?></wp:category_parent>
+		<?php
+		wxr_cat_name( $c );
 		wxr_category_description( $c );
-		wxr_term_meta( $c ); ?>
+		wxr_term_meta( $c );
+		?>
 	</wp:category>
 <?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>
-		<?php wxr_tag_name( $t );
+		<?php
+		wxr_tag_name( $t );
 		wxr_tag_description( $t );
-		wxr_term_meta( $t ); ?>
+		wxr_term_meta( $t );
+		?>
 	</wp:tag>
 <?php endforeach; ?>
 <?php foreach ( $terms as $t ) : ?>
@@ -468,20 +494,26 @@ function export_wp( $args = array() ) {
 		<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>
 		<wp:term_slug><?php echo wxr_cdata( $t->slug ); ?></wp:term_slug>
-		<wp:term_parent><?php echo wxr_cdata( $t->parent ? $terms[$t->parent]->slug : '' ); ?></wp:term_parent>
-		<?php wxr_term_name( $t );
+		<wp:term_parent><?php echo wxr_cdata( $t->parent ? $terms[ $t->parent ]->slug : '' ); ?></wp:term_parent>
+		<?php
+		wxr_term_name( $t );
 		wxr_term_description( $t );
-		wxr_term_meta( $t ); ?>
+		wxr_term_meta( $t );
+		?>
 	</wp:term>
 <?php endforeach; ?>
-<?php if ( 'all' == $args['content'] ) wxr_nav_menu_terms(); ?>
+<?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 ) {
+<?php
+if ( $post_ids ) {
 	/**
 	 * @global WP_Query $wp_query
 	 */
@@ -492,25 +524,28 @@ function export_wp( $args = array() ) {
 
 	// 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" );
+		$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
+		<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>
+		?>
+		</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>
 		<dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
 		<description></description>
-		<content:encoded><?php
+		<content:encoded>
+		<?php
 			/**
 			 * Filters the post content used for WXR exports.
 			 *
@@ -519,8 +554,10 @@ function export_wp( $args = array() ) {
 			 * @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
+		?>
+		</content:encoded>
+		<excerpt:encoded>
+		<?php
 			/**
 			 * Filters the post excerpt used for WXR exports.
 			 *
@@ -529,7 +566,8 @@ function export_wp( $args = array() ) {
 			 * @param string $post_excerpt Excerpt for the current post.
 			 */
 			echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
-		?></excerpt:encoded>
+		?>
+		</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>
 		<wp:post_date_gmt><?php echo wxr_cdata( $post->post_date_gmt ); ?></wp:post_date_gmt>
@@ -542,36 +580,40 @@ function export_wp( $args = array() ) {
 		<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 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;
+		}
 		?>
 		<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: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  = 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>
@@ -580,41 +622,43 @@ function export_wp( $args = array() ) {
 			<wp:comment_author_IP><?php echo wxr_cdata( $c->comment_author_IP ); ?></wp:comment_author_IP>
 			<wp:comment_date><?php echo wxr_cdata( $c->comment_date ); ?></wp:comment_date>
 			<wp:comment_date_gmt><?php echo wxr_cdata( $c->comment_date_gmt ); ?></wp:comment_date_gmt>
-			<wp:comment_content><?php echo wxr_cdata( $c->comment_content ) ?></wp:comment_content>
+			<wp:comment_content><?php echo wxr_cdata( $c->comment_content ); ?></wp:comment_content>
 			<wp:comment_approved><?php echo wxr_cdata( $c->comment_approved ); ?></wp:comment_approved>
 			<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;
-				}
-			?>
-			<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>
+<?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; ?>
-	</item>
-<?php
+		</item>
+	<?php
+		}
 	}
-	}
-} ?>
+}
+?>
 </channel>
 </rss>
 <?php
diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php
index 1a792b9087..4c42c5be3e 100644
--- a/wp-admin/includes/file.php
+++ b/wp-admin/includes/file.php
@@ -105,9 +105,9 @@ function get_home_path() {
 	$siteurl = set_url_scheme( get_option( 'siteurl' ), 'http' );
 	if ( ! empty( $home ) && 0 !== strcasecmp( $home, $siteurl ) ) {
 		$wp_path_rel_to_home = str_ireplace( $home, '', $siteurl ); /* $siteurl - $home */
-		$pos = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), trailingslashit( $wp_path_rel_to_home ) );
-		$home_path = substr( $_SERVER['SCRIPT_FILENAME'], 0, $pos );
-		$home_path = trailingslashit( $home_path );
+		$pos                 = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), trailingslashit( $wp_path_rel_to_home ) );
+		$home_path           = substr( $_SERVER['SCRIPT_FILENAME'], 0, $pos );
+		$home_path           = trailingslashit( $home_path );
 	} else {
 		$home_path = ABSPATH;
 	}
@@ -156,7 +156,7 @@ function list_files( $folder = '', $levels = 100, $exclusions = array() ) {
 			if ( is_dir( $folder . $file ) ) {
 				$files2 = list_files( $folder . $file, $levels - 1 );
 				if ( $files2 ) {
-					$files = array_merge($files, $files2 );
+					$files = array_merge( $files, $files2 );
 				} else {
 					$files[] = $folder . $file . '/';
 				}
@@ -367,8 +367,8 @@ function wp_edit_theme_plugin_file( $args ) {
 		return new WP_Error( 'missing_nonce' );
 	}
 
-	$plugin = null;
-	$theme = null;
+	$plugin    = null;
+	$theme     = null;
 	$real_file = null;
 	if ( ! empty( $args['plugin'] ) ) {
 		$plugin = $args['plugin'];
@@ -434,9 +434,9 @@ function wp_edit_theme_plugin_file( $args ) {
 					$allowed_files = array_merge( $allowed_files, $theme->get_files( 'php', -1 ) );
 					break;
 				case 'css':
-					$style_files = $theme->get_files( 'css', -1 );
+					$style_files                = $theme->get_files( 'css', -1 );
 					$allowed_files['style.css'] = $style_files['style.css'];
-					$allowed_files = array_merge( $allowed_files, $style_files );
+					$allowed_files              = array_merge( $allowed_files, $style_files );
 					break;
 				default:
 					$allowed_files = array_merge( $allowed_files, $theme->get_files( $type, -1 ) );
@@ -493,17 +493,17 @@ function wp_edit_theme_plugin_file( $args ) {
 
 	if ( $is_active && 'php' === $extension ) {
 
-		$scrape_key = md5( rand() );
-		$transient = 'scrape_key_' . $scrape_key;
+		$scrape_key   = md5( rand() );
+		$transient    = 'scrape_key_' . $scrape_key;
 		$scrape_nonce = strval( rand() );
 		set_transient( $transient, $scrape_nonce, 60 ); // It shouldn't take more than 60 seconds to make the two loopback requests.
 
-		$cookies = wp_unslash( $_COOKIE );
+		$cookies       = wp_unslash( $_COOKIE );
 		$scrape_params = array(
-			'wp_scrape_key' => $scrape_key,
+			'wp_scrape_key'   => $scrape_key,
 			'wp_scrape_nonce' => $scrape_nonce,
 		);
-		$headers = array(
+		$headers       = array(
 			'Cache-Control' => 'no-cache',
 		);
 
@@ -519,7 +519,7 @@ function wp_edit_theme_plugin_file( $args ) {
 		$timeout = 100;
 
 		$needle_start = "###### wp_scraping_result_start:$scrape_key ######";
-		$needle_end = "###### wp_scraping_result_end:$scrape_key ######";
+		$needle_end   = "###### wp_scraping_result_end:$scrape_key ######";
 
 		// Attempt loopback request to editor to see if user just whitescreened themselves.
 		if ( $plugin ) {
@@ -528,23 +528,23 @@ function wp_edit_theme_plugin_file( $args ) {
 			$url = add_query_arg(
 				array(
 					'theme' => $stylesheet,
-					'file' => $file,
+					'file'  => $file,
 				),
 				admin_url( 'theme-editor.php' )
 			);
 		} else {
 			$url = admin_url();
 		}
-		$url = add_query_arg( $scrape_params, $url );
-		$r = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout' ) );
-		$body = wp_remote_retrieve_body( $r );
+		$url                    = add_query_arg( $scrape_params, $url );
+		$r                      = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout' ) );
+		$body                   = wp_remote_retrieve_body( $r );
 		$scrape_result_position = strpos( $body, $needle_start );
 
 		$loopback_request_failure = array(
-			'code' => 'loopback_request_failed',
+			'code'    => 'loopback_request_failed',
 			'message' => __( 'Unable to communicate back with site to check for fatal errors, so the PHP change was reverted. You will need to upload your PHP file change by some other means, such as by using SFTP.' ),
 		);
-		$json_parse_failure = array(
+		$json_parse_failure       = array(
 			'code' => 'json_parse_error',
 		);
 
@@ -554,7 +554,7 @@ function wp_edit_theme_plugin_file( $args ) {
 		} else {
 			$error_output = substr( $body, $scrape_result_position + strlen( $needle_start ) );
 			$error_output = substr( $error_output, 0, strpos( $error_output, $needle_end ) );
-			$result = json_decode( trim( $error_output ), true );
+			$result       = json_decode( trim( $error_output ), true );
 			if ( empty( $result ) ) {
 				$result = $json_parse_failure;
 			}
@@ -562,10 +562,10 @@ function wp_edit_theme_plugin_file( $args ) {
 
 		// Try making request to homepage as well to see if visitors have been whitescreened.
 		if ( true === $result ) {
-			$url = home_url( '/' );
-			$url = add_query_arg( $scrape_params, $url );
-			$r = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout' ) );
-			$body = wp_remote_retrieve_body( $r );
+			$url                    = home_url( '/' );
+			$url                    = add_query_arg( $scrape_params, $url );
+			$r                      = wp_remote_get( $url, compact( 'cookies', 'headers', 'timeout' ) );
+			$body                   = wp_remote_retrieve_body( $r );
 			$scrape_result_position = strpos( $body, $needle_start );
 
 			if ( false === $scrape_result_position ) {
@@ -573,7 +573,7 @@ function wp_edit_theme_plugin_file( $args ) {
 			} else {
 				$error_output = substr( $body, $scrape_result_position + strlen( $needle_start ) );
 				$error_output = substr( $error_output, 0, strpos( $error_output, $needle_end ) );
-				$result = json_decode( trim( $error_output ), true );
+				$result       = json_decode( trim( $error_output ), true );
 				if ( empty( $result ) ) {
 					$result = $json_parse_failure;
 				}
@@ -642,7 +642,7 @@ function wp_tempnam( $filename = '', $dir = '' ) {
 	// Suffix some random data to avoid filename conflicts
 	$temp_filename .= '-' . wp_generate_password( 6, false );
 	$temp_filename .= '.tmp';
-	$temp_filename = $dir . wp_unique_filename( $dir, $temp_filename );
+	$temp_filename  = $dir . wp_unique_filename( $dir, $temp_filename );
 
 	$fp = @fopen( $temp_filename, 'x' );
 	if ( ! $fp && is_writable( $dir ) && file_exists( $temp_filename ) ) {
@@ -669,17 +669,18 @@ function wp_tempnam( $filename = '', $dir = '' ) {
 function validate_file_to_edit( $file, $allowed_files = array() ) {
 	$code = validate_file( $file, $allowed_files );
 
-	if (!$code )
+	if ( ! $code ) {
 		return $file;
+	}
 
 	switch ( $code ) {
-		case 1 :
+		case 1:
 			wp_die( __( 'Sorry, that file cannot be edited.' ) );
 
-		// case 2 :
-		// wp_die( __('Sorry, can&#8217;t call files with their real path.' ));
+			// case 2 :
+			// wp_die( __('Sorry, can&#8217;t call files with their real path.' ));
 
-		case 3 :
+		case 3:
 			wp_die( __( 'Sorry, that file cannot be edited.' ) );
 	}
 }
@@ -756,7 +757,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
 			'',
 			__( 'Missing a temporary folder.' ),
 			__( 'Failed to write file to disk.' ),
-			__( 'File upload stopped by extension.' )
+			__( 'File upload stopped by extension.' ),
 		);
 	}
 
@@ -766,7 +767,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
 
 	// If you override this, you must provide $ext and $type!!
 	$test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
-	$mimes = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
+	$mimes     = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
 
 	// A correct form post will pass this test.
 	if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) {
@@ -796,16 +797,16 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
 
 	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
 	if ( $test_type ) {
-		$wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes );
-		$ext = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
-		$type = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type'];
+		$wp_filetype     = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes );
+		$ext             = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
+		$type            = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type'];
 		$proper_filename = empty( $wp_filetype['proper_filename'] ) ? '' : $wp_filetype['proper_filename'];
 
 		// Check to see if wp_check_filetype_and_ext() determined the filename was incorrect
 		if ( $proper_filename ) {
 			$file['name'] = $proper_filename;
 		}
-		if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
+		if ( ( ! $type || ! $ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
 			return call_user_func_array( $upload_error_handler, array( &$file, __( 'Sorry, this file type is not permitted for security reasons.' ) ) );
 		}
 		if ( ! $type ) {
@@ -828,7 +829,7 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
 	// Move the file to the uploads dir.
 	$new_file = $uploads['path'] . "/$filename";
 
- 	/**
+	/**
 	 * Filters whether to short-circuit moving the uploaded file after passing all checks.
 	 *
 	 * If a non-null value is passed to the filter, moving the file and any related error
@@ -858,12 +859,12 @@ function _wp_handle_upload( &$file, $overrides, $time, $action ) {
 			} else {
 				$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
 			}
-			return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
+			return $upload_error_handler( $file, sprintf( __( 'The uploaded file could not be moved to %s.' ), $error_path ) );
 		}
 	}
 
 	// Set correct file permissions.
-	$stat = stat( dirname( $new_file ));
+	$stat  = stat( dirname( $new_file ) );
 	$perms = $stat['mode'] & 0000666;
 	@ chmod( $new_file, $perms );
 
@@ -888,11 +889,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(
-		'file' => $new_file,
-		'url'  => $url,
-		'type' => $type
-	), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' );
+	return apply_filters(
+		'wp_handle_upload', array(
+			'file' => $new_file,
+			'url'  => $url,
+			'type' => $type,
+		), 'wp_handle_sideload' === $action ? 'sideload' : 'upload'
+	);
 }
 
 /**
@@ -966,23 +969,31 @@ function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
  */
 function download_url( $url, $timeout = 300 ) {
 	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
-		return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+	if ( ! $url ) {
+		return new WP_Error( 'http_no_url', __( 'Invalid URL Provided.' ) );
+	}
 
 	$url_filename = basename( parse_url( $url, PHP_URL_PATH ) );
 
 	$tmpfname = wp_tempnam( $url_filename );
-	if ( ! $tmpfname )
-		return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+	if ( ! $tmpfname ) {
+		return new WP_Error( 'http_no_file', __( 'Could not create Temporary file.' ) );
+	}
 
-	$response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+	$response = wp_safe_remote_get(
+		$url, array(
+			'timeout'  => $timeout,
+			'stream'   => true,
+			'filename' => $tmpfname,
+		)
+	);
 
 	if ( is_wp_error( $response ) ) {
 		unlink( $tmpfname );
 		return $response;
 	}
 
-	if ( 200 != wp_remote_retrieve_response_code( $response ) ){
+	if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
 		unlink( $tmpfname );
 		return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
 	}
@@ -1009,17 +1020,19 @@ function download_url( $url, $timeout = 300 ) {
  * @return bool|object WP_Error on failure, true on success, false when the MD5 format is unknown/unexpected
  */
 function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) )
+	if ( 32 == strlen( $expected_md5 ) ) {
 		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	elseif ( 24 == strlen( $expected_md5 ) )
+	} elseif ( 24 == strlen( $expected_md5 ) ) {
 		$expected_raw_md5 = base64_decode( $expected_md5 );
-	else
+	} else {
 		return false; // unknown format
+	}
 
 	$file_md5 = md5_file( $filename, true );
 
-	if ( $file_md5 === $expected_raw_md5 )
+	if ( $file_md5 === $expected_raw_md5 ) {
 		return true;
+	}
 
 	return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
 }
@@ -1039,33 +1052,37 @@ function verify_file_md5( $filename, $expected_md5 ) {
  * @param string $to Full path on the filesystem to extract archive to
  * @return mixed WP_Error on failure, True on success
  */
-function unzip_file($file, $to) {
+function unzip_file( $file, $to ) {
 	global $wp_filesystem;
 
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! $wp_filesystem || ! is_object( $wp_filesystem ) ) {
+		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+	}
 
 	// Unzip can use a lot of memory, but not this much hopefully.
 	wp_raise_memory_limit( 'admin' );
 
 	$needed_dirs = array();
-	$to = trailingslashit($to);
+	$to          = trailingslashit( $to );
 
 	// Determine any parent dir's needed (of the upgrade directory)
-	if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
-		$path = preg_split('![/\\\]!', untrailingslashit($to));
-		for ( $i = count($path); $i >= 0; $i-- ) {
-			if ( empty($path[$i]) )
+	if ( ! $wp_filesystem->is_dir( $to ) ) { //Only do parents if no children exist
+		$path = preg_split( '![/\\\]!', untrailingslashit( $to ) );
+		for ( $i = count( $path ); $i >= 0; $i-- ) {
+			if ( empty( $path[ $i ] ) ) {
 				continue;
+			}
 
-			$dir = implode('/', array_slice($path, 0, $i+1) );
-			if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
+			$dir = implode( '/', array_slice( $path, 0, $i + 1 ) );
+			if ( preg_match( '!^[a-z]:$!i', $dir ) ) { // Skip it if it looks like a Windows Drive letter.
 				continue;
+			}
 
-			if ( ! $wp_filesystem->is_dir($dir) )
+			if ( ! $wp_filesystem->is_dir( $dir ) ) {
 				$needed_dirs[] = $dir;
-			else
+			} else {
 				break; // A folder exists, therefor, we dont need the check the levels below this
+			}
 		}
 	}
 
@@ -1077,16 +1094,17 @@ function unzip_file($file, $to) {
 	 * @param bool $ziparchive Whether to use ZipArchive. Default true.
 	 */
 	if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
-		$result = _unzip_file_ziparchive($file, $to, $needed_dirs);
+		$result = _unzip_file_ziparchive( $file, $to, $needed_dirs );
 		if ( true === $result ) {
 			return $result;
-		} elseif ( is_wp_error($result) ) {
-			if ( 'incompatible_archive' != $result->get_error_code() )
+		} elseif ( is_wp_error( $result ) ) {
+			if ( 'incompatible_archive' != $result->get_error_code() ) {
 				return $result;
+			}
 		}
 	}
 	// Fall through to PclZip if ZipArchive is not available, or encountered an error opening the file.
-	return _unzip_file_pclzip($file, $to, $needed_dirs);
+	return _unzip_file_pclzip( $file, $to, $needed_dirs );
 }
 
 /**
@@ -1104,23 +1122,26 @@ function unzip_file($file, $to) {
  * @param array $needed_dirs A partial list of required folders needed to be created.
  * @return mixed WP_Error on failure, True on success
  */
-function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
+function _unzip_file_ziparchive( $file, $to, $needed_dirs = array() ) {
 	global $wp_filesystem;
 
 	$z = new ZipArchive();
 
 	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
-	if ( true !== $zopen )
+	if ( true !== $zopen ) {
 		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	}
 
 	$uncompressed_size = 0;
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
+		if ( ! $info = $z->statIndex( $i ) ) {
 			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr( $info['name'], 0, 9 ) ) { // Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		// Don't extract invalid files:
 		if ( 0 !== validate_file( $info['name'] ) ) {
@@ -1145,25 +1166,28 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
 	 */
 	if ( wp_doing_cron() ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
 			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
-	}
-
-	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
-		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
-			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
-			continue;
-
-		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
-			$needed_dirs[] = $parent_folder;
-			$parent_folder = dirname($parent_folder);
 		}
 	}
-	asort($needed_dirs);
+
+	$needed_dirs = array_unique( $needed_dirs );
+	foreach ( $needed_dirs as $dir ) {
+		// Check the parent folders of the folders all exist within the creation array.
+		if ( untrailingslashit( $to ) == $dir ) { // Skip over the working directory, We know this exists (or will exist)
+			continue;
+		}
+		if ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, Skip it
+			continue;
+		}
+
+		$parent_folder = dirname( $dir );
+		while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs ) ) {
+			$needed_dirs[] = $parent_folder;
+			$parent_folder = dirname( $parent_folder );
+		}
+	}
+	asort( $needed_dirs );
 
 	// Create those directories if need be:
 	foreach ( $needed_dirs as $_dir ) {
@@ -1172,29 +1196,34 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
 			return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
 		}
 	}
-	unset($needed_dirs);
+	unset( $needed_dirs );
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
+		if ( ! $info = $z->statIndex( $i ) ) {
 			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ( '/' == substr( $info['name'], -1 ) ) { // directory
 			continue;
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr( $info['name'], 0, 9 ) ) { // Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
 		// Don't extract invalid files:
 		if ( 0 !== validate_file( $info['name'] ) ) {
 			continue;
 		}
 
-		$contents = $z->getFromIndex($i);
-		if ( false === $contents )
+		$contents = $z->getFromIndex( $i );
+		if ( false === $contents ) {
 			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
+		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE ) ) {
 			return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		}
 	}
 
 	$z->close();
@@ -1217,36 +1246,39 @@ function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
  * @param array $needed_dirs A partial list of required folders needed to be created.
  * @return mixed WP_Error on failure, True on success
  */
-function _unzip_file_pclzip($file, $to, $needed_dirs = array()) {
+function _unzip_file_pclzip( $file, $to, $needed_dirs = array() ) {
 	global $wp_filesystem;
 
 	mbstring_binary_safe_encoding();
 
-	require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+	require_once( ABSPATH . 'wp-admin/includes/class-pclzip.php' );
 
-	$archive = new PclZip($file);
+	$archive = new PclZip( $file );
 
-	$archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING);
+	$archive_files = $archive->extract( PCLZIP_OPT_EXTRACT_AS_STRING );
 
 	reset_mbstring_encoding();
 
 	// Is the archive valid?
-	if ( !is_array($archive_files) )
-		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+	if ( ! is_array( $archive_files ) ) {
+		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), $archive->errorInfo( true ) );
+	}
 
-	if ( 0 == count($archive_files) )
+	if ( 0 == count( $archive_files ) ) {
 		return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	}
 
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive)
 	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr( $file['filename'], 0, 9 ) ) { // Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		$uncompressed_size += $file['size'];
 
-		$needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
+		$needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname( $file['filename'] ) );
 	}
 
 	/*
@@ -1256,49 +1288,56 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) {
 	 */
 	if ( wp_doing_cron() ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
 			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
-	}
-
-	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
-		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
-			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
-			continue;
-
-		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
-			$needed_dirs[] = $parent_folder;
-			$parent_folder = dirname($parent_folder);
 		}
 	}
-	asort($needed_dirs);
+
+	$needed_dirs = array_unique( $needed_dirs );
+	foreach ( $needed_dirs as $dir ) {
+		// Check the parent folders of the folders all exist within the creation array.
+		if ( untrailingslashit( $to ) == $dir ) { // Skip over the working directory, We know this exists (or will exist)
+			continue;
+		}
+		if ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, Skip it
+			continue;
+		}
+
+		$parent_folder = dirname( $dir );
+		while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs ) ) {
+			$needed_dirs[] = $parent_folder;
+			$parent_folder = dirname( $parent_folder );
+		}
+	}
+	asort( $needed_dirs );
 
 	// Create those directories if need be:
 	foreach ( $needed_dirs as $_dir ) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
+		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
 			return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		}
 	}
-	unset($needed_dirs);
+	unset( $needed_dirs );
 
 	// Extract the files from the zip
 	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] )
+		if ( $file['folder'] ) {
 			continue;
+		}
 
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr( $file['filename'], 0, 9 ) ) { // Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
 		// Don't extract invalid files:
 		if ( 0 !== validate_file( $file['filename'] ) ) {
 			continue;
 		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
+		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE ) ) {
 			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		}
 	}
 	return true;
 }
@@ -1316,41 +1355,46 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) {
  * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function copy_dir($from, $to, $skip_list = array() ) {
+function copy_dir( $from, $to, $skip_list = array() ) {
 	global $wp_filesystem;
 
-	$dirlist = $wp_filesystem->dirlist($from);
+	$dirlist = $wp_filesystem->dirlist( $from );
 
-	$from = trailingslashit($from);
-	$to = trailingslashit($to);
+	$from = trailingslashit( $from );
+	$to   = trailingslashit( $to );
 
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
+		if ( in_array( $filename, $skip_list ) ) {
 			continue;
+		}
 
 		if ( 'f' == $fileinfo['type'] ) {
-			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+			if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
 				// If copy failed, chmod file to 0644 and try again.
 				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
+				if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
 					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				}
 			}
 		} elseif ( 'd' == $fileinfo['type'] ) {
-			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
+			if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
+				if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) {
 					return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				}
 			}
 
 			// generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
 			$sub_skip_list = array();
 			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
+				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
 					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				}
 			}
 
-			$result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
+			$result = copy_dir( $from . $filename, $to . $filename, $sub_skip_list );
+			if ( is_wp_error( $result ) ) {
 				return $result;
+			}
 		}
 	}
 	return true;
@@ -1376,12 +1420,13 @@ function copy_dir($from, $to, $skip_list = array() ) {
 function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) {
 	global $wp_filesystem;
 
-	require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php' );
 
 	$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
 
-	if ( ! $method )
+	if ( ! $method ) {
 		return false;
+	}
 
 	if ( ! class_exists( "WP_Filesystem_$method" ) ) {
 
@@ -1397,32 +1442,39 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
 		 */
 		$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
 
-		if ( ! file_exists($abstraction_file) )
+		if ( ! file_exists( $abstraction_file ) ) {
 			return;
+		}
 
-		require_once($abstraction_file);
+		require_once( $abstraction_file );
 	}
 	$method = "WP_Filesystem_$method";
 
-	$wp_filesystem = new $method($args);
+	$wp_filesystem = new $method( $args );
 
 	//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
-	if ( ! defined('FS_CONNECT_TIMEOUT') )
-		define('FS_CONNECT_TIMEOUT', 30);
-	if ( ! defined('FS_TIMEOUT') )
-		define('FS_TIMEOUT', 30);
+	if ( ! defined( 'FS_CONNECT_TIMEOUT' ) ) {
+		define( 'FS_CONNECT_TIMEOUT', 30 );
+	}
+	if ( ! defined( 'FS_TIMEOUT' ) ) {
+		define( 'FS_TIMEOUT', 30 );
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
 		return false;
+	}
 
-	if ( !$wp_filesystem->connect() )
+	if ( ! $wp_filesystem->connect() ) {
 		return false; //There was an error connecting to the server.
+	}
 
 	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	if ( ! defined( 'FS_CHMOD_DIR' ) ) {
+		define( 'FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
+	}
+	if ( ! defined( 'FS_CHMOD_FILE' ) ) {
+		define( 'FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	}
 
 	return true;
 }
@@ -1454,7 +1506,7 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
  * @return string The transport to use, see description for valid return values.
  */
 function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) {
-	$method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
+	$method = defined( 'FS_METHOD' ) ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
 
 	if ( ! $context ) {
 		$context = WP_CONTENT_DIR;
@@ -1470,36 +1522,42 @@ function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_f
 	if ( ! $method ) {
 
 		$temp_file_name = $context . 'temp-write-test-' . str_replace( '.', '-', uniqid( '', true ) );
-		$temp_handle = @fopen($temp_file_name, 'w');
+		$temp_handle    = @fopen( $temp_file_name, 'w' );
 		if ( $temp_handle ) {
 
 			// Attempt to determine the file owner of the WordPress files, and that of newly created files
 			$wp_file_owner = $temp_file_owner = false;
-			if ( function_exists('fileowner') ) {
-				$wp_file_owner = @fileowner( __FILE__ );
+			if ( function_exists( 'fileowner' ) ) {
+				$wp_file_owner   = @fileowner( __FILE__ );
 				$temp_file_owner = @fileowner( $temp_file_name );
 			}
 
 			if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
 				// WordPress is creating files as the same owner as the WordPress files,
 				// this means it's safe to modify & create new files via PHP.
-				$method = 'direct';
+				$method                                  = 'direct';
 				$GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
 			} elseif ( $allow_relaxed_file_ownership ) {
 				// The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
 				// safely in this directory. This mode doesn't create new files, only alter existing ones.
-				$method = 'direct';
+				$method                                  = 'direct';
 				$GLOBALS['_wp_filesystem_direct_method'] = 'relaxed_ownership';
 			}
 
-			@fclose($temp_handle);
-			@unlink($temp_file_name);
+			@fclose( $temp_handle );
+			@unlink( $temp_file_name );
 		}
- 	}
+	}
 
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	if ( ! $method && isset( $args['connection_type'] ) && 'ssh' == $args['connection_type'] && extension_loaded( 'ssh2' ) && function_exists( 'stream_get_contents' ) ) {
+		$method = 'ssh2';
+	}
+	if ( ! $method && extension_loaded( 'ftp' ) ) {
+		$method = 'ftpext';
+	}
+	if ( ! $method && ( extension_loaded( 'sockets' ) || function_exists( 'fsockopen' ) ) ) {
+		$method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	}
 
 	/**
 	 * Filters the filesystem method to use.
@@ -1566,20 +1624,28 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 	 * @param array  $extra_fields                 Extra POST fields.
 	 */
 	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
-	if ( '' !== $req_cred )
+	if ( '' !== $req_cred ) {
 		return $req_cred;
+	}
 
-	if ( empty($type) ) {
+	if ( empty( $type ) ) {
 		$type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
 	}
 
-	if ( 'direct' == $type )
+	if ( 'direct' == $type ) {
 		return true;
+	}
 
-	if ( is_null( $extra_fields ) )
+	if ( is_null( $extra_fields ) ) {
 		$extra_fields = array( 'version', 'locale' );
+	}
 
-	$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
+	$credentials = get_option(
+		'ftp_credentials', array(
+			'hostname' => '',
+			'username' => '',
+		)
+	);
 
 	$submitted_form = wp_unslash( $_POST );
 
@@ -1596,23 +1662,24 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 	}
 
 	// If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
-	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($submitted_form['hostname']) ? $submitted_form['hostname'] : $credentials['hostname']);
-	$credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($submitted_form['username']) ? $submitted_form['username'] : $credentials['username']);
-	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($submitted_form['password']) ? $submitted_form['password'] : '');
+	$credentials['hostname'] = defined( 'FTP_HOST' ) ? FTP_HOST : ( ! empty( $submitted_form['hostname'] ) ? $submitted_form['hostname'] : $credentials['hostname'] );
+	$credentials['username'] = defined( 'FTP_USER' ) ? FTP_USER : ( ! empty( $submitted_form['username'] ) ? $submitted_form['username'] : $credentials['username'] );
+	$credentials['password'] = defined( 'FTP_PASS' ) ? FTP_PASS : ( ! empty( $submitted_form['password'] ) ? $submitted_form['password'] : '' );
 
 	// Check to see if we are setting the public/private keys for ssh
-	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($submitted_form['public_key']) ? $submitted_form['public_key'] : '');
-	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($submitted_form['private_key']) ? $submitted_form['private_key'] : '');
+	$credentials['public_key']  = defined( 'FTP_PUBKEY' ) ? FTP_PUBKEY : ( ! empty( $submitted_form['public_key'] ) ? $submitted_form['public_key'] : '' );
+	$credentials['private_key'] = defined( 'FTP_PRIKEY' ) ? FTP_PRIKEY : ( ! empty( $submitted_form['private_key'] ) ? $submitted_form['private_key'] : '' );
 
 	// Sanitize the hostname, Some people might pass in odd-data:
-	$credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
+	$credentials['hostname'] = preg_replace( '|\w+://|', '', $credentials['hostname'] ); //Strip any schemes off
 
-	if ( strpos($credentials['hostname'], ':') ) {
-		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-		if ( ! is_numeric($credentials['port']) )
-			unset($credentials['port']);
+	if ( strpos( $credentials['hostname'], ':' ) ) {
+		list( $credentials['hostname'], $credentials['port'] ) = explode( ':', $credentials['hostname'], 2 );
+		if ( ! is_numeric( $credentials['port'] ) ) {
+			unset( $credentials['port'] );
+		}
 	} else {
-		unset($credentials['port']);
+		unset( $credentials['port'] );
 	}
 
 	if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
@@ -1626,40 +1693,45 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
 	}
 	if ( ! $error &&
 			(
-				( !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) ||
-				( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
+				( ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] ) ) ||
+				( 'ssh' == $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] ) )
 			) ) {
 		$stored_credentials = $credentials;
-		if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
+		if ( ! empty( $stored_credentials['port'] ) ) { //save port as part of hostname to simplify above code.
 			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+		}
 
-		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
+		unset( $stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key'] );
 		if ( ! wp_installing() ) {
 			update_option( 'ftp_credentials', $stored_credentials );
 		}
 		return $credentials;
 	}
-	$hostname = isset( $credentials['hostname'] ) ? $credentials['hostname'] : '';
-	$username = isset( $credentials['username'] ) ? $credentials['username'] : '';
-	$public_key = isset( $credentials['public_key'] ) ? $credentials['public_key'] : '';
-	$private_key = isset( $credentials['private_key'] ) ? $credentials['private_key'] : '';
-	$port = isset( $credentials['port'] ) ? $credentials['port'] : '';
+	$hostname        = isset( $credentials['hostname'] ) ? $credentials['hostname'] : '';
+	$username        = isset( $credentials['username'] ) ? $credentials['username'] : '';
+	$public_key      = isset( $credentials['public_key'] ) ? $credentials['public_key'] : '';
+	$private_key     = isset( $credentials['private_key'] ) ? $credentials['private_key'] : '';
+	$port            = isset( $credentials['port'] ) ? $credentials['port'] : '';
 	$connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
 
 	if ( $error ) {
-		$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
+		$error_string = __( '<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.' );
+		if ( is_wp_error( $error ) ) {
 			$error_string = esc_html( $error->get_error_message() );
+		}
 		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
 	}
 
 	$types = array();
-	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )
-		$types[ 'ftp' ] = __('FTP');
-	if ( extension_loaded('ftp') ) //Only this supports FTPS
-		$types[ 'ftps' ] = __('FTPS (SSL)');
-	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )
-		$types[ 'ssh' ] = __('SSH2');
+	if ( extension_loaded( 'ftp' ) || extension_loaded( 'sockets' ) || function_exists( 'fsockopen' ) ) {
+		$types['ftp'] = __( 'FTP' );
+	}
+	if ( extension_loaded( 'ftp' ) ) { //Only this supports FTPS
+		$types['ftps'] = __( 'FTPS (SSL)' );
+	}
+	if ( extension_loaded( 'ssh2' ) && function_exists( 'stream_get_contents' ) ) {
+		$types['ssh'] = __( 'SSH2' );
+	}
 
 	/**
 	 * Filters the connection types to output to the filesystem credentials form.
@@ -1677,7 +1749,7 @@ 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">
+<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.
@@ -1687,54 +1759,73 @@ if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
 }
 echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
 ?>
-<p id="request-filesystem-credentials-desc"><?php
-	$label_user = __('Username');
-	$label_pass = __('Password');
-	_e('To perform the requested action, WordPress needs to access your web server.');
+<p id="request-filesystem-credentials-desc">
+<?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');
-		}
-		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' );
 	}
-	_e('If you do not remember your credentials, you should contact your web host.');
+	echo ' ';
+}
+	_e( 'If you do not remember your credentials, you should contact your web host.' );
 
 	$password_value = '';
-	if ( defined('FTP_PASS') ) {
-		$password_value = '*****';
-	}
-?></p>
+if ( defined( 'FTP_PASS' ) ) {
+	$password_value = '*****';
+}
+?>
+</p>
 <label for="hostname">
-	<span class="field-title"><?php _e( 'Hostname' ) ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
+	<span class="field-title"><?php _e( 'Hostname' ); ?></span>
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ); ?>" value="
+																																						<?php
+																																						echo esc_attr( $hostname );
+																																						if ( ! empty( $port ) ) {
+																																							echo ":$port";}
+?>
+"<?php disabled( defined( 'FTP_HOST' ) ); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
 		<span class="field-title"><?php echo $label_user; ?></span>
-		<input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> />
+		<input name="username" type="text" id="username" value="<?php echo esc_attr( $username ); ?>"<?php disabled( defined( 'FTP_USER' ) ); ?> />
 	</label>
 </div>
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
-		<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
+		<input name="password" type="password" id="password" value="<?php echo $password_value; ?>"<?php disabled( defined( 'FTP_PASS' ) ); ?> />
+		<em>
+		<?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
 	$disabled = disabled( ( defined( 'FTP_SSL' ) && FTP_SSL ) || ( defined( 'FTP_SSH' ) && FTP_SSH ), true, false );
-	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 ); echo $disabled; ?> />
+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 );
+																	echo $disabled;
+?>
+ />
 		<?php echo $text; ?>
 	</label>
 <?php
@@ -1751,21 +1842,22 @@ if ( isset( $types['ssh'] ) ) {
 <fieldset id="ssh-keys"<?php echo $hidden_class; ?>>
 <legend><?php _e( 'Authentication Keys' ); ?></legend>
 <label for="public_key">
-	<span class="field-title"><?php _e('Public Key:') ?></span>
-	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> />
+	<span class="field-title"><?php _e( 'Public Key:' ); ?></span>
+	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr( $public_key ); ?>"<?php disabled( defined( 'FTP_PUBKEY' ) ); ?> />
 </label>
 <label for="private_key">
-	<span class="field-title"><?php _e('Private Key:') ?></span>
-	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
+	<span class="field-title"><?php _e( 'Private Key:' ); ?></span>
+	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr( $private_key ); ?>"<?php disabled( defined( 'FTP_PRIKEY' ) ); ?> />
 </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>
+<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 ] ) )
+	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">
diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index efa98659ee..2f474d4caa 100644
--- a/wp-admin/includes/image-edit.php
+++ b/wp-admin/includes/image-edit.php
@@ -13,30 +13,33 @@
  * @param bool|object $msg     Optional. Message to display for image editor updates or errors.
  *                             Default false.
  */
-function wp_image_editor($post_id, $msg = false) {
-	$nonce = wp_create_nonce("image_editor-$post_id");
-	$meta = wp_get_attachment_metadata($post_id);
-	$thumb = image_get_intermediate_size($post_id, 'thumbnail');
-	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
-	$note = '';
+function wp_image_editor( $post_id, $msg = false ) {
+	$nonce     = wp_create_nonce( "image_editor-$post_id" );
+	$meta      = wp_get_attachment_metadata( $post_id );
+	$thumb     = image_get_intermediate_size( $post_id, 'thumbnail' );
+	$sub_sizes = isset( $meta['sizes'] ) && is_array( $meta['sizes'] );
+	$note      = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
+	if ( isset( $meta['width'], $meta['height'] ) ) {
 		$big = max( $meta['width'], $meta['height'] );
-	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+	} else {
+		die( __( 'Image data does not exist. Please re-upload the image.' ) );
+	}
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
 	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
-	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
+	$can_restore  = false;
+	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
 		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	}
 
 	if ( $msg ) {
-		if ( isset($msg->error) )
+		if ( isset( $msg->error ) ) {
 			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
+		} elseif ( isset( $msg->msg ) ) {
 			$note = "<div class='updated'><p>$msg->msg</p></div>";
+		}
 	}
 
 	?>
@@ -49,10 +52,10 @@ function wp_image_editor($post_id, $msg = false) {
 		<h2><?php _e( 'Scale Image' ); ?></h2>
 		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
 		<div class="imgedit-help">
-		<p><?php _e('You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.'); ?></p>
+		<p><?php _e( 'You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.' ); ?></p>
 		</div>
-		<?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
-		<p><?php printf( __('Original dimensions %s'), $meta['width'] . ' &times; ' . $meta['height'] ); ?></p>
+		<?php if ( isset( $meta['width'], $meta['height'] ) ) : ?>
+		<p><?php printf( __( 'Original dimensions %s' ), $meta['width'] . ' &times; ' . $meta['height'] ); ?></p>
 		<?php endif ?>
 		<div class="imgedit-submit">
 
@@ -68,7 +71,7 @@ function wp_image_editor($post_id, $msg = false) {
 		</label>
 		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
 		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
- 		</div>
+		 </div>
 		</fieldset>
 
 		</div>
@@ -81,12 +84,16 @@ function wp_image_editor($post_id, $msg = false) {
 	<div class="imgedit-group-top">
 		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e( 'Restore Original Image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
 		<div class="imgedit-help">
-		<p><?php _e('Discard any changes and restore the original image.');
+		<p>
+		<?php
+		_e( 'Discard any changes and restore the original image.' );
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
-			echo ' '.__('Previously edited copies of the image will not be deleted.');
+		if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
+			echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
+		}
 
-		?></p>
+		?>
+		</p>
 		<div class="imgedit-submit">
 		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
 		</div>
@@ -102,13 +109,13 @@ function wp_image_editor($post_id, $msg = false) {
 		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
 
 		<div class="imgedit-help">
-		<p><?php _e('To crop the image, click on it and drag to make your selection.'); ?></p>
+		<p><?php _e( 'To crop the image, click on it and drag to make your selection.' ); ?></p>
 
-		<p><strong><?php _e('Crop Aspect Ratio'); ?></strong><br />
-		<?php _e('The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc.'); ?></p>
+		<p><strong><?php _e( 'Crop Aspect Ratio' ); ?></strong><br />
+		<?php _e( 'The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc.' ); ?></p>
 
-		<p><strong><?php _e('Crop Selection'); ?></strong><br />
-		<?php _e('Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings.'); ?></p>
+		<p><strong><?php _e( 'Crop Selection' ); ?></strong><br />
+		<?php _e( 'Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings.' ); ?></p>
 		</div>
 	</div>
 
@@ -140,7 +147,8 @@ function wp_image_editor($post_id, $msg = false) {
 
 	</div>
 
-	<?php if ( $thumb && $sub_sizes ) {
+	<?php
+	if ( $thumb && $sub_sizes ) {
 		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
 	?>
 
@@ -148,7 +156,7 @@ function wp_image_editor($post_id, $msg = false) {
 	<div class="imgedit-group-top">
 		<h2><?php _e( 'Thumbnail Settings' ); ?></h2>
 		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
-		<p class="imgedit-help"><?php _e('You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.'); ?></p>
+		<p class="imgedit-help"><?php _e( 'You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.' ); ?></p>
 	</div>
 
 	<figure class="imgedit-thumbnail-preview">
@@ -162,15 +170,15 @@ function wp_image_editor($post_id, $msg = false) {
 
 		<label class="imgedit-label">
 		<input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
-		<?php _e('All image sizes'); ?></label>
+		<?php _e( 'All image sizes' ); ?></label>
 
 		<label class="imgedit-label">
 		<input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="thumbnail" />
-		<?php _e('Thumbnail'); ?></label>
+		<?php _e( 'Thumbnail' ); ?></label>
 
 		<label class="imgedit-label">
 		<input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
-		<?php _e('All sizes except thumbnail'); ?></label>
+		<?php _e( 'All sizes except thumbnail' ); ?></label>
 	</fieldset>
 	</div>
 	</div>
@@ -182,20 +190,27 @@ function wp_image_editor($post_id, $msg = false) {
 	<div class="imgedit-panel-content wp-clearfix">
 		<?php echo $note; ?>
 		<div class="imgedit-menu wp-clearfix">
-			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button><?php
+			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button>
+																		<?php
 
-		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) {
-			$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>
+																		// On some setups GD library does not provide imagerotate() - Ticket #11536
+																		if ( wp_image_editor_supports(
+																			array(
+																				'mime_type' => get_post_mime_type( $post_id ),
+																				'methods'   => array( 'rotate' ),
+																			)
+																		) ) {
+																			$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 } 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 } ?>
+																<?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 } ?>
 
 			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e( 'Flip vertically' ); ?></span></button>
 			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e( 'Flip horizontally' ); ?></span></button>
@@ -213,7 +228,7 @@ function wp_image_editor($post_id, $msg = false) {
 		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
 
 		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
+		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
 		</div>
 
 		<div class="imgedit-submit">
@@ -224,7 +239,7 @@ function wp_image_editor($post_id, $msg = false) {
 
 	</div>
 	<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 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
 }
@@ -250,8 +265,9 @@ function wp_stream_image( $image, $mime_type, $attachment_id ) {
 		 */
 		$image = apply_filters( 'image_editor_save_pre', $image, $attachment_id );
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
+		if ( is_wp_error( $image->stream( $mime_type ) ) ) {
 			return false;
+		}
 
 		return true;
 	} else {
@@ -315,8 +331,9 @@ function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
 		 */
 		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
+		if ( null !== $saved ) {
 			return $saved;
+		}
 
 		return $image->save( $filename, $mime_type );
 	} else {
@@ -342,12 +359,12 @@ function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
 		 */
 		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
+		if ( null !== $saved ) {
 			return $saved;
+		}
 
 		switch ( $mime_type ) {
 			case 'image/jpeg':
-
 				/** This filter is documented in wp-includes/class-wp-image-editor.php */
 				return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
 			case 'image/png':
@@ -370,9 +387,9 @@ function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
  * @param int $h Image height in pixels.
  * @return float|int Image preview ratio.
  */
-function _image_get_preview_ratio($w, $h) {
-	$max = max($w, $h);
-	return $max > 400 ? (400 / $max) : 1;
+function _image_get_preview_ratio( $w, $h ) {
+	$max = max( $w, $h );
+	return $max > 400 ? ( 400 / $max ) : 1;
 }
 
 /**
@@ -387,12 +404,12 @@ function _image_get_preview_ratio($w, $h) {
  * @param float|int $angle Image rotation angle, in degrees.
  * @return resource|false GD image resource, false otherwise.
  */
-function _rotate_image_resource($img, $angle) {
+function _rotate_image_resource( $img, $angle ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::rotate()' );
-	if ( function_exists('imagerotate') ) {
-		$rotated = imagerotate($img, $angle, 0);
-		if ( is_resource($rotated) ) {
-			imagedestroy($img);
+	if ( function_exists( 'imagerotate' ) ) {
+		$rotated = imagerotate( $img, $angle, 0 );
+		if ( is_resource( $rotated ) ) {
+			imagedestroy( $img );
 			$img = $rotated;
 		}
 	}
@@ -412,19 +429,19 @@ function _rotate_image_resource($img, $angle) {
  * @param bool     $vert Whether to flip vertically.
  * @return resource (maybe) flipped image resource.
  */
-function _flip_image_resource($img, $horz, $vert) {
+function _flip_image_resource( $img, $horz, $vert ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::flip()' );
-	$w = imagesx($img);
-	$h = imagesy($img);
-	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
-		$sx = $vert ? ($w - 1) : 0;
-		$sy = $horz ? ($h - 1) : 0;
+	$w   = imagesx( $img );
+	$h   = imagesy( $img );
+	$dst = wp_imagecreatetruecolor( $w, $h );
+	if ( is_resource( $dst ) ) {
+		$sx = $vert ? ( $w - 1 ) : 0;
+		$sy = $horz ? ( $h - 1 ) : 0;
 		$sw = $vert ? -$w : $w;
 		$sh = $horz ? -$h : $h;
 
-		if ( imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh) ) {
-			imagedestroy($img);
+		if ( imagecopyresampled( $dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
+			imagedestroy( $img );
 			$img = $dst;
 		}
 	}
@@ -444,11 +461,11 @@ function _flip_image_resource($img, $horz, $vert) {
  * @param float    $h   Source height.
  * @return resource (maybe) cropped image resource.
  */
-function _crop_image_resource($img, $x, $y, $w, $h) {
-	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
-		if ( imagecopy($dst, $img, 0, 0, $x, $y, $w, $h) ) {
-			imagedestroy($img);
+function _crop_image_resource( $img, $x, $y, $w, $h ) {
+	$dst = wp_imagecreatetruecolor( $w, $h );
+	if ( is_resource( $dst ) ) {
+		if ( imagecopy( $dst, $img, 0, 0, $x, $y, $w, $h ) ) {
+			imagedestroy( $img );
 			$img = $dst;
 		}
 	}
@@ -465,52 +482,55 @@ function _crop_image_resource($img, $x, $y, $w, $h) {
  * @return WP_Image_Editor WP_Image_Editor instance with changes applied.
  */
 function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
+	if ( is_resource( $image ) ) {
 		_deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+	}
 
-	if ( !is_array($changes) )
+	if ( ! is_array( $changes ) ) {
 		return $image;
+	}
 
 	// Expand change operations.
 	foreach ( $changes as $key => $obj ) {
-		if ( isset($obj->r) ) {
-			$obj->type = 'rotate';
+		if ( isset( $obj->r ) ) {
+			$obj->type  = 'rotate';
 			$obj->angle = $obj->r;
-			unset($obj->r);
-		} elseif ( isset($obj->f) ) {
+			unset( $obj->r );
+		} elseif ( isset( $obj->f ) ) {
 			$obj->type = 'flip';
 			$obj->axis = $obj->f;
-			unset($obj->f);
-		} elseif ( isset($obj->c) ) {
+			unset( $obj->f );
+		} elseif ( isset( $obj->c ) ) {
 			$obj->type = 'crop';
-			$obj->sel = $obj->c;
-			unset($obj->c);
+			$obj->sel  = $obj->c;
+			unset( $obj->c );
 		}
-		$changes[$key] = $obj;
+		$changes[ $key ] = $obj;
 	}
 
 	// Combine operations.
-	if ( count($changes) > 1 ) {
-		$filtered = array($changes[0]);
+	if ( count( $changes ) > 1 ) {
+		$filtered = array( $changes[0] );
 		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
 			$combined = false;
-			if ( $filtered[$i]->type == $changes[$j]->type ) {
-				switch ( $filtered[$i]->type ) {
+			if ( $filtered[ $i ]->type == $changes[ $j ]->type ) {
+				switch ( $filtered[ $i ]->type ) {
 					case 'rotate':
-						$filtered[$i]->angle += $changes[$j]->angle;
-						$combined = true;
+						$filtered[ $i ]->angle += $changes[ $j ]->angle;
+						$combined               = true;
 						break;
 					case 'flip':
-						$filtered[$i]->axis ^= $changes[$j]->axis;
-						$combined = true;
+						$filtered[ $i ]->axis ^= $changes[ $j ]->axis;
+						$combined              = true;
 						break;
 				}
 			}
-			if ( !$combined )
-				$filtered[++$i] = $changes[$j];
+			if ( ! $combined ) {
+				$filtered[ ++$i ] = $changes[ $j ];
+			}
 		}
 		$changes = $filtered;
-		unset($filtered);
+		unset( $filtered );
 	}
 
 	// Image resource before applying the changes.
@@ -522,7 +542,7 @@ function image_edit_apply_changes( $image, $changes ) {
 		 * @since 3.5.0
 		 *
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
- 		 * @param array           $changes Array of change operations.
+		 * @param array           $changes Array of change operations.
 		 */
 		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
 	} elseif ( is_resource( $image ) ) {
@@ -534,7 +554,7 @@ function image_edit_apply_changes( $image, $changes ) {
 		 * @deprecated 3.5.0 Use wp_image_editor_before_change instead.
 		 *
 		 * @param resource $image   GD image resource.
- 		 * @param array    $changes Array of change operations.
+		 * @param array    $changes Array of change operations.
 		 */
 		$image = apply_filters( 'image_edit_before_change', $image, $changes );
 	}
@@ -543,26 +563,29 @@ function image_edit_apply_changes( $image, $changes ) {
 		switch ( $operation->type ) {
 			case 'rotate':
 				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
+					if ( $image instanceof WP_Image_Editor ) {
 						$image->rotate( $operation->angle );
-					else
+					} else {
 						$image = _rotate_image_resource( $image, $operation->angle );
+					}
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
-						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
-					else
+				if ( $operation->axis != 0 ) {
+					if ( $image instanceof WP_Image_Editor ) {
+						$image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+					} else {
 						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+					}
+				}
 				break;
 			case 'crop':
 				$sel = $operation->sel;
 
 				if ( $image instanceof WP_Image_Editor ) {
 					$size = $image->get_size();
-					$w = $size['width'];
-					$h = $size['height'];
+					$w    = $size['width'];
+					$h    = $size['height'];
 
 					$scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
 					$image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
@@ -596,21 +619,23 @@ function stream_preview_image( $post_id ) {
 		return false;
 	}
 
-	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
+	$changes = ! empty( $_REQUEST['history'] ) ? json_decode( wp_unslash( $_REQUEST['history'] ) ) : null;
+	if ( $changes ) {
 		$img = image_edit_apply_changes( $img, $changes );
+	}
 
 	// Scale the image.
 	$size = $img->get_size();
-	$w = $size['width'];
-	$h = $size['height'];
+	$w    = $size['width'];
+	$h    = $size['height'];
 
 	$ratio = _image_get_preview_ratio( $w, $h );
-	$w2 = max ( 1, $w * $ratio );
-	$h2 = max ( 1, $h * $ratio );
+	$w2    = max( 1, $w * $ratio );
+	$h2    = max( 1, $h * $ratio );
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
+	if ( is_wp_error( $img->resize( $w2, $h2 ) ) ) {
 		return false;
+	}
 
 	return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
@@ -623,78 +648,83 @@ function stream_preview_image( $post_id ) {
  * @param int $post_id Attachment post ID.
  * @return stdClass Image restoration message object.
  */
-function wp_restore_image($post_id) {
-	$meta = wp_get_attachment_metadata($post_id);
-	$file = get_attached_file($post_id);
+function wp_restore_image( $post_id ) {
+	$meta         = wp_get_attachment_metadata( $post_id );
+	$file         = get_attached_file( $post_id );
 	$backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
-	$restored = false;
-	$msg = new stdClass;
+	$restored     = false;
+	$msg          = new stdClass;
 
-	if ( !is_array($backup_sizes) ) {
-		$msg->error = __('Cannot load image metadata.');
+	if ( ! is_array( $backup_sizes ) ) {
+		$msg->error = __( 'Cannot load image metadata.' );
 		return $msg;
 	}
 
-	$parts = pathinfo($file);
-	$suffix = time() . rand(100, 999);
+	$parts         = pathinfo( $file );
+	$suffix        = time() . rand( 100, 999 );
 	$default_sizes = get_intermediate_image_sizes();
 
-	if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
+	if ( isset( $backup_sizes['full-orig'] ) && is_array( $backup_sizes['full-orig'] ) ) {
 		$data = $backup_sizes['full-orig'];
 
 		if ( $parts['basename'] != $data['file'] ) {
-			if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+			if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
 
 				// Delete only if it's an edited image.
-				if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
+				if ( preg_match( '/-e[0-9]{13}\./', $parts['basename'] ) ) {
 					wp_delete_file( $file );
 				}
 			} elseif ( isset( $meta['width'], $meta['height'] ) ) {
-				$backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
+				$backup_sizes[ "full-$suffix" ] = array(
+					'width'  => $meta['width'],
+					'height' => $meta['height'],
+					'file'   => $parts['basename'],
+				);
 			}
 		}
 
-		$restored_file = path_join($parts['dirname'], $data['file']);
-		$restored = update_attached_file($post_id, $restored_file);
+		$restored_file = path_join( $parts['dirname'], $data['file'] );
+		$restored      = update_attached_file( $post_id, $restored_file );
 
-		$meta['file'] = _wp_relative_upload_path( $restored_file );
-		$meta['width'] = $data['width'];
+		$meta['file']   = _wp_relative_upload_path( $restored_file );
+		$meta['width']  = $data['width'];
 		$meta['height'] = $data['height'];
 	}
 
 	foreach ( $default_sizes as $default_size ) {
-		if ( isset($backup_sizes["$default_size-orig"]) ) {
-			$data = $backup_sizes["$default_size-orig"];
-			if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
-				if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+		if ( isset( $backup_sizes[ "$default_size-orig" ] ) ) {
+			$data = $backup_sizes[ "$default_size-orig" ];
+			if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] != $data['file'] ) {
+				if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
 
 					// Delete only if it's an edited image.
-					if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
-						$delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
+					if ( preg_match( '/-e[0-9]{13}-/', $meta['sizes'][ $default_size ]['file'] ) ) {
+						$delete_file = path_join( $parts['dirname'], $meta['sizes'][ $default_size ]['file'] );
 						wp_delete_file( $delete_file );
 					}
 				} else {
-					$backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
+					$backup_sizes[ "$default_size-{$suffix}" ] = $meta['sizes'][ $default_size ];
 				}
 			}
 
-			$meta['sizes'][$default_size] = $data;
+			$meta['sizes'][ $default_size ] = $data;
 		} else {
-			unset($meta['sizes'][$default_size]);
+			unset( $meta['sizes'][ $default_size ] );
 		}
 	}
 
 	if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
 		( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
 
-		$msg->error = __('Cannot save image metadata.');
+		$msg->error = __( 'Cannot save image metadata.' );
 		return $msg;
 	}
 
-	if ( !$restored )
-		$msg->error = __('Image metadata is inconsistent.');
-	else
-		$msg->msg = __('Image restored successfully.');
+	if ( ! $restored ) {
+		$msg->error = __( 'Image metadata is inconsistent.' );
+	} else {
+		$msg->msg = __( 'Image restored successfully.' );
+	}
 
 	return $msg;
 }
@@ -709,69 +739,72 @@ function wp_restore_image($post_id) {
 function wp_save_image( $post_id ) {
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
-	$return = new stdClass;
+	$return  = new stdClass;
 	$success = $delete = $scaled = $nocrop = false;
-	$post = get_post( $post_id );
+	$post    = get_post( $post_id );
 
 	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
 	if ( is_wp_error( $img ) ) {
-		$return->error = esc_js( __('Unable to create new image.') );
+		$return->error = esc_js( __( 'Unable to create new image.' ) );
 		return $return;
 	}
 
-	$fwidth = !empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
-	$fheight = !empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
-	$target = !empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
-	$scale = !empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
+	$fwidth  = ! empty( $_REQUEST['fwidth'] ) ? intval( $_REQUEST['fwidth'] ) : 0;
+	$fheight = ! empty( $_REQUEST['fheight'] ) ? intval( $_REQUEST['fheight'] ) : 0;
+	$target  = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
+	$scale   = ! empty( $_REQUEST['do'] ) && 'scale' == $_REQUEST['do'];
 
 	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
 		$size = $img->get_size();
-		$sX = $size['width'];
-		$sY = $size['height'];
+		$sX   = $size['width'];
+		$sY   = $size['height'];
 
 		// Check if it has roughly the same w / h ratio.
-		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
+		$diff = round( $sX / $sY, 2 ) - round( $fwidth / $fheight, 2 );
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
+			if ( $img->resize( $fwidth, $fheight ) ) {
 				$scaled = true;
+			}
 		}
 
-		if ( !$scaled ) {
-			$return->error = esc_js( __('Error while saving the scaled image. Please reload the page and try again.') );
+		if ( ! $scaled ) {
+			$return->error = esc_js( __( 'Error while saving the scaled image. Please reload the page and try again.' ) );
 			return $return;
 		}
-	} elseif ( !empty($_REQUEST['history']) ) {
-		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
-			$img = image_edit_apply_changes($img, $changes);
+	} elseif ( ! empty( $_REQUEST['history'] ) ) {
+		$changes = json_decode( wp_unslash( $_REQUEST['history'] ) );
+		if ( $changes ) {
+			$img = image_edit_apply_changes( $img, $changes );
+		}
 	} else {
-		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
+		$return->error = esc_js( __( 'Nothing to save, the image has not changed.' ) );
 		return $return;
 	}
 
-	$meta = wp_get_attachment_metadata($post_id);
+	$meta         = wp_get_attachment_metadata( $post_id );
 	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
 
-	if ( !is_array($meta) ) {
-		$return->error = esc_js( __('Image data does not exist. Please re-upload the image.') );
+	if ( ! is_array( $meta ) ) {
+		$return->error = esc_js( __( 'Image data does not exist. Please re-upload the image.' ) );
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
+	if ( ! is_array( $backup_sizes ) ) {
 		$backup_sizes = array();
+	}
 
 	// Generate new filename.
 	$path = get_attached_file( $post_id );
 
 	$basename = pathinfo( $path, PATHINFO_BASENAME );
-	$dirname = pathinfo( $path, PATHINFO_DIRNAME );
-	$ext = pathinfo( $path, PATHINFO_EXTENSION );
+	$dirname  = pathinfo( $path, PATHINFO_DIRNAME );
+	$ext      = pathinfo( $path, PATHINFO_EXTENSION );
 	$filename = pathinfo( $path, PATHINFO_FILENAME );
-	$suffix = time() . rand(100, 999);
+	$suffix   = time() . rand( 100, 999 );
 
-	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
-		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $basename ) {
+	if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE &&
+		isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
 
 		if ( 'thumbnail' == $target ) {
 			$new_path = "{$dirname}/{$filename}-temp.{$ext}";
@@ -780,11 +813,11 @@ function wp_save_image( $post_id ) {
 		}
 	} else {
 		while ( true ) {
-			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
-			$filename .= "-e{$suffix}";
+			$filename     = preg_replace( '/-e([0-9]+)$/', '', $filename );
+			$filename    .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$ext}";
-			$new_path = "{$dirname}/$new_filename";
-			if ( file_exists($new_path) ) {
+			$new_path     = "{$dirname}/$new_filename";
+			if ( file_exists( $new_path ) ) {
 				$suffix++;
 			} else {
 				break;
@@ -793,8 +826,8 @@ function wp_save_image( $post_id ) {
 	}
 
 	// Save the full-size file, also needed to create sub-sizes.
-	if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
-		$return->error = esc_js( __('Unable to save the image.') );
+	if ( ! wp_save_image_file( $new_path, $img, $post->post_mime_type, $post_id ) ) {
+		$return->error = esc_js( __( 'Unable to save the image.' ) );
 		return $return;
 	}
 
@@ -809,26 +842,31 @@ function wp_save_image( $post_id ) {
 		}
 
 		if ( $tag ) {
-			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $basename );
+			$backup_sizes[ $tag ] = array(
+				'width'  => $meta['width'],
+				'height' => $meta['height'],
+				'file'   => $basename,
+			);
 		}
 		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
 		$meta['file'] = _wp_relative_upload_path( $new_path );
 
-		$size = $img->get_size();
-		$meta['width'] = $size['width'];
+		$size           = $img->get_size();
+		$meta['width']  = $size['width'];
 		$meta['height'] = $size['height'];
 
-		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
+		if ( $success && ( 'nothumb' == $target || 'all' == $target ) ) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ( 'nothumb' == $target ) {
+				$sizes = array_diff( $sizes, array( 'thumbnail' ) );
+			}
 		}
 
 		$return->fw = $meta['width'];
 		$return->fh = $meta['height'];
 	} elseif ( 'thumbnail' == $target ) {
-		$sizes = array( 'thumbnail' );
+		$sizes   = array( 'thumbnail' );
 		$success = $delete = $nocrop = true;
 	}
 
@@ -852,16 +890,18 @@ function wp_save_image( $post_id ) {
 
 		foreach ( $sizes as $size ) {
 			$tag = false;
-			if ( isset( $meta['sizes'][$size] ) ) {
-				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
+			if ( isset( $meta['sizes'][ $size ] ) ) {
+				if ( isset( $backup_sizes[ "$size-orig" ] ) ) {
+					if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes[ "$size-orig" ]['file'] != $meta['sizes'][ $size ]['file'] ) {
 						$tag = "$size-$suffix";
+					}
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
-					$backup_sizes[$tag] = $meta['sizes'][$size];
+				if ( $tag ) {
+					$backup_sizes[ $tag ] = $meta['sizes'][ $size ];
+				}
 			}
 
 			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
@@ -874,7 +914,11 @@ function wp_save_image( $post_id ) {
 				$crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
 			}
 
-			$_sizes[ $size ] = array( 'width' => $width, 'height' => $height, 'crop' => $crop );
+			$_sizes[ $size ] = array(
+				'width'  => $width,
+				'height' => $height,
+				'crop'   => $crop,
+			);
 		}
 
 		$meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );
@@ -884,17 +928,17 @@ function wp_save_image( $post_id ) {
 
 	if ( $success ) {
 		wp_update_attachment_metadata( $post_id, $meta );
-		update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
+		update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes );
 
 		if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
 			// Check if it's an image edit from attachment edit screen
 			if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
-				$thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+				$thumb_url         = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
 				$return->thumbnail = $thumb_url[0];
 			} else {
-				$file_url = wp_get_attachment_url($post_id);
+				$file_url = wp_get_attachment_url( $post_id );
 				if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
-					$return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
+					$return->thumbnail = path_join( dirname( $file_url ), $thumb['file'] );
 				} else {
 					$return->thumbnail = "$file_url?w=128&h=128";
 				}
@@ -908,6 +952,6 @@ function wp_save_image( $post_id ) {
 		wp_delete_file( $new_path );
 	}
 
-	$return->msg = esc_js( __('Image saved') );
+	$return->msg = esc_js( __( 'Image saved' ) );
 	return $return;
 }
diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 375f523b70..3fe8cc8e69 100644
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -37,15 +37,18 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s
 	}
 
 	$editor = wp_get_image_editor( $src );
-	if ( is_wp_error( $editor ) )
+	if ( is_wp_error( $editor ) ) {
 		return $editor;
+	}
 
 	$src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
-	if ( is_wp_error( $src ) )
+	if ( is_wp_error( $src ) ) {
 		return $src;
+	}
 
-	if ( ! $dst_file )
+	if ( ! $dst_file ) {
 		$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	}
 
 	/*
 	 * The directory containing the original file may no longer exist when
@@ -56,8 +59,9 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s
 	$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
 
 	$result = $editor->save( $dst_file );
-	if ( is_wp_error( $result ) )
+	if ( is_wp_error( $result ) ) {
 		return $result;
+	}
 
 	return $dst_file;
 }
@@ -74,46 +78,50 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s
 function wp_generate_attachment_metadata( $attachment_id, $file ) {
 	$attachment = get_post( $attachment_id );
 
-	$metadata = array();
-	$support = false;
+	$metadata  = array();
+	$support   = false;
 	$mime_type = get_post_mime_type( $attachment );
 
 	if ( preg_match( '!^image/!', $mime_type ) && file_is_displayable_image( $file ) ) {
-		$imagesize = getimagesize( $file );
-		$metadata['width'] = $imagesize[0];
+		$imagesize          = getimagesize( $file );
+		$metadata['width']  = $imagesize[0];
 		$metadata['height'] = $imagesize[1];
 
 		// Make the file path relative to the upload dir.
-		$metadata['file'] = _wp_relative_upload_path($file);
+		$metadata['file'] = _wp_relative_upload_path( $file );
 
 		// Make thumbnails and other intermediate sizes.
 		$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
 		$sizes = array();
 		foreach ( get_intermediate_image_sizes() as $s ) {
-			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
-			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) {
+			$sizes[ $s ] = array(
+				'width'  => '',
+				'height' => '',
+				'crop'   => false,
+			);
+			if ( isset( $_wp_additional_image_sizes[ $s ]['width'] ) ) {
 				// For theme-added sizes
-				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] );
+				$sizes[ $s ]['width'] = intval( $_wp_additional_image_sizes[ $s ]['width'] );
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['width'] = get_option( "{$s}_size_w" );
+				$sizes[ $s ]['width'] = get_option( "{$s}_size_w" );
 			}
 
-			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) {
+			if ( isset( $_wp_additional_image_sizes[ $s ]['height'] ) ) {
 				// For theme-added sizes
-				$sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] );
+				$sizes[ $s ]['height'] = intval( $_wp_additional_image_sizes[ $s ]['height'] );
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['height'] = get_option( "{$s}_size_h" );
+				$sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
 			}
 
-			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) {
+			if ( isset( $_wp_additional_image_sizes[ $s ]['crop'] ) ) {
 				// For theme-added sizes
-				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
+				$sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['crop'] = get_option( "{$s}_crop" );
+				$sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
 			}
 		}
 
@@ -131,37 +139,40 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 		if ( $sizes ) {
 			$editor = wp_get_image_editor( $file );
 
-			if ( ! is_wp_error( $editor ) )
+			if ( ! is_wp_error( $editor ) ) {
 				$metadata['sizes'] = $editor->multi_resize( $sizes );
+			}
 		} else {
 			$metadata['sizes'] = array();
 		}
 
 		// Fetch additional metadata from EXIF/IPTC.
 		$image_meta = wp_read_image_metadata( $file );
-		if ( $image_meta )
+		if ( $image_meta ) {
 			$metadata['image_meta'] = $image_meta;
-
+		}
 	} elseif ( wp_attachment_is( 'video', $attachment ) ) {
 		$metadata = wp_read_video_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' );
+		$support  = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' );
 	} elseif ( wp_attachment_is( 'audio', $attachment ) ) {
 		$metadata = wp_read_audio_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
+		$support  = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
 	}
 
 	if ( $support && ! empty( $metadata['image']['data'] ) ) {
 		// Check for existing cover.
-		$hash = md5( $metadata['image']['data'] );
-		$posts = get_posts( array(
-			'fields' => 'ids',
-			'post_type' => 'attachment',
-			'post_mime_type' => $metadata['image']['mime'],
-			'post_status' => 'inherit',
-			'posts_per_page' => 1,
-			'meta_key' => '_cover_hash',
-			'meta_value' => $hash
-		) );
+		$hash   = md5( $metadata['image']['data'] );
+		$posts  = get_posts(
+			array(
+				'fields'         => 'ids',
+				'post_type'      => 'attachment',
+				'post_mime_type' => $metadata['image']['mime'],
+				'post_status'    => 'inherit',
+				'posts_per_page' => 1,
+				'meta_key'       => '_cover_hash',
+				'meta_value'     => $hash,
+			)
+		);
 		$exists = reset( $posts );
 
 		if ( ! empty( $exists ) ) {
@@ -169,20 +180,20 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 		} else {
 			$ext = '.jpg';
 			switch ( $metadata['image']['mime'] ) {
-			case 'image/gif':
-				$ext = '.gif';
-				break;
-			case 'image/png':
-				$ext = '.png';
-				break;
+				case 'image/gif':
+					$ext = '.gif';
+					break;
+				case 'image/png':
+					$ext = '.png';
+					break;
 			}
 			$basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
 			$uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );
 			if ( false === $uploaded['error'] ) {
 				$image_attachment = array(
 					'post_mime_type' => $metadata['image']['mime'],
-					'post_type' => 'attachment',
-					'post_content' => '',
+					'post_type'      => 'attachment',
+					'post_content'   => '',
 				);
 				/**
 				 * Filters the parameters for the attachment thumbnail creation.
@@ -202,9 +213,8 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 				update_post_meta( $attachment_id, '_thumbnail_id', $sub_attachment_id );
 			}
 		}
-	}
-	// Try to create image thumbnails for PDFs
-	else if ( 'application/pdf' === $mime_type ) {
+	} // Try to create image thumbnails for PDFs
+	elseif ( 'application/pdf' === $mime_type ) {
 		$fallback_sizes = array(
 			'thumbnail',
 			'medium',
@@ -221,7 +231,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 		 */
 		$fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata );
 
-		$sizes = array();
+		$sizes                      = array();
 		$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
 		foreach ( $fallback_sizes as $s ) {
@@ -256,8 +266,8 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 				 * PDFs may have the same file filename as JPEGs.
 				 * Ensure the PDF preview image does not overwrite any JPEG images that already exist.
 				 */
-				$dirname = dirname( $file ) . '/';
-				$ext = '.' . pathinfo( $file, PATHINFO_EXTENSION );
+				$dirname      = dirname( $file ) . '/';
+				$ext          = '.' . pathinfo( $file, PATHINFO_EXTENSION );
 				$preview_file = $dirname . wp_unique_filename( $dirname, wp_basename( $file, $ext ) . '-pdf.jpg' );
 
 				$uploaded = $editor->save( $preview_file, 'image/jpeg' );
@@ -269,7 +279,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
 					unset( $uploaded['path'] );
 
 					if ( ! is_wp_error( $editor ) ) {
-						$metadata['sizes'] = $editor->multi_resize( $sizes );
+						$metadata['sizes']         = $editor->multi_resize( $sizes );
 						$metadata['sizes']['full'] = $uploaded;
 					}
 				}
@@ -301,10 +311,11 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
  * @param string $str
  * @return int|float
  */
-function wp_exif_frac2dec($str) {
+function wp_exif_frac2dec( $str ) {
 	@list( $n, $d ) = explode( '/', $str );
-	if ( !empty($d) )
+	if ( ! empty( $d ) ) {
 		return $n / $d;
+	}
 	return $str;
 }
 
@@ -316,9 +327,9 @@ function wp_exif_frac2dec($str) {
  * @param string $str
  * @return int
  */
-function wp_exif_date2ts($str) {
-	@list( $date, $time ) = explode( ' ', trim($str) );
-	@list( $y, $m, $d ) = explode( ':', $date );
+function wp_exif_date2ts( $str ) {
+	@list( $date, $time ) = explode( ' ', trim( $str ) );
+	@list( $y, $m, $d )   = explode( ':', $date );
 
 	return strtotime( "{$y}-{$m}-{$d} {$time}" );
 }
@@ -340,8 +351,9 @@ function wp_exif_date2ts($str) {
  * @return bool|array False on failure. Image metadata array on success.
  */
 function wp_read_image_metadata( $file ) {
-	if ( ! file_exists( $file ) )
+	if ( ! file_exists( $file ) ) {
 		return false;
+	}
 
 	list( , , $sourceImageType ) = getimagesize( $file );
 
@@ -352,18 +364,18 @@ function wp_read_image_metadata( $file ) {
 	 * floats, dates to unix timestamps, and everything else to strings.
 	 */
 	$meta = array(
-		'aperture' => 0,
-		'credit' => '',
-		'camera' => '',
-		'caption' => '',
+		'aperture'          => 0,
+		'credit'            => '',
+		'camera'            => '',
+		'caption'           => '',
 		'created_timestamp' => 0,
-		'copyright' => '',
-		'focal_length' => 0,
-		'iso' => 0,
-		'shutter_speed' => 0,
-		'title' => '',
-		'orientation' => 0,
-		'keywords' => array(),
+		'copyright'         => '',
+		'focal_length'      => 0,
+		'iso'               => 0,
+		'shutter_speed'     => 0,
+		'title'             => '',
+		'orientation'       => 0,
+		'keywords'          => array(),
 	);
 
 	$iptc = array();
@@ -380,10 +392,10 @@ function wp_read_image_metadata( $file ) {
 			// Headline, "A brief synopsis of the caption."
 			if ( ! empty( $iptc['2#105'][0] ) ) {
 				$meta['title'] = trim( $iptc['2#105'][0] );
-			/*
-			 * Title, "Many use the Title field to store the filename of the image,
-			 * though the field may be used in many ways."
-			 */
+				/*
+				* Title, "Many use the Title field to store the filename of the image,
+				* though the field may be used in many ways."
+				*/
 			} elseif ( ! empty( $iptc['2#005'][0] ) ) {
 				$meta['title'] = trim( $iptc['2#005'][0] );
 			}
@@ -403,16 +415,19 @@ function wp_read_image_metadata( $file ) {
 				$meta['caption'] = $caption;
 			}
 
-			if ( ! empty( $iptc['2#110'][0] ) ) // credit
+			if ( ! empty( $iptc['2#110'][0] ) ) { // credit
 				$meta['credit'] = trim( $iptc['2#110'][0] );
-			elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
+			} elseif ( ! empty( $iptc['2#080'][0] ) ) { // creator / legacy byline
 				$meta['credit'] = trim( $iptc['2#080'][0] );
+			}
 
-			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
+			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) { // created date and time
 				$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
+			}
 
-			if ( ! empty( $iptc['2#116'][0] ) ) // copyright
+			if ( ! empty( $iptc['2#116'][0] ) ) { // copyright
 				$meta['copyright'] = trim( $iptc['2#116'][0] );
+			}
 
 			if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
 				$meta['keywords'] = array_values( $iptc['2#025'] );
@@ -454,7 +469,7 @@ function wp_read_image_metadata( $file ) {
 		if ( empty( $meta['credit'] ) ) {
 			if ( ! empty( $exif['Artist'] ) ) {
 				$meta['credit'] = trim( $exif['Artist'] );
-			} elseif ( ! empty($exif['Author'] ) ) {
+			} elseif ( ! empty( $exif['Author'] ) ) {
 				$meta['credit'] = trim( $exif['Author'] );
 			}
 		}
@@ -523,9 +538,9 @@ function wp_read_image_metadata( $file ) {
  * @param string $path File path to test if valid image.
  * @return bool True if valid image, false if not valid image.
  */
-function file_is_valid_image($path) {
-	$size = @getimagesize($path);
-	return !empty($size);
+function file_is_valid_image( $path ) {
+	$size = @getimagesize( $path );
+	return ! empty( $size );
 }
 
 /**
@@ -536,7 +551,7 @@ function file_is_valid_image($path) {
  * @param string $path File path to test.
  * @return bool True if suitable, false if not suitable.
  */
-function file_is_displayable_image($path) {
+function file_is_displayable_image( $path ) {
 	$displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP );
 
 	$info = @getimagesize( $path );
@@ -571,24 +586,25 @@ function file_is_displayable_image($path) {
  */
 function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
 	$filepath = _load_image_to_edit_path( $attachment_id, $size );
-	if ( empty( $filepath ) )
+	if ( empty( $filepath ) ) {
 		return false;
+	}
 
 	switch ( $mime_type ) {
 		case 'image/jpeg':
-			$image = imagecreatefromjpeg($filepath);
+			$image = imagecreatefromjpeg( $filepath );
 			break;
 		case 'image/png':
-			$image = imagecreatefrompng($filepath);
+			$image = imagecreatefrompng( $filepath );
 			break;
 		case 'image/gif':
-			$image = imagecreatefromgif($filepath);
+			$image = imagecreatefromgif( $filepath );
 			break;
 		default:
 			$image = false;
 			break;
 	}
-	if ( is_resource($image) ) {
+	if ( is_resource( $image ) ) {
 		/**
 		 * Filters the current image being loaded for editing.
 		 *
@@ -599,9 +615,9 @@ function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
 		 * @param string   $size          Image size.
 		 */
 		$image = apply_filters( 'load_image_to_edit', $image, $attachment_id, $size );
-		if ( function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
-			imagealphablending($image, false);
-			imagesavealpha($image, true);
+		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
+			imagealphablending( $image, false );
+			imagesavealpha( $image, true );
 		}
 	}
 	return $image;
@@ -676,8 +692,9 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
  */
 function _copy_image_file( $attachment_id ) {
 	$dst_file = $src_file = get_attached_file( $attachment_id );
-	if ( ! file_exists( $src_file ) )
+	if ( ! file_exists( $src_file ) ) {
 		$src_file = _load_image_to_edit_path( $attachment_id );
+	}
 
 	if ( $src_file ) {
 		$dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
@@ -689,8 +706,9 @@ function _copy_image_file( $attachment_id ) {
 		 */
 		wp_mkdir_p( dirname( $dst_file ) );
 
-		if ( ! @copy( $src_file, $dst_file ) )
+		if ( ! @copy( $src_file, $dst_file ) ) {
 			$dst_file = false;
+		}
 	} else {
 		$dst_file = false;
 	}
diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index ca12dfa8f0..787ce596eb 100644
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -53,9 +53,10 @@ function _usort_by_first_member( $a, $b ) {
  */
 function register_importer( $id, $name, $description, $callback ) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
+	if ( is_wp_error( $callback ) ) {
 		return $callback;
-	$wp_importers[$id] = array ( $name, $description, $callback );
+	}
+	$wp_importers[ $id ] = array( $name, $description, $callback );
 }
 
 /**
@@ -81,13 +82,16 @@ function wp_import_cleanup( $id ) {
 function wp_import_handle_upload() {
 	if ( ! isset( $_FILES['import'] ) ) {
 		return array(
-			'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' )
+			'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ),
 		);
 	}
 
-	$overrides = array( 'test_form' => false, 'test_type' => false );
+	$overrides                 = array(
+		'test_form' => false,
+		'test_type' => false,
+	);
 	$_FILES['import']['name'] .= '.txt';
-	$upload = wp_handle_upload( $_FILES['import'], $overrides );
+	$upload                    = wp_handle_upload( $_FILES['import'], $overrides );
 
 	if ( isset( $upload['error'] ) ) {
 		return $upload;
@@ -95,12 +99,12 @@ function wp_import_handle_upload() {
 
 	// Construct the object array
 	$object = array(
-		'post_title' => basename( $upload['file'] ),
-		'post_content' => $upload['url'],
+		'post_title'     => basename( $upload['file'] ),
+		'post_content'   => $upload['url'],
 		'post_mime_type' => $upload['type'],
-		'guid' => $upload['url'],
-		'context' => 'import',
-		'post_status' => 'private'
+		'guid'           => $upload['url'],
+		'context'        => 'import',
+		'post_status'    => 'private',
 	);
 
 	// Save the data
@@ -112,7 +116,10 @@ function wp_import_handle_upload() {
 	 */
 	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
 
-	return array( 'file' => $upload['file'], 'id' => $id );
+	return array(
+		'file' => $upload['file'],
+		'id'   => $id,
+	);
 }
 
 /**
@@ -125,22 +132,24 @@ function wp_import_handle_upload() {
 function wp_get_popular_importers() {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
-	$locale = get_user_locale();
-	$cache_key = 'popular_importers_' . md5( $locale . $wp_version );
+	$locale            = get_user_locale();
+	$cache_key         = 'popular_importers_' . md5( $locale . $wp_version );
 	$popular_importers = get_site_transient( $cache_key );
 
 	if ( ! $popular_importers ) {
-		$url = add_query_arg( array(
-			'locale'  => $locale,
-			'version' => $wp_version,
-		), 'http://api.wordpress.org/core/importers/1.1/' );
+		$url     = add_query_arg(
+			array(
+				'locale'  => $locale,
+				'version' => $wp_version,
+			), 'http://api.wordpress.org/core/importers/1.1/'
+		);
 		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
 
 		if ( wp_http_supports( array( 'ssl' ) ) ) {
 			$url = set_url_scheme( $url, 'https' );
 		}
 
-		$response = wp_remote_get( $url, $options );
+		$response          = wp_remote_get( $url, $options );
 		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
 
 		if ( is_array( $popular_importers ) ) {
@@ -152,63 +161,65 @@ function wp_get_popular_importers() {
 
 	if ( is_array( $popular_importers ) ) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
+		if ( $popular_importers['translated'] ) {
 			return $popular_importers['importers'];
+		}
 
 		foreach ( $popular_importers['importers'] as &$importer ) {
 			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
+			if ( $importer['name'] != 'WordPress' ) {
 				$importer['name'] = translate( $importer['name'] );
+			}
 		}
 		return $popular_importers['importers'];
 	}
 
 	return array(
 		// slug => name, description, plugin slug, and register_importer() slug
-		'blogger' => array(
-			'name' => __( 'Blogger' ),
+		'blogger'     => array(
+			'name'        => __( 'Blogger' ),
 			'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
 			'plugin-slug' => 'blogger-importer',
 			'importer-id' => 'blogger',
 		),
-		'wpcat2tag' => array(
-			'name' => __( 'Categories and Tags Converter' ),
+		'wpcat2tag'   => array(
+			'name'        => __( 'Categories and Tags Converter' ),
 			'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
 			'plugin-slug' => 'wpcat2tag-importer',
 			'importer-id' => 'wp-cat2tag',
 		),
 		'livejournal' => array(
-			'name' => __( 'LiveJournal' ),
+			'name'        => __( 'LiveJournal' ),
 			'description' => __( 'Import posts from LiveJournal using their API.' ),
 			'plugin-slug' => 'livejournal-importer',
 			'importer-id' => 'livejournal',
 		),
 		'movabletype' => array(
-			'name' => __( 'Movable Type and TypePad' ),
+			'name'        => __( 'Movable Type and TypePad' ),
 			'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
 			'plugin-slug' => 'movabletype-importer',
 			'importer-id' => 'mt',
 		),
-		'opml' => array(
-			'name' => __( 'Blogroll' ),
+		'opml'        => array(
+			'name'        => __( 'Blogroll' ),
 			'description' => __( 'Import links in OPML format.' ),
 			'plugin-slug' => 'opml-importer',
 			'importer-id' => 'opml',
 		),
-		'rss' => array(
-			'name' => __( 'RSS' ),
+		'rss'         => array(
+			'name'        => __( 'RSS' ),
 			'description' => __( 'Import posts from an RSS feed.' ),
 			'plugin-slug' => 'rss-importer',
 			'importer-id' => 'rss',
 		),
-		'tumblr' => array(
-			'name' => __( 'Tumblr' ),
+		'tumblr'      => array(
+			'name'        => __( 'Tumblr' ),
 			'description' => __( 'Import posts &amp; media from Tumblr using their API.' ),
 			'plugin-slug' => 'tumblr-importer',
 			'importer-id' => 'tumblr',
 		),
-		'wordpress' => array(
-			'name' => 'WordPress',
+		'wordpress'   => array(
+			'name'        => 'WordPress',
 			'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
 			'plugin-slug' => 'wordpress-importer',
 			'importer-id' => 'wordpress',
diff --git a/wp-admin/includes/list-table.php b/wp-admin/includes/list-table.php
index e4c66d1fff..7c6699b274 100644
--- a/wp-admin/includes/list-table.php
+++ b/wp-admin/includes/list-table.php
@@ -22,33 +22,35 @@
 function _get_list_table( $class, $args = array() ) {
 	$core_classes = array(
 		//Site Admin
-		'WP_Posts_List_Table' => 'posts',
-		'WP_Media_List_Table' => 'media',
-		'WP_Terms_List_Table' => 'terms',
-		'WP_Users_List_Table' => 'users',
-		'WP_Comments_List_Table' => 'comments',
-		'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ),
-		'WP_Links_List_Table' => 'links',
+		'WP_Posts_List_Table'          => 'posts',
+		'WP_Media_List_Table'          => 'media',
+		'WP_Terms_List_Table'          => 'terms',
+		'WP_Users_List_Table'          => 'users',
+		'WP_Comments_List_Table'       => 'comments',
+		'WP_Post_Comments_List_Table'  => array( 'comments', 'post-comments' ),
+		'WP_Links_List_Table'          => 'links',
 		'WP_Plugin_Install_List_Table' => 'plugin-install',
-		'WP_Themes_List_Table' => 'themes',
-		'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),
-		'WP_Plugins_List_Table' => 'plugins',
+		'WP_Themes_List_Table'         => 'themes',
+		'WP_Theme_Install_List_Table'  => array( 'themes', 'theme-install' ),
+		'WP_Plugins_List_Table'        => 'plugins',
 		// Network Admin
-		'WP_MS_Sites_List_Table' => 'ms-sites',
-		'WP_MS_Users_List_Table' => 'ms-users',
-		'WP_MS_Themes_List_Table' => 'ms-themes',
+		'WP_MS_Sites_List_Table'       => 'ms-sites',
+		'WP_MS_Users_List_Table'       => 'ms-users',
+		'WP_MS_Themes_List_Table'      => 'ms-themes',
 	);
 
 	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
+		foreach ( (array) $core_classes[ $class ] as $required ) {
 			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		}
 
-		if ( isset( $args['screen'] ) )
+		if ( isset( $args['screen'] ) ) {
 			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
+		} elseif ( isset( $GLOBALS['hook_suffix'] ) ) {
 			$args['screen'] = get_current_screen();
-		else
+		} else {
 			$args['screen'] = null;
+		}
 
 		return new $class( $args );
 	}
@@ -65,7 +67,7 @@ function _get_list_table( $class, $args = array() ) {
  * @param array $columns An array of columns with column IDs as the keys and translated column names as the values
  * @see get_column_headers(), print_column_headers(), get_hidden_columns()
  */
-function register_column_headers($screen, $columns) {
+function register_column_headers( $screen, $columns ) {
 	new _WP_List_Table_Compat( $screen, $columns );
 }
 
@@ -78,7 +80,7 @@ function register_column_headers($screen, $columns) {
  * @param bool             $with_id Whether to set the id attribute or not.
  */
 function print_column_headers( $screen, $with_id = true ) {
-	$wp_list_table = new _WP_List_Table_Compat($screen);
+	$wp_list_table = new _WP_List_Table_Compat( $screen );
 
 	$wp_list_table->print_column_headers( $with_id );
 }
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index e00dfb18a8..03e949f16f 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -15,10 +15,10 @@
  */
 function media_upload_tabs() {
 	$_default_tabs = array(
-		'type' => __('From Computer'), // handler action suffix => tab text
-		'type_url' => __('From URL'),
-		'gallery' => __('Gallery'),
-		'library' => __('Media Library')
+		'type'     => __( 'From Computer' ), // handler action suffix => tab text
+		'type_url' => __( 'From URL' ),
+		'gallery'  => __( 'Gallery' ),
+		'library'  => __( 'Media Library' ),
 	);
 
 	/**
@@ -41,25 +41,26 @@ function media_upload_tabs() {
  * @param array $tabs
  * @return array $tabs with gallery if post has image attachment
  */
-function update_gallery_tab($tabs) {
+function update_gallery_tab( $tabs ) {
 	global $wpdb;
 
-	if ( !isset($_REQUEST['post_id']) ) {
-		unset($tabs['gallery']);
+	if ( ! isset( $_REQUEST['post_id'] ) ) {
+		unset( $tabs['gallery'] );
 		return $tabs;
 	}
 
-	$post_id = intval($_REQUEST['post_id']);
+	$post_id = intval( $_REQUEST['post_id'] );
 
-	if ( $post_id )
+	if ( $post_id ) {
 		$attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) );
+	}
 
-	if ( empty($attachments) ) {
-		unset($tabs['gallery']);
+	if ( empty( $attachments ) ) {
+		unset( $tabs['gallery'] );
 		return $tabs;
 	}
 
-	$tabs['gallery'] = sprintf(__('Gallery (%s)'), "<span id='attachments-count'>$attachments</span>");
+	$tabs['gallery'] = sprintf( __( 'Gallery (%s)' ), "<span id='attachments-count'>$attachments</span>" );
 
 	return $tabs;
 }
@@ -73,14 +74,14 @@ function update_gallery_tab($tabs) {
  */
 function the_media_upload_tabs() {
 	global $redir_tab;
-	$tabs = media_upload_tabs();
+	$tabs    = media_upload_tabs();
 	$default = 'type';
 
-	if ( !empty($tabs) ) {
+	if ( ! empty( $tabs ) ) {
 		echo "<ul id='sidemenu'>\n";
-		if ( isset($redir_tab) && array_key_exists($redir_tab, $tabs) ) {
+		if ( isset( $redir_tab ) && array_key_exists( $redir_tab, $tabs ) ) {
 			$current = $redir_tab;
-		} elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) ) {
+		} elseif ( isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $tabs ) ) {
 			$current = $_GET['tab'];
 		} else {
 			/** This filter is documented in wp-admin/media-upload.php */
@@ -90,12 +91,21 @@ function the_media_upload_tabs() {
 		foreach ( $tabs as $callback => $text ) {
 			$class = '';
 
-			if ( $current == $callback )
+			if ( $current == $callback ) {
 				$class = " class='current'";
+			}
 
-			$href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));
-			$link = "<a href='" . esc_url($href) . "'$class>$text</a>";
-			echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
+			$href = add_query_arg(
+				array(
+					'tab'            => $callback,
+					's'              => false,
+					'paged'          => false,
+					'post_mime_type' => false,
+					'm'              => false,
+				)
+			);
+			$link = "<a href='" . esc_url( $href ) . "'$class>$text</a>";
+			echo "\t<li id='" . esc_attr( "tab-$callback" ) . "'>$link</li>\n";
 		}
 		echo "</ul>\n";
 	}
@@ -131,8 +141,9 @@ function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $re
 		$rel = '';
 	}
 
-	if ( $url )
+	if ( $url ) {
 		$html = '<a href="' . esc_attr( $url ) . '"' . $rel . '>' . $html . '</a>';
+	}
 
 	/**
 	 * Filters the image HTML markup to send to the editor when inserting an image.
@@ -197,27 +208,30 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $
 	 * @param bool $bool Whether to disable appending captions. Returning true to the filter
 	 *                   will disable captions. Default empty string.
 	 */
-	if ( empty($caption) || apply_filters( 'disable_captions', '' ) )
+	if ( empty( $caption ) || apply_filters( 'disable_captions', '' ) ) {
 		return $html;
+	}
 
 	$id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
-	if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )
+	if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) ) {
 		return $html;
+	}
 
 	$width = $matches[1];
 
-	$caption = str_replace( array("\r\n", "\r"), "\n", $caption);
+	$caption = str_replace( array( "\r\n", "\r" ), "\n", $caption );
 	$caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
 
 	// Convert any remaining line breaks to <br>.
 	$caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
 
 	$html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
-	if ( empty($align) )
+	if ( empty( $align ) ) {
 		$align = 'none';
+	}
 
-	$shcode = '[caption id="' . $id . '" align="align' . $align	. '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';
+	$shcode = '[caption id="' . $id . '" align="align' . $align . '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';
 
 	/**
 	 * Filters the image HTML markup including the caption shortcode.
@@ -248,7 +262,7 @@ function _cleanup_image_add_caption( $matches ) {
  *
  * @param string $html
  */
-function media_send_to_editor($html) {
+function media_send_to_editor( $html ) {
 ?>
 <script type="text/javascript">
 var win = window.dialogArguments || opener || parent || top;
@@ -270,28 +284,30 @@ win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
  * @param array  $overrides Override the wp_handle_upload() behavior. Optional.
  * @return int|WP_Error ID of the attachment or a WP_Error object on failure.
  */
-function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) {
+function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false ) ) {
 
-	$time = current_time('mysql');
-	if ( $post = get_post($post_id) ) {
+	$time = current_time( 'mysql' );
+	if ( $post = get_post( $post_id ) ) {
 		// The post date doesn't usually matter for pages, so don't backdate this upload.
-		if ( 'page' !== $post->post_type && substr( $post->post_date, 0, 4 ) > 0 )
+		if ( 'page' !== $post->post_type && substr( $post->post_date, 0, 4 ) > 0 ) {
 			$time = $post->post_date;
+		}
 	}
 
-	$file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
+	$file = wp_handle_upload( $_FILES[ $file_id ], $overrides, $time );
 
-	if ( isset($file['error']) )
+	if ( isset( $file['error'] ) ) {
 		return new WP_Error( 'upload_error', $file['error'] );
+	}
 
-	$name = $_FILES[$file_id]['name'];
+	$name = $_FILES[ $file_id ]['name'];
 	$ext  = pathinfo( $name, PATHINFO_EXTENSION );
 	$name = wp_basename( $name, ".$ext" );
 
-	$url = $file['url'];
-	$type = $file['type'];
-	$file = $file['file'];
-	$title = sanitize_text_field( $name );
+	$url     = $file['url'];
+	$type    = $file['type'];
+	$file    = $file['file'];
+	$title   = sanitize_text_field( $name );
 	$content = '';
 	$excerpt = '';
 
@@ -317,7 +333,6 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 				/* translators: 1: audio track title */
 				$content .= sprintf( __( '"%s".' ), $title );
 			}
-
 		} elseif ( ! empty( $meta['album'] ) ) {
 
 			if ( ! empty( $meta['artist'] ) ) {
@@ -326,7 +341,6 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 			} else {
 				$content .= $meta['album'] . '.';
 			}
-
 		} elseif ( ! empty( $meta['artist'] ) ) {
 
 			$content .= $meta['artist'] . '.';
@@ -354,7 +368,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 			$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'];
@@ -366,21 +380,23 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
 	}
 
 	// Construct the attachment array
-	$attachment = array_merge( array(
-		'post_mime_type' => $type,
-		'guid' => $url,
-		'post_parent' => $post_id,
-		'post_title' => $title,
-		'post_content' => $content,
-		'post_excerpt' => $excerpt,
-	), $post_data );
+	$attachment = array_merge(
+		array(
+			'post_mime_type' => $type,
+			'guid'           => $url,
+			'post_parent'    => $post_id,
+			'post_title'     => $title,
+			'post_content'   => $content,
+			'post_excerpt'   => $excerpt,
+		), $post_data
+	);
 
 	// This should never be set as it would then overwrite an existing attachment.
 	unset( $attachment['ID'] );
 
 	// Save the data
 	$id = wp_insert_attachment( $attachment, $file, $post_id, true );
-	if ( !is_wp_error($id) ) {
+	if ( ! is_wp_error( $id ) ) {
 		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
 	}
 
@@ -400,51 +416,59 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override
  * @return int|object The ID of the attachment or a WP_Error on failure.
  */
 function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data = array() ) {
-	$overrides = array('test_form'=>false);
+	$overrides = array( 'test_form' => false );
 
 	$time = current_time( 'mysql' );
 	if ( $post = get_post( $post_id ) ) {
-		if ( substr( $post->post_date, 0, 4 ) > 0 )
+		if ( substr( $post->post_date, 0, 4 ) > 0 ) {
 			$time = $post->post_date;
+		}
 	}
 
 	$file = wp_handle_sideload( $file_array, $overrides, $time );
-	if ( isset($file['error']) )
+	if ( isset( $file['error'] ) ) {
 		return new WP_Error( 'upload_error', $file['error'] );
+	}
 
-	$url = $file['url'];
-	$type = $file['type'];
-	$file = $file['file'];
-	$title = preg_replace('/\.[^.]+$/', '', basename($file));
+	$url     = $file['url'];
+	$type    = $file['type'];
+	$file    = $file['file'];
+	$title   = preg_replace( '/\.[^.]+$/', '', basename( $file ) );
 	$content = '';
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	if ( $image_meta = @wp_read_image_metadata($file) ) {
-		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
+	if ( $image_meta = @wp_read_image_metadata( $file ) ) {
+		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
 			$title = $image_meta['title'];
-		if ( trim( $image_meta['caption'] ) )
+		}
+		if ( trim( $image_meta['caption'] ) ) {
 			$content = $image_meta['caption'];
+		}
 	}
 
-	if ( isset( $desc ) )
+	if ( isset( $desc ) ) {
 		$title = $desc;
+	}
 
 	// Construct the attachment array.
-	$attachment = array_merge( array(
-		'post_mime_type' => $type,
-		'guid' => $url,
-		'post_parent' => $post_id,
-		'post_title' => $title,
-		'post_content' => $content,
-	), $post_data );
+	$attachment = array_merge(
+		array(
+			'post_mime_type' => $type,
+			'guid'           => $url,
+			'post_parent'    => $post_id,
+			'post_title'     => $title,
+			'post_content'   => $content,
+		), $post_data
+	);
 
 	// This should never be set as it would then overwrite an existing attachment.
 	unset( $attachment['ID'] );
 
 	// Save the attachment metadata
-	$id = wp_insert_attachment($attachment, $file, $post_id);
-	if ( !is_wp_error($id) )
+	$id = wp_insert_attachment( $attachment, $file, $post_id );
+	if ( ! is_wp_error( $id ) ) {
 		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	}
 
 	return $id;
 }
@@ -458,17 +482,18 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
  *
  * @param string|callable $content_func
  */
-function wp_iframe($content_func /* ... */) {
+function wp_iframe( $content_func /* ... */ ) {
 	_wp_admin_html_begin();
 ?>
-<title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
+<title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
 <?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' ) )
-	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
+	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) {
 	wp_enqueue_style( 'deprecated-media' );
+}
 wp_enqueue_style( 'ie' );
 ?>
 <script type="text/javascript">
@@ -538,8 +563,8 @@ document.body.className = document.body.className.replace('no-js', 'js');
 </script>
 <?php
 	$args = func_get_args();
-	$args = array_slice($args, 1);
-	call_user_func_array($content_func, $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' );
@@ -561,22 +586,26 @@ document.body.className = document.body.className.replace('no-js', 'js');
  *
  * @param string $editor_id
  */
-function media_buttons($editor_id = 'content') {
+function media_buttons( $editor_id = 'content' ) {
 	static $instance = 0;
 	$instance++;
 
 	$post = get_post();
-	if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
+	if ( ! $post && ! empty( $GLOBALS['post_ID'] ) ) {
 		$post = $GLOBALS['post_ID'];
+	}
 
-	wp_enqueue_media( array(
-		'post' => $post
-	) );
+	wp_enqueue_media(
+		array(
+			'post' => $post,
+		)
+	);
 
 	$img = '<span class="wp-media-buttons-icon"></span> ';
 
 	$id_attribute = $instance === 1 ? ' id="insert-media-button"' : '';
-	printf( '<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
+	printf(
+		'<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
 		$id_attribute,
 		esc_attr( $editor_id ),
 		$img . __( 'Add Media' )
@@ -595,14 +624,14 @@ function media_buttons($editor_id = 'content') {
 
 	if ( $legacy_filter ) {
 		// #WP22559. Close <a> if a plugin started by closing <a> to open their own <a> tag.
-		if ( 0 === stripos( trim( $legacy_filter ), '</a>' ) )
+		if ( 0 === stripos( trim( $legacy_filter ), '</a>' ) ) {
 			$legacy_filter .= '</a>';
+		}
 		echo $legacy_filter;
 	}
 }
 
 /**
- *
  * @global int $post_ID
  * @param string $type
  * @param int $post_id
@@ -612,16 +641,19 @@ function media_buttons($editor_id = 'content') {
 function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
 	global $post_ID;
 
-	if ( empty( $post_id ) )
+	if ( empty( $post_id ) ) {
 		$post_id = $post_ID;
+	}
 
-	$upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url('media-upload.php') );
+	$upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url( 'media-upload.php' ) );
 
-	if ( $type && 'media' != $type )
-		$upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
+	if ( $type && 'media' != $type ) {
+		$upload_iframe_src = add_query_arg( 'type', $type, $upload_iframe_src );
+	}
 
-	if ( ! empty( $tab ) )
-		$upload_iframe_src = add_query_arg('tab', $tab, $upload_iframe_src);
+	if ( ! empty( $tab ) ) {
+		$upload_iframe_src = add_query_arg( 'tab', $tab, $upload_iframe_src );
+	}
 
 	/**
 	 * Filters the upload iframe source URL for a specific media type.
@@ -635,7 +667,7 @@ function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
 	 */
 	$upload_iframe_src = apply_filters( "{$type}_upload_iframe_src", $upload_iframe_src );
 
-	return add_query_arg('TB_iframe', true, $upload_iframe_src);
+	return add_query_arg( 'TB_iframe', true, $upload_iframe_src );
 }
 
 /**
@@ -646,72 +678,83 @@ function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
  * @return mixed void|object WP_Error on failure
  */
 function media_upload_form_handler() {
-	check_admin_referer('media-form');
+	check_admin_referer( 'media-form' );
 
 	$errors = null;
 
-	if ( isset($_POST['send']) ) {
-		$keys = array_keys( $_POST['send'] );
+	if ( isset( $_POST['send'] ) ) {
+		$keys    = array_keys( $_POST['send'] );
 		$send_id = (int) reset( $keys );
 	}
 
-	if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
-		$post = $_post = get_post($attachment_id, ARRAY_A);
+	if ( ! empty( $_POST['attachments'] ) ) {
+		foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
+			$post = $_post = get_post( $attachment_id, ARRAY_A );
 
-		if ( !current_user_can( 'edit_post', $attachment_id ) )
-			continue;
-
-		if ( isset($attachment['post_content']) )
-			$post['post_content'] = $attachment['post_content'];
-		if ( isset($attachment['post_title']) )
-			$post['post_title'] = $attachment['post_title'];
-		if ( isset($attachment['post_excerpt']) )
-			$post['post_excerpt'] = $attachment['post_excerpt'];
-		if ( isset($attachment['menu_order']) )
-			$post['menu_order'] = $attachment['menu_order'];
-
-		if ( isset($send_id) && $attachment_id == $send_id ) {
-			if ( isset($attachment['post_parent']) )
-				$post['post_parent'] = $attachment['post_parent'];
-		}
-
-		/**
-		 * Filters the attachment fields to be saved.
-		 *
-		 * @since 2.5.0
-		 *
-		 * @see wp_get_attachment_metadata()
-		 *
-		 * @param array $post       An array of post data.
-		 * @param array $attachment An array of attachment metadata.
-		 */
-		$post = apply_filters( 'attachment_fields_to_save', $post, $attachment );
-
-		if ( isset($attachment['image_alt']) ) {
-			$image_alt = wp_unslash( $attachment['image_alt'] );
-			if ( $image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true) ) {
-				$image_alt = wp_strip_all_tags( $image_alt, true );
-
-				// Update_meta expects slashed.
-				update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+			if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
+				continue;
 			}
-		}
 
-		if ( isset($post['errors']) ) {
-			$errors[$attachment_id] = $post['errors'];
-			unset($post['errors']);
-		}
+			if ( isset( $attachment['post_content'] ) ) {
+				$post['post_content'] = $attachment['post_content'];
+			}
+			if ( isset( $attachment['post_title'] ) ) {
+				$post['post_title'] = $attachment['post_title'];
+			}
+			if ( isset( $attachment['post_excerpt'] ) ) {
+				$post['post_excerpt'] = $attachment['post_excerpt'];
+			}
+			if ( isset( $attachment['menu_order'] ) ) {
+				$post['menu_order'] = $attachment['menu_order'];
+			}
 
-		if ( $post != $_post )
-			wp_update_post($post);
+			if ( isset( $send_id ) && $attachment_id == $send_id ) {
+				if ( isset( $attachment['post_parent'] ) ) {
+					$post['post_parent'] = $attachment['post_parent'];
+				}
+			}
 
-		foreach ( get_attachment_taxonomies($post) as $t ) {
-			if ( isset($attachment[$t]) )
-				wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false);
+			/**
+			 * Filters the attachment fields to be saved.
+			 *
+			 * @since 2.5.0
+			 *
+			 * @see wp_get_attachment_metadata()
+			 *
+			 * @param array $post       An array of post data.
+			 * @param array $attachment An array of attachment metadata.
+			 */
+			$post = apply_filters( 'attachment_fields_to_save', $post, $attachment );
+
+			if ( isset( $attachment['image_alt'] ) ) {
+				$image_alt = wp_unslash( $attachment['image_alt'] );
+				if ( $image_alt != get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) {
+					$image_alt = wp_strip_all_tags( $image_alt, true );
+
+					// Update_meta expects slashed.
+					update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+				}
+			}
+
+			if ( isset( $post['errors'] ) ) {
+				$errors[ $attachment_id ] = $post['errors'];
+				unset( $post['errors'] );
+			}
+
+			if ( $post != $_post ) {
+				wp_update_post( $post );
+			}
+
+			foreach ( get_attachment_taxonomies( $post ) as $t ) {
+				if ( isset( $attachment[ $t ] ) ) {
+					wp_set_object_terms( $attachment_id, array_map( 'trim', preg_split( '/,+/', $attachment[ $t ] ) ), $t, false );
+				}
+			}
 		}
 	}
 
-	if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?>
+	if ( isset( $_POST['insert-gallery'] ) || isset( $_POST['update-gallery'] ) ) {
+	?>
 		<script type="text/javascript">
 		var win = window.dialogArguments || opener || parent || top;
 		win.tb_remove();
@@ -720,14 +763,15 @@ function media_upload_form_handler() {
 		exit;
 	}
 
-	if ( isset($send_id) ) {
-		$attachment = wp_unslash( $_POST['attachments'][$send_id] );
+	if ( isset( $send_id ) ) {
+		$attachment = wp_unslash( $_POST['attachments'][ $send_id ] );
 
 		$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
-		if ( !empty($attachment['url']) ) {
+		if ( ! empty( $attachment['url'] ) ) {
 			$rel = '';
-			if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )
-				$rel = " rel='attachment wp-att-" . esc_attr($send_id) . "'";
+			if ( strpos( $attachment['url'], 'attachment_id' ) || get_attachment_link( $send_id ) == $attachment['url'] ) {
+				$rel = " rel='attachment wp-att-" . esc_attr( $send_id ) . "'";
+			}
 			$html = "<a href='{$attachment['url']}'$rel>$html</a>";
 		}
 
@@ -743,7 +787,7 @@ function media_upload_form_handler() {
 		 * @param array  $attachment Array of attachment metadata.
 		 */
 		$html = apply_filters( 'media_send_to_editor', $html, $send_id, $attachment );
-		return media_send_to_editor($html);
+		return media_send_to_editor( $html );
 	}
 
 	return $errors;
@@ -758,36 +802,40 @@ function media_upload_form_handler() {
  */
 function wp_media_upload_handler() {
 	$errors = array();
-	$id = 0;
+	$id     = 0;
 
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		check_admin_referer('media-form');
+	if ( isset( $_POST['html-upload'] ) && ! empty( $_FILES ) ) {
+		check_admin_referer( 'media-form' );
 		// Upload File button was clicked
-		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
-		unset($_FILES);
-		if ( is_wp_error($id) ) {
+		$id = media_handle_upload( 'async-upload', $_REQUEST['post_id'] );
+		unset( $_FILES );
+		if ( is_wp_error( $id ) ) {
 			$errors['upload_error'] = $id;
-			$id = false;
+			$id                     = false;
 		}
 	}
 
-	if ( !empty($_POST['insertonlybutton']) ) {
+	if ( ! empty( $_POST['insertonlybutton'] ) ) {
 		$src = $_POST['src'];
-		if ( !empty($src) && !strpos($src, '://') )
+		if ( ! empty( $src ) && ! strpos( $src, '://' ) ) {
 			$src = "http://$src";
+		}
 
 		if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
 			$title = esc_html( wp_unslash( $_POST['title'] ) );
-			if ( empty( $title ) )
+			if ( empty( $title ) ) {
 				$title = esc_html( basename( $src ) );
+			}
 
-			if ( $title && $src )
-				$html = "<a href='" . esc_url($src) . "'>$title</a>";
+			if ( $title && $src ) {
+				$html = "<a href='" . esc_url( $src ) . "'>$title</a>";
+			}
 
 			$type = 'file';
 			if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
-				&& ( 'audio' == $ext_type || 'video' == $ext_type ) )
+				&& ( 'audio' == $ext_type || 'video' == $ext_type ) ) {
 					$type = $ext_type;
+			}
 
 			/**
 			 * Filters the URL sent to the editor for a specific media type.
@@ -804,13 +852,14 @@ function wp_media_upload_handler() {
 			$html = apply_filters( "{$type}_send_to_editor_url", $html, esc_url_raw( $src ), $title );
 		} else {
 			$align = '';
-			$alt = esc_attr( wp_unslash( $_POST['alt'] ) );
-			if ( isset($_POST['align']) ) {
+			$alt   = esc_attr( wp_unslash( $_POST['alt'] ) );
+			if ( isset( $_POST['align'] ) ) {
 				$align = esc_attr( wp_unslash( $_POST['align'] ) );
 				$class = " class='align$align'";
 			}
-			if ( !empty($src) )
-				$html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
+			if ( ! empty( $src ) ) {
+				$html = "<img src='" . esc_url( $src ) . "' alt='$alt'$class />";
+			}
 
 			/**
 			 * Filters the image URL sent to the editor.
@@ -826,27 +875,30 @@ function wp_media_upload_handler() {
 			$html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align );
 		}
 
-		return media_send_to_editor($html);
+		return media_send_to_editor( $html );
 	}
 
 	if ( isset( $_POST['save'] ) ) {
-		$errors['upload_notice'] = __('Saved.');
+		$errors['upload_notice'] = __( 'Saved.' );
 		wp_enqueue_script( 'admin-gallery' );
- 		return wp_iframe( 'media_upload_gallery_form', $errors );
+		return wp_iframe( 'media_upload_gallery_form', $errors );
 
 	} elseif ( ! empty( $_POST ) ) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
+		if ( is_string( $return ) ) {
 			return $return;
-		if ( is_array($return) )
+		}
+		if ( is_array( $return ) ) {
 			$errors = $return;
+		}
 	}
 
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) {
+	if ( isset( $_GET['tab'] ) && $_GET['tab'] == 'type_url' ) {
 		$type = 'image';
-		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) )
+		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) {
 			$type = $_GET['type'];
+		}
 		return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
 	}
 
@@ -875,7 +927,7 @@ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' )
 			return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
 		}
 
-		$file_array = array();
+		$file_array         = array();
 		$file_array['name'] = basename( $matches[0] );
 
 		// Download file to temp location.
@@ -893,7 +945,7 @@ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' )
 		if ( is_wp_error( $id ) ) {
 			@unlink( $file_array['tmp_name'] );
 			return $id;
-		// If attachment id was requested, return it early.
+			// If attachment id was requested, return it early.
 		} elseif ( $return === 'id' ) {
 			return $id;
 		}
@@ -907,7 +959,7 @@ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' )
 			return $src;
 		}
 
-		$alt = isset( $desc ) ? esc_attr( $desc ) : '';
+		$alt  = isset( $desc ) ? esc_attr( $desc ) : '';
 		$html = "<img src='$src' alt='$alt' />";
 		return $html;
 	} else {
@@ -925,16 +977,18 @@ function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' )
 function media_upload_gallery() {
 	$errors = array();
 
-	if ( !empty($_POST) ) {
+	if ( ! empty( $_POST ) ) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
+		if ( is_string( $return ) ) {
 			return $return;
-		if ( is_array($return) )
+		}
+		if ( is_array( $return ) ) {
 			$errors = $return;
+		}
 	}
 
-	wp_enqueue_script('admin-gallery');
+	wp_enqueue_script( 'admin-gallery' );
 	return wp_iframe( 'media_upload_gallery_form', $errors );
 }
 
@@ -947,13 +1001,15 @@ function media_upload_gallery() {
  */
 function media_upload_library() {
 	$errors = array();
-	if ( !empty($_POST) ) {
+	if ( ! empty( $_POST ) ) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
+		if ( is_string( $return ) ) {
 			return $return;
-		if ( is_array($return) )
+		}
+		if ( is_array( $return ) ) {
 			$errors = $return;
+		}
 	}
 
 	return wp_iframe( 'media_upload_library_form', $errors );
@@ -970,21 +1026,28 @@ function media_upload_library() {
  */
 function image_align_input_fields( $post, $checked = '' ) {
 
-	if ( empty($checked) )
-		$checked = get_user_setting('align', 'none');
+	if ( empty( $checked ) ) {
+		$checked = get_user_setting( 'align', 'none' );
+	}
 
-	$alignments = array('none' => __('None'), 'left' => __('Left'), 'center' => __('Center'), 'right' => __('Right'));
-	if ( !array_key_exists( (string) $checked, $alignments ) )
+	$alignments = array(
+		'none'   => __( 'None' ),
+		'left'   => __( 'Left' ),
+		'center' => __( 'Center' ),
+		'right'  => __( 'Right' ),
+	);
+	if ( ! array_key_exists( (string) $checked, $alignments ) ) {
 		$checked = 'none';
+	}
 
 	$out = array();
 	foreach ( $alignments as $name => $label ) {
-		$name = esc_attr($name);
-		$out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'".
-			( $checked == $name ? " checked='checked'" : "" ) .
+		$name  = esc_attr( $name );
+		$out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'" .
+			( $checked == $name ? " checked='checked'" : '' ) .
 			" /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
 	}
-	return join("\n", $out);
+	return join( "\n", $out );
 }
 
 /**
@@ -1005,25 +1068,27 @@ function image_size_input_fields( $post, $check = '' ) {
 	 * @param array $size_names Array of image sizes and their names. Default values
 	 *                          include 'Thumbnail', 'Medium', 'Large', 'Full Size'.
 	 */
-	$size_names = apply_filters( 'image_size_names_choose', array(
-		'thumbnail' => __( 'Thumbnail' ),
-		'medium'    => __( 'Medium' ),
-		'large'     => __( 'Large' ),
-		'full'      => __( 'Full Size' )
-	) );
+	$size_names = apply_filters(
+		'image_size_names_choose', array(
+			'thumbnail' => __( 'Thumbnail' ),
+			'medium'    => __( 'Medium' ),
+			'large'     => __( 'Large' ),
+			'full'      => __( 'Full Size' ),
+		)
+	);
 
 	if ( empty( $check ) ) {
-		$check = get_user_setting('imgsize', 'medium');
+		$check = get_user_setting( 'imgsize', 'medium' );
 	}
 	$out = array();
 
 	foreach ( $size_names as $size => $label ) {
 		$downsize = image_downsize( $post->ID, $size );
-		$checked = '';
+		$checked  = '';
 
 		// Is this size selectable?
 		$enabled = ( $downsize[3] || 'full' == $size );
-		$css_id = "image-size-{$size}-{$post->ID}";
+		$css_id  = "image-size-{$size}-{$post->ID}";
 
 		// If this size is the default but that's not available, don't select it.
 		if ( $size == $check ) {
@@ -1037,7 +1102,7 @@ function image_size_input_fields( $post, $check = '' ) {
 			 * If $check is not enabled, default to the first available size
 			 * that's bigger than a thumbnail.
 			 */
-			$check = $size;
+			$check   = $size;
 			$checked = " checked='checked'";
 		}
 
@@ -1047,7 +1112,7 @@ function image_size_input_fields( $post, $check = '' ) {
 
 		// Only show the dimensions if that choice is available.
 		if ( $enabled ) {
-			$html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
+			$html .= " <label for='{$css_id}' class='help'>" . sprintf( '(%d&nbsp;&times;&nbsp;%d)', $downsize[1], $downsize[2] ) . '</label>';
 		}
 		$html .= '</div>';
 
@@ -1070,26 +1135,28 @@ function image_size_input_fields( $post, $check = '' ) {
  * @param string $url_type
  * @return string
  */
-function image_link_input_fields($post, $url_type = '') {
+function image_link_input_fields( $post, $url_type = '' ) {
 
-	$file = wp_get_attachment_url($post->ID);
-	$link = get_attachment_link($post->ID);
+	$file = wp_get_attachment_url( $post->ID );
+	$link = get_attachment_link( $post->ID );
 
-	if ( empty($url_type) )
-		$url_type = get_user_setting('urlbutton', 'post');
+	if ( empty( $url_type ) ) {
+		$url_type = get_user_setting( 'urlbutton', 'post' );
+	}
 
 	$url = '';
-	if ( $url_type == 'file' )
+	if ( $url_type == 'file' ) {
 		$url = $file;
-	elseif ( $url_type == 'post' )
+	} elseif ( $url_type == 'post' ) {
 		$url = $link;
+	}
 
 	return "
-	<input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
-	<button type='button' class='button urlnone' data-link-url=''>" . __('None') . "</button>
-	<button type='button' class='button urlfile' data-link-url='" . esc_attr($file) . "'>" . __('File URL') . "</button>
-	<button type='button' class='button urlpost' data-link-url='" . esc_attr($link) . "'>" . __('Attachment Post URL') . "</button>
-";
+	<input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr( $url ) . "' /><br />
+	<button type='button' class='button urlnone' data-link-url=''>" . __( 'None' ) . "</button>
+	<button type='button' class='button urlfile' data-link-url='" . esc_attr( $file ) . "'>" . __( 'File URL' ) . "</button>
+	<button type='button' class='button urlpost' data-link-url='" . esc_attr( $link ) . "'>" . __( 'Attachment Post URL' ) . '</button>
+';
 }
 
 /**
@@ -1100,7 +1167,7 @@ function image_link_input_fields($post, $url_type = '') {
  * @param WP_Post $edit_post Attachment WP_Post object.
  * @return string HTML markup for the textarea element.
  */
-function wp_caption_input_textarea($edit_post) {
+function wp_caption_input_textarea( $edit_post ) {
 	// Post data is already escaped.
 	$name = "attachments[{$edit_post->ID}][post_excerpt]";
 
@@ -1116,7 +1183,7 @@ function wp_caption_input_textarea($edit_post) {
  * @param object $post
  * @return array
  */
-function image_attachment_fields_to_edit($form_fields, $post) {
+function image_attachment_fields_to_edit( $form_fields, $post ) {
 	return $form_fields;
 }
 
@@ -1130,7 +1197,7 @@ function image_attachment_fields_to_edit($form_fields, $post) {
  * @return array Filtered attachment form fields.
  */
 function media_single_attachment_fields_to_edit( $form_fields, $post ) {
-	unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']);
+	unset( $form_fields['url'], $form_fields['align'], $form_fields['image-size'] );
 	return $form_fields;
 }
 
@@ -1144,7 +1211,7 @@ function media_single_attachment_fields_to_edit( $form_fields, $post ) {
  * @return array Filtered attachment form fields.
  */
 function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
-	unset($form_fields['image_url']);
+	unset( $form_fields['image_url'] );
 	return $form_fields;
 }
 
@@ -1164,8 +1231,8 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
 function image_attachment_fields_to_save( $post, $attachment ) {
 	if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) {
 		if ( strlen( trim( $post['post_title'] ) ) == 0 ) {
-			$attachment_url = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
-			$post['post_title'] = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
+			$attachment_url                           = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
+			$post['post_title']                       = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
 			$post['errors']['post_title']['errors'][] = __( 'Empty Title filled from filename.' );
 		}
 	}
@@ -1183,16 +1250,16 @@ function image_attachment_fields_to_save( $post, $attachment ) {
  * @param array $attachment
  * @return string
  */
-function image_media_send_to_editor($html, $attachment_id, $attachment) {
-	$post = get_post($attachment_id);
-	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-		$url = $attachment['url'];
-		$align = !empty($attachment['align']) ? $attachment['align'] : 'none';
-		$size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
-		$alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
-		$rel = ( strpos( $url, 'attachment_id') || $url === get_attachment_link( $attachment_id ) );
+function image_media_send_to_editor( $html, $attachment_id, $attachment ) {
+	$post = get_post( $attachment_id );
+	if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
+		$url   = $attachment['url'];
+		$align = ! empty( $attachment['align'] ) ? $attachment['align'] : 'none';
+		$size  = ! empty( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
+		$alt   = ! empty( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
+		$rel   = ( strpos( $url, 'attachment_id' ) || $url === get_attachment_link( $attachment_id ) );
 
-		return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt);
+		return get_image_send_to_editor( $attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt );
 	}
 
 	return $html;
@@ -1207,98 +1274,106 @@ function image_media_send_to_editor($html, $attachment_id, $attachment) {
  * @param array $errors
  * @return array
  */
-function get_attachment_fields_to_edit($post, $errors = null) {
-	if ( is_int($post) )
-		$post = get_post($post);
-	if ( is_array($post) )
+function get_attachment_fields_to_edit( $post, $errors = null ) {
+	if ( is_int( $post ) ) {
+		$post = get_post( $post );
+	}
+	if ( is_array( $post ) ) {
 		$post = new WP_Post( (object) $post );
+	}
 
-	$image_url = wp_get_attachment_url($post->ID);
+	$image_url = wp_get_attachment_url( $post->ID );
 
-	$edit_post = sanitize_post($post, 'edit');
+	$edit_post = sanitize_post( $post, 'edit' );
 
 	$form_fields = array(
 		'post_title'   => array(
-			'label'      => __('Title'),
-			'value'      => $edit_post->post_title
+			'label' => __( 'Title' ),
+			'value' => $edit_post->post_title,
 		),
-		'image_alt'   => array(),
+		'image_alt'    => array(),
 		'post_excerpt' => array(
-			'label'      => __('Caption'),
-			'input'      => 'html',
-			'html'       => wp_caption_input_textarea($edit_post)
+			'label' => __( 'Caption' ),
+			'input' => 'html',
+			'html'  => wp_caption_input_textarea( $edit_post ),
 		),
 		'post_content' => array(
-			'label'      => __('Description'),
-			'value'      => $edit_post->post_content,
-			'input'      => 'textarea'
+			'label' => __( 'Description' ),
+			'value' => $edit_post->post_content,
+			'input' => 'textarea',
 		),
 		'url'          => array(
-			'label'      => __('Link URL'),
-			'input'      => 'html',
-			'html'       => image_link_input_fields($post, get_option('image_default_link_type')),
-			'helps'      => __('Enter a link URL or click above for presets.')
+			'label' => __( 'Link URL' ),
+			'input' => 'html',
+			'html'  => image_link_input_fields( $post, get_option( 'image_default_link_type' ) ),
+			'helps' => __( 'Enter a link URL or click above for presets.' ),
 		),
 		'menu_order'   => array(
-			'label'      => __('Order'),
-			'value'      => $edit_post->menu_order
+			'label' => __( 'Order' ),
+			'value' => $edit_post->menu_order,
+		),
+		'image_url'    => array(
+			'label' => __( 'File URL' ),
+			'input' => 'html',
+			'html'  => "<input type='text' class='text urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='" . esc_attr( $image_url ) . "' /><br />",
+			'value' => wp_get_attachment_url( $post->ID ),
+			'helps' => __( 'Location of the uploaded file.' ),
 		),
-		'image_url'	=> array(
-			'label'      => __('File URL'),
-			'input'      => 'html',
-			'html'       => "<input type='text' class='text urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='" . esc_attr($image_url) . "' /><br />",
-			'value'      => wp_get_attachment_url($post->ID),
-			'helps'      => __('Location of the uploaded file.')
-		)
 	);
 
-	foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
-		$t = (array) get_taxonomy($taxonomy);
-		if ( ! $t['public'] || ! $t['show_ui'] )
+	foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
+		$t = (array) get_taxonomy( $taxonomy );
+		if ( ! $t['public'] || ! $t['show_ui'] ) {
 			continue;
-		if ( empty($t['label']) )
+		}
+		if ( empty( $t['label'] ) ) {
 			$t['label'] = $taxonomy;
-		if ( empty($t['args']) )
+		}
+		if ( empty( $t['args'] ) ) {
 			$t['args'] = array();
+		}
 
-		$terms = get_object_term_cache($post->ID, $taxonomy);
-		if ( false === $terms )
-			$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+		$terms = get_object_term_cache( $post->ID, $taxonomy );
+		if ( false === $terms ) {
+			$terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
+		}
 
 		$values = array();
 
-		foreach ( $terms as $term )
+		foreach ( $terms as $term ) {
 			$values[] = $term->slug;
-		$t['value'] = join(', ', $values);
+		}
+		$t['value'] = join( ', ', $values );
 
-		$form_fields[$taxonomy] = $t;
+		$form_fields[ $taxonomy ] = $t;
 	}
 
 	// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
 	// The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
-	$form_fields = array_merge_recursive($form_fields, (array) $errors);
+	$form_fields = array_merge_recursive( $form_fields, (array) $errors );
 
 	// This was formerly in image_attachment_fields_to_edit().
-	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
-		$alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
-		if ( empty($alt) )
+	if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
+		$alt = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
+		if ( empty( $alt ) ) {
 			$alt = '';
+		}
 
 		$form_fields['post_title']['required'] = true;
 
 		$form_fields['image_alt'] = array(
 			'value' => $alt,
-			'label' => __('Alternative Text'),
-			'helps' => __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;')
+			'label' => __( 'Alternative Text' ),
+			'helps' => __( 'Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;' ),
 		);
 
 		$form_fields['align'] = array(
-			'label' => __('Alignment'),
+			'label' => __( 'Alignment' ),
 			'input' => 'html',
-			'html'  => image_align_input_fields($post, get_option('image_default_align')),
+			'html'  => image_align_input_fields( $post, get_option( 'image_default_align' ) ),
 		);
 
-		$form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
+		$form_fields['image-size'] = image_size_input_fields( $post, get_option( 'image_default_size', 'medium' ) );
 
 	} else {
 		unset( $form_fields['image_alt'] );
@@ -1335,23 +1410,35 @@ function get_attachment_fields_to_edit($post, $errors = null) {
 function get_media_items( $post_id, $errors ) {
 	$attachments = array();
 	if ( $post_id ) {
-		$post = get_post($post_id);
-		if ( $post && $post->post_type == 'attachment' )
-			$attachments = array($post->ID => $post);
-		else
-			$attachments = get_children( array( 'post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC') );
+		$post = get_post( $post_id );
+		if ( $post && $post->post_type == 'attachment' ) {
+			$attachments = array( $post->ID => $post );
+		} else {
+			$attachments = get_children(
+				array(
+					'post_parent' => $post_id,
+					'post_type'   => 'attachment',
+					'orderby'     => 'menu_order ASC, ID',
+					'order'       => 'DESC',
+				)
+			);
+		}
 	} else {
-		if ( is_array($GLOBALS['wp_the_query']->posts) )
-			foreach ( $GLOBALS['wp_the_query']->posts as $attachment )
-				$attachments[$attachment->ID] = $attachment;
+		if ( is_array( $GLOBALS['wp_the_query']->posts ) ) {
+			foreach ( $GLOBALS['wp_the_query']->posts as $attachment ) {
+				$attachments[ $attachment->ID ] = $attachment;
+			}
+		}
 	}
 
 	$output = '';
 	foreach ( (array) $attachments as $id => $attachment ) {
-		if ( $attachment->post_status == 'trash' )
+		if ( $attachment->post_status == 'trash' ) {
 			continue;
-		if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
+		}
+		if ( $item = get_media_item( $id, array( 'errors' => isset( $errors[ $id ] ) ? $errors[ $id ] : null ) ) ) {
 			$output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
+		}
 	}
 
 	return $output;
@@ -1371,22 +1458,23 @@ function get_media_items( $post_id, $errors ) {
 function get_media_item( $attachment_id, $args = null ) {
 	global $redir_tab;
 
-	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) )
+	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) ) {
 		$thumb_url = $thumb_url[0];
-	else
+	} else {
 		$thumb_url = false;
+	}
 
-	$post = get_post( $attachment_id );
-	$current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
+	$post            = get_post( $attachment_id );
+	$current_post_id = ! empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
 
 	$default_args = array(
-		'errors' => null,
-		'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true,
-		'delete' => true,
-		'toggle' => true,
-		'show_title' => true
+		'errors'     => null,
+		'send'       => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true,
+		'delete'     => true,
+		'toggle'     => true,
+		'show_title' => true,
 	);
-	$args = wp_parse_args( $args, $default_args );
+	$args         = wp_parse_args( $args, $default_args );
 
 	/**
 	 * Filters the arguments used to retrieve an image for the edit image form.
@@ -1402,39 +1490,40 @@ function get_media_item( $attachment_id, $args = null ) {
 	$toggle_on  = __( 'Show' );
 	$toggle_off = __( 'Hide' );
 
-	$file = get_attached_file( $post->ID );
+	$file     = get_attached_file( $post->ID );
 	$filename = esc_html( wp_basename( $file ) );
-	$title = esc_attr( $post->post_title );
+	$title    = esc_attr( $post->post_title );
 
 	$post_mime_types = get_post_mime_types();
-	$keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
-	$type = reset( $keys );
-	$type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
+	$keys            = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
+	$type            = reset( $keys );
+	$type_html       = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 
 	$form_fields = get_attachment_fields_to_edit( $post, $r['errors'] );
 
 	if ( $r['toggle'] ) {
-		$class = empty( $r['errors'] ) ? 'startclosed' : 'startopen';
+		$class        = empty( $r['errors'] ) ? 'startclosed' : 'startopen';
 		$toggle_links = "
 	<a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
 	<a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
 	} else {
-		$class = '';
+		$class        = '';
 		$toggle_links = '';
 	}
 
-	$display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
-	$display_title = $r['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . "</span></div>" : '';
+	$display_title = ( ! empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
+	$display_title = $r['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . '</span></div>' : '';
 
 	$gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
-	$order = '';
+	$order   = '';
 
 	foreach ( $form_fields as $key => $val ) {
 		if ( 'menu_order' == $key ) {
-			if ( $gallery )
-				$order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ). "' /></div>";
-			else
+			if ( $gallery ) {
+				$order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' /></div>";
+			} else {
 				$order = "<input type='hidden' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' />";
+			}
 
 			unset( $form_fields['menu_order'] );
 			break;
@@ -1442,9 +1531,10 @@ function get_media_item( $attachment_id, $args = null ) {
 	}
 
 	$media_dims = '';
-	$meta = wp_get_attachment_metadata( $post->ID );
-	if ( isset( $meta['width'], $meta['height'] ) )
+	$meta       = wp_get_attachment_metadata( $post->ID );
+	if ( isset( $meta['width'], $meta['height'] ) ) {
 		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+	}
 
 	/**
 	 * Filters the media metadata.
@@ -1458,7 +1548,7 @@ function get_media_item( $attachment_id, $args = null ) {
 
 	$image_edit_button = '';
 	if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
-		$nonce = wp_create_nonce( "image_editor-$post->ID" );
+		$nonce             = wp_create_nonce( "image_editor-$post->ID" );
 		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
 	}
 
@@ -1477,11 +1567,12 @@ function get_media_item( $attachment_id, $args = null ) {
 			<p>$image_edit_button</p>
 			</td>
 			<td>
-			<p><strong>" . __('File name:') . "</strong> $filename</p>
-			<p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
-			<p><strong>" . __('Upload date:') . "</strong> " . mysql2date( __( 'F j, Y' ), $post->post_date ). '</p>';
-			if ( !empty( $media_dims ) )
-				$item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
+			<p><strong>" . __( 'File name:' ) . "</strong> $filename</p>
+			<p><strong>" . __( 'File type:' ) . "</strong> $post->post_mime_type</p>
+			<p><strong>" . __( 'Upload date:' ) . '</strong> ' . mysql2date( __( 'F j, Y' ), $post->post_date ) . '</p>';
+	if ( ! empty( $media_dims ) ) {
+		$item .= '<p><strong>' . __( 'Dimensions:' ) . "</strong> $media_dims</p>\n";
+	}
 
 			$item .= "</td></tr>\n";
 
@@ -1505,25 +1596,25 @@ function get_media_item( $attachment_id, $args = null ) {
 
 	$delete = empty( $r['delete'] ) ? '' : $r['delete'];
 	if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
-		if ( !EMPTY_TRASH_DAYS ) {
+		if ( ! EMPTY_TRASH_DAYS ) {
 			$delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
-		} elseif ( !MEDIA_TRASH ) {
+		} elseif ( ! MEDIA_TRASH ) {
 			$delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
 				<div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" .
 				/* translators: %s: file name */
 				'<p>' . sprintf( __( 'You are about to delete %s.' ), '<strong>' . $filename . '</strong>' ) . "</p>
 				<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
-				<a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
-				</div>";
+				<a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . '</a>
+				</div>';
 		} else {
 			$delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
-			<a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
+			<a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . '</a>';
 		}
 	} else {
 		$delete = '';
 	}
 
-	$thumbnail = '';
+	$thumbnail       = '';
 	$calling_post_id = 0;
 	if ( isset( $_GET['post_id'] ) ) {
 		$calling_post_id = absint( $_GET['post_id'] );
@@ -1533,45 +1624,46 @@ function get_media_item( $attachment_id, $args = null ) {
 	if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
 		&& post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
 
-		$calling_post = get_post( $calling_post_id );
+		$calling_post             = get_post( $calling_post_id );
 		$calling_post_type_object = get_post_type_object( $calling_post->post_type );
 
 		$ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" );
-		$thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html( $calling_post_type_object->labels->use_featured_image ) . "</a>";
+		$thumbnail  = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html( $calling_post_type_object->labels->use_featured_image ) . '</a>';
 	}
 
-	if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) {
+	if ( ( $r['send'] || $thumbnail || $delete ) && ! isset( $form_fields['buttons'] ) ) {
 		$form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $r['send'] . " $thumbnail $delete</td></tr>\n" );
 	}
 	$hidden_fields = array();
 
 	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' )
+		if ( $id[0] == '_' ) {
 			continue;
+		}
 
-		if ( !empty( $field['tr'] ) ) {
+		if ( ! empty( $field['tr'] ) ) {
 			$item .= $field['tr'];
 			continue;
 		}
 
 		$field = array_merge( $defaults, $field );
-		$name = "attachments[$attachment_id][$id]";
+		$name  = "attachments[$attachment_id][$id]";
 
 		if ( $field['input'] == 'hidden' ) {
-			$hidden_fields[$name] = $field['value'];
+			$hidden_fields[ $name ] = $field['value'];
 			continue;
 		}
 
 		$required      = $field['required'] ? '<span class="required">*</span>' : '';
 		$required_attr = $field['required'] ? ' required' : '';
 		$aria_required = $field['required'] ? " aria-required='true'" : '';
-		$class  = $id;
-		$class .= $field['required'] ? ' form-required' : '';
+		$class         = $id;
+		$class        .= $field['required'] ? ' form-required' : '';
 
 		$item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
-		if ( !empty( $field[ $field['input'] ] ) )
+		if ( ! empty( $field[ $field['input'] ] ) ) {
 			$item .= $field[ $field['input'] ];
-		elseif ( $field['input'] == 'textarea' ) {
+		} elseif ( $field['input'] == 'textarea' ) {
 			if ( 'post_content' == $id && user_can_richedit() ) {
 				// Sanitize_post() skips the post_content when user_can_richedit.
 				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
@@ -1581,38 +1673,48 @@ function get_media_item( $attachment_id, $args = null ) {
 		} else {
 			$item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr}{$aria_required} />";
 		}
-		if ( !empty( $field['helps'] ) )
+		if ( ! empty( $field['helps'] ) ) {
 			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		}
 		$item .= "</td>\n\t\t</tr>\n";
 
 		$extra_rows = array();
 
-		if ( !empty( $field['errors'] ) )
-			foreach ( array_unique( (array) $field['errors'] ) as $error )
+		if ( ! empty( $field['errors'] ) ) {
+			foreach ( array_unique( (array) $field['errors'] ) as $error ) {
 				$extra_rows['error'][] = $error;
+			}
+		}
 
-		if ( !empty( $field['extra_rows'] ) )
-			foreach ( $field['extra_rows'] as $class => $rows )
-				foreach ( (array) $rows as $html )
-					$extra_rows[$class][] = $html;
+		if ( ! empty( $field['extra_rows'] ) ) {
+			foreach ( $field['extra_rows'] as $class => $rows ) {
+				foreach ( (array) $rows as $html ) {
+					$extra_rows[ $class ][] = $html;
+				}
+			}
+		}
 
-		foreach ( $extra_rows as $class => $rows )
-			foreach ( $rows as $html )
+		foreach ( $extra_rows as $class => $rows ) {
+			foreach ( $rows as $html ) {
 				$item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
+			}
+		}
 	}
 
-	if ( !empty( $form_fields['_final'] ) )
+	if ( ! empty( $form_fields['_final'] ) ) {
 		$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
+	}
 	$item .= "\t</tbody>\n";
 	$item .= "\t</table>\n";
 
-	foreach ( $hidden_fields as $name => $value )
+	foreach ( $hidden_fields as $name => $value ) {
 		$item .= "\t<input type='hidden' name='$name' id='$name' value='" . esc_attr( $value ) . "' />\n";
+	}
 
 	if ( $post->post_parent < 1 && isset( $_REQUEST['post_id'] ) ) {
-		$parent = (int) $_REQUEST['post_id'];
+		$parent      = (int) $_REQUEST['post_id'];
 		$parent_name = "attachments[$attachment_id][post_parent]";
-		$item .= "\t<input type='hidden' name='$parent_name' id='$parent_name' value='$parent' />\n";
+		$item       .= "\t<input type='hidden' name='$parent_name' id='$parent_name' value='$parent' />\n";
 	}
 
 	return $item;
@@ -1629,7 +1731,7 @@ function get_compat_media_markup( $attachment_id, $args = null ) {
 	$post = get_post( $attachment_id );
 
 	$default_args = array(
-		'errors' => null,
+		'errors'   => null,
 		'in_modal' => false,
 	);
 
@@ -1643,40 +1745,47 @@ function get_compat_media_markup( $attachment_id, $args = null ) {
 	$form_fields = array();
 
 	if ( $args['in_modal'] ) {
-		foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
-			$t = (array) get_taxonomy($taxonomy);
-			if ( ! $t['public'] || ! $t['show_ui'] )
+		foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
+			$t = (array) get_taxonomy( $taxonomy );
+			if ( ! $t['public'] || ! $t['show_ui'] ) {
 				continue;
-			if ( empty($t['label']) )
+			}
+			if ( empty( $t['label'] ) ) {
 				$t['label'] = $taxonomy;
-			if ( empty($t['args']) )
+			}
+			if ( empty( $t['args'] ) ) {
 				$t['args'] = array();
+			}
 
-			$terms = get_object_term_cache($post->ID, $taxonomy);
-			if ( false === $terms )
-				$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+			$terms = get_object_term_cache( $post->ID, $taxonomy );
+			if ( false === $terms ) {
+				$terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
+			}
 
 			$values = array();
 
-			foreach ( $terms as $term )
+			foreach ( $terms as $term ) {
 				$values[] = $term->slug;
-			$t['value'] = join(', ', $values);
+			}
+			$t['value']    = join( ', ', $values );
 			$t['taxonomy'] = true;
 
-			$form_fields[$taxonomy] = $t;
+			$form_fields[ $taxonomy ] = $t;
 		}
 	}
 
 	// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
 	// The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
-	$form_fields = array_merge_recursive($form_fields, (array) $args['errors'] );
+	$form_fields = array_merge_recursive( $form_fields, (array) $args['errors'] );
 
 	/** This filter is documented in wp-admin/includes/media.php */
 	$form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
 
-	unset( $form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
+	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['url'], $form_fields['menu_order'], $form_fields['image_url']
+	);
 
 	/** This filter is documented in wp-admin/includes/media.php */
 	$media_meta = apply_filters( 'media_meta', '', $post );
@@ -1694,24 +1803,26 @@ function get_compat_media_markup( $attachment_id, $args = null ) {
 
 	$item = '';
 	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' )
+		if ( $id[0] == '_' ) {
 			continue;
+		}
 
-		$name = "attachments[$attachment_id][$id]";
+		$name    = "attachments[$attachment_id][$id]";
 		$id_attr = "attachments-$attachment_id-$id";
 
-		if ( !empty( $field['tr'] ) ) {
+		if ( ! empty( $field['tr'] ) ) {
 			$item .= $field['tr'];
 			continue;
 		}
 
 		$field = array_merge( $defaults, $field );
 
-		if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) )
+		if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) ) {
 			continue;
+		}
 
 		if ( $field['input'] == 'hidden' ) {
-			$hidden_fields[$name] = $field['value'];
+			$hidden_fields[ $name ] = $field['value'];
 			continue;
 		}
 
@@ -1719,16 +1830,16 @@ function get_compat_media_markup( $attachment_id, $args = null ) {
 		$required      = $field['required'] ? '<span class="required">*</span>' : '';
 		$required_attr = $field['required'] ? ' required' : '';
 		$aria_required = $field['required'] ? " aria-required='true'" : '';
-		$class  = 'compat-field-' . $id;
-		$class .= $field['required'] ? ' form-required' : '';
+		$class         = 'compat-field-' . $id;
+		$class        .= $field['required'] ? ' form-required' : '';
 
 		$item .= "\t\t<tr class='$class'>";
 		$item .= "\t\t\t<th scope='row' class='label'><label for='$id_attr'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label>";
 		$item .= "</th>\n\t\t\t<td class='field'>";
 
-		if ( !empty( $field[ $field['input'] ] ) )
+		if ( ! empty( $field[ $field['input'] ] ) ) {
 			$item .= $field[ $field['input'] ];
-		elseif ( $field['input'] == 'textarea' ) {
+		} elseif ( $field['input'] == 'textarea' ) {
 			if ( 'post_content' == $id && user_can_richedit() ) {
 				// sanitize_post() skips the post_content when user_can_richedit.
 				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
@@ -1737,28 +1848,37 @@ function get_compat_media_markup( $attachment_id, $args = null ) {
 		} else {
 			$item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr}{$aria_required} />";
 		}
-		if ( !empty( $field['helps'] ) )
+		if ( ! empty( $field['helps'] ) ) {
 			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		}
 		$item .= "</td>\n\t\t</tr>\n";
 
 		$extra_rows = array();
 
-		if ( !empty( $field['errors'] ) )
-			foreach ( array_unique( (array) $field['errors'] ) as $error )
+		if ( ! empty( $field['errors'] ) ) {
+			foreach ( array_unique( (array) $field['errors'] ) as $error ) {
 				$extra_rows['error'][] = $error;
+			}
+		}
 
-		if ( !empty( $field['extra_rows'] ) )
-			foreach ( $field['extra_rows'] as $class => $rows )
-				foreach ( (array) $rows as $html )
-					$extra_rows[$class][] = $html;
+		if ( ! empty( $field['extra_rows'] ) ) {
+			foreach ( $field['extra_rows'] as $class => $rows ) {
+				foreach ( (array) $rows as $html ) {
+					$extra_rows[ $class ][] = $html;
+				}
+			}
+		}
 
-		foreach ( $extra_rows as $class => $rows )
-			foreach ( $rows as $html )
+		foreach ( $extra_rows as $class => $rows ) {
+			foreach ( $rows as $html ) {
 				$item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
+			}
+		}
 	}
 
-	if ( !empty( $form_fields['_final'] ) )
+	if ( ! empty( $form_fields['_final'] ) ) {
 		$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
+	}
 
 	if ( $item ) {
 		$item = '<p class="media-types media-types-required-info">' .
@@ -1770,12 +1890,13 @@ function get_compat_media_markup( $attachment_id, $args = null ) {
 		$item .= '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
 	}
 
-	if ( $item )
+	if ( $item ) {
 		$item = '<input type="hidden" name="attachments[' . $attachment_id . '][menu_order]" value="' . esc_attr( $post->menu_order ) . '" />' . $item;
+	}
 
 	return array(
-		'item'   => $item,
-		'meta'   => $media_meta,
+		'item' => $item,
+		'meta' => $media_meta,
 	);
 }
 
@@ -1811,14 +1932,14 @@ function media_upload_form( $errors = null ) {
 	global $type, $tab, $is_IE, $is_opera;
 
 	if ( ! _device_can_upload() ) {
-		echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/' ) . '</p>';
+		echo '<p>' . sprintf( __( 'The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.' ), 'https://apps.wordpress.org/' ) . '</p>';
 		return;
 	}
 
-	$upload_action_url = admin_url('async-upload.php');
-	$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
-	$_type = isset($type) ? $type : '';
-	$_tab = isset($tab) ? $tab : '';
+	$upload_action_url = admin_url( 'async-upload.php' );
+	$post_id           = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+	$_type             = isset( $type ) ? $type : '';
+	$_tab              = isset( $tab ) ? $tab : '';
 
 	$max_upload_size = wp_max_upload_size();
 	if ( ! $max_upload_size ) {
@@ -1826,20 +1947,26 @@ function media_upload_form( $errors = null ) {
 	}
 ?>
 
-<div id="media-upload-notice"><?php
-
-	if (isset($errors['upload_notice']) )
-		echo $errors['upload_notice'];
-
-?></div>
-<div id="media-upload-error"><?php
-
-	if (isset($errors['upload_error']) && is_wp_error($errors['upload_error']))
-		echo $errors['upload_error']->get_error_message();
-
-?></div>
+<div id="media-upload-notice">
 <?php
-if ( is_multisite() && !is_upload_space_available() ) {
+
+if ( isset( $errors['upload_notice'] ) ) {
+	echo $errors['upload_notice'];
+}
+
+?>
+</div>
+<div id="media-upload-error">
+<?php
+
+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() ) {
 	/**
 	 * Fires when an upload will exceed the defined upload space quota for a network site.
 	 *
@@ -1857,11 +1984,11 @@ if ( is_multisite() && !is_upload_space_available() ) {
 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_id'  => $post_id,
+	'_wpnonce' => wp_create_nonce( 'media-form' ),
+	'type'     => $_type,
+	'tab'      => $_tab,
+	'short'    => '1',
 );
 
 /**
@@ -1879,15 +2006,15 @@ $post_params = apply_filters( 'upload_post_params', $post_params );
  * 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',
+	'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,
+	'multipart_params' => $post_params,
 );
 
 // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
@@ -1912,12 +2039,14 @@ $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 = 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 = 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 ); ?>;
@@ -1931,12 +2060,13 @@ wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
  * @since 2.6.0 As 'pre-flash-upload-ui'
  * @since 3.3.0
  */
-do_action( 'pre-plupload-upload-ui' ); ?>
+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>
-	<p><?php _ex('or', 'Uploader: Drop files here - or - Select Files'); ?></p>
-	<p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e('Select Files'); ?>" class="button" /></p>
+	<p class="drag-drop-info"><?php _e( 'Drop files here' ); ?></p>
+	<p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
+	<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
@@ -1946,7 +2076,8 @@ do_action( 'pre-plupload-upload-ui' ); ?>
  * @since 2.6.0 As 'post-flash-upload-ui'
  * @since 3.3.0
  */
-do_action( 'post-plupload-upload-ui' ); ?>
+do_action( 'post-plupload-upload-ui' );
+?>
 </div>
 
 <div id="html-upload-ui" class="hide-if-js">
@@ -1959,10 +2090,10 @@ do_action( 'post-plupload-upload-ui' ); ?>
 	do_action( 'pre-html-upload-ui' );
 	?>
 	<p id="async-upload-wrap">
-		<label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
+		<label class="screen-reader-text" for="async-upload"><?php _e( 'Upload' ); ?></label>
 		<input type="file" name="async-upload" id="async-upload" />
 		<?php submit_button( __( 'Upload' ), 'primary', 'html-upload', false ); ?>
-		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
+		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e( 'Cancel' ); ?></a>
 	</p>
 	<div class="clear"></div>
 <?php
@@ -1997,13 +2128,13 @@ do_action( 'post-html-upload-ui' );
  * @param object $errors
  * @param integer $id
  */
-function media_upload_type_form($type = 'file', $errors = null, $id = null) {
+function media_upload_type_form( $type = 'file', $errors = null, $id = null ) {
 
 	media_upload_header();
 
-	$post_id = isset( $_REQUEST['post_id'] )? intval( $_REQUEST['post_id'] ) : 0;
+	$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
 
-	$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
+	$form_action_url = admin_url( "media-upload.php?type=$type&tab=type&post_id=$post_id" );
 
 	/**
 	 * Filters the media upload form action URL.
@@ -2014,18 +2145,19 @@ function media_upload_type_form($type = 'file', $errors = null, $id = null) {
 	 * @param string $type            The type of media. Default 'file'.
 	 */
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
-	$form_class = 'media-upload-form type-form validate';
+	$form_class      = 'media-upload-form type-form validate';
 
-	if ( get_user_setting('uploader') )
+	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 ); ?>
 <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>
+<h3 class="media-title"><?php _e( 'Add media files from your computer' ); ?></h3>
 
 <?php media_upload_form( $errors ); ?>
 
@@ -2038,18 +2170,20 @@ jQuery(function($){
 	updateMediaForm();
 });
 </script>
-<div id="media-items"><?php
+<div id="media-items">
+<?php
 
 if ( $id ) {
-	if ( !is_wp_error($id) ) {
-		add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
+	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>';
+		echo '<div id="media-upload-error">' . esc_html( $id->get_error_message() ) . '</div></div>';
 		exit;
 	}
 }
-?></div>
+?>
+</div>
 
 <p class="savebutton ml-submit">
 <?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
@@ -2067,28 +2201,30 @@ if ( $id ) {
  * @param object $errors
  * @param integer $id
  */
-function media_upload_type_url_form($type = null, $errors = null, $id = null) {
-	if ( null === $type )
+function media_upload_type_url_form( $type = null, $errors = null, $id = null ) {
+	if ( null === $type ) {
 		$type = 'image';
+	}
 
 	media_upload_header();
 
 	$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
 
-	$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
+	$form_action_url = admin_url( "media-upload.php?type=$type&tab=type&post_id=$post_id" );
 	/** This filter is documented in wp-admin/includes/media.php */
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
-	$form_class = 'media-upload-form type-form validate';
+	$form_class      = 'media-upload-form type-form validate';
 
-	if ( get_user_setting('uploader') )
+	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>
+<h3 class="media-title"><?php _e( 'Insert media from another website' ); ?></h3>
 
 <script type="text/javascript">
 var addExtImage = {
@@ -2108,16 +2244,16 @@ var addExtImage = {
 
 <?php
 	/** This filter is documented in wp-admin/includes/media.php */
-	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){
-				return a.replace(/[\r\n\t]+/, ' ');
-			});
+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){
+			return a.replace(/[\r\n\t]+/, ' ');
+		});
 
-			caption = caption.replace(/\s*\n\s*/g, '<br />');
-		}
+		caption = caption.replace(/\s*\n\s*/g, '<br />');
+	}
 <?php } ?>
 
 		cls = caption ? '' : ' class="'+t.align+'"';
@@ -2211,20 +2347,21 @@ echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
  *
  * @param array $errors
  */
-function media_upload_gallery_form($errors) {
+function media_upload_gallery_form( $errors ) {
 	global $redir_tab, $type;
 
 	$redir_tab = 'gallery';
 	media_upload_header();
 
-	$post_id = intval($_REQUEST['post_id']);
-	$form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id");
+	$post_id         = intval( $_REQUEST['post_id'] );
+	$form_action_url = admin_url( "media-upload.php?type=$type&tab=gallery&post_id=$post_id" );
 	/** This filter is documented in wp-admin/includes/media.php */
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
-	$form_class = 'media-upload-form validate';
+	$form_class      = 'media-upload-form validate';
 
-	if ( get_user_setting('uploader') )
+	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
+	}
 ?>
 
 <script type="text/javascript">
@@ -2238,67 +2375,74 @@ jQuery(function($){
 </script>
 <div id="sort-buttons" class="hide-if-no-js">
 <span>
-<?php _e('All Tabs:'); ?>
-<a href="#" id="showall"><?php _e('Show'); ?></a>
-<a href="#" id="hideall" style="display:none;"><?php _e('Hide'); ?></a>
+<?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:'); ?>
-<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>
+<?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 wp_nonce_field( 'media-form' ); ?>
 <?php //media_upload_form( $errors ); ?>
 <table class="widefat">
 <thead><tr>
-<th><?php _e('Media'); ?></th>
-<th class="order-head"><?php _e('Order'); ?></th>
-<th class="actions-head"><?php _e('Actions'); ?></th>
+<th><?php _e( 'Media' ); ?></th>
+<th class="order-head"><?php _e( 'Order' ); ?></th>
+<th class="actions-head"><?php _e( 'Actions' ); ?></th>
 </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'] ); ?>" />
 </p>
 
 <div id="gallery-settings" style="display:none;">
-<div class="title"><?php _e('Gallery Settings'); ?></div>
+<div class="title"><?php _e( 'Gallery Settings' ); ?></div>
 <table id="basic" class="describe"><tbody>
 	<tr>
 	<th scope="row" class="label">
 		<label>
-		<span class="alignleft"><?php _e('Link thumbnails to:'); ?></span>
+		<span class="alignleft"><?php _e( 'Link thumbnails to:' ); ?></span>
 		</label>
 	</th>
 	<td class="field">
 		<input type="radio" name="linkto" id="linkto-file" value="file" />
-		<label for="linkto-file" class="radio"><?php _e('Image File'); ?></label>
+		<label for="linkto-file" class="radio"><?php _e( 'Image File' ); ?></label>
 
 		<input type="radio" checked="checked" name="linkto" id="linkto-post" value="post" />
-		<label for="linkto-post" class="radio"><?php _e('Attachment Page'); ?></label>
+		<label for="linkto-post" class="radio"><?php _e( 'Attachment Page' ); ?></label>
 	</td>
 	</tr>
 
 	<tr>
 	<th scope="row" class="label">
 		<label>
-		<span class="alignleft"><?php _e('Order images by:'); ?></span>
+		<span class="alignleft"><?php _e( 'Order images by:' ); ?></span>
 		</label>
 	</th>
 	<td class="field">
 		<select id="orderby" name="orderby">
-			<option value="menu_order" selected="selected"><?php _e('Menu order'); ?></option>
-			<option value="title"><?php _e('Title'); ?></option>
-			<option value="post_date"><?php _e('Date/Time'); ?></option>
-			<option value="rand"><?php _e('Random'); ?></option>
+			<option value="menu_order" selected="selected"><?php _e( 'Menu order' ); ?></option>
+			<option value="title"><?php _e( 'Title' ); ?></option>
+			<option value="post_date"><?php _e( 'Date/Time' ); ?></option>
+			<option value="rand"><?php _e( 'Random' ); ?></option>
 		</select>
 	</td>
 	</tr>
@@ -2306,22 +2450,22 @@ jQuery(function($){
 	<tr>
 	<th scope="row" class="label">
 		<label>
-		<span class="alignleft"><?php _e('Order:'); ?></span>
+		<span class="alignleft"><?php _e( 'Order:' ); ?></span>
 		</label>
 	</th>
 	<td class="field">
 		<input type="radio" checked="checked" name="order" id="order-asc" value="asc" />
-		<label for="order-asc" class="radio"><?php _e('Ascending'); ?></label>
+		<label for="order-asc" class="radio"><?php _e( 'Ascending' ); ?></label>
 
 		<input type="radio" name="order" id="order-desc" value="desc" />
-		<label for="order-desc" class="radio"><?php _e('Descending'); ?></label>
+		<label for="order-desc" class="radio"><?php _e( 'Descending' ); ?></label>
 	</td>
 	</tr>
 
 	<tr>
 	<th scope="row" class="label">
 		<label>
-		<span class="alignleft"><?php _e('Gallery columns:'); ?></span>
+		<span class="alignleft"><?php _e( 'Gallery columns:' ); ?></span>
 		</label>
 	</th>
 	<td class="field">
@@ -2363,24 +2507,25 @@ jQuery(function($){
  *
  * @param array $errors
  */
-function media_upload_library_form($errors) {
+function media_upload_library_form( $errors ) {
 	global $wpdb, $wp_query, $wp_locale, $type, $tab, $post_mime_types;
 
 	media_upload_header();
 
 	$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
 
-	$form_action_url = admin_url("media-upload.php?type=$type&tab=library&post_id=$post_id");
+	$form_action_url = admin_url( "media-upload.php?type=$type&tab=library&post_id=$post_id" );
 	/** This filter is documented in wp-admin/includes/media.php */
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
-	$form_class = 'media-upload-form validate';
+	$form_class      = 'media-upload-form validate';
 
-	if ( get_user_setting('uploader') )
+	if ( get_user_setting( 'uploader' ) ) {
 		$form_class .= ' html-uploader';
+	}
 
-	$q = $_GET;
+	$q                   = $_GET;
 	$q['posts_per_page'] = 10;
-	$q['paged'] = isset( $q['paged'] ) ? intval( $q['paged'] ) : 0;
+	$q['paged']          = isset( $q['paged'] ) ? intval( $q['paged'] ) : 0;
 	if ( $q['paged'] < 1 ) {
 		$q['paged'] = 1;
 	}
@@ -2401,7 +2546,7 @@ function media_upload_library_form($errors) {
 <input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
 
 <p id="media-search" class="search-box">
-	<label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
+	<label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
 	<input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
 	<?php submit_button( __( 'Search Media' ), '', '', false ); ?>
 </p>
@@ -2410,33 +2555,54 @@ function media_upload_library_form($errors) {
 <?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];
+$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;
+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' )
+if ( empty( $_GET['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
 	$class = ' class="current"';
-else
+} 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>';
+}
+$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) )
+	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']) )
+	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>';
+	$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.
@@ -2447,25 +2613,28 @@ foreach ( $post_mime_types as $mime_type => $label ) {
  *
  * @param array $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);
+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'],
-));
+$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 )
+if ( $page_links ) {
 	echo "<div class='tablenav-pages'>$page_links</div>";
+}
 ?>
 
 <div class="alignleft actions">
@@ -2475,25 +2644,28 @@ $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmon
 
 $arc_result = $wpdb->get_results( $arc_query );
 
-$month_count = count($arc_result);
+$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 )
+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 )
+	if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
 		$default = ' selected="selected"';
-	else
+	} 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 esc_html( $wp_locale->get_month( $arc_row->mmonth ) . " $arc_row->yyear" );
 	echo "</option>\n";
 }
 ?>
@@ -2510,7 +2682,7 @@ 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 wp_nonce_field( 'media-form' ); ?>
 <?php //media_upload_form( $errors ); ?>
 
 <script type="text/javascript">
@@ -2526,8 +2698,8 @@ 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 ); ?>
@@ -2551,7 +2723,7 @@ function wp_media_insert_url_form( $default_view = 'image' ) {
 		$caption = '
 		<tr class="image-only">
 			<th scope="row" class="label">
-				<label for="caption"><span class="alignleft">' . __('Image Caption') . '</span></label>
+				<label for="caption"><span class="alignleft">' . __( 'Image Caption' ) . '</span></label>
 			</th>
 			<td class="field"><textarea id="caption" name="caption"></textarea></td>
 		</tr>
@@ -2560,12 +2732,13 @@ function wp_media_insert_url_form( $default_view = 'image' ) {
 		$caption = '';
 	}
 
-	$default_align = get_option('image_default_align');
-	if ( empty($default_align) )
+	$default_align = get_option( 'image_default_align' );
+	if ( empty( $default_align ) ) {
 		$default_align = 'none';
+	}
 
 	if ( 'image' == $default_view ) {
-		$view = 'image-only';
+		$view        = 'image-only';
 		$table_class = '';
 	} else {
 		$view = $table_class = 'not-image';
@@ -2590,44 +2763,44 @@ function wp_media_insert_url_form( $default_view = 'image' ) {
 			<td class="field"><input id="title" name="title" value="" type="text" required aria-required="true" /></td>
 		</tr>
 
-		<tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</p></td></tr>
+		<tr class="not-image"><td></td><td><p class="help">' . __( 'Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;' ) . '</p></td></tr>
 
 		<tr class="image-only">
 			<th scope="row" class="label">
-				<label for="alt"><span class="alignleft">' . __('Alternative Text') . '</span></label>
+				<label for="alt"><span class="alignleft">' . __( 'Alternative Text' ) . '</span></label>
 			</th>
 			<td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
-			<p class="help">' . __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;') . '</p></td>
+			<p class="help">' . __( 'Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;' ) . '</p></td>
 		</tr>
 		' . $caption . '
 		<tr class="align image-only">
-			<th scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
+			<th scope="row" class="label"><p><label for="align">' . __( 'Alignment' ) . '</label></p></th>
 			<td class="field">
-				<input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />
-				<label for="align-none" class="align image-align-none-label">' . __('None') . '</label>
-				<input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'left' ? ' checked="checked"' : '').' />
-				<label for="align-left" class="align image-align-left-label">' . __('Left') . '</label>
-				<input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'center' ? ' checked="checked"' : '').' />
-				<label for="align-center" class="align image-align-center-label">' . __('Center') . '</label>
-				<input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'right' ? ' checked="checked"' : '').' />
-				<label for="align-right" class="align image-align-right-label">' . __('Right') . '</label>
+				<input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'none' ? ' checked="checked"' : '' ) . ' />
+				<label for="align-none" class="align image-align-none-label">' . __( 'None' ) . '</label>
+				<input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'left' ? ' checked="checked"' : '' ) . ' />
+				<label for="align-left" class="align image-align-left-label">' . __( 'Left' ) . '</label>
+				<input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'center' ? ' checked="checked"' : '' ) . ' />
+				<label for="align-center" class="align image-align-center-label">' . __( 'Center' ) . '</label>
+				<input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'right' ? ' checked="checked"' : '' ) . ' />
+				<label for="align-right" class="align image-align-right-label">' . __( 'Right' ) . '</label>
 			</td>
 		</tr>
 
 		<tr class="image-only">
 			<th scope="row" class="label">
-				<label for="url"><span class="alignleft">' . __('Link Image To:') . '</span></label>
+				<label for="url"><span class="alignleft">' . __( 'Link Image To:' ) . '</span></label>
 			</th>
 			<td class="field"><input id="url" name="url" value="" type="text" /><br />
 
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __('None') . '</button>
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
-			<p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
+			<button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __( 'None' ) . '</button>
+			<button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __( 'Link to image' ) . '</button>
+			<p class="help">' . __( 'Enter a link URL or click above for presets.' ) . '</p></td>
 		</tr>
 		<tr class="image-only">
 			<td></td>
 			<td>
-				<input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
+				<input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__( 'Insert into Post' ) . '" />
 			</td>
 		</tr>
 		<tr class="not-image">
@@ -2651,10 +2824,11 @@ function wp_media_insert_url_form( $default_view = 'image' ) {
 function media_upload_flash_bypass() {
 	$browser_uploader = admin_url( 'media-new.php?browser-uploader' );
 
-	if ( $post = get_post() )
+	if ( $post = get_post() ) {
 		$browser_uploader .= '&amp;post_id=' . intval( $post->ID );
-	elseif ( ! empty( $GLOBALS['post_ID'] ) )
+	} elseif ( ! empty( $GLOBALS['post_ID'] ) ) {
 		$browser_uploader .= '&amp;post_id=' . intval( $GLOBALS['post_ID'] );
+	}
 
 	?>
 	<p class="upload-flash-bypass">
@@ -2671,7 +2845,7 @@ function media_upload_flash_bypass() {
 function media_upload_html_bypass() {
 	?>
 	<p class="upload-html-bypass hide-if-no-js">
-		<?php _e('You are using the browser&#8217;s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. <a href="#">Switch to the multi-file uploader</a>.'); ?>
+		<?php _e( 'You are using the browser&#8217;s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. <a href="#">Switch to the multi-file uploader</a>.' ); ?>
 	</p>
 	<?php
 }
@@ -2689,11 +2863,11 @@ function media_upload_text_after() {}
  * @since 3.3.0
  */
 function media_upload_max_image_resize() {
-	$checked = get_user_setting('upload_resize') ? ' checked="true"' : '';
-	$a = $end = '';
+	$checked = get_user_setting( 'upload_resize' ) ? ' checked="true"' : '';
+	$a       = $end = '';
 
 	if ( current_user_can( 'manage_options' ) ) {
-		$a = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
+		$a   = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
 		$end = '</a>';
 	}
 ?>
@@ -2725,22 +2899,25 @@ function multisite_over_quota_message() {
  */
 function edit_form_image_editor( $post ) {
 	$open = isset( $_GET['image-editor'] );
-	if ( $open )
+	if ( $open ) {
 		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+	}
 
 	$thumb_url = false;
-	if ( $attachment_id = intval( $post->ID ) )
+	if ( $attachment_id = intval( $post->ID ) ) {
 		$thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
+	}
 
 	$alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
 
-	$att_url = wp_get_attachment_url( $post->ID ); ?>
+	$att_url = wp_get_attachment_url( $post->ID );
+	?>
 	<div class="wp_attachment_holder wp-clearfix">
 	<?php
 	if ( wp_attachment_is_image( $post->ID ) ) :
 		$image_edit_button = '';
 		if ( wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
-			$nonce = wp_create_nonce( "image_editor-$post->ID" );
+			$nonce             = wp_create_nonce( "image_editor-$post->ID" );
 			$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
 		}
 
@@ -2759,29 +2936,32 @@ function edit_form_image_editor( $post ) {
 			<p><?php echo $image_edit_button; ?></p>
 		</div>
 		<div<?php echo $not_open_style; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
-			<?php if ( $open ) wp_image_editor( $attachment_id ); ?>
+			<?php
+			if ( $open ) {
+				wp_image_editor( $attachment_id );}
+?>
 		</div>
 	<?php
-	elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ):
+	elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ) :
 
 		wp_maybe_generate_attachment_metadata( $post );
 
 		echo wp_audio_shortcode( array( 'src' => $att_url ) );
 
-	elseif ( $attachment_id && wp_attachment_is( 'video', $post ) ):
+	elseif ( $attachment_id && wp_attachment_is( 'video', $post ) ) :
 
 		wp_maybe_generate_attachment_metadata( $post );
 
 		$meta = wp_get_attachment_metadata( $attachment_id );
-		$w = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0;
-		$h = ! empty( $meta['height'] ) ? $meta['height'] : 0;
+		$w    = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0;
+		$h    = ! empty( $meta['height'] ) ? $meta['height'] : 0;
 		if ( $h && $w < $meta['width'] ) {
 			$h = round( ( $meta['height'] * $w ) / $meta['width'] );
 		}
 
 		$attr = array( 'src' => $att_url );
 		if ( ! empty( $w ) && ! empty( $h ) ) {
-			$attr['width'] = $w;
+			$attr['width']  = $w;
 			$attr['height'] = $h;
 		}
 
@@ -2792,7 +2972,7 @@ function edit_form_image_editor( $post ) {
 
 		echo wp_video_shortcode( $attr );
 
-	elseif ( isset( $thumb_url[0] ) ):
+	elseif ( isset( $thumb_url[0] ) ) :
 
 		?>
 		<div class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
@@ -2802,7 +2982,7 @@ function edit_form_image_editor( $post ) {
 		</div>
 		<?php
 
-	else:
+	else :
 
 		/**
 		 * Fires when an attachment type can't be rendered in the edit form.
@@ -2813,7 +2993,8 @@ function edit_form_image_editor( $post ) {
 		 */
 		do_action( 'wp_edit_form_attachment_display', $post );
 
-	endif; ?>
+	endif;
+	?>
 	</div>
 	<div class="wp_attachment_details edit-form-section">
 		<p>
@@ -2831,19 +3012,22 @@ function edit_form_image_editor( $post ) {
 
 	<?php
 		$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-		$editor_args = array(
+		$editor_args        = array(
 			'textarea_name' => 'content',
 			'textarea_rows' => 5,
 			'media_buttons' => false,
-			'tinymce' => false,
-			'quicktags' => $quicktags_settings,
+			'tinymce'       => false,
+			'quicktags'     => $quicktags_settings,
 		);
 	?>
 
-	<label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong><?php
-	if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
-		echo ': ' . __( 'Displayed on attachment pages.' );
-	} ?></label>
+	<label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
+														<?php
+														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 ); ?>
 
 	</div>
@@ -2861,13 +3045,14 @@ function edit_form_image_editor( $post ) {
 function attachment_submitbox_metadata() {
 	$post = get_post();
 
-	$file = get_attached_file( $post->ID );
+	$file     = get_attached_file( $post->ID );
 	$filename = esc_html( wp_basename( $file ) );
 
 	$media_dims = '';
-	$meta = wp_get_attachment_metadata( $post->ID );
-	if ( isset( $meta['width'], $meta['height'] ) )
+	$meta       = wp_get_attachment_metadata( $post->ID );
+	if ( isset( $meta['width'], $meta['height'] ) ) {
 		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+	}
 	/** This filter is documented in wp-admin/includes/media.php */
 	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
@@ -2881,30 +3066,34 @@ function attachment_submitbox_metadata() {
 		<?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
 	</div>
 	<div class="misc-pub-section misc-pub-filetype">
-		<?php _e( 'File type:' ); ?> <strong><?php
-			if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
-				echo esc_html( strtoupper( $matches[1] ) );
-				list( $mime_type ) = explode( '/', $post->post_mime_type );
-				if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
-					if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
-						echo ' (' . $meta['mime_type'] . ')';
+		<?php _e( 'File type:' ); ?> <strong>
+					<?php
+					if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
+						echo esc_html( strtoupper( $matches[1] ) );
+						list( $mime_type ) = explode( '/', $post->post_mime_type );
+						if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
+							if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
+								echo ' (' . $meta['mime_type'] . ')';
+							}
+						}
+					} else {
+						echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
 					}
-				}
-			} else {
-				echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
-			}
-		?></strong>
+		?>
+		</strong>
 	</div>
 
 	<?php
 		$file_size = false;
 
-		if ( isset( $meta['filesize'] ) )
-			$file_size = $meta['filesize'];
-		elseif ( file_exists( $file ) )
-			$file_size = filesize( $file );
+	if ( isset( $meta['filesize'] ) ) {
+		$file_size = $meta['filesize'];
+	} elseif ( file_exists( $file ) ) {
+		$file_size = filesize( $file );
+	}
 
-		if ( ! empty( $file_size ) ) : ?>
+	if ( ! empty( $file_size ) ) :
+		?>
 			<div class="misc-pub-section misc-pub-filesize">
 				<?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
 			</div>
@@ -2937,26 +3126,28 @@ function attachment_submitbox_metadata() {
 			}
 	?>
 		<div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-			<?php echo $label ?> <strong><?php
-				switch ( $key ) {
-					case 'bitrate' :
-						echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
-						if ( ! empty( $meta['bitrate_mode'] ) ) {
-							echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
+			<?php echo $label; ?> <strong>
+						<?php
+						switch ( $key ) {
+							case 'bitrate':
+								echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
+								if ( ! empty( $meta['bitrate_mode'] ) ) {
+									echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
+								}
+								break;
+							default:
+								echo esc_html( $meta[ $key ] );
+								break;
 						}
-						break;
-					default:
-						echo esc_html( $meta[ $key ] );
-						break;
-				}
-			?></strong>
+			?>
+			</strong>
 		</div>
 	<?php
 		}
 
 		$fields = array(
 			'dataformat' => __( 'Audio Format:' ),
-			'codec'      => __( 'Audio Codec:' )
+			'codec'      => __( 'Audio Codec:' ),
 		);
 
 		/**
@@ -2979,14 +3170,14 @@ function attachment_submitbox_metadata() {
 			}
 	?>
 		<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>
+			<?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
 		</div>
 	<?php
 		}
-
 	}
 
-	if ( $media_dims ) : ?>
+	if ( $media_dims ) :
+	?>
 	<div class="misc-pub-section misc-pub-dimensions">
 		<?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
 	</div>
@@ -3004,13 +3195,14 @@ function attachment_submitbox_metadata() {
  */
 function wp_add_id3_tag_data( &$metadata, $data ) {
 	foreach ( array( 'id3v2', 'id3v1' ) as $version ) {
-		if ( ! empty( $data[$version]['comments'] ) ) {
-			foreach ( $data[$version]['comments'] as $key => $list ) {
+		if ( ! empty( $data[ $version ]['comments'] ) ) {
+			foreach ( $data[ $version ]['comments'] as $key => $list ) {
 				if ( 'length' !== $key && ! empty( $list ) ) {
-					$metadata[$key] = wp_kses_post( reset( $list ) );
+					$metadata[ $key ] = wp_kses_post( reset( $list ) );
 					// Fix bug in byte stream analysis.
-					if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
-						$metadata[$key] = 'Cop' . $metadata[$key];
+					if ( 'terms_of_use' === $key && 0 === strpos( $metadata[ $key ], 'yright notice.' ) ) {
+						$metadata[ $key ] = 'Cop' . $metadata[ $key ];
+					}
 				}
 			}
 			break;
@@ -3018,13 +3210,13 @@ function wp_add_id3_tag_data( &$metadata, $data ) {
 	}
 
 	if ( ! empty( $data['id3v2']['APIC'] ) ) {
-		$image = reset( $data['id3v2']['APIC']);
+		$image = reset( $data['id3v2']['APIC'] );
 		if ( ! empty( $image['data'] ) ) {
 			$metadata['image'] = array(
-				'data' => $image['data'],
-				'mime' => $image['image_mime'],
-				'width' => $image['image_width'],
-				'height' => $image['image_height']
+				'data'   => $image['data'],
+				'mime'   => $image['image_mime'],
+				'width'  => $image['image_width'],
+				'height' => $image['image_height'],
 			);
 		}
 	} elseif ( ! empty( $data['comments']['picture'] ) ) {
@@ -3032,7 +3224,7 @@ function wp_add_id3_tag_data( &$metadata, $data ) {
 		if ( ! empty( $image['data'] ) ) {
 			$metadata['image'] = array(
 				'data' => $image['data'],
-				'mime' => $image['image_mime']
+				'mime' => $image['image_mime'],
 			);
 		}
 	}
@@ -3060,35 +3252,48 @@ function wp_read_video_metadata( $file ) {
 	if ( ! class_exists( 'getID3', false ) ) {
 		require( ABSPATH . WPINC . '/ID3/getid3.php' );
 	}
-	$id3 = new getID3();
+	$id3  = new getID3();
 	$data = $id3->analyze( $file );
 
-	if ( isset( $data['video']['lossless'] ) )
+	if ( isset( $data['video']['lossless'] ) ) {
 		$metadata['lossless'] = $data['video']['lossless'];
-	if ( ! empty( $data['video']['bitrate'] ) )
+	}
+	if ( ! empty( $data['video']['bitrate'] ) ) {
 		$metadata['bitrate'] = (int) $data['video']['bitrate'];
-	if ( ! empty( $data['video']['bitrate_mode'] ) )
+	}
+	if ( ! empty( $data['video']['bitrate_mode'] ) ) {
 		$metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
-	if ( ! empty( $data['filesize'] ) )
+	}
+	if ( ! empty( $data['filesize'] ) ) {
 		$metadata['filesize'] = (int) $data['filesize'];
-	if ( ! empty( $data['mime_type'] ) )
+	}
+	if ( ! empty( $data['mime_type'] ) ) {
 		$metadata['mime_type'] = $data['mime_type'];
-	if ( ! empty( $data['playtime_seconds'] ) )
+	}
+	if ( ! empty( $data['playtime_seconds'] ) ) {
 		$metadata['length'] = (int) round( $data['playtime_seconds'] );
-	if ( ! empty( $data['playtime_string'] ) )
+	}
+	if ( ! empty( $data['playtime_string'] ) ) {
 		$metadata['length_formatted'] = $data['playtime_string'];
-	if ( ! empty( $data['video']['resolution_x'] ) )
+	}
+	if ( ! empty( $data['video']['resolution_x'] ) ) {
 		$metadata['width'] = (int) $data['video']['resolution_x'];
-	if ( ! empty( $data['video']['resolution_y'] ) )
+	}
+	if ( ! empty( $data['video']['resolution_y'] ) ) {
 		$metadata['height'] = (int) $data['video']['resolution_y'];
-	if ( ! empty( $data['fileformat'] ) )
+	}
+	if ( ! empty( $data['fileformat'] ) ) {
 		$metadata['fileformat'] = $data['fileformat'];
-	if ( ! empty( $data['video']['dataformat'] ) )
+	}
+	if ( ! empty( $data['video']['dataformat'] ) ) {
 		$metadata['dataformat'] = $data['video']['dataformat'];
-	if ( ! empty( $data['video']['encoder'] ) )
+	}
+	if ( ! empty( $data['video']['encoder'] ) ) {
 		$metadata['encoder'] = $data['video']['encoder'];
-	if ( ! empty( $data['video']['codec'] ) )
+	}
+	if ( ! empty( $data['video']['codec'] ) ) {
 		$metadata['codec'] = $data['video']['codec'];
+	}
 
 	if ( ! empty( $data['audio'] ) ) {
 		unset( $data['audio']['streams'] );
@@ -3144,7 +3349,7 @@ function wp_read_audio_metadata( $file ) {
 	if ( ! class_exists( 'getID3', false ) ) {
 		require( ABSPATH . WPINC . '/ID3/getid3.php' );
 	}
-	$id3 = new getID3();
+	$id3  = new getID3();
 	$data = $id3->analyze( $file );
 
 	if ( ! empty( $data['audio'] ) ) {
@@ -3152,16 +3357,21 @@ function wp_read_audio_metadata( $file ) {
 		$metadata = $data['audio'];
 	}
 
-	if ( ! empty( $data['fileformat'] ) )
+	if ( ! empty( $data['fileformat'] ) ) {
 		$metadata['fileformat'] = $data['fileformat'];
-	if ( ! empty( $data['filesize'] ) )
+	}
+	if ( ! empty( $data['filesize'] ) ) {
 		$metadata['filesize'] = (int) $data['filesize'];
-	if ( ! empty( $data['mime_type'] ) )
+	}
+	if ( ! empty( $data['mime_type'] ) ) {
 		$metadata['mime_type'] = $data['mime_type'];
-	if ( ! empty( $data['playtime_seconds'] ) )
+	}
+	if ( ! empty( $data['playtime_seconds'] ) ) {
 		$metadata['length'] = (int) round( $data['playtime_seconds'] );
-	if ( ! empty( $data['playtime_string'] ) )
+	}
+	if ( ! empty( $data['playtime_string'] ) ) {
 		$metadata['length_formatted'] = $data['playtime_string'];
+	}
 
 	wp_add_id3_tag_data( $metadata, $data );
 
@@ -3200,8 +3410,7 @@ function wp_get_media_creation_timestamp( $metadata ) {
 		case 'webm':
 			if ( isset( $metadata['matroska']['comments']['creation_time']['0'] ) ) {
 				$creation_date = strtotime( $metadata['matroska']['comments']['creation_time']['0'] );
-			}
-			elseif ( isset( $metadata['matroska']['info']['0']['DateUTC_unix'] ) ) {
+			} elseif ( isset( $metadata['matroska']['info']['0']['DateUTC_unix'] ) ) {
 				$creation_date = (int) $metadata['matroska']['info']['0']['DateUTC_unix'];
 			}
 			break;
@@ -3270,7 +3479,7 @@ function wp_media_attach_action( $parent_id, $action = 'attach' ) {
 			}
 		}
 
-		$key = 'attach' === $action ? 'attached' : 'detach';
+		$key      = 'attach' === $action ? 'attached' : 'detach';
 		$location = add_query_arg( array( $key => $result ), $location );
 		wp_redirect( $location );
 		exit;
diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php
index 1c6f545f48..cea9c758f1 100644
--- a/wp-admin/includes/menu.php
+++ b/wp-admin/includes/menu.php
@@ -42,48 +42,51 @@ if ( is_network_admin() ) {
 }
 
 // Create list of page plugin hook names.
-foreach ($menu as $menu_page) {
-	if ( false !== $pos = strpos($menu_page[2], '?') ) {
+foreach ( $menu as $menu_page ) {
+	if ( false !== $pos = strpos( $menu_page[2], '?' ) ) {
 		// Handle post_type=post|page|foo pages.
-		$hook_name = substr($menu_page[2], 0, $pos);
-		$hook_args = substr($menu_page[2], $pos + 1);
-		wp_parse_str($hook_args, $hook_args);
+		$hook_name = substr( $menu_page[2], 0, $pos );
+		$hook_args = substr( $menu_page[2], $pos + 1 );
+		wp_parse_str( $hook_args, $hook_args );
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
+		if ( isset( $hook_args['post_type'] ) ) {
 			$hook_name = $hook_args['post_type'];
-		else
-			$hook_name = basename($hook_name, '.php');
-		unset($hook_args);
+		} else {
+			$hook_name = basename( $hook_name, '.php' );
+		}
+		unset( $hook_args );
 	} else {
-		$hook_name = basename($menu_page[2], '.php');
+		$hook_name = basename( $menu_page[2], '.php' );
 	}
-	$hook_name = sanitize_title($hook_name);
+	$hook_name = sanitize_title( $hook_name );
 
-	if ( isset($compat[$hook_name]) )
-		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
+	if ( isset( $compat[ $hook_name ] ) ) {
+		$hook_name = $compat[ $hook_name ];
+	} elseif ( ! $hook_name ) {
 		continue;
+	}
 
-	$admin_page_hooks[$menu_page[2]] = $hook_name;
+	$admin_page_hooks[ $menu_page[2] ] = $hook_name;
 }
-unset($menu_page, $compat);
+unset( $menu_page, $compat );
 
 $_wp_submenu_nopriv = array();
-$_wp_menu_nopriv = array();
+$_wp_menu_nopriv    = array();
 // Loop over submenus and remove pages for which the user does not have privs.
-foreach ($submenu as $parent => $sub) {
-	foreach ($sub as $index => $data) {
-		if ( ! current_user_can($data[1]) ) {
-			unset($submenu[$parent][$index]);
-			$_wp_submenu_nopriv[$parent][$data[2]] = true;
+foreach ( $submenu as $parent => $sub ) {
+	foreach ( $sub as $index => $data ) {
+		if ( ! current_user_can( $data[1] ) ) {
+			unset( $submenu[ $parent ][ $index ] );
+			$_wp_submenu_nopriv[ $parent ][ $data[2] ] = true;
 		}
 	}
-	unset($index, $data);
+	unset( $index, $data );
 
-	if ( empty($submenu[$parent]) )
-		unset($submenu[$parent]);
+	if ( empty( $submenu[ $parent ] ) ) {
+		unset( $submenu[ $parent ] );
+	}
 }
-unset($sub, $parent);
+unset( $sub, $parent );
 
 /*
  * Loop over the top-level menu.
@@ -91,10 +94,11 @@ unset($sub, $parent);
  * will have the next submenu in line be assigned as the new menu parent.
  */
 foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
+	if ( empty( $submenu[ $data[2] ] ) ) {
 		continue;
-	$subs = $submenu[$data[2]];
-	$first_sub = reset( $subs );
+	}
+	$subs       = $submenu[ $data[2] ];
+	$first_sub  = reset( $subs );
 	$old_parent = $data[2];
 	$new_parent = $first_sub[2];
 	/*
@@ -102,20 +106,21 @@ foreach ( $menu as $id => $data ) {
 	 * make the first submenu the new parent.
 	 */
 	if ( $new_parent != $old_parent ) {
-		$_wp_real_parent_file[$old_parent] = $new_parent;
-		$menu[$id][2] = $new_parent;
+		$_wp_real_parent_file[ $old_parent ] = $new_parent;
+		$menu[ $id ][2]                      = $new_parent;
 
-		foreach ($submenu[$old_parent] as $index => $data) {
-			$submenu[$new_parent][$index] = $submenu[$old_parent][$index];
-			unset($submenu[$old_parent][$index]);
+		foreach ( $submenu[ $old_parent ] as $index => $data ) {
+			$submenu[ $new_parent ][ $index ] = $submenu[ $old_parent ][ $index ];
+			unset( $submenu[ $old_parent ][ $index ] );
 		}
-		unset($submenu[$old_parent], $index);
+		unset( $submenu[ $old_parent ], $index );
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
-			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		if ( isset( $_wp_submenu_nopriv[ $old_parent ] ) ) {
+			$_wp_submenu_nopriv[ $new_parent ] = $_wp_submenu_nopriv[ $old_parent ];
+		}
 	}
 }
-unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
+unset( $id, $data, $subs, $first_sub, $old_parent, $new_parent );
 
 if ( is_network_admin() ) {
 
@@ -154,75 +159,75 @@ if ( is_network_admin() ) {
  * that the user does not have. Run re-parent loop again.
  */
 foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
-		$_wp_menu_nopriv[$data[2]] = true;
+	if ( ! current_user_can( $data[1] ) ) {
+		$_wp_menu_nopriv[ $data[2] ] = true;
+	}
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
 	 * remove the submenu.
 	 */
-	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
-		$subs = $submenu[$data[2]];
+	if ( ! empty( $submenu[ $data[2] ] ) && 1 == count( $submenu[ $data[2] ] ) ) {
+		$subs      = $submenu[ $data[2] ];
 		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		if ( $data[2] == $first_sub[2] ) {
+			unset( $submenu[ $data[2] ] );
+		}
 	}
 
 	// If submenu is empty...
-	if ( empty($submenu[$data[2]]) ) {
+	if ( empty( $submenu[ $data[2] ] ) ) {
 		// And user doesn't have privs, remove menu.
-		if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
-			unset($menu[$id]);
+		if ( isset( $_wp_menu_nopriv[ $data[2] ] ) ) {
+			unset( $menu[ $id ] );
 		}
 	}
 }
-unset($id, $data, $subs, $first_sub);
+unset( $id, $data, $subs, $first_sub );
 
 /**
- *
  * @param string $add
  * @param string $class
  * @return string
  */
-function add_cssclass($add, $class) {
-	$class = empty($class) ? $add : $class .= ' ' . $add;
+function add_cssclass( $add, $class ) {
+	$class = empty( $class ) ? $add : $class .= ' ' . $add;
 	return $class;
 }
 
 /**
- *
  * @param array $menu
  * @return array
  */
-function add_menu_classes($menu) {
+function add_menu_classes( $menu ) {
 	$first = $lastorder = false;
-	$i = 0;
-	$mc = count($menu);
+	$i     = 0;
+	$mc    = count( $menu );
 	foreach ( $menu as $order => $top ) {
 		$i++;
 
 		if ( 0 == $order ) { // dashboard is always shown/single
-			$menu[0][4] = add_cssclass('menu-top-first', $top[4]);
-			$lastorder = 0;
+			$menu[0][4] = add_cssclass( 'menu-top-first', $top[4] );
+			$lastorder  = 0;
 			continue;
 		}
 
-		if ( 0 === strpos($top[2], 'separator') && false !== $lastorder ) { // if separator
-			$first = true;
-			$c = $menu[$lastorder][4];
-			$menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
+		if ( 0 === strpos( $top[2], 'separator' ) && false !== $lastorder ) { // if separator
+			$first                 = true;
+			$c                     = $menu[ $lastorder ][4];
+			$menu[ $lastorder ][4] = add_cssclass( 'menu-top-last', $c );
 			continue;
 		}
 
 		if ( $first ) {
-			$c = $menu[$order][4];
-			$menu[$order][4] = add_cssclass('menu-top-first', $c);
-			$first = false;
+			$c                 = $menu[ $order ][4];
+			$menu[ $order ][4] = add_cssclass( 'menu-top-first', $c );
+			$first             = false;
 		}
 
 		if ( $mc == $i ) { // last item
-			$c = $menu[$order][4];
-			$menu[$order][4] = add_cssclass('menu-top-last', $c);
+			$c                 = $menu[ $order ][4];
+			$menu[ $order ][4] = add_cssclass( 'menu-top-last', $c );
 		}
 
 		$lastorder = $order;
@@ -238,7 +243,7 @@ function add_menu_classes($menu) {
 	return apply_filters( 'add_menu_classes', $menu );
 }
 
-uksort($menu, "strnatcasecmp"); // make it all pretty
+uksort( $menu, 'strnatcasecmp' ); // make it all pretty
 
 /**
  * Filters whether to enable custom ordering of the administration menu.
@@ -254,7 +259,7 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
 	foreach ( $menu as $menu_item ) {
 		$menu_order[] = $menu_item[2];
 	}
-	unset($menu_item);
+	unset( $menu_item );
 	$default_menu_order = $menu_order;
 
 	/**
@@ -269,12 +274,11 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
 	 *
 	 * @param array $menu_order An ordered array of menu items.
 	 */
-	$menu_order = apply_filters( 'menu_order', $menu_order );
-	$menu_order = array_flip($menu_order);
-	$default_menu_order = array_flip($default_menu_order);
+	$menu_order         = apply_filters( 'menu_order', $menu_order );
+	$menu_order         = array_flip( $menu_order );
+	$default_menu_order = array_flip( $default_menu_order );
 
 	/**
-	 *
 	 * @global array $menu_order
 	 * @global array $default_menu_order
 	 *
@@ -282,25 +286,26 @@ if ( apply_filters( 'custom_menu_order', false ) ) {
 	 * @param array $b
 	 * @return int
 	 */
-	function sort_menu($a, $b) {
+	function sort_menu( $a, $b ) {
 		global $menu_order, $default_menu_order;
 		$a = $a[2];
 		$b = $b[2];
-		if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
+		if ( isset( $menu_order[ $a ] ) && ! isset( $menu_order[ $b ] ) ) {
 			return -1;
-		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+		} elseif ( ! isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
 			return 1;
-		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
+		} elseif ( isset( $menu_order[ $a ] ) && isset( $menu_order[ $b ] ) ) {
+			if ( $menu_order[ $a ] == $menu_order[ $b ] ) {
 				return 0;
-			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
+			}
+			return ( $menu_order[ $a ] < $menu_order[ $b ] ) ? -1 : 1;
 		} else {
-			return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
+			return ( $default_menu_order[ $a ] <= $default_menu_order[ $b ] ) ? -1 : 1;
 		}
 	}
 
-	usort($menu, 'sort_menu');
-	unset($menu_order, $default_menu_order);
+	usort( $menu, 'sort_menu' );
+	unset( $menu_order, $default_menu_order );
 }
 
 // Prevent adjacent separators
@@ -326,11 +331,12 @@ unset( $id, $data, $prev_menu_was_separator );
 // Remove the last menu item if it is a separator.
 $last_menu_key = array_keys( $menu );
 $last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
+if ( ! empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][4] ) {
 	unset( $menu[ $last_menu_key ] );
+}
 unset( $last_menu_key );
 
-if ( !user_can_access_admin_page() ) {
+if ( ! user_can_access_admin_page() ) {
 
 	/**
 	 * Fires when access to an admin page is denied.
@@ -342,4 +348,4 @@ if ( !user_can_access_admin_page() ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
 }
 
-$menu = add_menu_classes($menu);
+$menu = add_menu_classes( $menu );
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 330fdcfdfa..703c1ab6b1 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -22,9 +22,9 @@
 function post_submit_meta_box( $post, $args = array() ) {
 	global $action;
 
-	$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);
+	$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">
 
@@ -38,16 +38,16 @@ function post_submit_meta_box( $post, $args = array() ) {
 <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"';
-		}
+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" />
+<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 ) { ?>
-<input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" class="button" />
+<input type="submit" name="save" id="save-post" value="<?php esc_attr_e( 'Save as Pending' ); ?>" class="button" />
 <span class="spinner"></span>
 <?php } ?>
 </div>
@@ -61,7 +61,8 @@ if ( 'publish' == $post->post_status ) {
 	$preview_button_text = __( 'Preview' );
 }
 
-$preview_button = sprintf( '%1$s<span class="screen-reader-text"> %2$s</span>',
+$preview_button = sprintf(
+	'%1$s<span class="screen-reader-text"> %2$s</span>',
 	$preview_button_text,
 	/* translators: accessibility text */
 	__( '(opens in a new window)' )
@@ -87,101 +88,105 @@ do_action( 'post_submitbox_minor_actions', $post );
 <div id="misc-publishing-actions">
 
 <div class="misc-pub-section misc-pub-post-status">
-<?php _e( 'Status:' ) ?> <span id="post-status-display"><?php
+<?php _e( 'Status:' ); ?> <span id="post-status-display">
+			<?php
 
-switch ( $post->post_status ) {
-	case 'private':
-		_e('Privately Published');
-		break;
-	case 'publish':
-		_e('Published');
-		break;
-	case 'future':
-		_e('Scheduled');
-		break;
-	case 'pending':
-		_e('Pending Review');
-		break;
-	case 'draft':
-	case 'auto-draft':
-		_e('Draft');
-		break;
-}
+			switch ( $post->post_status ) {
+				case 'private':
+					_e( 'Privately Published' );
+					break;
+				case 'publish':
+					_e( 'Published' );
+					break;
+				case 'future':
+					_e( 'Scheduled' );
+					break;
+				case 'pending':
+					_e( 'Pending Review' );
+					break;
+				case 'draft':
+				case 'auto-draft':
+					_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"';
-		}
+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>
+<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 ) : ?>
-<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
+<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>
+<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e( 'Privately Published' ); ?></option>
 <?php elseif ( 'future' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+<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>
+<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e( 'Pending Review' ); ?></option>
 <?php if ( 'auto-draft' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<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>
+<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
 <?php endif; ?>
 </select>
-<a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
-<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e('Cancel'); ?></a>
+<a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
 </div>
 
 <?php } ?>
 </div><!-- .misc-pub-section -->
 
 <div class="misc-pub-section misc-pub-visibility" id="visibility">
-<?php _e('Visibility:'); ?> <span id="post-visibility-display"><?php
+<?php _e( 'Visibility:' ); ?> <span id="post-visibility-display">
+							<?php
 
-if ( 'private' == $post->post_status ) {
-	$post->post_password = '';
-	$visibility = 'private';
-	$visibility_trans = __('Private');
-} elseif ( !empty( $post->post_password ) ) {
-	$visibility = 'password';
-	$visibility_trans = __('Password protected');
-} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
-	$visibility = 'public';
-	$visibility_trans = __('Public, Sticky');
-} else {
-	$visibility = 'public';
-	$visibility_trans = __('Public');
-}
+							if ( 'private' == $post->post_status ) {
+								$post->post_password = '';
+								$visibility          = 'private';
+								$visibility_trans    = __( 'Private' );
+							} elseif ( ! empty( $post->post_password ) ) {
+								$visibility       = 'password';
+								$visibility_trans = __( 'Password protected' );
+							} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
+								$visibility       = 'public';
+								$visibility_trans = __( 'Public, Sticky' );
+							} else {
+								$visibility       = 'public';
+								$visibility_trans = __( 'Public' );
+							}
 
-echo esc_html( $visibility_trans ); ?></span>
+							echo esc_html( $visibility_trans );
+?>
+</span>
 <?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'): ?>
-<input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID)); ?> />
+<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr( $post->post_password ); ?>" />
+<?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 />
+<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' ) ) : ?>
 <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 />
-<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr($post->post_password); ?>"  maxlength="255" /><br /></span>
-<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
+<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 />
+<span id="password-span"><label for="post_password"><?php _e( 'Password:' ); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr( $post->post_password ); ?>"  maxlength="255" /><br /></span>
+<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e( 'Private' ); ?></label><br />
 
 <p>
-	<a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
-	<a href="#visibility" class="cancel-post-visibility hide-if-no-js button-cancel"><?php _e('Cancel'); ?></a>
+	<a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e( 'OK' ); ?></a>
+	<a href="#visibility" class="cancel-post-visibility hide-if-no-js button-cancel"><?php _e( 'Cancel' ); ?></a>
 </p>
 </div>
 <?php } ?>
@@ -194,26 +199,27 @@ $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. 1: Date on which the post is currently scheduled to be published */
-		$stamp = __('Scheduled for: <b>%1$s</b>');
+		$stamp = __( 'Scheduled for: <b>%1$s</b>' );
 	} elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
 		/* translators: Post date information. 1: Date on which the post was published */
-		$stamp = __('Published on: <b>%1$s</b>');
+		$stamp = __( 'Published on: <b>%1$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>');
+		$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. 1: Date on which the post is to be published */
-		$stamp = __('Schedule for: <b>%1$s</b>');
+		$stamp = __( 'Schedule for: <b>%1$s</b>' );
 	} else { // draft, 1 or more saves, date specified
 		/* translators: Post date information. 1: Date on which the post is to be published */
-		$stamp = __('Publish on: <b>%1$s</b>');
+		$stamp = __( 'Publish on: <b>%1$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') ) );
+	$stamp = __( 'Publish <b>immediately</b>' );
+	$date  = date_i18n( $datef, strtotime( current_time( 'mysql' ) ) );
 }
 
-if ( ! empty( $args['args']['revisions_count'] ) ) : ?>
+if ( ! empty( $args['args']['revisions_count'] ) ) :
+?>
 <div class="misc-pub-section misc-pub-revisions">
 	<?php
 		/* translators: Post revisions heading. 1: The number of available revisions */
@@ -221,12 +227,14 @@ if ( ! empty( $args['args']['revisions_count'] ) ) : ?>
 	?>
 	<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 endif;
+<?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>
@@ -285,38 +293,46 @@ 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');
+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
-} ?>
+<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 ( ! 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' ) ) : ?>
+		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 : ?>
-		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
+		<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;
-	else : ?>
-		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
+<?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 { ?>
-		<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' ) ?>" />
+} 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
-} ?>
+}
+?>
 </div>
 <div class="clear"></div>
 </div>
@@ -346,18 +362,20 @@ function attachment_submit_meta_box( $post ) {
 
 <div id="misc-publishing-actions">
 	<div class="misc-pub-section curtime misc-pub-curtime">
-		<span id="timestamp"><?php
+		<span id="timestamp">
+		<?php
 			$date = date_i18n(
 				/* translators: Publish box date format, see https://secure.php.net/date */
 				__( 'M j, Y @ H:i' ),
 				strtotime( $post->post_date )
 			);
-			printf(
-				/* translators: Attachment information. %s: Date the attachment was uploaded */
-				__( 'Uploaded on: %s' ),
-				'<b>' . $date . '</b>'
-			);
-		?></span>
+							printf(
+								/* translators: Attachment information. %s: Date the attachment was uploaded */
+								__( 'Uploaded on: %s' ),
+								'<b>' . $date . '</b>'
+							);
+		?>
+		</span>
 	</div><!-- .misc-pub-section -->
 
 	<?php
@@ -368,7 +386,7 @@ function attachment_submit_meta_box( $post ) {
 	 * @since 3.5.0
 	 * @since 4.9.0 Added the `$post` parameter.
 	 *
-	 * @param WP_Post $post WP_Post object for the current attachment. 
+	 * @param WP_Post $post WP_Post object for the current attachment.
 	 */
 	do_action( 'attachment_submitbox_misc_actions', $post );
 	?>
@@ -379,20 +397,21 @@ function attachment_submit_meta_box( $post ) {
 <div id="major-publishing-actions">
 	<div id="delete-action">
 	<?php
-	if ( current_user_can( 'delete_post', $post->ID ) )
+	if ( current_user_can( 'delete_post', $post->ID ) ) {
 		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
+			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
 		} else {
 			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . '</a>';
 		}
+	}
 	?>
 	</div>
 
 	<div id="publishing-action">
 		<span class="spinner"></span>
-		<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' ) ?>" />
+		<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' ); ?>" />
 	</div>
 	<div class="clear"></div>
 </div><!-- #major-publishing-actions -->
@@ -419,17 +438,19 @@ function attachment_submit_meta_box( $post ) {
  */
 function post_format_meta_box( $post, $box ) {
 	if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
-	$post_formats = get_theme_support( 'post-formats' );
+		$post_formats = get_theme_support( 'post-formats' );
 
-	if ( is_array( $post_formats[0] ) ) :
-		$post_format = get_post_format( $post->ID );
-		if ( !$post_format )
-			$post_format = '0';
-		// Add in the current one if it isn't there yet, in case the current theme doesn't support it
-		if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
-			$post_formats[0][] = $post_format;
-	?>
-	<div id="post-formats-select">
+		if ( is_array( $post_formats[0] ) ) :
+			$post_format = get_post_format( $post->ID );
+			if ( ! $post_format ) {
+				$post_format = '0';
+			}
+			// Add in the current one if it isn't there yet, in case the current theme doesn't support it
+			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>
 			<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
@@ -438,7 +459,9 @@ function post_format_meta_box( $post, $box ) {
 			<?php endforeach; ?>
 		</fieldset>
 	</div>
-	<?php endif; endif;
+	<?php
+	endif;
+endif;
 }
 
 /**
@@ -469,12 +492,12 @@ function post_tags_meta_box( $post, $box ) {
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
-	$tax_name = esc_attr( $r['taxonomy'] );
-	$taxonomy = get_taxonomy( $r['taxonomy'] );
+	$r                     = wp_parse_args( $args, $defaults );
+	$tax_name              = esc_attr( $r['taxonomy'] );
+	$taxonomy              = get_taxonomy( $r['taxonomy'] );
 	$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
-	$comma = _x( ',', 'tag delimiter' );
-	$terms_to_edit = get_terms_to_edit( $post->ID, $tax_name );
+	$comma                 = _x( ',', 'tag delimiter' );
+	$terms_to_edit         = get_terms_to_edit( $post->ID, $tax_name );
 	if ( ! is_string( $terms_to_edit ) ) {
 		$terms_to_edit = '';
 	}
@@ -485,14 +508,14 @@ function post_tags_meta_box( $post, $box ) {
 		<label for="tax-input-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_or_remove_items; ?></label>
 		<p><textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?> aria-describedby="new-tag-<?php echo $tax_name; ?>-desc"><?php echo str_replace( ',', $comma . ' ', $terms_to_edit ); // textarea_escaped by esc_attr() ?></textarea></p>
 	</div>
- 	<?php if ( $user_can_assign_terms ) : ?>
+	<?php if ( $user_can_assign_terms ) : ?>
 	<div class="ajaxtag hide-if-no-js">
 		<label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
 		<p><input data-wp-taxonomy="<?php echo $tax_name; ?>" type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" aria-describedby="new-tag-<?php echo $tax_name; ?>-desc" value="" />
-		<input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
+		<input type="button" class="button tagadd" value="<?php esc_attr_e( 'Add' ); ?>" /></p>
 	</div>
 	<p class="howto" id="new-tag-<?php echo $tax_name; ?>-desc"><?php echo $taxonomy->labels->separate_items_with_commas; ?></p>
-	<?php elseif ( empty( $terms_to_edit ) ): ?>
+	<?php elseif ( empty( $terms_to_edit ) ) : ?>
 		<p><?php echo $taxonomy->labels->no_terms; ?></p>
 	<?php endif; ?>
 	</div>
@@ -532,7 +555,7 @@ function post_categories_meta_box( $post, $box ) {
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
+	$r        = wp_parse_args( $args, $defaults );
 	$tax_name = esc_attr( $r['taxonomy'] );
 	$taxonomy = get_taxonomy( $r['taxonomy'] );
 	?>
@@ -554,7 +577,14 @@ function post_categories_meta_box( $post, $box ) {
 			echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
 			?>
 			<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( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?>
+				<?php
+				wp_terms_checklist(
+					$post->ID, array(
+						'taxonomy'     => $tax_name,
+						'popular_cats' => $popular_ids,
+					)
+				);
+?>
 			</ul>
 		</div>
 	<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
@@ -626,16 +656,18 @@ function post_categories_meta_box( $post, $box ) {
  *
  * @param object $post
  */
-function post_excerpt_meta_box($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
+<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
 	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>
+?>
+</p>
 <?php
 }
 
@@ -646,14 +678,14 @@ function post_excerpt_meta_box($post) {
  *
  * @param object $post
  */
-function post_trackback_meta_box($post) {
+function post_trackback_meta_box( $post ) {
 	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="' .
 		esc_attr( str_replace( "\n", ' ', $post->to_ping ) ) . '" aria-describedby="trackback-url-desc" />';
-	if ('' != $post->pinged) {
-		$pings = '<p>'. __('Already pinged:') . '</p><ul>';
-		$already_pinged = explode("\n", trim($post->pinged));
-		foreach ($already_pinged as $pinged_url) {
-			$pings .= "\n\t<li>" . esc_html($pinged_url) . "</li>";
+	if ( '' != $post->pinged ) {
+		$pings          = '<p>' . __( 'Already pinged:' ) . '</p><ul>';
+		$already_pinged = explode( "\n", trim( $post->pinged ) );
+		foreach ( $already_pinged as $pinged_url ) {
+			$pings .= "\n\t<li>" . esc_html( $pinged_url ) . '</li>';
 		}
 		$pings .= '</ul>';
 	}
@@ -664,17 +696,20 @@ function post_trackback_meta_box($post) {
 	<?php echo $form_trackback; ?>
 </p>
 <p id="trackback-url-desc" class="howto"><?php _e( 'Separate multiple URLs with spaces' ); ?></p>
-<p><?php
+<p>
+<?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>
+?>
+</p>
 <?php
-if ( ! empty($pings) )
+if ( ! empty( $pings ) ) {
 	echo $pings;
 }
+}
 
 /**
  * Display custom fields form fields.
@@ -683,26 +718,30 @@ if ( ! empty($pings) )
  *
  * @param object $post
  */
-function post_custom_meta_box($post) {
+function post_custom_meta_box( $post ) {
 ?>
 <div id="postcustomstuff">
 <div id="ajax-response"></div>
 <?php
-$metadata = has_meta($post->ID);
+$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' ] ) )
+	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 ); ?>
+meta_form( $post );
+?>
 </div>
-<p><?php
+<p>
+<?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>
+?>
+</p>
 <?php
 }
 
@@ -713,17 +752,20 @@ meta_form( $post ); ?>
  *
  * @param object $post
  */
-function post_comment_status_meta_box($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 />
-	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php
-		printf(
-			/* translators: %s: Codex URL */
-			__( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page' ),
-			__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' ) );
-		?></label>
+	<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 />
+	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked( $post->ping_status, 'open' ); ?> /> 
+																																						<?php
+																																						printf(
+																																							/* translators: %s: Codex URL */
+																																							__( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page' ),
+																																							__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
+																																						);
+		?>
+		</label>
 	<?php
 	/**
 	 * Fires at the end of the Discussion meta box on the post editing screen.
@@ -746,8 +788,8 @@ function post_comment_status_meta_box($post) {
  * @param array $result table header rows
  * @return array
  */
-function post_comment_meta_box_thead($result) {
-	unset($result['cb'], $result['response']);
+function post_comment_meta_box_thead( $result ) {
+	unset( $result['cb'], $result['response'] );
 	return $result;
 }
 
@@ -761,25 +803,31 @@ function post_comment_meta_box_thead($result) {
 function post_comment_meta_box( $post ) {
 	wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
 	?>
-	<p class="hide-if-no-js" id="add-new-comment"><a class="button" href="#commentstatusdiv" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);return false;"><?php _e('Add comment'); ?></a></p>
+	<p class="hide-if-no-js" id="add-new-comment"><a class="button" href="#commentstatusdiv" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);return false;"><?php _e( 'Add comment' ); ?></a></p>
 	<?php
 
-	$total = get_comments( array( 'post_id' => $post->ID, 'number' => 1, 'count' => true ) );
-	$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
+	$total         = get_comments(
+		array(
+			'post_id' => $post->ID,
+			'number'  => 1,
+			'count'   => true,
+		)
+	);
+	$wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table' );
 	$wp_list_table->display( true );
 
 	if ( 1 > $total ) {
-		echo '<p id="no-comments">' . __('No comments yet.') . '</p>';
+		echo '<p id="no-comments">' . __( 'No comments yet.' ) . '</p>';
 	} else {
 		$hidden = get_hidden_meta_boxes( get_current_screen() );
-		if ( ! in_array('commentsdiv', $hidden) ) {
+		if ( ! in_array( 'commentsdiv', $hidden ) ) {
 			?>
 			<script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
 			<?php
 		}
 
 		?>
-		<p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.load(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <span class="spinner"></span></p>
+		<p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.load(<?php echo $total; ?>);return false;"><?php _e( 'Show comments' ); ?></a> <span class="spinner"></span></p>
 		<?php
 	}
 
@@ -793,11 +841,11 @@ function post_comment_meta_box( $post ) {
  *
  * @param object $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 );
+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 ); ?>" />
+<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
 }
 
@@ -810,18 +858,20 @@ $editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
  *
  * @param object $post
  */
-function post_author_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>
+<label class="screen-reader-text" for="post_author_override"><?php _e( 'Author' ); ?></label>
 <?php
-	wp_dropdown_users( array(
-		'who' => 'authors',
-		'name' => 'post_author_override',
-		'selected' => empty($post->ID) ? $user_ID : $post->post_author,
-		'include_selected' => true,
-		'show' => 'display_name_with_login',
-	) );
+	wp_dropdown_users(
+		array(
+			'who'              => 'authors',
+			'name'             => 'post_author_override',
+			'selected'         => empty( $post->ID ) ? $user_ID : $post->post_author,
+			'include_selected' => true,
+			'show'             => 'display_name_with_login',
+		)
+	);
 }
 
 /**
@@ -844,14 +894,14 @@ function post_revisions_meta_box( $post ) {
  *
  * @param object $post
  */
-function page_attributes_meta_box($post) {
+function page_attributes_meta_box( $post ) {
 	if ( is_post_type_hierarchical( $post->post_type ) ) :
 		$dropdown_args = array(
 			'post_type'        => $post->post_type,
 			'exclude_tree'     => $post->ID,
 			'selected'         => $post->post_parent,
 			'name'             => 'parent_id',
-			'show_option_none' => __('(no parent)'),
+			'show_option_none' => __( '(no parent)' ),
 			'sort_column'      => 'menu_order, post_title',
 			'echo'             => 0,
 		);
@@ -867,8 +917,8 @@ function page_attributes_meta_box($post) {
 		 * @param WP_Post $post          The current post.
 		 */
 		$dropdown_args = apply_filters( 'page_attributes_dropdown_pages_args', $dropdown_args, $post );
-		$pages = wp_dropdown_pages( $dropdown_args );
-		if ( ! empty($pages) ) :
+		$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; ?>
@@ -879,18 +929,20 @@ function page_attributes_meta_box($post) {
 	if ( count( get_page_templates( $post ) ) > 0 && get_option( 'page_for_posts' ) != $post->ID ) :
 		$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 );
-?></p>
+<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 );
+?>
+</p>
 <select name="page_template" id="page_template">
 <?php
 /**
@@ -902,7 +954,7 @@ function page_attributes_meta_box($post) {
  * @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' );
+$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 ); ?>
@@ -923,7 +975,8 @@ 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;
 }
 
@@ -936,7 +989,7 @@ do_action( 'page_attributes_misc_attributes', $post );
  *
  * @param object $link
  */
-function link_submit_meta_box($link) {
+function link_submit_meta_box( $link ) {
 ?>
 <div class="submitbox" id="submitlink">
 
@@ -949,8 +1002,8 @@ function link_submit_meta_box($link) {
 
 <div id="minor-publishing-actions">
 <div id="preview-action">
-<?php if ( !empty($link->link_id) ) { ?>
-	<a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
+<?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>
 <div class="clear"></div>
@@ -958,7 +1011,7 @@ function link_submit_meta_box($link) {
 
 <div id="misc-publishing-actions">
 <div class="misc-pub-section misc-pub-private">
-	<label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label>
+	<label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked( $link->link_visible, 'N' ); ?> /> <?php _e( 'Keep this link private' ); ?></label>
 </div>
 </div>
 
@@ -971,16 +1024,17 @@ do_action( 'post_submitbox_start', null );
 ?>
 <div id="delete-action">
 <?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>
+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) ) { ?>
-	<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update Link' ) ?>" />
+<?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' ) ?>" />
+	<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Add Link' ); ?>" />
 <?php } ?>
 </div>
 <div class="clear"></div>
@@ -1005,7 +1059,7 @@ do_action( 'submitlink_box' );
  *
  * @param object $link
  */
-function link_categories_meta_box($link) {
+function link_categories_meta_box( $link ) {
 ?>
 <div id="taxonomy-linkcategory" class="categorydiv">
 	<ul id="category-tabs" class="category-tabs">
@@ -1016,17 +1070,18 @@ function link_categories_meta_box($link) {
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
 			<?php
-			if ( isset($link->link_id) )
-				wp_link_category_checklist($link->link_id);
-			else
+			if ( isset( $link->link_id ) ) {
+				wp_link_category_checklist( $link->link_id );
+			} else {
 				wp_link_category_checklist();
+			}
 			?>
 		</ul>
 	</div>
 
 	<div id="categories-pop" class="tabs-panel" style="display: none;">
 		<ul id="categorychecklist-pop" class="categorychecklist form-no-clear">
-			<?php wp_popular_terms_checklist('link_category'); ?>
+			<?php wp_popular_terms_checklist( 'link_category' ); ?>
 		</ul>
 	</div>
 
@@ -1051,19 +1106,21 @@ function link_categories_meta_box($link) {
  *
  * @param object $link
  */
-function link_target_meta_box($link) { ?>
-<fieldset><legend class="screen-reader-text"><span><?php _e('Target') ?></span></legend>
+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>
+<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>
 <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>
+<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>
 <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>
+<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>
 </fieldset>
-<p><?php _e('Choose the target frame for your link.'); ?></p>
+<p><?php _e( 'Choose the target frame for your link.' ); ?></p>
 <?php
 }
 
@@ -1086,17 +1143,25 @@ function xfn_check( $class, $value = '', $deprecated = '' ) {
 	}
 
 	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
-	$rels = preg_split('/\s+/', $link_rel);
+	$rels     = preg_split( '/\s+/', $link_rel );
 
-	if ('' != $value && in_array($value, $rels) ) {
+	if ( '' != $value && in_array( $value, $rels ) ) {
 		echo ' checked="checked"';
 	}
 
-	if ('' == $value) {
-		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
-		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
-		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+	if ( '' == $value ) {
+		if ( 'family' == $class && strpos( $link_rel, 'child' ) === false && strpos( $link_rel, 'parent' ) === false && strpos( $link_rel, 'sibling' ) === false && strpos( $link_rel, 'spouse' ) === false && strpos( $link_rel, 'kin' ) === false ) {
+			echo ' checked="checked"';
+		}
+		if ( 'friendship' == $class && strpos( $link_rel, 'friend' ) === false && strpos( $link_rel, 'acquaintance' ) === false && strpos( $link_rel, 'contact' ) === false ) {
+			echo ' checked="checked"';
+		}
+		if ( 'geographical' == $class && strpos( $link_rel, 'co-resident' ) === false && strpos( $link_rel, 'neighbor' ) === false ) {
+			echo ' checked="checked"';
+		}
+		if ( 'identity' == $class && in_array( 'me', $rels ) ) {
+			echo ' checked="checked"';
+		}
 	}
 }
 
@@ -1107,114 +1172,114 @@ function xfn_check( $class, $value = '', $deprecated = '' ) {
  *
  * @param object $link
  */
-function link_xfn_meta_box($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>
-		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr($link->link_rel) : ''); ?>" /></td>
+		<th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'rel:' ); ?></label></th>
+		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr( $link->link_rel ) : '' ); ?>" /></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></span></legend>
+		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'identity' ); ?></th>
+		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'identity' ); ?></span></legend>
 			<label for="me">
-			<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
-			<?php _e('another web address of mine') ?></label>
+			<input type="checkbox" name="identity" value="me" id="me" <?php xfn_check( 'identity', 'me' ); ?> />
+			<?php _e( 'another web address of mine' ); ?></label>
 		</fieldset></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friendship') ?></span></legend>
+		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'friendship' ); ?></th>
+		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'friendship' ); ?></span></legend>
 			<label for="contact">
-			<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('contact') ?>
+			<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check( 'friendship', 'contact' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'contact' ); ?>
 			</label>
 			<label for="acquaintance">
-			<input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('acquaintance') ?>
+			<input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check( 'friendship', 'acquaintance' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'acquaintance' ); ?>
 			</label>
 			<label for="friend">
-			<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('friend') ?>
+			<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check( 'friendship', 'friend' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'friend' ); ?>
 			</label>
 			<label for="friendship">
-			<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
+			<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check( 'friendship' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'none' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
 	<tr>
-		<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?> </th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('physical') ?></span></legend>
+		<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'physical' ); ?> </th>
+		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'physical' ); ?></span></legend>
 			<label for="met">
-			<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('met') ?>
+			<input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check( 'physical', 'met' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'met' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
 	<tr>
-		<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?> </th>
-		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('professional') ?></span></legend>
+		<th scope="row"> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'professional' ); ?> </th>
+		<td><fieldset><legend class="screen-reader-text"><span><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'professional' ); ?></span></legend>
 			<label for="co-worker">
-			<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-worker') ?>
+			<input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check( 'professional', 'co-worker' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'co-worker' ); ?>
 			</label>
 			<label for="colleague">
-			<input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('colleague') ?>
+			<input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check( 'professional', 'colleague' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'colleague' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('geographical') ?> </span></legend>
+		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'geographical' ); ?></th>
+		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'geographical' ); ?> </span></legend>
 			<label for="co-resident">
-			<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('co-resident') ?>
+			<input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check( 'geographical', 'co-resident' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'co-resident' ); ?>
 			</label>
 			<label for="neighbor">
-			<input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check('geographical', 'neighbor'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('neighbor') ?>
+			<input class="valinp" type="radio" name="geographical" value="neighbor" id="neighbor" <?php xfn_check( 'geographical', 'neighbor' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'neighbor' ); ?>
 			</label>
 			<label for="geographical">
-			<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
+			<input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check( 'geographical' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'none' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('family') ?> </span></legend>
+		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'family' ); ?></th>
+		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'family' ); ?> </span></legend>
 			<label for="child">
-			<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('child') ?>
+			<input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check( 'family', 'child' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'child' ); ?>
 			</label>
 			<label for="kin">
-			<input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check('family', 'kin'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('kin') ?>
+			<input class="valinp" type="radio" name="family" value="kin" id="kin" <?php xfn_check( 'family', 'kin' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'kin' ); ?>
 			</label>
 			<label for="parent">
-			<input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check('family', 'parent'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('parent') ?>
+			<input class="valinp" type="radio" name="family" value="parent" id="parent" <?php xfn_check( 'family', 'parent' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'parent' ); ?>
 			</label>
 			<label for="sibling">
-			<input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check('family', 'sibling'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sibling') ?>
+			<input class="valinp" type="radio" name="family" value="sibling" id="sibling" <?php xfn_check( 'family', 'sibling' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'sibling' ); ?>
 			</label>
 			<label for="spouse">
-			<input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check('family', 'spouse'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('spouse') ?>
+			<input class="valinp" type="radio" name="family" value="spouse" id="spouse" <?php xfn_check( 'family', 'spouse' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'spouse' ); ?>
 			</label>
 			<label for="family">
-			<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('none') ?>
+			<input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check( 'family' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'none' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
 	<tr>
-		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?></th>
-		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('romantic') ?> </span></legend>
+		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'romantic' ); ?></th>
+		<td><fieldset><legend class="screen-reader-text"><span> <?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'romantic' ); ?> </span></legend>
 			<label for="muse">
-			<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('muse') ?>
+			<input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check( 'romantic', 'muse' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'muse' ); ?>
 			</label>
 			<label for="crush">
-			<input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check('romantic', 'crush'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('crush') ?>
+			<input class="valinp" type="checkbox" name="romantic" value="crush" id="crush" <?php xfn_check( 'romantic', 'crush' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'crush' ); ?>
 			</label>
 			<label for="date">
-			<input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check('romantic', 'date'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('date') ?>
+			<input class="valinp" type="checkbox" name="romantic" value="date" id="date" <?php xfn_check( 'romantic', 'date' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'date' ); ?>
 			</label>
 			<label for="romantic">
-			<input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('sweetheart') ?>
+			<input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check( 'romantic', 'sweetheart' ); ?> />&nbsp;<?php /* translators: xfn: http://gmpg.org/xfn/ */ _e( 'sweetheart' ); ?>
 			</label>
 		</fieldset></td>
 	</tr>
 
 </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>
+<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
 }
 
@@ -1225,32 +1290,34 @@ function link_xfn_meta_box($link) {
  *
  * @param object $link
  */
-function link_advanced_meta_box($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>
-		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" /></td>
+		<th scope="row"><label for="link_image"><?php _e( 'Image Address' ); ?></label></th>
+		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo ( isset( $link->link_image ) ? esc_attr( $link->link_image ) : '' ); ?>" /></td>
 	</tr>
 	<tr>
-		<th scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
-		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" /></td>
+		<th scope="row"><label for="rss_uri"><?php _e( 'RSS Address' ); ?></label></th>
+		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo ( isset( $link->link_rss ) ? esc_attr( $link->link_rss ) : '' ); ?>" /></td>
 	</tr>
 	<tr>
-		<th scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
+		<th scope="row"><label for="link_notes"><?php _e( 'Notes' ); ?></label></th>
+		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : '' ); // textarea_escaped ?></textarea></td>
 	</tr>
 	<tr>
-		<th scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
+		<th scope="row"><label for="link_rating"><?php _e( 'Rating' ); ?></label></th>
 		<td><select name="link_rating" id="link_rating" size="1">
 		<?php
-			for ( $r = 0; $r <= 10; $r++ ) {
-				echo '<option value="' . $r . '"';
-				if ( isset($link->link_rating) && $link->link_rating == $r )
-					echo ' selected="selected"';
-				echo('>' . $r . '</option>');
+		for ( $r = 0; $r <= 10; $r++ ) {
+			echo '<option value="' . $r . '"';
+			if ( isset( $link->link_rating ) && $link->link_rating == $r ) {
+				echo ' selected="selected"';
 			}
-		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
+			echo( '>' . $r . '</option>' );
+		}
+		?>
+		</select>&nbsp;<?php _e( '(Leave at 0 for no rating.)' ); ?>
 		</td>
 	</tr>
 </table>
@@ -1282,14 +1349,17 @@ function attachment_id3_data_meta_box( $post ) {
 		$meta = wp_get_attachment_metadata( $post->ID );
 	}
 
-	foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) : ?>
+	foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) :
+	?>
 	<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
-			if ( ! empty( $meta[ $key ] ) ) {
-				echo esc_attr( $meta[ $key ] );
-			}
-		?>" />
+		<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
+												if ( ! empty( $meta[ $key ] ) ) {
+													echo esc_attr( $meta[ $key ] );
+												}
+		?>
+		" />
 	</p>
 	<?php
 	endforeach;
diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index d060c138dd..ab15762ffa 100644
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -14,7 +14,7 @@
  * @return bool
  */
 function got_mod_rewrite() {
-	$got_rewrite = apache_mod_loaded('mod_rewrite', true);
+	$got_rewrite = apache_mod_loaded( 'mod_rewrite', true );
 
 	/**
 	 * Filters whether Apache and mod_rewrite are present.
@@ -65,7 +65,7 @@ function got_url_rewrite() {
  * @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers.
  */
 function extract_from_markers( $filename, $marker ) {
-	$result = array ();
+	$result = array();
 
 	if ( ! file_exists( $filename ) ) {
 		return $result;
@@ -136,7 +136,7 @@ function insert_with_markers( $filename, $marker, $insertion ) {
 	}
 
 	// Split out the existing file into the preceding lines, and those that appear after the marker
-	$pre_lines = $post_lines = $existing_lines = array();
+	$pre_lines    = $post_lines = $existing_lines = array();
 	$found_marker = $found_end_marker = false;
 	foreach ( $lines as $line ) {
 		if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
@@ -164,13 +164,15 @@ function insert_with_markers( $filename, $marker, $insertion ) {
 	}
 
 	// Generate the new file data
-	$new_file_data = implode( "\n", array_merge(
-		$pre_lines,
-		array( $start_marker ),
-		$insertion,
-		array( $end_marker ),
-		$post_lines
-	) );
+	$new_file_data = implode(
+		"\n", array_merge(
+			$pre_lines,
+			array( $start_marker ),
+			$insertion,
+			array( $end_marker ),
+			$post_lines
+		)
+	);
 
 	// Write to the start of the file, and truncate it to that length
 	fseek( $fp, 0 );
@@ -196,19 +198,20 @@ function insert_with_markers( $filename, $marker, $insertion ) {
  * @global WP_Rewrite $wp_rewrite
  */
 function save_mod_rewrite_rules() {
-	if ( is_multisite() )
+	if ( is_multisite() ) {
 		return;
+	}
 
 	global $wp_rewrite;
 
-	$home_path = get_home_path();
-	$htaccess_file = $home_path.'.htaccess';
+	$home_path     = get_home_path();
+	$htaccess_file = $home_path . '.htaccess';
 
 	/*
 	 * If the file doesn't already exist check for write access to the directory
 	 * and whether we have some rules. Else check for write access to the file.
 	 */
-	if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
+	if ( ( ! file_exists( $htaccess_file ) && is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks() ) || is_writable( $htaccess_file ) ) {
 		if ( got_mod_rewrite() ) {
 			$rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
 			return insert_with_markers( $htaccess_file, 'WordPress', $rules );
@@ -228,22 +231,23 @@ function save_mod_rewrite_rules() {
  *
  * @return bool True if web.config was updated successfully
  */
-function iis7_save_url_rewrite_rules(){
-	if ( is_multisite() )
+function iis7_save_url_rewrite_rules() {
+	if ( is_multisite() ) {
 		return;
+	}
 
 	global $wp_rewrite;
 
-	$home_path = get_home_path();
+	$home_path       = get_home_path();
 	$web_config_file = $home_path . 'web.config';
 
 	// Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
-	if ( iis7_supports_permalinks() && ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) ) {
-		$rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
-		if ( ! empty($rule) ) {
-			return iis7_add_rewrite_rule($web_config_file, $rule);
+	if ( iis7_supports_permalinks() && ( ( ! file_exists( $web_config_file ) && win_is_writable( $home_path ) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable( $web_config_file ) ) ) {
+		$rule = $wp_rewrite->iis7_url_rewrite_rules( false, '', '' );
+		if ( ! empty( $rule ) ) {
+			return iis7_add_rewrite_rule( $web_config_file, $rule );
 		} else {
-			return iis7_delete_rewrite_rule($web_config_file);
+			return iis7_delete_rewrite_rule( $web_config_file );
 		}
 	}
 	return false;
@@ -257,14 +261,15 @@ function iis7_save_url_rewrite_rules(){
  * @param string $file
  */
 function update_recently_edited( $file ) {
-	$oldfiles = (array ) get_option( 'recently_edited' );
+	$oldfiles = (array) get_option( 'recently_edited' );
 	if ( $oldfiles ) {
-		$oldfiles = array_reverse( $oldfiles );
+		$oldfiles   = array_reverse( $oldfiles );
 		$oldfiles[] = $file;
-		$oldfiles = array_reverse( $oldfiles );
-		$oldfiles = array_unique( $oldfiles );
-		if ( 5 < count( $oldfiles ))
+		$oldfiles   = array_reverse( $oldfiles );
+		$oldfiles   = array_unique( $oldfiles );
+		if ( 5 < count( $oldfiles ) ) {
 			array_pop( $oldfiles );
+		}
 	} else {
 		$oldfiles[] = $file;
 	}
@@ -283,7 +288,7 @@ function update_recently_edited( $file ) {
 function wp_make_theme_file_tree( $allowed_files ) {
 	$tree_list = array();
 	foreach ( $allowed_files as $file_name => $absolute_filename ) {
-		$list = explode( '/', $file_name );
+		$list     = explode( '/', $file_name );
 		$last_dir = &$tree_list;
 		foreach ( $list as $dir ) {
 			$last_dir =& $last_dir[ $dir ];
@@ -309,7 +314,7 @@ function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
 
 	if ( is_array( $tree ) ) {
 		$index = 0;
-		$size = count( $tree );
+		$size  = count( $tree );
 		foreach ( $tree as $label => $theme_file ) :
 			$index++;
 			if ( ! is_array( $theme_file ) ) {
@@ -328,9 +333,9 @@ function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
 		endforeach;
 	} else {
 		$filename = $tree;
-		$url = add_query_arg(
+		$url      = add_query_arg(
 			array(
-				'file' => rawurlencode( $tree ),
+				'file'  => rawurlencode( $tree ),
 				'theme' => rawurlencode( $stylesheet ),
 			),
 			self_admin_url( 'theme-editor.php' )
@@ -372,7 +377,7 @@ function wp_print_theme_file_tree( $tree, $level = 2, $size = 1, $index = 1 ) {
 function wp_make_plugin_file_tree( $plugin_editable_files ) {
 	$tree_list = array();
 	foreach ( $plugin_editable_files as $plugin_file ) {
-		$list = explode( '/', preg_replace( '#^.+?/#', '', $plugin_file ) );
+		$list     = explode( '/', preg_replace( '#^.+?/#', '', $plugin_file ) );
 		$last_dir = &$tree_list;
 		foreach ( $list as $dir ) {
 			$last_dir =& $last_dir[ $dir ];
@@ -398,7 +403,7 @@ function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $
 	global $file, $plugin;
 	if ( is_array( $tree ) ) {
 		$index = 0;
-		$size = count( $tree );
+		$size  = count( $tree );
 		foreach ( $tree as $label => $plugin_file ) :
 			$index++;
 			if ( ! is_array( $plugin_file ) ) {
@@ -418,7 +423,7 @@ function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $
 	} else {
 		$url = add_query_arg(
 			array(
-				'file' => rawurlencode( $tree ),
+				'file'   => rawurlencode( $tree ),
 				'plugin' => rawurlencode( $plugin ),
 			),
 			self_admin_url( 'plugin-editor.php' )
@@ -452,8 +457,9 @@ function wp_print_plugin_file_tree( $tree, $label = '', $level = 2, $size = 1, $
  * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-	if ( wp_installing() )
+	if ( wp_installing() ) {
 		return;
+	}
 
 	if ( is_multisite() && ms_is_switched() ) {
 		delete_option( 'rewrite_rules' );
@@ -495,12 +501,13 @@ function wp_reset_vars( $vars ) {
  *
  * @param string|WP_Error $message
  */
-function show_message($message) {
-	if ( is_wp_error($message) ){
-		if ( $message->get_error_data() && is_string( $message->get_error_data() ) )
+function show_message( $message ) {
+	if ( is_wp_error( $message ) ) {
+		if ( $message->get_error_data() && is_string( $message->get_error_data() ) ) {
 			$message = $message->get_error_message() . ': ' . $message->get_error_data();
-		else
+		} else {
 			$message = $message->get_error_message();
+		}
 	}
 	echo "<p>$message</p>\n";
 	wp_ob_end_flush_all();
@@ -514,15 +521,17 @@ function show_message($message) {
  * @return array
  */
 function wp_doc_link_parse( $content ) {
-	if ( !is_string( $content ) || empty( $content ) )
+	if ( ! is_string( $content ) || empty( $content ) ) {
 		return array();
+	}
 
-	if ( !function_exists('token_get_all') )
+	if ( ! function_exists( 'token_get_all' ) ) {
 		return array();
+	}
 
-	$tokens = token_get_all( $content );
-	$count = count( $tokens );
-	$functions = array();
+	$tokens           = token_get_all( $content );
+	$count            = count( $tokens );
+	$functions        = array();
 	$ignore_functions = array();
 	for ( $t = 0; $t < $count - 2; $t++ ) {
 		if ( ! is_array( $tokens[ $t ] ) ) {
@@ -532,10 +541,10 @@ function wp_doc_link_parse( $content ) {
 		if ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) {
 			// If it's a function or class defined locally, there's not going to be any docs available
 			if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ) ) ) || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] ) ) {
-				$ignore_functions[] = $tokens[$t][1];
+				$ignore_functions[] = $tokens[ $t ][1];
 			}
 			// Add this to our stack of unique references
-			$functions[] = $tokens[$t][1];
+			$functions[] = $tokens[ $t ][1];
 		}
 	}
 
@@ -555,8 +564,9 @@ function wp_doc_link_parse( $content ) {
 
 	$out = array();
 	foreach ( $functions as $function ) {
-		if ( in_array( $function, $ignore_functions ) )
+		if ( in_array( $function, $ignore_functions ) ) {
 			continue;
+		}
 		$out[] = $function;
 	}
 
@@ -570,26 +580,29 @@ function wp_doc_link_parse( $content ) {
  */
 function set_screen_options() {
 
-	if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
+	if ( isset( $_POST['wp_screen_options'] ) && is_array( $_POST['wp_screen_options'] ) ) {
 		check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
 
-		if ( !$user = wp_get_current_user() )
+		if ( ! $user = wp_get_current_user() ) {
 			return;
+		}
 		$option = $_POST['wp_screen_options']['option'];
-		$value = $_POST['wp_screen_options']['value'];
+		$value  = $_POST['wp_screen_options']['value'];
 
-		if ( $option != sanitize_key( $option ) )
+		if ( $option != sanitize_key( $option ) ) {
 			return;
+		}
 
 		$map_option = $option;
-		$type = str_replace('edit_', '', $map_option);
-		$type = str_replace('_per_page', '', $type);
-		if ( in_array( $type, get_taxonomies() ) )
+		$type       = str_replace( 'edit_', '', $map_option );
+		$type       = str_replace( '_per_page', '', $type );
+		if ( in_array( $type, get_taxonomies() ) ) {
 			$map_option = 'edit_tags_per_page';
-		elseif ( in_array( $type, get_post_types() ) )
+		} elseif ( in_array( $type, get_post_types() ) ) {
 			$map_option = 'edit_per_page';
-		else
-			$option = str_replace('-', '_', $option);
+		} else {
+			$option = str_replace( '-', '_', $option );
+		}
 
 		switch ( $map_option ) {
 			case 'edit_per_page':
@@ -598,7 +611,7 @@ function set_screen_options() {
 			case 'upload_per_page':
 			case 'edit_tags_per_page':
 			case 'plugins_per_page':
-			// Network admin
+				// Network admin
 			case 'sites_network_per_page':
 			case 'users_network_per_page':
 			case 'site_users_network_per_page':
@@ -606,11 +619,11 @@ function set_screen_options() {
 			case 'themes_network_per_page':
 			case 'site_themes_network_per_page':
 				$value = (int) $value;
-				if ( $value < 1 || $value > 999 )
+				if ( $value < 1 || $value > 999 ) {
 					return;
+				}
 				break;
 			default:
-
 				/**
 				 * Filters a screen option value before it is set.
 				 *
@@ -629,12 +642,13 @@ function set_screen_options() {
 				 */
 				$value = apply_filters( 'set-screen-option', false, $option, $value );
 
-				if ( false === $value )
+				if ( false === $value ) {
 					return;
+				}
 				break;
 		}
 
-		update_user_meta($user->ID, $option, $value);
+		update_user_meta( $user->ID, $option, $value );
 
 		$url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
 		if ( isset( $_POST['mode'] ) ) {
@@ -654,22 +668,25 @@ function set_screen_options() {
  * @return bool
  * @param string $filename The file path to the configuration file
  */
-function iis7_rewrite_rule_exists($filename) {
-	if ( ! file_exists($filename) )
+function iis7_rewrite_rule_exists( $filename ) {
+	if ( ! file_exists( $filename ) ) {
 		return false;
+	}
 	if ( ! class_exists( 'DOMDocument', false ) ) {
 		return false;
 	}
 
 	$doc = new DOMDocument();
-	if ( $doc->load($filename) === false )
+	if ( $doc->load( $filename ) === false ) {
 		return false;
-	$xpath = new DOMXPath($doc);
-	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
-	if ( $rules->length == 0 )
+	}
+	$xpath = new DOMXPath( $doc );
+	$rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+	if ( $rules->length == 0 ) {
 		return false;
-	else
+	} else {
 		return true;
+	}
 }
 
 /**
@@ -680,28 +697,30 @@ function iis7_rewrite_rule_exists($filename) {
  * @param string $filename Name of the configuration file
  * @return bool
  */
-function iis7_delete_rewrite_rule($filename) {
+function iis7_delete_rewrite_rule( $filename ) {
 	// If configuration file does not exist then rules also do not exist so there is nothing to delete
-	if ( ! file_exists($filename) )
+	if ( ! file_exists( $filename ) ) {
 		return true;
+	}
 
 	if ( ! class_exists( 'DOMDocument', false ) ) {
 		return false;
 	}
 
-	$doc = new DOMDocument();
+	$doc                     = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc -> load($filename) === false )
+	if ( $doc->load( $filename ) === false ) {
 		return false;
-	$xpath = new DOMXPath($doc);
-	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
+	}
+	$xpath = new DOMXPath( $doc );
+	$rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
 	if ( $rules->length > 0 ) {
-		$child = $rules->item(0);
+		$child  = $rules->item( 0 );
 		$parent = $child->parentNode;
-		$parent->removeChild($child);
+		$parent->removeChild( $child );
 		$doc->formatOutput = true;
-		saveDomDocument($doc, $filename);
+		saveDomDocument( $doc, $filename );
 	}
 	return true;
 }
@@ -715,74 +734,76 @@ function iis7_delete_rewrite_rule($filename) {
  * @param string $rewrite_rule The XML fragment with URL Rewrite rule
  * @return bool
  */
-function iis7_add_rewrite_rule($filename, $rewrite_rule) {
+function iis7_add_rewrite_rule( $filename, $rewrite_rule ) {
 	if ( ! class_exists( 'DOMDocument', false ) ) {
 		return false;
 	}
 
 	// If configuration file does not exist then we create one.
-	if ( ! file_exists($filename) ) {
-		$fp = fopen( $filename, 'w');
-		fwrite($fp, '<configuration/>');
-		fclose($fp);
+	if ( ! file_exists( $filename ) ) {
+		$fp = fopen( $filename, 'w' );
+		fwrite( $fp, '<configuration/>' );
+		fclose( $fp );
 	}
 
-	$doc = new DOMDocument();
+	$doc                     = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc->load($filename) === false )
+	if ( $doc->load( $filename ) === false ) {
 		return false;
+	}
 
-	$xpath = new DOMXPath($doc);
+	$xpath = new DOMXPath( $doc );
 
 	// First check if the rule already exists as in that case there is no need to re-add it
-	$wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]');
-	if ( $wordpress_rules->length > 0 )
+	$wordpress_rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
+	if ( $wordpress_rules->length > 0 ) {
 		return true;
+	}
 
 	// Check the XPath to the rewrite rule and create XML nodes if they do not exist
-	$xmlnodes = $xpath->query('/configuration/system.webServer/rewrite/rules');
+	$xmlnodes = $xpath->query( '/configuration/system.webServer/rewrite/rules' );
 	if ( $xmlnodes->length > 0 ) {
-		$rules_node = $xmlnodes->item(0);
+		$rules_node = $xmlnodes->item( 0 );
 	} else {
-		$rules_node = $doc->createElement('rules');
+		$rules_node = $doc->createElement( 'rules' );
 
-		$xmlnodes = $xpath->query('/configuration/system.webServer/rewrite');
+		$xmlnodes = $xpath->query( '/configuration/system.webServer/rewrite' );
 		if ( $xmlnodes->length > 0 ) {
-			$rewrite_node = $xmlnodes->item(0);
-			$rewrite_node->appendChild($rules_node);
+			$rewrite_node = $xmlnodes->item( 0 );
+			$rewrite_node->appendChild( $rules_node );
 		} else {
-			$rewrite_node = $doc->createElement('rewrite');
-			$rewrite_node->appendChild($rules_node);
+			$rewrite_node = $doc->createElement( 'rewrite' );
+			$rewrite_node->appendChild( $rules_node );
 
-			$xmlnodes = $xpath->query('/configuration/system.webServer');
+			$xmlnodes = $xpath->query( '/configuration/system.webServer' );
 			if ( $xmlnodes->length > 0 ) {
-				$system_webServer_node = $xmlnodes->item(0);
-				$system_webServer_node->appendChild($rewrite_node);
+				$system_webServer_node = $xmlnodes->item( 0 );
+				$system_webServer_node->appendChild( $rewrite_node );
 			} else {
-				$system_webServer_node = $doc->createElement('system.webServer');
-				$system_webServer_node->appendChild($rewrite_node);
+				$system_webServer_node = $doc->createElement( 'system.webServer' );
+				$system_webServer_node->appendChild( $rewrite_node );
 
-				$xmlnodes = $xpath->query('/configuration');
+				$xmlnodes = $xpath->query( '/configuration' );
 				if ( $xmlnodes->length > 0 ) {
-					$config_node = $xmlnodes->item(0);
-					$config_node->appendChild($system_webServer_node);
+					$config_node = $xmlnodes->item( 0 );
+					$config_node->appendChild( $system_webServer_node );
 				} else {
-					$config_node = $doc->createElement('configuration');
-					$doc->appendChild($config_node);
-					$config_node->appendChild($system_webServer_node);
+					$config_node = $doc->createElement( 'configuration' );
+					$doc->appendChild( $config_node );
+					$config_node->appendChild( $system_webServer_node );
 				}
 			}
 		}
 	}
 
 	$rule_fragment = $doc->createDocumentFragment();
-	$rule_fragment->appendXML($rewrite_rule);
-	$rules_node->appendChild($rule_fragment);
+	$rule_fragment->appendXML( $rewrite_rule );
+	$rules_node->appendChild( $rule_fragment );
 
-	$doc->encoding = "UTF-8";
+	$doc->encoding     = 'UTF-8';
 	$doc->formatOutput = true;
-	saveDomDocument($doc, $filename);
+	saveDomDocument( $doc, $filename );
 
 	return true;
 }
@@ -795,12 +816,12 @@ function iis7_add_rewrite_rule($filename, $rewrite_rule) {
  * @param DOMDocument $doc
  * @param string $filename
  */
-function saveDomDocument($doc, $filename) {
+function saveDomDocument( $doc, $filename ) {
 	$config = $doc->saveXML();
-	$config = preg_replace("/([^\r])\n/", "$1\r\n", $config);
-	$fp = fopen($filename, 'w');
-	fwrite($fp, $config);
-	fclose($fp);
+	$config = preg_replace( "/([^\r])\n/", "$1\r\n", $config );
+	$fp     = fopen( $filename, 'w' );
+	fwrite( $fp, $config );
+	fclose( $fp );
 }
 
 /**
@@ -819,7 +840,14 @@ function admin_color_scheme_picker( $user_id ) {
 
 	if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
 		// Set Default ('fresh') and Light should go first.
-		$_wp_admin_css_colors = array_filter( array_merge( array( 'fresh' => '', 'light' => '' ), $_wp_admin_css_colors ) );
+		$_wp_admin_css_colors = array_filter(
+			array_merge(
+				array(
+					'fresh' => '',
+					'light' => '',
+				), $_wp_admin_css_colors
+			)
+		);
 	}
 
 	$current_color = get_user_option( 'admin_color', $user_id );
@@ -865,7 +893,6 @@ function admin_color_scheme_picker( $user_id ) {
 }
 
 /**
- *
  * @global array $_wp_admin_css_colors
  */
 function wp_color_scheme_settings() {
@@ -884,7 +911,11 @@ function wp_color_scheme_settings() {
 		$icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
 	} else {
 		// Fall back to the default set of icon colors if the default scheme is missing.
-		$icon_colors = array( 'base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff' );
+		$icon_colors = array(
+			'base'    => '#82878c',
+			'focus'   => '#00a0d2',
+			'current' => '#fff',
+		);
 	}
 
 	echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
@@ -916,22 +947,25 @@ function wp_check_locked_posts( $response, $data, $screen_id ) {
 
 	if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
 		foreach ( $data['wp-check-locked-posts'] as $key ) {
-			if ( ! $post_id = absint( substr( $key, 5 ) ) )
+			if ( ! $post_id = absint( substr( $key, 5 ) ) ) {
 				continue;
+			}
 
 			if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
 				$send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
 
-				if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+				if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
 					$send['avatar_src'] = $matches[1];
+				}
 
-				$checked[$key] = $send;
+				$checked[ $key ] = $send;
 			}
 		}
 	}
 
-	if ( ! empty( $checked ) )
+	if ( ! empty( $checked ) ) {
 		$response['wp-check-locked-posts'] = $checked;
+	}
 
 	return $response;
 }
@@ -949,28 +983,32 @@ function wp_check_locked_posts( $response, $data, $screen_id ) {
 function wp_refresh_post_lock( $response, $data, $screen_id ) {
 	if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
 		$received = $data['wp-refresh-post-lock'];
-		$send = array();
+		$send     = array();
 
-		if ( ! $post_id = absint( $received['post_id'] ) )
+		if ( ! $post_id = absint( $received['post_id'] ) ) {
 			return $response;
+		}
 
-		if ( ! current_user_can('edit_post', $post_id) )
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return $response;
+		}
 
 		if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
 			$error = array(
-				'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
+				'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name ),
 			);
 
 			if ( $avatar = get_avatar( $user->ID, 64 ) ) {
-				if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+				if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
 					$error['avatar_src'] = $matches[1];
+				}
 			}
 
 			$send['lock_error'] = $error;
 		} else {
-			if ( $new_lock = wp_set_post_lock( $post_id ) )
+			if ( $new_lock = wp_set_post_lock( $post_id ) ) {
 				$send['new_lock'] = implode( ':', $new_lock );
+			}
 		}
 
 		$response['wp-refresh-post-lock'] = $send;
@@ -991,7 +1029,7 @@ function wp_refresh_post_lock( $response, $data, $screen_id ) {
  */
 function wp_refresh_post_nonces( $response, $data, $screen_id ) {
 	if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
-		$received = $data['wp-refresh-post-nonces'];
+		$received                           = $data['wp-refresh-post-nonces'];
 		$response['wp-refresh-post-nonces'] = array( 'check' => 1 );
 
 		if ( ! $post_id = absint( $received['post_id'] ) ) {
@@ -1003,12 +1041,12 @@ function wp_refresh_post_nonces( $response, $data, $screen_id ) {
 		}
 
 		$response['wp-refresh-post-nonces'] = array(
-			'replace' => array(
-				'getpermalinknonce' => wp_create_nonce('getpermalink'),
-				'samplepermalinknonce' => wp_create_nonce('samplepermalink'),
-				'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
-				'_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
-				'_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+			'replace'        => array(
+				'getpermalinknonce'    => wp_create_nonce( 'getpermalink' ),
+				'samplepermalinknonce' => wp_create_nonce( 'samplepermalink' ),
+				'closedpostboxesnonce' => wp_create_nonce( 'closedpostboxes' ),
+				'_ajax_linking_nonce'  => wp_create_nonce( 'internal-linking' ),
+				'_wpnonce'             => wp_create_nonce( 'update-post_' . $post_id ),
 			),
 			'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
 		);
@@ -1051,14 +1089,23 @@ function heartbeat_autosave( $response, $data ) {
 		$saved = wp_autosave( $data['wp_autosave'] );
 
 		if ( is_wp_error( $saved ) ) {
-			$response['wp_autosave'] = array( 'success' => false, 'message' => $saved->get_error_message() );
+			$response['wp_autosave'] = array(
+				'success' => false,
+				'message' => $saved->get_error_message(),
+			);
 		} elseif ( empty( $saved ) ) {
-			$response['wp_autosave'] = array( 'success' => false, 'message' => __( 'Error while saving.' ) );
+			$response['wp_autosave'] = array(
+				'success' => false,
+				'message' => __( 'Error while saving.' ),
+			);
 		} else {
 			/* translators: draft saved date format, see https://secure.php.net/date */
 			$draft_saved_date_format = __( 'g:i:s a' );
 			/* translators: %s: date and time */
-			$response['wp_autosave'] = array( 'success' => true, 'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ) );
+			$response['wp_autosave'] = array(
+				'success' => true,
+				'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ),
+			);
 		}
 	}
 
@@ -1148,7 +1195,7 @@ function update_option_new_admin_email( $old_value, $value ) {
 		return;
 	}
 
-	$hash = md5( $value . time() . mt_rand() );
+	$hash            = md5( $value . time() . mt_rand() );
 	$new_admin_email = array(
 		'hash'     => $hash,
 		'newemail' => $value,
@@ -1158,7 +1205,8 @@ function update_option_new_admin_email( $old_value, $value ) {
 	$switched_locale = switch_to_locale( get_user_locale() );
 
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-	$email_text = __( 'Howdy ###USERNAME###,
+	$email_text = __(
+		'Howdy ###USERNAME###,
 
 You recently requested to have the administration email address on
 your site changed.
@@ -1173,7 +1221,8 @@ This email has been sent to ###EMAIL###
 
 Regards,
 All at ###SITENAME###
-###SITEURL###' );
+###SITEURL###'
+	);
 
 	/**
 	 * Filters the text of the email sent when a change of site admin email address is attempted.
@@ -1199,11 +1248,11 @@ All at ###SITENAME###
 	$content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
 
 	$current_user = wp_get_current_user();
-	$content = str_replace( '###USERNAME###', $current_user->user_login, $content );
-	$content = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash=' . $hash ) ), $content );
-	$content = str_replace( '###EMAIL###', $value, $content );
-	$content = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
-	$content = str_replace( '###SITEURL###', home_url(), $content );
+	$content      = str_replace( '###USERNAME###', $current_user->user_login, $content );
+	$content      = str_replace( '###ADMIN_URL###', esc_url( self_admin_url( 'options.php?adminhash=' . $hash ) ), $content );
+	$content      = str_replace( '###EMAIL###', $value, $content );
+	$content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), $content );
+	$content      = str_replace( '###SITEURL###', home_url(), $content );
 
 	wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ), $content );
 
diff --git a/wp-admin/includes/ms-admin-filters.php b/wp-admin/includes/ms-admin-filters.php
index 02fbf68b3c..dd4cf9e38b 100644
--- a/wp-admin/includes/ms-admin-filters.php
+++ b/wp-admin/includes/ms-admin-filters.php
@@ -32,13 +32,13 @@ add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2
 add_filter( 'import_allow_create_users', 'check_import_new_users' );
 
 // Notices Hooks
-add_action( 'admin_notices',         'site_admin_notice' );
+add_action( 'admin_notices', 'site_admin_notice' );
 add_action( 'network_admin_notices', 'site_admin_notice' );
 
 // Update Hooks
-add_action( 'network_admin_notices', 'update_nag',      3  );
+add_action( 'network_admin_notices', 'update_nag', 3 );
 add_action( 'network_admin_notices', 'maintenance_nag', 10 );
 
 // Network Admin Hooks
-add_action( 'add_site_option_new_admin_email',    'update_network_option_new_admin_email', 10, 2 );
+add_action( 'add_site_option_new_admin_email', 'update_network_option_new_admin_email', 10, 2 );
 add_action( 'update_site_option_new_admin_email', 'update_network_option_new_admin_email', 10, 2 );
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 220d6323e3..6d9af2564f 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -16,14 +16,17 @@
  * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
  */
 function check_upload_size( $file ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
 		return $file;
+	}
 
-	if ( $file['error'] != '0' ) // there's already an error
+	if ( $file['error'] != '0' ) { // there's already an error
 		return $file;
+	}
 
-	if ( defined( 'WP_IMPORTING' ) )
+	if ( defined( 'WP_IMPORTING' ) ) {
 		return $file;
+	}
 
 	$space_left = get_upload_space_available();
 
@@ -79,7 +82,12 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 	 */
 	do_action( 'delete_blog', $blog_id, $drop );
 
-	$users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
+	$users = get_users(
+		array(
+			'blog_id' => $blog_id,
+			'fields'  => 'ids',
+		)
+	);
 
 	// Remove users from this blog.
 	if ( ! empty( $users ) ) {
@@ -137,21 +145,22 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 		 * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
 		 * @param int    $blog_id            The site ID.
 		 */
-		$dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
-		$dir = rtrim( $dir, DIRECTORY_SEPARATOR );
+		$dir     = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
+		$dir     = rtrim( $dir, DIRECTORY_SEPARATOR );
 		$top_dir = $dir;
-		$stack = array($dir);
-		$index = 0;
+		$stack   = array( $dir );
+		$index   = 0;
 
 		while ( $index < count( $stack ) ) {
 			// Get indexed directory from stack
-			$dir = $stack[$index];
+			$dir = $stack[ $index ];
 
 			$dh = @opendir( $dir );
 			if ( $dh ) {
 				while ( ( $file = @readdir( $dh ) ) !== false ) {
-					if ( $file == '.' || $file == '..' )
+					if ( $file == '.' || $file == '..' ) {
 						continue;
+					}
 
 					if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
 						$stack[] = $dir . DIRECTORY_SEPARATOR . $file;
@@ -166,8 +175,9 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 
 		$stack = array_reverse( $stack ); // Last added dirs are deepest
 		foreach ( (array) $stack as $dir ) {
-			if ( $dir != $top_dir)
-			@rmdir( $dir );
+			if ( $dir != $top_dir ) {
+				@rmdir( $dir );
+			}
 		}
 
 		clean_blog_cache( $blog );
@@ -183,8 +193,9 @@ function wpmu_delete_blog( $blog_id, $drop = false ) {
 	 */
 	do_action( 'deleted_blog', $blog_id, $drop );
 
-	if ( $switch )
+	if ( $switch ) {
 		restore_current_blog();
+	}
 }
 
 /**
@@ -206,11 +217,12 @@ function wpmu_delete_user( $id ) {
 		return false;
 	}
 
-	$id = (int) $id;
+	$id   = (int) $id;
 	$user = new WP_User( $id );
 
-	if ( !$user->exists() )
+	if ( ! $user->exists() ) {
 		return false;
+	}
 
 	// Global super-administrators are protected, and cannot be deleted.
 	$_super_admins = get_super_admins();
@@ -243,8 +255,9 @@ function wpmu_delete_user( $id ) {
 			$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
 
 			if ( $link_ids ) {
-				foreach ( $link_ids as $link_id )
+				foreach ( $link_ids as $link_id ) {
 					wp_delete_link( $link_id );
+				}
 			}
 
 			restore_current_blog();
@@ -252,8 +265,9 @@ function wpmu_delete_user( $id ) {
 	}
 
 	$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-	foreach ( $meta as $mid )
+	foreach ( $meta as $mid ) {
 		delete_metadata_by_mid( 'user', $mid );
+	}
 
 	$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
 
@@ -274,8 +288,9 @@ function wpmu_delete_user( $id ) {
  * @return bool True if user is over upload space quota, otherwise false.
  */
 function upload_is_user_over_quota( $echo = true ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
 		return false;
+	}
 
 	$space_allowed = get_space_allowed();
 	if ( ! is_numeric( $space_allowed ) ) {
@@ -284,8 +299,9 @@ function upload_is_user_over_quota( $echo = true ) {
 	$space_used = get_space_used();
 
 	if ( ( $space_allowed - $space_used ) < 0 ) {
-		if ( $echo )
+		if ( $echo ) {
 			_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+		}
 		return true;
 	} else {
 		return false;
@@ -299,7 +315,7 @@ function upload_is_user_over_quota( $echo = true ) {
  */
 function display_space_usage() {
 	$space_allowed = get_space_allowed();
-	$space_used = get_space_used();
+	$space_used    = get_space_used();
 
 	$percent_used = ( $space_used / $space_allowed ) * 100;
 
@@ -313,10 +329,12 @@ function display_space_usage() {
 		$space .= __( 'MB' );
 	}
 	?>
-	<strong><?php
+	<strong>
+	<?php
 		/* translators: Storage space that's been used. 1: Percentage of used space, 2: Total space allowed in megabytes or gigabytes */
 		printf( __( 'Used: %1$s%% of %2$s' ), number_format( $percent_used ), $space );
-	?></strong>
+	?>
+	</strong>
 	<?php
 }
 
@@ -348,8 +366,9 @@ function upload_space_setting( $id ) {
 	$quota = get_option( 'blog_upload_space' );
 	restore_current_blog();
 
-	if ( !$quota )
+	if ( ! $quota ) {
 		$quota = '';
+	}
 
 	?>
 	<tr>
@@ -381,8 +400,9 @@ function upload_space_setting( $id ) {
 function update_user_status( $id, $pref, $value, $deprecated = null ) {
 	global $wpdb;
 
-	if ( null !== $deprecated )
+	if ( null !== $deprecated ) {
 		_deprecated_argument( __FUNCTION__, '3.0.2' );
+	}
 
 	$wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
 
@@ -425,8 +445,9 @@ function update_user_status( $id, $pref, $value, $deprecated = null ) {
 function refresh_user_details( $id ) {
 	$id = (int) $id;
 
-	if ( !$user = get_userdata( $id ) )
+	if ( ! $user = get_userdata( $id ) ) {
 		return false;
+	}
 
 	clean_user_cache( $user );
 
@@ -443,19 +464,194 @@ function refresh_user_details( $id ) {
  *                then the first two letters of $code is returned.
  */
 function format_code_lang( $code = '' ) {
-	$code = strtolower( substr( $code, 0, 2 ) );
+	$code       = strtolower( substr( $code, 0, 2 ) );
 	$lang_codes = array(
-		'aa' => 'Afar', 'ab' => 'Abkhazian', 'af' => 'Afrikaans', 'ak' => 'Akan', 'sq' => 'Albanian', 'am' => 'Amharic', 'ar' => 'Arabic', 'an' => 'Aragonese', 'hy' => 'Armenian', 'as' => 'Assamese', 'av' => 'Avaric', 'ae' => 'Avestan', 'ay' => 'Aymara', 'az' => 'Azerbaijani', 'ba' => 'Bashkir', 'bm' => 'Bambara', 'eu' => 'Basque', 'be' => 'Belarusian', 'bn' => 'Bengali',
-		'bh' => 'Bihari', 'bi' => 'Bislama', 'bs' => 'Bosnian', 'br' => 'Breton', 'bg' => 'Bulgarian', 'my' => 'Burmese', 'ca' => 'Catalan; Valencian', 'ch' => 'Chamorro', 'ce' => 'Chechen', 'zh' => 'Chinese', 'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic', 'cv' => 'Chuvash', 'kw' => 'Cornish', 'co' => 'Corsican', 'cr' => 'Cree',
-		'cs' => 'Czech', 'da' => 'Danish', 'dv' => 'Divehi; Dhivehi; Maldivian', 'nl' => 'Dutch; Flemish', 'dz' => 'Dzongkha', 'en' => 'English', 'eo' => 'Esperanto', 'et' => 'Estonian', 'ee' => 'Ewe', 'fo' => 'Faroese', 'fj' => 'Fijjian', 'fi' => 'Finnish', 'fr' => 'French', 'fy' => 'Western Frisian', 'ff' => 'Fulah', 'ka' => 'Georgian', 'de' => 'German', 'gd' => 'Gaelic; Scottish Gaelic',
-		'ga' => 'Irish', 'gl' => 'Galician', 'gv' => 'Manx', 'el' => 'Greek, Modern', 'gn' => 'Guarani', 'gu' => 'Gujarati', 'ht' => 'Haitian; Haitian Creole', 'ha' => 'Hausa', 'he' => 'Hebrew', 'hz' => 'Herero', 'hi' => 'Hindi', 'ho' => 'Hiri Motu', 'hu' => 'Hungarian', 'ig' => 'Igbo', 'is' => 'Icelandic', 'io' => 'Ido', 'ii' => 'Sichuan Yi', 'iu' => 'Inuktitut', 'ie' => 'Interlingue',
-		'ia' => 'Interlingua (International Auxiliary Language Association)', 'id' => 'Indonesian', 'ik' => 'Inupiaq', 'it' => 'Italian', 'jv' => 'Javanese', 'ja' => 'Japanese', 'kl' => 'Kalaallisut; Greenlandic', 'kn' => 'Kannada', 'ks' => 'Kashmiri', 'kr' => 'Kanuri', 'kk' => 'Kazakh', 'km' => 'Central Khmer', 'ki' => 'Kikuyu; Gikuyu', 'rw' => 'Kinyarwanda', 'ky' => 'Kirghiz; Kyrgyz',
-		'kv' => 'Komi', 'kg' => 'Kongo', 'ko' => 'Korean', 'kj' => 'Kuanyama; Kwanyama', 'ku' => 'Kurdish', 'lo' => 'Lao', 'la' => 'Latin', 'lv' => 'Latvian', 'li' => 'Limburgan; Limburger; Limburgish', 'ln' => 'Lingala', 'lt' => 'Lithuanian', 'lb' => 'Luxembourgish; Letzeburgesch', 'lu' => 'Luba-Katanga', 'lg' => 'Ganda', 'mk' => 'Macedonian', 'mh' => 'Marshallese', 'ml' => 'Malayalam',
-		'mi' => 'Maori', 'mr' => 'Marathi', 'ms' => 'Malay', 'mg' => 'Malagasy', 'mt' => 'Maltese', 'mo' => 'Moldavian', 'mn' => 'Mongolian', 'na' => 'Nauru', 'nv' => 'Navajo; Navaho', 'nr' => 'Ndebele, South; South Ndebele', 'nd' => 'Ndebele, North; North Ndebele', 'ng' => 'Ndonga', 'ne' => 'Nepali', 'nn' => 'Norwegian Nynorsk; Nynorsk, Norwegian', 'nb' => 'Bokmål, Norwegian, Norwegian Bokmål',
-		'no' => 'Norwegian', 'ny' => 'Chichewa; Chewa; Nyanja', 'oc' => 'Occitan, Provençal', 'oj' => 'Ojibwa', 'or' => 'Oriya', 'om' => 'Oromo', 'os' => 'Ossetian; Ossetic', 'pa' => 'Panjabi; Punjabi', 'fa' => 'Persian', 'pi' => 'Pali', 'pl' => 'Polish', 'pt' => 'Portuguese', 'ps' => 'Pushto', 'qu' => 'Quechua', 'rm' => 'Romansh', 'ro' => 'Romanian', 'rn' => 'Rundi', 'ru' => 'Russian',
-		'sg' => 'Sango', 'sa' => 'Sanskrit', 'sr' => 'Serbian', 'hr' => 'Croatian', 'si' => 'Sinhala; Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho, Southern', 'es' => 'Spanish; Castilian', 'sc' => 'Sardinian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili',
-		'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'bo' => 'Tibetan', 'ti' => 'Tigrinya', 'to' => 'Tonga (Tonga Islands)', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur; Uyghur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek',
-		've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh','wa' => 'Walloon','wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' );
+		'aa' => 'Afar',
+		'ab' => 'Abkhazian',
+		'af' => 'Afrikaans',
+		'ak' => 'Akan',
+		'sq' => 'Albanian',
+		'am' => 'Amharic',
+		'ar' => 'Arabic',
+		'an' => 'Aragonese',
+		'hy' => 'Armenian',
+		'as' => 'Assamese',
+		'av' => 'Avaric',
+		'ae' => 'Avestan',
+		'ay' => 'Aymara',
+		'az' => 'Azerbaijani',
+		'ba' => 'Bashkir',
+		'bm' => 'Bambara',
+		'eu' => 'Basque',
+		'be' => 'Belarusian',
+		'bn' => 'Bengali',
+		'bh' => 'Bihari',
+		'bi' => 'Bislama',
+		'bs' => 'Bosnian',
+		'br' => 'Breton',
+		'bg' => 'Bulgarian',
+		'my' => 'Burmese',
+		'ca' => 'Catalan; Valencian',
+		'ch' => 'Chamorro',
+		'ce' => 'Chechen',
+		'zh' => 'Chinese',
+		'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic',
+		'cv' => 'Chuvash',
+		'kw' => 'Cornish',
+		'co' => 'Corsican',
+		'cr' => 'Cree',
+		'cs' => 'Czech',
+		'da' => 'Danish',
+		'dv' => 'Divehi; Dhivehi; Maldivian',
+		'nl' => 'Dutch; Flemish',
+		'dz' => 'Dzongkha',
+		'en' => 'English',
+		'eo' => 'Esperanto',
+		'et' => 'Estonian',
+		'ee' => 'Ewe',
+		'fo' => 'Faroese',
+		'fj' => 'Fijjian',
+		'fi' => 'Finnish',
+		'fr' => 'French',
+		'fy' => 'Western Frisian',
+		'ff' => 'Fulah',
+		'ka' => 'Georgian',
+		'de' => 'German',
+		'gd' => 'Gaelic; Scottish Gaelic',
+		'ga' => 'Irish',
+		'gl' => 'Galician',
+		'gv' => 'Manx',
+		'el' => 'Greek, Modern',
+		'gn' => 'Guarani',
+		'gu' => 'Gujarati',
+		'ht' => 'Haitian; Haitian Creole',
+		'ha' => 'Hausa',
+		'he' => 'Hebrew',
+		'hz' => 'Herero',
+		'hi' => 'Hindi',
+		'ho' => 'Hiri Motu',
+		'hu' => 'Hungarian',
+		'ig' => 'Igbo',
+		'is' => 'Icelandic',
+		'io' => 'Ido',
+		'ii' => 'Sichuan Yi',
+		'iu' => 'Inuktitut',
+		'ie' => 'Interlingue',
+		'ia' => 'Interlingua (International Auxiliary Language Association)',
+		'id' => 'Indonesian',
+		'ik' => 'Inupiaq',
+		'it' => 'Italian',
+		'jv' => 'Javanese',
+		'ja' => 'Japanese',
+		'kl' => 'Kalaallisut; Greenlandic',
+		'kn' => 'Kannada',
+		'ks' => 'Kashmiri',
+		'kr' => 'Kanuri',
+		'kk' => 'Kazakh',
+		'km' => 'Central Khmer',
+		'ki' => 'Kikuyu; Gikuyu',
+		'rw' => 'Kinyarwanda',
+		'ky' => 'Kirghiz; Kyrgyz',
+		'kv' => 'Komi',
+		'kg' => 'Kongo',
+		'ko' => 'Korean',
+		'kj' => 'Kuanyama; Kwanyama',
+		'ku' => 'Kurdish',
+		'lo' => 'Lao',
+		'la' => 'Latin',
+		'lv' => 'Latvian',
+		'li' => 'Limburgan; Limburger; Limburgish',
+		'ln' => 'Lingala',
+		'lt' => 'Lithuanian',
+		'lb' => 'Luxembourgish; Letzeburgesch',
+		'lu' => 'Luba-Katanga',
+		'lg' => 'Ganda',
+		'mk' => 'Macedonian',
+		'mh' => 'Marshallese',
+		'ml' => 'Malayalam',
+		'mi' => 'Maori',
+		'mr' => 'Marathi',
+		'ms' => 'Malay',
+		'mg' => 'Malagasy',
+		'mt' => 'Maltese',
+		'mo' => 'Moldavian',
+		'mn' => 'Mongolian',
+		'na' => 'Nauru',
+		'nv' => 'Navajo; Navaho',
+		'nr' => 'Ndebele, South; South Ndebele',
+		'nd' => 'Ndebele, North; North Ndebele',
+		'ng' => 'Ndonga',
+		'ne' => 'Nepali',
+		'nn' => 'Norwegian Nynorsk; Nynorsk, Norwegian',
+		'nb' => 'Bokmål, Norwegian, Norwegian Bokmål',
+		'no' => 'Norwegian',
+		'ny' => 'Chichewa; Chewa; Nyanja',
+		'oc' => 'Occitan, Provençal',
+		'oj' => 'Ojibwa',
+		'or' => 'Oriya',
+		'om' => 'Oromo',
+		'os' => 'Ossetian; Ossetic',
+		'pa' => 'Panjabi; Punjabi',
+		'fa' => 'Persian',
+		'pi' => 'Pali',
+		'pl' => 'Polish',
+		'pt' => 'Portuguese',
+		'ps' => 'Pushto',
+		'qu' => 'Quechua',
+		'rm' => 'Romansh',
+		'ro' => 'Romanian',
+		'rn' => 'Rundi',
+		'ru' => 'Russian',
+		'sg' => 'Sango',
+		'sa' => 'Sanskrit',
+		'sr' => 'Serbian',
+		'hr' => 'Croatian',
+		'si' => 'Sinhala; Sinhalese',
+		'sk' => 'Slovak',
+		'sl' => 'Slovenian',
+		'se' => 'Northern Sami',
+		'sm' => 'Samoan',
+		'sn' => 'Shona',
+		'sd' => 'Sindhi',
+		'so' => 'Somali',
+		'st' => 'Sotho, Southern',
+		'es' => 'Spanish; Castilian',
+		'sc' => 'Sardinian',
+		'ss' => 'Swati',
+		'su' => 'Sundanese',
+		'sw' => 'Swahili',
+		'sv' => 'Swedish',
+		'ty' => 'Tahitian',
+		'ta' => 'Tamil',
+		'tt' => 'Tatar',
+		'te' => 'Telugu',
+		'tg' => 'Tajik',
+		'tl' => 'Tagalog',
+		'th' => 'Thai',
+		'bo' => 'Tibetan',
+		'ti' => 'Tigrinya',
+		'to' => 'Tonga (Tonga Islands)',
+		'tn' => 'Tswana',
+		'ts' => 'Tsonga',
+		'tk' => 'Turkmen',
+		'tr' => 'Turkish',
+		'tw' => 'Twi',
+		'ug' => 'Uighur; Uyghur',
+		'uk' => 'Ukrainian',
+		'ur' => 'Urdu',
+		'uz' => 'Uzbek',
+		've' => 'Venda',
+		'vi' => 'Vietnamese',
+		'vo' => 'Volapük',
+		'cy' => 'Welsh',
+		'wa' => 'Walloon',
+		'wo' => 'Wolof',
+		'xh' => 'Xhosa',
+		'yi' => 'Yiddish',
+		'yo' => 'Yoruba',
+		'za' => 'Zhuang; Chuang',
+		'zu' => 'Zulu',
+	);
 
 	/**
 	 * Filters the language codes.
@@ -500,30 +696,33 @@ function sync_category_tag_slugs( $term, $taxonomy ) {
  * @access private
  */
 function _access_denied_splash() {
-	if ( ! is_user_logged_in() || is_network_admin() )
+	if ( ! is_user_logged_in() || is_network_admin() ) {
 		return;
+	}
 
 	$blogs = get_blogs_of_user( get_current_user_id() );
 
-	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) )
+	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) ) {
 		return;
+	}
 
 	$blog_name = get_bloginfo( 'name' );
 
-	if ( empty( $blogs ) )
+	if ( empty( $blogs ) ) {
 		wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
+	}
 
-	$output = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
+	$output  = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
 	$output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
 
-	$output .= '<h3>' . __('Your Sites') . '</h3>';
+	$output .= '<h3>' . __( 'Your Sites' ) . '</h3>';
 	$output .= '<table>';
 
 	foreach ( $blogs as $blog ) {
 		$output .= '<tr>';
 		$output .= "<td>{$blog->blogname}</td>";
 		$output .= '<td><a href="' . esc_url( get_admin_url( $blog->userblog_id ) ) . '">' . __( 'Visit Dashboard' ) . '</a> | ' .
-			'<a href="' . esc_url( get_home_url( $blog->userblog_id ) ). '">' . __( 'View Site' ) . '</a></td>';
+			'<a href="' . esc_url( get_home_url( $blog->userblog_id ) ) . '">' . __( 'View Site' ) . '</a></td>';
 		$output .= '</tr>';
 	}
 
@@ -558,29 +757,29 @@ function check_import_new_users( $permission ) {
  * @param string $current    Optional. The current language code. Default empty.
  */
 function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
-	$flag = false;
+	$flag   = false;
 	$output = array();
 
 	foreach ( (array) $lang_files as $val ) {
 		$code_lang = basename( $val, '.mo' );
 
 		if ( $code_lang == 'en_US' ) { // American English
-			$flag = true;
-			$ae = __( 'American English' );
-			$output[$ae] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $ae . '</option>';
+			$flag          = true;
+			$ae            = __( 'American English' );
+			$output[ $ae ] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $ae . '</option>';
 		} elseif ( $code_lang == 'en_GB' ) { // British English
-			$flag = true;
-			$be = __( 'British English' );
-			$output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
+			$flag          = true;
+			$be            = __( 'British English' );
+			$output[ $be ] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
 		} else {
-			$translated = format_code_lang( $code_lang );
-			$output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
+			$translated            = format_code_lang( $code_lang );
+			$output[ $translated ] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html( $translated ) . '</option>';
 		}
-
 	}
 
-	if ( $flag === false ) // WordPress english
-		$output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . "</option>";
+	if ( $flag === false ) { // WordPress english
+		$output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . '</option>';
+	}
 
 	// Order by name
 	uksort( $output, 'strnatcasecmp' );
@@ -621,7 +820,7 @@ function site_admin_notice() {
 	}
 
 	if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
-		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
+		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . '</div>';
 	}
 }
 
@@ -638,18 +837,22 @@ function site_admin_notice() {
  * @return array The new array of post data after checking for collisions.
  */
 function avoid_blog_page_permalink_collision( $data, $postarr ) {
-	if ( is_subdomain_install() )
+	if ( is_subdomain_install() ) {
 		return $data;
-	if ( $data['post_type'] != 'page' )
+	}
+	if ( $data['post_type'] != 'page' ) {
 		return $data;
-	if ( !isset( $data['post_name'] ) || $data['post_name'] == '' )
+	}
+	if ( ! isset( $data['post_name'] ) || $data['post_name'] == '' ) {
 		return $data;
-	if ( !is_main_site() )
+	}
+	if ( ! is_main_site() ) {
 		return $data;
+	}
 
 	$post_name = $data['post_name'];
-	$c = 0;
-	while( $c < 10 && get_id_from_blogname( $post_name ) ) {
+	$c         = 0;
+	while ( $c < 10 && get_id_from_blogname( $post_name ) ) {
 		$post_name .= mt_rand( 1, 10 );
 		$c ++;
 	}
@@ -675,30 +878,36 @@ function choose_primary_blog() {
 		<th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th>
 		<td>
 		<?php
-		$all_blogs = get_blogs_of_user( get_current_user_id() );
+		$all_blogs    = get_blogs_of_user( get_current_user_id() );
 		$primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );
 		if ( count( $all_blogs ) > 1 ) {
 			$found = false;
 			?>
 			<select name="primary_blog" id="primary_blog">
-				<?php foreach ( (array) $all_blogs as $blog ) {
-					if ( $primary_blog == $blog->userblog_id )
+				<?php
+				foreach ( (array) $all_blogs as $blog ) {
+					if ( $primary_blog == $blog->userblog_id ) {
 						$found = true;
-					?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
-				} ?>
+					}
+					?>
+					<option value="<?php echo $blog->userblog_id; ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ); ?></option>
+					<?php
+				}
+				?>
 			</select>
 			<?php
-			if ( !$found ) {
+			if ( ! $found ) {
 				$blog = reset( $all_blogs );
 				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
 			}
 		} elseif ( count( $all_blogs ) == 1 ) {
 			$blog = reset( $all_blogs );
 			echo esc_url( get_home_url( $blog->userblog_id ) );
-			if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
+			if ( $primary_blog != $blog->userblog_id ) { // Set the primary blog again if it's out of sync with blog list.
 				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+			}
 		} else {
-			echo "N/A";
+			echo 'N/A';
 		}
 		?>
 		</td>
@@ -719,10 +928,11 @@ function choose_primary_blog() {
  * @return bool True if network can be edited, otherwise false.
  */
 function can_edit_network( $network_id ) {
-	if ( $network_id == get_current_network_id() )
+	if ( $network_id == get_current_network_id() ) {
 		$result = true;
-	else
+	} else {
 		$result = false;
+	}
 
 	/**
 	 * Filters whether this network can be edited from this page.
@@ -751,7 +961,6 @@ var tb_pathToImage = "<?php echo includes_url( 'js/thickbox/loadingAnimation.gif
 }
 
 /**
- *
  * @param array $users
  */
 function confirm_delete_users( $users ) {
@@ -773,9 +982,11 @@ function confirm_delete_users( $users ) {
 	<?php
 	wp_nonce_field( 'ms-users-delete' );
 	$site_admins = get_super_admins();
-	$admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
+	$admin_out   = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>';
+	?>
 	<table class="form-table">
-	<?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
+	<?php
+	foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
 		if ( $user_id != '' && $user_id != '0' ) {
 			$delete_user = get_userdata( $user_id );
 
@@ -791,23 +1002,33 @@ function confirm_delete_users( $users ) {
 				<th scope="row"><?php echo $delete_user->user_login; ?>
 					<?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
 				</th>
-			<?php $blogs = get_blogs_of_user( $user_id, true );
+			<?php
+			$blogs = get_blogs_of_user( $user_id, true );
 
 			if ( ! empty( $blogs ) ) {
 				?>
-				<td><fieldset><p><legend><?php printf(
+				<td><fieldset><p><legend>
+				<?php
+				printf(
 					/* translators: user login */
 					__( 'What should be done with content owned by %s?' ),
 					'<em>' . $delete_user->user_login . '</em>'
-				); ?></legend></p>
+				);
+				?>
+				</legend></p>
 				<?php
 				foreach ( (array) $blogs as $key => $details ) {
-					$blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
-					if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
-						$user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
-						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+					$blog_users = get_users(
+						array(
+							'blog_id' => $details->userblog_id,
+							'fields'  => array( 'ID', 'user_login' ),
+						)
+					);
+					if ( is_array( $blog_users ) && ! empty( $blog_users ) ) {
+						$user_site      = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
+						$user_dropdown  = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
 						$user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
-						$user_list = '';
+						$user_list      = '';
 						foreach ( $blog_users as $user ) {
 							if ( ! in_array( $user->ID, $allusers ) ) {
 								$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
@@ -821,16 +1042,16 @@ function confirm_delete_users( $users ) {
 						?>
 						<ul style="list-style:none;">
 							<li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
-							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
+							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="delete" checked="checked" />
 							<?php _e( 'Delete all content.' ); ?></label></li>
-							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
+							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID; ?>]" value="reassign" />
 							<?php _e( 'Attribute all content to:' ); ?></label>
 							<?php echo $user_dropdown; ?></li>
 						</ul>
 						<?php
 					}
 				}
-				echo "</fieldset></td></tr>";
+				echo '</fieldset></td></tr>';
 			} else {
 				?>
 				<td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
@@ -846,13 +1067,15 @@ function confirm_delete_users( $users ) {
 	/** This action is documented in wp-admin/users.php */
 	do_action( 'delete_user_form', $current_user, $allusers );
 
-	if ( 1 == count( $users ) ) : ?>
+	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>
-	<?php endif;
+	<?php
+	endif;
 
-	submit_button( __('Confirm Deletion'), 'primary' );
+	submit_button( __( 'Confirm Deletion' ), 'primary' );
 	?>
 	</form>
 	<?php
@@ -915,19 +1138,39 @@ function network_edit_site_nav( $args = array() ) {
 	 *     }
 	 * }
 	 */
-	$links = apply_filters( 'network_edit_site_nav_links', array(
-		'site-info'     => array( 'label' => __( 'Info' ),     'url' => 'site-info.php',     'cap' => 'manage_sites' ),
-		'site-users'    => array( 'label' => __( 'Users' ),    'url' => 'site-users.php',    'cap' => 'manage_sites' ),
-		'site-themes'   => array( 'label' => __( 'Themes' ),   'url' => 'site-themes.php',   'cap' => 'manage_sites' ),
-		'site-settings' => array( 'label' => __( 'Settings' ), 'url' => 'site-settings.php', 'cap' => 'manage_sites' )
-	) );
+	$links = apply_filters(
+		'network_edit_site_nav_links', array(
+			'site-info'     => array(
+				'label' => __( 'Info' ),
+				'url'   => 'site-info.php',
+				'cap'   => 'manage_sites',
+			),
+			'site-users'    => array(
+				'label' => __( 'Users' ),
+				'url'   => 'site-users.php',
+				'cap'   => 'manage_sites',
+			),
+			'site-themes'   => array(
+				'label' => __( 'Themes' ),
+				'url'   => 'site-themes.php',
+				'cap'   => 'manage_sites',
+			),
+			'site-settings' => array(
+				'label' => __( 'Settings' ),
+				'url'   => 'site-settings.php',
+				'cap'   => 'manage_sites',
+			),
+		)
+	);
 
 	// Parse arguments
-	$r = wp_parse_args( $args, array(
-		'blog_id'  => isset( $_GET['blog_id'] ) ? (int) $_GET['blog_id'] : 0,
-		'links'    => $links,
-		'selected' => 'site-info',
-	) );
+	$r = wp_parse_args(
+		$args, array(
+			'blog_id'  => isset( $_GET['blog_id'] ) ? (int) $_GET['blog_id'] : 0,
+			'links'    => $links,
+			'selected' => 'site-info',
+		)
+	);
 
 	// Setup the links array
 	$screen_links = array();
@@ -974,13 +1217,13 @@ function network_edit_site_nav( $args = array() ) {
 function get_site_screen_help_tab_args() {
 	return array(
 		'id'      => 'overview',
-		'title'   => __('Overview'),
+		'title'   => __( 'Overview' ),
 		'content' =>
-			'<p>' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '</p>' .
-			'<p>' . __('<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '</p>' .
-			'<p>' . __('<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '</p>' .
-			'<p>' . sprintf( __('<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
-			'<p>' . __('<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '</p>'
+			'<p>' . __( 'The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.' ) . '</p>' .
+			'<p>' . __( '<strong>Info</strong> &mdash; The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '</p>' .
+			'<p>' . __( '<strong>Users</strong> &mdash; This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '</p>' .
+			'<p>' . sprintf( __( '<strong>Themes</strong> &mdash; This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site&#8217;s Appearance menu. To enable a theme for the entire network, see the <a href="%s">Network Themes</a> screen.' ), network_admin_url( 'themes.php' ) ) . '</p>' .
+			'<p>' . __( '<strong>Settings</strong> &mdash; This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '</p>',
 	);
 }
 
@@ -992,7 +1235,7 @@ function get_site_screen_help_tab_args() {
  * @return string Help sidebar content.
  */
 function get_site_screen_help_sidebar_content() {
-	return '<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>') . '</p>' .
-		'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>';
+	return '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+		'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>';
 }
diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index c98b2c7377..74209af075 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -21,10 +21,10 @@ require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php'
  * @param array $request The unsanitized request values.
  */
 function _wp_ajax_menu_quick_search( $request = array() ) {
-	$args = array();
-	$type = isset( $request['type'] ) ? $request['type'] : '';
-	$object_type = isset( $request['object_type'] ) ? $request['object_type'] : '';
-	$query = isset( $request['q'] ) ? $request['q'] : '';
+	$args            = array();
+	$type            = isset( $request['type'] ) ? $request['type'] : '';
+	$object_type     = isset( $request['object_type'] ) ? $request['object_type'] : '';
+	$query           = isset( $request['q'] ) ? $request['q'] : '';
 	$response_format = isset( $request['response-format'] ) && in_array( $request['response-format'], array( 'json', 'markup' ) ) ? $request['response-format'] : 'json';
 
 	if ( 'markup' == $response_format ) {
@@ -36,13 +36,13 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 			if ( isset( $request['ID'] ) ) {
 				$object_id = (int) $request['ID'];
 				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
+					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
 				} elseif ( 'json' == $response_format ) {
 					echo wp_json_encode(
 						array(
-							'ID' => $object_id,
+							'ID'         => $object_id,
 							'post_title' => get_the_title( $object_id ),
-							'post_type' => get_post_type( $object_id ),
+							'post_type'  => get_post_type( $object_id ),
 						)
 					);
 					echo "\n";
@@ -52,26 +52,24 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 			if ( isset( $request['ID'] ) ) {
 				$object_id = (int) $request['ID'];
 				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
+					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
 				} elseif ( 'json' == $response_format ) {
 					$post_obj = get_term( $object_id, $object_type );
 					echo wp_json_encode(
 						array(
-							'ID' => $object_id,
+							'ID'         => $object_id,
 							'post_title' => $post_obj->name,
-							'post_type' => $object_type,
+							'post_type'  => $object_type,
 						)
 					);
 					echo "\n";
 				}
 			}
-
 		}
-
-	} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
+	} elseif ( preg_match( '/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches ) ) {
 		if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
 			$post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) );
-			$args = array_merge(
+			$args          = array_merge(
 				$args,
 				array(
 					'no_found_rows'          => true,
@@ -93,34 +91,37 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
 				$post = $search_results_query->next_post();
 				if ( 'markup' == $response_format ) {
 					$var_by_ref = $post->ID;
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
+					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
 				} elseif ( 'json' == $response_format ) {
 					echo wp_json_encode(
 						array(
-							'ID' => $post->ID,
+							'ID'         => $post->ID,
 							'post_title' => get_the_title( $post->ID ),
-							'post_type' => $matches[2],
+							'post_type'  => $matches[2],
 						)
 					);
 					echo "\n";
 				}
 			}
 		} elseif ( 'taxonomy' == $matches[1] ) {
-			$terms = get_terms( $matches[2], array(
-				'name__like' => $query,
-				'number' => 10,
-			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
+			$terms = get_terms(
+				$matches[2], array(
+					'name__like' => $query,
+					'number'     => 10,
+				)
+			);
+			if ( empty( $terms ) || is_wp_error( $terms ) ) {
 				return;
+			}
 			foreach ( (array) $terms as $term ) {
 				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
+					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
 				} elseif ( 'json' == $response_format ) {
 					echo wp_json_encode(
 						array(
-							'ID' => $term->term_id,
+							'ID'         => $term->term_id,
 							'post_title' => $term->name,
-							'post_type' => $matches[2],
+							'post_type'  => $matches[2],
 						)
 					);
 					echo "\n";
@@ -134,7 +135,7 @@ function _wp_ajax_menu_quick_search( $request = array() ) {
  * Register nav menu meta boxes and advanced menu items.
  *
  * @since 3.0.0
- **/
+ */
 function wp_nav_menu_setup() {
 	// Register meta boxes
 	wp_nav_menu_post_type_meta_boxes();
@@ -147,9 +148,17 @@ function wp_nav_menu_setup() {
 	// If first time editing, disable advanced items by default.
 	if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
 		$user = wp_get_current_user();
-		update_user_option($user->ID, 'managenav-menuscolumnshidden',
-			array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ),
-			true);
+		update_user_option(
+			$user->ID, 'managenav-menuscolumnshidden',
+			array(
+				0 => 'link-target',
+				1 => 'css-classes',
+				2 => 'xfn',
+				3 => 'description',
+				4 => 'title-attribute',
+			),
+			true
+		);
 	}
 }
 
@@ -159,19 +168,20 @@ function wp_nav_menu_setup() {
  * @since 3.0.0
  *
  * @global array $wp_meta_boxes
- **/
+ */
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
+	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array( $wp_meta_boxes ) ) {
 		return;
+	}
 
 	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
-	$hidden_meta_boxes = array();
+	$hidden_meta_boxes  = array();
 
-	foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-		foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-			foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
+	foreach ( array_keys( $wp_meta_boxes['nav-menus'] ) as $context ) {
+		foreach ( array_keys( $wp_meta_boxes['nav-menus'][ $context ] ) as $priority ) {
+			foreach ( $wp_meta_boxes['nav-menus'][ $context ][ $priority ] as $box ) {
 				if ( in_array( $box['id'], $initial_meta_boxes ) ) {
 					unset( $box['id'] );
 				} else {
@@ -193,8 +203,9 @@ function wp_initial_nav_menu_meta_boxes() {
 function wp_nav_menu_post_type_meta_boxes() {
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( ! $post_types )
+	if ( ! $post_types ) {
 		return;
+	}
 
 	foreach ( $post_types as $post_type ) {
 		/**
@@ -227,8 +238,9 @@ function wp_nav_menu_post_type_meta_boxes() {
 function wp_nav_menu_taxonomy_meta_boxes() {
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( !$taxonomies )
+	if ( ! $taxonomies ) {
 		return;
+	}
 
 	foreach ( $taxonomies as $tax ) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
@@ -253,8 +265,9 @@ function wp_nav_menu_taxonomy_meta_boxes() {
 function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
+	if ( $one_theme_location_no_menus ) {
 		return false;
+	}
 
 	return disabled( $nav_menu_selected_id, 0 );
 }
@@ -287,7 +300,7 @@ function wp_nav_menu_item_link_meta_box() {
 
 		<p class="button-controls wp-clearfix">
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -321,26 +334,27 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 
 	// Paginate browsing for large numbers of post objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum  = isset( $_REQUEST[ $post_type_name . '-tab' ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
+	$offset   = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
 
 	$args = array(
-		'offset' => $offset,
-		'order' => 'ASC',
-		'orderby' => 'title',
-		'posts_per_page' => $per_page,
-		'post_type' => $post_type_name,
-		'suppress_filters' => true,
+		'offset'                 => $offset,
+		'order'                  => 'ASC',
+		'orderby'                => 'title',
+		'posts_per_page'         => $per_page,
+		'post_type'              => $post_type_name,
+		'suppress_filters'       => true,
 		'update_post_term_cache' => false,
-		'update_post_meta_cache' => false
+		'update_post_meta_cache' => false,
 	);
 
-	if ( isset( $box['args']->_default_query ) )
-		$args = array_merge($args, (array) $box['args']->_default_query );
+	if ( isset( $box['args']->_default_query ) ) {
+		$args = array_merge( $args, (array) $box['args']->_default_query );
+	}
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
-	$posts = $get_posts->query( $args );
+	$posts     = $get_posts->query( $args );
 	if ( ! $get_posts->post_count ) {
 		echo '<p>' . __( 'No items.' ) . '</p>';
 		return;
@@ -348,36 +362,41 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 
 	$num_pages = $get_posts->max_num_pages;
 
-	$page_links = paginate_links( array(
-		'base' => add_query_arg(
-			array(
-				$post_type_name . '-tab' => 'all',
-				'paged' => '%#%',
-				'item-type' => 'post_type',
-				'item-object' => $post_type_name,
-			)
-		),
-		'format' => '',
-		'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
-		'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
-		'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
-		'total'   => $num_pages,
-		'current' => $pagenum
-	));
+	$page_links = paginate_links(
+		array(
+			'base'               => add_query_arg(
+				array(
+					$post_type_name . '-tab' => 'all',
+					'paged'                  => '%#%',
+					'item-type'              => 'post_type',
+					'item-object'            => $post_type_name,
+				)
+			),
+			'format'             => '',
+			'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
+			'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+			'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+			'total'              => $num_pages,
+			'current'            => $pagenum,
+		)
+	);
 
 	$db_fields = false;
 	if ( is_post_type_hierarchical( $post_type_name ) ) {
-		$db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+		$db_fields = array(
+			'parent' => 'post_parent',
+			'id'     => 'ID',
+		);
 	}
 
 	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
 
 	$current_tab = 'most-recent';
-	if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) {
-		$current_tab = $_REQUEST[$post_type_name . '-tab'];
+	if ( isset( $_REQUEST[ $post_type_name . '-tab' ] ) && in_array( $_REQUEST[ $post_type_name . '-tab' ], array( 'all', 'search' ) ) ) {
+		$current_tab = $_REQUEST[ $post_type_name . '-tab' ];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
+	if ( ! empty( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
 		$current_tab = 'search';
 	}
 
@@ -392,9 +411,9 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 
 	$most_recent_url = $view_all_url = $search_url = '';
 	if ( $nav_menu_selected_id ) {
-		$most_recent_url = esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
-		$view_all_url    = esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
-		$search_url      = esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+		$most_recent_url = esc_url( add_query_arg( $post_type_name . '-tab', 'most-recent', remove_query_arg( $removed_args ) ) );
+		$view_all_url    = esc_url( add_query_arg( $post_type_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
+		$search_url      = esc_url( add_query_arg( $post_type_name . '-tab', 'search', remove_query_arg( $removed_args ) ) );
 	}
 	?>
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
@@ -411,18 +430,26 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
 				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
-					<?php _e( 'Search'); ?>
+					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
 		</ul><!-- .posttype-tabs -->
 
-		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php
-			echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>">
+		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel 
+												<?php
+												echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+		?>
+		">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
-				$recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) );
-				$most_recent = $get_posts->query( $recent_args );
+				$recent_args    = array_merge(
+					$args, array(
+						'orderby'        => 'post_date',
+						'order'          => 'DESC',
+						'posts_per_page' => 15,
+					)
+				);
+				$most_recent    = $get_posts->query( $recent_args );
 				$args['walker'] = $walker;
 
 				/**
@@ -446,15 +473,24 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel <?php
+		<div class="tabs-panel 
+		<?php
 			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+		?>
+		" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 			<?php
-			if ( isset( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-posttype-' . $post_type_name] );
-				$search_results = get_posts( array( 's' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) );
+			if ( isset( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
+				$searched       = esc_attr( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] );
+				$search_results = get_posts(
+					array(
+						's'         => $searched,
+						'post_type' => $post_type_name,
+						'fields'    => 'all',
+						'order'     => 'DESC',
+					)
+				);
 			} else {
-				$searched = '';
+				$searched       = '';
 				$search_results = array();
 			}
 			?>
@@ -465,29 +501,31 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
 			</p>
 
-			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
+			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name; ?>" class="categorychecklist form-no-clear">
 			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
 				?>
 			<?php elseif ( is_wp_error( $search_results ) ) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
 			<?php elseif ( ! empty( $searched ) ) : ?>
-				<li><?php _e('No results found.'); ?></li>
+				<li><?php _e( 'No results found.' ); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>">
+		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all 
+							<?php
+							echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+		?>
+		">
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
 			<?php endif; ?>
-			<ul id="<?php echo $post_type_name; ?>checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
+			<ul id="<?php echo $post_type_name; ?>checklist" data-wp-lists="list:<?php echo $post_type_name; ?>" class="categorychecklist form-no-clear">
 				<?php
 				$args['walker'] = $walker;
 
@@ -496,43 +534,47 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 				 * page at the top of the list.
 				 */
 				if ( 'page' == $post_type_name ) {
-					$front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
+					$front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
 					if ( ! empty( $front_page ) ) {
-						$front_page_obj = get_post( $front_page );
+						$front_page_obj                = get_post( $front_page );
 						$front_page_obj->front_or_home = true;
 						array_unshift( $posts, $front_page_obj );
 					} else {
-						$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-						array_unshift( $posts, (object) array(
-							'front_or_home' => true,
-							'ID' => 0,
-							'object_id' => $_nav_menu_placeholder,
-							'post_content' => '',
-							'post_excerpt' => '',
-							'post_parent' => '',
-							'post_title' => _x('Home', 'nav menu home label'),
-							'post_type' => 'nav_menu_item',
-							'type' => 'custom',
-							'url' => home_url('/'),
-						) );
+						$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
+						array_unshift(
+							$posts, (object) array(
+								'front_or_home' => true,
+								'ID'            => 0,
+								'object_id'     => $_nav_menu_placeholder,
+								'post_content'  => '',
+								'post_excerpt'  => '',
+								'post_parent'   => '',
+								'post_title'    => _x( 'Home', 'nav menu home label' ),
+								'post_type'     => 'nav_menu_item',
+								'type'          => 'custom',
+								'url'           => home_url( '/' ),
+							)
+						);
 					}
 				}
 
 				$post_type = get_post_type_object( $post_type_name );
 
 				if ( $post_type->has_archive ) {
-					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-					array_unshift( $posts, (object) array(
-						'ID' => 0,
-						'object_id' => $_nav_menu_placeholder,
-						'object'     => $post_type_name,
-						'post_content' => '',
-						'post_excerpt' => '',
-						'post_title' => $post_type->labels->archives,
-						'post_type' => 'nav_menu_item',
-						'type' => 'post_type_archive',
-						'url' => get_post_type_archive_link( $post_type_name ),
-					) );
+					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
+					array_unshift(
+						$posts, (object) array(
+							'ID'           => 0,
+							'object_id'    => $_nav_menu_placeholder,
+							'object'       => $post_type_name,
+							'post_content' => '',
+							'post_excerpt' => '',
+							'post_title'   => $post_type->labels->archives,
+							'post_type'    => 'nav_menu_item',
+							'type'         => 'post_type_archive',
+							'url'          => get_post_type_archive_link( $post_type_name ),
+						)
+					);
 				}
 
 				/**
@@ -553,10 +595,10 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 				 */
 				$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
 
-				$checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
+				$checkbox_items = walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $posts ), 0, (object) $args );
 
 				if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
-					$checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items);
+					$checkbox_items = preg_replace( '/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items );
 
 				}
 
@@ -572,15 +614,19 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 
 		<p class="button-controls wp-clearfix">
 			<span class="list-controls">
-				<a href="<?php
-					echo esc_url( add_query_arg(
-						array(
-							$post_type_name . '-tab' => 'all',
-							'selectall' => 1,
-						),
-						remove_query_arg( $removed_args )
-					));
-				?>#posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
+				<a href="
+				<?php
+					echo esc_url(
+						add_query_arg(
+							array(
+								$post_type_name . '-tab' => 'all',
+								'selectall'              => 1,
+							),
+							remove_query_arg( $removed_args )
+						)
+					);
+				?>
+				#posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
 			</span>
 
 			<span class="add-to-menu">
@@ -613,65 +659,79 @@ function wp_nav_menu_item_post_type_meta_box( $object, $box ) {
 function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 	global $nav_menu_selected_id;
 	$taxonomy_name = $box['args']->name;
-	$taxonomy = get_taxonomy( $taxonomy_name );
+	$taxonomy      = get_taxonomy( $taxonomy_name );
 
 	// Paginate browsing for large numbers of objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum  = isset( $_REQUEST[ $taxonomy_name . '-tab' ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
+	$offset   = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
 
 	$args = array(
-		'child_of' => 0,
-		'exclude' => '',
-		'hide_empty' => false,
+		'child_of'     => 0,
+		'exclude'      => '',
+		'hide_empty'   => false,
 		'hierarchical' => 1,
-		'include' => '',
-		'number' => $per_page,
-		'offset' => $offset,
-		'order' => 'ASC',
-		'orderby' => 'name',
-		'pad_counts' => false,
+		'include'      => '',
+		'number'       => $per_page,
+		'offset'       => $offset,
+		'order'        => 'ASC',
+		'orderby'      => 'name',
+		'pad_counts'   => false,
 	);
 
 	$terms = get_terms( $taxonomy_name, $args );
 
-	if ( ! $terms || is_wp_error($terms) ) {
+	if ( ! $terms || is_wp_error( $terms ) ) {
 		echo '<p>' . __( 'No items.' ) . '</p>';
 		return;
 	}
 
-	$num_pages = ceil( wp_count_terms( $taxonomy_name , array_merge( $args, array('number' => '', 'offset' => '') ) ) / $per_page );
-
-	$page_links = paginate_links( array(
-		'base' => add_query_arg(
-			array(
-				$taxonomy_name . '-tab' => 'all',
-				'paged' => '%#%',
-				'item-type' => 'taxonomy',
-				'item-object' => $taxonomy_name,
+	$num_pages = ceil(
+		wp_count_terms(
+			$taxonomy_name, array_merge(
+				$args, array(
+					'number' => '',
+					'offset' => '',
+				)
 			)
-		),
-		'format' => '',
-		'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
-		'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
-		'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
-		'total'   => $num_pages,
-		'current' => $pagenum
-	));
+		) / $per_page
+	);
+
+	$page_links = paginate_links(
+		array(
+			'base'               => add_query_arg(
+				array(
+					$taxonomy_name . '-tab' => 'all',
+					'paged'                 => '%#%',
+					'item-type'             => 'taxonomy',
+					'item-object'           => $taxonomy_name,
+				)
+			),
+			'format'             => '',
+			'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
+			'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
+			'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+			'total'              => $num_pages,
+			'current'            => $pagenum,
+		)
+	);
 
 	$db_fields = false;
 	if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
-		$db_fields = array( 'parent' => 'parent', 'id' => 'term_id' );
+		$db_fields = array(
+			'parent' => 'parent',
+			'id'     => 'term_id',
+		);
 	}
 
 	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
 
 	$current_tab = 'most-used';
-	if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) {
-		$current_tab = $_REQUEST[$taxonomy_name . '-tab'];
+	if ( isset( $_REQUEST[ $taxonomy_name . '-tab' ] ) && in_array( $_REQUEST[ $taxonomy_name . '-tab' ], array( 'all', 'most-used', 'search' ) ) ) {
+		$current_tab = $_REQUEST[ $taxonomy_name . '-tab' ];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
+	if ( ! empty( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
 		$current_tab = 'search';
 	}
 
@@ -686,9 +746,9 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 
 	$most_used_url = $view_all_url = $search_url = '';
 	if ( $nav_menu_selected_id ) {
-		$most_used_url = esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
-		$view_all_url  = esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
-		$search_url    = esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+		$most_used_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'most-used', remove_query_arg( $removed_args ) ) );
+		$view_all_url  = esc_url( add_query_arg( $taxonomy_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
+		$search_url    = esc_url( add_query_arg( $taxonomy_name . '-tab', 'search', remove_query_arg( $removed_args ) ) );
 	}
 	?>
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
@@ -710,30 +770,41 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php
-			echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>">
+		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel 
+										<?php
+										echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+		?>
+		">
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
-				$popular_terms = get_terms( $taxonomy_name, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+				$popular_terms  = get_terms(
+					$taxonomy_name, array(
+						'orderby'      => 'count',
+						'order'        => 'DESC',
+						'number'       => 10,
+						'hierarchical' => false,
+					)
+				);
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args );
+				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $popular_terms ), 0, (object) $args );
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>">
+		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all 
+										<?php
+										echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+		?>
+		">
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
 			<?php endif; ?>
-			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
+			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name; ?>" class="categorychecklist form-no-clear">
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args );
+				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $terms ), 0, (object) $args );
 				?>
 			</ul>
 			<?php if ( ! empty( $page_links ) ) : ?>
@@ -743,15 +814,25 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 			<?php endif; ?>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel <?php
+		<div class="tabs-panel 
+		<?php
 			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+		?>
+		" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 			<?php
-			if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
-				$search_results = get_terms( $taxonomy_name, array( 'name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) );
+			if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
+				$searched       = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
+				$search_results = get_terms(
+					$taxonomy_name, array(
+						'name__like'   => $searched,
+						'fields'       => 'all',
+						'orderby'      => 'count',
+						'order'        => 'DESC',
+						'hierarchical' => false,
+					)
+				);
 			} else {
-				$searched = '';
+				$searched       = '';
 				$search_results = array();
 			}
 			?>
@@ -762,31 +843,35 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
 				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
 			</p>
 
-			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
+			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name; ?>" class="categorychecklist form-no-clear">
 			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
 				?>
 			<?php elseif ( is_wp_error( $search_results ) ) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
 			<?php elseif ( ! empty( $searched ) ) : ?>
-				<li><?php _e('No results found.'); ?></li>
+				<li><?php _e( 'No results found.' ); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<p class="button-controls wp-clearfix">
 			<span class="list-controls">
-				<a href="<?php
-					echo esc_url(add_query_arg(
-						array(
-							$taxonomy_name . '-tab' => 'all',
-							'selectall' => 1,
-						),
-						remove_query_arg($removed_args)
-					));
-				?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
+				<a href="
+				<?php
+					echo esc_url(
+						add_query_arg(
+							array(
+								$taxonomy_name . '-tab' => 'all',
+								'selectall'             => 1,
+							),
+							remove_query_arg( $removed_args )
+						)
+					);
+				?>
+				#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
 			</span>
 
 			<span class="add-to-menu">
@@ -809,7 +894,7 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $box ) {
  * @return array The database IDs of the items saved
  */
 function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
-	$menu_id = (int) $menu_id;
+	$menu_id     = (int) $menu_id;
 	$items_saved = array();
 
 	if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
@@ -845,19 +930,19 @@ function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
 			}
 
 			$args = array(
-				'menu-item-db-id' => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
-				'menu-item-object-id' => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
-				'menu-item-object' => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ),
-				'menu-item-parent-id' => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ),
-				'menu-item-position' => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ),
-				'menu-item-type' => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ),
-				'menu-item-title' => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ),
-				'menu-item-url' => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ),
+				'menu-item-db-id'       => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
+				'menu-item-object-id'   => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
+				'menu-item-object'      => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ),
+				'menu-item-parent-id'   => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ),
+				'menu-item-position'    => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ),
+				'menu-item-type'        => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ),
+				'menu-item-title'       => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ),
+				'menu-item-url'         => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ),
 				'menu-item-description' => ( isset( $_item_object_data['menu-item-description'] ) ? $_item_object_data['menu-item-description'] : '' ),
-				'menu-item-attr-title' => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ),
-				'menu-item-target' => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ),
-				'menu-item-classes' => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ),
-				'menu-item-xfn' => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ),
+				'menu-item-attr-title'  => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ),
+				'menu-item-target'      => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ),
+				'menu-item-classes'     => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ),
+				'menu-item-xfn'         => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ),
 			);
 
 			$items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
@@ -882,24 +967,24 @@ function _wp_nav_menu_meta_box_object( $object = null ) {
 
 		if ( 'page' == $object->name ) {
 			$object->_default_query = array(
-				'orderby' => 'menu_order title',
+				'orderby'     => 'menu_order title',
 				'post_status' => 'publish',
 			);
 
-		// Posts should show only published items.
+			// Posts should show only published items.
 		} elseif ( 'post' == $object->name ) {
 			$object->_default_query = array(
 				'post_status' => 'publish',
 			);
 
-		// Categories should be in reverse chronological order.
+			// Categories should be in reverse chronological order.
 		} elseif ( 'category' == $object->name ) {
 			$object->_default_query = array(
 				'orderby' => 'id',
-				'order' => 'DESC',
+				'order'   => 'DESC',
 			);
 
-		// Custom post types should show only published items.
+			// Custom post types should show only published items.
 		} else {
 			$object->_default_query = array(
 				'post_status' => 'publish',
@@ -923,14 +1008,15 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
 
 	// If the menu exists, get its items.
 	if ( is_nav_menu( $menu ) ) {
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array('post_status' => 'any') );
-		$result = '<div id="menu-instructions" class="post-body-plain';
-		$result .= ( ! empty($menu_items) ) ? ' menu-instructions-inactive">' : '">';
-		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
-		$result .= '</div>';
+		$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'post_status' => 'any' ) );
+		$result     = '<div id="menu-instructions" class="post-body-plain';
+		$result    .= ( ! empty( $menu_items ) ) ? ' menu-instructions-inactive">' : '">';
+		$result    .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
+		$result    .= '</div>';
 
-		if ( empty($menu_items) )
+		if ( empty( $menu_items ) ) {
 			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		}
 
 		/**
 		 * Filters the Walker class used when adding nav menu items.
@@ -945,9 +1031,11 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
 		if ( class_exists( $walker_class_name ) ) {
 			$walker = new $walker_class_name;
 		} else {
-			return new WP_Error( 'menu_walker_not_exist',
+			return new WP_Error(
+				'menu_walker_not_exist',
 				/* translators: %s: walker class name */
-				sprintf( __( 'The Walker class named %s does not exist.' ),
+				sprintf(
+					__( 'The Walker class named %s does not exist.' ),
 					'<strong>' . $walker_class_name . '</strong>'
 				)
 			);
@@ -955,10 +1043,12 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
 		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
+			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
 				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
+			}
+			if ( ! empty( $menu_item->_invalid ) ) {
 				$some_invalid_menu_items = true;
+			}
 		}
 
 		if ( $some_pending_menu_items ) {
@@ -970,7 +1060,7 @@ function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
 		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
-		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
+		$result .= walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $menu_items ), 0, (object) array( 'walker' => $walker ) );
 		$result .= ' </ul> ';
 		return $result;
 	} elseif ( is_wp_error( $menu ) ) {
@@ -1011,10 +1101,11 @@ function _wp_delete_orphaned_draft_menu_items() {
 	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
 
 	// Delete orphaned draft menu items.
-	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < %d", $delete_timestamp ) );
+	$menu_items_to_delete = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < %d", $delete_timestamp ) );
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
+	foreach ( (array) $menu_items_to_delete as $menu_item_id ) {
 		wp_delete_post( $menu_item_id, true );
+	}
 }
 
 /**
@@ -1026,19 +1117,36 @@ function _wp_delete_orphaned_draft_menu_items() {
  * @param string $nav_menu_selected_title Title of the currently-selected menu
  * @return array $messages The menu updated message
  */
-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( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
-	$messages = array();
-	$menu_items = array();
+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(
+			'orderby'     => 'ID',
+			'output'      => ARRAY_A,
+			'output_key'  => 'ID',
+			'post_status' => 'draft,publish',
+		)
+	);
+	$messages            = array();
+	$menu_items          = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
-		$menu_items[$_item->db_id] = $_item;
+	foreach ( $unsorted_menu_items as $_item ) {
+		$menu_items[ $_item->db_id ] = $_item;
+	}
 
 	$post_fields = array(
-		'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
-		'menu-item-parent-id', 'menu-item-position', 'menu-item-type',
-		'menu-item-title', 'menu-item-url', 'menu-item-description',
-		'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn'
+		'menu-item-db-id',
+		'menu-item-object-id',
+		'menu-item-object',
+		'menu-item-parent-id',
+		'menu-item-position',
+		'menu-item-type',
+		'menu-item-title',
+		'menu-item-url',
+		'menu-item-description',
+		'menu-item-attr-title',
+		'menu-item-target',
+		'menu-item-classes',
+		'menu-item-xfn',
 	);
 
 	wp_defer_term_counting( true );
@@ -1047,14 +1155,16 @@ function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_select
 		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
 				continue;
+			}
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ( $post_fields as $field ) {
+				$args[ $field ] = isset( $_POST[ $field ][ $_key ] ) ? $_POST[ $field ][ $_key ] : '';
+			}
 
-			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
+			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][ $_key ] != $_key ? 0 : $_key ), $args );
 
 			if ( is_wp_error( $menu_item_db_id ) ) {
 				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
@@ -1074,16 +1184,19 @@ function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_select
 	}
 
 	// Store 'auto-add' pages.
-	$auto_add = ! empty( $_POST['auto-add-pages'] );
+	$auto_add        = ! empty( $_POST['auto-add-pages'] );
 	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
+	if ( ! isset( $nav_menu_option['auto_add'] ) ) {
 		$nav_menu_option['auto_add'] = array();
+	}
 	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
+		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
 			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		}
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
+			unset( $nav_menu_option['auto_add'][ $key ] );
+		}
 	}
 	// Remove nonexistent/deleted menus
 	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
@@ -1096,7 +1209,8 @@ function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_select
 
 	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
 		/* translators: %s: nav menu title */
-		sprintf( __( '%s has been updated.' ),
+		sprintf(
+			__( '%s has been updated.' ),
 			'<strong>' . $nav_menu_selected_title . '</strong>'
 		) . '</p></div>';
 
diff --git a/wp-admin/includes/network.php b/wp-admin/includes/network.php
index f9c5a79ec6..da7aec32a3 100644
--- a/wp-admin/includes/network.php
+++ b/wp-admin/includes/network.php
@@ -19,7 +19,7 @@
 function network_domain_check() {
 	global $wpdb;
 
-	$sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
+	$sql = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->site ) );
 	if ( $wpdb->get_var( $sql ) ) {
 		return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" );
 	}
@@ -34,8 +34,9 @@ function network_domain_check() {
  */
 function allow_subdomain_install() {
 	$domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
-	if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) )
+	if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) ) {
 		return false;
+	}
 
 	return true;
 }
@@ -51,22 +52,25 @@ function allow_subdomain_install() {
  */
 function allow_subdirectory_install() {
 	global $wpdb;
-        /**
-         * Filters whether to enable the subdirectory installation feature in Multisite.
-         *
-         * @since 3.0.0
-         *
-         * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false.
-         */
-	if ( apply_filters( 'allow_subdirectory_install', false ) )
+		/**
+		 * Filters whether to enable the subdirectory installation feature in Multisite.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param bool $allow Whether to enable the subdirectory installation feature in Multisite. Default is false.
+		 */
+	if ( apply_filters( 'allow_subdirectory_install', false ) ) {
 		return true;
+	}
 
-	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL )
+	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL ) {
 		return true;
+	}
 
 	$post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
-	if ( empty( $post ) )
+	if ( empty( $post ) ) {
 		return true;
+	}
 
 	return false;
 }
@@ -78,11 +82,13 @@ function allow_subdirectory_install() {
  * @return string Base domain.
  */
 function get_clean_basedomain() {
-	if ( $existing_domain = network_domain_check() )
+	if ( $existing_domain = network_domain_check() ) {
 		return $existing_domain;
+	}
 	$domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
-	if ( $slash = strpos( $domain, '/' ) )
+	if ( $slash = strpos( $domain, '/' ) ) {
 		$domain = substr( $domain, 0, $slash );
+	}
 	return $domain;
 }
 
@@ -90,7 +96,7 @@ function get_clean_basedomain() {
  * Prints step 1 for Network installation process.
  *
  * @todo Realistically, step 1 should be a welcome screen explaining what a Network is and such. Navigating to Tools > Network
- * 	should not be a sudden "Welcome to a new install process! Fill this out and click here." See also contextual help todo.
+ *  should not be a sudden "Welcome to a new install process! Fill this out and click here." See also contextual help todo.
  *
  * @since 3.0.0
  *
@@ -101,7 +107,7 @@ function get_clean_basedomain() {
 function network_step1( $errors = false ) {
 	global $is_apache;
 
-	if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
+	if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
 		echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . sprintf(
 			/* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
 			__( 'The constant %s cannot be defined when creating a network.' ),
@@ -125,7 +131,7 @@ function network_step1( $errors = false ) {
 		die();
 	}
 
-	$hostname = get_clean_basedomain();
+	$hostname  = get_clean_basedomain();
 	$has_ports = strstr( $hostname, ':' );
 	if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
 		echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
@@ -147,8 +153,9 @@ function network_step1( $errors = false ) {
 	$error_codes = array();
 	if ( is_wp_error( $errors ) ) {
 		echo '<div class="error"><p><strong>' . __( 'ERROR: The network could not be created.' ) . '</strong></p>';
-		foreach ( $errors->get_error_messages() as $error )
+		foreach ( $errors->get_error_messages() as $error ) {
 			echo "<p>$error</p>";
+		}
 		echo '</div>';
 		$error_codes = $errors->get_error_codes();
 	}
@@ -172,23 +179,25 @@ function network_step1( $errors = false ) {
 
 	if ( isset( $_POST['subdomain_install'] ) ) {
 		$subdomain_install = (bool) $_POST['subdomain_install'];
-	} elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
+	} elseif ( apache_mod_loaded( 'mod_rewrite' ) ) { // assume nothing
 		$subdomain_install = true;
-	} elseif ( !allow_subdirectory_install() ) {
+	} elseif ( ! allow_subdirectory_install() ) {
 		$subdomain_install = true;
 	} else {
 		$subdomain_install = false;
 		if ( $got_mod_rewrite = got_mod_rewrite() ) { // dangerous assumptions
 			echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
 			/* translators: %s: mod_rewrite */
-			printf( __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
+			printf(
+				__( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
 				'<code>mod_rewrite</code>'
 			);
 			echo '</p>';
 		} elseif ( $is_apache ) {
 			echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ';
 			/* translators: %s: mod_rewrite */
-			printf( __( 'It looks like the Apache %s module is not installed.' ),
+			printf(
+				__( 'It looks like the Apache %s module is not installed.' ),
 				'<code>mod_rewrite</code>'
 			);
 			echo '</p>';
@@ -197,7 +206,8 @@ function network_step1( $errors = false ) {
 		if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache)
 			echo '<p>';
 			/* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite */
-			printf( __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
+			printf(
+				__( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
 				'<code>mod_rewrite</code>',
 				'https://httpd.apache.org/docs/mod/mod_rewrite.html',
 				'https://www.google.com/search?q=apache+mod_rewrite'
@@ -206,7 +216,8 @@ function network_step1( $errors = false ) {
 		}
 	}
 
-	if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
+	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>
@@ -215,48 +226,63 @@ function network_step1( $errors = false ) {
 		<table class="form-table">
 			<tr>
 				<th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th>
-				<td><?php printf(
+				<td>
+				<?php
+				printf(
 					/* translators: 1: hostname */
 					_x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ),
 					$hostname
-				); ?></td>
+				);
+				?>
+				</td>
 			</tr>
 			<tr>
 				<th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th>
-				<td><?php printf(
+				<td>
+				<?php
+				printf(
 					/* translators: 1: hostname */
 					_x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ),
 					$hostname
-				); ?></td>
+				);
+				?>
+				</td>
 			</tr>
 		</table>
 
 <?php
 	endif;
 
-		if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) )
-			echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+	if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
+		echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+	}
 
 		$is_www = ( 0 === strpos( $hostname, 'www.' ) );
-		if ( $is_www ) :
+	if ( $is_www ) :
 		?>
 		<h3><?php esc_html_e( 'Server Address' ); ?></h3>
-		<p><?php printf(
+		<p>
+		<?php
+		printf(
 			/* translators: 1: site url 2: host name 3. www */
 			__( 'We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ),
 			'<code>' . substr( $hostname, 4 ) . '</code>',
 			'<code>' . $hostname . '</code>',
 			'<code>www</code>'
-		); ?></p>
+		);
+		?>
+		</p>
 		<table class="form-table">
 			<tr>
-				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
-				<td>
-					<?php printf(
+			<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
+			<td>
+				<?php
+					printf(
 						/* translators: %s: host name */
 						__( 'The internet address of your network will be %s.' ),
 						'<code>' . $hostname . '</code>'
-					); ?>
+					);
+					?>
 				</td>
 			</tr>
 		</table>
@@ -267,7 +293,8 @@ function network_step1( $errors = false ) {
 		<?php if ( 'localhost' == $hostname ) : ?>
 			<tr>
 				<th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
-				<td><?php
+				<td>
+				<?php
 					printf(
 						/* translators: 1: localhost 2: localhost.localdomain */
 						__( 'Because you are using %1$s, the sites in your WordPress network must use sub-directories. Consider using %2$s if you wish to use sub-domains.' ),
@@ -275,37 +302,47 @@ function network_step1( $errors = false ) {
 						'<code>localhost.localdomain</code>'
 					);
 					// Uh oh:
-					if ( !allow_subdirectory_install() )
-						echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				?></td>
+				if ( ! allow_subdirectory_install() ) {
+					echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+				}
+				?>
+				</td>
 			</tr>
-		<?php elseif ( !allow_subdomain_install() ) : ?>
+		<?php elseif ( ! allow_subdomain_install() ) : ?>
 			<tr>
 				<th scope="row"><?php esc_html_e( 'Sub-directory Installation' ); ?></th>
-				<td><?php
+				<td>
+				<?php
 					_e( 'Because your installation is in a directory, the sites in your WordPress network must use sub-directories.' );
 					// Uh oh:
-					if ( !allow_subdirectory_install() )
-						echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				?></td>
+				if ( ! allow_subdirectory_install() ) {
+					echo ' <strong>' . __( 'Warning:' ) . ' ' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+				}
+				?>
+				</td>
 			</tr>
-		<?php elseif ( !allow_subdirectory_install() ) : ?>
+		<?php elseif ( ! allow_subdirectory_install() ) : ?>
 			<tr>
 				<th scope="row"><?php esc_html_e( 'Sub-domain Installation' ); ?></th>
-				<td><?php _e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
+				<td>
+				<?php
+				_e( 'Because your installation is not new, the sites in your WordPress network must use sub-domains.' );
 					echo ' <strong>' . __( 'The main site in a sub-directory installation will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
-				?></td>
+				?>
+				</td>
 			</tr>
 		<?php endif; ?>
 		<?php if ( ! $is_www ) : ?>
 			<tr>
 				<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
 				<td>
-					<?php printf(
+					<?php
+					printf(
 						/* translators: %s: host name */
 						__( 'The internet address of your network will be %s.' ),
 						'<code>' . $hostname . '</code>'
-					); ?>
+					);
+					?>
 				</td>
 			</tr>
 		<?php endif; ?>
@@ -354,7 +391,6 @@ function network_step2( $errors = false ) {
 	$wp_siteurl_subdir = preg_replace( '#^' . preg_quote( $home_path, '#' ) . '#', '', $abspath_fix );
 	$rewrite_base      = ! empty( $wp_siteurl_subdir ) ? ltrim( trailingslashit( $wp_siteurl_subdir ), '/' ) : '';
 
-
 	$location_of_wp_config = $abspath_fix;
 	if ( ! file_exists( ABSPATH . 'wp-config.php' ) && file_exists( dirname( ABSPATH ) . '/wp-config.php' ) ) {
 		$location_of_wp_config = dirname( $abspath_fix );
@@ -362,14 +398,16 @@ function network_step2( $errors = false ) {
 	$location_of_wp_config = trailingslashit( $location_of_wp_config );
 
 	// Wildcard DNS message.
-	if ( is_wp_error( $errors ) )
+	if ( is_wp_error( $errors ) ) {
 		echo '<div class="error">' . $errors->get_error_message() . '</div>';
+	}
 
 	if ( $_POST ) {
-		if ( allow_subdomain_install() )
+		if ( allow_subdomain_install() ) {
 			$subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
-		else
+		} else {
 			$subdomain_install = false;
+		}
 	} else {
 		if ( is_multisite() ) {
 			$subdomain_install = is_subdomain_install();
@@ -393,37 +431,41 @@ function network_step2( $errors = false ) {
 ?>
 		<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><?php
-			if ( file_exists( $home_path . '.htaccess' ) ) {
-				echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-				printf(
-					/* translators: 1: wp-config.php 2: .htaccess */
-					__( 'We recommend you back up your existing %1$s and %2$s files.' ),
-					'<code>wp-config.php</code>',
-					'<code>.htaccess</code>'
-				);
-			} elseif ( file_exists( $home_path . 'web.config' ) ) {
-				echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-				printf(
-					/* translators: 1: wp-config.php 2: web.config */
-					__( 'We recommend you back up your existing %1$s and %2$s files.' ),
-					'<code>wp-config.php</code>',
-					'<code>web.config</code>'
-				);
-			} else {
-				echo '<strong>' . __( 'Caution:' ) . '</strong> ';
-				printf(
-					/* translators: 1: wp-config.php */
-					__( 'We recommend you back up your existing %s file.' ),
-					'<code>wp-config.php</code>'
-				);
-			}
-		?></p></div>
+		<div class="updated inline"><p>
+		<?php
+		if ( file_exists( $home_path . '.htaccess' ) ) {
+			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+			printf(
+				/* translators: 1: wp-config.php 2: .htaccess */
+				__( 'We recommend you back up your existing %1$s and %2$s files.' ),
+				'<code>wp-config.php</code>',
+				'<code>.htaccess</code>'
+			);
+		} elseif ( file_exists( $home_path . 'web.config' ) ) {
+			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+			printf(
+				/* translators: 1: wp-config.php 2: web.config */
+				__( 'We recommend you back up your existing %1$s and %2$s files.' ),
+				'<code>wp-config.php</code>',
+				'<code>web.config</code>'
+			);
+		} else {
+			echo '<strong>' . __( 'Caution:' ) . '</strong> ';
+			printf(
+				/* translators: 1: wp-config.php */
+				__( 'We recommend you back up your existing %s file.' ),
+				'<code>wp-config.php</code>'
+			);
+		}
+		?>
+		</p></div>
 <?php
 	}
 ?>
 		<ol>
-			<li><p><?php printf(
+			<li><p>
+			<?php
+			printf(
 				/* translators: 1: wp-config.php 2: location of wp-config file, 3: translated version of "That's all, stop editing! Happy blogging." */
 				__( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading %3$s:' ),
 				'<code>wp-config.php</code>',
@@ -434,7 +476,9 @@ function network_step2( $errors = false ) {
 				 * https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
 				 */
 				'<code>/* ' . __( 'That&#8217;s all, stop editing! Happy blogging.' ) . ' */</code>'
-			); ?></p>
+			);
+			?>
+			</p>
 				<textarea class="code" readonly="readonly" cols="100" rows="7">
 define('MULTISITE', true);
 define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>);
@@ -444,58 +488,68 @@ define('SITE_ID_CURRENT_SITE', 1);
 define('BLOG_ID_CURRENT_SITE', 1);
 </textarea>
 <?php
-	$keys_salts = array( 'AUTH_KEY' => '', 'SECURE_AUTH_KEY' => '', 'LOGGED_IN_KEY' => '', 'NONCE_KEY' => '', 'AUTH_SALT' => '', 'SECURE_AUTH_SALT' => '', 'LOGGED_IN_SALT' => '', 'NONCE_SALT' => '' );
-	foreach ( $keys_salts as $c => $v ) {
-		if ( defined( $c ) )
-			unset( $keys_salts[ $c ] );
+	$keys_salts = array(
+		'AUTH_KEY'         => '',
+		'SECURE_AUTH_KEY'  => '',
+		'LOGGED_IN_KEY'    => '',
+		'NONCE_KEY'        => '',
+		'AUTH_SALT'        => '',
+		'SECURE_AUTH_SALT' => '',
+		'LOGGED_IN_SALT'   => '',
+		'NONCE_SALT'       => '',
+	);
+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 ) . "' );";
-			}
-		} 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 ) . "' );";
-			}
+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 ) . "' );";
 		}
-		$num_keys_salts = count( $keys_salts );
+	} 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 );
 ?>
-	<p>
-		<?php
-			if ( 1 == $num_keys_salts ) {
-				printf(
-					/* translators: 1: wp-config.php */
-					__( 'This unique authentication key is also missing from your %s file.' ),
-					'<code>wp-config.php</code>'
-				);
-			} else {
-				printf(
-					/* translators: 1: wp-config.php */
-					__( 'These unique authentication keys are also missing from your %s file.' ),
-					'<code>wp-config.php</code>'
-				);
-			}
+<p>
+	<?php
+	if ( 1 == $num_keys_salts ) {
+		printf(
+			/* translators: 1: wp-config.php */
+			__( 'This unique authentication key is also missing from your %s file.' ),
+			'<code>wp-config.php</code>'
+		);
+	} else {
+		printf(
+			/* translators: 1: 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
-	}
+}
 ?>
 </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}';
+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>
@@ -504,14 +558,14 @@ define('BLOG_ID_CURRENT_SITE', 1);
                     <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 .= '
+	}
+			$web_config_file .= '
                 <rule name="WordPress Rule 2" stopProcessing="true">
                     <match url="^' . $iis_subdir_match . 'wp-admin$" ignoreCase="false" />
                     <action type="Redirect" url="' . $iis_subdir_replacement . 'wp-admin/" redirectType="Permanent" />
@@ -542,26 +596,28 @@ define('BLOG_ID_CURRENT_SITE', 1);
 </configuration>
 ';
 
-		echo '<li><p>';
-		printf(
-			/* translators: 1: a filename like .htaccess. 2: a file path. */
-			__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
-			'<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>';
-		?>
-		<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
+			echo '<li><p>';
+			printf(
+				/* translators: 1: a filename like .htaccess. 2: a file path. */
+				__( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ),
+				'<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>';
+	}
+	?>
+	<textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
 		</textarea></li>
 		</ol>
 
-	<?php else : // end iis7_supports_permalinks(). construct an htaccess file instead:
+	<?php
+	else : // end iis7_supports_permalinks(). construct an htaccess file instead:
 
 		$ms_files_rewriting = '';
 		if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
-			$ms_files_rewriting = "\n# uploaded files\nRewriteRule ^";
+			$ms_files_rewriting  = "\n# uploaded files\nRewriteRule ^";
 			$ms_files_rewriting .= $subdir_match . "files/(.+) {$rewrite_base}" . WPINC . "/ms-files.php?file={$subdir_replacement_12} [L]" . "\n";
 		}
 
@@ -590,17 +646,20 @@ EOF;
 			'<code>' . $home_path . '</code>'
 		);
 		echo '</p>';
-		if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
+		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="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
 <?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
 		</ol>
 
-	<?php endif; // end IIS/Apache code branches.
+	<?php
+	endif; // end IIS/Apache code branches.
 
-	if ( !is_multisite() ) { ?>
+	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/noop.php b/wp-admin/includes/noop.php
index 1fa4787dc0..134bef7efe 100644
--- a/wp-admin/includes/noop.php
+++ b/wp-admin/includes/noop.php
@@ -65,7 +65,8 @@ function get_bloginfo() {}
 /**
  * @ignore
  */
-function is_admin() {return true;}
+function is_admin() {
+	return true;}
 
 /**
  * @ignore
@@ -93,15 +94,15 @@ function includes_url() {}
 function wp_guess_url() {}
 
 if ( ! function_exists( 'json_encode' ) ) :
-/**
- * @ignore
- */
-function json_encode() {}
+	/**
+	 * @ignore
+	 */
+	function json_encode() {}
 endif;
 
 function get_file( $path ) {
 
-	if ( function_exists('realpath') ) {
+	if ( function_exists( 'realpath' ) ) {
 		$path = realpath( $path );
 	}
 
@@ -110,4 +111,4 @@ function get_file( $path ) {
 	}
 
 	return @file_get_contents( $path );
-}
\ No newline at end of file
+}
diff --git a/wp-admin/includes/options.php b/wp-admin/includes/options.php
index f011efd312..2cf257bd80 100644
--- a/wp-admin/includes/options.php
+++ b/wp-admin/includes/options.php
@@ -107,7 +107,7 @@ function options_reading_add_js() {
 				selects.prop( 'disabled', ! staticPage.prop('checked') );
 			};
 		check_disabled();
- 		section.find('input:radio').change(check_disabled);
+		 section.find('input:radio').change(check_disabled);
 	});
 </script>
 <?php
diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index 3c414d609f..d63e5dc97f 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -145,18 +145,19 @@ function plugins_api( $action, $args = array() ) {
 		include( ABSPATH . WPINC . '/version.php' );
 
 		$url = $http_url = 'http://api.wordpress.org/plugins/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
+		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
 			$url = set_url_scheme( $url, 'https' );
+		}
 
 		$http_args = array(
-			'timeout' => 15,
+			'timeout'    => 15,
 			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
-			'body' => array(
-				'action' => $action,
-				'request' => serialize( $args )
-			)
+			'body'       => array(
+				'action'  => $action,
+				'request' => serialize( $args ),
+			),
 		);
-		$request = wp_remote_post( $url, $http_args );
+		$request   = wp_remote_post( $url, $http_args );
 
 		if ( $ssl && is_wp_error( $request ) ) {
 			trigger_error(
@@ -170,8 +171,9 @@ function plugins_api( $action, $args = array() ) {
 			$request = wp_remote_post( $http_url, $http_args );
 		}
 
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error( 'plugins_api_failed',
+		if ( is_wp_error( $request ) ) {
+			$res = new WP_Error(
+				'plugins_api_failed',
 				sprintf(
 					/* translators: %s: support forums URL */
 					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
@@ -182,7 +184,8 @@ function plugins_api( $action, $args = array() ) {
 		} else {
 			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
 			if ( ! is_object( $res ) && ! is_array( $res ) ) {
-				$res = new WP_Error( 'plugins_api_failed',
+				$res = new WP_Error(
+					'plugins_api_failed',
 					sprintf(
 						/* translators: %s: support forums URL */
 						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
@@ -192,7 +195,7 @@ function plugins_api( $action, $args = array() ) {
 				);
 			}
 		}
-	} elseif ( !is_wp_error($res) ) {
+	} elseif ( ! is_wp_error( $res ) ) {
 		$res->external = true;
 	}
 
@@ -217,14 +220,16 @@ function plugins_api( $action, $args = array() ) {
  * @return array
  */
 function install_popular_tags( $args = array() ) {
-	$key = md5(serialize($args));
-	if ( false !== ($tags = get_site_transient('poptags_' . $key) ) )
+	$key = md5( serialize( $args ) );
+	if ( false !== ( $tags = get_site_transient( 'poptags_' . $key ) ) ) {
 		return $tags;
+	}
 
-	$tags = plugins_api('hot_tags', $args);
+	$tags = plugins_api( 'hot_tags', $args );
 
-	if ( is_wp_error($tags) )
+	if ( is_wp_error( $tags ) ) {
 		return $tags;
+	}
 
 	set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS );
 
@@ -241,30 +246,35 @@ function install_dashboard() {
 	<?php display_plugins_table(); ?>
 
 	<div class="plugins-popular-tags-wrapper">
-	<h2><?php _e( 'Popular tags' ) ?></h2>
-	<p><?php _e( 'You may also browse based on the most popular tags in the Plugin Directory:' ) ?></p>
+	<h2><?php _e( 'Popular tags' ); ?></h2>
+	<p><?php _e( 'You may also browse based on the most popular tags in the Plugin Directory:' ); ?></p>
 	<?php
 
 	$api_tags = install_popular_tags();
 
 	echo '<p class="popular-tags">';
-	if ( is_wp_error($api_tags) ) {
+	if ( is_wp_error( $api_tags ) ) {
 		echo $api_tags->get_error_message();
 	} else {
 		//Set up the tags in a way which can be interpreted by wp_generate_tag_cloud()
 		$tags = array();
 		foreach ( (array) $api_tags as $tag ) {
-			$url = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) );
-			$data = array(
-				'link' => esc_url( $url ),
-				'name' => $tag['name'],
-				'slug' => $tag['slug'],
-				'id' => sanitize_title_with_dashes( $tag['name'] ),
-				'count' => $tag['count']
+			$url                  = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) );
+			$data                 = array(
+				'link'  => esc_url( $url ),
+				'name'  => $tag['name'],
+				'slug'  => $tag['slug'],
+				'id'    => sanitize_title_with_dashes( $tag['name'] ),
+				'count' => $tag['count'],
 			);
 			$tags[ $tag['name'] ] = (object) $data;
 		}
-		echo wp_generate_tag_cloud($tags, array( 'single_text' => __('%s plugin'), 'multiple_text' => __('%s plugins') ) );
+		echo wp_generate_tag_cloud(
+			$tags, array(
+				'single_text'   => __( '%s plugin' ),
+				'multiple_text' => __( '%s plugins' ),
+			)
+		);
 	}
 	echo '</p><br class="clear" /></div>';
 }
@@ -280,7 +290,8 @@ function install_dashboard() {
 function install_search_form( $deprecated = true ) {
 	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
 	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	?><form class="search-form search-plugins" method="get">
+	?>
+	<form class="search-form search-plugins" method="get">
 		<input type="hidden" name="tab" value="search" />
 		<label class="screen-reader-text" for="typeselector"><?php _e( 'Search plugins by:' ); ?></label>
 		<select name="type" id="typeselector">
@@ -289,21 +300,23 @@ function install_search_form( $deprecated = true ) {
 			<option value="tag"<?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Plugin Installer' ); ?></option>
 		</select>
 		<label><span class="screen-reader-text"><?php _e( 'Search Plugins' ); ?></span>
-			<input type="search" name="s" value="<?php echo esc_attr( $term ) ?>" class="wp-filter-search" placeholder="<?php esc_attr_e( 'Search plugins...' ); ?>" />
+			<input type="search" name="s" value="<?php echo esc_attr( $term ); ?>" class="wp-filter-search" placeholder="<?php esc_attr_e( 'Search plugins...' ); ?>" />
 		</label>
 		<?php submit_button( __( 'Search Plugins' ), 'hide-if-js', false, false, array( 'id' => 'search-submit' ) ); ?>
-	</form><?php
+	</form>
+	<?php
 }
 
 /**
  * Upload from zip
+ *
  * @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'); ?>">
+	<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' ); ?>">
 		<?php wp_nonce_field( 'plugin-upload' ); ?>
 		<label class="screen-reader-text" for="pluginzip"><?php _e( 'Plugin zip file' ); ?></label>
 		<input type="file" id="pluginzip" name="pluginzip" />
@@ -315,8 +328,8 @@ function install_plugins_upload() {
 
 /**
  * Show a username form for the favorites page
- * @since 3.5.0
  *
+ * @since 3.5.0
  */
 function install_plugins_favorites_form() {
 	$user   = get_user_option( 'wporg_favorites' );
@@ -346,15 +359,15 @@ function display_plugins_table() {
 	global $wp_list_table;
 
 	switch ( current_filter() ) {
-		case 'install_plugins_favorites' :
+		case 'install_plugins_favorites':
 			if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
 				return;
 			}
 			break;
-		case 'install_plugins_recommended' :
+		case 'install_plugins_recommended':
 			echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
 			break;
-		case 'install_plugins_beta' :
+		case 'install_plugins_beta':
 			printf(
 				'<p>' . __( 'You are using a development version of WordPress. These feature plugins are also under development. <a href="%s">Learn more</a>.' ) . '</p>',
 				'https://make.wordpress.org/core/handbook/about/release-cycle/features-as-plugins/'
@@ -385,29 +398,31 @@ function display_plugins_table() {
  *     @type string $file    Plugin filename relative to the plugins directory.
  * }
  */
-function install_plugin_install_status($api, $loop = false) {
+function install_plugin_install_status( $api, $loop = false ) {
 	// This function is called recursively, $loop prevents further loops.
-	if ( is_array($api) )
+	if ( is_array( $api ) ) {
 		$api = (object) $api;
+	}
 
 	// Default to a "new" plugin
-	$status = 'install';
-	$url = false;
+	$status      = 'install';
+	$url         = false;
 	$update_file = false;
 
 	/*
 	 * Check to see if this plugin is known to be installed,
 	 * and has an update awaiting it.
 	 */
-	$update_plugins = get_site_transient('update_plugins');
+	$update_plugins = get_site_transient( 'update_plugins' );
 	if ( isset( $update_plugins->response ) ) {
-		foreach ( (array)$update_plugins->response as $file => $plugin ) {
+		foreach ( (array) $update_plugins->response as $file => $plugin ) {
 			if ( $plugin->slug === $api->slug ) {
-				$status = 'update_available';
+				$status      = 'update_available';
 				$update_file = $file;
-				$version = $plugin->new_version;
-				if ( current_user_can('update_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
+				$version     = $plugin->new_version;
+				if ( current_user_can( 'update_plugins' ) ) {
+					$url = wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' . $update_file ), 'upgrade-plugin_' . $update_file );
+				}
 				break;
 			}
 		}
@@ -415,36 +430,39 @@ function install_plugin_install_status($api, $loop = false) {
 
 	if ( 'install' == $status ) {
 		if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
-			$installed_plugin = get_plugins('/' . $api->slug);
-			if ( empty($installed_plugin) ) {
-				if ( current_user_can('install_plugins') )
-					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			$installed_plugin = get_plugins( '/' . $api->slug );
+			if ( empty( $installed_plugin ) ) {
+				if ( current_user_can( 'install_plugins' ) ) {
+					$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug );
+				}
 			} else {
-				$key = array_keys( $installed_plugin );
-				$key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+				$key         = array_keys( $installed_plugin );
+				$key         = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
 				$update_file = $api->slug . '/' . $key;
-				if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
+				if ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '=' ) ) {
 					$status = 'latest_installed';
-				} elseif ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '<') ) {
-					$status = 'newer_installed';
+				} elseif ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '<' ) ) {
+					$status  = 'newer_installed';
 					$version = $installed_plugin[ $key ]['Version'];
 				} else {
 					//If the above update check failed, Then that probably means that the update checker has out-of-date information, force a refresh
 					if ( ! $loop ) {
-						delete_site_transient('update_plugins');
+						delete_site_transient( 'update_plugins' );
 						wp_update_plugins();
-						return install_plugin_install_status($api, true);
+						return install_plugin_install_status( $api, true );
 					}
 				}
 			}
 		} else {
 			// "install" & no directory with that slug
-			if ( current_user_can('install_plugins') )
-				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
+			if ( current_user_can( 'install_plugins' ) ) {
+				$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug );
+			}
 		}
 	}
-	if ( isset($_GET['from']) )
+	if ( isset( $_GET['from'] ) ) {
 		$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	}
 
 	$file = $update_file;
 	return compact( 'status', 'url', 'version', 'file' );
@@ -464,45 +482,69 @@ function install_plugin_information() {
 		return;
 	}
 
-	$api = plugins_api( 'plugin_information', array(
-		'slug' => wp_unslash( $_REQUEST['plugin'] ),
-		'is_ssl' => is_ssl(),
-		'fields' => array(
-			'banners' => true,
-			'reviews' => true,
-			'downloaded' => false,
-			'active_installs' => true
+	$api = plugins_api(
+		'plugin_information', array(
+			'slug'   => wp_unslash( $_REQUEST['plugin'] ),
+			'is_ssl' => is_ssl(),
+			'fields' => array(
+				'banners'         => true,
+				'reviews'         => true,
+				'downloaded'      => false,
+				'active_installs' => true,
+			),
 		)
-	) );
+	);
 
 	if ( is_wp_error( $api ) ) {
 		wp_die( $api );
 	}
 
 	$plugins_allowedtags = array(
-		'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),
-		'abbr' => array( 'title' => array() ), 'acronym' => array( 'title' => array() ),
-		'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
-		'div' => array( 'class' => array() ), 'span' => array( 'class' => array() ),
-		'p' => array(), 'br' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
-		'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
-		'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() ),
+		'a'          => array(
+			'href'   => array(),
+			'title'  => array(),
+			'target' => array(),
+		),
+		'abbr'       => array( 'title' => array() ),
+		'acronym'    => array( 'title' => array() ),
+		'code'       => array(),
+		'pre'        => array(),
+		'em'         => array(),
+		'strong'     => array(),
+		'div'        => array( 'class' => array() ),
+		'span'       => array( 'class' => array() ),
+		'p'          => array(),
+		'br'         => array(),
+		'ul'         => array(),
+		'ol'         => array(),
+		'li'         => array(),
+		'h1'         => array(),
+		'h2'         => array(),
+		'h3'         => array(),
+		'h4'         => array(),
+		'h5'         => array(),
+		'h6'         => array(),
+		'img'        => array(
+			'src'   => array(),
+			'class' => array(),
+			'alt'   => array(),
+		),
 		'blockquote' => array( 'cite' => true ),
 	);
 
 	$plugins_section_titles = array(
-		'description'  => _x( 'Description',  'Plugin installer section title' ),
+		'description'  => _x( 'Description', 'Plugin installer section title' ),
 		'installation' => _x( 'Installation', 'Plugin installer section title' ),
-		'faq'          => _x( 'FAQ',          'Plugin installer section title' ),
-		'screenshots'  => _x( 'Screenshots',  'Plugin installer section title' ),
-		'changelog'    => _x( 'Changelog',    'Plugin installer section title' ),
-		'reviews'      => _x( 'Reviews',      'Plugin installer section title' ),
-		'other_notes'  => _x( 'Other Notes',  'Plugin installer section title' )
+		'faq'          => _x( 'FAQ', 'Plugin installer section title' ),
+		'screenshots'  => _x( 'Screenshots', 'Plugin installer section title' ),
+		'changelog'    => _x( 'Changelog', 'Plugin installer section title' ),
+		'reviews'      => _x( 'Reviews', 'Plugin installer section title' ),
+		'other_notes'  => _x( 'Other Notes', 'Plugin installer section title' ),
 	);
 
 	// Sanitize HTML
 	foreach ( (array) $api->sections as $section_name => $content ) {
-		$api->sections[$section_name] = wp_kses( $content, $plugins_allowedtags );
+		$api->sections[ $section_name ] = wp_kses( $content, $plugins_allowedtags );
 	}
 
 	foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) {
@@ -516,7 +558,7 @@ function install_plugin_information() {
 	$section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description'; // Default to the Description tab, Do not translate, API returns English.
 	if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
 		$section_titles = array_keys( (array) $api->sections );
-		$section = reset( $section_titles );
+		$section        = reset( $section_titles );
 	}
 
 	iframe_header( __( 'Plugin Installation' ) );
@@ -525,8 +567,8 @@ function install_plugin_information() {
 
 	if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) {
 		$_with_banner = 'with-banner';
-		$low  = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low'];
-		$high = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high'];
+		$low          = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low'];
+		$high         = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high'];
 		?>
 		<style type="text/css">
 			#plugin-information-title.with-banner {
@@ -556,9 +598,14 @@ function install_plugin_information() {
 			$title = ucwords( str_replace( '_', ' ', $section_name ) );
 		}
 
-		$class = ( $section_name === $section ) ? ' class="current"' : '';
-		$href = add_query_arg( array('tab' => $tab, 'section' => $section_name) );
-		$href = esc_url( $href );
+		$class       = ( $section_name === $section ) ? ' class="current"' : '';
+		$href        = add_query_arg(
+			array(
+				'tab'     => $tab,
+				'section' => $section_name,
+			)
+		);
+		$href        = esc_url( $href );
 		$san_section = esc_attr( $section_name );
 		echo "\t<a name='$san_section' href='$href' $class>$title</a>\n";
 	}
@@ -591,15 +638,17 @@ function install_plugin_information() {
 			<?php } if ( ! empty( $api->tested ) ) { ?>
 				<li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
 			<?php } if ( isset( $api->active_installs ) ) { ?>
-				<li><strong><?php _e( 'Active Installations:' ); ?></strong> <?php
-					if ( $api->active_installs >= 1000000 ) {
-						_ex( '1+ Million', 'Active plugin installations' );
-					} elseif ( 0 == $api->active_installs ) {
-						_ex( 'Less Than 10', 'Active plugin installations' );
-					} else {
-						echo number_format_i18n( $api->active_installs ) . '+';
-					}
-					?></li>
+				<li><strong><?php _e( 'Active Installations:' ); ?></strong> 
+										<?php
+										if ( $api->active_installs >= 1000000 ) {
+											_ex( '1+ Million', 'Active plugin installations' );
+										} elseif ( 0 == $api->active_installs ) {
+											_ex( 'Less Than 10', 'Active plugin installations' );
+										} else {
+											echo number_format_i18n( $api->active_installs ) . '+';
+										}
+					?>
+					</li>
 			<?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
 				<li><a target="_blank" href="<?php echo __( 'https://wordpress.org/plugins/' ) . $api->slug; ?>/"><?php _e( 'WordPress.org Plugin Page &#187;' ); ?></a></li>
 			<?php } if ( ! empty( $api->homepage ) ) { ?>
@@ -610,11 +659,21 @@ function install_plugin_information() {
 		</ul>
 		<?php if ( ! empty( $api->rating ) ) { ?>
 			<h3><?php _e( 'Average Rating' ); ?></h3>
-			<?php wp_star_rating( array( 'rating' => $api->rating, 'type' => 'percent', 'number' => $api->num_ratings ) ); ?>
+			<?php
+			wp_star_rating(
+				array(
+					'rating' => $api->rating,
+					'type'   => 'percent',
+					'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 ) { ?>
+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
@@ -622,10 +681,13 @@ function install_plugin_information() {
 				// Avoid div-by-zero.
 				$_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
 				/* translators: 1: number of stars (used to determine singular/plural), 2: number of reviews */
-				$aria_label = esc_attr( sprintf( _n( 'Reviews with %1$d star: %2$s. Opens in a new window.', 'Reviews with %1$d stars: %2$s. Opens in a new window.', $key ),
-					$key,
-					number_format_i18n( $ratecount )
-				) );
+				$aria_label = esc_attr(
+					sprintf(
+						_n( 'Reviews with %1$d star: %2$s. Opens in a new window.', 'Reviews with %1$d stars: %2$s. Opens in a new window.', $key ),
+						$key,
+						number_format_i18n( $ratecount )
+					)
+				);
 				?>
 				<div class="counter-container">
 						<span class="counter-label">
@@ -639,8 +701,9 @@ function install_plugin_information() {
 				</div>
 				<?php
 			}
-		}
-		if ( ! empty( $api->contributors ) ) { ?>
+}
+if ( ! empty( $api->contributors ) ) {
+		?>
 			<h3><?php _e( 'Contributors' ); ?></h3>
 			<ul class="contributors">
 				<?php
@@ -701,12 +764,12 @@ function install_plugin_information() {
 				break;
 			case 'update_available':
 				if ( $status['url'] ) {
-					echo '<a data-slug="' . esc_attr( $api->slug ) . '" data-plugin="' . esc_attr( $status['file'] ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) .'</a>';
+					echo '<a data-slug="' . esc_attr( $api->slug ) . '" data-plugin="' . esc_attr( $status['file'] ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) . '</a>';
 				}
 				break;
 			case 'newer_installed':
 				/* translators: %s: Plugin version */
-				echo '<a class="button button-primary right disabled">' . sprintf( __( 'Newer Version (%s) Installed'), $status['version'] ) . '</a>';
+				echo '<a class="button button-primary right disabled">' . sprintf( __( 'Newer Version (%s) Installed' ), $status['version'] ) . '</a>';
 				break;
 			case 'latest_installed':
 				echo '<a class="button button-primary right disabled">' . __( 'Latest Version Installed' ) . '</a>';
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 1a9889d3d3..2366dd0359 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -22,15 +22,15 @@
  *     Author URI: Link to the author's web site
  *     Version: Must be set in the plugin for WordPress 2.3+
  *     Text Domain: Optional. Unique identifier, should be same as the one used in
- *    		load_plugin_textdomain()
+ *          load_plugin_textdomain()
  *     Domain Path: Optional. Only useful if the translations are located in a
- *    		folder above the plugin's base path. For example, if .mo files are
- *    		located in the locale folder then Domain Path will be "/locale/" and
- *    		must have the first slash. Defaults to the base folder the plugin is
- *    		located in.
+ *          folder above the plugin's base path. For example, if .mo files are
+ *          located in the locale folder then Domain Path will be "/locale/" and
+ *          must have the first slash. Defaults to the base folder the plugin is
+ *          located in.
  *     Network: Optional. Specify "Network: true" to require that a plugin is activated
- *    		across all sites in an installation. This will prevent a plugin from being
- *    		activated on a single site when Multisite is enabled.
+ *          across all sites in an installation. This will prevent a plugin from being
+ *          activated on a single site when Multisite is enabled.
  *      * / # Remove the space to close comment
  *
  * Some users have issues with opening large files and manipulating the contents
@@ -68,17 +68,17 @@
 function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
 
 	$default_headers = array(
-		'Name' => 'Plugin Name',
-		'PluginURI' => 'Plugin URI',
-		'Version' => 'Version',
+		'Name'        => 'Plugin Name',
+		'PluginURI'   => 'Plugin URI',
+		'Version'     => 'Version',
 		'Description' => 'Description',
-		'Author' => 'Author',
-		'AuthorURI' => 'Author URI',
-		'TextDomain' => 'Text Domain',
-		'DomainPath' => 'Domain Path',
-		'Network' => 'Network',
+		'Author'      => 'Author',
+		'AuthorURI'   => 'Author URI',
+		'TextDomain'  => 'Text Domain',
+		'DomainPath'  => 'Domain Path',
+		'Network'     => 'Network',
 		// Site Wide Only is deprecated in favor of Network.
-		'_sitewide' => 'Site Wide Only',
+		'_sitewide'   => 'Site Wide Only',
 	);
 
 	$plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
@@ -136,47 +136,54 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup
 			$textdomain = 'default';
 		}
 		if ( $textdomain ) {
-			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field )
+			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field ) {
 				$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+			}
 		}
 	}
 
 	// Sanitize fields
-	$allowed_tags = $allowed_tags_in_links = array(
+	$allowed_tags      = $allowed_tags_in_links = array(
 		'abbr'    => array( 'title' => true ),
 		'acronym' => array( 'title' => true ),
 		'code'    => true,
 		'em'      => true,
 		'strong'  => true,
 	);
-	$allowed_tags['a'] = array( 'href' => true, 'title' => true );
+	$allowed_tags['a'] = array(
+		'href'  => true,
+		'title' => true,
+	);
 
 	// Name is marked up inside <a> tags. Don't allow these.
 	// Author is too, but some plugins have used <a> here (omitting Author URI).
-	$plugin_data['Name']        = wp_kses( $plugin_data['Name'],        $allowed_tags_in_links );
-	$plugin_data['Author']      = wp_kses( $plugin_data['Author'],      $allowed_tags );
+	$plugin_data['Name']   = wp_kses( $plugin_data['Name'], $allowed_tags_in_links );
+	$plugin_data['Author'] = wp_kses( $plugin_data['Author'], $allowed_tags );
 
 	$plugin_data['Description'] = wp_kses( $plugin_data['Description'], $allowed_tags );
-	$plugin_data['Version']     = wp_kses( $plugin_data['Version'],     $allowed_tags );
+	$plugin_data['Version']     = wp_kses( $plugin_data['Version'], $allowed_tags );
 
-	$plugin_data['PluginURI']   = esc_url( $plugin_data['PluginURI'] );
-	$plugin_data['AuthorURI']   = esc_url( $plugin_data['AuthorURI'] );
+	$plugin_data['PluginURI'] = esc_url( $plugin_data['PluginURI'] );
+	$plugin_data['AuthorURI'] = esc_url( $plugin_data['AuthorURI'] );
 
 	$plugin_data['Title']      = $plugin_data['Name'];
 	$plugin_data['AuthorName'] = $plugin_data['Author'];
 
 	// Apply markup
 	if ( $markup ) {
-		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] )
+		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] ) {
 			$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+		}
 
-		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] )
+		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] ) {
 			$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		}
 
 		$plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
 
-		if ( $plugin_data['Author'] )
-			$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		if ( $plugin_data['Author'] ) {
+			$plugin_data['Description'] .= ' <cite>' . sprintf( __( 'By %s.' ), $plugin_data['Author'] ) . '</cite>';
+		}
 	}
 
 	return $plugin_data;
@@ -192,7 +199,7 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup
  */
 function get_plugin_files( $plugin ) {
 	$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
-	$dir = dirname( $plugin_file );
+	$dir         = dirname( $plugin_file );
 
 	$plugin_files = array( plugin_basename( $plugin_file ) );
 
@@ -237,64 +244,74 @@ function get_plugin_files( $plugin ) {
  * @param string $plugin_folder Optional. Relative path to single plugin folder.
  * @return array Key is the plugin file path and the value is an array of the plugin data.
  */
-function get_plugins($plugin_folder = '') {
+function get_plugins( $plugin_folder = '' ) {
 
-	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
+	if ( ! $cache_plugins = wp_cache_get( 'plugins', 'plugins' ) ) {
 		$cache_plugins = array();
+	}
 
-	if ( isset($cache_plugins[ $plugin_folder ]) )
+	if ( isset( $cache_plugins[ $plugin_folder ] ) ) {
 		return $cache_plugins[ $plugin_folder ];
+	}
 
-	$wp_plugins = array ();
+	$wp_plugins  = array();
 	$plugin_root = WP_PLUGIN_DIR;
-	if ( !empty($plugin_folder) )
+	if ( ! empty( $plugin_folder ) ) {
 		$plugin_root .= $plugin_folder;
+	}
 
 	// Files in wp-content/plugins directory
-	$plugins_dir = @ opendir( $plugin_root);
+	$plugins_dir  = @ opendir( $plugin_root );
 	$plugin_files = array();
 	if ( $plugins_dir ) {
-		while (($file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr($file, 0, 1) == '.' )
+		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
+			if ( substr( $file, 0, 1 ) == '.' ) {
 				continue;
-			if ( is_dir( $plugin_root.'/'.$file ) ) {
-				$plugins_subdir = @ opendir( $plugin_root.'/'.$file );
+			}
+			if ( is_dir( $plugin_root . '/' . $file ) ) {
+				$plugins_subdir = @ opendir( $plugin_root . '/' . $file );
 				if ( $plugins_subdir ) {
-					while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( substr($subfile, 0, 1) == '.' )
+					while ( ( $subfile = readdir( $plugins_subdir ) ) !== false ) {
+						if ( substr( $subfile, 0, 1 ) == '.' ) {
 							continue;
-						if ( substr($subfile, -4) == '.php' )
+						}
+						if ( substr( $subfile, -4 ) == '.php' ) {
 							$plugin_files[] = "$file/$subfile";
+						}
 					}
 					closedir( $plugins_subdir );
 				}
 			} else {
-				if ( substr($file, -4) == '.php' )
+				if ( substr( $file, -4 ) == '.php' ) {
 					$plugin_files[] = $file;
+				}
 			}
 		}
 		closedir( $plugins_dir );
 	}
 
-	if ( empty($plugin_files) )
+	if ( empty( $plugin_files ) ) {
 		return $wp_plugins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( "$plugin_root/$plugin_file" ) )
+		if ( ! is_readable( "$plugin_root/$plugin_file" ) ) {
 			continue;
+		}
 
 		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if ( empty( $plugin_data['Name'] ) ) {
 			continue;
+		}
 
-		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
+		$wp_plugins[ plugin_basename( $plugin_file ) ] = $plugin_data;
 	}
 
 	uasort( $wp_plugins, '_sort_uname_callback' );
 
 	$cache_plugins[ $plugin_folder ] = $wp_plugins;
-	wp_cache_set('plugins', $cache_plugins, 'plugins');
+	wp_cache_set( 'plugins', $cache_plugins, 'plugins' );
 
 	return $wp_plugins;
 }
@@ -312,12 +329,14 @@ function get_mu_plugins() {
 	// Files in wp-content/mu-plugins directory
 	$plugin_files = array();
 
-	if ( ! is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir( WPMU_PLUGIN_DIR ) ) {
 		return $wp_plugins;
+	}
 	if ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr( $file, -4 ) == '.php' )
+			if ( substr( $file, -4 ) == '.php' ) {
 				$plugin_files[] = $file;
+			}
 		}
 	} else {
 		return $wp_plugins;
@@ -325,23 +344,27 @@ function get_mu_plugins() {
 
 	@closedir( $plugins_dir );
 
-	if ( empty($plugin_files) )
+	if ( empty( $plugin_files ) ) {
 		return $wp_plugins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) )
+		if ( ! is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) ) {
 			continue;
+		}
 
 		$plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if ( empty( $plugin_data['Name'] ) ) {
 			$plugin_data['Name'] = $plugin_file;
+		}
 
 		$wp_plugins[ $plugin_file ] = $plugin_data;
 	}
 
-	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) // silence is golden
+	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php' ) <= 30 ) { // silence is golden
 		unset( $wp_plugins['index.php'] );
+	}
 
 	uasort( $wp_plugins, '_sort_uname_callback' );
 
@@ -365,7 +388,7 @@ function _sort_uname_callback( $a, $b ) {
  * @return array Key is the file path and the value is an array of the plugin data.
  */
 function get_dropins() {
-	$dropins = array();
+	$dropins      = array();
 	$plugin_files = array();
 
 	$_dropins = _get_dropins();
@@ -373,8 +396,9 @@ function get_dropins() {
 	// These exist in the wp-content directory
 	if ( $plugins_dir = @ opendir( WP_CONTENT_DIR ) ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( isset( $_dropins[ $file ] ) )
+			if ( isset( $_dropins[ $file ] ) ) {
 				$plugin_files[] = $file;
+			}
 		}
 	} else {
 		return $dropins;
@@ -382,15 +406,18 @@ function get_dropins() {
 
 	@closedir( $plugins_dir );
 
-	if ( empty($plugin_files) )
+	if ( empty( $plugin_files ) ) {
 		return $dropins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
+		if ( ! is_readable( WP_CONTENT_DIR . "/$plugin_file" ) ) {
 			continue;
+		}
 		$plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
-		if ( empty( $plugin_data['Name'] ) )
+		if ( empty( $plugin_data['Name'] ) ) {
 			$plugin_data['Name'] = $plugin_file;
+		}
 		$dropins[ $plugin_file ] = $plugin_data;
 	}
 
@@ -406,23 +433,23 @@ function get_dropins() {
  *
  * @since 3.0.0
  * @return array Key is file name. The value is an array, with the first value the
- *	purpose of the drop-in and the second value the name of the constant that must be
- *	true for the drop-in to be used, or true if no constant is required.
+ *  purpose of the drop-in and the second value the name of the constant that must be
+ *  true for the drop-in to be used, or true if no constant is required.
  */
 function _get_dropins() {
 	$dropins = array(
-		'advanced-cache.php' => array( __( 'Advanced caching plugin.'       ), 'WP_CACHE' ), // WP_CACHE
-		'db.php'             => array( __( 'Custom database class.'         ), true ), // auto on load
+		'advanced-cache.php' => array( __( 'Advanced caching plugin.' ), 'WP_CACHE' ), // WP_CACHE
+		'db.php'             => array( __( 'Custom database class.' ), true ), // auto on load
 		'db-error.php'       => array( __( 'Custom database error message.' ), true ), // auto on error
-		'install.php'        => array( __( 'Custom installation script.'    ), true ), // auto on installation
-		'maintenance.php'    => array( __( 'Custom maintenance message.'    ), true ), // auto on maintenance
-		'object-cache.php'   => array( __( 'External object cache.'         ), true ), // auto on load
+		'install.php'        => array( __( 'Custom installation script.' ), true ), // auto on installation
+		'maintenance.php'    => array( __( 'Custom maintenance message.' ), true ), // auto on maintenance
+		'object-cache.php'   => array( __( 'External object cache.' ), true ), // auto on load
 	);
 
 	if ( is_multisite() ) {
-		$dropins['sunrise.php'       ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
-		$dropins['blog-deleted.php'  ] = array( __( 'Custom site deleted message.'   ), true ); // auto on deleted blog
-		$dropins['blog-inactive.php' ] = array( __( 'Custom site inactive message.'  ), true ); // auto on inactive blog
+		$dropins['sunrise.php']        = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
+		$dropins['blog-deleted.php']   = array( __( 'Custom site deleted message.' ), true ); // auto on deleted blog
+		$dropins['blog-inactive.php']  = array( __( 'Custom site inactive message.' ), true ); // auto on inactive blog
 		$dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog
 	}
 
@@ -475,12 +502,14 @@ function is_plugin_inactive( $plugin ) {
  * @return bool True, if active for the network, otherwise false.
  */
 function is_plugin_active_for_network( $plugin ) {
-	if ( !is_multisite() )
+	if ( ! is_multisite() ) {
 		return false;
+	}
 
-	$plugins = get_site_option( 'active_sitewide_plugins');
-	if ( isset($plugins[$plugin]) )
+	$plugins = get_site_option( 'active_sitewide_plugins' );
+	if ( isset( $plugins[ $plugin ] ) ) {
 		return true;
+	}
 
 	return false;
 }
@@ -499,8 +528,9 @@ function is_plugin_active_for_network( $plugin ) {
  */
 function is_network_only_plugin( $plugin ) {
 	$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-	if ( $plugin_data )
+	if ( $plugin_data ) {
 		return $plugin_data['Network'];
+	}
 	return false;
 }
 
@@ -534,21 +564,23 @@ function is_network_only_plugin( $plugin ) {
 function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
 	$plugin = plugin_basename( trim( $plugin ) );
 
-	if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
-		$network_wide = true;
-		$current = get_site_option( 'active_sitewide_plugins', array() );
+	if ( is_multisite() && ( $network_wide || is_network_only_plugin( $plugin ) ) ) {
+		$network_wide        = true;
+		$current             = get_site_option( 'active_sitewide_plugins', array() );
 		$_GET['networkwide'] = 1; // Back compat for plugins looking for this value.
 	} else {
 		$current = get_option( 'active_plugins', array() );
 	}
 
-	$valid = validate_plugin($plugin);
-	if ( is_wp_error($valid) )
+	$valid = validate_plugin( $plugin );
+	if ( is_wp_error( $valid ) ) {
 		return $valid;
+	}
 
 	if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
-		if ( !empty($redirect) )
-			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
+		if ( ! empty( $redirect ) ) {
+			wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) ); // we'll override this later if the plugin can be included without fatal error
+		}
 		ob_start();
 		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
 		$_wp_plugin_file = $plugin;
@@ -587,14 +619,14 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
 		}
 
 		if ( $network_wide ) {
-			$current = get_site_option( 'active_sitewide_plugins', array() );
-			$current[$plugin] = time();
+			$current            = get_site_option( 'active_sitewide_plugins', array() );
+			$current[ $plugin ] = time();
 			update_site_option( 'active_sitewide_plugins', $current );
 		} else {
-			$current = get_option( 'active_plugins', array() );
+			$current   = get_option( 'active_plugins', array() );
 			$current[] = $plugin;
-			sort($current);
-			update_option('active_plugins', $current);
+			sort( $current );
+			update_option( 'active_plugins', $current );
 		}
 
 		if ( ! $silent ) {
@@ -615,7 +647,7 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
 
 		if ( ob_get_length() > 0 ) {
 			$output = ob_get_clean();
-			return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
+			return new WP_Error( 'unexpected_output', __( 'The plugin generated unexpected output.' ), $output );
 		}
 		ob_end_clean();
 	}
@@ -634,18 +666,20 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
  * @param string|array $plugins Single plugin or list of plugins to deactivate.
  * @param bool $silent Prevent calling deactivation hooks. Default is false.
  * @param mixed $network_wide Whether to deactivate the plugin for all sites in the network.
- * 	A value of null (the default) will deactivate plugins for both the site and the network.
+ *  A value of null (the default) will deactivate plugins for both the site and the network.
  */
 function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
-	if ( is_multisite() )
+	if ( is_multisite() ) {
 		$network_current = get_site_option( 'active_sitewide_plugins', array() );
+	}
 	$current = get_option( 'active_plugins', array() );
 	$do_blog = $do_network = false;
 
 	foreach ( (array) $plugins as $plugin ) {
 		$plugin = plugin_basename( trim( $plugin ) );
-		if ( ! is_plugin_active($plugin) )
+		if ( ! is_plugin_active( $plugin ) ) {
 			continue;
+		}
 
 		$network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
 
@@ -714,10 +748,12 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
 		}
 	}
 
-	if ( $do_blog )
-		update_option('active_plugins', $current);
-	if ( $do_network )
+	if ( $do_blog ) {
+		update_option( 'active_plugins', $current );
+	}
+	if ( $do_network ) {
 		update_site_option( 'active_sitewide_plugins', $network_current );
+	}
 }
 
 /**
@@ -737,20 +773,24 @@ function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
 function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
-	if ( !is_array($plugins) )
-		$plugins = array($plugins);
+	if ( ! is_array( $plugins ) ) {
+		$plugins = array( $plugins );
+	}
 
 	$errors = array();
 	foreach ( $plugins as $plugin ) {
-		if ( !empty($redirect) )
-			$redirect = add_query_arg('plugin', $plugin, $redirect);
-		$result = activate_plugin($plugin, $redirect, $network_wide, $silent);
-		if ( is_wp_error($result) )
-			$errors[$plugin] = $result;
+		if ( ! empty( $redirect ) ) {
+			$redirect = add_query_arg( 'plugin', $plugin, $redirect );
+		}
+		$result = activate_plugin( $plugin, $redirect, $network_wide, $silent );
+		if ( is_wp_error( $result ) ) {
+			$errors[ $plugin ] = $result;
+		}
 	}
 
-	if ( !empty($errors) )
-		return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
+	if ( ! empty( $errors ) ) {
+		return new WP_Error( 'plugins_invalid', __( 'One of the plugins is invalid.' ), $errors );
+	}
 
 	return true;
 }
@@ -770,24 +810,26 @@ function activate_plugins( $plugins, $redirect = '', $network_wide = false, $sil
 function delete_plugins( $plugins, $deprecated = '' ) {
 	global $wp_filesystem;
 
-	if ( empty($plugins) )
+	if ( empty( $plugins ) ) {
 		return false;
+	}
 
 	$checked = array();
-	foreach ( $plugins as $plugin )
+	foreach ( $plugins as $plugin ) {
 		$checked[] = 'checked[]=' . $plugin;
+	}
 
-	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
+	$url = wp_nonce_url( 'plugins.php?action=delete-selected&verify-delete=1&' . implode( '&', $checked ), 'bulk-plugins' );
 
 	ob_start();
 	$credentials = request_filesystem_credentials( $url );
-	$data = ob_get_clean();
+	$data        = ob_get_clean();
 
 	if ( false === $credentials ) {
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty( $data ) ) {
+			include_once( ABSPATH . 'wp-admin/admin-header.php' );
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include( ABSPATH . 'wp-admin/admin-footer.php' );
 			exit;
 		}
 		return;
@@ -798,20 +840,22 @@ function delete_plugins( $plugins, $deprecated = '' ) {
 		request_filesystem_credentials( $url, '', true ); // Failed to connect, Error and request again.
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty( $data ) ) {
+			include_once( ABSPATH . 'wp-admin/admin-header.php' );
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include( ABSPATH . 'wp-admin/admin-footer.php' );
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! is_object( $wp_filesystem ) ) {
+		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+		return new WP_Error( 'fs_error', __( 'Filesystem error.' ), $wp_filesystem->errors );
+	}
 
 	// Get the base plugin folder.
 	$plugins_dir = $wp_filesystem->wp_plugins_dir();
@@ -828,7 +872,7 @@ function delete_plugins( $plugins, $deprecated = '' ) {
 	foreach ( $plugins as $plugin_file ) {
 		// Run Uninstall hook.
 		if ( is_uninstallable_plugin( $plugin_file ) ) {
-			uninstall_plugin($plugin_file);
+			uninstall_plugin( $plugin_file );
 		}
 
 		/**
@@ -877,7 +921,7 @@ function delete_plugins( $plugins, $deprecated = '' ) {
 	}
 
 	// Remove deleted plugins from the plugin updates list.
-	if ( $current = get_site_transient('update_plugins') ) {
+	if ( $current = get_site_transient( 'update_plugins' ) ) {
 		// Don't remove the plugins that weren't deleted.
 		$deleted = array_diff( $plugins, $errors );
 
@@ -922,11 +966,12 @@ function validate_active_plugins() {
 
 	if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
 		$network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-		$plugins = array_merge( $plugins, array_keys( $network_plugins ) );
+		$plugins         = array_merge( $plugins, array_keys( $network_plugins ) );
 	}
 
-	if ( empty( $plugins ) )
+	if ( empty( $plugins ) ) {
 		return array();
+	}
 
 	$invalid = array();
 
@@ -934,7 +979,7 @@ function validate_active_plugins() {
 	foreach ( $plugins as $plugin ) {
 		$result = validate_plugin( $plugin );
 		if ( is_wp_error( $result ) ) {
-			$invalid[$plugin] = $result;
+			$invalid[ $plugin ] = $result;
 			deactivate_plugins( $plugin, true );
 		}
 	}
@@ -951,15 +996,18 @@ function validate_active_plugins() {
  * @param string $plugin Path to the main plugin file from plugins directory.
  * @return WP_Error|int 0 on success, WP_Error on failure.
  */
-function validate_plugin($plugin) {
-	if ( validate_file($plugin) )
-		return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
-	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
-		return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
+function validate_plugin( $plugin ) {
+	if ( validate_file( $plugin ) ) {
+		return new WP_Error( 'plugin_invalid', __( 'Invalid plugin path.' ) );
+	}
+	if ( ! file_exists( WP_PLUGIN_DIR . '/' . $plugin ) ) {
+		return new WP_Error( 'plugin_not_found', __( 'Plugin file does not exist.' ) );
+	}
 
 	$installed_plugins = get_plugins();
-	if ( ! isset($installed_plugins[$plugin]) )
-		return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
+	if ( ! isset( $installed_plugins[ $plugin ] ) ) {
+		return new WP_Error( 'no_plugin_header', __( 'The plugin does not have a valid header.' ) );
+	}
 	return 0;
 }
 
@@ -971,12 +1019,13 @@ function validate_plugin($plugin) {
  * @param string $plugin Path to the main plugin file from plugins directory.
  * @return bool Whether plugin can be uninstalled.
  */
-function is_uninstallable_plugin($plugin) {
-	$file = plugin_basename($plugin);
+function is_uninstallable_plugin( $plugin ) {
+	$file = plugin_basename( $plugin );
 
-	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) )
+	$uninstallable_plugins = (array) get_option( 'uninstall_plugins' );
+	if ( isset( $uninstallable_plugins[ $file ] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname( $file ) . '/uninstall.php' ) ) {
 		return true;
+	}
 
 	return false;
 }
@@ -991,10 +1040,10 @@ function is_uninstallable_plugin($plugin) {
  * @param string $plugin Path to the main plugin file from plugins directory.
  * @return true True if a plugin's uninstall.php file has been found and included.
  */
-function uninstall_plugin($plugin) {
-	$file = plugin_basename($plugin);
+function uninstall_plugin( $plugin ) {
+	$file = plugin_basename( $plugin );
 
-	$uninstallable_plugins = (array) get_option('uninstall_plugins');
+	$uninstallable_plugins = (array) get_option( 'uninstall_plugins' );
 
 	/**
 	 * Fires in uninstall_plugin() immediately before the plugin is uninstalled.
@@ -1006,25 +1055,25 @@ function uninstall_plugin($plugin) {
 	 */
 	do_action( 'pre_uninstall_plugin', $plugin, $uninstallable_plugins );
 
-	if ( file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) {
-		if ( isset( $uninstallable_plugins[$file] ) ) {
-			unset($uninstallable_plugins[$file]);
-			update_option('uninstall_plugins', $uninstallable_plugins);
+	if ( file_exists( WP_PLUGIN_DIR . '/' . dirname( $file ) . '/uninstall.php' ) ) {
+		if ( isset( $uninstallable_plugins[ $file ] ) ) {
+			unset( $uninstallable_plugins[ $file ] );
+			update_option( 'uninstall_plugins', $uninstallable_plugins );
 		}
-		unset($uninstallable_plugins);
+		unset( $uninstallable_plugins );
 
-		define('WP_UNINSTALL_PLUGIN', $file);
+		define( 'WP_UNINSTALL_PLUGIN', $file );
 		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-		include( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' );
+		include( WP_PLUGIN_DIR . '/' . dirname( $file ) . '/uninstall.php' );
 
 		return true;
 	}
 
-	if ( isset( $uninstallable_plugins[$file] ) ) {
-		$callable = $uninstallable_plugins[$file];
-		unset($uninstallable_plugins[$file]);
-		update_option('uninstall_plugins', $uninstallable_plugins);
-		unset($uninstallable_plugins);
+	if ( isset( $uninstallable_plugins[ $file ] ) ) {
+		$callable = $uninstallable_plugins[ $file ];
+		unset( $uninstallable_plugins[ $file ] );
+		update_option( 'uninstall_plugins', $uninstallable_plugins );
+		unset( $uninstallable_plugins );
 
 		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
 		include( WP_PLUGIN_DIR . '/' . $file );
@@ -1082,18 +1131,19 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
 
 	$menu_slug = plugin_basename( $menu_slug );
 
-	$admin_page_hooks[$menu_slug] = sanitize_title( $menu_title );
+	$admin_page_hooks[ $menu_slug ] = sanitize_title( $menu_title );
 
 	$hookname = get_plugin_page_hookname( $menu_slug, '' );
 
-	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
+	if ( ! empty( $function ) && ! empty( $hookname ) && current_user_can( $capability ) ) {
 		add_action( $hookname, $function );
+	}
 
-	if ( empty($icon_url) ) {
-		$icon_url = 'dashicons-admin-generic';
+	if ( empty( $icon_url ) ) {
+		$icon_url   = 'dashicons-admin-generic';
 		$icon_class = 'menu-icon-generic ';
 	} else {
-		$icon_url = set_url_scheme( $icon_url );
+		$icon_url   = set_url_scheme( $icon_url );
 		$icon_class = '';
 	}
 
@@ -1102,16 +1152,16 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
 	if ( null === $position ) {
 		$menu[] = $new_menu;
 	} elseif ( isset( $menu[ "$position" ] ) ) {
-	 	$position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ) , -5 ) * 0.00001;
+		$position            = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ), -5 ) * 0.00001;
 		$menu[ "$position" ] = $new_menu;
 	} else {
 		$menu[ $position ] = $new_menu;
 	}
 
-	$_registered_pages[$hookname] = true;
+	$_registered_pages[ $hookname ] = true;
 
 	// No parent as top level
-	$_parent_pages[$menu_slug] = false;
+	$_parent_pages[ $menu_slug ] = false;
 
 	return $hookname;
 }
@@ -1148,14 +1198,15 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability,
 	global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv,
 		$_registered_pages, $_parent_pages;
 
-	$menu_slug = plugin_basename( $menu_slug );
-	$parent_slug = plugin_basename( $parent_slug);
+	$menu_slug   = plugin_basename( $menu_slug );
+	$parent_slug = plugin_basename( $parent_slug );
 
-	if ( isset( $_wp_real_parent_file[$parent_slug] ) )
-		$parent_slug = $_wp_real_parent_file[$parent_slug];
+	if ( isset( $_wp_real_parent_file[ $parent_slug ] ) ) {
+		$parent_slug = $_wp_real_parent_file[ $parent_slug ];
+	}
 
-	if ( !current_user_can( $capability ) ) {
-		$_wp_submenu_nopriv[$parent_slug][$menu_slug] = true;
+	if ( ! current_user_can( $capability ) ) {
+		$_wp_submenu_nopriv[ $parent_slug ][ $menu_slug ] = true;
 		return false;
 	}
 
@@ -1165,30 +1216,33 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability,
 	 * parent file someone is trying to link back to the parent manually. In
 	 * this case, don't automatically add a link back to avoid duplication.
 	 */
-	if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
-		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
-				$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+	if ( ! isset( $submenu[ $parent_slug ] ) && $menu_slug != $parent_slug ) {
+		foreach ( (array) $menu as $parent_menu ) {
+			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) ) {
+				$submenu[ $parent_slug ][] = array_slice( $parent_menu, 0, 4 );
+			}
 		}
 	}
 
-	$submenu[$parent_slug][] = array ( $menu_title, $capability, $menu_slug, $page_title );
+	$submenu[ $parent_slug ][] = array( $menu_title, $capability, $menu_slug, $page_title );
 
-	$hookname = get_plugin_page_hookname( $menu_slug, $parent_slug);
-	if (!empty ( $function ) && !empty ( $hookname ))
+	$hookname = get_plugin_page_hookname( $menu_slug, $parent_slug );
+	if ( ! empty( $function ) && ! empty( $hookname ) ) {
 		add_action( $hookname, $function );
+	}
 
-	$_registered_pages[$hookname] = true;
+	$_registered_pages[ $hookname ] = true;
 
 	/*
 	 * Backward-compatibility for plugins using add_management page.
 	 * See wp-admin/admin.php for redirect from edit.php to tools.php
 	 */
-	if ( 'tools.php' == $parent_slug )
-		$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	if ( 'tools.php' == $parent_slug ) {
+		$_registered_pages[ get_plugin_page_hookname( $menu_slug, 'edit.php' ) ] = true;
+	}
 
 	// No parent as top level.
-	$_parent_pages[$menu_slug] = $parent_slug;
+	$_parent_pages[ $menu_slug ] = $parent_slug;
 
 	return $hookname;
 }
@@ -1290,10 +1344,11 @@ function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $f
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
 function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	if ( current_user_can('edit_users') )
+	if ( current_user_can( 'edit_users' ) ) {
 		$parent = 'users.php';
-	else
+	} else {
 		$parent = 'profile.php';
+	}
 	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
 }
 /**
@@ -1431,7 +1486,7 @@ function remove_menu_page( $menu_slug ) {
 
 	foreach ( $menu as $i => $item ) {
 		if ( $menu_slug == $item[2] ) {
-			unset( $menu[$i] );
+			unset( $menu[ $i ] );
 			return $item;
 		}
 	}
@@ -1453,12 +1508,13 @@ function remove_menu_page( $menu_slug ) {
 function remove_submenu_page( $menu_slug, $submenu_slug ) {
 	global $submenu;
 
-	if ( !isset( $submenu[$menu_slug] ) )
+	if ( ! isset( $submenu[ $menu_slug ] ) ) {
 		return false;
+	}
 
-	foreach ( $submenu[$menu_slug] as $i => $item ) {
+	foreach ( $submenu[ $menu_slug ] as $i => $item ) {
 		if ( $submenu_slug == $item[2] ) {
-			unset( $submenu[$menu_slug][$i] );
+			unset( $submenu[ $menu_slug ][ $i ] );
 			return $item;
 		}
 	}
@@ -1479,12 +1535,12 @@ function remove_submenu_page( $menu_slug, $submenu_slug ) {
  * @param bool $echo Whether or not to echo the url - default is true
  * @return string the url
  */
-function menu_page_url($menu_slug, $echo = true) {
+function menu_page_url( $menu_slug, $echo = true ) {
 	global $_parent_pages;
 
-	if ( isset( $_parent_pages[$menu_slug] ) ) {
-		$parent_slug = $_parent_pages[$menu_slug];
-		if ( $parent_slug && ! isset( $_parent_pages[$parent_slug] ) ) {
+	if ( isset( $_parent_pages[ $menu_slug ] ) ) {
+		$parent_slug = $_parent_pages[ $menu_slug ];
+		if ( $parent_slug && ! isset( $_parent_pages[ $parent_slug ] ) ) {
 			$url = admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) );
 		} else {
 			$url = admin_url( 'admin.php?page=' . $menu_slug );
@@ -1493,10 +1549,11 @@ function menu_page_url($menu_slug, $echo = true) {
 		$url = '';
 	}
 
-	$url = esc_url($url);
+	$url = esc_url( $url );
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $url;
+	}
 
 	return $url;
 }
@@ -1505,7 +1562,6 @@ function menu_page_url($menu_slug, $echo = true) {
 // Pluggable Menu Support -- Private
 //
 /**
- *
  * @global string $parent_file
  * @global array $menu
  * @global array $submenu
@@ -1520,60 +1576,65 @@ function get_admin_page_parent( $parent = '' ) {
 	global $parent_file, $menu, $submenu, $pagenow, $typenow,
 		$plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
 
-	if ( !empty ( $parent ) && 'admin.php' != $parent ) {
-		if ( isset( $_wp_real_parent_file[$parent] ) )
-			$parent = $_wp_real_parent_file[$parent];
+	if ( ! empty( $parent ) && 'admin.php' != $parent ) {
+		if ( isset( $_wp_real_parent_file[ $parent ] ) ) {
+			$parent = $_wp_real_parent_file[ $parent ];
+		}
 		return $parent;
 	}
 
 	if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
-		foreach ( (array)$menu as $parent_menu ) {
+		foreach ( (array) $menu as $parent_menu ) {
 			if ( $parent_menu[2] == $plugin_page ) {
 				$parent_file = $plugin_page;
-				if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
+				if ( isset( $_wp_real_parent_file[ $parent_file ] ) ) {
+					$parent_file = $_wp_real_parent_file[ $parent_file ];
+				}
 				return $parent_file;
 			}
 		}
-		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+		if ( isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
 			$parent_file = $plugin_page;
-			if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
+			if ( isset( $_wp_real_parent_file[ $parent_file ] ) ) {
+					$parent_file = $_wp_real_parent_file[ $parent_file ];
+			}
 			return $parent_file;
 		}
 	}
 
-	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
+	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $pagenow ][ $plugin_page ] ) ) {
 		$parent_file = $pagenow;
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
-			$parent_file = $_wp_real_parent_file[$parent_file];
+		if ( isset( $_wp_real_parent_file[ $parent_file ] ) ) {
+			$parent_file = $_wp_real_parent_file[ $parent_file ];
+		}
 		return $parent_file;
 	}
 
-	foreach (array_keys( (array)$submenu ) as $parent) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $_wp_real_parent_file[$parent] ) )
-				$parent = $_wp_real_parent_file[$parent];
-			if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+	foreach ( array_keys( (array) $submenu ) as $parent ) {
+		foreach ( $submenu[ $parent ] as $submenu_array ) {
+			if ( isset( $_wp_real_parent_file[ $parent ] ) ) {
+				$parent = $_wp_real_parent_file[ $parent ];
+			}
+			if ( ! empty( $typenow ) && ( $submenu_array[2] == "$pagenow?post_type=$typenow" ) ) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+			} elseif ( $submenu_array[2] == $pagenow && empty( $typenow ) && ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) ) ) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
+			} elseif ( isset( $plugin_page ) && ( $plugin_page == $submenu_array[2] ) ) {
 				$parent_file = $parent;
 				return $parent;
 			}
 		}
 	}
 
-	if ( empty($parent_file) )
+	if ( empty( $parent_file ) ) {
 		$parent_file = '';
+	}
 	return '';
 }
 
 /**
- *
  * @global string $title
  * @global array $menu
  * @global array $submenu
@@ -1584,20 +1645,21 @@ function get_admin_page_parent( $parent = '' ) {
 function get_admin_page_title() {
 	global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
 
-	if ( ! empty ( $title ) )
+	if ( ! empty( $title ) ) {
 		return $title;
+	}
 
 	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
 
 	$parent = $parent1 = get_admin_page_parent();
 
-	if ( empty ( $parent) ) {
-		foreach ( (array)$menu as $menu_array ) {
+	if ( empty( $parent ) ) {
+		foreach ( (array) $menu as $menu_array ) {
 			if ( isset( $menu_array[3] ) ) {
 				if ( $menu_array[2] == $pagenow ) {
 					$title = $menu_array[3];
 					return $menu_array[3];
-				} elseif ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
+				} elseif ( isset( $plugin_page ) && ( $plugin_page == $menu_array[2] ) && ( $hook == $menu_array[3] ) ) {
 					$title = $menu_array[3];
 					return $menu_array[3];
 				}
@@ -1608,7 +1670,7 @@ function get_admin_page_title() {
 		}
 	} else {
 		foreach ( array_keys( $submenu ) as $parent ) {
-			foreach ( $submenu[$parent] as $submenu_array ) {
+			foreach ( $submenu[ $parent ] as $submenu_array ) {
 				if ( isset( $plugin_page ) &&
 					( $plugin_page == $submenu_array[2] ) &&
 					(
@@ -1616,15 +1678,16 @@ function get_admin_page_title() {
 						( $parent == $plugin_page ) ||
 						( $plugin_page == $hook ) ||
 						( $pagenow == 'admin.php' && $parent1 != $submenu_array[2] ) ||
-						( !empty($typenow) && $parent == $pagenow . '?post_type=' . $typenow)
+						( ! empty( $typenow ) && $parent == $pagenow . '?post_type=' . $typenow )
 					)
 					) {
 						$title = $submenu_array[3];
 						return $submenu_array[3];
-					}
+				}
 
-				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
+				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) { // not the current page
 					continue;
+				}
 
 				if ( isset( $submenu_array[3] ) ) {
 					$title = $submenu_array[3];
@@ -1635,16 +1698,15 @@ function get_admin_page_title() {
 				}
 			}
 		}
-		if ( empty ( $title ) ) {
+		if ( empty( $title ) ) {
 			foreach ( $menu as $menu_array ) {
 				if ( isset( $plugin_page ) &&
 					( $plugin_page == $menu_array[2] ) &&
 					( $pagenow == 'admin.php' ) &&
-					( $parent1 == $menu_array[2] ) )
-					{
+					( $parent1 == $menu_array[2] ) ) {
 						$title = $menu_array[3];
 						return $menu_array[3];
-					}
+				}
 			}
 		}
 	}
@@ -1661,14 +1723,14 @@ function get_admin_page_title() {
  */
 function get_plugin_page_hook( $plugin_page, $parent_page ) {
 	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-	if ( has_action($hook) )
+	if ( has_action( $hook ) ) {
 		return $hook;
-	else
+	} else {
 		return null;
+	}
 }
 
 /**
- *
  * @global array $admin_page_hooks
  * @param string $plugin_page
  * @param string $parent_page
@@ -1679,14 +1741,14 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) {
 	$parent = get_admin_page_parent( $parent_page );
 
 	$page_type = 'admin';
-	if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) {
-		if ( isset( $admin_page_hooks[$plugin_page] ) ) {
+	if ( empty( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[ $plugin_page ] ) ) {
+		if ( isset( $admin_page_hooks[ $plugin_page ] ) ) {
 			$page_type = 'toplevel';
-		} elseif ( isset( $admin_page_hooks[$parent] )) {
-			$page_type = $admin_page_hooks[$parent];
+		} elseif ( isset( $admin_page_hooks[ $parent ] ) ) {
+			$page_type = $admin_page_hooks[ $parent ];
 		}
-	} elseif ( isset( $admin_page_hooks[$parent] ) ) {
-		$page_type = $admin_page_hooks[$parent];
+	} elseif ( isset( $admin_page_hooks[ $parent ] ) ) {
+		$page_type = $admin_page_hooks[ $parent ];
 	}
 
 	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );
@@ -1695,7 +1757,6 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) {
 }
 
 /**
- *
  * @global string $pagenow
  * @global array $menu
  * @global array $submenu
@@ -1710,62 +1771,75 @@ function user_can_access_admin_page() {
 
 	$parent = get_admin_page_parent();
 
-	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
+	if ( ! isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $parent ][ $pagenow ] ) ) {
 		return false;
-
-	if ( isset( $plugin_page ) ) {
-		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
-			return false;
-
-		$hookname = get_plugin_page_hookname($plugin_page, $parent);
-
-		if ( !isset($_registered_pages[$hookname]) )
-			return false;
 	}
 
-	if ( empty( $parent) ) {
-		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
+	if ( isset( $plugin_page ) ) {
+		if ( isset( $_wp_submenu_nopriv[ $parent ][ $plugin_page ] ) ) {
 			return false;
-		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
+		}
+
+		$hookname = get_plugin_page_hookname( $plugin_page, $parent );
+
+		if ( ! isset( $_registered_pages[ $hookname ] ) ) {
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
+		}
+	}
+
+	if ( empty( $parent ) ) {
+		if ( isset( $_wp_menu_nopriv[ $pagenow ] ) ) {
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+		}
+		if ( isset( $_wp_submenu_nopriv[ $pagenow ][ $pagenow ] ) ) {
 			return false;
-		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
-			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
+		}
+		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $pagenow ][ $plugin_page ] ) ) {
+			return false;
+		}
+		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
+			return false;
+		}
+		foreach ( array_keys( $_wp_submenu_nopriv ) as $key ) {
+			if ( isset( $_wp_submenu_nopriv[ $key ][ $pagenow ] ) ) {
 				return false;
-			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
-			return false;
+			}
+			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $key ][ $plugin_page ] ) ) {
+				return false;
+			}
 		}
 		return true;
 	}
 
-	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
 		return false;
+	}
 
-	if ( isset( $submenu[$parent] ) ) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
+	if ( isset( $submenu[ $parent ] ) ) {
+		foreach ( $submenu[ $parent ] as $submenu_array ) {
 			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ))
+				if ( current_user_can( $submenu_array[1] ) ) {
 					return true;
-				else
+				} else {
 					return false;
+				}
 			} elseif ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ))
+				if ( current_user_can( $submenu_array[1] ) ) {
 					return true;
-				else
+				} else {
 					return false;
+				}
 			}
 		}
 	}
 
 	foreach ( $menu as $menu_array ) {
-		if ( $menu_array[2] == $parent) {
-			if ( current_user_can( $menu_array[1] ))
+		if ( $menu_array[2] == $parent ) {
+			if ( current_user_can( $menu_array[1] ) ) {
 				return true;
-			else
+			} else {
 				return false;
+			}
 		}
 	}
 
@@ -1789,8 +1863,9 @@ function user_can_access_admin_page() {
 function option_update_filter( $options ) {
 	global $new_whitelist_options;
 
-	if ( is_array( $new_whitelist_options ) )
+	if ( is_array( $new_whitelist_options ) ) {
 		$options = add_option_whitelist( $new_whitelist_options, $options );
+	}
 
 	return $options;
 }
@@ -1807,20 +1882,22 @@ function option_update_filter( $options ) {
  * @return array
  */
 function add_option_whitelist( $new_options, $options = '' ) {
-	if ( $options == '' )
+	if ( $options == '' ) {
 		global $whitelist_options;
-	else
+	} else {
 		$whitelist_options = $options;
+	}
 
 	foreach ( $new_options as $page => $keys ) {
 		foreach ( $keys as $key ) {
-			if ( !isset($whitelist_options[ $page ]) || !is_array($whitelist_options[ $page ]) ) {
-				$whitelist_options[ $page ] = array();
+			if ( ! isset( $whitelist_options[ $page ] ) || ! is_array( $whitelist_options[ $page ] ) ) {
+				$whitelist_options[ $page ]   = array();
 				$whitelist_options[ $page ][] = $key;
 			} else {
 				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos === false )
+				if ( $pos === false ) {
 					$whitelist_options[ $page ][] = $key;
+				}
 			}
 		}
 	}
@@ -1840,17 +1917,19 @@ function add_option_whitelist( $new_options, $options = '' ) {
  * @return array
  */
 function remove_option_whitelist( $del_options, $options = '' ) {
-	if ( $options == '' )
+	if ( $options == '' ) {
 		global $whitelist_options;
-	else
+	} else {
 		$whitelist_options = $options;
+	}
 
 	foreach ( $del_options as $page => $keys ) {
 		foreach ( $keys as $key ) {
-			if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
+			if ( isset( $whitelist_options[ $page ] ) && is_array( $whitelist_options[ $page ] ) ) {
 				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos !== false )
+				if ( $pos !== false ) {
 					unset( $whitelist_options[ $page ][ $pos ] );
+				}
 			}
 		}
 	}
@@ -1865,10 +1944,10 @@ function remove_option_whitelist( $del_options, $options = '' ) {
  *
  * @param string $option_group A settings group name. This should match the group name used in register_setting().
  */
-function settings_fields($option_group) {
-	echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />";
+function settings_fields( $option_group ) {
+	echo "<input type='hidden' name='option_page' value='" . esc_attr( $option_group ) . "' />";
 	echo '<input type="hidden" name="action" value="update" />';
-	wp_nonce_field("$option_group-options");
+	wp_nonce_field( "$option_group-options" );
 }
 
 /**
@@ -1879,8 +1958,9 @@ function settings_fields($option_group) {
  * @param bool $clear_update_cache Whether to clear the Plugin updates cache
  */
 function wp_clean_plugins_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
+	if ( $clear_update_cache ) {
 		delete_site_transient( 'update_plugins' );
+	}
 	wp_cache_delete( 'plugins', 'plugins' );
 }
 
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 71d04f0bac..727269e51e 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -19,44 +19,52 @@
  */
 function _wp_translate_postdata( $update = false, $post_data = null ) {
 
-	if ( empty($post_data) )
+	if ( empty( $post_data ) ) {
 		$post_data = &$_POST;
+	}
 
-	if ( $update )
+	if ( $update ) {
 		$post_data['ID'] = (int) $post_data['post_ID'];
+	}
 
 	$ptype = get_post_type_object( $post_data['post_type'] );
 
 	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
+		if ( 'page' == $post_data['post_type'] ) {
 			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
-		else
+		} else {
 			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+		}
 	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
+		if ( 'page' == $post_data['post_type'] ) {
 			return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
-		else
+		} else {
 			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+		}
 	}
 
-	if ( isset( $post_data['content'] ) )
+	if ( isset( $post_data['content'] ) ) {
 		$post_data['post_content'] = $post_data['content'];
+	}
 
-	if ( isset( $post_data['excerpt'] ) )
+	if ( isset( $post_data['excerpt'] ) ) {
 		$post_data['post_excerpt'] = $post_data['excerpt'];
+	}
 
-	if ( isset( $post_data['parent_id'] ) )
+	if ( isset( $post_data['parent_id'] ) ) {
 		$post_data['post_parent'] = (int) $post_data['parent_id'];
+	}
 
-	if ( isset($post_data['trackback_url']) )
+	if ( isset( $post_data['trackback_url'] ) ) {
 		$post_data['to_ping'] = $post_data['trackback_url'];
+	}
 
 	$post_data['user_ID'] = get_current_user_id();
 
-	if (!empty ( $post_data['post_author_override'] ) ) {
+	if ( ! empty( $post_data['post_author_override'] ) ) {
 		$post_data['post_author'] = (int) $post_data['post_author_override'];
 	} else {
-		if (!empty ( $post_data['post_author'] ) ) {
+		if ( ! empty( $post_data['post_author'] ) ) {
 			$post_data['post_author'] = (int) $post_data['post_author'];
 		} else {
 			$post_data['post_author'] = (int) $post_data['user_ID'];
@@ -67,15 +75,17 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 		&& ! current_user_can( $ptype->cap->edit_others_posts ) ) {
 
 		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
+			if ( 'page' == $post_data['post_type'] ) {
 				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
-			else
+			} else {
 				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+			}
 		} else {
-			if ( 'page' == $post_data['post_type'] )
+			if ( 'page' == $post_data['post_type'] ) {
 				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
-			else
+			} else {
 				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			}
 		}
 	}
 
@@ -93,21 +103,27 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
+	if ( isset( $post_data['saveasdraft'] ) && '' != $post_data['saveasdraft'] ) {
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
+	}
+	if ( isset( $post_data['saveasprivate'] ) && '' != $post_data['saveasprivate'] ) {
 		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
+	}
+	if ( isset( $post_data['publish'] ) && ( '' != $post_data['publish'] ) && ( ! isset( $post_data['post_status'] ) || $post_data['post_status'] != 'private' ) ) {
 		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
+	}
+	if ( isset( $post_data['advanced'] ) && '' != $post_data['advanced'] ) {
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
+	}
+	if ( isset( $post_data['pending'] ) && '' != $post_data['pending'] ) {
 		$post_data['post_status'] = 'pending';
+	}
 
-	if ( isset( $post_data['ID'] ) )
+	if ( isset( $post_data['ID'] ) ) {
 		$post_id = $post_data['ID'];
-	else
+	} else {
 		$post_id = false;
+	}
 	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
 
 	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
@@ -118,9 +134,11 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if ( isset( $post_data['post_status'] ) && ( in_array( $post_data['post_status'], $published_statuses ) && ! current_user_can( $ptype->cap->publish_posts ) ) ) {
+		if ( ! in_array( $previous_status, $published_statuses ) || ! current_user_can( 'edit_post', $post_id ) ) {
 			$post_data['post_status'] = 'pending';
+		}
+	}
 
 	if ( ! isset( $post_data['post_status'] ) ) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
@@ -130,36 +148,38 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 		unset( $post_data['post_password'] );
 	}
 
-	if (!isset( $post_data['comment_status'] ))
+	if ( ! isset( $post_data['comment_status'] ) ) {
 		$post_data['comment_status'] = 'closed';
+	}
 
-	if (!isset( $post_data['ping_status'] ))
+	if ( ! isset( $post_data['ping_status'] ) ) {
 		$post_data['ping_status'] = 'closed';
+	}
 
-	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
+	foreach ( array( 'aa', 'mm', 'jj', 'hh', 'mn' ) as $timeunit ) {
+		if ( ! empty( $post_data[ 'hidden_' . $timeunit ] ) && $post_data[ 'hidden_' . $timeunit ] != $post_data[ $timeunit ] ) {
 			$post_data['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty( $post_data['edit_date'] ) ) {
-		$aa = $post_data['aa'];
-		$mm = $post_data['mm'];
-		$jj = $post_data['jj'];
-		$hh = $post_data['hh'];
-		$mn = $post_data['mn'];
-		$ss = $post_data['ss'];
-		$aa = ($aa <= 0 ) ? date('Y') : $aa;
-		$mm = ($mm <= 0 ) ? date('n') : $mm;
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$jj = ($jj <= 0 ) ? date('j') : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
-		$post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
-		$valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
-		if ( !$valid_date ) {
+	if ( ! empty( $post_data['edit_date'] ) ) {
+		$aa                     = $post_data['aa'];
+		$mm                     = $post_data['mm'];
+		$jj                     = $post_data['jj'];
+		$hh                     = $post_data['hh'];
+		$mn                     = $post_data['mn'];
+		$ss                     = $post_data['ss'];
+		$aa                     = ( $aa <= 0 ) ? date( 'Y' ) : $aa;
+		$mm                     = ( $mm <= 0 ) ? date( 'n' ) : $mm;
+		$jj                     = ( $jj > 31 ) ? 31 : $jj;
+		$jj                     = ( $jj <= 0 ) ? date( 'j' ) : $jj;
+		$hh                     = ( $hh > 23 ) ? $hh - 24 : $hh;
+		$mn                     = ( $mn > 59 ) ? $mn - 60 : $mn;
+		$ss                     = ( $ss > 59 ) ? $ss - 60 : $ss;
+		$post_data['post_date'] = sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $aa, $mm, $jj, $hh, $mn, $ss );
+		$valid_date             = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
+		if ( ! $valid_date ) {
 			return new WP_Error( 'invalid_date', __( 'Invalid date.' ) );
 		}
 		$post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
@@ -188,15 +208,16 @@ function _wp_translate_postdata( $update = false, $post_data = null ) {
 function edit_post( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if ( empty( $post_data ) ) {
 		$post_data = &$_POST;
+	}
 
 	// Clear out any data in internal vars.
 	unset( $post_data['filter'] );
 
-	$post_ID = (int) $post_data['post_ID'];
-	$post = get_post( $post_ID );
-	$post_data['post_type'] = $post->post_type;
+	$post_ID                     = (int) $post_data['post_ID'];
+	$post                        = get_post( $post_ID );
+	$post_data['post_type']      = $post->post_type;
 	$post_data['post_mime_type'] = $post->post_mime_type;
 
 	if ( ! empty( $post_data['post_status'] ) ) {
@@ -207,33 +228,40 @@ function edit_post( $post_data = null ) {
 		}
 	}
 
-	$ptype = get_post_type_object($post_data['post_type']);
-	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('Sorry, you are not allowed to edit this page.' ));
-		else
-			wp_die( __('Sorry, you are not allowed to edit this post.' ));
+	$ptype = get_post_type_object( $post_data['post_type'] );
+	if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+		if ( 'page' == $post_data['post_type'] ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
+		} else {
+			wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 	}
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
-		$revisions = wp_get_post_revisions( $post_ID, array( 'order' => 'ASC', 'posts_per_page' => 1 ) );
-		$revision = current( $revisions );
+		$revisions = wp_get_post_revisions(
+			$post_ID, array(
+				'order'          => 'ASC',
+				'posts_per_page' => 1,
+			)
+		);
+		$revision  = current( $revisions );
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
+		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
 			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		}
 	}
 
-	if ( isset($post_data['visibility']) ) {
+	if ( isset( $post_data['visibility'] ) ) {
 		switch ( $post_data['visibility'] ) {
-			case 'public' :
+			case 'public':
 				$post_data['post_password'] = '';
 				break;
-			case 'password' :
+			case 'password':
 				unset( $post_data['sticky'] );
 				break;
-			case 'private' :
-				$post_data['post_status'] = 'private';
+			case 'private':
+				$post_data['post_status']   = 'private';
 				$post_data['post_password'] = '';
 				unset( $post_data['sticky'] );
 				break;
@@ -241,18 +269,21 @@ function edit_post( $post_data = null ) {
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
+	if ( is_wp_error( $post_data ) ) {
 		wp_die( $post_data->get_error_message() );
+	}
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
+	if ( isset( $post_data['post_format'] ) ) {
 		set_post_format( $post_ID, $post_data['post_format'] );
+	}
 
 	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
 	foreach ( $format_meta_urls as $format_meta_url ) {
 		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
+		if ( isset( $post_data[ $keyed ] ) ) {
 			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		}
 	}
 
 	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
@@ -260,10 +291,11 @@ function edit_post( $post_data = null ) {
 	foreach ( $format_keys as $key ) {
 		$keyed = '_format_' . $key;
 		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
+			if ( current_user_can( 'unfiltered_html' ) ) {
 				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
-			else
+			} else {
 				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			}
 		}
 	}
 
@@ -282,35 +314,42 @@ function edit_post( $post_data = null ) {
 	}
 
 	// Meta Stuff
-	if ( isset($post_data['meta']) && $post_data['meta'] ) {
+	if ( isset( $post_data['meta'] ) && $post_data['meta'] ) {
 		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+			if ( ! $meta = get_post_meta_by_id( $key ) ) {
 				continue;
-			if ( $meta->post_id != $post_ID )
+			}
+			if ( $meta->post_id != $post_ID ) {
 				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) )
+			}
+			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) ) {
 				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
+			}
+			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) ) {
 				continue;
+			}
 			update_meta( $key, $value['key'], $value['value'] );
 		}
 	}
 
-	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
+	if ( isset( $post_data['deletemeta'] ) && $post_data['deletemeta'] ) {
 		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+			if ( ! $meta = get_post_meta_by_id( $key ) ) {
 				continue;
-			if ( $meta->post_id != $post_ID )
+			}
+			if ( $meta->post_id != $post_ID ) {
 				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
+			}
+			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) ) {
 				continue;
+			}
 			delete_meta( $key );
 		}
 	}
 
 	// Attachment stuff
 	if ( 'attachment' == $post_data['post_type'] ) {
-		if ( isset( $post_data[ '_wp_attachment_image_alt' ] ) ) {
+		if ( isset( $post_data['_wp_attachment_image_alt'] ) ) {
 			$image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
 			if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
 				$image_alt = wp_strip_all_tags( $image_alt, true );
@@ -360,10 +399,11 @@ function edit_post( $post_data = null ) {
 	wp_set_post_lock( $post_ID );
 
 	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
+		if ( ! empty( $post_data['sticky'] ) ) {
 			stick_post( $post_ID );
-		else
+		} else {
 			unstick_post( $post_ID );
+		}
 	}
 
 	return $post_ID;
@@ -385,28 +425,31 @@ function edit_post( $post_data = null ) {
 function bulk_edit_posts( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if ( empty( $post_data ) ) {
 		$post_data = &$_POST;
+	}
 
-	if ( isset($post_data['post_type']) )
-		$ptype = get_post_type_object($post_data['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset( $post_data['post_type'] ) ) {
+		$ptype = get_post_type_object( $post_data['post_type'] );
+	} else {
+		$ptype = get_post_type_object( 'post' );
+	}
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('Sorry, you are not allowed to edit pages.'));
-		else
-			wp_die( __('Sorry, you are not allowed to edit posts.'));
+	if ( ! current_user_can( $ptype->cap->edit_posts ) ) {
+		if ( 'page' == $ptype->name ) {
+			wp_die( __( 'Sorry, you are not allowed to edit pages.' ) );
+		} else {
+			wp_die( __( 'Sorry, you are not allowed to edit posts.' ) );
+		}
 	}
 
 	if ( -1 == $post_data['_status'] ) {
 		$post_data['post_status'] = null;
-		unset($post_data['post_status']);
+		unset( $post_data['post_status'] );
 	} else {
 		$post_data['post_status'] = $post_data['_status'];
 	}
-	unset($post_data['_status']);
+	unset( $post_data['_status'] );
 
 	if ( ! empty( $post_data['post_status'] ) ) {
 		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
@@ -419,42 +462,54 @@ function bulk_edit_posts( $post_data = null ) {
 	$post_IDs = array_map( 'intval', (array) $post_data['post'] );
 
 	$reset = array(
-		'post_author', 'post_status', 'post_password',
-		'post_parent', 'page_template', 'comment_status',
-		'ping_status', 'keep_private', 'tax_input',
-		'post_category', 'sticky', 'post_format',
+		'post_author',
+		'post_status',
+		'post_password',
+		'post_parent',
+		'page_template',
+		'comment_status',
+		'ping_status',
+		'keep_private',
+		'tax_input',
+		'post_category',
+		'sticky',
+		'post_format',
 	);
 
 	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
-			unset($post_data[$field]);
+		if ( isset( $post_data[ $field ] ) && ( '' == $post_data[ $field ] || -1 == $post_data[ $field ] ) ) {
+			unset( $post_data[ $field ] );
+		}
 	}
 
-	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
+	if ( isset( $post_data['post_category'] ) ) {
+		if ( is_array( $post_data['post_category'] ) && ! empty( $post_data['post_category'] ) ) {
 			$new_cats = array_map( 'absint', $post_data['post_category'] );
-		else
-			unset($post_data['post_category']);
+		} else {
+			unset( $post_data['post_category'] );
+		}
 	}
 
 	$tax_input = array();
-	if ( isset($post_data['tax_input'])) {
+	if ( isset( $post_data['tax_input'] ) ) {
 		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
+			if ( empty( $terms ) ) {
 				continue;
+			}
 			if ( is_taxonomy_hierarchical( $tax_name ) ) {
 				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
 			} else {
 				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
+				if ( ',' !== $comma ) {
 					$terms = str_replace( $comma, ',', $terms );
+				}
 				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
 			}
 		}
 	}
 
-	if ( isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent']) ) {
-		$pages = $wpdb->get_results("SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'");
+	if ( isset( $post_data['post_parent'] ) && ( $parent = (int) $post_data['post_parent'] ) ) {
+		$pages    = $wpdb->get_results( "SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'" );
 		$children = array();
 
 		for ( $i = 0; $i < 50 && $parent > 0; $i++ ) {
@@ -469,7 +524,7 @@ function bulk_edit_posts( $post_data = null ) {
 		}
 	}
 
-	$updated = $skipped = $locked = array();
+	$updated          = $skipped = $locked = array();
 	$shared_post_data = $post_data;
 
 	foreach ( $post_IDs as $post_ID ) {
@@ -478,7 +533,7 @@ function bulk_edit_posts( $post_data = null ) {
 
 		$post_type_object = get_post_type_object( get_post_type( $post_ID ) );
 
-		if ( !isset( $post_type_object ) || ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! isset( $post_type_object ) || ( isset( $children ) && in_array( $post_ID, $children ) ) || ! current_user_can( 'edit_post', $post_ID ) ) {
 			$skipped[] = $post_ID;
 			continue;
 		}
@@ -488,32 +543,34 @@ function bulk_edit_posts( $post_data = null ) {
 			continue;
 		}
 
-		$post = get_post( $post_ID );
+		$post      = get_post( $post_ID );
 		$tax_names = get_object_taxonomies( $post );
 		foreach ( $tax_names as $tax_name ) {
-			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
-				$new_terms = $tax_input[$tax_name];
-			else
+			$taxonomy_obj = get_taxonomy( $tax_name );
+			if ( isset( $tax_input[ $tax_name ] ) && current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
+				$new_terms = $tax_input[ $tax_name ];
+			} else {
 				$new_terms = array();
+			}
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
-			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			if ( $taxonomy_obj->hierarchical ) {
+				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array( 'fields' => 'ids' ) );
+			} else {
+				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array( 'fields' => 'names' ) );
+			}
 
-			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
+			$post_data['tax_input'][ $tax_name ] = array_merge( $current_terms, $new_terms );
 		}
 
-		if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
-			$cats = (array) wp_get_post_categories($post_ID);
-			$post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
+		if ( isset( $new_cats ) && in_array( 'category', $tax_names ) ) {
+			$cats                       = (array) wp_get_post_categories( $post_ID );
+			$post_data['post_category'] = array_unique( array_merge( $cats, $new_cats ) );
 			unset( $post_data['tax_input']['category'] );
 		}
 
-		$post_data['post_type'] = $post->post_type;
+		$post_data['post_type']      = $post->post_type;
 		$post_data['post_mime_type'] = $post->post_mime_type;
-		$post_data['guid'] = $post->guid;
+		$post_data['guid']           = $post->guid;
 
 		foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
 			if ( ! isset( $post_data[ $field ] ) ) {
@@ -521,7 +578,7 @@ function bulk_edit_posts( $post_data = null ) {
 			}
 		}
 
-		$post_data['ID'] = $post_ID;
+		$post_data['ID']      = $post_ID;
 		$post_data['post_ID'] = $post_ID;
 
 		$post_data = _wp_translate_postdata( true, $post_data );
@@ -538,14 +595,19 @@ function bulk_edit_posts( $post_data = null ) {
 		$updated[] = wp_update_post( $post_data );
 
 		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
+			if ( 'sticky' == $post_data['sticky'] ) {
 				stick_post( $post_ID );
-			else
+			} else {
 				unstick_post( $post_ID );
+			}
 		}
 	}
 
-	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
+	return array(
+		'updated' => $updated,
+		'skipped' => $skipped,
+		'locked'  => $locked,
+	);
 }
 
 /**
@@ -559,42 +621,52 @@ function bulk_edit_posts( $post_data = null ) {
  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( ! empty( $_REQUEST['post_title'] ) ) {
+		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ) );
+	}
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( ! empty( $_REQUEST['content'] ) ) {
+		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ) );
+	}
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	if ( ! empty( $_REQUEST['excerpt'] ) ) {
+		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ) );
+	}
 
 	if ( $create_in_db ) {
-		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
-		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
+		$post_id = wp_insert_post(
+			array(
+				'post_title'  => __( 'Auto Draft' ),
+				'post_type'   => $post_type,
+				'post_status' => 'auto-draft',
+			)
+		);
+		$post    = get_post( $post_id );
+		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) ) {
 			set_post_format( $post, get_option( 'default_post_format' ) );
+		}
 	} else {
-		$post = new stdClass;
-		$post->ID = 0;
-		$post->post_author = '';
-		$post->post_date = '';
-		$post->post_date_gmt = '';
-		$post->post_password = '';
-		$post->post_name = '';
-		$post->post_type = $post_type;
-		$post->post_status = 'draft';
-		$post->to_ping = '';
-		$post->pinged = '';
+		$post                 = new stdClass;
+		$post->ID             = 0;
+		$post->post_author    = '';
+		$post->post_date      = '';
+		$post->post_date_gmt  = '';
+		$post->post_password  = '';
+		$post->post_name      = '';
+		$post->post_type      = $post_type;
+		$post->post_status    = 'draft';
+		$post->to_ping        = '';
+		$post->pinged         = '';
 		$post->comment_status = get_default_comment_status( $post_type );
-		$post->ping_status = get_default_comment_status( $post_type, 'pingback' );
-		$post->post_pingback = get_option( 'default_pingback_flag' );
-		$post->post_category = get_option( 'default_category' );
-		$post->page_template = 'default';
-		$post->post_parent = 0;
-		$post->menu_order = 0;
-		$post = new WP_Post( $post );
+		$post->ping_status    = get_default_comment_status( $post_type, 'pingback' );
+		$post->post_pingback  = get_option( 'default_pingback_flag' );
+		$post->post_category  = get_option( 'default_category' );
+		$post->page_template  = 'default';
+		$post->post_parent    = 0;
+		$post->menu_order     = 0;
+		$post                 = new WP_Post( $post );
 	}
 
 	/**
@@ -642,33 +714,34 @@ function get_default_post_to_edit( $post_type = 'post', $create_in_db = false )
  * @param string $date Optional post date
  * @return int Post ID if post exists, 0 otherwise.
  */
-function post_exists($title, $content = '', $date = '') {
+function post_exists( $title, $content = '', $date = '' ) {
 	global $wpdb;
 
-	$post_title = wp_unslash( sanitize_post_field( 'post_title', $title, 0, 'db' ) );
+	$post_title   = wp_unslash( sanitize_post_field( 'post_title', $title, 0, 'db' ) );
 	$post_content = wp_unslash( sanitize_post_field( 'post_content', $content, 0, 'db' ) );
-	$post_date = wp_unslash( sanitize_post_field( 'post_date', $date, 0, 'db' ) );
+	$post_date    = wp_unslash( sanitize_post_field( 'post_date', $date, 0, 'db' ) );
 
 	$query = "SELECT ID FROM $wpdb->posts WHERE 1=1";
-	$args = array();
+	$args  = array();
 
-	if ( !empty ( $date ) ) {
+	if ( ! empty( $date ) ) {
 		$query .= ' AND post_date = %s';
 		$args[] = $post_date;
 	}
 
-	if ( !empty ( $title ) ) {
+	if ( ! empty( $title ) ) {
 		$query .= ' AND post_title = %s';
 		$args[] = $post_title;
 	}
 
-	if ( !empty ( $content ) ) {
+	if ( ! empty( $content ) ) {
 		$query .= ' AND post_content = %s';
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( ! empty( $args ) ) {
+		return (int) $wpdb->get_var( $wpdb->prepare( $query, $args ) );
+	}
 
 	return 0;
 }
@@ -683,16 +756,18 @@ function post_exists($title, $content = '', $date = '') {
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
-		$ptype = get_post_type_object($_POST['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset( $_POST['post_type'] ) ) {
+		$ptype = get_post_type_object( $_POST['post_type'] );
+	} else {
+		$ptype = get_post_type_object( 'post' );
+	}
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
+	if ( ! current_user_can( $ptype->cap->edit_posts ) ) {
+		if ( 'page' == $ptype->name ) {
 			return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
-		else
+		} else {
 			return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+		}
 	}
 
 	$_POST['post_mime_type'] = '';
@@ -701,19 +776,20 @@ function wp_write_post() {
 	unset( $_POST['filter'] );
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
+	if ( isset( $_POST['post_ID'] ) ) {
 		return edit_post();
+	}
 
-	if ( isset($_POST['visibility']) ) {
+	if ( isset( $_POST['visibility'] ) ) {
 		switch ( $_POST['visibility'] ) {
-			case 'public' :
+			case 'public':
 				$_POST['post_password'] = '';
 				break;
-			case 'password' :
+			case 'password':
 				unset( $_POST['sticky'] );
 				break;
-			case 'private' :
-				$_POST['post_status'] = 'private';
+			case 'private':
+				$_POST['post_status']   = 'private';
 				$_POST['post_password'] = '';
 				unset( $_POST['sticky'] );
 				break;
@@ -721,16 +797,19 @@ function wp_write_post() {
 	}
 
 	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
+	if ( is_wp_error( $translated ) ) {
 		return $translated;
+	}
 
 	// Create the post.
 	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
+	if ( is_wp_error( $post_ID ) ) {
 		return $post_ID;
+	}
 
-	if ( empty($post_ID) )
+	if ( empty( $post_ID ) ) {
 		return 0;
+	}
 
 	add_meta( $post_ID );
 
@@ -753,10 +832,11 @@ function wp_write_post() {
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
+	if ( is_wp_error( $result ) ) {
 		wp_die( $result->get_error_message() );
-	else
+	} else {
 		return $result;
+	}
 }
 
 //
@@ -774,25 +854,29 @@ function write_post() {
 function add_meta( $post_ID ) {
 	$post_ID = (int) $post_ID;
 
-	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
-	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
-	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
+	$metakeyselect = isset( $_POST['metakeyselect'] ) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
+	$metakeyinput  = isset( $_POST['metakeyinput'] ) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
+	$metavalue     = isset( $_POST['metavalue'] ) ? $_POST['metavalue'] : '';
+	if ( is_string( $metavalue ) ) {
 		$metavalue = trim( $metavalue );
+	}
 
-	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
+	if ( ( '0' === $metavalue || ! empty( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && ! empty( $metakeyselect ) ) || ! empty( $metakeyinput ) ) ) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
+		if ( '#NONE#' != $metakeyselect ) {
 			$metakey = $metakeyselect;
+		}
 
-		if ( $metakeyinput )
+		if ( $metakeyinput ) {
 			$metakey = $metakeyinput; // default
+		}
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
+		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
 			return false;
+		}
 
 		$metakey = wp_slash( $metakey );
 
@@ -811,7 +895,7 @@ function add_meta( $post_ID ) {
  * @return bool
  */
 function delete_meta( $mid ) {
-	return delete_metadata_by_mid( 'post' , $mid );
+	return delete_metadata_by_mid( 'post', $mid );
 }
 
 /**
@@ -826,11 +910,13 @@ function delete_meta( $mid ) {
 function get_meta_keys() {
 	global $wpdb;
 
-	$keys = $wpdb->get_col( "
+	$keys = $wpdb->get_col(
+		"
 			SELECT meta_key
 			FROM $wpdb->postmeta
 			GROUP BY meta_key
-			ORDER BY meta_key" );
+			ORDER BY meta_key"
+	);
 
 	return $keys;
 }
@@ -860,9 +946,13 @@ function get_post_meta_by_id( $mid ) {
 function has_meta( $postid ) {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value, meta_id, post_id
+	return $wpdb->get_results(
+		$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
+	);
 }
 
 /**
@@ -876,7 +966,7 @@ function has_meta( $postid ) {
  * @return bool
  */
 function update_meta( $meta_id, $meta_key, $meta_value ) {
-	$meta_key = wp_unslash( $meta_key );
+	$meta_key   = wp_unslash( $meta_key );
 	$meta_value = wp_unslash( $meta_value );
 
 	return update_metadata_by_mid( 'post', $meta_id, $meta_value, $meta_key );
@@ -896,35 +986,39 @@ function update_meta( $meta_id, $meta_key, $meta_value ) {
  * @return void|int|WP_Error Void if nothing fixed. 0 or WP_Error on update failure. The post ID on update success.
  */
 function _fix_attachment_links( $post ) {
-	$post = get_post( $post, ARRAY_A );
+	$post    = get_post( $post, ARRAY_A );
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
+	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) ) {
 		return;
+	}
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
+	if ( ! strpos( $content, '?attachment_id=' ) || ! preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) ) {
 		return;
+	}
 
-	$site_url = get_bloginfo('url');
-	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
-	$replace = '';
+	$site_url = get_bloginfo( 'url' );
+	$site_url = substr( $site_url, (int) strpos( $site_url, '://' ) ); // remove the http(s)
+	$replace  = '';
 
 	foreach ( $link_matches[1] as $key => $value ) {
-		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
-			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
+		if ( ! strpos( $value, '?attachment_id=' ) || ! strpos( $value, 'wp-att-' )
+			|| ! preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
+			|| ! preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) ) {
 				continue;
+		}
 
-		$quote = $url_match[1]; // the quote (single or double)
+		$quote  = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
+		if ( ! $url_id || ! $rel_id || $url_id != $rel_id || strpos( $url_match[0], $site_url ) === false ) {
 			continue;
+		}
 
-		$link = $link_matches[0][$key];
+		$link    = $link_matches[0][ $key ];
 		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
 
 		$content = str_replace( $link, $replace, $content );
@@ -933,9 +1027,9 @@ function _fix_attachment_links( $post ) {
 	if ( $replace ) {
 		$post['post_content'] = $content;
 		// Escape data pulled from DB.
-		$post = add_magic_quotes($post);
+		$post = add_magic_quotes( $post );
 
-		return wp_update_post($post);
+		return wp_update_post( $post );
 	}
 }
 
@@ -947,10 +1041,10 @@ function _fix_attachment_links( $post ) {
  * @param string $type The post_type you want the statuses for
  * @return array As array of all the statuses for the supplied post type
  */
-function get_available_post_statuses($type = 'post') {
-	$stati = wp_count_posts($type);
+function get_available_post_statuses( $type = 'post' ) {
+	$stati = wp_count_posts( $type );
 
-	return array_keys(get_object_vars($stati));
+	return array_keys( get_object_vars( $stati ) );
 }
 
 /**
@@ -962,22 +1056,24 @@ function get_available_post_statuses($type = 'post') {
  * @return array
  */
 function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
+	if ( false === $q ) {
 		$q = $_GET;
-	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
-	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
-	$post_stati  = get_post_stati();
+	}
+	$q['m']     = isset( $q['m'] ) ? (int) $q['m'] : 0;
+	$q['cat']   = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+	$post_stati = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
+	if ( isset( $q['post_type'] ) && in_array( $q['post_type'], get_post_types() ) ) {
 		$post_type = $q['post_type'];
-	else
+	} else {
 		$post_type = 'post';
+	}
 
-	$avail_post_stati = get_available_post_statuses($post_type);
+	$avail_post_stati = get_available_post_statuses( $post_type );
 
-	if ( isset($q['post_status']) && in_array( $q['post_status'], $post_stati ) ) {
+	if ( isset( $q['post_status'] ) && in_array( $q['post_status'], $post_stati ) ) {
 		$post_status = $q['post_status'];
-		$perm = 'readable';
+		$perm        = 'readable';
 	}
 
 	if ( isset( $q['orderby'] ) ) {
@@ -992,10 +1088,11 @@ function wp_edit_posts_query( $q = false ) {
 		$order = 'ASC';
 	}
 
-	$per_page = "edit_{$post_type}_per_page";
+	$per_page       = "edit_{$post_type}_per_page";
 	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
+	if ( empty( $posts_per_page ) || $posts_per_page < 1 ) {
 		$posts_per_page = 20;
+	}
 
 	/**
 	 * Filters the number of items per page to show for a specific 'per_page' type.
@@ -1022,19 +1119,20 @@ function wp_edit_posts_query( $q = false ) {
 	 */
 	$posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type );
 
-	$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
+	$query = compact( 'post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page' );
 
 	// Hierarchical types require special args.
-	if ( is_post_type_hierarchical( $post_type ) && !isset($orderby) ) {
-		$query['orderby'] = 'menu_order title';
-		$query['order'] = 'asc';
-		$query['posts_per_page'] = -1;
+	if ( is_post_type_hierarchical( $post_type ) && ! isset( $orderby ) ) {
+		$query['orderby']                = 'menu_order title';
+		$query['order']                  = 'asc';
+		$query['posts_per_page']         = -1;
 		$query['posts_per_archive_page'] = -1;
-		$query['fields'] = 'id=>parent';
+		$query['fields']                 = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
+	if ( ! empty( $q['show_sticky'] ) ) {
 		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	}
 
 	wp( $query );
 
@@ -1051,10 +1149,10 @@ function wp_edit_posts_query( $q = false ) {
  * @param string $type
  * @return mixed
  */
-function get_available_post_mime_types($type = 'attachment') {
+function get_available_post_mime_types( $type = 'attachment' ) {
 	global $wpdb;
 
-	$types = $wpdb->get_col($wpdb->prepare("SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type));
+	$types = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT post_mime_type FROM $wpdb->posts WHERE post_type = %s", $type ) );
 	return $types;
 }
 
@@ -1071,11 +1169,11 @@ function wp_edit_attachments_query_vars( $q = false ) {
 	if ( false === $q ) {
 		$q = $_GET;
 	}
-	$q['m']   = isset( $q['m'] ) ? (int) $q['m'] : 0;
-	$q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+	$q['m']         = isset( $q['m'] ) ? (int) $q['m'] : 0;
+	$q['cat']       = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
 	$q['post_type'] = 'attachment';
-	$post_type = get_post_type_object( 'attachment' );
-	$states = 'inherit';
+	$post_type      = get_post_type_object( 'attachment' );
+	$states         = 'inherit';
 	if ( current_user_can( $post_type->cap->read_private_posts ) ) {
 		$states .= ',private';
 	}
@@ -1098,8 +1196,8 @@ function wp_edit_attachments_query_vars( $q = false ) {
 	$q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
 
 	$post_mime_types = get_post_mime_types();
-	if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) {
-		unset($q['post_mime_type']);
+	if ( isset( $q['post_mime_type'] ) && ! array_intersect( (array) $q['post_mime_type'], array_keys( $post_mime_types ) ) ) {
+		unset( $q['post_mime_type'] );
 	}
 
 	foreach ( array_keys( $post_mime_types ) as $type ) {
@@ -1133,7 +1231,7 @@ function wp_edit_attachments_query_vars( $q = false ) {
 function wp_edit_attachments_query( $q = false ) {
 	wp( wp_edit_attachments_query_vars( $q ) );
 
-	$post_mime_types = get_post_mime_types();
+	$post_mime_types       = get_post_mime_types();
 	$avail_post_mime_types = get_available_post_mime_types( 'attachment' );
 
 	return array( $post_mime_types, $avail_post_mime_types );
@@ -1151,8 +1249,8 @@ function wp_edit_attachments_query( $q = false ) {
 function postbox_classes( $id, $page ) {
 	if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) {
 		$classes = array( '' );
-	} elseif ( $closed = get_user_option('closedpostboxes_'.$page ) ) {
-		if ( !is_array( $closed ) ) {
+	} elseif ( $closed = get_user_option( 'closedpostboxes_' . $page ) ) {
+		if ( ! is_array( $closed ) ) {
 			$classes = array( '' );
 		} else {
 			$classes = in_array( $id, $closed ) ? array( 'closed' ) : array( '' );
@@ -1185,59 +1283,62 @@ function postbox_classes( $id, $page ) {
  * @param string $name  Optional. Name to override the post name. Default null.
  * @return array Array containing the sample permalink with placeholder for the post name, and the post name.
  */
-function get_sample_permalink($id, $title = null, $name = null) {
+function get_sample_permalink( $id, $title = null, $name = null ) {
 	$post = get_post( $id );
-	if ( ! $post )
+	if ( ! $post ) {
 		return array( '', '' );
+	}
 
-	$ptype = get_post_type_object($post->post_type);
+	$ptype = get_post_type_object( $post->post_type );
 
 	$original_status = $post->post_status;
-	$original_date = $post->post_date;
-	$original_name = $post->post_name;
+	$original_date   = $post->post_date;
+	$original_name   = $post->post_name;
 
 	// Hack: get_permalink() would return ugly permalink for drafts, so we will fake that our post is published.
 	if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ) ) ) {
 		$post->post_status = 'publish';
-		$post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
+		$post->post_name   = sanitize_title( $post->post_name ? $post->post_name : $post->post_title, $post->ID );
 	}
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
-		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	if ( ! is_null( $name ) ) {
+		$post->post_name = sanitize_title( $name ? $name : $title, $post->ID );
+	}
 
-	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
+	$post->post_name = wp_unique_post_slug( $post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent );
 
 	$post->filter = 'sample';
 
-	$permalink = get_permalink($post, true);
+	$permalink = get_permalink( $post, true );
 
 	// Replace custom post_type Token with generic pagename token for ease of use.
-	$permalink = str_replace("%$post->post_type%", '%pagename%', $permalink);
+	$permalink = str_replace( "%$post->post_type%", '%pagename%', $permalink );
 
 	// Handle page hierarchy
 	if ( $ptype->hierarchical ) {
-		$uri = get_page_uri($post);
+		$uri = get_page_uri( $post );
 		if ( $uri ) {
-			$uri = untrailingslashit($uri);
+			$uri = untrailingslashit( $uri );
 			$uri = strrev( stristr( strrev( $uri ), '/' ) );
-			$uri = untrailingslashit($uri);
+			$uri = untrailingslashit( $uri );
 		}
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
 		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( !empty($uri) )
+		if ( ! empty( $uri ) ) {
 			$uri .= '/';
-		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
+		}
+		$permalink = str_replace( '%pagename%', "{$uri}%pagename%", $permalink );
 	}
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	$permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name, $post ) );
+	$permalink         = array( $permalink, apply_filters( 'editable_slug', $post->post_name, $post ) );
 	$post->post_status = $original_status;
-	$post->post_date = $original_date;
-	$post->post_name = $original_name;
-	unset($post->filter);
+	$post->post_date   = $original_date;
+	$post->post_name   = $original_name;
+	unset( $post->filter );
 
 	/**
 	 * Filters the sample permalink.
@@ -1265,17 +1366,18 @@ function get_sample_permalink($id, $title = null, $name = null) {
  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 	$post = get_post( $id );
-	if ( ! $post )
+	if ( ! $post ) {
 		return '';
+	}
 
-	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
+	list($permalink, $post_name) = get_sample_permalink( $post->ID, $new_title, $new_slug );
 
-	$view_link = false;
+	$view_link      = false;
 	$preview_target = '';
 
 	if ( current_user_can( 'read_post', $post->ID ) ) {
 		if ( 'draft' === $post->post_status || empty( $post->post_name ) ) {
-			$view_link = get_preview_post_link( $post );
+			$view_link      = get_preview_post_link( $post );
 			$preview_target = " target='wp-preview-{$post->ID}'";
 		} else {
 			if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
@@ -1293,14 +1395,14 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 
 		if ( false !== $view_link ) {
 			$display_link = urldecode( $view_link );
-			$return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . esc_html( $display_link ) . "</a>\n";
+			$return      .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . esc_html( $display_link ) . "</a>\n";
 		} else {
 			$return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
 		}
 
 		// Encourage a pretty permalink setting
-		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) {
-			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
+		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && ! ( 'page' == get_option( 'show_on_front' ) && $id == get_option( 'page_on_front' ) ) ) {
+			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __( 'Change Permalinks' ) . "</a></span>\n";
 		}
 	} else {
 		if ( mb_strlen( $post_name ) > 34 ) {
@@ -1310,9 +1412,9 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 		}
 
 		$post_name_html = '<span id="editable-post-name">' . esc_html( $post_name_abridged ) . '</span>';
-		$display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, esc_html( urldecode( $permalink ) ) );
+		$display_link   = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, esc_html( urldecode( $permalink ) ) );
 
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
+		$return  = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
 		$return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
 		$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
 		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
@@ -1353,7 +1455,8 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
 	$set_thumbnail_link = '<p class="hide-if-no-js"><a href="%s" id="set-post-thumbnail"%s class="thickbox">%s</a></p>';
 	$upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
 
-	$content = sprintf( $set_thumbnail_link,
+	$content = sprintf(
+		$set_thumbnail_link,
 		esc_url( $upload_iframe_src ),
 		'', // Empty when there's no featured image set, `aria-describedby` attribute otherwise.
 		esc_html( $post_type_object->labels->set_featured_image )
@@ -1384,7 +1487,8 @@ function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
 		$thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
 
 		if ( ! empty( $thumbnail_html ) ) {
-			$content = sprintf( $set_thumbnail_link,
+			$content  = sprintf(
+				$set_thumbnail_link,
 				esc_url( $upload_iframe_src ),
 				' aria-describedby="set-post-thumbnail-desc"',
 				$thumbnail_html
@@ -1464,7 +1568,7 @@ function wp_set_post_lock( $post_id ) {
 		return false;
 	}
 
-	$now = time();
+	$now  = time();
 	$lock = "$now:$user_id";
 
 	update_post_meta( $post->ID, '_edit_lock', $lock );
@@ -1479,12 +1583,14 @@ function wp_set_post_lock( $post_id ) {
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
+	if ( ! $post = get_post() ) {
 		return;
+	}
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
+	if ( $user_id = wp_check_post_lock( $post->ID ) ) {
 		$user = get_userdata( $user_id );
+	}
 
 	if ( $user ) {
 
@@ -1499,8 +1605,9 @@ function _admin_notice_post_locked() {
 		 * @param WP_Post      $post    Post object.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
+		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) ) {
 			return;
+		}
 
 		$locked = true;
 	} else {
@@ -1510,12 +1617,13 @@ function _admin_notice_post_locked() {
 	if ( $locked && ( $sendback = wp_get_referer() ) &&
 		false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
 
-		$sendback_text = __('Go back');
+		$sendback_text = __( 'Go back' );
 	} else {
 		$sendback = admin_url( 'edit.php' );
 
-		if ( 'post' != $post->post_type )
+		if ( 'post' != $post->post_type ) {
 			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		}
 
 		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
 	}
@@ -1533,8 +1641,8 @@ function _admin_notice_post_locked() {
 		if ( get_post_type_object( $post->post_type )->public ) {
 			if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
 				// Latest content is in autosave
-				$nonce = wp_create_nonce( 'post_preview_' . $post->ID );
-				$query_args['preview_id'] = $post->ID;
+				$nonce                       = wp_create_nonce( 'post_preview_' . $post->ID );
+				$query_args['preview_id']    = $post->ID;
 				$query_args['preview_nonce'] = $nonce;
 			}
 		}
@@ -1561,13 +1669,13 @@ function _admin_notice_post_locked() {
 		<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
-			if ( $override ) {
-				/* translators: %s: user's display name */
-				printf( __( '%s is already editing this post. Do you want to take over?' ), esc_html( $user->display_name ) );
-			} else {
-				/* translators: %s: user's display name */
-				printf( __( '%s is already editing this post.' ), esc_html( $user->display_name ) );
-			}
+		if ( $override ) {
+			/* translators: %s: user's display name */
+			printf( __( '%s is already editing this post. Do you want to take over?' ), esc_html( $user->display_name ) );
+		} else {
+			/* translators: %s: user's display name */
+			printf( __( '%s is already editing this post.' ), esc_html( $user->display_name ) );
+		}
 		?>
 		</p>
 		<?php
@@ -1583,16 +1691,16 @@ function _admin_notice_post_locked() {
 		<p>
 		<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>
+		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e( 'Preview' ); ?></a>
 		<?php
-		}
+}
 
 		// Allow plugins to prevent some users overriding the post lock
-		if ( $override ) {
-			?>
-			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e('Take over'); ?></a>
+if ( $override ) {
+	?>
+	<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e( 'Take over' ); ?></a>
 			<?php
-		}
+}
 
 		?>
 		</p>
@@ -1605,7 +1713,7 @@ function _admin_notice_post_locked() {
 			<p class="wp-tab-first" tabindex="0">
 			<span class="currently-editing"></span><br />
 			<span class="locked-saving hidden"><img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" width="16" height="16" alt="" /> <?php _e( 'Saving revision&hellip;' ); ?></span>
-			<span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
+			<span class="locked-saved hidden"><?php _e( 'Your latest changes were saved as a revision.' ); ?></span>
 			</p>
 			<?php
 			/**
@@ -1638,26 +1746,27 @@ function _admin_notice_post_locked() {
  */
 function wp_create_post_autosave( $post_data ) {
 	if ( is_numeric( $post_data ) ) {
-		$post_id = $post_data;
+		$post_id   = $post_data;
 		$post_data = $_POST;
 	} else {
 		$post_id = (int) $post_data['post_ID'];
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
+	if ( is_wp_error( $post_data ) ) {
 		return $post_data;
+	}
 
 	$post_author = get_current_user_id();
 
 	// Store one autosave per author. If there is already an autosave, overwrite it.
 	if ( $old_autosave = wp_get_post_autosave( $post_id, $post_author ) ) {
-		$new_autosave = _wp_post_revision_data( $post_data, true );
-		$new_autosave['ID'] = $old_autosave->ID;
+		$new_autosave                = _wp_post_revision_data( $post_data, true );
+		$new_autosave['ID']          = $old_autosave->ID;
 		$new_autosave['post_author'] = $post_author;
 
 		// If the new autosave has the same content as the post, delete the autosave.
-		$post = get_post( $post_id );
+		$post                  = get_post( $post_id );
 		$autosave_is_different = false;
 		foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields( $post ) ) ) as $field ) {
 			if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
@@ -1699,7 +1808,7 @@ function wp_create_post_autosave( $post_data ) {
  */
 function post_preview() {
 
-	$post_ID = (int) $_POST['post_ID'];
+	$post_ID     = (int) $_POST['post_ID'];
 	$_POST['ID'] = $post_ID;
 
 	if ( ! $post = get_post( $post_ID ) ) {
@@ -1717,19 +1826,21 @@ function post_preview() {
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
+		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] ) {
 			$_POST['post_status'] = 'draft';
+		}
 
 		$saved_post_id = wp_create_post_autosave( $post->ID );
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
+	if ( is_wp_error( $saved_post_id ) ) {
 		wp_die( $saved_post_id->get_error_message() );
+	}
 
 	$query_args = array();
 
 	if ( $is_autosave && $saved_post_id ) {
-		$query_args['preview_id'] = $post->ID;
+		$query_args['preview_id']    = $post->ID;
 		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
 
 		if ( isset( $_POST['post_format'] ) ) {
@@ -1757,10 +1868,11 @@ function post_preview() {
  */
 function wp_autosave( $post_data ) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
+	if ( ! defined( 'DOING_AUTOSAVE' ) ) {
 		define( 'DOING_AUTOSAVE', true );
+	}
 
-	$post_id = (int) $post_data['post_id'];
+	$post_id         = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
 
 	if ( false === wp_verify_nonce( $post_data['_wpnonce'], 'update-post_' . $post_id ) ) {
@@ -1773,11 +1885,13 @@ function wp_autosave( $post_data ) {
 		return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );
 	}
 
-	if ( 'auto-draft' == $post->post_status )
+	if ( 'auto-draft' == $post->post_status ) {
 		$post_data['post_status'] = 'draft';
+	}
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
+	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) ) {
 		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	}
 
 	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked
@@ -1793,8 +1907,8 @@ function wp_autosave( $post_data ) {
  *
  * @param int $post_id Optional. Post ID.
  */
-function redirect_post($post_id = '') {
-	if ( isset($_POST['save']) || isset($_POST['publish']) ) {
+function redirect_post( $post_id = '' ) {
+	if ( isset( $_POST['save'] ) || isset( $_POST['publish'] ) ) {
 		$status = get_post_status( $post_id );
 
 		if ( isset( $_POST['publish'] ) ) {
@@ -1813,13 +1927,13 @@ function redirect_post($post_id = '') {
 		}
 
 		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
-	} elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
+	} elseif ( isset( $_POST['addmeta'] ) && $_POST['addmeta'] ) {
 		$location = add_query_arg( 'message', 2, wp_get_referer() );
-		$location = explode('#', $location);
+		$location = explode( '#', $location );
 		$location = $location[0] . '#postcustom';
-	} elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) {
+	} elseif ( isset( $_POST['deletemeta'] ) && $_POST['deletemeta'] ) {
 		$location = add_query_arg( 'message', 3, wp_get_referer() );
-		$location = explode('#', $location);
+		$location = explode( '#', $location );
 		$location = $location[0] . '#postcustom';
 	} else {
 		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
@@ -1878,11 +1992,13 @@ function taxonomy_meta_box_sanitize_cb_input( $taxonomy, $terms ) {
 			continue;
 		}
 
-		$_term = get_terms( $taxonomy, array(
-			'name' => $term,
-			'fields' => 'ids',
-			'hide_empty' => false,
-		) );
+		$_term = get_terms(
+			$taxonomy, array(
+				'name'       => $term,
+				'fields'     => 'ids',
+				'hide_empty' => false,
+			)
+		);
 
 		if ( ! empty( $_term ) ) {
 			$clean_terms[] = intval( $_term[0] );
diff --git a/wp-admin/includes/revision.php b/wp-admin/includes/revision.php
index 5a765cb8da..be2a791cba 100644
--- a/wp-admin/includes/revision.php
+++ b/wp-admin/includes/revision.php
@@ -20,38 +20,45 @@
  *                    Or, false on failure.
  */
 function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post( $post ) ) {
 		return false;
+	}
 
 	if ( $compare_from ) {
-		if ( ! $compare_from = get_post( $compare_from ) )
+		if ( ! $compare_from = get_post( $compare_from ) ) {
 			return false;
+		}
 	} else {
 		// If we're dealing with the first revision...
 		$compare_from = false;
 	}
 
-	if ( ! $compare_to = get_post( $compare_to ) )
+	if ( ! $compare_to = get_post( $compare_to ) ) {
 		return false;
+	}
 
 	// If comparing revisions, make sure we're dealing with the right post parent.
 	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
-	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
+	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID ) {
 		return false;
-	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
+	}
+	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID ) {
 		return false;
+	}
 
 	if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
-		$temp = $compare_from;
+		$temp         = $compare_from;
 		$compare_from = $compare_to;
-		$compare_to = $temp;
+		$compare_to   = $temp;
 	}
 
 	// Add default title if title field is empty
-	if ( $compare_from && empty( $compare_from->post_title ) )
+	if ( $compare_from && empty( $compare_from->post_title ) ) {
 		$compare_from->post_title = __( '(no title)' );
-	if ( empty( $compare_to->post_title ) )
+	}
+	if ( empty( $compare_to->post_title ) ) {
 		$compare_to->post_title = __( '(no title)' );
+	}
 
 	$return = array();
 
@@ -76,7 +83,7 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
 		$content_to = apply_filters( "_wp_post_revision_field_{$field}", $compare_to->$field, $field, $compare_to, 'to' );
 
 		$args = array(
-			'show_split_view' => true
+			'show_split_view' => true,
 		);
 
 		/**
@@ -103,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>';
 			$diff .= '<td>' . esc_html( $compare_from->post_title ) . '</td><td></td><td>' . esc_html( $compare_to->post_title ) . '</td>';
 			$diff .= '</tr></tbody>';
 			$diff .= '</table>';
@@ -111,7 +118,7 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
 
 		if ( $diff ) {
 			$return[] = array(
-				'id' => $field,
+				'id'   => $field,
 				'name' => $name,
 				'diff' => $diff,
 			);
@@ -143,16 +150,22 @@ function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
  * @return array An associative array of revision data and related settings.
  */
 function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) {
-	$post = get_post( $post );
+	$post    = get_post( $post );
 	$authors = array();
 	$now_gmt = time();
 
-	$revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC', 'check_enabled' => false ) );
+	$revisions = wp_get_post_revisions(
+		$post->ID, array(
+			'order'         => 'ASC',
+			'check_enabled' => false,
+		)
+	);
 	// If revisions are disabled, we only want autosaves and the current post.
 	if ( ! wp_revisions_enabled( $post ) ) {
 		foreach ( $revisions as $revision_id => $revision ) {
-			if ( ! wp_is_post_autosave( $revision ) )
+			if ( ! wp_is_post_autosave( $revision ) ) {
 				unset( $revisions[ $revision_id ] );
+			}
 		}
 		$revisions = array( $post->ID => $post ) + $revisions;
 	}
@@ -162,37 +175,41 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
 	cache_users( wp_list_pluck( $revisions, 'post_author' ) );
 
 	$can_restore = current_user_can( 'edit_post', $post->ID );
-	$current_id = false;
+	$current_id  = false;
 
 	foreach ( $revisions as $revision ) {
-		$modified = strtotime( $revision->post_modified );
+		$modified     = strtotime( $revision->post_modified );
 		$modified_gmt = strtotime( $revision->post_modified_gmt . ' +0000' );
 		if ( $can_restore ) {
-			$restore_link = str_replace( '&amp;', '&', wp_nonce_url(
-				add_query_arg(
-					array( 'revision' => $revision->ID,
-						'action' => 'restore' ),
+			$restore_link = str_replace(
+				'&amp;', '&', wp_nonce_url(
+					add_query_arg(
+						array(
+							'revision' => $revision->ID,
+							'action'   => 'restore',
+						),
 						admin_url( 'revision.php' )
-				),
-				"restore-post_{$revision->ID}"
-			) );
+					),
+					"restore-post_{$revision->ID}"
+				)
+			);
 		}
 
 		if ( ! isset( $authors[ $revision->post_author ] ) ) {
 			$authors[ $revision->post_author ] = array(
-				'id' => (int) $revision->post_author,
+				'id'     => (int) $revision->post_author,
 				'avatar' => $show_avatars ? get_avatar( $revision->post_author, 32 ) : '',
-				'name' => get_the_author_meta( 'display_name', $revision->post_author ),
+				'name'   => get_the_author_meta( 'display_name', $revision->post_author ),
 			);
 		}
 
 		$autosave = (bool) wp_is_post_autosave( $revision );
-		$current = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
+		$current  = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
 		if ( $current && ! empty( $current_id ) ) {
 			// If multiple revisions have the same post_modified_gmt, highest ID is current.
 			if ( $current_id < $revision->ID ) {
 				$revisions[ $current_id ]['current'] = false;
-				$current_id = $revision->ID;
+				$current_id                          = $revision->ID;
 			} else {
 				$current = false;
 			}
@@ -253,7 +270,7 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
 			'current'    => true,
 			'restoreUrl' => false,
 		);
-		$current_id = $post->ID;
+		$current_id             = $post->ID;
 	}
 
 	/*
@@ -288,21 +305,23 @@ function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null
 
 	$from = absint( $from );
 
-	$diffs = array( array(
-		'id' => $from . ':' . $selected_revision_id,
-		'fields' => wp_get_revision_ui_diff( $post->ID, $from, $selected_revision_id ),
-	));
+	$diffs = array(
+		array(
+			'id'     => $from . ':' . $selected_revision_id,
+			'fields' => wp_get_revision_ui_diff( $post->ID, $from, $selected_revision_id ),
+		),
+	);
 
 	return array(
-		'postId'           => $post->ID,
-		'nonce'            => wp_create_nonce( 'revisions-ajax-nonce' ),
-		'revisionData'     => array_values( $revisions ),
-		'to'               => $selected_revision_id,
-		'from'             => $from,
-		'diffData'         => $diffs,
-		'baseUrl'          => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
-		'compareTwoMode'   => absint( $compare_two_mode ), // Apparently booleans are not allowed
-		'revisionIds'      => array_keys( $revisions ),
+		'postId'         => $post->ID,
+		'nonce'          => wp_create_nonce( 'revisions-ajax-nonce' ),
+		'revisionData'   => array_values( $revisions ),
+		'to'             => $selected_revision_id,
+		'from'           => $from,
+		'diffData'       => $diffs,
+		'baseUrl'        => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
+		'compareTwoMode' => absint( $compare_two_mode ), // Apparently booleans are not allowed
+		'revisionIds'    => array_keys( $revisions ),
 	);
 }
 
@@ -357,14 +376,32 @@ function wp_print_revision_templates() {
 					{{{ data.attributes.author.avatar }}}
 					<div class="author-info">
 					<# if ( data.attributes.autosave ) { #>
-						<span class="byline"><?php printf( __( 'Autosave by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline">
+						<?php
+						printf(
+							__( 'Autosave by %s' ),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'
+						);
+							?>
+							</span>
 					<# } else if ( data.attributes.current ) { #>
-						<span class="byline"><?php printf( __( 'Current Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline">
+						<?php
+						printf(
+							__( 'Current Revision by %s' ),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'
+						);
+							?>
+							</span>
 					<# } else { #>
-						<span class="byline"><?php printf( __( 'Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline">
+						<?php
+						printf(
+							__( 'Revision by %s' ),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'
+						);
+							?>
+							</span>
 					<# } #>
 						<span class="time-ago">{{ data.attributes.timeAgo }}</span>
 						<span class="date">({{ data.attributes.dateShort }})</span>
@@ -399,5 +436,6 @@ function wp_print_revision_templates() {
 			{{{ field.diff }}}
 		<# }); #>
 		</div>
-	</script><?php
+	</script>
+	<?php
 }
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 5a6e7c19a2..edba6973a0 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -38,8 +38,9 @@ function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
 
 	$charset_collate = $wpdb->get_charset_collate();
 
-	if ( $blog_id && $blog_id != $wpdb->blogid )
+	if ( $blog_id && $blog_id != $wpdb->blogid ) {
 		$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	}
 
 	// Engage multisite if in the middle of turning it on from network.php.
 	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
@@ -235,10 +236,11 @@ CREATE TABLE $wpdb->posts (
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite )
+	if ( $is_multisite ) {
 		$global_tables = $users_multi_table . $usermeta_table;
-	else
+	} else {
 		$global_tables = $users_single_table . $usermeta_table;
+	}
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (
@@ -310,27 +312,30 @@ CREATE TABLE $wpdb->signups (
 ) $charset_collate;";
 
 	switch ( $scope ) {
-		case 'blog' :
+		case 'blog':
 			$queries = $blog_tables;
 			break;
-		case 'global' :
+		case 'global':
 			$queries = $global_tables;
-			if ( $is_multisite )
+			if ( $is_multisite ) {
 				$queries .= $ms_global_tables;
+			}
 			break;
-		case 'ms_global' :
+		case 'ms_global':
 			$queries = $ms_global_tables;
 			break;
-		case 'all' :
+		case 'all':
 		default:
 			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite )
+			if ( $is_multisite ) {
 				$queries .= $ms_global_tables;
+			}
 			break;
 	}
 
-	if ( isset( $old_blog_id ) )
+	if ( isset( $old_blog_id ) ) {
 		$wpdb->set_blog_id( $old_blog_id );
+	}
 
 	return $queries;
 }
@@ -358,7 +363,7 @@ function populate_options() {
 	 */
 	do_action( 'populate_options' );
 
-	if ( ini_get('safe_mode') ) {
+	if ( ini_get( 'safe_mode' ) ) {
 		// Safe mode can break mkdir() so use a flat structure by default.
 		$uploads_use_yearmonth_folders = 0;
 	} else {
@@ -367,7 +372,7 @@ function populate_options() {
 
 	// If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
 	$stylesheet = $template = WP_DEFAULT_THEME;
-	$theme = wp_get_theme( WP_DEFAULT_THEME );
+	$theme      = wp_get_theme( WP_DEFAULT_THEME );
 	if ( ! $theme->exists() ) {
 		$theme = WP_Theme::get_core_default_theme();
 	}
@@ -379,144 +384,145 @@ function populate_options() {
 	}
 
 	$timezone_string = '';
-	$gmt_offset = 0;
+	$gmt_offset      = 0;
 	/*
 	 * translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)
 	 * or a valid timezone string (America/New_York). See https://secure.php.net/manual/en/timezones.php
 	 * for all timezone strings supported by PHP.
 	 */
 	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
-	if ( is_numeric( $offset_or_tz ) )
+	if ( is_numeric( $offset_or_tz ) ) {
 		$gmt_offset = $offset_or_tz;
-	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
+	} elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) ) {
 			$timezone_string = $offset_or_tz;
+	}
 
 	$options = array(
-	'siteurl' => $guessurl,
-	'home' => $guessurl,
-	'blogname' => __('My Site'),
-	/* translators: site tagline */
-	'blogdescription' => __('Just another WordPress site'),
-	'users_can_register' => 0,
-	'admin_email' => 'you@example.com',
-	/* translators: default start of the week. 0 = Sunday, 1 = Monday */
-	'start_of_week' => _x( '1', 'start of week' ),
-	'use_balanceTags' => 0,
-	'use_smilies' => 1,
-	'require_name_email' => 1,
-	'comments_notify' => 1,
-	'posts_per_rss' => 10,
-	'rss_use_excerpt' => 0,
-	'mailserver_url' => 'mail.example.com',
-	'mailserver_login' => 'login@example.com',
-	'mailserver_pass' => 'password',
-	'mailserver_port' => 110,
-	'default_category' => 1,
-	'default_comment_status' => 'open',
-	'default_ping_status' => 'open',
-	'default_pingback_flag' => 1,
-	'posts_per_page' => 10,
-	/* translators: default date format, see https://secure.php.net/date */
-	'date_format' => __('F j, Y'),
-	/* translators: default time format, see https://secure.php.net/date */
-	'time_format' => __('g:i a'),
-	/* translators: links last updated date format, see https://secure.php.net/date */
-	'links_updated_date_format' => __('F j, Y g:i a'),
-	'comment_moderation' => 0,
-	'moderation_notify' => 1,
-	'permalink_structure' => '',
-	'rewrite_rules' => '',
-	'hack_file' => 0,
-	'blog_charset' => 'UTF-8',
-	'moderation_keys' => '',
-	'active_plugins' => array(),
-	'category_base' => '',
-	'ping_sites' => 'http://rpc.pingomatic.com/',
-	'comment_max_links' => 2,
-	'gmt_offset' => $gmt_offset,
+		'siteurl'                         => $guessurl,
+		'home'                            => $guessurl,
+		'blogname'                        => __( 'My Site' ),
+		/* translators: site tagline */
+		'blogdescription'                 => __( 'Just another WordPress site' ),
+		'users_can_register'              => 0,
+		'admin_email'                     => 'you@example.com',
+		/* translators: default start of the week. 0 = Sunday, 1 = Monday */
+		'start_of_week'                   => _x( '1', 'start of week' ),
+		'use_balanceTags'                 => 0,
+		'use_smilies'                     => 1,
+		'require_name_email'              => 1,
+		'comments_notify'                 => 1,
+		'posts_per_rss'                   => 10,
+		'rss_use_excerpt'                 => 0,
+		'mailserver_url'                  => 'mail.example.com',
+		'mailserver_login'                => 'login@example.com',
+		'mailserver_pass'                 => 'password',
+		'mailserver_port'                 => 110,
+		'default_category'                => 1,
+		'default_comment_status'          => 'open',
+		'default_ping_status'             => 'open',
+		'default_pingback_flag'           => 1,
+		'posts_per_page'                  => 10,
+		/* translators: default date format, see https://secure.php.net/date */
+		'date_format'                     => __( 'F j, Y' ),
+		/* translators: default time format, see https://secure.php.net/date */
+		'time_format'                     => __( 'g:i a' ),
+		/* translators: links last updated date format, see https://secure.php.net/date */
+		'links_updated_date_format'       => __( 'F j, Y g:i a' ),
+		'comment_moderation'              => 0,
+		'moderation_notify'               => 1,
+		'permalink_structure'             => '',
+		'rewrite_rules'                   => '',
+		'hack_file'                       => 0,
+		'blog_charset'                    => 'UTF-8',
+		'moderation_keys'                 => '',
+		'active_plugins'                  => array(),
+		'category_base'                   => '',
+		'ping_sites'                      => 'http://rpc.pingomatic.com/',
+		'comment_max_links'               => 2,
+		'gmt_offset'                      => $gmt_offset,
 
-	// 1.5
-	'default_email_category' => 1,
-	'recently_edited' => '',
-	'template' => $template,
-	'stylesheet' => $stylesheet,
-	'comment_whitelist' => 1,
-	'blacklist_keys' => '',
-	'comment_registration' => 0,
-	'html_type' => 'text/html',
+		// 1.5
+		'default_email_category'          => 1,
+		'recently_edited'                 => '',
+		'template'                        => $template,
+		'stylesheet'                      => $stylesheet,
+		'comment_whitelist'               => 1,
+		'blacklist_keys'                  => '',
+		'comment_registration'            => 0,
+		'html_type'                       => 'text/html',
 
-	// 1.5.1
-	'use_trackback' => 0,
+		// 1.5.1
+		'use_trackback'                   => 0,
 
-	// 2.0
-	'default_role' => 'subscriber',
-	'db_version' => $wp_db_version,
+		// 2.0
+		'default_role'                    => 'subscriber',
+		'db_version'                      => $wp_db_version,
 
-	// 2.0.1
-	'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
-	'upload_path' => '',
+		// 2.0.1
+		'uploads_use_yearmonth_folders'   => $uploads_use_yearmonth_folders,
+		'upload_path'                     => '',
 
-	// 2.1
-	'blog_public' => '1',
-	'default_link_category' => 2,
-	'show_on_front' => 'posts',
+		// 2.1
+		'blog_public'                     => '1',
+		'default_link_category'           => 2,
+		'show_on_front'                   => 'posts',
 
-	// 2.2
-	'tag_base' => '',
+		// 2.2
+		'tag_base'                        => '',
 
-	// 2.5
-	'show_avatars' => '1',
-	'avatar_rating' => 'G',
-	'upload_url_path' => '',
-	'thumbnail_size_w' => 150,
-	'thumbnail_size_h' => 150,
-	'thumbnail_crop' => 1,
-	'medium_size_w' => 300,
-	'medium_size_h' => 300,
+		// 2.5
+		'show_avatars'                    => '1',
+		'avatar_rating'                   => 'G',
+		'upload_url_path'                 => '',
+		'thumbnail_size_w'                => 150,
+		'thumbnail_size_h'                => 150,
+		'thumbnail_crop'                  => 1,
+		'medium_size_w'                   => 300,
+		'medium_size_h'                   => 300,
 
-	// 2.6
-	'avatar_default' => 'mystery',
+		// 2.6
+		'avatar_default'                  => 'mystery',
 
-	// 2.7
-	'large_size_w' => 1024,
-	'large_size_h' => 1024,
-	'image_default_link_type' => 'none',
-	'image_default_size' => '',
-	'image_default_align' => '',
-	'close_comments_for_old_posts' => 0,
-	'close_comments_days_old' => 14,
-	'thread_comments' => 1,
-	'thread_comments_depth' => 5,
-	'page_comments' => 0,
-	'comments_per_page' => 50,
-	'default_comments_page' => 'newest',
-	'comment_order' => 'asc',
-	'sticky_posts' => array(),
-	'widget_categories' => array(),
-	'widget_text' => array(),
-	'widget_rss' => array(),
-	'uninstall_plugins' => array(),
+		// 2.7
+		'large_size_w'                    => 1024,
+		'large_size_h'                    => 1024,
+		'image_default_link_type'         => 'none',
+		'image_default_size'              => '',
+		'image_default_align'             => '',
+		'close_comments_for_old_posts'    => 0,
+		'close_comments_days_old'         => 14,
+		'thread_comments'                 => 1,
+		'thread_comments_depth'           => 5,
+		'page_comments'                   => 0,
+		'comments_per_page'               => 50,
+		'default_comments_page'           => 'newest',
+		'comment_order'                   => 'asc',
+		'sticky_posts'                    => array(),
+		'widget_categories'               => array(),
+		'widget_text'                     => array(),
+		'widget_rss'                      => array(),
+		'uninstall_plugins'               => array(),
 
-	// 2.8
-	'timezone_string' => $timezone_string,
+		// 2.8
+		'timezone_string'                 => $timezone_string,
 
-	// 3.0
-	'page_for_posts' => 0,
-	'page_on_front' => 0,
+		// 3.0
+		'page_for_posts'                  => 0,
+		'page_on_front'                   => 0,
 
-	// 3.1
-	'default_post_format' => 0,
+		// 3.1
+		'default_post_format'             => 0,
 
-	// 3.5
-	'link_manager_enabled' => 0,
+		// 3.5
+		'link_manager_enabled'            => 0,
 
-	// 4.3.0
-	'finished_splitting_shared_terms' => 1,
-	'site_icon' => 0,
+		// 4.3.0
+		'finished_splitting_shared_terms' => 1,
+		'site_icon'                       => 0,
 
-	// 4.4.0
-	'medium_large_size_w' => 768,
-	'medium_large_size_h' => 0,
+		// 4.4.0
+		'medium_large_size_w'             => 768,
+		'medium_large_size_h'             => 0,
 	);
 
 	// 3.3
@@ -528,62 +534,130 @@ function populate_options() {
 	// 3.0 multisite
 	if ( is_multisite() ) {
 		/* translators: site tagline */
-		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_network()->site_name );
-		$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
+		$options['blogdescription']     = sprintf( __( 'Just another %s site' ), get_network()->site_name );
+		$options['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
 	}
 
 	// Set autoload to no for these options
 	$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
 
-	$keys = "'" . implode( "', '", array_keys( $options ) ) . "'";
+	$keys             = "'" . implode( "', '", array_keys( $options ) ) . "'";
 	$existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" );
 
 	$insert = '';
 	foreach ( $options as $option => $value ) {
-		if ( in_array($option, $existing_options) )
+		if ( in_array( $option, $existing_options ) ) {
 			continue;
-		if ( in_array($option, $fat_options) )
+		}
+		if ( in_array( $option, $fat_options ) ) {
 			$autoload = 'no';
-		else
+		} else {
 			$autoload = 'yes';
+		}
 
-		if ( is_array($value) )
-			$value = serialize($value);
-		if ( !empty($insert) )
+		if ( is_array( $value ) ) {
+			$value = serialize( $value );
+		}
+		if ( ! empty( $insert ) ) {
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
+		}
+		$insert .= $wpdb->prepare( '(%s, %s, %s)', $option, $value, $autoload );
 	}
 
-	if ( !empty($insert) )
-		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	if ( ! empty( $insert ) ) {
+		$wpdb->query( "INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert );
+	}
 
 	// In case it is set, but blank, update "home".
-	if ( !__get_option('home') ) update_option('home', $guessurl);
+	if ( ! __get_option( 'home' ) ) {
+		update_option( 'home', $guessurl );
+	}
 
 	// Delete unused options.
 	$unusedoptions = array(
-		'blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory',
-		'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping',
-		'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers',
-		'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference',
-		'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char',
-		'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1',
-		'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5',
-		'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9',
-		'links_recently_updated_time', 'links_recently_updated_prepend', 'links_recently_updated_append',
-		'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat',
-		'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce',
-		'_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins',
-		'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron',
-		'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page',
-		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
-		'embed_autourls', 'default_post_edit_rows', 'gzipcompression', 'advanced_edit'
+		'blodotgsping_url',
+		'bodyterminator',
+		'emailtestonly',
+		'phoneemail_separator',
+		'smilies_directory',
+		'subjectprefix',
+		'use_bbcode',
+		'use_blodotgsping',
+		'use_phoneemail',
+		'use_quicktags',
+		'use_weblogsping',
+		'weblogs_cache_file',
+		'use_preview',
+		'use_htmltrans',
+		'smilies_directory',
+		'fileupload_allowedusers',
+		'use_phoneemail',
+		'default_post_status',
+		'default_post_category',
+		'archive_mode',
+		'time_difference',
+		'links_minadminlevel',
+		'links_use_adminlevels',
+		'links_rating_type',
+		'links_rating_char',
+		'links_rating_ignore_zero',
+		'links_rating_single_image',
+		'links_rating_image0',
+		'links_rating_image1',
+		'links_rating_image2',
+		'links_rating_image3',
+		'links_rating_image4',
+		'links_rating_image5',
+		'links_rating_image6',
+		'links_rating_image7',
+		'links_rating_image8',
+		'links_rating_image9',
+		'links_recently_updated_time',
+		'links_recently_updated_prepend',
+		'links_recently_updated_append',
+		'weblogs_cacheminutes',
+		'comment_allowed_tags',
+		'search_engine_friendly_urls',
+		'default_geourl_lat',
+		'default_geourl_lon',
+		'use_default_geourl',
+		'weblogs_xml_url',
+		'new_users_can_blog',
+		'_wpnonce',
+		'_wp_http_referer',
+		'Update',
+		'action',
+		'rich_editing',
+		'autosave_interval',
+		'deactivated_plugins',
+		'can_compress_scripts',
+		'page_uris',
+		'update_core',
+		'update_plugins',
+		'update_themes',
+		'doing_cron',
+		'random_seed',
+		'rss_excerpt_length',
+		'secret',
+		'use_linksupdate',
+		'default_comment_status_page',
+		'wporg_popular_tags',
+		'what_to_show',
+		'rss_language',
+		'language',
+		'enable_xmlrpc',
+		'enable_app',
+		'embed_autourls',
+		'default_post_edit_rows',
+		'gzipcompression',
+		'advanced_edit',
 	);
-	foreach ( $unusedoptions as $option )
-		delete_option($option);
+	foreach ( $unusedoptions as $option ) {
+		delete_option( $option );
+	}
 
 	// Delete obsolete magpie stuff.
-	$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
+	$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'" );
 
 	// Clear expired transients
 	delete_expired_transients( true );
@@ -615,99 +689,99 @@ function populate_roles_160() {
 
 	// Dummy gettext calls to get strings in the catalog.
 	/* translators: user role */
-	_x('Administrator', 'User role');
+	_x( 'Administrator', 'User role' );
 	/* translators: user role */
-	_x('Editor', 'User role');
+	_x( 'Editor', 'User role' );
 	/* translators: user role */
-	_x('Author', 'User role');
+	_x( 'Author', 'User role' );
 	/* translators: user role */
-	_x('Contributor', 'User role');
+	_x( 'Contributor', 'User role' );
 	/* translators: user role */
-	_x('Subscriber', 'User role');
+	_x( 'Subscriber', 'User role' );
 
-	add_role('administrator', 'Administrator');
-	add_role('editor', 'Editor');
-	add_role('author', 'Author');
-	add_role('contributor', 'Contributor');
-	add_role('subscriber', 'Subscriber');
+	add_role( 'administrator', 'Administrator' );
+	add_role( 'editor', 'Editor' );
+	add_role( 'author', 'Author' );
+	add_role( 'contributor', 'Contributor' );
+	add_role( 'subscriber', 'Subscriber' );
 
 	// Add caps for Administrator role
-	$role = get_role('administrator');
-	$role->add_cap('switch_themes');
-	$role->add_cap('edit_themes');
-	$role->add_cap('activate_plugins');
-	$role->add_cap('edit_plugins');
-	$role->add_cap('edit_users');
-	$role->add_cap('edit_files');
-	$role->add_cap('manage_options');
-	$role->add_cap('moderate_comments');
-	$role->add_cap('manage_categories');
-	$role->add_cap('manage_links');
-	$role->add_cap('upload_files');
-	$role->add_cap('import');
-	$role->add_cap('unfiltered_html');
-	$role->add_cap('edit_posts');
-	$role->add_cap('edit_others_posts');
-	$role->add_cap('edit_published_posts');
-	$role->add_cap('publish_posts');
-	$role->add_cap('edit_pages');
-	$role->add_cap('read');
-	$role->add_cap('level_10');
-	$role->add_cap('level_9');
-	$role->add_cap('level_8');
-	$role->add_cap('level_7');
-	$role->add_cap('level_6');
-	$role->add_cap('level_5');
-	$role->add_cap('level_4');
-	$role->add_cap('level_3');
-	$role->add_cap('level_2');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
+	$role = get_role( 'administrator' );
+	$role->add_cap( 'switch_themes' );
+	$role->add_cap( 'edit_themes' );
+	$role->add_cap( 'activate_plugins' );
+	$role->add_cap( 'edit_plugins' );
+	$role->add_cap( 'edit_users' );
+	$role->add_cap( 'edit_files' );
+	$role->add_cap( 'manage_options' );
+	$role->add_cap( 'moderate_comments' );
+	$role->add_cap( 'manage_categories' );
+	$role->add_cap( 'manage_links' );
+	$role->add_cap( 'upload_files' );
+	$role->add_cap( 'import' );
+	$role->add_cap( 'unfiltered_html' );
+	$role->add_cap( 'edit_posts' );
+	$role->add_cap( 'edit_others_posts' );
+	$role->add_cap( 'edit_published_posts' );
+	$role->add_cap( 'publish_posts' );
+	$role->add_cap( 'edit_pages' );
+	$role->add_cap( 'read' );
+	$role->add_cap( 'level_10' );
+	$role->add_cap( 'level_9' );
+	$role->add_cap( 'level_8' );
+	$role->add_cap( 'level_7' );
+	$role->add_cap( 'level_6' );
+	$role->add_cap( 'level_5' );
+	$role->add_cap( 'level_4' );
+	$role->add_cap( 'level_3' );
+	$role->add_cap( 'level_2' );
+	$role->add_cap( 'level_1' );
+	$role->add_cap( 'level_0' );
 
 	// Add caps for Editor role
-	$role = get_role('editor');
-	$role->add_cap('moderate_comments');
-	$role->add_cap('manage_categories');
-	$role->add_cap('manage_links');
-	$role->add_cap('upload_files');
-	$role->add_cap('unfiltered_html');
-	$role->add_cap('edit_posts');
-	$role->add_cap('edit_others_posts');
-	$role->add_cap('edit_published_posts');
-	$role->add_cap('publish_posts');
-	$role->add_cap('edit_pages');
-	$role->add_cap('read');
-	$role->add_cap('level_7');
-	$role->add_cap('level_6');
-	$role->add_cap('level_5');
-	$role->add_cap('level_4');
-	$role->add_cap('level_3');
-	$role->add_cap('level_2');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
+	$role = get_role( 'editor' );
+	$role->add_cap( 'moderate_comments' );
+	$role->add_cap( 'manage_categories' );
+	$role->add_cap( 'manage_links' );
+	$role->add_cap( 'upload_files' );
+	$role->add_cap( 'unfiltered_html' );
+	$role->add_cap( 'edit_posts' );
+	$role->add_cap( 'edit_others_posts' );
+	$role->add_cap( 'edit_published_posts' );
+	$role->add_cap( 'publish_posts' );
+	$role->add_cap( 'edit_pages' );
+	$role->add_cap( 'read' );
+	$role->add_cap( 'level_7' );
+	$role->add_cap( 'level_6' );
+	$role->add_cap( 'level_5' );
+	$role->add_cap( 'level_4' );
+	$role->add_cap( 'level_3' );
+	$role->add_cap( 'level_2' );
+	$role->add_cap( 'level_1' );
+	$role->add_cap( 'level_0' );
 
 	// Add caps for Author role
-	$role = get_role('author');
-	$role->add_cap('upload_files');
-	$role->add_cap('edit_posts');
-	$role->add_cap('edit_published_posts');
-	$role->add_cap('publish_posts');
-	$role->add_cap('read');
-	$role->add_cap('level_2');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
+	$role = get_role( 'author' );
+	$role->add_cap( 'upload_files' );
+	$role->add_cap( 'edit_posts' );
+	$role->add_cap( 'edit_published_posts' );
+	$role->add_cap( 'publish_posts' );
+	$role->add_cap( 'read' );
+	$role->add_cap( 'level_2' );
+	$role->add_cap( 'level_1' );
+	$role->add_cap( 'level_0' );
 
 	// Add caps for Contributor role
-	$role = get_role('contributor');
-	$role->add_cap('edit_posts');
-	$role->add_cap('read');
-	$role->add_cap('level_1');
-	$role->add_cap('level_0');
+	$role = get_role( 'contributor' );
+	$role->add_cap( 'edit_posts' );
+	$role->add_cap( 'read' );
+	$role->add_cap( 'level_1' );
+	$role->add_cap( 'level_0' );
 
 	// Add caps for Subscriber role
-	$role = get_role('subscriber');
-	$role->add_cap('read');
-	$role->add_cap('level_0');
+	$role = get_role( 'subscriber' );
+	$role->add_cap( 'read' );
+	$role->add_cap( 'level_0' );
 }
 
 /**
@@ -716,44 +790,45 @@ function populate_roles_160() {
  * @since 2.1.0
  */
 function populate_roles_210() {
-	$roles = array('administrator', 'editor');
-	foreach ($roles as $role) {
-		$role = get_role($role);
-		if ( empty($role) )
+	$roles = array( 'administrator', 'editor' );
+	foreach ( $roles as $role ) {
+		$role = get_role( $role );
+		if ( empty( $role ) ) {
 			continue;
+		}
 
-		$role->add_cap('edit_others_pages');
-		$role->add_cap('edit_published_pages');
-		$role->add_cap('publish_pages');
-		$role->add_cap('delete_pages');
-		$role->add_cap('delete_others_pages');
-		$role->add_cap('delete_published_pages');
-		$role->add_cap('delete_posts');
-		$role->add_cap('delete_others_posts');
-		$role->add_cap('delete_published_posts');
-		$role->add_cap('delete_private_posts');
-		$role->add_cap('edit_private_posts');
-		$role->add_cap('read_private_posts');
-		$role->add_cap('delete_private_pages');
-		$role->add_cap('edit_private_pages');
-		$role->add_cap('read_private_pages');
+		$role->add_cap( 'edit_others_pages' );
+		$role->add_cap( 'edit_published_pages' );
+		$role->add_cap( 'publish_pages' );
+		$role->add_cap( 'delete_pages' );
+		$role->add_cap( 'delete_others_pages' );
+		$role->add_cap( 'delete_published_pages' );
+		$role->add_cap( 'delete_posts' );
+		$role->add_cap( 'delete_others_posts' );
+		$role->add_cap( 'delete_published_posts' );
+		$role->add_cap( 'delete_private_posts' );
+		$role->add_cap( 'edit_private_posts' );
+		$role->add_cap( 'read_private_posts' );
+		$role->add_cap( 'delete_private_pages' );
+		$role->add_cap( 'edit_private_pages' );
+		$role->add_cap( 'read_private_pages' );
 	}
 
-	$role = get_role('administrator');
-	if ( ! empty($role) ) {
-		$role->add_cap('delete_users');
-		$role->add_cap('create_users');
+	$role = get_role( 'administrator' );
+	if ( ! empty( $role ) ) {
+		$role->add_cap( 'delete_users' );
+		$role->add_cap( 'create_users' );
 	}
 
-	$role = get_role('author');
-	if ( ! empty($role) ) {
-		$role->add_cap('delete_posts');
-		$role->add_cap('delete_published_posts');
+	$role = get_role( 'author' );
+	if ( ! empty( $role ) ) {
+		$role->add_cap( 'delete_posts' );
+		$role->add_cap( 'delete_published_posts' );
 	}
 
-	$role = get_role('contributor');
-	if ( ! empty($role) ) {
-		$role->add_cap('delete_posts');
+	$role = get_role( 'contributor' );
+	if ( ! empty( $role ) ) {
+		$role->add_cap( 'delete_posts' );
 	}
 }
 
@@ -765,7 +840,7 @@ function populate_roles_210() {
 function populate_roles_230() {
 	$role = get_role( 'administrator' );
 
-	if ( !empty( $role ) ) {
+	if ( ! empty( $role ) ) {
 		$role->add_cap( 'unfiltered_upload' );
 	}
 }
@@ -778,7 +853,7 @@ function populate_roles_230() {
 function populate_roles_250() {
 	$role = get_role( 'administrator' );
 
-	if ( !empty( $role ) ) {
+	if ( ! empty( $role ) ) {
 		$role->add_cap( 'edit_dashboard' );
 	}
 }
@@ -791,7 +866,7 @@ function populate_roles_250() {
 function populate_roles_260() {
 	$role = get_role( 'administrator' );
 
-	if ( !empty( $role ) ) {
+	if ( ! empty( $role ) ) {
 		$role->add_cap( 'update_plugins' );
 		$role->add_cap( 'delete_plugins' );
 	}
@@ -805,7 +880,7 @@ function populate_roles_260() {
 function populate_roles_270() {
 	$role = get_role( 'administrator' );
 
-	if ( !empty( $role ) ) {
+	if ( ! empty( $role ) ) {
 		$role->add_cap( 'install_plugins' );
 		$role->add_cap( 'update_themes' );
 	}
@@ -819,7 +894,7 @@ function populate_roles_270() {
 function populate_roles_280() {
 	$role = get_role( 'administrator' );
 
-	if ( !empty( $role ) ) {
+	if ( ! empty( $role ) ) {
 		$role->add_cap( 'install_themes' );
 	}
 }
@@ -832,7 +907,7 @@ function populate_roles_280() {
 function populate_roles_300() {
 	$role = get_role( 'administrator' );
 
-	if ( !empty( $role ) ) {
+	if ( ! empty( $role ) ) {
 		$role->add_cap( 'update_core' );
 		$role->add_cap( 'list_users' );
 		$role->add_cap( 'remove_users' );
@@ -843,18 +918,19 @@ function populate_roles_300() {
 	}
 }
 
-if ( !function_exists( 'install_network' ) ) :
-/**
- * Install Network.
- *
- * @since 3.0.0
- */
-function install_network() {
-	if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
-		define( 'WP_INSTALLING_NETWORK', true );
+if ( ! function_exists( 'install_network' ) ) :
+	/**
+	 * Install Network.
+	 *
+	 * @since 3.0.0
+	 */
+	function install_network() {
+		if ( ! defined( 'WP_INSTALLING_NETWORK' ) ) {
+			define( 'WP_INSTALLING_NETWORK', true );
+		}
 
-	dbDelta( wp_get_db_schema( 'global' ) );
-}
+		dbDelta( wp_get_db_schema( 'global' ) );
+	}
 endif;
 
 /**
@@ -881,10 +957,12 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' == $domain )
+	if ( '' == $domain ) {
 		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
-	if ( '' == $site_name )
+	}
+	if ( '' == $site_name ) {
 		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	}
 
 	// Check for network collision.
 	$network_exists = false;
@@ -898,11 +976,13 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 		}
 	}
 
-	if ( ! is_email( $email ) )
+	if ( ! is_email( $email ) ) {
 		$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	}
 
-	if ( $errors->get_error_code() )
+	if ( $errors->get_error_code() ) {
 		return $errors;
+	}
 
 	// If a user with the provided email does not exist, default to the current user as the new network admin.
 	$site_user = get_user_by( 'email', $email );
@@ -911,8 +991,8 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 	}
 
 	// Set up site tables.
-	$template = get_option( 'template' );
-	$stylesheet = get_option( 'stylesheet' );
+	$template       = get_option( 'template' );
+	$stylesheet     = get_option( 'stylesheet' );
 	$allowed_themes = array( $stylesheet => true );
 
 	if ( $template != $stylesheet ) {
@@ -931,20 +1011,33 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 	}
 
 	if ( 1 == $network_id ) {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );
+		$wpdb->insert(
+			$wpdb->site, array(
+				'domain' => $domain,
+				'path'   => $path,
+			)
+		);
 		$network_id = $wpdb->insert_id;
 	} else {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path, 'id' => $network_id ) );
+		$wpdb->insert(
+			$wpdb->site, array(
+				'domain' => $domain,
+				'path'   => $path,
+				'id'     => $network_id,
+			)
+		);
 	}
 
 	wp_cache_delete( 'networks_have_paths', 'site-options' );
 
-	if ( !is_multisite() ) {
+	if ( ! is_multisite() ) {
 		$site_admins = array( $site_user->user_login );
-		$users = get_users( array(
-			'fields' => array( 'user_login' ),
-			'role'   => 'administrator',
-		) );
+		$users       = get_users(
+			array(
+				'fields' => array( 'user_login' ),
+				'role'   => 'administrator',
+			)
+		);
 		if ( $users ) {
 			foreach ( $users as $user ) {
 				$site_admins[] = $user->user_login;
@@ -957,7 +1050,8 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 	}
 
 	/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-	$welcome_email = __( 'Howdy USERNAME,
+	$welcome_email = __(
+		'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -970,50 +1064,70 @@ Log in here: BLOG_URLwp-login.php
 
 We hope you enjoy your new site. Thanks!
 
---The Team @ SITE_NAME' );
+--The Team @ SITE_NAME'
+	);
 
 	$misc_exts = array(
 		// Images.
-		'jpg', 'jpeg', 'png', 'gif',
+		'jpg',
+		'jpeg',
+		'png',
+		'gif',
 		// Video.
-		'mov', 'avi', 'mpg', '3gp', '3g2',
+		'mov',
+		'avi',
+		'mpg',
+		'3gp',
+		'3g2',
 		// "audio".
-		'midi', 'mid',
+		'midi',
+		'mid',
 		// Miscellaneous.
-		'pdf', 'doc', 'ppt', 'odt', 'pptx', 'docx', 'pps', 'ppsx', 'xls', 'xlsx', 'key',
+		'pdf',
+		'doc',
+		'ppt',
+		'odt',
+		'pptx',
+		'docx',
+		'pps',
+		'ppsx',
+		'xls',
+		'xlsx',
+		'key',
 	);
-	$audio_exts = wp_get_audio_extensions();
-	$video_exts = wp_get_video_extensions();
+	$audio_exts       = wp_get_audio_extensions();
+	$video_exts       = wp_get_video_extensions();
 	$upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) );
 
 	$sitemeta = array(
-		'site_name' => $site_name,
-		'admin_email' => $email,
-		'admin_user_id' => $site_user->ID,
-		'registration' => 'none',
-		'upload_filetypes' => implode( ' ', $upload_filetypes ),
-		'blog_upload_space' => 100,
-		'fileupload_maxk' => 1500,
-		'site_admins' => $site_admins,
-		'allowedthemes' => $allowed_themes,
-		'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
-		'wpmu_upgrade_site' => $wp_db_version,
-		'welcome_email' => $welcome_email,
+		'site_name'                   => $site_name,
+		'admin_email'                 => $email,
+		'admin_user_id'               => $site_user->ID,
+		'registration'                => 'none',
+		'upload_filetypes'            => implode( ' ', $upload_filetypes ),
+		'blog_upload_space'           => 100,
+		'fileupload_maxk'             => 1500,
+		'site_admins'                 => $site_admins,
+		'allowedthemes'               => $allowed_themes,
+		'illegal_names'               => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
+		'wpmu_upgrade_site'           => $wp_db_version,
+		'welcome_email'               => $welcome_email,
 		/* translators: %s: site link */
-		'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
+		'first_post'                  => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
 		// @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
-		'siteurl' => get_option( 'siteurl' ) . '/',
-		'add_new_users' => '0',
+		'siteurl'                     => get_option( 'siteurl' ) . '/',
+		'add_new_users'               => '0',
 		'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
-		'subdomain_install' => intval( $subdomain_install ),
-		'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
-		'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
-		'initial_db_version' => get_option( 'initial_db_version' ),
-		'active_sitewide_plugins' => array(),
-		'WPLANG' => get_locale(),
+		'subdomain_install'           => intval( $subdomain_install ),
+		'global_terms_enabled'        => global_terms_enabled() ? '1' : '0',
+		'ms_files_rewriting'          => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
+		'initial_db_version'          => get_option( 'initial_db_version' ),
+		'active_sitewide_plugins'     => array(),
+		'WPLANG'                      => get_locale(),
 	);
-	if ( ! $subdomain_install )
+	if ( ! $subdomain_install ) {
 		$sitemeta['illegal_names'][] = 'blog';
+	}
 
 	/**
 	 * Filters meta for a network on creation.
@@ -1027,11 +1141,13 @@ We hope you enjoy your new site. Thanks!
 
 	$insert = '';
 	foreach ( $sitemeta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) )
+		if ( is_array( $meta_value ) ) {
 			$meta_value = serialize( $meta_value );
-		if ( !empty( $insert ) )
+		}
+		if ( ! empty( $insert ) ) {
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
+		}
+		$insert .= $wpdb->prepare( '( %d, %s, %s)', $network_id, $meta_key, $meta_value );
 	}
 	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
 
@@ -1043,33 +1159,49 @@ We hope you enjoy your new site. Thanks!
 	 * created.
 	 */
 	if ( ! is_multisite() ) {
-		$current_site = new stdClass;
-		$current_site->domain = $domain;
-		$current_site->path = $path;
+		$current_site            = new stdClass;
+		$current_site->domain    = $domain;
+		$current_site->path      = $path;
 		$current_site->site_name = ucfirst( $domain );
-		$wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );
+		$wpdb->insert(
+			$wpdb->blogs, array(
+				'site_id'    => $network_id,
+				'blog_id'    => 1,
+				'domain'     => $domain,
+				'path'       => $path,
+				'registered' => current_time( 'mysql' ),
+			)
+		);
 		$current_site->blog_id = $blog_id = $wpdb->insert_id;
 		update_user_meta( $site_user->ID, 'source_domain', $domain );
 		update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
 
-		if ( $subdomain_install )
+		if ( $subdomain_install ) {
 			$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-		else
+		} else {
 			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+		}
 
 		flush_rewrite_rules();
 
-		if ( ! $subdomain_install )
+		if ( ! $subdomain_install ) {
 			return true;
+		}
 
 		$vhost_ok = false;
-		$errstr = '';
+		$errstr   = '';
 		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
-		$page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-		if ( is_wp_error( $page ) )
+		$page     = wp_remote_get(
+			'http://' . $hostname, array(
+				'timeout'     => 5,
+				'httpversion' => '1.1',
+			)
+		);
+		if ( is_wp_error( $page ) ) {
 			$errstr = $page->get_error_message();
-		elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
+		} elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) {
 				$vhost_ok = true;
+		}
 
 		if ( ! $vhost_ok ) {
 			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
@@ -1079,7 +1211,7 @@ We hope you enjoy your new site. Thanks!
 				__( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
 				'<code>' . $hostname . '</code>'
 			);
-			if ( ! empty ( $errstr ) ) {
+			if ( ! empty( $errstr ) ) {
 				/* translators: %s: error message */
 				$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
 			}
diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php
index c3c4594d93..8860c0d12b 100644
--- a/wp-admin/includes/screen.php
+++ b/wp-admin/includes/screen.php
@@ -17,8 +17,9 @@
  * @return array Containing the headers in the format id => UI String
  */
 function get_column_headers( $screen ) {
-	if ( is_string( $screen ) )
+	if ( is_string( $screen ) ) {
 		$screen = convert_to_screen( $screen );
+	}
 
 	static $column_headers = array();
 
@@ -98,13 +99,15 @@ function get_hidden_columns( $screen ) {
 function meta_box_prefs( $screen ) {
 	global $wp_meta_boxes;
 
-	if ( is_string( $screen ) )
+	if ( is_string( $screen ) ) {
 		$screen = convert_to_screen( $screen );
+	}
 
-	if ( empty($wp_meta_boxes[$screen->id]) )
+	if ( empty( $wp_meta_boxes[ $screen->id ] ) ) {
 		return;
+	}
 
-	$hidden = get_hidden_meta_boxes($screen);
+	$hidden = get_hidden_meta_boxes( $screen );
 
 	foreach ( array_keys( $wp_meta_boxes[ $screen->id ] ) as $context ) {
 		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
@@ -112,11 +115,13 @@ function meta_box_prefs( $screen ) {
 				continue;
 			}
 			foreach ( $wp_meta_boxes[ $screen->id ][ $context ][ $priority ] as $box ) {
-				if ( false == $box || ! $box['title'] )
+				if ( false == $box || ! $box['title'] ) {
 					continue;
+				}
 				// Submit box cannot be hidden
-				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] )
+				if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) {
 					continue;
+				}
 
 				$widget_title = $box['title'];
 
@@ -144,8 +149,9 @@ function meta_box_prefs( $screen ) {
  * @return array Hidden Meta Boxes
  */
 function get_hidden_meta_boxes( $screen ) {
-	if ( is_string( $screen ) )
+	if ( is_string( $screen ) ) {
 		$screen = convert_to_screen( $screen );
+	}
 
 	$hidden = get_user_option( "metaboxhidden_{$screen->id}" );
 
@@ -155,10 +161,11 @@ function get_hidden_meta_boxes( $screen ) {
 	if ( $use_defaults ) {
 		$hidden = array();
 		if ( 'post' == $screen->base ) {
-			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
-				$hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
-			else
+			if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type ) {
+				$hidden = array( 'slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv' );
+			} else {
 				$hidden = array( 'slugdiv' );
+			}
 		}
 
 		/**
@@ -196,8 +203,9 @@ function get_hidden_meta_boxes( $screen ) {
 function add_screen_option( $option, $args = array() ) {
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen ) {
 		return;
+	}
 
 	$current_screen->add_option( $option, $args );
 }
@@ -214,8 +222,9 @@ function add_screen_option( $option, $args = array() ) {
 function get_current_screen() {
 	global $current_screen;
 
-	if ( ! isset( $current_screen ) )
+	if ( ! isset( $current_screen ) ) {
 		return null;
+	}
 
 	return $current_screen;
 }
@@ -226,7 +235,7 @@ function get_current_screen() {
  * @since 3.0.0
  *
  * @param mixed $hook_name Optional. The hook name (also known as the hook suffix) used to determine the screen,
- *	                       or an existing screen object.
+ *                         or an existing screen object.
  */
 function set_current_screen( $hook_name = '' ) {
 	WP_Screen::get( $hook_name )->set_current_screen();
diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php
index 524cf05d27..1e14fa0b5b 100644
--- a/wp-admin/includes/taxonomy.php
+++ b/wp-admin/includes/taxonomy.php
@@ -22,9 +22,10 @@
  * @return mixed
  */
 function category_exists( $cat_name, $parent = null ) {
-	$id = term_exists($cat_name, 'category', $parent);
-	if ( is_array($id) )
+	$id = term_exists( $cat_name, 'category', $parent );
+	if ( is_array( $id ) ) {
 		$id = $id['term_id'];
+	}
 	return $id;
 }
 
@@ -52,10 +53,16 @@ function get_category_to_edit( $id ) {
  * @return int|WP_Error
  */
 function wp_create_category( $cat_name, $parent = 0 ) {
-	if ( $id = category_exists($cat_name, $parent) )
+	if ( $id = category_exists( $cat_name, $parent ) ) {
 		return $id;
+	}
 
-	return wp_insert_category( array('cat_name' => $cat_name, 'category_parent' => $parent) );
+	return wp_insert_category(
+		array(
+			'cat_name'        => $cat_name,
+			'category_parent' => $parent,
+		)
+	);
 }
 
 /**
@@ -68,7 +75,7 @@ function wp_create_category( $cat_name, $parent = 0 ) {
  * @return array List of categories to create for the given post.
  */
 function wp_create_categories( $categories, $post_id = '' ) {
-	$cat_ids = array ();
+	$cat_ids = array();
 	foreach ( $categories as $category ) {
 		if ( $id = category_exists( $category ) ) {
 			$cat_ids[] = $id;
@@ -77,8 +84,9 @@ function wp_create_categories( $categories, $post_id = '' ) {
 		}
 	}
 
-	if ( $post_id )
-		wp_set_post_categories($post_id, $cat_ids);
+	if ( $post_id ) {
+		wp_set_post_categories( $post_id, $cat_ids );
+	}
 
 	return $cat_ids;
 }
@@ -106,8 +114,15 @@ function wp_create_categories( $categories, $post_id = '' ) {
  *                    depending on param $wp_error.
  */
 function wp_insert_category( $catarr, $wp_error = false ) {
-	$cat_defaults = array( 'cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '' );
-	$catarr = wp_parse_args( $catarr, $cat_defaults );
+	$cat_defaults = array(
+		'cat_ID'               => 0,
+		'taxonomy'             => 'category',
+		'cat_name'             => '',
+		'category_description' => '',
+		'category_nicename'    => '',
+		'category_parent'      => '',
+	);
+	$catarr       = wp_parse_args( $catarr, $cat_defaults );
 
 	if ( trim( $catarr['cat_name'] ) == '' ) {
 		if ( ! $wp_error ) {
@@ -120,12 +135,12 @@ function wp_insert_category( $catarr, $wp_error = false ) {
 	$catarr['cat_ID'] = (int) $catarr['cat_ID'];
 
 	// Are we updating or creating?
-	$update = ! empty ( $catarr['cat_ID'] );
+	$update = ! empty( $catarr['cat_ID'] );
 
-	$name = $catarr['cat_name'];
+	$name        = $catarr['cat_name'];
 	$description = $catarr['category_description'];
-	$slug = $catarr['category_nicename'];
-	$parent = (int) $catarr['category_parent'];
+	$slug        = $catarr['category_nicename'];
+	$parent      = (int) $catarr['category_parent'];
 	if ( $parent < 0 ) {
 		$parent = 0;
 	}
@@ -136,7 +151,7 @@ function wp_insert_category( $catarr, $wp_error = false ) {
 		$parent = 0;
 	}
 
-	$args = compact('name', 'slug', 'parent', 'description');
+	$args = compact( 'name', 'slug', 'parent', 'description' );
 
 	if ( $update ) {
 		$catarr['cat_ID'] = wp_update_term( $catarr['cat_ID'], $catarr['taxonomy'], $args );
@@ -165,23 +180,24 @@ function wp_insert_category( $catarr, $wp_error = false ) {
  * @param array $catarr The 'cat_ID' value is required. All other keys are optional.
  * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure.
  */
-function wp_update_category($catarr) {
+function wp_update_category( $catarr ) {
 	$cat_ID = (int) $catarr['cat_ID'];
 
-	if ( isset($catarr['category_parent']) && ($cat_ID == $catarr['category_parent']) )
+	if ( isset( $catarr['category_parent'] ) && ( $cat_ID == $catarr['category_parent'] ) ) {
 		return false;
+	}
 
 	// First, get all of the original fields
 	$category = get_term( $cat_ID, 'category', ARRAY_A );
 	_make_cat_compat( $category );
 
 	// Escape data pulled from DB.
-	$category = wp_slash($category);
+	$category = wp_slash( $category );
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$catarr = array_merge($category, $catarr);
+	$catarr = array_merge( $category, $catarr );
 
-	return wp_insert_category($catarr);
+	return wp_insert_category( $catarr );
 }
 
 //
@@ -196,8 +212,8 @@ function wp_update_category($catarr) {
  * @param int|string $tag_name
  * @return mixed
  */
-function tag_exists($tag_name) {
-	return term_exists($tag_name, 'post_tag');
+function tag_exists( $tag_name ) {
+	return term_exists( $tag_name, 'post_tag' );
 }
 
 /**
@@ -208,8 +224,8 @@ function tag_exists($tag_name) {
  * @param int|string $tag_name
  * @return array|WP_Error
  */
-function wp_create_tag($tag_name) {
-	return wp_create_term( $tag_name, 'post_tag');
+function wp_create_tag( $tag_name ) {
+	return wp_create_term( $tag_name, 'post_tag' );
 }
 
 /**
@@ -222,7 +238,7 @@ function wp_create_tag($tag_name) {
  * @return string|bool|WP_Error
  */
 function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
-	return get_terms_to_edit( $post_id, $taxonomy);
+	return get_terms_to_edit( $post_id, $taxonomy );
 }
 
 /**
@@ -236,8 +252,9 @@ function get_tags_to_edit( $post_id, $taxonomy = 'post_tag' ) {
  */
 function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id ) {
 		return false;
+	}
 
 	$terms = get_object_term_cache( $post_id, $taxonomy );
 	if ( false === $terms ) {
@@ -282,9 +299,10 @@ function get_terms_to_edit( $post_id, $taxonomy = 'post_tag' ) {
  * @param string $taxonomy Optional. The taxonomy for which to retrieve terms. Default 'post_tag'.
  * @return array|WP_Error
  */
-function wp_create_term($tag_name, $taxonomy = 'post_tag') {
-	if ( $id = term_exists($tag_name, $taxonomy) )
+function wp_create_term( $tag_name, $taxonomy = 'post_tag' ) {
+	if ( $id = term_exists( $tag_name, $taxonomy ) ) {
 		return $id;
+	}
 
-	return wp_insert_term($tag_name, $taxonomy);
+	return wp_insert_term( $tag_name, $taxonomy );
 }
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 0c8c863ec7..9078a224fd 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -38,14 +38,16 @@ require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
  *                                     the top of the list. Default true.
  */
 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(
-		'taxonomy' => 'category',
-		'descendants_and_self' => $descendants_and_self,
-		'selected_cats' => $selected_cats,
-		'popular_cats' => $popular_cats,
-		'walker' => $walker,
-		'checked_ontop' => $checked_ontop
-	) );
+	wp_terms_checklist(
+		$post_id, array(
+			'taxonomy'             => 'category',
+			'descendants_and_self' => $descendants_and_self,
+			'selected_cats'        => $selected_cats,
+			'popular_cats'         => $popular_cats,
+			'walker'               => $walker,
+			'checked_ontop'        => $checked_ontop,
+		)
+	);
 }
 
 /**
@@ -75,14 +77,14 @@ function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $select
  * }
  */
 function wp_terms_checklist( $post_id = 0, $args = array() ) {
- 	$defaults = array(
+	$defaults = array(
 		'descendants_and_self' => 0,
-		'selected_cats' => false,
-		'popular_cats' => false,
-		'walker' => null,
-		'taxonomy' => 'category',
-		'checked_ontop' => true,
-		'echo' => true,
+		'selected_cats'        => false,
+		'popular_cats'         => false,
+		'walker'               => null,
+		'taxonomy'             => 'category',
+		'checked_ontop'        => true,
+		'echo'                 => true,
 	);
 
 	/**
@@ -105,12 +107,12 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 		$walker = $r['walker'];
 	}
 
-	$taxonomy = $r['taxonomy'];
+	$taxonomy             = $r['taxonomy'];
 	$descendants_and_self = (int) $r['descendants_and_self'];
 
 	$args = array( 'taxonomy' => $taxonomy );
 
-	$tax = get_taxonomy( $taxonomy );
+	$tax              = get_taxonomy( $taxonomy );
 	$args['disabled'] = ! current_user_can( $tax->cap->assign_terms );
 
 	$args['list_only'] = ! empty( $r['list_only'] );
@@ -125,21 +127,25 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 	if ( is_array( $r['popular_cats'] ) ) {
 		$args['popular_cats'] = $r['popular_cats'];
 	} else {
-		$args['popular_cats'] = get_terms( $taxonomy, array(
-			'fields' => 'ids',
-			'orderby' => 'count',
-			'order' => 'DESC',
-			'number' => 10,
-			'hierarchical' => false
-		) );
+		$args['popular_cats'] = get_terms(
+			$taxonomy, array(
+				'fields'       => 'ids',
+				'orderby'      => 'count',
+				'order'        => 'DESC',
+				'number'       => 10,
+				'hierarchical' => false,
+			)
+		);
 	}
 	if ( $descendants_and_self ) {
-		$categories = (array) get_terms( $taxonomy, array(
-			'child_of' => $descendants_and_self,
-			'hierarchical' => 0,
-			'hide_empty' => 0
-		) );
-		$self = get_term( $descendants_and_self, $taxonomy );
+		$categories = (array) get_terms(
+			$taxonomy, array(
+				'child_of'     => $descendants_and_self,
+				'hierarchical' => 0,
+				'hide_empty'   => 0,
+			)
+		);
+		$self       = get_term( $descendants_and_self, $taxonomy );
 		array_unshift( $categories, $self );
 	} else {
 		$categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
@@ -150,12 +156,12 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 	if ( $r['checked_ontop'] ) {
 		// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 		$checked_categories = array();
-		$keys = array_keys( $categories );
+		$keys               = array_keys( $categories );
 
 		foreach ( $keys as $k ) {
-			if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
-				$checked_categories[] = $categories[$k];
-				unset( $categories[$k] );
+			if ( in_array( $categories[ $k ]->term_id, $args['selected_cats'] ) ) {
+				$checked_categories[] = $categories[ $k ];
+				unset( $categories[ $k ] );
 			}
 		}
 
@@ -191,21 +197,30 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
 function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
 	$post = get_post();
 
-	if ( $post && $post->ID )
-		$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
-	else
+	if ( $post && $post->ID ) {
+		$checked_terms = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+	} else {
 		$checked_terms = array();
+	}
 
-	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+	$terms = get_terms(
+		$taxonomy, array(
+			'orderby'      => 'count',
+			'order'        => 'DESC',
+			'number'       => $number,
+			'hierarchical' => false,
+		)
+	);
 
-	$tax = get_taxonomy($taxonomy);
+	$tax = get_taxonomy( $taxonomy );
 
 	$popular_ids = array();
 	foreach ( (array) $terms as $term ) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // Hack for Ajax use.
+		if ( ! $echo ) { // Hack for Ajax use.
 			continue;
-		$id = "popular-$taxonomy-$term->term_id";
+		}
+		$id      = "popular-$taxonomy-$term->term_id";
 		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
 		?>
 
@@ -246,18 +261,24 @@ function wp_link_category_checklist( $link_id = 0 ) {
 		$checked_categories[] = $default;
 	}
 
-	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
+	$categories = get_terms(
+		'link_category', array(
+			'orderby'    => 'name',
+			'hide_empty' => 0,
+		)
+	);
 
-	if ( empty( $categories ) )
+	if ( empty( $categories ) ) {
 		return;
+	}
 
 	foreach ( $categories as $category ) {
 		$cat_id = $category->term_id;
 
 		/** This filter is documented in wp-includes/category-template.php */
-		$name = esc_html( apply_filters( 'the_category', $category->name, '', '' ) );
+		$name    = esc_html( apply_filters( 'the_category', $category->name, '', '' ) );
 		$checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
-		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
+		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, '</label></li>';
 	}
 }
 
@@ -268,10 +289,11 @@ function wp_link_category_checklist( $link_id = 0 ) {
  *
  * @param WP_Post $post Post object.
  */
-function get_inline_data($post) {
-	$post_type_object = get_post_type_object($post->post_type);
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
+function get_inline_data( $post ) {
+	$post_type_object = get_post_type_object( $post->post_type );
+	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
 		return;
+	}
 
 	$title = esc_textarea( trim( $post->post_title ) );
 
@@ -304,7 +326,7 @@ function get_inline_data($post) {
 	}
 
 	$taxonomy_names = get_object_taxonomies( $post->post_type );
-	foreach ( $taxonomy_names as $taxonomy_name) {
+	foreach ( $taxonomy_names as $taxonomy_name ) {
 		$taxonomy = get_taxonomy( $taxonomy_name );
 
 		if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
@@ -325,17 +347,19 @@ function get_inline_data($post) {
 				$terms_to_edit = '';
 			}
 
-			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
+			echo '<div class="tags_input" id="' . $taxonomy_name . '_' . $post->ID . '">'
 				. esc_html( str_replace( ',', ', ', $terms_to_edit ) ) . '</div>';
 
 		}
 	}
 
-	if ( !$post_type_object->hierarchical )
-		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( ! $post_type_object->hierarchical ) {
+		echo '<div class="sticky">' . ( is_sticky( $post->ID ) ? 'sticky' : '' ) . '</div>';
+	}
 
-	if ( post_type_supports( $post->post_type, 'post-formats' ) )
+	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	}
 
 	echo '</div>';
 }
@@ -369,18 +393,24 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 	 * @param string $content The reply-to form content.
 	 * @param array  $args    An array of default args.
 	 */
-	$content = apply_filters( 'wp_comment_reply', '', array( 'position' => $position, 'checkbox' => $checkbox, 'mode' => $mode ) );
+	$content = apply_filters(
+		'wp_comment_reply', '', array(
+			'position' => $position,
+			'checkbox' => $checkbox,
+			'mode'     => $mode,
+		)
+	);
 
-	if ( ! empty($content) ) {
+	if ( ! empty( $content ) ) {
 		echo $content;
 		return;
 	}
 
 	if ( ! $wp_list_table ) {
 		if ( $mode == 'single' ) {
-			$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
+			$wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table' );
 		} else {
-			$wp_list_table = _get_list_table('WP_Comments_List_Table');
+			$wp_list_table = _get_list_table( 'WP_Comments_List_Table' );
 		}
 	}
 
@@ -402,23 +432,29 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 	<label for="replycontent" class="screen-reader-text"><?php _e( 'Comment' ); ?></label>
 	<?php
 	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-	wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+	wp_editor(
+		'', 'replycontent', array(
+			'media_buttons' => false,
+			'tinymce'       => false,
+			'quicktags'     => $quicktags_settings,
+		)
+	);
 	?>
 	</div>
 
 	<div id="edithead" style="display:none;">
 		<div class="inside">
-		<label for="author-name"><?php _e( 'Name' ) ?></label>
+		<label for="author-name"><?php _e( 'Name' ); ?></label>
 		<input type="text" name="newcomment_author" size="50" value="" id="author-name" />
 		</div>
 
 		<div class="inside">
-		<label for="author-email"><?php _e('Email') ?></label>
+		<label for="author-email"><?php _e( 'Email' ); ?></label>
 		<input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
 		</div>
 
 		<div class="inside">
-		<label for="author-url"><?php _e('URL') ?></label>
+		<label for="author-url"><?php _e( 'URL' ); ?></label>
 		<input type="text" id="author-url" name="newcomment_author_url" class="code" size="103" value="" />
 		</div>
 	</div>
@@ -445,11 +481,12 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 	<input type="hidden" name="status" id="status" value="" />
 	<input type="hidden" name="position" id="position" value="<?php echo $position; ?>" />
 	<input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
-	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
+	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr( $mode ); ?>" />
 	<?php
 		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
-		if ( current_user_can( 'unfiltered_html' ) )
-			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+	if ( current_user_can( 'unfiltered_html' ) ) {
+		wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+	}
 	?>
 	</fieldset>
 <?php if ( $table_row ) : ?>
@@ -469,10 +506,10 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
 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 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 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
 }
@@ -506,14 +543,15 @@ function list_meta( $meta ) {
 <table id="list-table">
 	<thead>
 	<tr>
-		<th class="left"><?php _ex( 'Name', 'meta name' ) ?></th>
-		<th><?php _e( 'Value' ) ?></th>
+		<th class="left"><?php _ex( 'Name', 'meta name' ); ?></th>
+		<th><?php _e( 'Value' ); ?></th>
 	</tr>
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
 <?php
-	foreach ( $meta as $entry )
-		echo _list_meta_row( $entry, $count );
+foreach ( $meta as $entry ) {
+	echo _list_meta_row( $entry, $count );
+}
 ?>
 	</tbody>
 </table>
@@ -534,11 +572,13 @@ function list_meta( $meta ) {
 function _list_meta_row( $entry, &$count ) {
 	static $update_nonce = '';
 
-	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
+	if ( is_protected_meta( $entry['meta_key'], 'post' ) ) {
 		return '';
+	}
 
-	if ( ! $update_nonce )
+	if ( ! $update_nonce ) {
 		$update_nonce = wp_create_nonce( 'add-meta' );
+	}
 
 	$r = '';
 	++ $count;
@@ -554,9 +594,9 @@ function _list_meta_row( $entry, &$count ) {
 		}
 	}
 
-	$entry['meta_key'] = esc_attr($entry['meta_key']);
+	$entry['meta_key']   = esc_attr( $entry['meta_key'] );
 	$entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // using a <textarea />
-	$entry['meta_id'] = (int) $entry['meta_id'];
+	$entry['meta_id']    = (int) $entry['meta_id'];
 
 	$delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
 
@@ -567,9 +607,9 @@ function _list_meta_row( $entry, &$count ) {
 	$r .= get_submit_button( __( 'Delete' ), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array( 'data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce" ) );
 	$r .= "\n\t\t";
 	$r .= get_submit_button( __( 'Update' ), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array( 'data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce" ) );
-	$r .= "</div>";
+	$r .= '</div>';
 	$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
-	$r .= "</td>";
+	$r .= '</td>';
 
 	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
 	return $r;
@@ -611,13 +651,13 @@ function meta_form( $post = null ) {
 		 * @param int $limit Number of custom fields to retrieve. Default 30.
 		 */
 		$limit = apply_filters( 'postmeta_form_limit', 30 );
-		$sql = "SELECT DISTINCT meta_key
+		$sql   = "SELECT DISTINCT meta_key
 			FROM $wpdb->postmeta
 			WHERE meta_key NOT BETWEEN '_' AND '_z'
 			HAVING meta_key NOT LIKE %s
 			ORDER BY meta_key
 			LIMIT %d";
-		$keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
+		$keys  = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
 	}
 
 	if ( $keys ) {
@@ -627,12 +667,12 @@ function meta_form( $post = null ) {
 		$meta_key_input_id = 'metakeyinput';
 	}
 ?>
-<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
+<p><strong><?php _e( 'Add New Custom Field:' ); ?></strong></p>
 <table id="newmeta">
 <thead>
 <tr>
-<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex( 'Name', 'meta name' ) ?></label></th>
-<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
+<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex( 'Name', 'meta name' ); ?></label></th>
+<th><label for="metavalue"><?php _e( 'Value' ); ?></label></th>
 </tr>
 </thead>
 
@@ -644,17 +684,18 @@ function meta_form( $post = null ) {
 <option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
 <?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;">
-<span id="enternew"><?php _e('Enter new'); ?></span>
-<span id="cancelnew" class="hidden"><?php _e('Cancel'); ?></span></a>
+<span id="enternew"><?php _e( 'Enter new' ); ?></span>
+<span id="cancelnew" class="hidden"><?php _e( 'Cancel' ); ?></span></a>
 <?php } else { ?>
 <input type="text" id="metakeyinput" name="metakeyinput" value="" />
 <?php } ?>
@@ -664,7 +705,14 @@ function meta_form( $post = null ) {
 
 <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 ); ?>
 </td></tr>
@@ -692,24 +740,26 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 	global $wp_locale;
 	$post = get_post();
 
-	if ( $for_post )
-		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	if ( $for_post ) {
+		$edit = ! ( in_array( $post->post_status, array( 'draft', 'pending' ) ) && ( ! $post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	}
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
+	if ( (int) $tab_index > 0 ) {
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
+	}
 
 	// todo: Remove this?
 	// echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
 
-	$time_adj = current_time('timestamp');
-	$post_date = ($for_post) ? $post->post_date : get_comment()->comment_date;
-	$jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
-	$mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
-	$aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
-	$hh = ($edit) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
-	$mn = ($edit) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
-	$ss = ($edit) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
+	$time_adj  = current_time( 'timestamp' );
+	$post_date = ( $for_post ) ? $post->post_date : get_comment()->comment_date;
+	$jj        = ( $edit ) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
+	$mm        = ( $edit ) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
+	$aa        = ( $edit ) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
+	$hh        = ( $edit ) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
+	$mn        = ( $edit ) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
+	$ss        = ( $edit ) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
 
 	$cur_jj = gmdate( 'd', $time_adj );
 	$cur_mm = gmdate( 'm', $time_adj );
@@ -718,18 +768,18 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 	$cur_mn = gmdate( 'i', $time_adj );
 
 	$month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
-	for ( $i = 1; $i < 13; $i = $i +1 ) {
-		$monthnum = zeroise($i, 2);
+	for ( $i = 1; $i < 13; $i = $i + 1 ) {
+		$monthnum  = zeroise( $i, 2 );
 		$monthtext = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
-		$month .= "\t\t\t" . '<option value="' . $monthnum . '" data-text="' . $monthtext . '" ' . selected( $monthnum, $mm, false ) . '>';
+		$month    .= "\t\t\t" . '<option value="' . $monthnum . '" data-text="' . $monthtext . '" ' . selected( $monthnum, $mm, false ) . '>';
 		/* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
 		$month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "</option>\n";
 	}
 	$month .= '</select></label>';
 
-	$day = '<label><span class="screen-reader-text">' . __( 'Day' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$year = '<label><span class="screen-reader-text">' . __( 'Year' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$hour = '<label><span class="screen-reader-text">' . __( 'Hour' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
+	$day    = '<label><span class="screen-reader-text">' . __( 'Day' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
+	$year   = '<label><span class="screen-reader-text">' . __( 'Year' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" /></label>';
+	$hour   = '<label><span class="screen-reader-text">' . __( 'Hour' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
 	$minute = '<label><span class="screen-reader-text">' . __( 'Minute' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
 
 	echo '<div class="timestamp-wrap">';
@@ -738,7 +788,9 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 
-	if ( $multi ) return;
+	if ( $multi ) {
+		return;
+	}
 
 	echo "\n\n";
 	$map = array(
@@ -758,8 +810,8 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
 ?>
 
 <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>
+<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
 }
@@ -778,7 +830,7 @@ function page_template_dropdown( $default = '', $post_type = 'page' ) {
 	ksort( $templates );
 	foreach ( array_keys( $templates ) as $template ) {
 		$selected = selected( $default, $templates[ $template ], false );
-		echo "\n\t<option value='" . esc_attr( $templates[ $template ] ) . "' $selected>" . esc_html( $template ) . "</option>";
+		echo "\n\t<option value='" . esc_attr( $templates[ $template ] ) . "' $selected>" . esc_html( $template ) . '</option>';
 	}
 }
 
@@ -799,20 +851,21 @@ function page_template_dropdown( $default = '', $post_type = 'page' ) {
  */
 function parent_dropdown( $default = 0, $parent = 0, $level = 0, $post = null ) {
 	global $wpdb;
-	$post = get_post( $post );
-	$items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
+	$post  = get_post( $post );
+	$items = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent ) );
 
 	if ( $items ) {
 		foreach ( $items as $item ) {
 			// A page cannot be its own parent.
-			if ( $post && $post->ID && $item->ID == $post->ID )
+			if ( $post && $post->ID && $item->ID == $post->ID ) {
 				continue;
+			}
 
-			$pad = str_repeat( '&nbsp;', $level * 3 );
+			$pad      = str_repeat( '&nbsp;', $level * 3 );
 			$selected = selected( $default, $item->ID, false );
 
-			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad " . esc_html($item->post_title) . "</option>";
-			parent_dropdown( $default, $item->ID, $level +1 );
+			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad " . esc_html( $item->post_title ) . '</option>';
+			parent_dropdown( $default, $item->ID, $level + 1 );
 		}
 	} else {
 		return false;
@@ -832,7 +885,7 @@ function wp_dropdown_roles( $selected = '' ) {
 	$editable_roles = array_reverse( get_editable_roles() );
 
 	foreach ( $editable_roles as $role => $details ) {
-		$name = translate_user_role($details['name'] );
+		$name = translate_user_role( $details['name'] );
 		// preselect specified role
 		if ( $selected == $role ) {
 			$r .= "\n\t<option selected='selected' value='" . esc_attr( $role ) . "'>$name</option>";
@@ -862,22 +915,24 @@ function wp_import_upload_form( $action ) {
 	 *
 	 * @param int $max_upload_size Allowed upload size. Default 1 MB.
 	 */
-	$bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
-	$size = size_format( $bytes );
+	$bytes      = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
+	$size       = size_format( $bytes );
 	$upload_dir = wp_upload_dir();
 	if ( ! empty( $upload_dir['error'] ) ) :
-		?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
-		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
+		?>
+		<div class="error"><p><?php _e( 'Before you can upload your import file, you will need to fix the following error:' ); ?></p>
+		<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 ); ?>)
+<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __( 'Maximum size: %s' ), $size ); ?>)
 <input type="file" id="upload" name="import" size="25" />
 <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
 	endif;
@@ -933,59 +988,72 @@ function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advan
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset( $wp_meta_boxes ) ) {
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	}
+	if ( ! isset( $wp_meta_boxes[ $page ] ) ) {
+		$wp_meta_boxes[ $page ] = array();
+	}
+	if ( ! isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
+		$wp_meta_boxes[ $page ][ $context ] = array();
+	}
 
-	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
-		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
+	foreach ( array_keys( $wp_meta_boxes[ $page ] ) as $a_context ) {
+		foreach ( array( 'high', 'core', 'default', 'low' ) as $a_priority ) {
+			if ( ! isset( $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] ) ) {
 				continue;
+			}
 
 			// If a core box was previously added or removed by a plugin, don't add.
 			if ( 'core' == $priority ) {
 				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
+				if ( false === $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] ) {
 					return;
+				}
 
 				/*
 				 * If box was added with default priority, give it core priority to
 				 * maintain sort order.
 				 */
 				if ( 'default' == $a_priority ) {
-					$wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
-					unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
+					$wp_meta_boxes[ $page ][ $a_context ]['core'][ $id ] = $wp_meta_boxes[ $page ][ $a_context ]['default'][ $id ];
+					unset( $wp_meta_boxes[ $page ][ $a_context ]['default'][ $id ] );
 				}
 				return;
 			}
 			// If no priority given and id already present, use existing priority.
-			if ( empty($priority) ) {
+			if ( empty( $priority ) ) {
 				$priority = $a_priority;
-			/*
-			 * Else, if we're adding to the sorted priority, we don't know the title
-			 * or callback. Grab them from the previously added context/priority.
-			 */
+				/*
+				* Else, if we're adding to the sorted priority, we don't know the title
+				* or callback. Grab them from the previously added context/priority.
+				*/
 			} elseif ( 'sorted' == $priority ) {
-				$title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
-				$callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
-				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
+				$title         = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['title'];
+				$callback      = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['callback'];
+				$callback_args = $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ]['args'];
 			}
 			// An id can be in only one priority and one context.
-			if ( $priority != $a_priority || $context != $a_context )
-				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			if ( $priority != $a_priority || $context != $a_context ) {
+				unset( $wp_meta_boxes[ $page ][ $a_context ][ $a_priority ][ $id ] );
+			}
 		}
 	}
 
-	if ( empty($priority) )
+	if ( empty( $priority ) ) {
 		$priority = 'low';
+	}
 
-	if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
-		$wp_meta_boxes[$page][$context][$priority] = array();
+	if ( ! isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
+		$wp_meta_boxes[ $page ][ $context ][ $priority ] = array();
+	}
 
-	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
+	$wp_meta_boxes[ $page ][ $context ][ $priority ][ $id ] = array(
+		'id'       => $id,
+		'title'    => $title,
+		'callback' => $callback,
+		'args'     => $callback_args,
+	);
 }
 
 /**
@@ -1009,16 +1077,17 @@ function do_meta_boxes( $screen, $context, $object ) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
+	if ( empty( $screen ) ) {
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
+	} elseif ( is_string( $screen ) ) {
 		$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
 	$hidden = get_hidden_meta_boxes( $screen );
 
-	printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
+	printf( '<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars( $context ) );
 
 	// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
 	if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
@@ -1037,20 +1106,21 @@ function do_meta_boxes( $screen, $context, $object ) {
 
 	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
 		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
-			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
+			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
 				foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+					if ( false == $box || ! $box['title'] ) {
 						continue;
+					}
 					$i++;
-					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
-					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
+					$hidden_class = in_array( $box['id'], $hidden ) ? ' hide-if-js' : '';
+					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes( $box['id'], $page ) . $hidden_class . '" ' . '>' . "\n";
 					if ( 'dashboard_browser_nag' != $box['id'] ) {
-						$widget_title = $box[ 'title' ];
+						$widget_title = $box['title'];
 
-						if ( is_array( $box[ 'args' ] ) && isset( $box[ 'args' ][ '__widget_basename' ] ) ) {
-							$widget_title = $box[ 'args' ][ '__widget_basename' ];
+						if ( is_array( $box['args'] ) && isset( $box['args']['__widget_basename'] ) ) {
+							$widget_title = $box['args']['__widget_basename'];
 							// Do not pass this parameter to the user callback function.
-							unset( $box[ 'args' ][ '__widget_basename' ] );
+							unset( $box['args']['__widget_basename'] );
 						}
 
 						echo '<button type="button" class="handlediv" aria-expanded="true">';
@@ -1060,7 +1130,7 @@ function do_meta_boxes( $screen, $context, $object ) {
 					}
 					echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
 					echo '<div class="inside">' . "\n";
-					call_user_func($box['callback'], $object, $box);
+					call_user_func( $box['callback'], $object, $box );
 					echo "</div>\n";
 					echo "</div>\n";
 				}
@@ -1068,7 +1138,7 @@ function do_meta_boxes( $screen, $context, $object ) {
 		}
 	}
 
-	echo "</div>";
+	echo '</div>';
 
 	return $i;
 
@@ -1111,15 +1181,19 @@ function remove_meta_box( $id, $screen, $context ) {
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset( $wp_meta_boxes ) ) {
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	}
+	if ( ! isset( $wp_meta_boxes[ $page ] ) ) {
+		$wp_meta_boxes[ $page ] = array();
+	}
+	if ( ! isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
+		$wp_meta_boxes[ $page ][ $context ] = array();
+	}
 
-	foreach ( array('high', 'core', 'default', 'low') as $priority )
-		$wp_meta_boxes[$page][$context][$priority][$id] = false;
+	foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
+		$wp_meta_boxes[ $page ][ $context ][ $priority ][ $id ] = false;
+	}
 }
 
 /**
@@ -1143,27 +1217,29 @@ function do_accordion_sections( $screen, $context, $object ) {
 
 	wp_enqueue_script( 'accordion' );
 
-	if ( empty( $screen ) )
+	if ( empty( $screen ) ) {
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
+	} elseif ( is_string( $screen ) ) {
 		$screen = convert_to_screen( $screen );
+	}
 
 	$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">
 	<?php
-	$i = 0;
+	$i          = 0;
 	$first_open = false;
 
 	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
 		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
 			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
 				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+					if ( false == $box || ! $box['title'] ) {
 						continue;
+					}
 					$i++;
 					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
@@ -1218,13 +1294,15 @@ function do_accordion_sections( $screen, $context, $object ) {
  *                           'general', 'reading', 'writing', 'discussion', 'media', etc. Create your own using
  *                           add_options_page();
  */
-function add_settings_section($id, $title, $callback, $page) {
+function add_settings_section( $id, $title, $callback, $page ) {
 	global $wp_settings_sections;
 
 	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'misc'
 			)
 		);
@@ -1232,16 +1310,22 @@ function add_settings_section($id, $title, $callback, $page) {
 	}
 
 	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'privacy'
 			)
 		);
 		$page = 'reading';
 	}
 
-	$wp_settings_sections[$page][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback);
+	$wp_settings_sections[ $page ][ $id ] = array(
+		'id'       => $id,
+		'title'    => $title,
+		'callback' => $callback,
+	);
 }
 
 /**
@@ -1279,13 +1363,15 @@ function add_settings_section($id, $title, $callback, $page) {
  *                             field is output.
  * }
  */
-function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
+function add_settings_field( $id, $title, $callback, $page, $section = 'default', $args = array() ) {
 	global $wp_settings_fields;
 
 	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'misc'
 			)
 		);
@@ -1293,16 +1379,23 @@ function add_settings_field($id, $title, $callback, $page, $section = 'default',
 	}
 
 	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'privacy'
 			)
 		);
 		$page = 'reading';
 	}
 
-	$wp_settings_fields[$page][$section][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $args);
+	$wp_settings_fields[ $page ][ $section ][ $id ] = array(
+		'id'       => $id,
+		'title'    => $title,
+		'callback' => $callback,
+		'args'     => $args,
+	);
 }
 
 /**
@@ -1321,18 +1414,22 @@ function add_settings_field($id, $title, $callback, $page, $section = 'default',
 function do_settings_sections( $page ) {
 	global $wp_settings_sections, $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_sections[$page] ) )
+	if ( ! isset( $wp_settings_sections[ $page ] ) ) {
 		return;
+	}
 
-	foreach ( (array) $wp_settings_sections[$page] as $section ) {
-		if ( $section['title'] )
+	foreach ( (array) $wp_settings_sections[ $page ] as $section ) {
+		if ( $section['title'] ) {
 			echo "<h2>{$section['title']}</h2>\n";
+		}
 
-		if ( $section['callback'] )
+		if ( $section['callback'] ) {
 			call_user_func( $section['callback'], $section );
+		}
 
-		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
+		if ( ! isset( $wp_settings_fields ) || ! isset( $wp_settings_fields[ $page ] ) || ! isset( $wp_settings_fields[ $page ][ $section['id'] ] ) ) {
 			continue;
+		}
 		echo '<table class="form-table">';
 		do_settings_fields( $page, $section['id'] );
 		echo '</table>';
@@ -1353,13 +1450,14 @@ function do_settings_sections( $page ) {
  * @param string $page Slug title of the admin page who's settings fields you want to show.
  * @param string $section Slug title of the settings section who's fields you want to show.
  */
-function do_settings_fields($page, $section) {
+function do_settings_fields( $page, $section ) {
 	global $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_fields[$page][$section] ) )
+	if ( ! isset( $wp_settings_fields[ $page ][ $section ] ) ) {
 		return;
+	}
 
-	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
+	foreach ( (array) $wp_settings_fields[ $page ][ $section ] as $field ) {
 		$class = '';
 
 		if ( ! empty( $field['args']['class'] ) ) {
@@ -1375,7 +1473,7 @@ function do_settings_fields($page, $section) {
 		}
 
 		echo '<td>';
-		call_user_func($field['callback'], $field['args']);
+		call_user_func( $field['callback'], $field['args'] );
 		echo '</td>';
 		echo '</tr>';
 	}
@@ -1412,7 +1510,7 @@ function add_settings_error( $setting, $code, $message, $type = 'error' ) {
 		'setting' => $setting,
 		'code'    => $code,
 		'message' => $message,
-		'type'    => $type
+		'type'    => $type,
 	);
 }
 
@@ -1447,8 +1545,9 @@ function get_settings_errors( $setting = '', $sanitize = false ) {
 	 * This allows the $sanitize_callback from register_setting() to run, adding
 	 * any settings errors you want to show by default.
 	 */
-	if ( $sanitize )
+	if ( $sanitize ) {
 		sanitize_option( $setting, get_option( $setting ) );
+	}
 
 	// If settings were passed back from options.php then use them.
 	if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
@@ -1465,8 +1564,9 @@ function get_settings_errors( $setting = '', $sanitize = false ) {
 	if ( $setting ) {
 		$setting_errors = array();
 		foreach ( (array) $wp_settings_errors as $key => $details ) {
-			if ( $setting == $details['setting'] )
-				$setting_errors[] = $wp_settings_errors[$key];
+			if ( $setting == $details['setting'] ) {
+				$setting_errors[] = $wp_settings_errors[ $key ];
+			}
 		}
 		return $setting_errors;
 	}
@@ -1503,21 +1603,23 @@ function get_settings_errors( $setting = '', $sanitize = false ) {
  */
 function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
 
-	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
+	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) ) {
 		return;
+	}
 
 	$settings_errors = get_settings_errors( $setting, $sanitize );
 
-	if ( empty( $settings_errors ) )
+	if ( empty( $settings_errors ) ) {
 		return;
+	}
 
 	$output = '';
 	foreach ( $settings_errors as $key => $details ) {
-		$css_id = 'setting-error-' . $details['code'];
+		$css_id    = 'setting-error-' . $details['code'];
 		$css_class = $details['type'] . ' settings-error notice is-dismissible';
-		$output .= "<div id='$css_id' class='$css_class'> \n";
-		$output .= "<p><strong>{$details['message']}</strong></p>";
-		$output .= "</div> \n";
+		$output   .= "<div id='$css_id' class='$css_class'> \n";
+		$output   .= "<p><strong>{$details['message']}</strong></p>";
+		$output   .= "</div> \n";
 	}
 	echo $output;
 }
@@ -1529,7 +1631,7 @@ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = fa
  *
  * @param string $found_action
  */
-function find_posts_div($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">
@@ -1539,7 +1641,7 @@ function find_posts_div($found_action = '') {
 		<div class="find-box-inside">
 			<div class="find-box-search">
 				<?php if ( $found_action ) { ?>
-					<input type="hidden" name="found_action" value="<?php echo esc_attr($found_action); ?>" />
+					<input type="hidden" name="found_action" value="<?php echo esc_attr( $found_action ); ?>" />
 				<?php } ?>
 				<input type="hidden" name="affected" id="affected" value="" />
 				<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
@@ -1568,8 +1670,9 @@ function find_posts_div($found_action = '') {
  */
 function the_post_password() {
 	$post = get_post();
-	if ( isset( $post->post_password ) )
+	if ( isset( $post->post_password ) ) {
 		echo esc_attr( $post->post_password );
+	}
 }
 
 /**
@@ -1585,8 +1688,9 @@ function the_post_password() {
  */
 function _draft_or_post_title( $post = 0 ) {
 	$title = get_the_title( $post );
-	if ( empty( $title ) )
+	if ( empty( $title ) ) {
 		$title = __( '(no title)' );
+	}
 	return esc_html( $title );
 }
 
@@ -1599,7 +1703,7 @@ function _draft_or_post_title( $post = 0 ) {
  * @since 2.7.0
  */
 function _admin_search_query() {
-	echo isset($_REQUEST['s']) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
+	echo isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
 }
 
 /**
@@ -1617,14 +1721,14 @@ function _admin_search_query() {
 function iframe_header( $title = '', $deprecated = false ) {
 	show_admin_bar( false );
 	global $hook_suffix, $admin_body_class, $wp_locale;
-	$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
+	$admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
 
 	$current_screen = get_current_screen();
 
 	@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>
+<title><?php bloginfo( 'name' ); ?> &rsaquo; <?php echo $title; ?> &#8212; <?php _e( 'WordPress' ); ?></title>
 <?php
 wp_enqueue_style( 'colors' );
 ?>
@@ -1663,8 +1767,9 @@ do_action( 'admin_head' );
 
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
 
-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}
 
 ?>
 </head>
@@ -1672,11 +1777,16 @@ if ( is_rtl() )
 /** This filter is documented in wp-admin/admin-header.php */
 $admin_body_classes = apply_filters( 'admin_body_class', '' );
 ?>
-<body<?php
+<body
+<?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 . ' ' . $admin_body_class; ?>">
+if ( isset( $GLOBALS['body_id'] ) ) {
+	echo ' id="' . $GLOBALS['body_id'] . '"';
+}
+?>
+ class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -1723,20 +1833,22 @@ function iframe_footer() {
 }
 
 /**
- *
  * @param WP_Post $post
  */
-function _post_states($post) {
+function _post_states( $post ) {
 	$post_states = array();
-	if ( isset( $_REQUEST['post_status'] ) )
+	if ( isset( $_REQUEST['post_status'] ) ) {
 		$post_status = $_REQUEST['post_status'];
-	else
+	} else {
 		$post_status = '';
+	}
 
-	if ( !empty($post->post_password) )
-		$post_states['protected'] = __('Password protected');
-	if ( 'private' == $post->post_status && 'private' != $post_status )
-		$post_states['private'] = __('Private');
+	if ( ! empty( $post->post_password ) ) {
+		$post_states['protected'] = __( 'Password protected' );
+	}
+	if ( 'private' == $post->post_status && 'private' != $post_status ) {
+		$post_states['private'] = __( 'Private' );
+	}
 	if ( 'draft' === $post->post_status ) {
 		if ( get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) {
 			$post_states[] = __( 'Customization Draft' );
@@ -1746,10 +1858,12 @@ function _post_states($post) {
 	} elseif ( 'trash' === $post->post_status && get_post_meta( $post->ID, '_customize_changeset_uuid', true ) ) {
 		$post_states[] = __( 'Customization Draft' );
 	}
-	if ( 'pending' == $post->post_status && 'pending' != $post_status )
-		$post_states['pending'] = _x('Pending', 'post status');
-	if ( is_sticky($post->ID) )
-		$post_states['sticky'] = __('Sticky');
+	if ( 'pending' == $post->post_status && 'pending' != $post_status ) {
+		$post_states['pending'] = _x( 'Pending', 'post status' );
+	}
+	if ( is_sticky( $post->ID ) ) {
+		$post_states['sticky'] = __( 'Sticky' );
+	}
 
 	if ( 'future' === $post->post_status ) {
 		$post_states['scheduled'] = __( 'Scheduled' );
@@ -1776,9 +1890,9 @@ function _post_states($post) {
 	 */
 	$post_states = apply_filters( 'display_post_states', $post_states, $post );
 
-	if ( ! empty($post_states) ) {
-		$state_count = count($post_states);
-		$i = 0;
+	if ( ! empty( $post_states ) ) {
+		$state_count = count( $post_states );
+		$i           = 0;
 		echo ' &mdash; ';
 		foreach ( $post_states as $state ) {
 			++$i;
@@ -1790,15 +1904,14 @@ function _post_states($post) {
 }
 
 /**
- *
  * @param WP_Post $post
  */
 function _media_states( $post ) {
 	$media_states = array();
-	$stylesheet = get_option('stylesheet');
+	$stylesheet   = get_option( 'stylesheet' );
 
-	if ( current_theme_supports( 'custom-header') ) {
-		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
+	if ( current_theme_supports( 'custom-header' ) ) {
+		$meta_header = get_post_meta( $post->ID, '_wp_attachment_is_custom_header', true );
 
 		if ( is_random_header_image() ) {
 			$header_images = wp_list_pluck( get_uploaded_header_images(), 'attachment_id' );
@@ -1821,8 +1934,8 @@ function _media_states( $post ) {
 		}
 	}
 
-	if ( current_theme_supports( 'custom-background') ) {
-		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
+	if ( current_theme_supports( 'custom-background' ) ) {
+		$meta_background = get_post_meta( $post->ID, '_wp_attachment_is_custom_background', true );
 
 		if ( ! empty( $meta_background ) && $meta_background == $stylesheet ) {
 			$media_states[] = __( 'Background Image' );
@@ -1856,7 +1969,7 @@ function _media_states( $post ) {
 
 	if ( ! empty( $media_states ) ) {
 		$state_count = count( $media_states );
-		$i = 0;
+		$i           = 0;
 		echo ' &mdash; ';
 		foreach ( $media_states as $state ) {
 			++$i;
@@ -1978,14 +2091,16 @@ function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap
  * @return string Submit button HTML.
  */
 function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
-	if ( ! is_array( $type ) )
+	if ( ! is_array( $type ) ) {
 		$type = explode( ' ', $type );
+	}
 
 	$button_shorthand = array( 'primary', 'small', 'large' );
-	$classes = array( 'button' );
+	$classes          = array( 'button' );
 	foreach ( $type as $t ) {
-		if ( 'secondary' === $t || 'button-secondary' === $t )
+		if ( 'secondary' === $t || 'button-secondary' === $t ) {
 			continue;
+		}
 		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
 	}
 	// Remove empty items, remove duplicate items, and finally build a string.
@@ -2011,10 +2126,10 @@ function get_submit_button( $text = '', $type = 'primary large', $name = 'submit
 
 	// Don't output empty name and id attributes.
 	$name_attr = $name ? ' name="' . esc_attr( $name ) . '"' : '';
-	$id_attr = $id ? ' id="' . esc_attr( $id ) . '"' : '';
+	$id_attr   = $id ? ' id="' . esc_attr( $id ) . '"' : '';
 
-	$button = '<input type="submit"' . $name_attr . $id_attr . ' class="' . esc_attr( $class );
-	$button	.= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
+	$button  = '<input type="submit"' . $name_attr . $id_attr . ' class="' . esc_attr( $class );
+	$button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
 
 	if ( $wrap ) {
 		$button = '<p class="submit">' . $button . '</p>';
@@ -2024,7 +2139,6 @@ function get_submit_button( $text = '', $type = 'primary large', $name = 'submit
 }
 
 /**
- *
  * @global bool $is_IE
  */
 function _wp_admin_html_begin() {
@@ -2032,29 +2146,34 @@ function _wp_admin_html_begin() {
 
 	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
 
-	if ( $is_IE )
-		@header('X-UA-Compatible: IE=edge');
+	if ( $is_IE ) {
+		@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; ?>" <?php
-	/**
-	 * Fires inside the HTML tag in the admin header.
-	 *
-	 * @since 2.2.0
-	 */
-	do_action( 'admin_xml_ns' );
-?> <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" class="ie8 <?php echo $admin_html_class; ?>" 
+																	<?php
+																	/**
+																	 * Fires inside the HTML tag in the admin header.
+																	 *
+																	 * @since 2.2.0
+																	 */
+																	do_action( 'admin_xml_ns' );
+?>
+	<?php language_attributes(); ?>>
 <![endif]-->
 <!--[if !(IE 8) ]><!-->
-<html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>" <?php
-	/** This action is documented in wp-admin/includes/template.php */
-	do_action( 'admin_xml_ns' );
-?> <?php language_attributes(); ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>" 
+																<?php
+																/** This action is documented in wp-admin/includes/template.php */
+																do_action( 'admin_xml_ns' );
+?>
+	<?php language_attributes(); ?>>
 <!--<![endif]-->
 <head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php echo get_option( 'blog_charset' ); ?>" />
 <?php
 }
 
@@ -2079,7 +2198,10 @@ function convert_to_screen( $hook_name ) {
 			),
 			'3.3.0'
 		);
-		return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' );
+		return (object) array(
+			'id'   => '_invalid',
+			'base' => '_are_belong_to_us',
+		);
 	}
 
 	return WP_Screen::get( $hook_name );
@@ -2096,7 +2218,7 @@ function _local_storage_notice() {
 	<div id="local-storage-notice" class="hidden notice is-dismissible">
 	<p class="local-restore">
 		<?php _e( 'The backup of this post in your browser is different from the version below.' ); ?>
-		<button type="button" class="button restore-backup"><?php _e('Restore the backup'); ?></button>
+		<button type="button" class="button restore-backup"><?php _e( 'Restore the backup' ); ?></button>
 	</p>
 	<p class="help">
 		<?php _e( 'This will replace the current editor content with the last backup version. You can use undo and redo in the editor to get the old content back or to return to the restored version.' ); ?>
@@ -2135,7 +2257,7 @@ function wp_star_rating( $args = array() ) {
 		'number' => 0,
 		'echo'   => true,
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r        = wp_parse_args( $args, $defaults );
 
 	// Non-English decimal places when the $rating is coming from a string
 	$rating = (float) str_replace( ',', '.', $r['rating'] );
@@ -2146,20 +2268,20 @@ function wp_star_rating( $args = array() ) {
 	}
 
 	// Calculate the number of each type of star needed
-	$full_stars = floor( $rating );
-	$half_stars = ceil( $rating - $full_stars );
+	$full_stars  = floor( $rating );
+	$half_stars  = ceil( $rating - $full_stars );
 	$empty_stars = 5 - $full_stars - $half_stars;
 
 	if ( $r['number'] ) {
 		/* translators: 1: The rating, 2: The number of ratings */
 		$format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number'] );
-		$title = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
+		$title  = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
 	} else {
 		/* translators: 1: The rating */
 		$title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
 	}
 
-	$output = '<div class="star-rating">';
+	$output  = '<div class="star-rating">';
 	$output .= '<span class="screen-reader-text">' . $title . '</span>';
 	$output .= str_repeat( '<div class="star star-full" aria-hidden="true"></div>', $full_stars );
 	$output .= str_repeat( '<div class="star star-half" aria-hidden="true"></div>', $half_stars );
diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php
index 86bd37e100..fd93e579b9 100644
--- a/wp-admin/includes/theme-install.php
+++ b/wp-admin/includes/theme-install.php
@@ -6,17 +6,48 @@
  * @subpackage Administration
  */
 
-$themes_allowedtags = array('a' => array('href' => array(), 'title' => array(), 'target' => array()),
-	'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
-	'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
-	'div' => array(), 'p' => array(), 'ul' => array(), 'ol' => array(), 'li' => array(),
-	'h1' => array(), 'h2' => array(), 'h3' => array(), 'h4' => array(), 'h5' => array(), 'h6' => array(),
-	'img' => array('src' => array(), 'class' => array(), 'alt' => array())
+$themes_allowedtags = array(
+	'a'       => array(
+		'href'   => array(),
+		'title'  => array(),
+		'target' => array(),
+	),
+	'abbr'    => array( 'title' => array() ),
+	'acronym' => array( 'title' => array() ),
+	'code'    => array(),
+	'pre'     => array(),
+	'em'      => array(),
+	'strong'  => array(),
+	'div'     => array(),
+	'p'       => array(),
+	'ul'      => array(),
+	'ol'      => array(),
+	'li'      => array(),
+	'h1'      => array(),
+	'h2'      => array(),
+	'h3'      => array(),
+	'h4'      => array(),
+	'h5'      => array(),
+	'h6'      => array(),
+	'img'     => array(
+		'src'   => array(),
+		'class' => array(),
+		'alt'   => array(),
+	),
 );
 
-$theme_field_defaults = array( 'description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
-	'rating' => true, 'downloaded' => true, 'downloadlink' => true, 'last_updated' => true, 'homepage' => true,
-	'tags' => true, 'num_ratings' => true
+$theme_field_defaults = array(
+	'description'  => true,
+	'sections'     => false,
+	'tested'       => true,
+	'requires'     => true,
+	'rating'       => true,
+	'downloaded'   => true,
+	'downloadlink' => true,
+	'last_updated' => true,
+	'homepage'     => true,
+	'tags'         => true,
+	'num_ratings'  => true,
 );
 
 /**
@@ -31,15 +62,18 @@ $theme_field_defaults = array( 'description' => true, 'sections' => false, 'test
 function install_themes_feature_list() {
 	_deprecated_function( __FUNCTION__, '3.1.0', 'get_theme_feature_list()' );
 
-	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
+	if ( ! $cache = get_transient( 'wporg_theme_feature_list' ) ) {
 		set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
 
-	if ( $cache )
+	if ( $cache ) {
 		return $cache;
+	}
 
 	$feature_list = themes_api( 'feature_list', array() );
-	if ( is_wp_error( $feature_list ) )
+	if ( is_wp_error( $feature_list ) ) {
 		return array();
+	}
 
 	set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -56,19 +90,21 @@ function install_themes_feature_list() {
 function install_theme_search_form( $type_selector = true ) {
 	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
 	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	if ( ! $type_selector )
+	if ( ! $type_selector ) {
 		echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+	}
 	?>
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
 	<?php if ( $type_selector ) : ?>
-	<label class="screen-reader-text" for="typeselector"><?php _e('Type of search'); ?></label>
+	<label class="screen-reader-text" for="typeselector"><?php _e( 'Type of search' ); ?></label>
 	<select	name="type" id="typeselector">
-	<option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
-	<option value="author" <?php selected('author', $type) ?>><?php _e('Author'); ?></option>
-	<option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
+	<option value="term" <?php selected( 'term', $type ); ?>><?php _e( 'Keyword' ); ?></option>
+	<option value="author" <?php selected( 'author', $type ); ?>><?php _e( 'Author' ); ?></option>
+	<option value="tag" <?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Theme Installer' ); ?></option>
 	</select>
-	<label class="screen-reader-text" for="s"><?php
+	<label class="screen-reader-text" for="s">
+	<?php
 	switch ( $type ) {
 		case 'term':
 			_e( 'Search by keyword' );
@@ -80,11 +116,12 @@ function install_theme_search_form( $type_selector = true ) {
 			_e( 'Search by tag' );
 			break;
 	}
-	?></label>
+	?>
+	</label>
 	<?php else : ?>
-	<label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
+	<label class="screen-reader-text" for="s"><?php _e( 'Search by keyword' ); ?></label>
 	<?php endif; ?>
-	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
+	<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
@@ -98,7 +135,7 @@ function install_theme_search_form( $type_selector = true ) {
 function install_themes_dashboard() {
 	install_theme_search_form( false );
 ?>
-<h4><?php _e('Feature Filter') ?></h4>
+<h4><?php _e( 'Feature Filter' ); ?></h4>
 <p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
 
 <form method="get">
@@ -114,7 +151,7 @@ function install_themes_dashboard() {
 		echo '<ol class="feature-group">';
 		foreach ( $features as $feature => $feature_name ) {
 			$feature_name = esc_html( $feature_name );
-			$feature = esc_attr($feature);
+			$feature      = esc_attr( $feature );
 ?>
 
 <li>
@@ -126,7 +163,8 @@ function install_themes_dashboard() {
 </ol>
 <br class="clear" />
 <?php
-	} ?>
+	}
+	?>
 
 </div>
 <br class="clear" />
@@ -140,8 +178,8 @@ function install_themes_dashboard() {
  */
 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'); ?>">
+<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' ); ?>
 	<label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
 	<input type="file" id="themezip" name="themezip" />
@@ -163,7 +201,7 @@ function display_theme( $theme ) {
 	_deprecated_function( __FUNCTION__, '3.4.0' );
 	global $wp_list_table;
 	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
+		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
 	}
 	$wp_list_table->prepare_items();
 	$wp_list_table->single_row( $theme );
@@ -180,7 +218,7 @@ function display_themes() {
 	global $wp_list_table;
 
 	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
+		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
 	}
 	$wp_list_table->prepare_items();
 	$wp_list_table->display();
@@ -199,12 +237,13 @@ function install_theme_information() {
 
 	$theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) );
 
-	if ( is_wp_error( $theme ) )
+	if ( is_wp_error( $theme ) ) {
 		wp_die( $theme );
+	}
 
-	iframe_header( __('Theme Installation') );
+	iframe_header( __( 'Theme Installation' ) );
 	if ( ! isset( $wp_list_table ) ) {
-		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
+		$wp_list_table = _get_list_table( 'WP_Theme_Install_List_Table' );
 	}
 	$wp_list_table->theme_installer_single( $theme );
 	iframe_footer();
diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 41c4a8d3e4..50de9b2702 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -17,25 +17,26 @@
  * @param string $redirect Redirect to page when complete.
  * @return void|bool|WP_Error When void, echoes content.
  */
-function delete_theme($stylesheet, $redirect = '') {
+function delete_theme( $stylesheet, $redirect = '' ) {
 	global $wp_filesystem;
 
-	if ( empty($stylesheet) )
+	if ( empty( $stylesheet ) ) {
 		return false;
+	}
 
 	if ( empty( $redirect ) ) {
-		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+		$redirect = wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet );
 	}
 
 	ob_start();
 	$credentials = request_filesystem_credentials( $redirect );
-	$data = ob_get_clean();
+	$data        = ob_get_clean();
 
 	if ( false === $credentials ) {
-		if ( ! empty( $data ) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty( $data ) ) {
+			include_once( ABSPATH . 'wp-admin/admin-header.php' );
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include( ABSPATH . 'wp-admin/admin-footer.php' );
 			exit;
 		}
 		return;
@@ -46,20 +47,22 @@ function delete_theme($stylesheet, $redirect = '') {
 		request_filesystem_credentials( $redirect, '', true ); // Failed to connect, Error and request again.
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ) {
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty( $data ) ) {
+			include_once( ABSPATH . 'wp-admin/admin-header.php' );
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include( ABSPATH . 'wp-admin/admin-footer.php' );
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! is_object( $wp_filesystem ) ) {
+		return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+		return new WP_Error( 'fs_error', __( 'Filesystem error.' ), $wp_filesystem->errors );
+	}
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
@@ -68,8 +71,8 @@ function delete_theme($stylesheet, $redirect = '') {
 	}
 
 	$themes_dir = trailingslashit( $themes_dir );
-	$theme_dir = trailingslashit( $themes_dir . $stylesheet );
-	$deleted = $wp_filesystem->delete( $theme_dir, true );
+	$theme_dir  = trailingslashit( $themes_dir . $stylesheet );
+	$deleted    = $wp_filesystem->delete( $theme_dir, true );
 
 	if ( ! $deleted ) {
 		return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) );
@@ -122,8 +125,8 @@ function get_page_templates( $post = null, $post_type = 'page' ) {
  * @param string $containingfolder Path of the theme parent folder
  * @return string
  */
-function _get_template_edit_filename($fullpath, $containingfolder) {
-	return str_replace(dirname(dirname( $containingfolder )) , '', $fullpath);
+function _get_template_edit_filename( $fullpath, $containingfolder ) {
+	return str_replace( dirname( dirname( $containingfolder ) ), '', $fullpath );
 }
 
 /**
@@ -155,11 +158,13 @@ function theme_update_available( $theme ) {
 function get_theme_update_available( $theme ) {
 	static $themes_update = null;
 
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can( 'update_themes' ) ) {
 		return false;
+	}
 
-	if ( !isset($themes_update) )
-		$themes_update = get_site_transient('update_themes');
+	if ( ! isset( $themes_update ) ) {
+		$themes_update = get_site_transient( 'update_themes' );
+	}
 
 	if ( ! ( $theme instanceof WP_Theme ) ) {
 		return false;
@@ -169,19 +174,27 @@ function get_theme_update_available( $theme ) {
 
 	$html = '';
 
-	if ( isset($themes_update->response[ $stylesheet ]) ) {
-		$update = $themes_update->response[ $stylesheet ];
-		$theme_name = $theme->display('Name');
-		$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $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 );
+	if ( isset( $themes_update->response[ $stylesheet ] ) ) {
+		$update      = $themes_update->response[ $stylesheet ];
+		$theme_name  = $theme->display( 'Name' );
+		$details_url = add_query_arg(
+			array(
+				'TB_iframe' => 'true',
+				'width'     => 1024,
+				'height'    => 800,
+			), $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 );
 
-		if ( !is_multisite() ) {
-			if ( ! current_user_can('update_themes') ) {
+		if ( ! is_multisite() ) {
+			if ( ! current_user_can( 'update_themes' ) ) {
 				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
+				$html = sprintf(
+					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
 					$theme_name,
 					esc_url( $details_url ),
-					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+					sprintf(
+						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: theme name, 2: version number */
 						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
 					),
@@ -189,10 +202,12 @@ function get_theme_update_available( $theme ) {
 				);
 			} elseif ( empty( $update['package'] ) ) {
 				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+				$html = sprintf(
+					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
 					$theme_name,
 					esc_url( $details_url ),
-					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+					sprintf(
+						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: theme name, 2: version number */
 						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
 					),
@@ -200,16 +215,19 @@ function get_theme_update_available( $theme ) {
 				);
 			} else {
 				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
+				$html = sprintf(
+					'<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
 					$theme_name,
 					esc_url( $details_url ),
-					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+					sprintf(
+						'class="thickbox open-plugin-details-modal" aria-label="%s"',
 						/* translators: 1: theme name, 2: version number */
 						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
 					),
 					$update['new_version'],
 					$update_url,
-					sprintf( 'aria-label="%s" id="update-theme" data-slug="%s"',
+					sprintf(
+						'aria-label="%s" id="update-theme" data-slug="%s"',
 						/* translators: %s: theme name */
 						esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) ),
 						$stylesheet
@@ -262,7 +280,7 @@ function get_theme_feature_list( $api = true ) {
 			'theme-options'         => __( 'Theme Options' ),
 		),
 
-		__( 'Layout' ) => array(
+		__( 'Layout' )   => array(
 			'grid-layout'   => __( 'Grid Layout' ),
 			'one-column'    => __( 'One Column' ),
 			'two-columns'   => __( 'Two Columns' ),
@@ -270,24 +288,28 @@ function get_theme_feature_list( $api = true ) {
 			'four-columns'  => __( 'Four Columns' ),
 			'left-sidebar'  => __( 'Left Sidebar' ),
 			'right-sidebar' => __( 'Right Sidebar' ),
-		)
+		),
 
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) )
+	if ( ! $api || ! current_user_can( 'install_themes' ) ) {
 		return $features;
-
-	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
-
-	if ( !$feature_list ) {
-		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) )
-			return $features;
 	}
 
-	if ( !$feature_list )
+	if ( ! $feature_list = get_site_transient( 'wporg_theme_feature_list' ) ) {
+		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
+
+	if ( ! $feature_list ) {
+		$feature_list = themes_api( 'feature_list', array() );
+		if ( is_wp_error( $feature_list ) ) {
+			return $features;
+		}
+	}
+
+	if ( ! $feature_list ) {
 		return $features;
+	}
 
 	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -300,15 +322,17 @@ function get_theme_feature_list( $api = true ) {
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
 	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset($category_translations[$feature_category]) )
-			$feature_category = $category_translations[$feature_category];
-		$wporg_features[$feature_category] = array();
+		if ( isset( $category_translations[ $feature_category ] ) ) {
+			$feature_category = $category_translations[ $feature_category ];
+		}
+		$wporg_features[ $feature_category ] = array();
 
 		foreach ( $feature_items as $feature ) {
-			if ( isset($features[$feature_category][$feature]) )
-				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
-			else
-				$wporg_features[$feature_category][$feature] = $feature;
+			if ( isset( $features[ $feature_category ][ $feature ] ) ) {
+				$wporg_features[ $feature_category ][ $feature ] = $features[ $feature_category ][ $feature ];
+			} else {
+				$wporg_features[ $feature_category ][ $feature ] = $feature;
+			}
 		}
 	}
 
@@ -445,17 +469,18 @@ function themes_api( $action, $args = array() ) {
 		include( ABSPATH . WPINC . '/version.php' );
 
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
+		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
 			$url = set_url_scheme( $url, 'https' );
+		}
 
 		$http_args = array(
 			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
-			'body' => array(
-				'action' => $action,
-				'request' => serialize( $args )
-			)
+			'body'       => array(
+				'action'  => $action,
+				'request' => serialize( $args ),
+			),
 		);
-		$request = wp_remote_post( $url, $http_args );
+		$request   = wp_remote_post( $url, $http_args );
 
 		if ( $ssl && is_wp_error( $request ) ) {
 			if ( ! wp_doing_ajax() ) {
@@ -471,8 +496,9 @@ function themes_api( $action, $args = array() ) {
 			$request = wp_remote_post( $http_url, $http_args );
 		}
 
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error( 'themes_api_failed',
+		if ( is_wp_error( $request ) ) {
+			$res = new WP_Error(
+				'themes_api_failed',
 				sprintf(
 					/* translators: %s: support forums URL */
 					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
@@ -483,7 +509,8 @@ function themes_api( $action, $args = array() ) {
 		} else {
 			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
 			if ( ! is_object( $res ) && ! is_array( $res ) ) {
-				$res = new WP_Error( 'themes_api_failed',
+				$res = new WP_Error(
+					'themes_api_failed',
 					sprintf(
 						/* translators: %s: support forums URL */
 						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
@@ -562,24 +589,26 @@ function wp_prepare_themes_for_js( $themes = null ) {
 	$parents = array();
 
 	foreach ( $themes as $theme ) {
-		$slug = $theme->get_stylesheet();
+		$slug         = $theme->get_stylesheet();
 		$encoded_slug = urlencode( $slug );
 
 		$parent = false;
 		if ( $theme->parent() ) {
-			$parent = $theme->parent();
+			$parent           = $theme->parent();
 			$parents[ $slug ] = $parent->get_stylesheet();
-			$parent = $parent->display( 'Name' );
+			$parent           = $parent->display( 'Name' );
 		}
 
 		$customize_action = null;
 		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$customize_action = esc_url( add_query_arg(
-				array(
-					'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
-				),
-				wp_customize_url( $slug )
-			) );
+			$customize_action = esc_url(
+				add_query_arg(
+					array(
+						'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
+					),
+					wp_customize_url( $slug )
+				)
+			);
 		}
 
 		$prepared_themes[ $slug ] = array(
@@ -594,12 +623,12 @@ function wp_prepare_themes_for_js( $themes = null ) {
 			'parent'       => $parent,
 			'active'       => $slug === $current_theme,
 			'hasUpdate'    => isset( $updates[ $slug ] ),
-			'hasPackage'   => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ][ 'package' ] ),
+			'hasPackage'   => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ]['package'] ),
 			'update'       => get_theme_update_available( $theme ),
 			'actions'      => array(
-				'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
+				'activate'  => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
 				'customize' => $customize_action,
-				'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
+				'delete'    => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
 			),
 		);
 	}
diff --git a/wp-admin/includes/translation-install.php b/wp-admin/includes/translation-install.php
index 2ad4c79f4b..73d27fb1b2 100644
--- a/wp-admin/includes/translation-install.php
+++ b/wp-admin/includes/translation-install.php
@@ -20,7 +20,7 @@ function translations_api( $type, $args = null ) {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
 	if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ) ) ) {
-		return	new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
+		return  new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
 	}
 
 	/**
@@ -42,7 +42,7 @@ function translations_api( $type, $args = null ) {
 
 		$options = array(
 			'timeout' => 3,
-			'body' => array(
+			'body'    => array(
 				'wp_version' => $wp_version,
 				'locale'     => get_locale(),
 				'version'    => $args['version'], // Version of plugin, theme or core
@@ -69,7 +69,8 @@ function translations_api( $type, $args = null ) {
 		}
 
 		if ( is_wp_error( $request ) ) {
-			$res = new WP_Error( 'translations_api_failed',
+			$res = new WP_Error(
+				'translations_api_failed',
 				sprintf(
 					/* translators: %s: support forums URL */
 					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
@@ -80,7 +81,8 @@ function translations_api( $type, $args = null ) {
 		} else {
 			$res = json_decode( wp_remote_retrieve_body( $request ), true );
 			if ( ! is_object( $res ) && ! is_array( $res ) ) {
-				$res = new WP_Error( 'translations_api_failed',
+				$res = new WP_Error(
+					'translations_api_failed',
 					sprintf(
 						/* translators: %s: support forums URL */
 						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
@@ -162,24 +164,28 @@ function wp_install_language_form( $languages ) {
 	if ( ! empty( $wp_local_package ) && isset( $languages[ $wp_local_package ] ) ) {
 		if ( isset( $languages[ $wp_local_package ] ) ) {
 			$language = $languages[ $wp_local_package ];
-			printf( '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
+			printf(
+				'<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
 				esc_attr( $language['language'] ),
 				esc_attr( current( $language['iso'] ) ),
 				esc_attr( $language['strings']['continue'] ),
 				in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
-				esc_html( $language['native_name'] ) );
+				esc_html( $language['native_name'] )
+			);
 
 			unset( $languages[ $wp_local_package ] );
 		}
 	}
 
 	foreach ( $languages as $language ) {
-		printf( '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
+		printf(
+			'<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
 			esc_attr( $language['language'] ),
 			esc_attr( current( $language['iso'] ) ),
 			esc_attr( $language['strings']['continue'] ),
 			in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
-			esc_html( $language['native_name'] ) );
+			esc_html( $language['native_name'] )
+		);
 	}
 	echo "</select>\n";
 	echo '<p class="step"><span class="spinner"></span><input id="language-continue" type="submit" class="button button-primary button-large" value="Continue" /></p>';
@@ -224,10 +230,10 @@ function wp_download_language_pack( $download ) {
 	$translation = (object) $translation;
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$skin = new Automatic_Upgrader_Skin;
-	$upgrader = new Language_Pack_Upgrader( $skin );
+	$skin              = new Automatic_Upgrader_Skin;
+	$upgrader          = new Language_Pack_Upgrader( $skin );
 	$translation->type = 'core';
-	$result = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
+	$result            = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
 
 	if ( ! $result || is_wp_error( $result ) ) {
 		return false;
@@ -250,7 +256,7 @@ function wp_can_install_language_pack() {
 	}
 
 	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-	$skin = new Automatic_Upgrader_Skin;
+	$skin     = new Automatic_Upgrader_Skin;
 	$upgrader = new Language_Pack_Upgrader( $skin );
 	$upgrader->init();
 
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 9f7889ac62..ec909143dd 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -18,731 +18,731 @@
 global $_old_files;
 
 $_old_files = array(
-// 2.0
-'wp-admin/import-b2.php',
-'wp-admin/import-blogger.php',
-'wp-admin/import-greymatter.php',
-'wp-admin/import-livejournal.php',
-'wp-admin/import-mt.php',
-'wp-admin/import-rss.php',
-'wp-admin/import-textpattern.php',
-'wp-admin/quicktags.js',
-'wp-images/fade-butt.png',
-'wp-images/get-firefox.png',
-'wp-images/header-shadow.png',
-'wp-images/smilies',
-'wp-images/wp-small.png',
-'wp-images/wpminilogo.png',
-'wp.php',
-// 2.0.8
-'wp-includes/js/tinymce/plugins/inlinepopups/readme.txt',
-// 2.1
-'wp-admin/edit-form-ajax-cat.php',
-'wp-admin/execute-pings.php',
-'wp-admin/inline-uploading.php',
-'wp-admin/link-categories.php',
-'wp-admin/list-manipulation.js',
-'wp-admin/list-manipulation.php',
-'wp-includes/comment-functions.php',
-'wp-includes/feed-functions.php',
-'wp-includes/functions-compat.php',
-'wp-includes/functions-formatting.php',
-'wp-includes/functions-post.php',
-'wp-includes/js/dbx-key.js',
-'wp-includes/js/tinymce/plugins/autosave/langs/cs.js',
-'wp-includes/js/tinymce/plugins/autosave/langs/sv.js',
-'wp-includes/links.php',
-'wp-includes/pluggable-functions.php',
-'wp-includes/template-functions-author.php',
-'wp-includes/template-functions-category.php',
-'wp-includes/template-functions-general.php',
-'wp-includes/template-functions-links.php',
-'wp-includes/template-functions-post.php',
-'wp-includes/wp-l10n.php',
-// 2.2
-'wp-admin/cat-js.php',
-'wp-admin/import/b2.php',
-'wp-includes/js/autosave-js.php',
-'wp-includes/js/list-manipulation-js.php',
-'wp-includes/js/wp-ajax-js.php',
-// 2.3
-'wp-admin/admin-db.php',
-'wp-admin/cat.js',
-'wp-admin/categories.js',
-'wp-admin/custom-fields.js',
-'wp-admin/dbx-admin-key.js',
-'wp-admin/edit-comments.js',
-'wp-admin/install-rtl.css',
-'wp-admin/install.css',
-'wp-admin/upgrade-schema.php',
-'wp-admin/upload-functions.php',
-'wp-admin/upload-rtl.css',
-'wp-admin/upload.css',
-'wp-admin/upload.js',
-'wp-admin/users.js',
-'wp-admin/widgets-rtl.css',
-'wp-admin/widgets.css',
-'wp-admin/xfn.js',
-'wp-includes/js/tinymce/license.html',
-// 2.5
-'wp-admin/css/upload.css',
-'wp-admin/images/box-bg-left.gif',
-'wp-admin/images/box-bg-right.gif',
-'wp-admin/images/box-bg.gif',
-'wp-admin/images/box-butt-left.gif',
-'wp-admin/images/box-butt-right.gif',
-'wp-admin/images/box-butt.gif',
-'wp-admin/images/box-head-left.gif',
-'wp-admin/images/box-head-right.gif',
-'wp-admin/images/box-head.gif',
-'wp-admin/images/heading-bg.gif',
-'wp-admin/images/login-bkg-bottom.gif',
-'wp-admin/images/login-bkg-tile.gif',
-'wp-admin/images/notice.gif',
-'wp-admin/images/toggle.gif',
-'wp-admin/includes/upload.php',
-'wp-admin/js/dbx-admin-key.js',
-'wp-admin/js/link-cat.js',
-'wp-admin/profile-update.php',
-'wp-admin/templates.php',
-'wp-includes/images/wlw/WpComments.png',
-'wp-includes/images/wlw/WpIcon.png',
-'wp-includes/images/wlw/WpWatermark.png',
-'wp-includes/js/dbx.js',
-'wp-includes/js/fat.js',
-'wp-includes/js/list-manipulation.js',
-'wp-includes/js/tinymce/langs/en.js',
-'wp-includes/js/tinymce/plugins/autosave/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/autosave/langs',
-'wp-includes/js/tinymce/plugins/directionality/images',
-'wp-includes/js/tinymce/plugins/directionality/langs',
-'wp-includes/js/tinymce/plugins/inlinepopups/css',
-'wp-includes/js/tinymce/plugins/inlinepopups/images',
-'wp-includes/js/tinymce/plugins/inlinepopups/jscripts',
-'wp-includes/js/tinymce/plugins/paste/images',
-'wp-includes/js/tinymce/plugins/paste/jscripts',
-'wp-includes/js/tinymce/plugins/paste/langs',
-'wp-includes/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php',
-'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php',
-'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php',
-'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php',
-'wp-includes/js/tinymce/plugins/spellchecker/css/spellchecker.css',
-'wp-includes/js/tinymce/plugins/spellchecker/images',
-'wp-includes/js/tinymce/plugins/spellchecker/langs',
-'wp-includes/js/tinymce/plugins/spellchecker/tinyspell.php',
-'wp-includes/js/tinymce/plugins/wordpress/images',
-'wp-includes/js/tinymce/plugins/wordpress/langs',
-'wp-includes/js/tinymce/plugins/wordpress/wordpress.css',
-'wp-includes/js/tinymce/plugins/wphelp',
-'wp-includes/js/tinymce/themes/advanced/css',
-'wp-includes/js/tinymce/themes/advanced/images',
-'wp-includes/js/tinymce/themes/advanced/jscripts',
-'wp-includes/js/tinymce/themes/advanced/langs',
-// 2.5.1
-'wp-includes/js/tinymce/tiny_mce_gzip.php',
-// 2.6
-'wp-admin/bookmarklet.php',
-'wp-includes/js/jquery/jquery.dimensions.min.js',
-'wp-includes/js/tinymce/plugins/wordpress/popups.css',
-'wp-includes/js/wp-ajax.js',
-// 2.7
-'wp-admin/css/press-this-ie-rtl.css',
-'wp-admin/css/press-this-ie.css',
-'wp-admin/css/upload-rtl.css',
-'wp-admin/edit-form.php',
-'wp-admin/images/comment-pill.gif',
-'wp-admin/images/comment-stalk-classic.gif',
-'wp-admin/images/comment-stalk-fresh.gif',
-'wp-admin/images/comment-stalk-rtl.gif',
-'wp-admin/images/del.png',
-'wp-admin/images/gear.png',
-'wp-admin/images/media-button-gallery.gif',
-'wp-admin/images/media-buttons.gif',
-'wp-admin/images/postbox-bg.gif',
-'wp-admin/images/tab.png',
-'wp-admin/images/tail.gif',
-'wp-admin/js/forms.js',
-'wp-admin/js/upload.js',
-'wp-admin/link-import.php',
-'wp-includes/images/audio.png',
-'wp-includes/images/css.png',
-'wp-includes/images/default.png',
-'wp-includes/images/doc.png',
-'wp-includes/images/exe.png',
-'wp-includes/images/html.png',
-'wp-includes/images/js.png',
-'wp-includes/images/pdf.png',
-'wp-includes/images/swf.png',
-'wp-includes/images/tar.png',
-'wp-includes/images/text.png',
-'wp-includes/images/video.png',
-'wp-includes/images/zip.png',
-'wp-includes/js/tinymce/tiny_mce_config.php',
-'wp-includes/js/tinymce/tiny_mce_ext.js',
-// 2.8
-'wp-admin/js/users.js',
-'wp-includes/js/swfupload/plugins/swfupload.documentready.js',
-'wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js',
-'wp-includes/js/swfupload/swfupload_f9.swf',
-'wp-includes/js/tinymce/plugins/autosave',
-'wp-includes/js/tinymce/plugins/paste/css',
-'wp-includes/js/tinymce/utils/mclayer.js',
-'wp-includes/js/tinymce/wordpress.css',
-// 2.8.5
-'wp-admin/import/btt.php',
-'wp-admin/import/jkw.php',
-// 2.9
-'wp-admin/js/page.dev.js',
-'wp-admin/js/page.js',
-'wp-admin/js/set-post-thumbnail-handler.dev.js',
-'wp-admin/js/set-post-thumbnail-handler.js',
-'wp-admin/js/slug.dev.js',
-'wp-admin/js/slug.js',
-'wp-includes/gettext.php',
-'wp-includes/js/tinymce/plugins/wordpress/js',
-'wp-includes/streams.php',
-// MU
-'README.txt',
-'htaccess.dist',
-'index-install.php',
-'wp-admin/css/mu-rtl.css',
-'wp-admin/css/mu.css',
-'wp-admin/images/site-admin.png',
-'wp-admin/includes/mu.php',
-'wp-admin/wpmu-admin.php',
-'wp-admin/wpmu-blogs.php',
-'wp-admin/wpmu-edit.php',
-'wp-admin/wpmu-options.php',
-'wp-admin/wpmu-themes.php',
-'wp-admin/wpmu-upgrade-site.php',
-'wp-admin/wpmu-users.php',
-'wp-includes/images/wordpress-mu.png',
-'wp-includes/wpmu-default-filters.php',
-'wp-includes/wpmu-functions.php',
-'wpmu-settings.php',
-// 3.0
-'wp-admin/categories.php',
-'wp-admin/edit-category-form.php',
-'wp-admin/edit-page-form.php',
-'wp-admin/edit-pages.php',
-'wp-admin/images/admin-header-footer.png',
-'wp-admin/images/browse-happy.gif',
-'wp-admin/images/ico-add.png',
-'wp-admin/images/ico-close.png',
-'wp-admin/images/ico-edit.png',
-'wp-admin/images/ico-viewpage.png',
-'wp-admin/images/fav-top.png',
-'wp-admin/images/screen-options-left.gif',
-'wp-admin/images/wp-logo-vs.gif',
-'wp-admin/images/wp-logo.gif',
-'wp-admin/import',
-'wp-admin/js/wp-gears.dev.js',
-'wp-admin/js/wp-gears.js',
-'wp-admin/options-misc.php',
-'wp-admin/page-new.php',
-'wp-admin/page.php',
-'wp-admin/rtl.css',
-'wp-admin/rtl.dev.css',
-'wp-admin/update-links.php',
-'wp-admin/wp-admin.css',
-'wp-admin/wp-admin.dev.css',
-'wp-includes/js/codepress',
-'wp-includes/js/codepress/engines/khtml.js',
-'wp-includes/js/codepress/engines/older.js',
-'wp-includes/js/jquery/autocomplete.dev.js',
-'wp-includes/js/jquery/autocomplete.js',
-'wp-includes/js/jquery/interface.js',
-'wp-includes/js/scriptaculous/prototype.js',
-'wp-includes/js/tinymce/wp-tinymce.js',
-// 3.1
-'wp-admin/edit-attachment-rows.php',
-'wp-admin/edit-link-categories.php',
-'wp-admin/edit-link-category-form.php',
-'wp-admin/edit-post-rows.php',
-'wp-admin/images/button-grad-active-vs.png',
-'wp-admin/images/button-grad-vs.png',
-'wp-admin/images/fav-arrow-vs-rtl.gif',
-'wp-admin/images/fav-arrow-vs.gif',
-'wp-admin/images/fav-top-vs.gif',
-'wp-admin/images/list-vs.png',
-'wp-admin/images/screen-options-right-up.gif',
-'wp-admin/images/screen-options-right.gif',
-'wp-admin/images/visit-site-button-grad-vs.gif',
-'wp-admin/images/visit-site-button-grad.gif',
-'wp-admin/link-category.php',
-'wp-admin/sidebar.php',
-'wp-includes/classes.php',
-'wp-includes/js/tinymce/blank.htm',
-'wp-includes/js/tinymce/plugins/media/css/content.css',
-'wp-includes/js/tinymce/plugins/media/img',
-'wp-includes/js/tinymce/plugins/safari',
-// 3.2
-'wp-admin/images/logo-login.gif',
-'wp-admin/images/star.gif',
-'wp-admin/js/list-table.dev.js',
-'wp-admin/js/list-table.js',
-'wp-includes/default-embeds.php',
-'wp-includes/js/tinymce/plugins/wordpress/img/help.gif',
-'wp-includes/js/tinymce/plugins/wordpress/img/more.gif',
-'wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif',
-'wp-includes/js/tinymce/themes/advanced/img/fm.gif',
-'wp-includes/js/tinymce/themes/advanced/img/sflogo.png',
-// 3.3
-'wp-admin/css/colors-classic-rtl.css',
-'wp-admin/css/colors-classic-rtl.dev.css',
-'wp-admin/css/colors-fresh-rtl.css',
-'wp-admin/css/colors-fresh-rtl.dev.css',
-'wp-admin/css/dashboard-rtl.dev.css',
-'wp-admin/css/dashboard.dev.css',
-'wp-admin/css/global-rtl.css',
-'wp-admin/css/global-rtl.dev.css',
-'wp-admin/css/global.css',
-'wp-admin/css/global.dev.css',
-'wp-admin/css/install-rtl.dev.css',
-'wp-admin/css/login-rtl.dev.css',
-'wp-admin/css/login.dev.css',
-'wp-admin/css/ms.css',
-'wp-admin/css/ms.dev.css',
-'wp-admin/css/nav-menu-rtl.css',
-'wp-admin/css/nav-menu-rtl.dev.css',
-'wp-admin/css/nav-menu.css',
-'wp-admin/css/nav-menu.dev.css',
-'wp-admin/css/plugin-install-rtl.css',
-'wp-admin/css/plugin-install-rtl.dev.css',
-'wp-admin/css/plugin-install.css',
-'wp-admin/css/plugin-install.dev.css',
-'wp-admin/css/press-this-rtl.dev.css',
-'wp-admin/css/press-this.dev.css',
-'wp-admin/css/theme-editor-rtl.css',
-'wp-admin/css/theme-editor-rtl.dev.css',
-'wp-admin/css/theme-editor.css',
-'wp-admin/css/theme-editor.dev.css',
-'wp-admin/css/theme-install-rtl.css',
-'wp-admin/css/theme-install-rtl.dev.css',
-'wp-admin/css/theme-install.css',
-'wp-admin/css/theme-install.dev.css',
-'wp-admin/css/widgets-rtl.dev.css',
-'wp-admin/css/widgets.dev.css',
-'wp-admin/includes/internal-linking.php',
-'wp-includes/images/admin-bar-sprite-rtl.png',
-'wp-includes/js/jquery/ui.button.js',
-'wp-includes/js/jquery/ui.core.js',
-'wp-includes/js/jquery/ui.dialog.js',
-'wp-includes/js/jquery/ui.draggable.js',
-'wp-includes/js/jquery/ui.droppable.js',
-'wp-includes/js/jquery/ui.mouse.js',
-'wp-includes/js/jquery/ui.position.js',
-'wp-includes/js/jquery/ui.resizable.js',
-'wp-includes/js/jquery/ui.selectable.js',
-'wp-includes/js/jquery/ui.sortable.js',
-'wp-includes/js/jquery/ui.tabs.js',
-'wp-includes/js/jquery/ui.widget.js',
-'wp-includes/js/l10n.dev.js',
-'wp-includes/js/l10n.js',
-'wp-includes/js/tinymce/plugins/wplink/css',
-'wp-includes/js/tinymce/plugins/wplink/img',
-'wp-includes/js/tinymce/plugins/wplink/js',
-'wp-includes/js/tinymce/themes/advanced/img/wpicons.png',
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png',
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.png',
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif',
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png',
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif',
-// Don't delete, yet: 'wp-rss.php',
-// Don't delete, yet: 'wp-rdf.php',
-// Don't delete, yet: 'wp-rss2.php',
-// Don't delete, yet: 'wp-commentsrss2.php',
-// Don't delete, yet: 'wp-atom.php',
-// Don't delete, yet: 'wp-feed.php',
-// 3.4
-'wp-admin/images/gray-star.png',
-'wp-admin/images/logo-login.png',
-'wp-admin/images/star.png',
-'wp-admin/index-extra.php',
-'wp-admin/network/index-extra.php',
-'wp-admin/user/index-extra.php',
-'wp-admin/images/screenshots/admin-flyouts.png',
-'wp-admin/images/screenshots/coediting.png',
-'wp-admin/images/screenshots/drag-and-drop.png',
-'wp-admin/images/screenshots/help-screen.png',
-'wp-admin/images/screenshots/media-icon.png',
-'wp-admin/images/screenshots/new-feature-pointer.png',
-'wp-admin/images/screenshots/welcome-screen.png',
-'wp-includes/css/editor-buttons.css',
-'wp-includes/css/editor-buttons.dev.css',
-'wp-includes/js/tinymce/plugins/paste/blank.htm',
-'wp-includes/js/tinymce/plugins/wordpress/css',
-'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js',
-'wp-includes/js/tinymce/plugins/wordpress/img/embedded.png',
-'wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif',
-'wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif',
-'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js',
-'wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css',
-'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js',
-'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js',
-'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',
-'wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png',
-'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',
-// Don't delete, yet: 'wp-pass.php',
-// Don't delete, yet: 'wp-register.php',
-// 3.5
-'wp-admin/gears-manifest.php',
-'wp-admin/includes/manifest.php',
-'wp-admin/images/archive-link.png',
-'wp-admin/images/blue-grad.png',
-'wp-admin/images/button-grad-active.png',
-'wp-admin/images/button-grad.png',
-'wp-admin/images/ed-bg-vs.gif',
-'wp-admin/images/ed-bg.gif',
-'wp-admin/images/fade-butt.png',
-'wp-admin/images/fav-arrow-rtl.gif',
-'wp-admin/images/fav-arrow.gif',
-'wp-admin/images/fav-vs.png',
-'wp-admin/images/fav.png',
-'wp-admin/images/gray-grad.png',
-'wp-admin/images/loading-publish.gif',
-'wp-admin/images/logo-ghost.png',
-'wp-admin/images/logo.gif',
-'wp-admin/images/menu-arrow-frame-rtl.png',
-'wp-admin/images/menu-arrow-frame.png',
-'wp-admin/images/menu-arrows.gif',
-'wp-admin/images/menu-bits-rtl-vs.gif',
-'wp-admin/images/menu-bits-rtl.gif',
-'wp-admin/images/menu-bits-vs.gif',
-'wp-admin/images/menu-bits.gif',
-'wp-admin/images/menu-dark-rtl-vs.gif',
-'wp-admin/images/menu-dark-rtl.gif',
-'wp-admin/images/menu-dark-vs.gif',
-'wp-admin/images/menu-dark.gif',
-'wp-admin/images/required.gif',
-'wp-admin/images/screen-options-toggle-vs.gif',
-'wp-admin/images/screen-options-toggle.gif',
-'wp-admin/images/toggle-arrow-rtl.gif',
-'wp-admin/images/toggle-arrow.gif',
-'wp-admin/images/upload-classic.png',
-'wp-admin/images/upload-fresh.png',
-'wp-admin/images/white-grad-active.png',
-'wp-admin/images/white-grad.png',
-'wp-admin/images/widgets-arrow-vs.gif',
-'wp-admin/images/widgets-arrow.gif',
-'wp-admin/images/wpspin_dark.gif',
-'wp-includes/images/upload.png',
-'wp-includes/js/prototype.js',
-'wp-includes/js/scriptaculous',
-'wp-admin/css/wp-admin-rtl.dev.css',
-'wp-admin/css/wp-admin.dev.css',
-'wp-admin/css/media-rtl.dev.css',
-'wp-admin/css/media.dev.css',
-'wp-admin/css/colors-classic.dev.css',
-'wp-admin/css/customize-controls-rtl.dev.css',
-'wp-admin/css/customize-controls.dev.css',
-'wp-admin/css/ie-rtl.dev.css',
-'wp-admin/css/ie.dev.css',
-'wp-admin/css/install.dev.css',
-'wp-admin/css/colors-fresh.dev.css',
-'wp-includes/js/customize-base.dev.js',
-'wp-includes/js/json2.dev.js',
-'wp-includes/js/comment-reply.dev.js',
-'wp-includes/js/customize-preview.dev.js',
-'wp-includes/js/wplink.dev.js',
-'wp-includes/js/tw-sack.dev.js',
-'wp-includes/js/wp-list-revisions.dev.js',
-'wp-includes/js/autosave.dev.js',
-'wp-includes/js/admin-bar.dev.js',
-'wp-includes/js/quicktags.dev.js',
-'wp-includes/js/wp-ajax-response.dev.js',
-'wp-includes/js/wp-pointer.dev.js',
-'wp-includes/js/hoverIntent.dev.js',
-'wp-includes/js/colorpicker.dev.js',
-'wp-includes/js/wp-lists.dev.js',
-'wp-includes/js/customize-loader.dev.js',
-'wp-includes/js/jquery/jquery.table-hotkeys.dev.js',
-'wp-includes/js/jquery/jquery.color.dev.js',
-'wp-includes/js/jquery/jquery.color.js',
-'wp-includes/js/jquery/jquery.hotkeys.dev.js',
-'wp-includes/js/jquery/jquery.form.dev.js',
-'wp-includes/js/jquery/suggest.dev.js',
-'wp-admin/js/xfn.dev.js',
-'wp-admin/js/set-post-thumbnail.dev.js',
-'wp-admin/js/comment.dev.js',
-'wp-admin/js/theme.dev.js',
-'wp-admin/js/cat.dev.js',
-'wp-admin/js/password-strength-meter.dev.js',
-'wp-admin/js/user-profile.dev.js',
-'wp-admin/js/theme-preview.dev.js',
-'wp-admin/js/post.dev.js',
-'wp-admin/js/media-upload.dev.js',
-'wp-admin/js/word-count.dev.js',
-'wp-admin/js/plugin-install.dev.js',
-'wp-admin/js/edit-comments.dev.js',
-'wp-admin/js/media-gallery.dev.js',
-'wp-admin/js/custom-fields.dev.js',
-'wp-admin/js/custom-background.dev.js',
-'wp-admin/js/common.dev.js',
-'wp-admin/js/inline-edit-tax.dev.js',
-'wp-admin/js/gallery.dev.js',
-'wp-admin/js/utils.dev.js',
-'wp-admin/js/widgets.dev.js',
-'wp-admin/js/wp-fullscreen.dev.js',
-'wp-admin/js/nav-menu.dev.js',
-'wp-admin/js/dashboard.dev.js',
-'wp-admin/js/link.dev.js',
-'wp-admin/js/user-suggest.dev.js',
-'wp-admin/js/postbox.dev.js',
-'wp-admin/js/tags.dev.js',
-'wp-admin/js/image-edit.dev.js',
-'wp-admin/js/media.dev.js',
-'wp-admin/js/customize-controls.dev.js',
-'wp-admin/js/inline-edit-post.dev.js',
-'wp-admin/js/categories.dev.js',
-'wp-admin/js/editor.dev.js',
-'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js',
-'wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js',
-'wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js',
-'wp-includes/js/plupload/handlers.dev.js',
-'wp-includes/js/plupload/wp-plupload.dev.js',
-'wp-includes/js/swfupload/handlers.dev.js',
-'wp-includes/js/jcrop/jquery.Jcrop.dev.js',
-'wp-includes/js/jcrop/jquery.Jcrop.js',
-'wp-includes/js/jcrop/jquery.Jcrop.css',
-'wp-includes/js/imgareaselect/jquery.imgareaselect.dev.js',
-'wp-includes/css/wp-pointer.dev.css',
-'wp-includes/css/editor.dev.css',
-'wp-includes/css/jquery-ui-dialog.dev.css',
-'wp-includes/css/admin-bar-rtl.dev.css',
-'wp-includes/css/admin-bar.dev.css',
-'wp-includes/js/jquery/ui/jquery.effects.clip.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.scale.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.blind.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.core.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.shake.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.fade.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.explode.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.slide.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.drop.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.highlight.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.bounce.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js',
-'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',
-'wp-admin/images/screenshots/captions-1.png',
-'wp-admin/images/screenshots/captions-2.png',
-'wp-admin/images/screenshots/flex-header-1.png',
-'wp-admin/images/screenshots/flex-header-2.png',
-'wp-admin/images/screenshots/flex-header-3.png',
-'wp-admin/images/screenshots/flex-header-media-library.png',
-'wp-admin/images/screenshots/theme-customizer.png',
-'wp-admin/images/screenshots/twitter-embed-1.png',
-'wp-admin/images/screenshots/twitter-embed-2.png',
-'wp-admin/js/utils.js',
-'wp-admin/options-privacy.php',
-'wp-app.php',
-'wp-includes/class-wp-atom-server.php',
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
-// 3.5.2
-'wp-includes/js/swfupload/swfupload-all.js',
-// 3.6
-'wp-admin/js/revisions-js.php',
-'wp-admin/images/screenshots',
-'wp-admin/js/categories.js',
-'wp-admin/js/categories.min.js',
-'wp-admin/js/custom-fields.js',
-'wp-admin/js/custom-fields.min.js',
-// 3.7
-'wp-admin/js/cat.js',
-'wp-admin/js/cat.min.js',
-'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.min.js',
-// 3.8
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif',
-'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif',
-'wp-includes/js/thickbox/tb-close-2x.png',
-'wp-includes/js/thickbox/tb-close.png',
-'wp-includes/images/wpmini-blue-2x.png',
-'wp-includes/images/wpmini-blue.png',
-'wp-admin/css/colors-fresh.css',
-'wp-admin/css/colors-classic.css',
-'wp-admin/css/colors-fresh.min.css',
-'wp-admin/css/colors-classic.min.css',
-'wp-admin/js/about.min.js',
-'wp-admin/js/about.js',
-'wp-admin/images/arrows-dark-vs-2x.png',
-'wp-admin/images/wp-logo-vs.png',
-'wp-admin/images/arrows-dark-vs.png',
-'wp-admin/images/wp-logo.png',
-'wp-admin/images/arrows-pr.png',
-'wp-admin/images/arrows-dark.png',
-'wp-admin/images/press-this.png',
-'wp-admin/images/press-this-2x.png',
-'wp-admin/images/arrows-vs-2x.png',
-'wp-admin/images/welcome-icons.png',
-'wp-admin/images/wp-logo-2x.png',
-'wp-admin/images/stars-rtl-2x.png',
-'wp-admin/images/arrows-dark-2x.png',
-'wp-admin/images/arrows-pr-2x.png',
-'wp-admin/images/menu-shadow-rtl.png',
-'wp-admin/images/arrows-vs.png',
-'wp-admin/images/about-search-2x.png',
-'wp-admin/images/bubble_bg-rtl-2x.gif',
-'wp-admin/images/wp-badge-2x.png',
-'wp-admin/images/wordpress-logo-2x.png',
-'wp-admin/images/bubble_bg-rtl.gif',
-'wp-admin/images/wp-badge.png',
-'wp-admin/images/menu-shadow.png',
-'wp-admin/images/about-globe-2x.png',
-'wp-admin/images/welcome-icons-2x.png',
-'wp-admin/images/stars-rtl.png',
-'wp-admin/images/wp-logo-vs-2x.png',
-'wp-admin/images/about-updates-2x.png',
-// 3.9
-'wp-admin/css/colors.css',
-'wp-admin/css/colors.min.css',
-'wp-admin/css/colors-rtl.css',
-'wp-admin/css/colors-rtl.min.css',
-// Following files added back in 4.5 see #36083
-// 'wp-admin/css/media-rtl.min.css',
-// 'wp-admin/css/media.min.css',
-// 'wp-admin/css/farbtastic-rtl.min.css',
-'wp-admin/images/lock-2x.png',
-'wp-admin/images/lock.png',
-'wp-admin/js/theme-preview.js',
-'wp-admin/js/theme-install.min.js',
-'wp-admin/js/theme-install.js',
-'wp-admin/js/theme-preview.min.js',
-'wp-includes/js/plupload/plupload.html4.js',
-'wp-includes/js/plupload/plupload.html5.js',
-'wp-includes/js/plupload/changelog.txt',
-'wp-includes/js/plupload/plupload.silverlight.js',
-'wp-includes/js/plupload/plupload.flash.js',
-// Added back in 4.9 [41328], see #41755
-// 'wp-includes/js/plupload/plupload.js',
-'wp-includes/js/tinymce/plugins/spellchecker',
-'wp-includes/js/tinymce/plugins/inlinepopups',
-'wp-includes/js/tinymce/plugins/media/js',
-'wp-includes/js/tinymce/plugins/media/css',
-'wp-includes/js/tinymce/plugins/wordpress/img',
-'wp-includes/js/tinymce/plugins/wpdialogs/js',
-'wp-includes/js/tinymce/plugins/wpeditimage/img',
-'wp-includes/js/tinymce/plugins/wpeditimage/js',
-'wp-includes/js/tinymce/plugins/wpeditimage/css',
-'wp-includes/js/tinymce/plugins/wpgallery/img',
-'wp-includes/js/tinymce/plugins/wpfullscreen/css',
-'wp-includes/js/tinymce/plugins/paste/js',
-'wp-includes/js/tinymce/themes/advanced',
-'wp-includes/js/tinymce/tiny_mce.js',
-'wp-includes/js/tinymce/mark_loaded_src.js',
-'wp-includes/js/tinymce/wp-tinymce-schema.js',
-'wp-includes/js/tinymce/plugins/media/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/media/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/media/media.htm',
-'wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/wpview/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/directionality/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/wpeditimage/editimage.html',
-'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm',
-'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/wplink/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/paste/editor_plugin.js',
-'wp-includes/js/tinymce/plugins/paste/pasteword.htm',
-'wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js',
-'wp-includes/js/tinymce/plugins/paste/pastetext.htm',
-'wp-includes/js/tinymce/langs/wp-langs.php',
-// 4.1
-'wp-includes/js/jquery/ui/jquery.ui.accordion.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.button.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.core.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.dialog.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.draggable.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.droppable.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-blind.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-bounce.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-clip.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-drop.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-explode.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-fade.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-fold.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-highlight.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-pulsate.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-scale.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-shake.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-slide.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect-transfer.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.effect.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.menu.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.mouse.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.position.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.resizable.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.selectable.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.slider.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.sortable.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.spinner.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.tabs.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js',
-'wp-includes/js/jquery/ui/jquery.ui.widget.min.js',
-'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png',
-// 4.3
-'wp-admin/js/wp-fullscreen.js',
-'wp-admin/js/wp-fullscreen.min.js',
-'wp-includes/js/tinymce/wp-mce-help.php',
-'wp-includes/js/tinymce/plugins/wpfullscreen',
-// 4.5
-'wp-includes/theme-compat/comments-popup.php',
-// 4.6
-'wp-admin/includes/class-wp-automatic-upgrader.php', // Wrong file name, see #37628.
-// 4.8
-'wp-includes/js/tinymce/plugins/wpembed',
-'wp-includes/js/tinymce/plugins/media/moxieplayer.swf',
-'wp-includes/js/tinymce/skins/lightgray/fonts/readme.md',
-'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.json',
-'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.json',
-'wp-includes/js/tinymce/skins/lightgray/skin.ie7.min.css',
-// 4.9
-'wp-admin/css/press-this-editor-rtl.css',
-'wp-admin/css/press-this-editor-rtl.min.css',
-'wp-admin/css/press-this-editor.css',
-'wp-admin/css/press-this-editor.min.css',
-'wp-admin/css/press-this-rtl.css',
-'wp-admin/css/press-this-rtl.min.css',
-'wp-admin/css/press-this.css',
-'wp-admin/css/press-this.min.css',
-'wp-admin/includes/class-wp-press-this.php',
-'wp-admin/js/bookmarklet.js',
-'wp-admin/js/bookmarklet.min.js',
-'wp-admin/js/press-this.js',
-'wp-admin/js/press-this.min.js',
-'wp-includes/js/mediaelement/background.png',
-'wp-includes/js/mediaelement/bigplay.png',
-'wp-includes/js/mediaelement/bigplay.svg',
-'wp-includes/js/mediaelement/controls.png',
-'wp-includes/js/mediaelement/controls.svg',
-'wp-includes/js/mediaelement/flashmediaelement.swf',
-'wp-includes/js/mediaelement/froogaloop.min.js',
-'wp-includes/js/mediaelement/jumpforward.png',
-'wp-includes/js/mediaelement/loading.gif',
-'wp-includes/js/mediaelement/silverlightmediaelement.xap',
-'wp-includes/js/mediaelement/skipback.png',
-'wp-includes/js/plupload/plupload.flash.swf',
-'wp-includes/js/plupload/plupload.full.min.js',
-'wp-includes/js/plupload/plupload.silverlight.xap',
-'wp-includes/js/swfupload/plugins',
-'wp-includes/js/swfupload/swfupload.swf',
+	// 2.0
+	'wp-admin/import-b2.php',
+	'wp-admin/import-blogger.php',
+	'wp-admin/import-greymatter.php',
+	'wp-admin/import-livejournal.php',
+	'wp-admin/import-mt.php',
+	'wp-admin/import-rss.php',
+	'wp-admin/import-textpattern.php',
+	'wp-admin/quicktags.js',
+	'wp-images/fade-butt.png',
+	'wp-images/get-firefox.png',
+	'wp-images/header-shadow.png',
+	'wp-images/smilies',
+	'wp-images/wp-small.png',
+	'wp-images/wpminilogo.png',
+	'wp.php',
+	// 2.0.8
+	'wp-includes/js/tinymce/plugins/inlinepopups/readme.txt',
+	// 2.1
+	'wp-admin/edit-form-ajax-cat.php',
+	'wp-admin/execute-pings.php',
+	'wp-admin/inline-uploading.php',
+	'wp-admin/link-categories.php',
+	'wp-admin/list-manipulation.js',
+	'wp-admin/list-manipulation.php',
+	'wp-includes/comment-functions.php',
+	'wp-includes/feed-functions.php',
+	'wp-includes/functions-compat.php',
+	'wp-includes/functions-formatting.php',
+	'wp-includes/functions-post.php',
+	'wp-includes/js/dbx-key.js',
+	'wp-includes/js/tinymce/plugins/autosave/langs/cs.js',
+	'wp-includes/js/tinymce/plugins/autosave/langs/sv.js',
+	'wp-includes/links.php',
+	'wp-includes/pluggable-functions.php',
+	'wp-includes/template-functions-author.php',
+	'wp-includes/template-functions-category.php',
+	'wp-includes/template-functions-general.php',
+	'wp-includes/template-functions-links.php',
+	'wp-includes/template-functions-post.php',
+	'wp-includes/wp-l10n.php',
+	// 2.2
+	'wp-admin/cat-js.php',
+	'wp-admin/import/b2.php',
+	'wp-includes/js/autosave-js.php',
+	'wp-includes/js/list-manipulation-js.php',
+	'wp-includes/js/wp-ajax-js.php',
+	// 2.3
+	'wp-admin/admin-db.php',
+	'wp-admin/cat.js',
+	'wp-admin/categories.js',
+	'wp-admin/custom-fields.js',
+	'wp-admin/dbx-admin-key.js',
+	'wp-admin/edit-comments.js',
+	'wp-admin/install-rtl.css',
+	'wp-admin/install.css',
+	'wp-admin/upgrade-schema.php',
+	'wp-admin/upload-functions.php',
+	'wp-admin/upload-rtl.css',
+	'wp-admin/upload.css',
+	'wp-admin/upload.js',
+	'wp-admin/users.js',
+	'wp-admin/widgets-rtl.css',
+	'wp-admin/widgets.css',
+	'wp-admin/xfn.js',
+	'wp-includes/js/tinymce/license.html',
+	// 2.5
+	'wp-admin/css/upload.css',
+	'wp-admin/images/box-bg-left.gif',
+	'wp-admin/images/box-bg-right.gif',
+	'wp-admin/images/box-bg.gif',
+	'wp-admin/images/box-butt-left.gif',
+	'wp-admin/images/box-butt-right.gif',
+	'wp-admin/images/box-butt.gif',
+	'wp-admin/images/box-head-left.gif',
+	'wp-admin/images/box-head-right.gif',
+	'wp-admin/images/box-head.gif',
+	'wp-admin/images/heading-bg.gif',
+	'wp-admin/images/login-bkg-bottom.gif',
+	'wp-admin/images/login-bkg-tile.gif',
+	'wp-admin/images/notice.gif',
+	'wp-admin/images/toggle.gif',
+	'wp-admin/includes/upload.php',
+	'wp-admin/js/dbx-admin-key.js',
+	'wp-admin/js/link-cat.js',
+	'wp-admin/profile-update.php',
+	'wp-admin/templates.php',
+	'wp-includes/images/wlw/WpComments.png',
+	'wp-includes/images/wlw/WpIcon.png',
+	'wp-includes/images/wlw/WpWatermark.png',
+	'wp-includes/js/dbx.js',
+	'wp-includes/js/fat.js',
+	'wp-includes/js/list-manipulation.js',
+	'wp-includes/js/tinymce/langs/en.js',
+	'wp-includes/js/tinymce/plugins/autosave/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/autosave/langs',
+	'wp-includes/js/tinymce/plugins/directionality/images',
+	'wp-includes/js/tinymce/plugins/directionality/langs',
+	'wp-includes/js/tinymce/plugins/inlinepopups/css',
+	'wp-includes/js/tinymce/plugins/inlinepopups/images',
+	'wp-includes/js/tinymce/plugins/inlinepopups/jscripts',
+	'wp-includes/js/tinymce/plugins/paste/images',
+	'wp-includes/js/tinymce/plugins/paste/jscripts',
+	'wp-includes/js/tinymce/plugins/paste/langs',
+	'wp-includes/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php',
+	'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php',
+	'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php',
+	'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php',
+	'wp-includes/js/tinymce/plugins/spellchecker/css/spellchecker.css',
+	'wp-includes/js/tinymce/plugins/spellchecker/images',
+	'wp-includes/js/tinymce/plugins/spellchecker/langs',
+	'wp-includes/js/tinymce/plugins/spellchecker/tinyspell.php',
+	'wp-includes/js/tinymce/plugins/wordpress/images',
+	'wp-includes/js/tinymce/plugins/wordpress/langs',
+	'wp-includes/js/tinymce/plugins/wordpress/wordpress.css',
+	'wp-includes/js/tinymce/plugins/wphelp',
+	'wp-includes/js/tinymce/themes/advanced/css',
+	'wp-includes/js/tinymce/themes/advanced/images',
+	'wp-includes/js/tinymce/themes/advanced/jscripts',
+	'wp-includes/js/tinymce/themes/advanced/langs',
+	// 2.5.1
+	'wp-includes/js/tinymce/tiny_mce_gzip.php',
+	// 2.6
+	'wp-admin/bookmarklet.php',
+	'wp-includes/js/jquery/jquery.dimensions.min.js',
+	'wp-includes/js/tinymce/plugins/wordpress/popups.css',
+	'wp-includes/js/wp-ajax.js',
+	// 2.7
+	'wp-admin/css/press-this-ie-rtl.css',
+	'wp-admin/css/press-this-ie.css',
+	'wp-admin/css/upload-rtl.css',
+	'wp-admin/edit-form.php',
+	'wp-admin/images/comment-pill.gif',
+	'wp-admin/images/comment-stalk-classic.gif',
+	'wp-admin/images/comment-stalk-fresh.gif',
+	'wp-admin/images/comment-stalk-rtl.gif',
+	'wp-admin/images/del.png',
+	'wp-admin/images/gear.png',
+	'wp-admin/images/media-button-gallery.gif',
+	'wp-admin/images/media-buttons.gif',
+	'wp-admin/images/postbox-bg.gif',
+	'wp-admin/images/tab.png',
+	'wp-admin/images/tail.gif',
+	'wp-admin/js/forms.js',
+	'wp-admin/js/upload.js',
+	'wp-admin/link-import.php',
+	'wp-includes/images/audio.png',
+	'wp-includes/images/css.png',
+	'wp-includes/images/default.png',
+	'wp-includes/images/doc.png',
+	'wp-includes/images/exe.png',
+	'wp-includes/images/html.png',
+	'wp-includes/images/js.png',
+	'wp-includes/images/pdf.png',
+	'wp-includes/images/swf.png',
+	'wp-includes/images/tar.png',
+	'wp-includes/images/text.png',
+	'wp-includes/images/video.png',
+	'wp-includes/images/zip.png',
+	'wp-includes/js/tinymce/tiny_mce_config.php',
+	'wp-includes/js/tinymce/tiny_mce_ext.js',
+	// 2.8
+	'wp-admin/js/users.js',
+	'wp-includes/js/swfupload/plugins/swfupload.documentready.js',
+	'wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js',
+	'wp-includes/js/swfupload/swfupload_f9.swf',
+	'wp-includes/js/tinymce/plugins/autosave',
+	'wp-includes/js/tinymce/plugins/paste/css',
+	'wp-includes/js/tinymce/utils/mclayer.js',
+	'wp-includes/js/tinymce/wordpress.css',
+	// 2.8.5
+	'wp-admin/import/btt.php',
+	'wp-admin/import/jkw.php',
+	// 2.9
+	'wp-admin/js/page.dev.js',
+	'wp-admin/js/page.js',
+	'wp-admin/js/set-post-thumbnail-handler.dev.js',
+	'wp-admin/js/set-post-thumbnail-handler.js',
+	'wp-admin/js/slug.dev.js',
+	'wp-admin/js/slug.js',
+	'wp-includes/gettext.php',
+	'wp-includes/js/tinymce/plugins/wordpress/js',
+	'wp-includes/streams.php',
+	// MU
+	'README.txt',
+	'htaccess.dist',
+	'index-install.php',
+	'wp-admin/css/mu-rtl.css',
+	'wp-admin/css/mu.css',
+	'wp-admin/images/site-admin.png',
+	'wp-admin/includes/mu.php',
+	'wp-admin/wpmu-admin.php',
+	'wp-admin/wpmu-blogs.php',
+	'wp-admin/wpmu-edit.php',
+	'wp-admin/wpmu-options.php',
+	'wp-admin/wpmu-themes.php',
+	'wp-admin/wpmu-upgrade-site.php',
+	'wp-admin/wpmu-users.php',
+	'wp-includes/images/wordpress-mu.png',
+	'wp-includes/wpmu-default-filters.php',
+	'wp-includes/wpmu-functions.php',
+	'wpmu-settings.php',
+	// 3.0
+	'wp-admin/categories.php',
+	'wp-admin/edit-category-form.php',
+	'wp-admin/edit-page-form.php',
+	'wp-admin/edit-pages.php',
+	'wp-admin/images/admin-header-footer.png',
+	'wp-admin/images/browse-happy.gif',
+	'wp-admin/images/ico-add.png',
+	'wp-admin/images/ico-close.png',
+	'wp-admin/images/ico-edit.png',
+	'wp-admin/images/ico-viewpage.png',
+	'wp-admin/images/fav-top.png',
+	'wp-admin/images/screen-options-left.gif',
+	'wp-admin/images/wp-logo-vs.gif',
+	'wp-admin/images/wp-logo.gif',
+	'wp-admin/import',
+	'wp-admin/js/wp-gears.dev.js',
+	'wp-admin/js/wp-gears.js',
+	'wp-admin/options-misc.php',
+	'wp-admin/page-new.php',
+	'wp-admin/page.php',
+	'wp-admin/rtl.css',
+	'wp-admin/rtl.dev.css',
+	'wp-admin/update-links.php',
+	'wp-admin/wp-admin.css',
+	'wp-admin/wp-admin.dev.css',
+	'wp-includes/js/codepress',
+	'wp-includes/js/codepress/engines/khtml.js',
+	'wp-includes/js/codepress/engines/older.js',
+	'wp-includes/js/jquery/autocomplete.dev.js',
+	'wp-includes/js/jquery/autocomplete.js',
+	'wp-includes/js/jquery/interface.js',
+	'wp-includes/js/scriptaculous/prototype.js',
+	'wp-includes/js/tinymce/wp-tinymce.js',
+	// 3.1
+	'wp-admin/edit-attachment-rows.php',
+	'wp-admin/edit-link-categories.php',
+	'wp-admin/edit-link-category-form.php',
+	'wp-admin/edit-post-rows.php',
+	'wp-admin/images/button-grad-active-vs.png',
+	'wp-admin/images/button-grad-vs.png',
+	'wp-admin/images/fav-arrow-vs-rtl.gif',
+	'wp-admin/images/fav-arrow-vs.gif',
+	'wp-admin/images/fav-top-vs.gif',
+	'wp-admin/images/list-vs.png',
+	'wp-admin/images/screen-options-right-up.gif',
+	'wp-admin/images/screen-options-right.gif',
+	'wp-admin/images/visit-site-button-grad-vs.gif',
+	'wp-admin/images/visit-site-button-grad.gif',
+	'wp-admin/link-category.php',
+	'wp-admin/sidebar.php',
+	'wp-includes/classes.php',
+	'wp-includes/js/tinymce/blank.htm',
+	'wp-includes/js/tinymce/plugins/media/css/content.css',
+	'wp-includes/js/tinymce/plugins/media/img',
+	'wp-includes/js/tinymce/plugins/safari',
+	// 3.2
+	'wp-admin/images/logo-login.gif',
+	'wp-admin/images/star.gif',
+	'wp-admin/js/list-table.dev.js',
+	'wp-admin/js/list-table.js',
+	'wp-includes/default-embeds.php',
+	'wp-includes/js/tinymce/plugins/wordpress/img/help.gif',
+	'wp-includes/js/tinymce/plugins/wordpress/img/more.gif',
+	'wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif',
+	'wp-includes/js/tinymce/themes/advanced/img/fm.gif',
+	'wp-includes/js/tinymce/themes/advanced/img/sflogo.png',
+	// 3.3
+	'wp-admin/css/colors-classic-rtl.css',
+	'wp-admin/css/colors-classic-rtl.dev.css',
+	'wp-admin/css/colors-fresh-rtl.css',
+	'wp-admin/css/colors-fresh-rtl.dev.css',
+	'wp-admin/css/dashboard-rtl.dev.css',
+	'wp-admin/css/dashboard.dev.css',
+	'wp-admin/css/global-rtl.css',
+	'wp-admin/css/global-rtl.dev.css',
+	'wp-admin/css/global.css',
+	'wp-admin/css/global.dev.css',
+	'wp-admin/css/install-rtl.dev.css',
+	'wp-admin/css/login-rtl.dev.css',
+	'wp-admin/css/login.dev.css',
+	'wp-admin/css/ms.css',
+	'wp-admin/css/ms.dev.css',
+	'wp-admin/css/nav-menu-rtl.css',
+	'wp-admin/css/nav-menu-rtl.dev.css',
+	'wp-admin/css/nav-menu.css',
+	'wp-admin/css/nav-menu.dev.css',
+	'wp-admin/css/plugin-install-rtl.css',
+	'wp-admin/css/plugin-install-rtl.dev.css',
+	'wp-admin/css/plugin-install.css',
+	'wp-admin/css/plugin-install.dev.css',
+	'wp-admin/css/press-this-rtl.dev.css',
+	'wp-admin/css/press-this.dev.css',
+	'wp-admin/css/theme-editor-rtl.css',
+	'wp-admin/css/theme-editor-rtl.dev.css',
+	'wp-admin/css/theme-editor.css',
+	'wp-admin/css/theme-editor.dev.css',
+	'wp-admin/css/theme-install-rtl.css',
+	'wp-admin/css/theme-install-rtl.dev.css',
+	'wp-admin/css/theme-install.css',
+	'wp-admin/css/theme-install.dev.css',
+	'wp-admin/css/widgets-rtl.dev.css',
+	'wp-admin/css/widgets.dev.css',
+	'wp-admin/includes/internal-linking.php',
+	'wp-includes/images/admin-bar-sprite-rtl.png',
+	'wp-includes/js/jquery/ui.button.js',
+	'wp-includes/js/jquery/ui.core.js',
+	'wp-includes/js/jquery/ui.dialog.js',
+	'wp-includes/js/jquery/ui.draggable.js',
+	'wp-includes/js/jquery/ui.droppable.js',
+	'wp-includes/js/jquery/ui.mouse.js',
+	'wp-includes/js/jquery/ui.position.js',
+	'wp-includes/js/jquery/ui.resizable.js',
+	'wp-includes/js/jquery/ui.selectable.js',
+	'wp-includes/js/jquery/ui.sortable.js',
+	'wp-includes/js/jquery/ui.tabs.js',
+	'wp-includes/js/jquery/ui.widget.js',
+	'wp-includes/js/l10n.dev.js',
+	'wp-includes/js/l10n.js',
+	'wp-includes/js/tinymce/plugins/wplink/css',
+	'wp-includes/js/tinymce/plugins/wplink/img',
+	'wp-includes/js/tinymce/plugins/wplink/js',
+	'wp-includes/js/tinymce/themes/advanced/img/wpicons.png',
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png',
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.png',
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif',
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png',
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif',
+	// Don't delete, yet: 'wp-rss.php',
+	// Don't delete, yet: 'wp-rdf.php',
+	// Don't delete, yet: 'wp-rss2.php',
+	// Don't delete, yet: 'wp-commentsrss2.php',
+	// Don't delete, yet: 'wp-atom.php',
+	// Don't delete, yet: 'wp-feed.php',
+	// 3.4
+	'wp-admin/images/gray-star.png',
+	'wp-admin/images/logo-login.png',
+	'wp-admin/images/star.png',
+	'wp-admin/index-extra.php',
+	'wp-admin/network/index-extra.php',
+	'wp-admin/user/index-extra.php',
+	'wp-admin/images/screenshots/admin-flyouts.png',
+	'wp-admin/images/screenshots/coediting.png',
+	'wp-admin/images/screenshots/drag-and-drop.png',
+	'wp-admin/images/screenshots/help-screen.png',
+	'wp-admin/images/screenshots/media-icon.png',
+	'wp-admin/images/screenshots/new-feature-pointer.png',
+	'wp-admin/images/screenshots/welcome-screen.png',
+	'wp-includes/css/editor-buttons.css',
+	'wp-includes/css/editor-buttons.dev.css',
+	'wp-includes/js/tinymce/plugins/paste/blank.htm',
+	'wp-includes/js/tinymce/plugins/wordpress/css',
+	'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js',
+	'wp-includes/js/tinymce/plugins/wordpress/img/embedded.png',
+	'wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif',
+	'wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif',
+	'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js',
+	'wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css',
+	'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js',
+	'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js',
+	'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',
+	'wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png',
+	'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',
+	// Don't delete, yet: 'wp-pass.php',
+	// Don't delete, yet: 'wp-register.php',
+	// 3.5
+	'wp-admin/gears-manifest.php',
+	'wp-admin/includes/manifest.php',
+	'wp-admin/images/archive-link.png',
+	'wp-admin/images/blue-grad.png',
+	'wp-admin/images/button-grad-active.png',
+	'wp-admin/images/button-grad.png',
+	'wp-admin/images/ed-bg-vs.gif',
+	'wp-admin/images/ed-bg.gif',
+	'wp-admin/images/fade-butt.png',
+	'wp-admin/images/fav-arrow-rtl.gif',
+	'wp-admin/images/fav-arrow.gif',
+	'wp-admin/images/fav-vs.png',
+	'wp-admin/images/fav.png',
+	'wp-admin/images/gray-grad.png',
+	'wp-admin/images/loading-publish.gif',
+	'wp-admin/images/logo-ghost.png',
+	'wp-admin/images/logo.gif',
+	'wp-admin/images/menu-arrow-frame-rtl.png',
+	'wp-admin/images/menu-arrow-frame.png',
+	'wp-admin/images/menu-arrows.gif',
+	'wp-admin/images/menu-bits-rtl-vs.gif',
+	'wp-admin/images/menu-bits-rtl.gif',
+	'wp-admin/images/menu-bits-vs.gif',
+	'wp-admin/images/menu-bits.gif',
+	'wp-admin/images/menu-dark-rtl-vs.gif',
+	'wp-admin/images/menu-dark-rtl.gif',
+	'wp-admin/images/menu-dark-vs.gif',
+	'wp-admin/images/menu-dark.gif',
+	'wp-admin/images/required.gif',
+	'wp-admin/images/screen-options-toggle-vs.gif',
+	'wp-admin/images/screen-options-toggle.gif',
+	'wp-admin/images/toggle-arrow-rtl.gif',
+	'wp-admin/images/toggle-arrow.gif',
+	'wp-admin/images/upload-classic.png',
+	'wp-admin/images/upload-fresh.png',
+	'wp-admin/images/white-grad-active.png',
+	'wp-admin/images/white-grad.png',
+	'wp-admin/images/widgets-arrow-vs.gif',
+	'wp-admin/images/widgets-arrow.gif',
+	'wp-admin/images/wpspin_dark.gif',
+	'wp-includes/images/upload.png',
+	'wp-includes/js/prototype.js',
+	'wp-includes/js/scriptaculous',
+	'wp-admin/css/wp-admin-rtl.dev.css',
+	'wp-admin/css/wp-admin.dev.css',
+	'wp-admin/css/media-rtl.dev.css',
+	'wp-admin/css/media.dev.css',
+	'wp-admin/css/colors-classic.dev.css',
+	'wp-admin/css/customize-controls-rtl.dev.css',
+	'wp-admin/css/customize-controls.dev.css',
+	'wp-admin/css/ie-rtl.dev.css',
+	'wp-admin/css/ie.dev.css',
+	'wp-admin/css/install.dev.css',
+	'wp-admin/css/colors-fresh.dev.css',
+	'wp-includes/js/customize-base.dev.js',
+	'wp-includes/js/json2.dev.js',
+	'wp-includes/js/comment-reply.dev.js',
+	'wp-includes/js/customize-preview.dev.js',
+	'wp-includes/js/wplink.dev.js',
+	'wp-includes/js/tw-sack.dev.js',
+	'wp-includes/js/wp-list-revisions.dev.js',
+	'wp-includes/js/autosave.dev.js',
+	'wp-includes/js/admin-bar.dev.js',
+	'wp-includes/js/quicktags.dev.js',
+	'wp-includes/js/wp-ajax-response.dev.js',
+	'wp-includes/js/wp-pointer.dev.js',
+	'wp-includes/js/hoverIntent.dev.js',
+	'wp-includes/js/colorpicker.dev.js',
+	'wp-includes/js/wp-lists.dev.js',
+	'wp-includes/js/customize-loader.dev.js',
+	'wp-includes/js/jquery/jquery.table-hotkeys.dev.js',
+	'wp-includes/js/jquery/jquery.color.dev.js',
+	'wp-includes/js/jquery/jquery.color.js',
+	'wp-includes/js/jquery/jquery.hotkeys.dev.js',
+	'wp-includes/js/jquery/jquery.form.dev.js',
+	'wp-includes/js/jquery/suggest.dev.js',
+	'wp-admin/js/xfn.dev.js',
+	'wp-admin/js/set-post-thumbnail.dev.js',
+	'wp-admin/js/comment.dev.js',
+	'wp-admin/js/theme.dev.js',
+	'wp-admin/js/cat.dev.js',
+	'wp-admin/js/password-strength-meter.dev.js',
+	'wp-admin/js/user-profile.dev.js',
+	'wp-admin/js/theme-preview.dev.js',
+	'wp-admin/js/post.dev.js',
+	'wp-admin/js/media-upload.dev.js',
+	'wp-admin/js/word-count.dev.js',
+	'wp-admin/js/plugin-install.dev.js',
+	'wp-admin/js/edit-comments.dev.js',
+	'wp-admin/js/media-gallery.dev.js',
+	'wp-admin/js/custom-fields.dev.js',
+	'wp-admin/js/custom-background.dev.js',
+	'wp-admin/js/common.dev.js',
+	'wp-admin/js/inline-edit-tax.dev.js',
+	'wp-admin/js/gallery.dev.js',
+	'wp-admin/js/utils.dev.js',
+	'wp-admin/js/widgets.dev.js',
+	'wp-admin/js/wp-fullscreen.dev.js',
+	'wp-admin/js/nav-menu.dev.js',
+	'wp-admin/js/dashboard.dev.js',
+	'wp-admin/js/link.dev.js',
+	'wp-admin/js/user-suggest.dev.js',
+	'wp-admin/js/postbox.dev.js',
+	'wp-admin/js/tags.dev.js',
+	'wp-admin/js/image-edit.dev.js',
+	'wp-admin/js/media.dev.js',
+	'wp-admin/js/customize-controls.dev.js',
+	'wp-admin/js/inline-edit-post.dev.js',
+	'wp-admin/js/categories.dev.js',
+	'wp-admin/js/editor.dev.js',
+	'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js',
+	'wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js',
+	'wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js',
+	'wp-includes/js/plupload/handlers.dev.js',
+	'wp-includes/js/plupload/wp-plupload.dev.js',
+	'wp-includes/js/swfupload/handlers.dev.js',
+	'wp-includes/js/jcrop/jquery.Jcrop.dev.js',
+	'wp-includes/js/jcrop/jquery.Jcrop.js',
+	'wp-includes/js/jcrop/jquery.Jcrop.css',
+	'wp-includes/js/imgareaselect/jquery.imgareaselect.dev.js',
+	'wp-includes/css/wp-pointer.dev.css',
+	'wp-includes/css/editor.dev.css',
+	'wp-includes/css/jquery-ui-dialog.dev.css',
+	'wp-includes/css/admin-bar-rtl.dev.css',
+	'wp-includes/css/admin-bar.dev.css',
+	'wp-includes/js/jquery/ui/jquery.effects.clip.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.scale.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.blind.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.core.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.shake.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.fade.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.explode.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.slide.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.drop.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.highlight.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.bounce.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js',
+	'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',
+	'wp-admin/images/screenshots/captions-1.png',
+	'wp-admin/images/screenshots/captions-2.png',
+	'wp-admin/images/screenshots/flex-header-1.png',
+	'wp-admin/images/screenshots/flex-header-2.png',
+	'wp-admin/images/screenshots/flex-header-3.png',
+	'wp-admin/images/screenshots/flex-header-media-library.png',
+	'wp-admin/images/screenshots/theme-customizer.png',
+	'wp-admin/images/screenshots/twitter-embed-1.png',
+	'wp-admin/images/screenshots/twitter-embed-2.png',
+	'wp-admin/js/utils.js',
+	'wp-admin/options-privacy.php',
+	'wp-app.php',
+	'wp-includes/class-wp-atom-server.php',
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
+	// 3.5.2
+	'wp-includes/js/swfupload/swfupload-all.js',
+	// 3.6
+	'wp-admin/js/revisions-js.php',
+	'wp-admin/images/screenshots',
+	'wp-admin/js/categories.js',
+	'wp-admin/js/categories.min.js',
+	'wp-admin/js/custom-fields.js',
+	'wp-admin/js/custom-fields.min.js',
+	// 3.7
+	'wp-admin/js/cat.js',
+	'wp-admin/js/cat.min.js',
+	'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.min.js',
+	// 3.8
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif',
+	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif',
+	'wp-includes/js/thickbox/tb-close-2x.png',
+	'wp-includes/js/thickbox/tb-close.png',
+	'wp-includes/images/wpmini-blue-2x.png',
+	'wp-includes/images/wpmini-blue.png',
+	'wp-admin/css/colors-fresh.css',
+	'wp-admin/css/colors-classic.css',
+	'wp-admin/css/colors-fresh.min.css',
+	'wp-admin/css/colors-classic.min.css',
+	'wp-admin/js/about.min.js',
+	'wp-admin/js/about.js',
+	'wp-admin/images/arrows-dark-vs-2x.png',
+	'wp-admin/images/wp-logo-vs.png',
+	'wp-admin/images/arrows-dark-vs.png',
+	'wp-admin/images/wp-logo.png',
+	'wp-admin/images/arrows-pr.png',
+	'wp-admin/images/arrows-dark.png',
+	'wp-admin/images/press-this.png',
+	'wp-admin/images/press-this-2x.png',
+	'wp-admin/images/arrows-vs-2x.png',
+	'wp-admin/images/welcome-icons.png',
+	'wp-admin/images/wp-logo-2x.png',
+	'wp-admin/images/stars-rtl-2x.png',
+	'wp-admin/images/arrows-dark-2x.png',
+	'wp-admin/images/arrows-pr-2x.png',
+	'wp-admin/images/menu-shadow-rtl.png',
+	'wp-admin/images/arrows-vs.png',
+	'wp-admin/images/about-search-2x.png',
+	'wp-admin/images/bubble_bg-rtl-2x.gif',
+	'wp-admin/images/wp-badge-2x.png',
+	'wp-admin/images/wordpress-logo-2x.png',
+	'wp-admin/images/bubble_bg-rtl.gif',
+	'wp-admin/images/wp-badge.png',
+	'wp-admin/images/menu-shadow.png',
+	'wp-admin/images/about-globe-2x.png',
+	'wp-admin/images/welcome-icons-2x.png',
+	'wp-admin/images/stars-rtl.png',
+	'wp-admin/images/wp-logo-vs-2x.png',
+	'wp-admin/images/about-updates-2x.png',
+	// 3.9
+	'wp-admin/css/colors.css',
+	'wp-admin/css/colors.min.css',
+	'wp-admin/css/colors-rtl.css',
+	'wp-admin/css/colors-rtl.min.css',
+	// Following files added back in 4.5 see #36083
+	// 'wp-admin/css/media-rtl.min.css',
+	// 'wp-admin/css/media.min.css',
+	// 'wp-admin/css/farbtastic-rtl.min.css',
+	'wp-admin/images/lock-2x.png',
+	'wp-admin/images/lock.png',
+	'wp-admin/js/theme-preview.js',
+	'wp-admin/js/theme-install.min.js',
+	'wp-admin/js/theme-install.js',
+	'wp-admin/js/theme-preview.min.js',
+	'wp-includes/js/plupload/plupload.html4.js',
+	'wp-includes/js/plupload/plupload.html5.js',
+	'wp-includes/js/plupload/changelog.txt',
+	'wp-includes/js/plupload/plupload.silverlight.js',
+	'wp-includes/js/plupload/plupload.flash.js',
+	// Added back in 4.9 [41328], see #41755
+	// 'wp-includes/js/plupload/plupload.js',
+	'wp-includes/js/tinymce/plugins/spellchecker',
+	'wp-includes/js/tinymce/plugins/inlinepopups',
+	'wp-includes/js/tinymce/plugins/media/js',
+	'wp-includes/js/tinymce/plugins/media/css',
+	'wp-includes/js/tinymce/plugins/wordpress/img',
+	'wp-includes/js/tinymce/plugins/wpdialogs/js',
+	'wp-includes/js/tinymce/plugins/wpeditimage/img',
+	'wp-includes/js/tinymce/plugins/wpeditimage/js',
+	'wp-includes/js/tinymce/plugins/wpeditimage/css',
+	'wp-includes/js/tinymce/plugins/wpgallery/img',
+	'wp-includes/js/tinymce/plugins/wpfullscreen/css',
+	'wp-includes/js/tinymce/plugins/paste/js',
+	'wp-includes/js/tinymce/themes/advanced',
+	'wp-includes/js/tinymce/tiny_mce.js',
+	'wp-includes/js/tinymce/mark_loaded_src.js',
+	'wp-includes/js/tinymce/wp-tinymce-schema.js',
+	'wp-includes/js/tinymce/plugins/media/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/media/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/media/media.htm',
+	'wp-includes/js/tinymce/plugins/wpview/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/wpview/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/directionality/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/directionality/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/wpeditimage/editimage.html',
+	'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm',
+	'wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/wplink/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/wplink/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/paste/editor_plugin.js',
+	'wp-includes/js/tinymce/plugins/paste/pasteword.htm',
+	'wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js',
+	'wp-includes/js/tinymce/plugins/paste/pastetext.htm',
+	'wp-includes/js/tinymce/langs/wp-langs.php',
+	// 4.1
+	'wp-includes/js/jquery/ui/jquery.ui.accordion.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.autocomplete.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.button.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.core.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.datepicker.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.dialog.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.draggable.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.droppable.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-blind.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-bounce.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-clip.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-drop.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-explode.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-fade.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-fold.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-highlight.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-pulsate.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-scale.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-shake.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-slide.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect-transfer.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.effect.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.menu.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.mouse.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.position.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.progressbar.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.resizable.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.selectable.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.slider.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.sortable.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.spinner.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.tabs.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.tooltip.min.js',
+	'wp-includes/js/jquery/ui/jquery.ui.widget.min.js',
+	'wp-includes/js/tinymce/skins/wordpress/images/dashicon-no-alt.png',
+	// 4.3
+	'wp-admin/js/wp-fullscreen.js',
+	'wp-admin/js/wp-fullscreen.min.js',
+	'wp-includes/js/tinymce/wp-mce-help.php',
+	'wp-includes/js/tinymce/plugins/wpfullscreen',
+	// 4.5
+	'wp-includes/theme-compat/comments-popup.php',
+	// 4.6
+	'wp-admin/includes/class-wp-automatic-upgrader.php', // Wrong file name, see #37628.
+	// 4.8
+	'wp-includes/js/tinymce/plugins/wpembed',
+	'wp-includes/js/tinymce/plugins/media/moxieplayer.swf',
+	'wp-includes/js/tinymce/skins/lightgray/fonts/readme.md',
+	'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.json',
+	'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.json',
+	'wp-includes/js/tinymce/skins/lightgray/skin.ie7.min.css',
+	// 4.9
+	'wp-admin/css/press-this-editor-rtl.css',
+	'wp-admin/css/press-this-editor-rtl.min.css',
+	'wp-admin/css/press-this-editor.css',
+	'wp-admin/css/press-this-editor.min.css',
+	'wp-admin/css/press-this-rtl.css',
+	'wp-admin/css/press-this-rtl.min.css',
+	'wp-admin/css/press-this.css',
+	'wp-admin/css/press-this.min.css',
+	'wp-admin/includes/class-wp-press-this.php',
+	'wp-admin/js/bookmarklet.js',
+	'wp-admin/js/bookmarklet.min.js',
+	'wp-admin/js/press-this.js',
+	'wp-admin/js/press-this.min.js',
+	'wp-includes/js/mediaelement/background.png',
+	'wp-includes/js/mediaelement/bigplay.png',
+	'wp-includes/js/mediaelement/bigplay.svg',
+	'wp-includes/js/mediaelement/controls.png',
+	'wp-includes/js/mediaelement/controls.svg',
+	'wp-includes/js/mediaelement/flashmediaelement.swf',
+	'wp-includes/js/mediaelement/froogaloop.min.js',
+	'wp-includes/js/mediaelement/jumpforward.png',
+	'wp-includes/js/mediaelement/loading.gif',
+	'wp-includes/js/mediaelement/silverlightmediaelement.xap',
+	'wp-includes/js/mediaelement/skipback.png',
+	'wp-includes/js/plupload/plupload.flash.swf',
+	'wp-includes/js/plupload/plupload.full.min.js',
+	'wp-includes/js/plupload/plupload.silverlight.xap',
+	'wp-includes/js/swfupload/plugins',
+	'wp-includes/js/swfupload/swfupload.swf',
 );
 
 /**
@@ -834,7 +834,7 @@ $_new_bundled_files = array(
  * @param string $to   Path to old WordPress installation.
  * @return WP_Error|null WP_Error on failure, null on success.
  */
-function update_core($from, $to) {
+function update_core( $from, $to ) {
 	global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;
 
 	@set_time_limit( 300 );
@@ -860,7 +860,7 @@ function update_core($from, $to) {
 
 	// Sanity check the unzipped distribution.
 	$distro = '';
-	$roots = array( '/wordpress/', '/wordpress-mu/' );
+	$roots  = array( '/wordpress/', '/wordpress-mu/' );
 	foreach ( $roots as $root ) {
 		if ( $wp_filesystem->exists( $from . $root . 'readme.html' ) && $wp_filesystem->exists( $from . $root . 'wp-includes/version.php' ) ) {
 			$distro = $root;
@@ -869,10 +869,9 @@ function update_core($from, $to) {
 	}
 	if ( ! $distro ) {
 		$wp_filesystem->delete( $from, true );
-		return new WP_Error( 'insane_distro', __('The update could not be unpacked') );
+		return new WP_Error( 'insane_distro', __( 'The update could not be unpacked' ) );
 	}
 
-
 	/*
 	 * Import $wp_version, $required_php_version, and $required_mysql_version from the new version.
 	 * DO NOT globalise any variables imported from `version-current.php` in this function.
@@ -889,32 +888,35 @@ function update_core($from, $to) {
 	require( WP_CONTENT_DIR . '/upgrade/version-current.php' );
 	$wp_filesystem->delete( $versions_file );
 
-	$php_version    = phpversion();
-	$mysql_version  = $wpdb->db_version();
-	$old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from
-	$development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' )  ); // a dash in the version indicates a Development release
-	$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+	$php_version       = phpversion();
+	$mysql_version     = $wpdb->db_version();
+	$old_wp_version    = $GLOBALS['wp_version']; // The version of WordPress we're updating from
+	$development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // a dash in the version indicates a Development release
+	$php_compat        = version_compare( $php_version, $required_php_version, '>=' );
+	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
 		$mysql_compat = true;
-	else
+	} else {
 		$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+	}
 
-	if ( !$mysql_compat || !$php_compat )
-		$wp_filesystem->delete($from, true);
+	if ( ! $mysql_compat || ! $php_compat ) {
+		$wp_filesystem->delete( $from, true );
+	}
 
-	if ( !$mysql_compat && !$php_compat )
-		return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s 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 ) );
-	elseif ( !$php_compat )
-		return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );
-	elseif ( !$mysql_compat )
-		return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
+	if ( ! $mysql_compat && ! $php_compat ) {
+		return new WP_Error( 'php_mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s 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 ) );
+	} elseif ( ! $php_compat ) {
+		return new WP_Error( 'php_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ) );
+	} elseif ( ! $mysql_compat ) {
+		return new WP_Error( 'mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ) );
+	}
 
 	/** This filter is documented in wp-admin/includes/update-core.php */
 	apply_filters( 'update_feedback', __( 'Preparing to install the latest version&#8230;' ) );
 
 	// Don't copy wp-content, we'll deal with that below
 	// We also copy version.php last so failed updates report their old version
-	$skip = array( 'wp-content', 'wp-includes/version.php' );
+	$skip              = array( 'wp-content', 'wp-includes/version.php' );
 	$check_is_writable = array();
 
 	// Check to see which files don't really need updating - only available for 3.7 and higher
@@ -923,22 +925,28 @@ function update_core($from, $to) {
 		$working_dir_local = WP_CONTENT_DIR . '/upgrade/' . basename( $from ) . $distro;
 
 		$checksums = get_core_checksums( $wp_version, isset( $wp_local_package ) ? $wp_local_package : 'en_US' );
-		if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) )
+		if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) ) {
 			$checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
+		}
 		if ( is_array( $checksums ) ) {
 			foreach ( $checksums as $file => $checksum ) {
-				if ( 'wp-content' == substr( $file, 0, 10 ) )
+				if ( 'wp-content' == substr( $file, 0, 10 ) ) {
 					continue;
-				if ( ! file_exists( ABSPATH . $file ) )
+				}
+				if ( ! file_exists( ABSPATH . $file ) ) {
 					continue;
-				if ( ! file_exists( $working_dir_local . $file ) )
+				}
+				if ( ! file_exists( $working_dir_local . $file ) ) {
 					continue;
-				if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ) ) )
+				}
+				if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ) ) ) {
 					continue;
-				if ( md5_file( ABSPATH . $file ) === $checksum )
+				}
+				if ( md5_file( ABSPATH . $file ) === $checksum ) {
 					$skip[] = $file;
-				else
+				} else {
 					$check_is_writable[ $file ] = ABSPATH . $file;
+				}
 			}
 		}
 	}
@@ -951,15 +959,17 @@ function update_core($from, $to) {
 			foreach ( $files_not_writable as $relative_file_not_writable => $file_not_writable ) {
 				// If the writable check failed, chmod file to 0644 and try again, same as copy_dir().
 				$wp_filesystem->chmod( $file_not_writable, FS_CHMOD_FILE );
-				if ( $wp_filesystem->is_writable( $file_not_writable ) )
+				if ( $wp_filesystem->is_writable( $file_not_writable ) ) {
 					unset( $files_not_writable[ $relative_file_not_writable ] );
+				}
 			}
 
 			// Store package-relative paths (the key) of non-writable files in the WP_Error object.
 			$error_data = version_compare( $old_wp_version, '3.7-beta2', '>' ) ? array_keys( $files_not_writable ) : '';
 
-			if ( $files_not_writable )
+			if ( $files_not_writable ) {
 				return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) );
+			}
 		}
 	}
 
@@ -967,16 +977,17 @@ function update_core($from, $to) {
 	apply_filters( 'update_feedback', __( 'Enabling Maintenance mode&#8230;' ) );
 	// Create maintenance file to signal that we are upgrading
 	$maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
-	$maintenance_file = $to . '.maintenance';
-	$wp_filesystem->delete($maintenance_file);
-	$wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE);
+	$maintenance_file   = $to . '.maintenance';
+	$wp_filesystem->delete( $maintenance_file );
+	$wp_filesystem->put_contents( $maintenance_file, $maintenance_string, FS_CHMOD_FILE );
 
 	/** This filter is documented in wp-admin/includes/update-core.php */
 	apply_filters( 'update_feedback', __( 'Copying the required files&#8230;' ) );
 	// Copy new versions of WP files into place.
 	$result = _copy_dir( $from . $distro, $to, $skip );
-	if ( is_wp_error( $result ) )
+	if ( is_wp_error( $result ) ) {
 		$result = new WP_Error( $result->get_error_code(), $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+	}
 
 	// Since we know the core files have copied over, we can now copy the version file
 	if ( ! is_wp_error( $result ) ) {
@@ -988,22 +999,25 @@ function update_core($from, $to) {
 	}
 
 	// Check to make sure everything copied correctly, ignoring the contents of wp-content
-	$skip = array( 'wp-content' );
+	$skip   = array( 'wp-content' );
 	$failed = array();
 	if ( isset( $checksums ) && is_array( $checksums ) ) {
 		foreach ( $checksums as $file => $checksum ) {
-			if ( 'wp-content' == substr( $file, 0, 10 ) )
+			if ( 'wp-content' == substr( $file, 0, 10 ) ) {
 				continue;
-			if ( ! file_exists( $working_dir_local . $file ) )
+			}
+			if ( ! file_exists( $working_dir_local . $file ) ) {
 				continue;
+			}
 			if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ) ) ) {
 				$skip[] = $file;
 				continue;
 			}
-			if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum )
+			if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) == $checksum ) {
 				$skip[] = $file;
-			else
+			} else {
 				$failed[] = $file;
+			}
 		}
 	}
 
@@ -1011,8 +1025,9 @@ function update_core($from, $to) {
 	if ( ! empty( $failed ) ) {
 		$total_size = 0;
 		foreach ( $failed as $file ) {
-			if ( file_exists( $working_dir_local . $file ) )
+			if ( file_exists( $working_dir_local . $file ) ) {
 				$total_size += filesize( $working_dir_local . $file );
+			}
 		}
 
 		// If we don't have enough free space, it isn't worth trying again.
@@ -1022,30 +1037,33 @@ function update_core($from, $to) {
 			$result = new WP_Error( 'disk_full', __( 'There is not enough free disk space to complete the update.' ) );
 		} else {
 			$result = _copy_dir( $from . $distro, $to, $skip );
-			if ( is_wp_error( $result ) )
+			if ( is_wp_error( $result ) ) {
 				$result = new WP_Error( $result->get_error_code() . '_retry', $result->get_error_message(), substr( $result->get_error_data(), strlen( $to ) ) );
+			}
 		}
 	}
 
 	// Custom Content Directory needs updating now.
 	// Copy Languages
-	if ( !is_wp_error($result) && $wp_filesystem->is_dir($from . $distro . 'wp-content/languages') ) {
-		if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir(WP_LANG_DIR) )
+	if ( ! is_wp_error( $result ) && $wp_filesystem->is_dir( $from . $distro . 'wp-content/languages' ) ) {
+		if ( WP_LANG_DIR != ABSPATH . WPINC . '/languages' || @is_dir( WP_LANG_DIR ) ) {
 			$lang_dir = WP_LANG_DIR;
-		else
+		} else {
 			$lang_dir = WP_CONTENT_DIR . '/languages';
+		}
 
-		if ( !@is_dir($lang_dir) && 0 === strpos($lang_dir, ABSPATH) ) { // Check the language directory exists first
-			$wp_filesystem->mkdir($to . str_replace(ABSPATH, '', $lang_dir), FS_CHMOD_DIR); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.
+		if ( ! @is_dir( $lang_dir ) && 0 === strpos( $lang_dir, ABSPATH ) ) { // Check the language directory exists first
+			$wp_filesystem->mkdir( $to . str_replace( ABSPATH, '', $lang_dir ), FS_CHMOD_DIR ); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.
 			clearstatcache(); // for FTP, Need to clear the stat cache
 		}
 
-		if ( @is_dir($lang_dir) ) {
-			$wp_lang_dir = $wp_filesystem->find_folder($lang_dir);
+		if ( @is_dir( $lang_dir ) ) {
+			$wp_lang_dir = $wp_filesystem->find_folder( $lang_dir );
 			if ( $wp_lang_dir ) {
-				$result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
-				if ( is_wp_error( $result ) )
+				$result = copy_dir( $from . $distro . 'wp-content/languages/', $wp_lang_dir );
+				if ( is_wp_error( $result ) ) {
 					$result = new WP_Error( $result->get_error_code() . '_languages', $result->get_error_message(), substr( $result->get_error_data(), strlen( $wp_lang_dir ) ) );
+				}
 			}
 		}
 	}
@@ -1057,7 +1075,7 @@ function update_core($from, $to) {
 
 	// 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
 	if ( '3.5' == $old_wp_version ) {
-		if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' )  ) {
+		if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' ) ) {
 			$wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' );
 		}
 	}
@@ -1065,41 +1083,47 @@ function update_core($from, $to) {
 	// Copy New bundled plugins & themes
 	// This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.
 	// $development_build controls us overwriting bundled themes and plugins when a non-stable release is being updated
-	if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
+	if ( ! is_wp_error( $result ) && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
 		foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {
 			// If a $development_build or if $introduced version is greater than what the site was previously running
 			if ( $development_build || version_compare( $introduced_version, $old_wp_version, '>' ) ) {
-				$directory = ('/' == $file[ strlen($file)-1 ]);
-				list($type, $filename) = explode('/', $file, 2);
+				$directory             = ( '/' == $file[ strlen( $file ) - 1 ] );
+				list($type, $filename) = explode( '/', $file, 2 );
 
 				// Check to see if the bundled items exist before attempting to copy them
-				if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) )
+				if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) ) {
 					continue;
+				}
 
-				if ( 'plugins' == $type )
+				if ( 'plugins' == $type ) {
 					$dest = $wp_filesystem->wp_plugins_dir();
-				elseif ( 'themes' == $type )
-					$dest = trailingslashit($wp_filesystem->wp_themes_dir()); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2
-				else
+				} elseif ( 'themes' == $type ) {
+					$dest = trailingslashit( $wp_filesystem->wp_themes_dir() ); // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2
+				} else {
 					continue;
+				}
 
 				if ( ! $directory ) {
-					if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) )
+					if ( ! $development_build && $wp_filesystem->exists( $dest . $filename ) ) {
 						continue;
+					}
 
-					if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE) )
+					if ( ! $wp_filesystem->copy( $from . $distro . 'wp-content/' . $file, $dest . $filename, FS_CHMOD_FILE ) ) {
 						$result = new WP_Error( "copy_failed_for_new_bundled_$type", __( 'Could not copy file.' ), $dest . $filename );
+					}
 				} else {
-					if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) )
+					if ( ! $development_build && $wp_filesystem->is_dir( $dest . $filename ) ) {
 						continue;
+					}
 
-					$wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
-					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
+					$wp_filesystem->mkdir( $dest . $filename, FS_CHMOD_DIR );
+					$_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename );
 
 					// If a error occurs partway through this final step, keep the error flowing through, but keep process going.
 					if ( is_wp_error( $_result ) ) {
-						if ( ! is_wp_error( $result ) )
+						if ( ! is_wp_error( $result ) ) {
 							$result = new WP_Error;
+						}
 						$result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), substr( $_result->get_error_data(), strlen( $dest ) ) );
 					}
 				}
@@ -1108,17 +1132,18 @@ function update_core($from, $to) {
 	}
 
 	// Handle $result error from the above blocks
-	if ( is_wp_error($result) ) {
-		$wp_filesystem->delete($from, true);
+	if ( is_wp_error( $result ) ) {
+		$wp_filesystem->delete( $from, true );
 		return $result;
 	}
 
 	// Remove old files
 	foreach ( $_old_files as $old_file ) {
 		$old_file = $to . $old_file;
-		if ( !$wp_filesystem->exists($old_file) )
+		if ( ! $wp_filesystem->exists( $old_file ) ) {
 			continue;
-		$wp_filesystem->delete($old_file, true);
+		}
+		$wp_filesystem->delete( $old_file, true );
 	}
 
 	// Remove any Genericons example.html's from the filesystem
@@ -1130,8 +1155,8 @@ function update_core($from, $to) {
 	// Upgrade DB with separate request
 	/** This filter is documented in wp-admin/includes/update-core.php */
 	apply_filters( 'update_feedback', __( 'Upgrading database&#8230;' ) );
-	$db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
-	wp_remote_post($db_upgrade_url, array('timeout' => 60));
+	$db_upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
+	wp_remote_post( $db_upgrade_url, array( 'timeout' => 60 ) );
 
 	// Clear the cache to prevent an update_option() from saving a stale db_version to the cache
 	wp_cache_flush();
@@ -1139,13 +1164,14 @@ function update_core($from, $to) {
 	wp_cache_delete( 'alloptions', 'options' );
 
 	// Remove working directory
-	$wp_filesystem->delete($from, true);
+	$wp_filesystem->delete( $from, true );
 
 	// Force refresh of update information
-	if ( function_exists('delete_site_transient') )
-		delete_site_transient('update_core');
-	else
-		delete_option('update_core');
+	if ( function_exists( 'delete_site_transient' ) ) {
+		delete_site_transient( 'update_core' );
+	} else {
+		delete_option( 'update_core' );
+	}
 
 	/**
 	 * Fires after WordPress core has been successfully updated.
@@ -1157,8 +1183,9 @@ function update_core($from, $to) {
 	do_action( '_core_updated_successfully', $wp_version );
 
 	// Clear the option that blocks auto updates after failures, now that we've been successful.
-	if ( function_exists( 'delete_site_option' ) )
+	if ( function_exists( 'delete_site_option' ) ) {
 		delete_site_option( 'auto_core_update_failed' );
+	}
 
 	return $wp_version;
 }
@@ -1182,29 +1209,32 @@ function update_core($from, $to) {
  * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function _copy_dir($from, $to, $skip_list = array() ) {
+function _copy_dir( $from, $to, $skip_list = array() ) {
 	global $wp_filesystem;
 
-	$dirlist = $wp_filesystem->dirlist($from);
+	$dirlist = $wp_filesystem->dirlist( $from );
 
-	$from = trailingslashit($from);
-	$to = trailingslashit($to);
+	$from = trailingslashit( $from );
+	$to   = trailingslashit( $to );
 
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
+		if ( in_array( $filename, $skip_list ) ) {
 			continue;
+		}
 
 		if ( 'f' == $fileinfo['type'] ) {
-			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+			if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
 				// If copy failed, chmod file to 0644 and try again.
 				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
+				if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
 					return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				}
 			}
 		} elseif ( 'd' == $fileinfo['type'] ) {
-			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
+			if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
+				if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) {
 					return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				}
 			}
 
 			/*
@@ -1213,13 +1243,15 @@ function _copy_dir($from, $to, $skip_list = array() ) {
 			 */
 			$sub_skip_list = array();
 			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
+				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
 					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				}
 			}
 
-			$result = _copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
+			$result = _copy_dir( $from . $filename, $to . $filename, $sub_skip_list );
+			if ( is_wp_error( $result ) ) {
 				return $result;
+			}
 		}
 	}
 	return true;
@@ -1241,21 +1273,24 @@ function _copy_dir($from, $to, $skip_list = array() ) {
 function _redirect_to_about_wordpress( $new_version ) {
 	global $wp_version, $pagenow, $action;
 
-	if ( version_compare( $wp_version, '3.4-RC1', '>=' ) )
+	if ( version_compare( $wp_version, '3.4-RC1', '>=' ) ) {
 		return;
+	}
 
 	// Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts.
-	if ( 'update-core.php' != $pagenow )
+	if ( 'update-core.php' != $pagenow ) {
 		return;
+	}
 
- 	if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
- 		return;
+	if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action ) {
+		return;
+	}
 
 	// Load the updated default text localization domain for new strings.
 	load_default_textdomain();
 
 	// See do_core_upgrade()
-	show_message( __('WordPress updated successfully') );
+	show_message( __( 'WordPress updated successfully' ) );
 
 	// self_admin_url() won't exist when upgrading from <= 3.0, so relative URLs are intentional.
 	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>.' ), $new_version, 'about.php?updated' ) . '</span>' );
@@ -1268,7 +1303,7 @@ window.location = 'about.php?updated';
 	<?php
 
 	// Include admin-footer.php and exit.
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
 	exit();
 }
 
diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 74863d5ca9..d8e1fe84d9 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -13,10 +13,12 @@
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) )
+	if ( ! is_array( $updates ) ) {
 		return false;
-	if ( empty( $updates ) )
+	}
+	if ( empty( $updates ) ) {
 		return (object) array( 'response' => 'latest' );
+	}
 	return $updates[0];
 }
 
@@ -24,36 +26,44 @@ function get_preferred_from_update_core() {
  * Get available core updates.
  *
  * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too,
- * 	                     set $options['available'] to false to skip not-dismissed updates.
+ *                       set $options['available'] to false to skip not-dismissed updates.
  * @return array|false Array of the update objects on success, false on failure.
  */
 function get_core_updates( $options = array() ) {
-	$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
+	$options   = array_merge(
+		array(
+			'available' => true,
+			'dismissed' => false,
+		), $options
+	);
 	$dismissed = get_site_option( 'dismissed_update_core' );
 
-	if ( ! is_array( $dismissed ) )
+	if ( ! is_array( $dismissed ) ) {
 		$dismissed = array();
+	}
 
 	$from_api = get_site_transient( 'update_core' );
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
 		return false;
+	}
 
 	$updates = $from_api->updates;
-	$result = array();
+	$result  = array();
 	foreach ( $updates as $update ) {
-		if ( $update->response == 'autoupdate' )
+		if ( $update->response == 'autoupdate' ) {
 			continue;
+		}
 
 		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
 			if ( $options['dismissed'] ) {
 				$update->dismissed = true;
-				$result[] = $update;
+				$result[]          = $update;
 			}
 		} else {
 			if ( $options['available'] ) {
 				$update->dismissed = false;
-				$result[] = $update;
+				$result[]          = $update;
 			}
 		}
 	}
@@ -71,22 +81,26 @@ function get_core_updates( $options = array() ) {
  */
 function find_core_auto_update() {
 	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) )
+	if ( ! $updates || empty( $updates->updates ) ) {
 		return false;
+	}
 
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
 	$auto_update = false;
-	$upgrader = new WP_Automatic_Updater;
+	$upgrader    = new WP_Automatic_Updater;
 	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' != $update->response )
+		if ( 'autoupdate' != $update->response ) {
 			continue;
+		}
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
+		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) {
 			continue;
+		}
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) )
+		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) {
 			$auto_update = $update;
+		}
 	}
 	return $auto_update;
 }
@@ -103,8 +117,9 @@ function find_core_auto_update() {
 function get_core_checksums( $version, $locale ) {
 	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
 
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
 		$url = set_url_scheme( $url, 'https' );
+	}
 
 	$options = array(
 		'timeout' => wp_doing_cron() ? 30 : 3,
@@ -123,20 +138,21 @@ function get_core_checksums( $version, $locale ) {
 		$response = wp_remote_get( $http_url, $options );
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
 		return false;
+	}
 
 	$body = trim( wp_remote_retrieve_body( $response ) );
 	$body = json_decode( $body, true );
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
+	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) {
 		return false;
+	}
 
 	return $body['checksums'];
 }
 
 /**
- *
  * @param object $update
  * @return bool
  */
@@ -147,24 +163,23 @@ function dismiss_core_update( $update ) {
 }
 
 /**
- *
  * @param string $version
  * @param string $locale
  * @return bool
  */
 function undismiss_core_update( $version, $locale ) {
 	$dismissed = get_site_option( 'dismissed_update_core' );
-	$key = $version . '|' . $locale;
+	$key       = $version . '|' . $locale;
 
-	if ( ! isset( $dismissed[$key] ) )
+	if ( ! isset( $dismissed[ $key ] ) ) {
 		return false;
+	}
 
-	unset( $dismissed[$key] );
+	unset( $dismissed[ $key ] );
 	return update_site_option( 'dismissed_update_core', $dismissed );
 }
 
 /**
- *
  * @param string $version
  * @param string $locale
  * @return object|false
@@ -172,71 +187,79 @@ function undismiss_core_update( $version, $locale ) {
 function find_core_update( $version, $locale ) {
 	$from_api = get_site_transient( 'update_core' );
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
 		return false;
+	}
 
 	$updates = $from_api->updates;
 	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale )
+		if ( $update->current == $version && $update->locale == $locale ) {
 			return $update;
+		}
 	}
 	return false;
 }
 
 /**
- *
  * @param string $msg
  * @return string
  */
 function core_update_footer( $msg = '' ) {
-	if ( !current_user_can('update_core') )
+	if ( ! current_user_can( 'update_core' ) ) {
 		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+	}
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) )
+	if ( ! is_object( $cur ) ) {
 		$cur = new stdClass;
+	}
 
-	if ( ! isset( $cur->current ) )
+	if ( ! isset( $cur->current ) ) {
 		$cur->current = '';
+	}
 
-	if ( ! isset( $cur->url ) )
+	if ( ! isset( $cur->url ) ) {
 		$cur->url = '';
+	}
 
-	if ( ! isset( $cur->response ) )
+	if ( ! isset( $cur->response ) ) {
 		$cur->response = '';
+	}
 
 	switch ( $cur->response ) {
-	case 'development' :
-		/* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		case 'development':
+			/* translators: 1: WordPress version number, 2: WordPress updates admin screen URL */
+			return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
 
-	case 'upgrade' :
-		return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		case 'upgrade':
+			return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
 
-	case 'latest' :
-	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		case 'latest':
+		default:
+			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
 	}
 }
 
 /**
- *
  * @global string $pagenow
  * @return false|void
  */
 function update_nag() {
-	if ( is_multisite() && !current_user_can('update_core') )
+	if ( is_multisite() && ! current_user_can( 'update_core' ) ) {
 		return false;
+	}
 
 	global $pagenow;
 
-	if ( 'update-core.php' == $pagenow )
+	if ( 'update-core.php' == $pagenow ) {
 		return;
+	}
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
+	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) {
 		return false;
+	}
 
 	if ( current_user_can( 'update_core' ) ) {
 		$msg = sprintf(
@@ -275,11 +298,12 @@ function update_right_now_message() {
 
 	$msg = '';
 
-	if ( current_user_can('update_core') ) {
+	if ( current_user_can( 'update_core' ) ) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
+		if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
 			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		}
 	}
 
 	/* translators: 1: version number, 2: theme name */
@@ -307,12 +331,12 @@ function update_right_now_message() {
  * @return array
  */
 function get_plugin_updates() {
-	$all_plugins = get_plugins();
+	$all_plugins     = get_plugins();
 	$upgrade_plugins = array();
-	$current = get_site_transient( 'update_plugins' );
-	foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
+	$current         = get_site_transient( 'update_plugins' );
+	foreach ( (array) $all_plugins as $plugin_file => $plugin_data ) {
 		if ( isset( $current->response[ $plugin_file ] ) ) {
-			$upgrade_plugins[ $plugin_file ] = (object) $plugin_data;
+			$upgrade_plugins[ $plugin_file ]         = (object) $plugin_data;
 			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
 		}
 	}
@@ -324,11 +348,12 @@ function get_plugin_updates() {
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( !current_user_can('update_plugins' ) )
+	if ( ! current_user_can( 'update_plugins' ) ) {
 		return;
+	}
 
 	$plugins = get_site_transient( 'update_plugins' );
-	if ( isset($plugins->response) && is_array($plugins->response) ) {
+	if ( isset( $plugins->response ) && is_array( $plugins->response ) ) {
 		$plugins = array_keys( $plugins->response );
 		foreach ( $plugins as $plugin_file ) {
 			add_action( "after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2 );
@@ -352,7 +377,10 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 	$response = $current->response[ $file ];
 
 	$plugins_allowedtags = array(
-		'a'       => array( 'href' => array(), 'title' => array() ),
+		'a'       => array(
+			'href'  => array(),
+			'title' => array(),
+		),
 		'abbr'    => array( 'title' => array() ),
 		'acronym' => array( 'title' => array() ),
 		'code'    => array(),
@@ -360,8 +388,8 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 		'strong'  => array(),
 	);
 
-	$plugin_name   = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
-	$details_url   = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $response->slug . '&section=changelog&TB_iframe=true&width=600&height=800' );
+	$plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
+	$details_url = self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $response->slug . '&section=changelog&TB_iframe=true&width=600&height=800' );
 
 	/** @var WP_Plugins_List_Table $wp_list_table */
 	$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
@@ -377,10 +405,12 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 
 		if ( ! current_user_can( 'update_plugins' ) ) {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
+			printf(
+				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
 				$plugin_name,
 				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				sprintf(
+					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
 					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
 				),
@@ -388,10 +418,12 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 			);
 		} elseif ( empty( $response->package ) ) {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
+			printf(
+				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
 				$plugin_name,
 				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				sprintf(
+					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
 					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
 				),
@@ -399,16 +431,19 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 			);
 		} else {
 			/* translators: 1: plugin name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+			printf(
+				__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
 				$plugin_name,
 				esc_url( $details_url ),
-				sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+				sprintf(
+					'class="thickbox open-plugin-details-modal" aria-label="%s"',
 					/* translators: 1: plugin name, 2: version number */
 					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $response->new_version ) )
 				),
 				$response->new_version,
 				wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
-				sprintf( 'class="update-link" aria-label="%s"',
+				sprintf(
+					'class="update-link" aria-label="%s"',
 					/* translators: %s: plugin name */
 					esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
 				)
@@ -457,18 +492,18 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 }
 
 /**
- *
  * @return array
  */
 function get_theme_updates() {
-	$current = get_site_transient('update_themes');
+	$current = get_site_transient( 'update_themes' );
 
-	if ( ! isset( $current->response ) )
+	if ( ! isset( $current->response ) ) {
 		return array();
+	}
 
 	$update_themes = array();
 	foreach ( $current->response as $stylesheet => $data ) {
-		$update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
+		$update_themes[ $stylesheet ]         = wp_get_theme( $stylesheet );
 		$update_themes[ $stylesheet ]->update = $data;
 	}
 
@@ -479,11 +514,12 @@ function get_theme_updates() {
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can( 'update_themes' ) ) {
 		return;
+	}
 
 	$themes = get_site_transient( 'update_themes' );
-	if ( isset($themes->response) && is_array($themes->response) ) {
+	if ( isset( $themes->response ) && is_array( $themes->response ) ) {
 		$themes = array_keys( $themes->response );
 
 		foreach ( $themes as $theme ) {
@@ -508,11 +544,13 @@ function wp_theme_update_row( $theme_key, $theme ) {
 
 	$response = $current->response[ $theme_key ];
 
-	$details_url = add_query_arg( array(
-		'TB_iframe' => 'true',
-		'width'     => 1024,
-		'height'    => 800,
-	), $current->response[ $theme_key ]['url'] );
+	$details_url = add_query_arg(
+		array(
+			'TB_iframe' => 'true',
+			'width'     => 1024,
+			'height'    => 800,
+		), $current->response[ $theme_key ]['url']
+	);
 
 	/** @var WP_MS_Themes_List_Table $wp_list_table */
 	$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
@@ -522,10 +560,12 @@ function wp_theme_update_row( $theme_key, $theme ) {
 	echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message notice inline notice-warning notice-alt"><p>';
 	if ( ! current_user_can( 'update_themes' ) ) {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.'),
+		printf(
+			__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ),
 			$theme['Name'],
 			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			sprintf(
+				'class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
 				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
 			),
@@ -533,10 +573,12 @@ function wp_theme_update_row( $theme_key, $theme ) {
 		);
 	} elseif ( empty( $response['package'] ) ) {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
+		printf(
+			__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
 			$theme['Name'],
 			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			sprintf(
+				'class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
 				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
 			),
@@ -544,16 +586,19 @@ function wp_theme_update_row( $theme_key, $theme ) {
 		);
 	} else {
 		/* translators: 1: theme name, 2: details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
+		printf(
+			__( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ),
 			$theme['Name'],
 			esc_url( $details_url ),
-			sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+			sprintf(
+				'class="thickbox open-plugin-details-modal" aria-label="%s"',
 				/* translators: 1: theme name, 2: version number */
 				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme['Name'], $response['new_version'] ) )
 			),
 			$response['new_version'],
 			wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
-			sprintf( 'class="update-link" aria-label="%s"',
+			sprintf(
+				'class="update-link" aria-label="%s"',
 				/* translators: %s: theme name */
 				esc_attr( sprintf( __( 'Update %s now' ), $theme['Name'] ) )
 			)
@@ -584,7 +629,6 @@ function wp_theme_update_row( $theme_key, $theme ) {
 }
 
 /**
- *
  * @global int $upgrading
  * @return false|void
  */
@@ -605,17 +649,20 @@ function maintenance_nag() {
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
 		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
+		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
 			$nag = true;
+		}
 	}
 
-	if ( ! $nag )
+	if ( ! $nag ) {
 		return false;
+	}
 
-	if ( current_user_can('update_core') )
-		$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
-	else
-		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
+	if ( current_user_can( 'update_core' ) ) {
+		$msg = sprintf( __( 'An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.' ), 'update-core.php' );
+	} else {
+		$msg = __( 'An automated WordPress update has failed to complete! Please notify the site administrator.' );
+	}
 
 	echo "<div class='update-nag'>$msg</div>";
 }
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 9422315922..7ab369dc7b 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -9,219 +9,264 @@
  */
 
 /** Include user installation customization script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
-	require (WP_CONTENT_DIR . '/install.php');
+if ( file_exists( WP_CONTENT_DIR . '/install.php' ) ) {
+	require( WP_CONTENT_DIR . '/install.php' );
+}
 
 /** WordPress Administration API */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once( ABSPATH . 'wp-admin/includes/admin.php' );
 
 /** WordPress Schema API */
-require_once(ABSPATH . 'wp-admin/includes/schema.php');
-
-if ( !function_exists('wp_install') ) :
-/**
- * Installs the site.
- *
- * Runs the required functions to set up and populate the database,
- * including primary admin user and initial options.
- *
- * @since 2.1.0
- *
- * @param string $blog_title    Site title.
- * @param string $user_name     User's username.
- * @param string $user_email    User's email.
- * @param bool   $public        Whether site is public.
- * @param string $deprecated    Optional. Not used.
- * @param string $user_password Optional. User's chosen password. Default empty (random password).
- * @param string $language      Optional. Language chosen. Default empty.
- * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
- */
-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6.0' );
-
-	wp_check_mysql_version();
-	wp_cache_flush();
-	make_db_current_silent();
-	populate_options();
-	populate_roles();
-
-	update_option('blogname', $blog_title);
-	update_option('admin_email', $user_email);
-	update_option('blog_public', $public);
-
-	// Freshness of site - in the future, this could get more specific about actions taken, perhaps.
-	update_option( 'fresh_site', 1 );
-
-	if ( $language ) {
-		update_option( 'WPLANG', $language );
-	}
-
-	$guessurl = wp_guess_url();
-
-	update_option('siteurl', $guessurl);
-
-	// If not a public blog, don't ping.
-	if ( ! $public )
-		update_option('default_pingback_flag', 0);
-
-	/*
-	 * Create default user. If the user already exists, the user tables are
-	 * being shared among sites. Just set the role in that case.
-	 */
-	$user_id = username_exists($user_name);
-	$user_password = trim($user_password);
-	$email_password = false;
-	if ( !$user_id && empty($user_password) ) {
-		$user_password = wp_generate_password( 12, false );
-		$message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
-		$user_id = wp_create_user($user_name, $user_password, $user_email);
-		update_user_option($user_id, 'default_password_nag', true, true);
-		$email_password = true;
-	} elseif ( ! $user_id ) {
-		// Password has been provided
-		$message = '<em>'.__('Your chosen password.').'</em>';
-		$user_id = wp_create_user($user_name, $user_password, $user_email);
-	} else {
-		$message = __('User already exists. Password inherited.');
-	}
-
-	$user = new WP_User($user_id);
-	$user->set_role('administrator');
-
-	wp_install_defaults($user_id);
-
-	wp_install_maybe_enable_pretty_permalinks();
-
-	flush_rewrite_rules();
-
-	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during installation.') ) );
-
-	wp_cache_flush();
+require_once( ABSPATH . 'wp-admin/includes/schema.php' );
 
+if ( ! function_exists( 'wp_install' ) ) :
 	/**
-	 * Fires after a site is fully installed.
+	 * Installs the site.
 	 *
-	 * @since 3.9.0
+	 * Runs the required functions to set up and populate the database,
+	 * including primary admin user and initial options.
 	 *
-	 * @param WP_User $user The site owner.
+	 * @since 2.1.0
+	 *
+	 * @param string $blog_title    Site title.
+	 * @param string $user_name     User's username.
+	 * @param string $user_email    User's email.
+	 * @param bool   $public        Whether site is public.
+	 * @param string $deprecated    Optional. Not used.
+	 * @param string $user_password Optional. User's chosen password. Default empty (random password).
+	 * @param string $language      Optional. Language chosen. Default empty.
+	 * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
 	 */
-	do_action( 'wp_install', $user );
+	function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
+		if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.6.0' );
+		}
 
-	return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
-}
+		wp_check_mysql_version();
+		wp_cache_flush();
+		make_db_current_silent();
+		populate_options();
+		populate_roles();
+
+		update_option( 'blogname', $blog_title );
+		update_option( 'admin_email', $user_email );
+		update_option( 'blog_public', $public );
+
+		// Freshness of site - in the future, this could get more specific about actions taken, perhaps.
+		update_option( 'fresh_site', 1 );
+
+		if ( $language ) {
+			update_option( 'WPLANG', $language );
+		}
+
+		$guessurl = wp_guess_url();
+
+		update_option( 'siteurl', $guessurl );
+
+		// If not a public blog, don't ping.
+		if ( ! $public ) {
+			update_option( 'default_pingback_flag', 0 );
+		}
+
+		/*
+		 * Create default user. If the user already exists, the user tables are
+		 * being shared among sites. Just set the role in that case.
+		 */
+		$user_id        = username_exists( $user_name );
+		$user_password  = trim( $user_password );
+		$email_password = false;
+		if ( ! $user_id && empty( $user_password ) ) {
+			$user_password = wp_generate_password( 12, false );
+			$message       = __( '<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.' );
+			$user_id       = wp_create_user( $user_name, $user_password, $user_email );
+			update_user_option( $user_id, 'default_password_nag', true, true );
+			$email_password = true;
+		} elseif ( ! $user_id ) {
+			// Password has been provided
+			$message = '<em>' . __( 'Your chosen password.' ) . '</em>';
+			$user_id = wp_create_user( $user_name, $user_password, $user_email );
+		} else {
+			$message = __( 'User already exists. Password inherited.' );
+		}
+
+		$user = new WP_User( $user_id );
+		$user->set_role( 'administrator' );
+
+		wp_install_defaults( $user_id );
+
+		wp_install_maybe_enable_pretty_permalinks();
+
+		flush_rewrite_rules();
+
+		wp_new_blog_notification( $blog_title, $guessurl, $user_id, ( $email_password ? $user_password : __( 'The password you chose during installation.' ) ) );
+
+		wp_cache_flush();
+
+		/**
+		 * Fires after a site is fully installed.
+		 *
+		 * @since 3.9.0
+		 *
+		 * @param WP_User $user The site owner.
+		 */
+		do_action( 'wp_install', $user );
+
+		return array(
+			'url'              => $guessurl,
+			'user_id'          => $user_id,
+			'password'         => $user_password,
+			'password_message' => $message,
+		);
+	}
 endif;
 
-if ( !function_exists('wp_install_defaults') ) :
-/**
- * Creates the initial content for a newly-installed site.
- *
- * Adds the default "Uncategorized" category, the first post (with comment),
- * first page, and default widgets for default theme for the current version.
- *
- * @since 2.1.0
- *
- * @global wpdb       $wpdb
- * @global WP_Rewrite $wp_rewrite
- * @global string     $table_prefix
- *
- * @param int $user_id User ID.
- */
-function wp_install_defaults( $user_id ) {
-	global $wpdb, $wp_rewrite, $table_prefix;
+if ( ! function_exists( 'wp_install_defaults' ) ) :
+	/**
+	 * Creates the initial content for a newly-installed site.
+	 *
+	 * Adds the default "Uncategorized" category, the first post (with comment),
+	 * first page, and default widgets for default theme for the current version.
+	 *
+	 * @since 2.1.0
+	 *
+	 * @global wpdb       $wpdb
+	 * @global WP_Rewrite $wp_rewrite
+	 * @global string     $table_prefix
+	 *
+	 * @param int $user_id User ID.
+	 */
+	function wp_install_defaults( $user_id ) {
+		global $wpdb, $wp_rewrite, $table_prefix;
 
-	// Default category
-	$cat_name = __('Uncategorized');
-	/* translators: Default category slug */
-	$cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
+		// Default category
+		$cat_name = __( 'Uncategorized' );
+		/* translators: Default category slug */
+		$cat_slug = sanitize_title( _x( 'Uncategorized', 'Default category slug' ) );
 
-	if ( global_terms_enabled() ) {
-		$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('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
-			$cat_id = $wpdb->insert_id;
-		}
-		update_option('default_category', $cat_id);
-	} else {
-		$cat_id = 1;
-	}
-
-	$wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
-	$cat_tt_id = $wpdb->insert_id;
-
-	// First post
-	$now = current_time( 'mysql' );
-	$now_gmt = current_time( 'mysql', 1 );
-	$first_post_guid = get_option( 'home' ) . '/?p=1';
-
-	if ( is_multisite() ) {
-		$first_post = get_site_option( 'first_post' );
-
-		if ( ! $first_post ) {
-			/* translators: %s: site link */
-			$first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' );
+		if ( global_terms_enabled() ) {
+			$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(
+						'cat_ID'            => 0,
+						'cat_name'          => $cat_name,
+						'category_nicename' => $cat_slug,
+						'last_updated'      => current_time( 'mysql', true ),
+					)
+				);
+				$cat_id = $wpdb->insert_id;
+			}
+			update_option( 'default_category', $cat_id );
+		} else {
+			$cat_id = 1;
 		}
 
-		$first_post = sprintf( $first_post,
-			sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
+		$wpdb->insert(
+			$wpdb->terms, array(
+				'term_id'    => $cat_id,
+				'name'       => $cat_name,
+				'slug'       => $cat_slug,
+				'term_group' => 0,
+			)
+		);
+		$wpdb->insert(
+			$wpdb->term_taxonomy, array(
+				'term_id'     => $cat_id,
+				'taxonomy'    => 'category',
+				'description' => '',
+				'parent'      => 0,
+				'count'       => 1,
+			)
+		);
+		$cat_tt_id = $wpdb->insert_id;
+
+		// First post
+		$now             = current_time( 'mysql' );
+		$now_gmt         = current_time( 'mysql', 1 );
+		$first_post_guid = get_option( 'home' ) . '/?p=1';
+
+		if ( is_multisite() ) {
+			$first_post = get_site_option( 'first_post' );
+
+			if ( ! $first_post ) {
+				/* translators: %s: site link */
+				$first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' );
+			}
+
+			$first_post = sprintf(
+				$first_post,
+				sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_network()->site_name )
+			);
+
+			// Back-compat for pre-4.4
+			$first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
+			$first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
+		} else {
+			$first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
+		}
+
+		$wpdb->insert(
+			$wpdb->posts, array(
+				'post_author'           => $user_id,
+				'post_date'             => $now,
+				'post_date_gmt'         => $now_gmt,
+				'post_content'          => $first_post,
+				'post_excerpt'          => '',
+				'post_title'            => __( 'Hello world!' ),
+				/* translators: Default post slug */
+				'post_name'             => sanitize_title( _x( 'hello-world', 'Default post slug' ) ),
+				'post_modified'         => $now,
+				'post_modified_gmt'     => $now_gmt,
+				'guid'                  => $first_post_guid,
+				'comment_count'         => 1,
+				'to_ping'               => '',
+				'pinged'                => '',
+				'post_content_filtered' => '',
+			)
+		);
+		$wpdb->insert(
+			$wpdb->term_relationships, array(
+				'term_taxonomy_id' => $cat_tt_id,
+				'object_id'        => 1,
+			)
 		);
 
-		// Back-compat for pre-4.4
-		$first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
-		$first_post = str_replace( 'SITE_NAME', get_network()->site_name, $first_post );
-	} else {
-		$first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
-	}
+		// Default comment
+		if ( is_multisite() ) {
+			$first_comment_author = get_site_option( 'first_comment_author' );
+			$first_comment_email  = get_site_option( 'first_comment_email' );
+			$first_comment_url    = get_site_option( 'first_comment_url', network_home_url() );
+			$first_comment        = get_site_option( 'first_comment' );
+		}
 
-	$wpdb->insert( $wpdb->posts, array(
-		'post_author' => $user_id,
-		'post_date' => $now,
-		'post_date_gmt' => $now_gmt,
-		'post_content' => $first_post,
-		'post_excerpt' => '',
-		'post_title' => __('Hello world!'),
-		/* translators: Default post slug */
-		'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
-		'post_modified' => $now,
-		'post_modified_gmt' => $now_gmt,
-		'guid' => $first_post_guid,
-		'comment_count' => 1,
-		'to_ping' => '',
-		'pinged' => '',
-		'post_content_filtered' => ''
-	));
-	$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
-
-	// Default comment
-	if ( is_multisite() ) {
-		$first_comment_author = get_site_option( 'first_comment_author' );
-		$first_comment_email = get_site_option( 'first_comment_email' );
-		$first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
-		$first_comment = get_site_option( 'first_comment' );
-	}
-
-	$first_comment_author = ! empty( $first_comment_author ) ? $first_comment_author : __( 'A WordPress Commenter' );
-	$first_comment_email = ! empty( $first_comment_email ) ? $first_comment_email : 'wapuu@wordpress.example';
-	$first_comment_url = ! empty( $first_comment_url ) ? $first_comment_url : 'https://wordpress.org/';
-	$first_comment = ! empty( $first_comment ) ? $first_comment :  __( 'Hi, this is a comment.
+		$first_comment_author = ! empty( $first_comment_author ) ? $first_comment_author : __( 'A WordPress Commenter' );
+		$first_comment_email  = ! empty( $first_comment_email ) ? $first_comment_email : 'wapuu@wordpress.example';
+		$first_comment_url    = ! empty( $first_comment_url ) ? $first_comment_url : 'https://wordpress.org/';
+		$first_comment        = ! empty( $first_comment ) ? $first_comment : __(
+			'Hi, this is a comment.
 To get started with moderating, editing, and deleting comments, please visit the Comments screen in the dashboard.
-Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.' );
-	$wpdb->insert( $wpdb->comments, array(
-		'comment_post_ID' => 1,
-		'comment_author' => $first_comment_author,
-		'comment_author_email' => $first_comment_email,
-		'comment_author_url' => $first_comment_url,
-		'comment_date' => $now,
-		'comment_date_gmt' => $now_gmt,
-		'comment_content' => $first_comment
-	));
+Commenter avatars come from <a href="https://gravatar.com">Gravatar</a>.'
+		);
+		$wpdb->insert(
+			$wpdb->comments, array(
+				'comment_post_ID'      => 1,
+				'comment_author'       => $first_comment_author,
+				'comment_author_email' => $first_comment_email,
+				'comment_author_url'   => $first_comment_url,
+				'comment_date'         => $now,
+				'comment_date_gmt'     => $now_gmt,
+				'comment_content'      => $first_comment,
+			)
+		);
 
-	// First Page
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page' );
+		// First Page
+		if ( is_multisite() ) {
+			$first_page = get_site_option( 'first_page' );
+		}
 
-	$first_page = ! empty( $first_page ) ? $first_page : sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+		$first_page = ! empty( $first_page ) ? $first_page : sprintf(
+			__(
+				"This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
 
 <blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
 
@@ -229,59 +274,136 @@ 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() );
+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()
+		);
 
-	$first_post_guid = get_option('home') . '/?page_id=2';
-	$wpdb->insert( $wpdb->posts, array(
-		'post_author' => $user_id,
-		'post_date' => $now,
-		'post_date_gmt' => $now_gmt,
-		'post_content' => $first_page,
-		'post_excerpt' => '',
-		'comment_status' => 'closed',
-		'post_title' => __( 'Sample Page' ),
-		/* translators: Default page slug */
-		'post_name' => __( 'sample-page' ),
-		'post_modified' => $now,
-		'post_modified_gmt' => $now_gmt,
-		'guid' => $first_post_guid,
-		'post_type' => 'page',
-		'to_ping' => '',
-		'pinged' => '',
-		'post_content_filtered' => ''
-	));
-	$wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
+		$first_post_guid = get_option( 'home' ) . '/?page_id=2';
+		$wpdb->insert(
+			$wpdb->posts, array(
+				'post_author'           => $user_id,
+				'post_date'             => $now,
+				'post_date_gmt'         => $now_gmt,
+				'post_content'          => $first_page,
+				'post_excerpt'          => '',
+				'comment_status'        => 'closed',
+				'post_title'            => __( 'Sample Page' ),
+				/* translators: Default page slug */
+				'post_name'             => __( 'sample-page' ),
+				'post_modified'         => $now,
+				'post_modified_gmt'     => $now_gmt,
+				'guid'                  => $first_post_guid,
+				'post_type'             => 'page',
+				'to_ping'               => '',
+				'pinged'                => '',
+				'post_content_filtered' => '',
+			)
+		);
+		$wpdb->insert(
+			$wpdb->postmeta, array(
+				'post_id'    => 2,
+				'meta_key'   => '_wp_page_template',
+				'meta_value' => 'default',
+			)
+		);
 
-	// Set up default widgets for default theme.
-	update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'sidebars_widgets', array( 'wp_inactive_widgets' => array(), 'sidebar-1' => array( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2' ), 'sidebar-2' => array(), 'sidebar-3' => array(), 'array_version' => 3 ) );
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
+		// Set up default widgets for default theme.
+		update_option(
+			'widget_search', array(
+				2              => array( 'title' => '' ),
+				'_multiwidget' => 1,
+			)
+		);
+		update_option(
+			'widget_recent-posts', array(
+				2              => array(
+					'title'  => '',
+					'number' => 5,
+				),
+				'_multiwidget' => 1,
+			)
+		);
+		update_option(
+			'widget_recent-comments', array(
+				2              => array(
+					'title'  => '',
+					'number' => 5,
+				),
+				'_multiwidget' => 1,
+			)
+		);
+		update_option(
+			'widget_archives', array(
+				2              => array(
+					'title'    => '',
+					'count'    => 0,
+					'dropdown' => 0,
+				),
+				'_multiwidget' => 1,
+			)
+		);
+		update_option(
+			'widget_categories', array(
+				2              => array(
+					'title'        => '',
+					'count'        => 0,
+					'hierarchical' => 0,
+					'dropdown'     => 0,
+				),
+				'_multiwidget' => 1,
+			)
+		);
+		update_option(
+			'widget_meta', array(
+				2              => array( 'title' => '' ),
+				'_multiwidget' => 1,
+			)
+		);
+		update_option(
+			'sidebars_widgets', array(
+				'wp_inactive_widgets' => array(),
+				'sidebar-1'           => array(
+					0 => 'search-2',
+					1 => 'recent-posts-2',
+					2 => 'recent-comments-2',
+					3 => 'archives-2',
+					4 => 'categories-2',
+					5 => 'meta-2',
+				),
+				'sidebar-2'           => array(),
+				'sidebar-3'           => array(),
+				'array_version'       => 3,
+			)
+		);
+		if ( ! is_multisite() ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 1 );
+		} elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 2 );
+		}
 
-	if ( is_multisite() ) {
-		// Flush rules to pick up the new page.
-		$wp_rewrite->init();
-		$wp_rewrite->flush_rules();
+		if ( is_multisite() ) {
+			// Flush rules to pick up the new page.
+			$wp_rewrite->init();
+			$wp_rewrite->flush_rules();
 
-		$user = new WP_User($user_id);
-		$wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
+			$user = new WP_User( $user_id );
+			$wpdb->update( $wpdb->options, array( 'option_value' => $user->user_email ), array( 'option_name' => 'admin_email' ) );
 
-		// Remove all perms except for the login user.
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level') );
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
+			// Remove all perms except for the login user.
+			$wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'user_level' ) );
+			$wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix . 'capabilities' ) );
 
-		// 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( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+			// 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(
+						'user_id'  => $user_id,
+						'meta_key' => $wpdb->base_prefix . '1_capabilities',
+					)
+				);
+			}
+		}
 	}
-}
 endif;
 
 /**
@@ -313,16 +435,16 @@ function wp_install_maybe_enable_pretty_permalinks() {
 	 */
 	$permalink_structures = array(
 		'/%year%/%monthnum%/%day%/%postname%/',
-		'/index.php/%year%/%monthnum%/%day%/%postname%/'
+		'/index.php/%year%/%monthnum%/%day%/%postname%/',
 	);
 
 	foreach ( (array) $permalink_structures as $permalink_structure ) {
 		$wp_rewrite->set_permalink_structure( $permalink_structure );
 
 		/*
-	 	 * Flush rules with the hard option to force refresh of the web-server's
-	 	 * rewrite config file (e.g. .htaccess or web.config).
-	 	 */
+		  * Flush rules with the hard option to force refresh of the web-server's
+		  * rewrite config file (e.g. .htaccess or web.config).
+		  */
 		$wp_rewrite->flush_rules( true );
 
 		$test_url = '';
@@ -334,12 +456,12 @@ function wp_install_maybe_enable_pretty_permalinks() {
 		}
 
 		/*
-	 	 * Send a request to the site, and check whether
-	 	 * the 'x-pingback' header is returned as expected.
-	 	 *
-	 	 * Uses wp_remote_get() instead of wp_remote_head() because web servers
-	 	 * can block head requests.
-	 	 */
+		  * Send a request to the site, and check whether
+		  * the 'x-pingback' header is returned as expected.
+		  *
+		  * Uses wp_remote_get() instead of wp_remote_head() because web servers
+		  * can block head requests.
+		  */
 		$response          = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
 		$x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
 		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' );
@@ -359,99 +481,106 @@ function wp_install_maybe_enable_pretty_permalinks() {
 	return false;
 }
 
-if ( !function_exists('wp_new_blog_notification') ) :
-/**
- * Notifies the site admin that the setup is complete.
- *
- * Sends an email with wp_mail to the new administrator that the site setup is complete,
- * and provides them with a record of their login credentials.
- *
- * @since 2.1.0
- *
- * @param string $blog_title Site title.
- * @param string $blog_url   Site url.
- * @param int    $user_id    User ID.
- * @param string $password   User's Password.
- */
-function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
-	$user = new WP_User( $user_id );
-	$email = $user->user_email;
-	$name = $user->user_login;
-	$login_url = wp_login_url();
-	/* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
-	$message = sprintf( __( "Your new WordPress site has been successfully set up at:
+if ( ! function_exists( 'wp_new_blog_notification' ) ) :
+	/**
+	 * Notifies the site admin that the setup is complete.
+	 *
+	 * Sends an email with wp_mail to the new administrator that the site setup is complete,
+	 * and provides them with a record of their login credentials.
+	 *
+	 * @since 2.1.0
+	 *
+	 * @param string $blog_title Site title.
+	 * @param string $blog_url   Site url.
+	 * @param int    $user_id    User ID.
+	 * @param string $password   User's Password.
+	 */
+	function wp_new_blog_notification( $blog_title, $blog_url, $user_id, $password ) {
+		$user      = new WP_User( $user_id );
+		$email     = $user->user_email;
+		$name      = $user->user_login;
+		$login_url = wp_login_url();
+		/* translators: New site notification email. 1: New site URL, 2: User login, 3: User password or password reset link, 4: Login URL */
+		$message = sprintf(
+			__(
+				'Your new WordPress site has been successfully set up at:
 
-%1\$s
+%1$s
 
 You can log in to the administrator account with the following information:
 
-Username: %2\$s
-Password: %3\$s
-Log in here: %4\$s
+Username: %2$s
+Password: %3$s
+Log in here: %4$s
 
 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);
-}
+		@wp_mail( $email, __( 'New WordPress Site' ), $message );
+	}
 endif;
 
-if ( !function_exists('wp_upgrade') ) :
-/**
- * Runs WordPress Upgrade functions.
- *
- * Upgrades the database if needed during a site update.
- *
- * @since 2.1.0
- *
- * @global int  $wp_current_db_version
- * @global int  $wp_db_version
- * @global wpdb $wpdb WordPress database abstraction object.
- */
-function wp_upgrade() {
-	global $wp_current_db_version, $wp_db_version, $wpdb;
-
-	$wp_current_db_version = __get_option('db_version');
-
-	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
-
-	if ( ! is_blog_installed() )
-		return;
-
-	wp_check_mysql_version();
-	wp_cache_flush();
-	pre_schema_upgrade();
-	make_db_current_silent();
-	upgrade_all();
-	if ( is_multisite() && is_main_site() )
-		upgrade_network();
-	wp_cache_flush();
-
-	if ( is_multisite() ) {
-		$site_id = get_current_blog_id();
-
-		if ( $wpdb->get_row( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = %d", $site_id ) ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->blog_versions} SET db_version = %d WHERE blog_id = %d", $wp_db_version, $site_id ) );
-		} else {
-			$wpdb->query( $wpdb->prepare( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( %d, %d, NOW() );", $site_id, $wp_db_version ) );
-		}
-	}
-
+if ( ! function_exists( 'wp_upgrade' ) ) :
 	/**
-	 * Fires after a site is fully upgraded.
+	 * Runs WordPress Upgrade functions.
 	 *
-	 * @since 3.9.0
+	 * Upgrades the database if needed during a site update.
 	 *
-	 * @param int $wp_db_version         The new $wp_db_version.
-	 * @param int $wp_current_db_version The old (current) $wp_db_version.
+	 * @since 2.1.0
+	 *
+	 * @global int  $wp_current_db_version
+	 * @global int  $wp_db_version
+	 * @global wpdb $wpdb WordPress database abstraction object.
 	 */
-	do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
-}
+	function wp_upgrade() {
+		global $wp_current_db_version, $wp_db_version, $wpdb;
+
+		$wp_current_db_version = __get_option( 'db_version' );
+
+		// We are up-to-date. Nothing to do.
+		if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+		}
+
+		if ( ! is_blog_installed() ) {
+			return;
+		}
+
+		wp_check_mysql_version();
+		wp_cache_flush();
+		pre_schema_upgrade();
+		make_db_current_silent();
+		upgrade_all();
+		if ( is_multisite() && is_main_site() ) {
+			upgrade_network();
+		}
+		wp_cache_flush();
+
+		if ( is_multisite() ) {
+			$site_id = get_current_blog_id();
+
+			if ( $wpdb->get_row( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = %d", $site_id ) ) ) {
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->blog_versions} SET db_version = %d WHERE blog_id = %d", $wp_db_version, $site_id ) );
+			} else {
+				$wpdb->query( $wpdb->prepare( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( %d, %d, NOW() );", $site_id, $wp_db_version ) );
+			}
+		}
+
+		/**
+		 * Fires after a site is fully upgraded.
+		 *
+		 * @since 3.9.0
+		 *
+		 * @param int $wp_db_version         The new $wp_db_version.
+		 * @param int $wp_current_db_version The old (current) $wp_db_version.
+		 */
+		do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
+	}
 endif;
 
 /**
@@ -468,24 +597,27 @@ endif;
  */
 function upgrade_all() {
 	global $wp_current_db_version, $wp_db_version;
-	$wp_current_db_version = __get_option('db_version');
+	$wp_current_db_version = __get_option( 'db_version' );
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ( $wp_db_version == $wp_current_db_version ) {
 		return;
+	}
 
 	// If the version is not set in the DB, try to guess the version.
-	if ( empty($wp_current_db_version) ) {
+	if ( empty( $wp_current_db_version ) ) {
 		$wp_current_db_version = 0;
 
 		// If the template option exists, we have 1.5.
-		$template = __get_option('template');
-		if ( !empty($template) )
+		$template = __get_option( 'template' );
+		if ( ! empty( $template ) ) {
 			$wp_current_db_version = 2541;
+		}
 	}
 
-	if ( $wp_current_db_version < 6039 )
+	if ( $wp_current_db_version < 6039 ) {
 		upgrade_230_options_table();
+	}
 
 	populate_options();
 
@@ -496,77 +628,101 @@ function upgrade_all() {
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
+	if ( $wp_current_db_version < 3308 ) {
 		upgrade_160();
+	}
 
-	if ( $wp_current_db_version < 4772 )
+	if ( $wp_current_db_version < 4772 ) {
 		upgrade_210();
+	}
 
-	if ( $wp_current_db_version < 4351 )
+	if ( $wp_current_db_version < 4351 ) {
 		upgrade_old_slugs();
+	}
 
-	if ( $wp_current_db_version < 5539 )
+	if ( $wp_current_db_version < 5539 ) {
 		upgrade_230();
+	}
 
-	if ( $wp_current_db_version < 6124 )
+	if ( $wp_current_db_version < 6124 ) {
 		upgrade_230_old_tables();
+	}
 
-	if ( $wp_current_db_version < 7499 )
+	if ( $wp_current_db_version < 7499 ) {
 		upgrade_250();
+	}
 
-	if ( $wp_current_db_version < 7935 )
+	if ( $wp_current_db_version < 7935 ) {
 		upgrade_252();
+	}
 
-	if ( $wp_current_db_version < 8201 )
+	if ( $wp_current_db_version < 8201 ) {
 		upgrade_260();
+	}
 
-	if ( $wp_current_db_version < 8989 )
+	if ( $wp_current_db_version < 8989 ) {
 		upgrade_270();
+	}
 
-	if ( $wp_current_db_version < 10360 )
+	if ( $wp_current_db_version < 10360 ) {
 		upgrade_280();
+	}
 
-	if ( $wp_current_db_version < 11958 )
+	if ( $wp_current_db_version < 11958 ) {
 		upgrade_290();
+	}
 
-	if ( $wp_current_db_version < 15260 )
+	if ( $wp_current_db_version < 15260 ) {
 		upgrade_300();
+	}
 
-	if ( $wp_current_db_version < 19389 )
+	if ( $wp_current_db_version < 19389 ) {
 		upgrade_330();
+	}
 
-	if ( $wp_current_db_version < 20080 )
+	if ( $wp_current_db_version < 20080 ) {
 		upgrade_340();
+	}
 
-	if ( $wp_current_db_version < 22422 )
+	if ( $wp_current_db_version < 22422 ) {
 		upgrade_350();
+	}
 
-	if ( $wp_current_db_version < 25824 )
+	if ( $wp_current_db_version < 25824 ) {
 		upgrade_370();
+	}
 
-	if ( $wp_current_db_version < 26148 )
+	if ( $wp_current_db_version < 26148 ) {
 		upgrade_372();
+	}
 
-	if ( $wp_current_db_version < 26691 )
+	if ( $wp_current_db_version < 26691 ) {
 		upgrade_380();
+	}
 
-	if ( $wp_current_db_version < 29630 )
+	if ( $wp_current_db_version < 29630 ) {
 		upgrade_400();
+	}
 
-	if ( $wp_current_db_version < 33055 )
+	if ( $wp_current_db_version < 33055 ) {
 		upgrade_430();
+	}
 
-	if ( $wp_current_db_version < 33056 )
+	if ( $wp_current_db_version < 33056 ) {
 		upgrade_431();
+	}
 
-	if ( $wp_current_db_version < 35700 )
+	if ( $wp_current_db_version < 35700 ) {
 		upgrade_440();
+	}
 
-	if ( $wp_current_db_version < 36686 )
+	if ( $wp_current_db_version < 36686 ) {
 		upgrade_450();
+	}
 
-	if ( $wp_current_db_version < 37965 )
+	if ( $wp_current_db_version < 37965 ) {
 		upgrade_460();
+	}
 
 	maybe_disable_link_manager();
 
@@ -588,21 +744,21 @@ function upgrade_100() {
 	global $wpdb;
 
 	// Get the title and ID of every post, post_name to check if it already has a value
-	$posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''");
-	if ($posts) {
-		foreach ($posts as $post) {
-			if ('' == $post->post_name) {
-				$newtitle = sanitize_title($post->post_title);
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) );
+	$posts = $wpdb->get_results( "SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''" );
+	if ( $posts ) {
+		foreach ( $posts as $post ) {
+			if ( '' == $post->post_name ) {
+				$newtitle = sanitize_title( $post->post_title );
+				$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID ) );
 			}
 		}
 	}
 
-	$categories = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories");
-	foreach ($categories as $category) {
-		if ('' == $category->category_nicename) {
-			$newtitle = sanitize_title($category->cat_name);
-			$wpdb->update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) );
+	$categories = $wpdb->get_results( "SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories" );
+	foreach ( $categories as $category ) {
+		if ( '' == $category->category_nicename ) {
+			$newtitle = sanitize_title( $category->cat_name );
+			$wpdb->update( $wpdb->categories, array( 'category_nicename' => $newtitle ), array( 'cat_ID' => $category->cat_ID ) );
 		}
 	}
 
@@ -612,24 +768,29 @@ function upgrade_100() {
 		AND option_value LIKE %s";
 	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( 'links_rating_image' ) . '%', $wpdb->esc_like( 'wp-links/links-images/' ) . '%' ) );
 
-	$done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
-	if ($done_ids) :
+	$done_ids = $wpdb->get_results( "SELECT DISTINCT post_id FROM $wpdb->post2cat" );
+	if ( $done_ids ) :
 		$done_posts = array();
-		foreach ($done_ids as $done_id) :
+		foreach ( $done_ids as $done_id ) :
 			$done_posts[] = $done_id->post_id;
 		endforeach;
-		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
-	else:
+		$catwhere = ' AND ID NOT IN (' . implode( ',', $done_posts ) . ')';
+	else :
 		$catwhere = '';
 	endif;
 
-	$allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
-	if ($allposts) :
-		foreach ($allposts as $post) {
+	$allposts = $wpdb->get_results( "SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere" );
+	if ( $allposts ) :
+		foreach ( $allposts as $post ) {
 			// Check to see if it's already been imported
-			$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('post_id' => $post->ID, 'category_id' => $post->post_category) );
+			$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(
+						'post_id'     => $post->ID,
+						'category_id' => $post->post_category,
+					)
+				);
 			}
 		}
 	endif;
@@ -647,13 +808,13 @@ function upgrade_101() {
 	global $wpdb;
 
 	// Clean up indices, add a few
-	add_clean_index($wpdb->posts, 'post_name');
-	add_clean_index($wpdb->posts, 'post_status');
-	add_clean_index($wpdb->categories, 'category_nicename');
-	add_clean_index($wpdb->comments, 'comment_approved');
-	add_clean_index($wpdb->comments, 'comment_post_ID');
-	add_clean_index($wpdb->links , 'link_category');
-	add_clean_index($wpdb->links , 'link_visible');
+	add_clean_index( $wpdb->posts, 'post_name' );
+	add_clean_index( $wpdb->posts, 'post_status' );
+	add_clean_index( $wpdb->categories, 'category_nicename' );
+	add_clean_index( $wpdb->comments, 'comment_approved' );
+	add_clean_index( $wpdb->comments, 'comment_post_ID' );
+	add_clean_index( $wpdb->links, 'link_category' );
+	add_clean_index( $wpdb->links, 'link_visible' );
 }
 
 /**
@@ -668,18 +829,18 @@ function upgrade_110() {
 	global $wpdb;
 
 	// Set user_nicename.
-	$users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
-	foreach ($users as $user) {
-		if ('' == $user->user_nicename) {
-			$newname = sanitize_title($user->user_nickname);
-			$wpdb->update( $wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID) );
+	$users = $wpdb->get_results( "SELECT ID, user_nickname, user_nicename FROM $wpdb->users" );
+	foreach ( $users as $user ) {
+		if ( '' == $user->user_nicename ) {
+			$newname = sanitize_title( $user->user_nickname );
+			$wpdb->update( $wpdb->users, array( 'user_nicename' => $newname ), array( 'ID' => $user->ID ) );
 		}
 	}
 
-	$users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
-	foreach ($users as $row) {
-		if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-			$wpdb->update( $wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID) );
+	$users = $wpdb->get_results( "SELECT ID, user_pass from $wpdb->users" );
+	foreach ( $users as $row ) {
+		if ( ! preg_match( '/^[A-Fa-f0-9]{32}$/', $row->user_pass ) ) {
+			$wpdb->update( $wpdb->users, array( 'user_pass' => md5( $row->user_pass ) ), array( 'ID' => $row->ID ) );
 		}
 	}
 
@@ -688,33 +849,33 @@ function upgrade_110() {
 
 	$time_difference = $all_options->time_difference;
 
-		$server_time = time()+date('Z');
-	$weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
-	$gmt_time = time();
+		$server_time = time() + date( 'Z' );
+	$weblogger_time  = $server_time + $time_difference * HOUR_IN_SECONDS;
+	$gmt_time        = time();
 
-	$diff_gmt_server = ($gmt_time - $server_time) / HOUR_IN_SECONDS;
-	$diff_weblogger_server = ($weblogger_time - $server_time) / HOUR_IN_SECONDS;
-	$diff_gmt_weblogger = $diff_gmt_server - $diff_weblogger_server;
-	$gmt_offset = -$diff_gmt_weblogger;
+	$diff_gmt_server       = ( $gmt_time - $server_time ) / HOUR_IN_SECONDS;
+	$diff_weblogger_server = ( $weblogger_time - $server_time ) / HOUR_IN_SECONDS;
+	$diff_gmt_weblogger    = $diff_gmt_server - $diff_weblogger_server;
+	$gmt_offset            = -$diff_gmt_weblogger;
 
 	// Add a gmt_offset option, with value $gmt_offset
-	add_option('gmt_offset', $gmt_offset);
+	add_option( 'gmt_offset', $gmt_offset );
 
 	// Check if we already set the GMT fields (if we did, then
 	// MAX(post_date_gmt) can't be '0000-00-00 00:00:00'
 	// <michel_v> I just slapped myself silly for not thinking about it earlier
-	$got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
+	$got_gmt_fields = ! ( $wpdb->get_var( "SELECT MAX(post_date_gmt) FROM $wpdb->posts" ) == '0000-00-00 00:00:00' );
 
-	if (!$got_gmt_fields) {
+	if ( ! $got_gmt_fields ) {
 
 		// Add or subtract time to all dates, to get GMT dates
-		$add_hours = intval($diff_gmt_weblogger);
-		$add_minutes = intval(60 * ($diff_gmt_weblogger - $add_hours));
-		$wpdb->query("UPDATE $wpdb->posts SET post_date_gmt = DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
-		$wpdb->query("UPDATE $wpdb->posts SET post_modified = post_date");
-		$wpdb->query("UPDATE $wpdb->posts SET post_modified_gmt = DATE_ADD(post_modified, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE) WHERE post_modified != '0000-00-00 00:00:00'");
-		$wpdb->query("UPDATE $wpdb->comments SET comment_date_gmt = DATE_ADD(comment_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
-		$wpdb->query("UPDATE $wpdb->users SET user_registered = DATE_ADD(user_registered, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)");
+		$add_hours   = intval( $diff_gmt_weblogger );
+		$add_minutes = intval( 60 * ( $diff_gmt_weblogger - $add_hours ) );
+		$wpdb->query( "UPDATE $wpdb->posts SET post_date_gmt = DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)" );
+		$wpdb->query( "UPDATE $wpdb->posts SET post_modified = post_date" );
+		$wpdb->query( "UPDATE $wpdb->posts SET post_modified_gmt = DATE_ADD(post_modified, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE) WHERE post_modified != '0000-00-00 00:00:00'" );
+		$wpdb->query( "UPDATE $wpdb->comments SET comment_date_gmt = DATE_ADD(comment_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)" );
+		$wpdb->query( "UPDATE $wpdb->users SET user_registered = DATE_ADD(user_registered, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)" );
 	}
 
 }
@@ -731,74 +892,75 @@ function upgrade_130() {
 	global $wpdb;
 
 	// Remove extraneous backslashes.
-	$posts = $wpdb->get_results("SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts");
-	if ($posts) {
-		foreach ($posts as $post) {
-			$post_content = addslashes(deslash($post->post_content));
-			$post_title = addslashes(deslash($post->post_title));
-			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
-				$guid = get_permalink($post->ID);
-			else
+	$posts = $wpdb->get_results( "SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts" );
+	if ( $posts ) {
+		foreach ( $posts as $post ) {
+			$post_content = addslashes( deslash( $post->post_content ) );
+			$post_title   = addslashes( deslash( $post->post_title ) );
+			$post_excerpt = addslashes( deslash( $post->post_excerpt ) );
+			if ( empty( $post->guid ) ) {
+				$guid = get_permalink( $post->ID );
+			} else {
 				$guid = $post->guid;
+			}
 
-			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
+			$wpdb->update( $wpdb->posts, compact( 'post_title', 'post_content', 'post_excerpt', 'guid' ), array( 'ID' => $post->ID ) );
 
 		}
 	}
 
 	// Remove extraneous backslashes.
-	$comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments");
-	if ($comments) {
-		foreach ($comments as $comment) {
-			$comment_content = deslash($comment->comment_content);
-			$comment_author = deslash($comment->comment_author);
+	$comments = $wpdb->get_results( "SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments" );
+	if ( $comments ) {
+		foreach ( $comments as $comment ) {
+			$comment_content = deslash( $comment->comment_content );
+			$comment_author  = deslash( $comment->comment_author );
 
-			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID) );
+			$wpdb->update( $wpdb->comments, compact( 'comment_content', 'comment_author' ), array( 'comment_ID' => $comment->comment_ID ) );
 		}
 	}
 
 	// Remove extraneous backslashes.
-	$links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links");
-	if ($links) {
-		foreach ($links as $link) {
-			$link_name = deslash($link->link_name);
-			$link_description = deslash($link->link_description);
+	$links = $wpdb->get_results( "SELECT link_id, link_name, link_description FROM $wpdb->links" );
+	if ( $links ) {
+		foreach ( $links as $link ) {
+			$link_name        = deslash( $link->link_name );
+			$link_description = deslash( $link->link_description );
 
-			$wpdb->update( $wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id) );
+			$wpdb->update( $wpdb->links, compact( 'link_name', 'link_description' ), array( 'link_id' => $link->link_id ) );
 		}
 	}
 
-	$active_plugins = __get_option('active_plugins');
+	$active_plugins = __get_option( 'active_plugins' );
 
 	/*
 	 * If plugins are not stored in an array, they're stored in the old
 	 * newline separated format. Convert to new format.
 	 */
-	if ( !is_array( $active_plugins ) ) {
-		$active_plugins = explode("\n", trim($active_plugins));
-		update_option('active_plugins', $active_plugins);
+	if ( ! is_array( $active_plugins ) ) {
+		$active_plugins = explode( "\n", trim( $active_plugins ) );
+		update_option( 'active_plugins', $active_plugins );
 	}
 
 	// Obsolete tables
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options');
+	$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues' );
+	$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes' );
+	$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups' );
+	$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options' );
 
 	// Update comments table to use comment_type
-	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
-	$wpdb->query("UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'");
+	$wpdb->query( "UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'" );
+	$wpdb->query( "UPDATE $wpdb->comments SET comment_type='pingback', comment_content = REPLACE(comment_content, '<pingback />', '') WHERE comment_content LIKE '<pingback />%'" );
 
 	// Some versions have multiple duplicate option_name rows with the same values
-	$options = $wpdb->get_results("SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name");
+	$options = $wpdb->get_results( "SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name" );
 	foreach ( $options as $option ) {
 		if ( 1 != $option->dupes ) { // Could this be done in the query?
-			$limit = $option->dupes - 1;
-			$dupe_ids = $wpdb->get_col( $wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit) );
+			$limit    = $option->dupes - 1;
+			$dupe_ids = $wpdb->get_col( $wpdb->prepare( "SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit ) );
 			if ( $dupe_ids ) {
-				$dupe_ids = join($dupe_ids, ',');
-				$wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
+				$dupe_ids = join( $dupe_ids, ',' );
+				$wpdb->query( "DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)" );
 			}
 		}
 	}
@@ -820,75 +982,106 @@ function upgrade_160() {
 
 	populate_roles_160();
 
-	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
+	$users = $wpdb->get_results( "SELECT * FROM $wpdb->users" );
 	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
+		if ( ! empty( $user->user_firstname ) ) {
+			update_user_meta( $user->ID, 'first_name', wp_slash( $user->user_firstname ) );
+		}
+		if ( ! empty( $user->user_lastname ) ) {
+			update_user_meta( $user->ID, 'last_name', wp_slash( $user->user_lastname ) );
+		}
+		if ( ! empty( $user->user_nickname ) ) {
+			update_user_meta( $user->ID, 'nickname', wp_slash( $user->user_nickname ) );
+		}
+		if ( ! empty( $user->user_level ) ) {
 			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		}
+		if ( ! empty( $user->user_icq ) ) {
+			update_user_meta( $user->ID, 'icq', wp_slash( $user->user_icq ) );
+		}
+		if ( ! empty( $user->user_aim ) ) {
+			update_user_meta( $user->ID, 'aim', wp_slash( $user->user_aim ) );
+		}
+		if ( ! empty( $user->user_msn ) ) {
+			update_user_meta( $user->ID, 'msn', wp_slash( $user->user_msn ) );
+		}
+		if ( ! empty( $user->user_yim ) ) {
+			update_user_meta( $user->ID, 'yim', wp_slash( $user->user_icq ) );
+		}
+		if ( ! empty( $user->user_description ) ) {
+			update_user_meta( $user->ID, 'description', wp_slash( $user->user_description ) );
+		}
 
-		if ( isset( $user->user_idmode ) ):
+		if ( isset( $user->user_idmode ) ) :
 			$idmode = $user->user_idmode;
-			if ($idmode == 'nickname') $id = $user->user_nickname;
-			if ($idmode == 'login') $id = $user->user_login;
-			if ($idmode == 'firstname') $id = $user->user_firstname;
-			if ($idmode == 'lastname') $id = $user->user_lastname;
-			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
-			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
-			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
+			if ( $idmode == 'nickname' ) {
+				$id = $user->user_nickname;
+			}
+			if ( $idmode == 'login' ) {
+				$id = $user->user_login;
+			}
+			if ( $idmode == 'firstname' ) {
+				$id = $user->user_firstname;
+			}
+			if ( $idmode == 'lastname' ) {
+				$id = $user->user_lastname;
+			}
+			if ( $idmode == 'namefl' ) {
+				$id = $user->user_firstname . ' ' . $user->user_lastname;
+			}
+			if ( $idmode == 'namelf' ) {
+				$id = $user->user_lastname . ' ' . $user->user_firstname;
+			}
+			if ( ! $idmode ) {
+				$id = $user->user_nickname;
+			}
+			$wpdb->update( $wpdb->users, array( 'display_name' => $id ), array( 'ID' => $user->ID ) );
 		endif;
 
 		// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
-		$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
-		if ( empty($caps) || defined('RESET_CAPS') ) {
-			$level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
-			$role = translate_level_to_role($level);
-			update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+		$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities' );
+		if ( empty( $caps ) || defined( 'RESET_CAPS' ) ) {
+			$level = get_user_meta( $user->ID, $wpdb->prefix . 'user_level', true );
+			$role  = translate_level_to_role( $level );
+			update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array( $role => true ) );
 		}
 
 	endforeach;
 	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	foreach ( $old_user_fields as $old ) {
+		$wpdb->query( "ALTER TABLE $wpdb->users DROP $old" );
+	}
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
 	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
-		foreach ($comments as $comment)
-			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+	if ( is_array( $comments ) ) {
+		foreach ( $comments as $comment ) {
+			$wpdb->update( $wpdb->posts, array( 'comment_count' => $comment->c ), array( 'ID' => $comment->comment_post_ID ) );
+		}
+	}
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
 	 * and put the mime type in post_type instead of post_mime_type.
 	 */
 	if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
-		$objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
-		foreach ($objects as $object) {
-			$wpdb->update( $wpdb->posts, array(	'post_status' => 'attachment',
-												'post_mime_type' => $object->post_type,
-												'post_type' => ''),
-										array( 'ID' => $object->ID ) );
+		$objects = $wpdb->get_results( "SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'" );
+		foreach ( $objects as $object ) {
+			$wpdb->update(
+				$wpdb->posts, array(
+					'post_status'    => 'attachment',
+					'post_mime_type' => $object->post_type,
+					'post_type'      => '',
+				),
+				array( 'ID' => $object->ID )
+			);
 
-			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
+			$meta = get_post_meta( $object->ID, 'imagedata', true );
+			if ( ! empty( $meta['file'] ) ) {
 				update_attached_file( $object->ID, $meta['file'] );
+			}
 		}
 	}
 }
@@ -907,21 +1100,23 @@ function upgrade_210() {
 
 	if ( $wp_current_db_version < 3506 ) {
 		// Update status and type.
-		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
+		$posts = $wpdb->get_results( "SELECT ID, post_status FROM $wpdb->posts" );
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
-			$status = $post->post_status;
-			$type = 'post';
+		if ( ! empty( $posts ) ) {
+			foreach ( $posts as $post ) {
+				$status = $post->post_status;
+				$type   = 'post';
 
-			if ( 'static' == $status ) {
-				$status = 'publish';
-				$type = 'page';
-			} elseif ( 'attachment' == $status ) {
-				$status = 'inherit';
-				$type = 'attachment';
+				if ( 'static' == $status ) {
+					$status = 'publish';
+					$type   = 'page';
+				} elseif ( 'attachment' == $status ) {
+					$status = 'inherit';
+					$type   = 'attachment';
+				}
+
+							$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID ) );
 			}
-
-			$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID) );
 		}
 	}
 
@@ -931,13 +1126,15 @@ function upgrade_210() {
 
 	if ( $wp_current_db_version < 3531 ) {
 		// Give future posts a post_status of future.
-		$now = gmdate('Y-m-d H:i:59');
-		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
+		$now = gmdate( 'Y-m-d H:i:59' );
+		$wpdb->query( "UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'" );
 
-		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
-				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
+		$posts = $wpdb->get_results( "SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'" );
+		if ( ! empty( $posts ) ) {
+			foreach ( $posts as $post ) {
+				wp_schedule_single_event( mysql2date( 'U', $post->post_date, false ), 'publish_future_post', array( $post->ID ) );
+			}
+		}
 	}
 }
 
@@ -958,86 +1155,98 @@ function upgrade_230() {
 	}
 
 	// Convert categories to terms.
-	$tt_ids = array();
-	$have_tags = false;
-	$categories = $wpdb->get_results("SELECT * FROM $wpdb->categories ORDER BY cat_ID");
-	foreach ($categories as $category) {
-		$term_id = (int) $category->cat_ID;
-		$name = $category->cat_name;
+	$tt_ids     = array();
+	$have_tags  = false;
+	$categories = $wpdb->get_results( "SELECT * FROM $wpdb->categories ORDER BY cat_ID" );
+	foreach ( $categories as $category ) {
+		$term_id     = (int) $category->cat_ID;
+		$name        = $category->cat_name;
 		$description = $category->category_description;
-		$slug = $category->category_nicename;
-		$parent = $category->category_parent;
-		$term_group = 0;
+		$slug        = $category->category_nicename;
+		$parent      = $category->category_parent;
+		$term_group  = 0;
 
 		// Associate terms with the same slug in a term group and make slugs unique.
-		if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+		if ( $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) ) ) {
 			$term_group = $exists[0]->term_group;
-			$id = $exists[0]->term_id;
-			$num = 2;
+			$id         = $exists[0]->term_id;
+			$num        = 2;
 			do {
 				$alt_slug = $slug . "-$num";
 				$num++;
-				$slug_check = $wpdb->get_var( $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug) );
+				$slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug ) );
 			} while ( $slug_check );
 
 			$slug = $alt_slug;
 
 			if ( empty( $term_group ) ) {
-				$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id) );
+				$term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group" ) + 1;
+				$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id ) );
 			}
 		}
 
-		$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) );
+		$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
+			)
+		);
 
 		$count = 0;
-		if ( !empty($category->category_count) ) {
-			$count = (int) $category->category_count;
+		if ( ! empty( $category->category_count ) ) {
+			$count    = (int) $category->category_count;
 			$taxonomy = 'category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
-			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+			$wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count ) );
+			$tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->link_count) ) {
-			$count = (int) $category->link_count;
+		if ( ! empty( $category->link_count ) ) {
+			$count    = (int) $category->link_count;
 			$taxonomy = 'link_category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
-			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+			$wpdb->query( $wpdb->prepare( "INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count ) );
+			$tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->tag_count) ) {
+		if ( ! empty( $category->tag_count ) ) {
 			$have_tags = true;
-			$count = (int) $category->tag_count;
-			$taxonomy = 'post_tag';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
-			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+			$count     = (int) $category->tag_count;
+			$taxonomy  = 'post_tag';
+			$wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent', 'count' ) );
+			$tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
 		}
 
-		if ( empty($count) ) {
-			$count = 0;
+		if ( empty( $count ) ) {
+			$count    = 0;
 			$taxonomy = 'category';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
-			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
+			$wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent', 'count' ) );
+			$tt_ids[ $term_id ][ $taxonomy ] = (int) $wpdb->insert_id;
 		}
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
+	if ( $have_tags ) {
 		$select .= ', rel_type';
+	}
 
-	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
+	$posts = $wpdb->get_results( "SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id" );
 	foreach ( $posts as $post ) {
-		$post_id = (int) $post->post_id;
-		$term_id = (int) $post->category_id;
+		$post_id  = (int) $post->post_id;
+		$term_id  = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
+		if ( ! empty( $post->rel_type ) && 'tag' == $post->rel_type ) {
 			$taxonomy = 'tag';
-		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
+		}
+		$tt_id = $tt_ids[ $term_id ][ $taxonomy ];
+		if ( empty( $tt_id ) ) {
 			continue;
+		}
 
-		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
+		$wpdb->insert(
+			$wpdb->term_relationships, array(
+				'object_id'        => $post_id,
+				'term_taxonomy_id' => $tt_id,
+			)
+		);
 	}
 
 	// < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
@@ -1046,78 +1255,103 @@ function upgrade_230() {
 		 * Create link_category terms for link categories. Create a map of link
 		 * cat IDs to link_category terms.
 		 */
-		$link_cat_id_map = array();
+		$link_cat_id_map  = array();
 		$default_link_cat = 0;
-		$tt_ids = array();
-		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
-		foreach ( $link_cats as $category) {
-			$cat_id = (int) $category->cat_id;
-			$term_id = 0;
-			$name = wp_slash($category->cat_name);
-			$slug = sanitize_title($name);
+		$tt_ids           = array();
+		$link_cats        = $wpdb->get_results( 'SELECT cat_id, cat_name FROM ' . $wpdb->prefix . 'linkcategories' );
+		foreach ( $link_cats as $category ) {
+			$cat_id     = (int) $category->cat_id;
+			$term_id    = 0;
+			$name       = wp_slash( $category->cat_name );
+			$slug       = sanitize_title( $name );
 			$term_group = 0;
 
 			// Associate terms with the same slug in a term group and make slugs unique.
-			if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+			if ( $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) ) ) {
 				$term_group = $exists[0]->term_group;
-				$term_id = $exists[0]->term_id;
+				$term_id    = $exists[0]->term_id;
 			}
 
-			if ( empty($term_id) ) {
-				$wpdb->insert( $wpdb->terms, compact('name', 'slug', 'term_group') );
+			if ( empty( $term_id ) ) {
+				$wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) );
 				$term_id = (int) $wpdb->insert_id;
 			}
 
-			$link_cat_id_map[$cat_id] = $term_id;
-			$default_link_cat = $term_id;
+			$link_cat_id_map[ $cat_id ] = $term_id;
+			$default_link_cat           = $term_id;
 
-			$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0) );
-			$tt_ids[$term_id] = (int) $wpdb->insert_id;
+			$wpdb->insert(
+				$wpdb->term_taxonomy, array(
+					'term_id'     => $term_id,
+					'taxonomy'    => 'link_category',
+					'description' => '',
+					'parent'      => 0,
+					'count'       => 0,
+				)
+			);
+			$tt_ids[ $term_id ] = (int) $wpdb->insert_id;
 		}
 
 		// Associate links to cats.
-		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
-			if ( 0 == $link->link_category )
-				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
-				continue;
-			$term_id = $link_cat_id_map[$link->link_category];
-			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
-				continue;
+		$links = $wpdb->get_results( "SELECT link_id, link_category FROM $wpdb->links" );
+		if ( ! empty( $links ) ) {
+			foreach ( $links as $link ) {
+				if ( 0 == $link->link_category ) {
+					continue;
+				}
+				if ( ! isset( $link_cat_id_map[ $link->link_category ] ) ) {
+					continue;
+				}
+				$term_id = $link_cat_id_map[ $link->link_category ];
+				$tt_id   = $tt_ids[ $term_id ];
+				if ( empty( $tt_id ) ) {
+					continue;
+				}
 
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
+				$wpdb->insert(
+					$wpdb->term_relationships, array(
+						'object_id'        => $link->link_id,
+						'term_taxonomy_id' => $tt_id,
+					)
+				);
+			}
 		}
 
 		// Set default to the last category we grabbed during the upgrade loop.
-		update_option('default_link_category', $default_link_cat);
+		update_option( 'default_link_category', $default_link_cat );
 	} else {
-		$links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
+		$links = $wpdb->get_results( "SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id" );
 		foreach ( $links as $link ) {
-			$link_id = (int) $link->link_id;
-			$term_id = (int) $link->category_id;
+			$link_id  = (int) $link->link_id;
+			$term_id  = (int) $link->category_id;
 			$taxonomy = 'link_category';
-			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
+			$tt_id    = $tt_ids[ $term_id ][ $taxonomy ];
+			if ( empty( $tt_id ) ) {
 				continue;
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
+			}
+			$wpdb->insert(
+				$wpdb->term_relationships, array(
+					'object_id'        => $link_id,
+					'term_taxonomy_id' => $tt_id,
+				)
+			);
 		}
 	}
 
 	if ( $wp_current_db_version < 4772 ) {
 		// Obsolete linkcategories table
-		$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
+		$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories' );
 	}
 
 	// Recalculate all counts
-	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
+	$terms = $wpdb->get_results( "SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy" );
 	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
+		if ( ( 'post_tag' == $term->taxonomy ) || ( 'category' == $term->taxonomy ) ) {
+			$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id ) );
+		} else {
+			$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id ) );
+		}
+		$wpdb->update( $wpdb->term_taxonomy, array( 'count' => $count ), array( 'term_taxonomy_id' => $term->term_taxonomy_id ) );
 	}
 }
 
@@ -1133,8 +1367,9 @@ function upgrade_230_options_table() {
 	global $wpdb;
 	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	foreach ( $old_options_fields as $old ) {
+		$wpdb->query( "ALTER TABLE $wpdb->options DROP $old" );
+	}
 	$wpdb->show_errors();
 }
 
@@ -1148,9 +1383,9 @@ function upgrade_230_options_table() {
  */
 function upgrade_230_old_tables() {
 	global $wpdb;
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
+	$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories' );
+	$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat' );
+	$wpdb->query( 'DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat' );
 }
 
 /**
@@ -1164,7 +1399,7 @@ function upgrade_230_old_tables() {
 function upgrade_old_slugs() {
 	// Upgrade people who were using the Redirect Old Slugs plugin.
 	global $wpdb;
-	$wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'");
+	$wpdb->query( "UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'" );
 }
 
 /**
@@ -1195,7 +1430,7 @@ function upgrade_250() {
 function upgrade_252() {
 	global $wpdb;
 
-	$wpdb->query("UPDATE $wpdb->users SET user_activation_key = ''");
+	$wpdb->query( "UPDATE $wpdb->users SET user_activation_key = ''" );
 }
 
 /**
@@ -1209,8 +1444,9 @@ function upgrade_252() {
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
+	if ( $wp_current_db_version < 8000 ) {
 		populate_roles_260();
+	}
 }
 
 /**
@@ -1225,12 +1461,14 @@ function upgrade_260() {
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
+	if ( $wp_current_db_version < 8980 ) {
 		populate_roles_270();
+	}
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
+	if ( $wp_current_db_version < 8921 ) {
 		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	}
 }
 
 /**
@@ -1245,15 +1483,17 @@ function upgrade_270() {
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
+	if ( $wp_current_db_version < 10360 ) {
 		populate_roles_280();
+	}
 	if ( is_multisite() ) {
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
+		while ( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
+				if ( ! @unserialize( $value ) ) {
 					$value = stripslashes( $value );
+				}
 				if ( $value !== $row->option_value ) {
 					update_option( $row->option_name, $value );
 				}
@@ -1296,15 +1536,17 @@ function upgrade_290() {
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
+	if ( $wp_current_db_version < 15093 ) {
 		populate_roles_300();
+	}
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
+	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) {
 		add_site_option( 'siteurl', '' );
+	}
 
 	// 3.0 screen options key name changes.
 	if ( wp_should_upgrade_global_tables() ) {
-		$sql = "DELETE FROM $wpdb->usermeta
+		$sql    = "DELETE FROM $wpdb->usermeta
 			WHERE meta_key LIKE %s
 			OR meta_key LIKE %s
 			OR meta_key LIKE %s
@@ -1318,14 +1560,17 @@ function upgrade_300() {
 			OR meta_key = 'categories_per_page'
 			OR meta_key = 'edit_tags_per_page'";
 		$prefix = $wpdb->esc_like( $wpdb->base_prefix );
-		$wpdb->query( $wpdb->prepare( $sql,
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'manage-'	   ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-order'  ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'metaboxorder'    ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'screen_layout'   ) . '%'
-		) );
+		$wpdb->query(
+			$wpdb->prepare(
+				$sql,
+				$prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
+				$prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
+				$prefix . '%' . $wpdb->esc_like( 'manage-' ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
+				$prefix . '%' . $wpdb->esc_like( 'meta-box-order' ) . '%',
+				$prefix . '%' . $wpdb->esc_like( 'metaboxorder' ) . '%',
+				$prefix . '%' . $wpdb->esc_like( 'screen_layout' ) . '%'
+			)
+		);
 	}
 
 }
@@ -1348,58 +1593,63 @@ function upgrade_330() {
 		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
 	}
 
-	if ( $wp_current_db_version >= 11548 )
+	if ( $wp_current_db_version >= 11548 ) {
 		return;
+	}
 
-	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
+	$sidebars_widgets  = get_option( 'sidebars_widgets', array() );
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+	if ( isset( $sidebars_widgets['wp_inactive_widgets'] ) || empty( $sidebars_widgets ) ) {
 		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
+	} elseif ( ! isset( $sidebars_widgets['array_version'] ) ) {
 		$sidebars_widgets['array_version'] = 1;
+	}
 
 	switch ( $sidebars_widgets['array_version'] ) {
-		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
-			foreach ( (array) $sidebar as $i => $name ) {
-				$id = strtolower($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
-					$_sidebars_widgets[$index][$i] = $id;
-					continue;
-				}
-				$id = sanitize_title($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
-					$_sidebars_widgets[$index][$i] = $id;
-					continue;
-				}
+		case 1:
+			foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+				if ( is_array( $sidebar ) ) {
+					foreach ( (array) $sidebar as $i => $name ) {
+						$id = strtolower( $name );
+						if ( isset( $wp_registered_widgets[ $id ] ) ) {
+							$_sidebars_widgets[ $index ][ $i ] = $id;
+							continue;
+						}
+						$id = sanitize_title( $name );
+						if ( isset( $wp_registered_widgets[ $id ] ) ) {
+							$_sidebars_widgets[ $index ][ $i ] = $id;
+							continue;
+						}
 
-				$found = false;
+						$found = false;
 
-				foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-					if ( strtolower($widget['name']) == strtolower($name) ) {
-						$_sidebars_widgets[$index][$i] = $widget['id'];
-						$found = true;
-						break;
-					} elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
-						$_sidebars_widgets[$index][$i] = $widget['id'];
-						$found = true;
-						break;
+						foreach ( $wp_registered_widgets as $widget_id => $widget ) {
+							if ( strtolower( $widget['name'] ) == strtolower( $name ) ) {
+								$_sidebars_widgets[ $index ][ $i ] = $widget['id'];
+								$found                             = true;
+								break;
+							} elseif ( sanitize_title( $widget['name'] ) == sanitize_title( $name ) ) {
+								$_sidebars_widgets[ $index ][ $i ] = $widget['id'];
+								$found                             = true;
+								break;
+							}
+						}
+
+						if ( $found ) {
+							continue;
+						}
+
+						unset( $_sidebars_widgets[ $index ][ $i ] );
 					}
 				}
-
-				if ( $found )
-					continue;
-
-				unset($_sidebars_widgets[$index][$i]);
 			}
 			$_sidebars_widgets['array_version'] = 2;
-			$sidebars_widgets = $_sidebars_widgets;
-			unset($_sidebars_widgets);
+			$sidebars_widgets                   = $_sidebars_widgets;
+			unset( $_sidebars_widgets );
 
-		case 2 :
-			$sidebars_widgets = retrieve_widgets();
+		case 2:
+			$sidebars_widgets                  = retrieve_widgets();
 			$sidebars_widgets['array_version'] = 3;
 			update_option( 'sidebars_widgets', $sidebars_widgets );
 	}
@@ -1425,7 +1675,7 @@ function upgrade_340() {
 
 	if ( $wp_current_db_version < 19799 ) {
 		$wpdb->hide_errors();
-		$wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
+		$wpdb->query( "ALTER TABLE $wpdb->comments DROP INDEX comment_approved" );
 		$wpdb->show_errors();
 	}
 
@@ -1454,14 +1704,16 @@ function upgrade_340() {
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
+	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
 		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	}
 
 	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
 		$meta_keys = array();
 		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			if ( false !== strpos( $name, '-' ) ) {
+				$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			}
 		}
 		if ( $meta_keys ) {
 			$meta_keys = implode( "', '", $meta_keys );
@@ -1469,8 +1721,9 @@ function upgrade_350() {
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
+	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
 		wp_delete_term( $term->term_id, 'post_format' );
+	}
 }
 
 /**
@@ -1483,8 +1736,9 @@ function upgrade_350() {
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
+	if ( $wp_current_db_version < 25824 ) {
 		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	}
 }
 
 /**
@@ -1498,8 +1752,9 @@ function upgrade_370() {
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
+	if ( $wp_current_db_version < 26148 ) {
 		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	}
 }
 
 /**
@@ -1578,7 +1833,7 @@ function upgrade_430() {
 			$tables = $wpdb->tables( 'all' );
 			if ( ! wp_should_upgrade_global_tables() ) {
 				$global_tables = $wpdb->tables( 'global' );
-				$tables = array_diff_assoc( $tables, $global_tables );
+				$tables        = array_diff_assoc( $tables, $global_tables );
 			}
 		}
 
@@ -1612,10 +1867,10 @@ function upgrade_430_fix_comments() {
 			'length' => 65535,
 		);
 	} elseif ( ! is_array( $content_length ) ) {
-		$length = (int) $content_length > 0 ? (int) $content_length : 65535;
+		$length         = (int) $content_length > 0 ? (int) $content_length : 65535;
 		$content_length = array(
-			'type'	 => 'byte',
-			'length' => $length
+			'type'   => 'byte',
+			'length' => $length,
 		);
 	}
 
@@ -1751,13 +2006,14 @@ function upgrade_network() {
 
 	// 2.8.
 	if ( $wp_current_db_version < 11549 ) {
-		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
+		$wpmu_sitewide_plugins   = get_site_option( 'wpmu_sitewide_plugins' );
 		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
 		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
+			if ( ! $active_sitewide_plugins ) {
 				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
-			else
+			} else {
 				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			}
 
 			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
 		}
@@ -1765,11 +2021,12 @@ function upgrade_network() {
 		delete_site_option( 'deactivated_sitewide_plugins' );
 
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
+		while ( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
+				if ( ! @unserialize( $value ) ) {
 					$value = stripslashes( $value );
+				}
 				if ( $value !== $row->meta_value ) {
 					update_site_option( $row->meta_key, $value );
 				}
@@ -1779,29 +2036,33 @@ function upgrade_network() {
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
+	if ( $wp_current_db_version < 13576 ) {
 		update_site_option( 'global_terms_enabled', '1' );
+	}
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
+	if ( $wp_current_db_version < 19390 ) {
 		update_site_option( 'initial_db_version', $wp_current_db_version );
+	}
 
 	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
+		if ( false === get_site_option( 'active_sitewide_plugins' ) ) {
 			update_site_option( 'active_sitewide_plugins', array() );
+		}
 	}
 
 	// 3.4
 	if ( $wp_current_db_version < 20148 ) {
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		$allowedthemes  = get_site_option( 'allowedthemes'  );
+		$allowedthemes  = get_site_option( 'allowedthemes' );
 		$allowed_themes = get_site_option( 'allowed_themes' );
 		if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
 			$converted = array();
-			$themes = wp_get_themes();
+			$themes    = wp_get_themes();
 			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
+				if ( isset( $allowed_themes[ $theme_data->get( 'Name' ) ] ) ) {
 					$converted[ $stylesheet ] = true;
+				}
 			}
 			update_site_option( 'allowedthemes', $converted );
 			delete_site_option( 'allowed_themes' );
@@ -1809,14 +2070,15 @@ function upgrade_network() {
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
+	if ( $wp_current_db_version < 21823 ) {
 		update_site_option( 'ms_files_rewriting', '1' );
+	}
 
 	// 3.5.2
 	if ( $wp_current_db_version < 24448 ) {
 		$illegal_names = get_site_option( 'illegal_names' );
 		if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
-			$illegal_name = reset( $illegal_names );
+			$illegal_name  = reset( $illegal_names );
 			$illegal_names = explode( ' ', $illegal_name );
 			update_site_option( 'illegal_names', $illegal_names );
 		}
@@ -1892,17 +2154,17 @@ function upgrade_network() {
  * @param string $create_ddl SQL statement to create table.
  * @return bool If table already exists or was created by function.
  */
-function maybe_create_table($table_name, $create_ddl) {
+function maybe_create_table( $table_name, $create_ddl ) {
 	global $wpdb;
 
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $table_name ) );
+	$query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $table_name ) );
 
 	if ( $wpdb->get_var( $query ) == $table_name ) {
 		return true;
 	}
 
 	// Didn't find it try to create it..
-	$wpdb->query($create_ddl);
+	$wpdb->query( $create_ddl );
 
 	// We cannot directly tell that whether this succeeded!
 	if ( $wpdb->get_var( $query ) == $table_name ) {
@@ -1922,13 +2184,13 @@ function maybe_create_table($table_name, $create_ddl) {
  * @param string $index Index name to drop.
  * @return true True, when finished.
  */
-function drop_index($table, $index) {
+function drop_index( $table, $index ) {
 	global $wpdb;
 	$wpdb->hide_errors();
-	$wpdb->query("ALTER TABLE `$table` DROP INDEX `$index`");
+	$wpdb->query( "ALTER TABLE `$table` DROP INDEX `$index`" );
 	// Now we need to take out all the extra ones we may have created
-	for ($i = 0; $i < 25; $i++) {
-		$wpdb->query("ALTER TABLE `$table` DROP INDEX `{$index}_$i`");
+	for ( $i = 0; $i < 25; $i++ ) {
+		$wpdb->query( "ALTER TABLE `$table` DROP INDEX `{$index}_$i`" );
 	}
 	$wpdb->show_errors();
 	return true;
@@ -1945,10 +2207,10 @@ function drop_index($table, $index) {
  * @param string $index Database table index column.
  * @return true True, when done with execution.
  */
-function add_clean_index($table, $index) {
+function add_clean_index( $table, $index ) {
 	global $wpdb;
-	drop_index($table, $index);
-	$wpdb->query("ALTER TABLE `$table` ADD INDEX ( `$index` )");
+	drop_index( $table, $index );
+	$wpdb->query( "ALTER TABLE `$table` ADD INDEX ( `$index` )" );
 	return true;
 }
 
@@ -1964,20 +2226,20 @@ function add_clean_index($table, $index) {
  * @param string $create_ddl  The SQL statement used to add the column.
  * @return bool True if already exists or on successful completion, false on error.
  */
-function maybe_add_column($table_name, $column_name, $create_ddl) {
+function maybe_add_column( $table_name, $column_name, $create_ddl ) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
-		if ($column == $column_name) {
+	foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
+		if ( $column == $column_name ) {
 			return true;
 		}
 	}
 
 	// Didn't find it try to create it.
-	$wpdb->query($create_ddl);
+	$wpdb->query( $create_ddl );
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
-		if ($column == $column_name) {
+	foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
+		if ( $column == $column_name ) {
 			return true;
 		}
 	}
@@ -2005,7 +2267,7 @@ function maybe_convert_table_to_utf8mb4( $table ) {
 	foreach ( $results as $column ) {
 		if ( $column->Collation ) {
 			list( $charset ) = explode( '_', $column->Collation );
-			$charset = strtolower( $charset );
+			$charset         = strtolower( $charset );
 			if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
 				// Don't upgrade tables that have non-utf8 columns.
 				return false;
@@ -2019,7 +2281,7 @@ function maybe_convert_table_to_utf8mb4( $table ) {
 	}
 
 	list( $table_charset ) = explode( '_', $table_details->Collation );
-	$table_charset = strtolower( $table_charset );
+	$table_charset         = strtolower( $table_charset );
 	if ( 'utf8mb4' === $table_charset ) {
 		return true;
 	}
@@ -2041,8 +2303,9 @@ function get_alloptions_110() {
 	$all_options = new stdClass;
 	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
 		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
+			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
 				$option->option_value = untrailingslashit( $option->option_value );
+			}
 			$all_options->{$option->option_name} = stripslashes( $option->option_value );
 		}
 	}
@@ -2061,22 +2324,26 @@ function get_alloptions_110() {
  * @param string $setting Option name.
  * @return mixed
  */
-function __get_option($setting) {
+function __get_option( $setting ) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
+	if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
 		return untrailingslashit( WP_HOME );
+	}
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
+	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
 		return untrailingslashit( WP_SITEURL );
+	}
 
-	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
+	$option = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
-	if ( 'home' == $setting && '' == $option )
+	if ( 'home' == $setting && '' == $option ) {
 		return __get_option( 'siteurl' );
+	}
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
 		$option = untrailingslashit( $option );
+	}
 
 	return maybe_unserialize( $option );
 }
@@ -2089,23 +2356,23 @@ function __get_option($setting) {
  * @param string $content The content to modify.
  * @return string The de-slashed content.
  */
-function deslash($content) {
+function deslash( $content ) {
 	// Note: \\\ inside a regex denotes a single backslash.
 
 	/*
 	 * Replace one or more backslashes followed by a single quote with
 	 * a single quote.
 	 */
-	$content = preg_replace("/\\\+'/", "'", $content);
+	$content = preg_replace( "/\\\+'/", "'", $content );
 
 	/*
 	 * Replace one or more backslashes followed by a double quote with
 	 * a double quote.
 	 */
-	$content = preg_replace('/\\\+"/', '"', $content);
+	$content = preg_replace( '/\\\+"/', '"', $content );
 
 	// Replace one or more backslashes with one backslash.
-	$content = preg_replace("/\\\+/", "\\", $content);
+	$content = preg_replace( '/\\\+/', '\\', $content );
 
 	return $content;
 }
@@ -2129,11 +2396,12 @@ function deslash($content) {
 function dbDelta( $queries = '', $execute = true ) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
+		$queries = wp_get_db_schema( $queries );
+	}
 
 	// Separate individual queries into an array
-	if ( !is_array($queries) ) {
+	if ( ! is_array( $queries ) ) {
 		$queries = explode( ';', $queries );
 		$queries = array_filter( $queries );
 	}
@@ -2147,20 +2415,20 @@ function dbDelta( $queries = '', $execute = true ) {
 	 */
 	$queries = apply_filters( 'dbdelta_queries', $queries );
 
-	$cqueries = array(); // Creation Queries
-	$iqueries = array(); // Insertion Queries
+	$cqueries   = array(); // Creation Queries
+	$iqueries   = array(); // Insertion Queries
 	$for_update = array();
 
 	// Create a tablename index for an array ($cqueries) of queries
-	foreach ($queries as $qry) {
-		if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
+	foreach ( $queries as $qry ) {
+		if ( preg_match( '|CREATE TABLE ([^ ]*)|', $qry, $matches ) ) {
 			$cqueries[ trim( $matches[1], '`' ) ] = $qry;
-			$for_update[$matches[1]] = 'Created table '.$matches[1];
-		} elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) {
+			$for_update[ $matches[1] ]            = 'Created table ' . $matches[1];
+		} elseif ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
 			array_unshift( $cqueries, $qry );
-		} elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
+		} elseif ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
 			$iqueries[] = $qry;
-		} elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
+		} elseif ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
 			$iqueries[] = $qry;
 		} else {
 			// Unrecognized query type
@@ -2201,22 +2469,23 @@ function dbDelta( $queries = '', $execute = true ) {
 		}
 
 		// Fetch the table column structure from the database
-		$suppress = $wpdb->suppress_errors();
-		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
+		$suppress    = $wpdb->suppress_errors();
+		$tablefields = $wpdb->get_results( "DESCRIBE {$table};" );
 		$wpdb->suppress_errors( $suppress );
 
-		if ( ! $tablefields )
+		if ( ! $tablefields ) {
 			continue;
+		}
 
 		// Clear the field and index arrays.
 		$cfields = $indices = $indices_without_subparts = array();
 
 		// Get all of the field names in the query from between the parentheses.
-		preg_match("|\((.*)\)|ms", $qry, $match2);
-		$qryline = trim($match2[1]);
+		preg_match( '|\((.*)\)|ms', $qry, $match2 );
+		$qryline = trim( $match2[1] );
 
 		// Separate field lines into an array.
-		$flds = explode("\n", $qryline);
+		$flds = explode( "\n", $qryline );
 
 		// For every field line specified in the query.
 		foreach ( $flds as $fld ) {
@@ -2224,7 +2493,7 @@ function dbDelta( $queries = '', $execute = true ) {
 
 			// Extract the field name.
 			preg_match( '|^([^ ]*)|', $fld, $fvals );
-			$fieldname = trim( $fvals[1], '`' );
+			$fieldname            = trim( $fvals[1], '`' );
 			$fieldname_lowercased = strtolower( $fieldname );
 
 			// Verify the found field name.
@@ -2291,21 +2560,21 @@ function dbDelta( $queries = '', $execute = true ) {
 						// Extract column name and number of indexed characters (sub_part).
 						preg_match(
 							'/'
-							.   '`?'                      // Name can be escaped with a backtick.
-							.       '(?P<column_name>'    // 1) Name of the column.
-							.           '(?:[0-9a-zA-Z$_-]|[\xC2-\xDF][\x80-\xBF])+'
-							.       ')'
-							.   '`?'                      // Name can be escaped with a backtick.
-							.   '(?:'                     // Optional sub part.
-							.       '\s*'                 // Optional white space character between name and opening bracket.
-							.       '\('                  // Opening bracket for the sub part.
-							.           '\s*'             // Optional white space character after opening bracket.
-							.           '(?P<sub_part>'
-							.               '\d+'         // 2) Number of indexed characters.
-							.           ')'
-							.           '\s*'             // Optional white space character before closing bracket.
-							.        '\)'                 // Closing bracket for the sub part.
-							.   ')?'
+							. '`?'                      // Name can be escaped with a backtick.
+							. '(?P<column_name>'    // 1) Name of the column.
+							. '(?:[0-9a-zA-Z$_-]|[\xC2-\xDF][\x80-\xBF])+'
+							. ')'
+							. '`?'                      // Name can be escaped with a backtick.
+							. '(?:'                     // Optional sub part.
+							. '\s*'                 // Optional white space character between name and opening bracket.
+							. '\('                  // Opening bracket for the sub part.
+							. '\s*'             // Optional white space character after opening bracket.
+							. '(?P<sub_part>'
+							. '\d+'         // 2) Number of indexed characters.
+							. ')'
+							. '\s*'             // Optional white space character before closing bracket.
+							. '\)'                 // Closing bracket for the sub part.
+							. ')?'
 							. '/',
 							$index_column,
 							$index_column_matches
@@ -2324,8 +2593,8 @@ function dbDelta( $queries = '', $execute = true ) {
 					}
 
 					// Build the normalized index definition and add it to the list of indices.
-					$indices[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns ) . ")";
-					$indices_without_subparts[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns_without_subparts ) . ")";
+					$indices[]                  = "{$index_type} {$index_name} (" . implode( ',', $index_columns ) . ')';
+					$indices_without_subparts[] = "{$index_type} {$index_name} (" . implode( ',', $index_columns_without_subparts ) . ')';
 
 					// Destroy no longer needed variables.
 					unset( $index_column, $index_column_matches, $index_matches, $index_type, $index_name, $index_columns, $index_columns_without_subparts );
@@ -2342,18 +2611,18 @@ function dbDelta( $queries = '', $execute = true ) {
 		// For every field in the table.
 		foreach ( $tablefields as $tablefield ) {
 			$tablefield_field_lowercased = strtolower( $tablefield->Field );
-			$tablefield_type_lowercased = strtolower( $tablefield->Type );
+			$tablefield_type_lowercased  = strtolower( $tablefield->Type );
 
 			// If the table field exists in the field array ...
 			if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
 
 				// Get the field type from the query.
 				preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
-				$fieldtype = $matches[1];
+				$fieldtype            = $matches[1];
 				$fieldtype_lowercased = strtolower( $fieldtype );
 
 				// Is actual field type different from the field type in query?
-				if ($tablefield->Type != $fieldtype) {
+				if ( $tablefield->Type != $fieldtype ) {
 					$do_change = true;
 					if ( in_array( $fieldtype_lowercased, $text_fields ) && in_array( $tablefield_type_lowercased, $text_fields ) ) {
 						if ( array_search( $fieldtype_lowercased, $text_fields ) < array_search( $tablefield_type_lowercased, $text_fields ) ) {
@@ -2369,18 +2638,18 @@ function dbDelta( $queries = '', $execute = true ) {
 
 					if ( $do_change ) {
 						// Add a query to change the column type.
-						$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];
-						$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
+						$cqueries[]                                      = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];
+						$for_update[ $table . '.' . $tablefield->Field ] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
 					}
 				}
 
 				// Get the default value from the array.
 				if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
 					$default_value = $matches[1];
-					if ($tablefield->Default != $default_value) {
+					if ( $tablefield->Default != $default_value ) {
 						// Add a query to change the column's default value
-						$cqueries[] = "ALTER TABLE {$table} ALTER COLUMN `{$tablefield->Field}` SET DEFAULT '{$default_value}'";
-						$for_update[$table.'.'.$tablefield->Field] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";
+						$cqueries[]                                      = "ALTER TABLE {$table} ALTER COLUMN `{$tablefield->Field}` SET DEFAULT '{$default_value}'";
+						$for_update[ $table . '.' . $tablefield->Field ] = "Changed default value of {$table}.{$tablefield->Field} from {$tablefield->Default} to {$default_value}";
 					}
 				}
 
@@ -2392,35 +2661,38 @@ function dbDelta( $queries = '', $execute = true ) {
 		}
 
 		// For every remaining field specified for the table.
-		foreach ($cfields as $fieldname => $fielddef) {
+		foreach ( $cfields as $fieldname => $fielddef ) {
 			// Push a query line into $cqueries that adds the field to that table.
-			$cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
-			$for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
+			$cqueries[]                              = "ALTER TABLE {$table} ADD COLUMN $fielddef";
+			$for_update[ $table . '.' . $fieldname ] = 'Added column ' . $table . '.' . $fieldname;
 		}
 
 		// Index stuff goes here. Fetch the table index structure from the database.
-		$tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
+		$tableindices = $wpdb->get_results( "SHOW INDEX FROM {$table};" );
 
-		if ($tableindices) {
+		if ( $tableindices ) {
 			// Clear the index array.
 			$index_ary = array();
 
 			// For every index in the table.
-			foreach ($tableindices as $tableindex) {
+			foreach ( $tableindices as $tableindex ) {
 
 				// Add the index to the index data array.
-				$keyname = strtolower( $tableindex->Key_name );
-				$index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
-				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
-				$index_ary[$keyname]['index_type'] = $tableindex->Index_type;
+				$keyname                             = strtolower( $tableindex->Key_name );
+				$index_ary[ $keyname ]['columns'][]  = array(
+					'fieldname' => $tableindex->Column_name,
+					'subpart'   => $tableindex->Sub_part,
+				);
+				$index_ary[ $keyname ]['unique']     = ( $tableindex->Non_unique == 0 ) ? true : false;
+				$index_ary[ $keyname ]['index_type'] = $tableindex->Index_type;
 			}
 
 			// For each actual index in the index array.
-			foreach ($index_ary as $index_name => $index_data) {
+			foreach ( $index_ary as $index_name => $index_data ) {
 
 				// Build a create string to compare to the query.
 				$index_string = '';
-				if ($index_name == 'primary') {
+				if ( $index_name == 'primary' ) {
 					$index_string .= 'PRIMARY ';
 				} elseif ( $index_data['unique'] ) {
 					$index_string .= 'UNIQUE ';
@@ -2432,13 +2704,13 @@ function dbDelta( $queries = '', $execute = true ) {
 					$index_string .= 'SPATIAL ';
 				}
 				$index_string .= 'KEY ';
-				if ( 'primary' !== $index_name  ) {
+				if ( 'primary' !== $index_name ) {
 					$index_string .= '`' . $index_name . '`';
 				}
 				$index_columns = '';
 
 				// For each column in the index.
-				foreach ($index_data['columns'] as $column_data) {
+				foreach ( $index_data['columns'] as $column_data ) {
 					if ( $index_columns != '' ) {
 						$index_columns .= ',';
 					}
@@ -2462,7 +2734,7 @@ function dbDelta( $queries = '', $execute = true ) {
 		// For every remaining index specified for the table.
 		foreach ( (array) $indices as $index ) {
 			// Push a query line into $cqueries that adds the index to that table.
-			$cqueries[] = "ALTER TABLE {$table} ADD $index";
+			$cqueries[]   = "ALTER TABLE {$table} ADD $index";
 			$for_update[] = 'Added index ' . $table . ' ' . $index;
 		}
 
@@ -2470,10 +2742,10 @@ function dbDelta( $queries = '', $execute = true ) {
 		unset( $cqueries[ $table ], $for_update[ $table ] );
 	}
 
-	$allqueries = array_merge($cqueries, $iqueries);
-	if ($execute) {
-		foreach ($allqueries as $query) {
-			$wpdb->query($query);
+	$allqueries = array_merge( $cqueries, $iqueries );
+	if ( $execute ) {
+		foreach ( $allqueries as $query ) {
+			$wpdb->query( $query );
 		}
 	}
 
@@ -2495,7 +2767,9 @@ function dbDelta( $queries = '', $execute = true ) {
 function make_db_current( $tables = 'all' ) {
 	$alterations = dbDelta( $tables );
 	echo "<ol>\n";
-	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
+	foreach ( $alterations as $alteration ) {
+		echo "<li>$alteration</li>\n";
+	}
 	echo "</ol>\n";
 }
 
@@ -2526,73 +2800,83 @@ function make_db_current_silent( $tables = 'all' ) {
  * @param string $template   The directory name of the theme.
  * @return bool
  */
-function make_site_theme_from_oldschool($theme_name, $template) {
+function make_site_theme_from_oldschool( $theme_name, $template ) {
 	$home_path = get_home_path();
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir  = WP_CONTENT_DIR . "/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
+	if ( ! file_exists( "$home_path/index.php" ) ) {
 		return false;
+	}
 
 	/*
 	 * Copy files from the old locations to the site theme.
 	 * TODO: This does not copy arbitrary include dependencies. Only the standard WP files are copied.
 	 */
-	$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
+	$files = array(
+		'index.php'             => 'index.php',
+		'wp-layout.css'         => 'style.css',
+		'wp-comments.php'       => 'comments.php',
+		'wp-comments-popup.php' => 'comments-popup.php',
+	);
 
-	foreach ($files as $oldfile => $newfile) {
-		if ($oldfile == 'index.php')
+	foreach ( $files as $oldfile => $newfile ) {
+		if ( $oldfile == 'index.php' ) {
 			$oldpath = $home_path;
-		else
+		} else {
 			$oldpath = ABSPATH;
+		}
 
 		// Check to make sure it's not a new index.
-		if ($oldfile == 'index.php') {
-			$index = implode('', file("$oldpath/$oldfile"));
-			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
+		if ( $oldfile == 'index.php' ) {
+			$index = implode( '', file( "$oldpath/$oldfile" ) );
+			if ( strpos( $index, 'WP_USE_THEMES' ) !== false ) {
+				if ( ! @copy( WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile" ) ) {
 					return false;
+				}
 
 				// Don't copy anything.
 				continue;
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
+		if ( ! @copy( "$oldpath/$oldfile", "$site_dir/$newfile" ) ) {
 			return false;
+		}
 
-		chmod("$site_dir/$newfile", 0777);
+		chmod( "$site_dir/$newfile", 0777 );
 
 		// Update the blog header include in each file.
-		$lines = explode("\n", implode('', file("$site_dir/$newfile")));
-		if ($lines) {
-			$f = fopen("$site_dir/$newfile", 'w');
+		$lines = explode( "\n", implode( '', file( "$site_dir/$newfile" ) ) );
+		if ( $lines ) {
+			$f = fopen( "$site_dir/$newfile", 'w' );
 
-			foreach ($lines as $line) {
-				if (preg_match('/require.*wp-blog-header/', $line))
+			foreach ( $lines as $line ) {
+				if ( preg_match( '/require.*wp-blog-header/', $line ) ) {
 					$line = '//' . $line;
+				}
 
 				// Update stylesheet references.
-				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
+				$line = str_replace( "<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line );
 
 				// Update comments template inclusion.
-				$line = str_replace("<?php include(ABSPATH . 'wp-comments.php'); ?>", "<?php comments_template(); ?>", $line);
+				$line = str_replace( "<?php include(ABSPATH . 'wp-comments.php'); ?>", '<?php comments_template(); ?>', $line );
 
-				fwrite($f, "{$line}\n");
+				fwrite( $f, "{$line}\n" );
 			}
-			fclose($f);
+			fclose( $f );
 		}
 	}
 
 	// Add a theme header.
-	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option( 'siteurl' ) . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 
-	$stylelines = file_get_contents("$site_dir/style.css");
-	if ($stylelines) {
-		$f = fopen("$site_dir/style.css", 'w');
+	$stylelines = file_get_contents( "$site_dir/style.css" );
+	if ( $stylelines ) {
+		$f = fopen( "$site_dir/style.css", 'w' );
 
-		fwrite($f, $header);
-		fwrite($f, $stylelines);
-		fclose($f);
+		fwrite( $f, $header );
+		fwrite( $f, $stylelines );
+		fclose( $f );
 	}
 
 	return true;
@@ -2609,58 +2893,68 @@ function make_site_theme_from_oldschool($theme_name, $template) {
  * @param string $template   The directory name of the theme.
  * @return false|void
  */
-function make_site_theme_from_default($theme_name, $template) {
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+function make_site_theme_from_default( $theme_name, $template ) {
+	$site_dir    = WP_CONTENT_DIR . "/themes/$template";
 	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
 
 	// Copy files from the default theme to the site theme.
 	//$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
 
-	$theme_dir = @ opendir($default_dir);
-	if ($theme_dir) {
-		while(($theme_file = readdir( $theme_dir )) !== false) {
-			if (is_dir("$default_dir/$theme_file"))
+	$theme_dir = @ opendir( $default_dir );
+	if ( $theme_dir ) {
+		while ( ( $theme_file = readdir( $theme_dir ) ) !== false ) {
+			if ( is_dir( "$default_dir/$theme_file" ) ) {
 				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
+			}
+			if ( ! @copy( "$default_dir/$theme_file", "$site_dir/$theme_file" ) ) {
 				return;
-			chmod("$site_dir/$theme_file", 0777);
+			}
+			chmod( "$site_dir/$theme_file", 0777 );
 		}
 	}
-	@closedir($theme_dir);
+	@closedir( $theme_dir );
 
 	// Rewrite the theme header.
-	$stylelines = explode("\n", implode('', file("$site_dir/style.css")));
-	if ($stylelines) {
-		$f = fopen("$site_dir/style.css", 'w');
+	$stylelines = explode( "\n", implode( '', file( "$site_dir/style.css" ) ) );
+	if ( $stylelines ) {
+		$f = fopen( "$site_dir/style.css", 'w' );
 
-		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
-			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
-			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
-			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
-			fwrite($f, $line . "\n");
+		foreach ( $stylelines as $line ) {
+			if ( strpos( $line, 'Theme Name:' ) !== false ) {
+				$line = 'Theme Name: ' . $theme_name;
+			} elseif ( strpos( $line, 'Theme URI:' ) !== false ) {
+				$line = 'Theme URI: ' . __get_option( 'url' );
+			} elseif ( strpos( $line, 'Description:' ) !== false ) {
+				$line = 'Description: Your theme.';
+			} elseif ( strpos( $line, 'Version:' ) !== false ) {
+				$line = 'Version: 1';
+			} elseif ( strpos( $line, 'Author:' ) !== false ) {
+				$line = 'Author: You';
+			}
+			fwrite( $f, $line . "\n" );
 		}
-		fclose($f);
+		fclose( $f );
 	}
 
 	// Copy the images.
-	umask(0);
-	if (! mkdir("$site_dir/images", 0777)) {
+	umask( 0 );
+	if ( ! mkdir( "$site_dir/images", 0777 ) ) {
 		return false;
 	}
 
-	$images_dir = @ opendir("$default_dir/images");
-	if ($images_dir) {
-		while(($image = readdir($images_dir)) !== false) {
-			if (is_dir("$default_dir/images/$image"))
+	$images_dir = @ opendir( "$default_dir/images" );
+	if ( $images_dir ) {
+		while ( ( $image = readdir( $images_dir ) ) !== false ) {
+			if ( is_dir( "$default_dir/images/$image" ) ) {
 				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
+			}
+			if ( ! @copy( "$default_dir/images/$image", "$site_dir/images/$image" ) ) {
 				return;
-			chmod("$site_dir/images/$image", 0777);
+			}
+			chmod( "$site_dir/images/$image", 0777 );
 		}
 	}
-	@closedir($images_dir);
+	@closedir( $images_dir );
 }
 
 /**
@@ -2674,41 +2968,42 @@ function make_site_theme_from_default($theme_name, $template) {
  */
 function make_site_theme() {
 	// Name the theme after the blog.
-	$theme_name = __get_option('blogname');
-	$template = sanitize_title($theme_name);
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$theme_name = __get_option( 'blogname' );
+	$template   = sanitize_title( $theme_name );
+	$site_dir   = WP_CONTENT_DIR . "/themes/$template";
 
 	// If the theme already exists, nothing to do.
-	if ( is_dir($site_dir)) {
+	if ( is_dir( $site_dir ) ) {
 		return false;
 	}
 
 	// We must be able to write to the themes dir.
-	if (! is_writable(WP_CONTENT_DIR . "/themes")) {
+	if ( ! is_writable( WP_CONTENT_DIR . '/themes' ) ) {
 		return false;
 	}
 
-	umask(0);
-	if (! mkdir($site_dir, 0777)) {
+	umask( 0 );
+	if ( ! mkdir( $site_dir, 0777 ) ) {
 		return false;
 	}
 
-	if (file_exists(ABSPATH . 'wp-layout.css')) {
-		if (! make_site_theme_from_oldschool($theme_name, $template)) {
+	if ( file_exists( ABSPATH . 'wp-layout.css' ) ) {
+		if ( ! make_site_theme_from_oldschool( $theme_name, $template ) ) {
 			// TODO: rm -rf the site theme directory.
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
+		if ( ! make_site_theme_from_default( $theme_name, $template ) ) {
 			// TODO: rm -rf the site theme directory.
 			return false;
+		}
 	}
 
 	// Make the new site theme active.
-	$current_template = __get_option('template');
-	if ($current_template == WP_DEFAULT_THEME) {
-		update_option('template', $template);
-		update_option('stylesheet', $template);
+	$current_template = __get_option( 'template' );
+	if ( $current_template == WP_DEFAULT_THEME ) {
+		update_option( 'template', $template );
+		update_option( 'stylesheet', $template );
 	}
 	return $template;
 }
@@ -2721,24 +3016,24 @@ function make_site_theme() {
  * @param int $level User level.
  * @return string User role name.
  */
-function translate_level_to_role($level) {
-	switch ($level) {
-	case 10:
-	case 9:
-	case 8:
-		return 'administrator';
-	case 7:
-	case 6:
-	case 5:
-		return 'editor';
-	case 4:
-	case 3:
-	case 2:
-		return 'author';
-	case 1:
-		return 'contributor';
-	case 0:
-		return 'subscriber';
+function translate_level_to_role( $level ) {
+	switch ( $level ) {
+		case 10:
+		case 9:
+		case 8:
+			return 'administrator';
+		case 7:
+		case 6:
+		case 5:
+			return 'editor';
+		case 4:
+		case 3:
+		case 2:
+			return 'author';
+		case 1:
+			return 'contributor';
+		case 0:
+			return 'subscriber';
 	}
 }
 
@@ -2752,8 +3047,9 @@ function translate_level_to_role($level) {
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
+	if ( is_wp_error( $result ) ) {
 		die( $result->get_error_message() );
+	}
 }
 
 /**
@@ -2784,8 +3080,9 @@ function maybe_disable_automattic_widgets() {
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
+	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
 		update_option( 'link_manager_enabled', 0 );
+	}
 }
 
 /**
@@ -2802,13 +3099,13 @@ function pre_schema_upgrade() {
 	// Upgrade versions prior to 2.9
 	if ( $wp_current_db_version < 11557 ) {
 		// Delete duplicate options. Keep the option with the highest option_id.
-		$wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
+		$wpdb->query( "DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id" );
 
 		// Drop the old primary key and add the new.
-		$wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)");
+		$wpdb->query( "ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)" );
 
 		// Drop the old option_name index. dbDelta() doesn't do the drop.
-		$wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
+		$wpdb->query( "ALTER TABLE $wpdb->options DROP INDEX option_name" );
 	}
 
 	// Multisite schema upgrades.
@@ -2850,18 +3147,18 @@ function pre_schema_upgrade() {
 	}
 }
 
-if ( !function_exists( 'install_global_terms' ) ) :
-/**
- * Install global terms.
- *
- * @since 3.0.0
- *
- * @global wpdb   $wpdb
- * @global string $charset_collate
- */
-function install_global_terms() {
-	global $wpdb, $charset_collate;
-	$ms_queries = "
+if ( ! function_exists( 'install_global_terms' ) ) :
+	/**
+	 * Install global terms.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @global wpdb   $wpdb
+	 * @global string $charset_collate
+	 */
+	function install_global_terms() {
+		global $wpdb, $charset_collate;
+		$ms_queries = "
 CREATE TABLE $wpdb->sitecategories (
   cat_ID bigint(20) NOT NULL auto_increment,
   cat_name varchar(55) NOT NULL default '',
@@ -2872,9 +3169,9 @@ CREATE TABLE $wpdb->sitecategories (
   KEY last_updated (last_updated)
 ) $charset_collate;
 ";
-// now create tables
-	dbDelta( $ms_queries );
-}
+		// now create tables
+		dbDelta( $ms_queries );
+	}
 endif;
 
 /**
diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index dfd0369d4c..269d64fb26 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -29,73 +29,85 @@ function add_user() {
  */
 function edit_user( $user_id = 0 ) {
 	$wp_roles = wp_roles();
-	$user = new stdClass;
+	$user     = new stdClass;
 	if ( $user_id ) {
-		$update = true;
-		$user->ID = (int) $user_id;
-		$userdata = get_userdata( $user_id );
+		$update           = true;
+		$user->ID         = (int) $user_id;
+		$userdata         = get_userdata( $user_id );
 		$user->user_login = wp_slash( $userdata->user_login );
 	} else {
 		$update = false;
 	}
 
-	if ( !$update && isset( $_POST['user_login'] ) )
-		$user->user_login = sanitize_user($_POST['user_login'], true);
+	if ( ! $update && isset( $_POST['user_login'] ) ) {
+		$user->user_login = sanitize_user( $_POST['user_login'], true );
+	}
 
 	$pass1 = $pass2 = '';
-	if ( isset( $_POST['pass1'] ) )
+	if ( isset( $_POST['pass1'] ) ) {
 		$pass1 = $_POST['pass1'];
-	if ( isset( $_POST['pass2'] ) )
+	}
+	if ( isset( $_POST['pass2'] ) ) {
 		$pass2 = $_POST['pass2'];
+	}
 
 	if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
-		$new_role = sanitize_text_field( $_POST['role'] );
-		$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
+		$new_role       = sanitize_text_field( $_POST['role'] );
+		$potential_role = isset( $wp_roles->role_objects[ $new_role ] ) ? $wp_roles->role_objects[ $new_role ] : false;
 		// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
 		// Multisite super admins can freely edit their blog roles -- they possess all caps.
-		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
+		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ( $potential_role && $potential_role->has_cap( 'edit_users' ) ) ) {
 			$user->role = $new_role;
+		}
 
 		// If the new role isn't editable by the logged-in user die with error
 		$editable_roles = get_editable_roles();
-		if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) )
+		if ( ! empty( $new_role ) && empty( $editable_roles[ $new_role ] ) ) {
 			wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
+		}
 	}
 
-	if ( isset( $_POST['email'] ))
+	if ( isset( $_POST['email'] ) ) {
 		$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+	}
 	if ( isset( $_POST['url'] ) ) {
-		if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
+		if ( empty( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
 			$user->user_url = '';
 		} else {
 			$user->user_url = esc_url_raw( $_POST['url'] );
-			$protocols = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
-			$user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
+			$protocols      = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
+			$user->user_url = preg_match( '/^(' . $protocols . '):/is', $user->user_url ) ? $user->user_url : 'http://' . $user->user_url;
 		}
 	}
-	if ( isset( $_POST['first_name'] ) )
+	if ( isset( $_POST['first_name'] ) ) {
 		$user->first_name = sanitize_text_field( $_POST['first_name'] );
-	if ( isset( $_POST['last_name'] ) )
+	}
+	if ( isset( $_POST['last_name'] ) ) {
 		$user->last_name = sanitize_text_field( $_POST['last_name'] );
-	if ( isset( $_POST['nickname'] ) )
+	}
+	if ( isset( $_POST['nickname'] ) ) {
 		$user->nickname = sanitize_text_field( $_POST['nickname'] );
-	if ( isset( $_POST['display_name'] ) )
+	}
+	if ( isset( $_POST['display_name'] ) ) {
 		$user->display_name = sanitize_text_field( $_POST['display_name'] );
+	}
 
-	if ( isset( $_POST['description'] ) )
+	if ( isset( $_POST['description'] ) ) {
 		$user->description = trim( $_POST['description'] );
+	}
 
 	foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
-		if ( isset( $_POST[$method] ))
-			$user->$method = sanitize_text_field( $_POST[$method] );
+		if ( isset( $_POST[ $method ] ) ) {
+			$user->$method = sanitize_text_field( $_POST[ $method ] );
+		}
 	}
 
 	if ( $update ) {
-		$user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
-		$user->syntax_highlighting = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
-		$user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
+		$user->rich_editing         = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
+		$user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
+		$user->admin_color          = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
 		$user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
-		$user->locale = '';
+		$user->locale               = '';
 
 		if ( isset( $_POST['locale'] ) ) {
 			$locale = sanitize_text_field( $_POST['locale'] );
@@ -114,14 +126,16 @@ function edit_user( $user_id = 0 ) {
 	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
 
 	$user->use_ssl = 0;
-	if ( !empty($_POST['use_ssl']) )
+	if ( ! empty( $_POST['use_ssl'] ) ) {
 		$user->use_ssl = 1;
+	}
 
 	$errors = new WP_Error();
 
 	/* checking that username has been typed */
-	if ( $user->user_login == '' )
+	if ( $user->user_login == '' ) {
 		$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+	}
 
 	/* checking that nickname has been typed */
 	if ( $update && empty( $user->nickname ) ) {
@@ -145,7 +159,7 @@ function edit_user( $user_id = 0 ) {
 	}
 
 	// Check for "\" in password.
-	if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) ) {
+	if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
 		$errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
 	}
 
@@ -154,14 +168,17 @@ function edit_user( $user_id = 0 ) {
 		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
 	}
 
-	if ( !empty( $pass1 ) )
+	if ( ! empty( $pass1 ) ) {
 		$user->user_pass = $pass1;
+	}
 
-	if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
+	if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
+		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+	}
 
-	if ( !$update && username_exists( $user->user_login ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
+	if ( ! $update && username_exists( $user->user_login ) ) {
+		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
+	}
 
 	/** This filter is documented in wp-includes/user.php */
 	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
@@ -173,10 +190,10 @@ function edit_user( $user_id = 0 ) {
 	/* checking email address */
 	if ( empty( $user->user_email ) ) {
 		$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
-	} elseif ( !is_email( $user->user_email ) ) {
+	} elseif ( ! is_email( $user->user_email ) ) {
 		$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
-	} elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
-		$errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
+	} elseif ( ( $owner_id = email_exists( $user->user_email ) ) && ( ! $update || ( $owner_id != $user->ID ) ) ) {
+		$errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
 	}
 
 	/**
@@ -190,8 +207,9 @@ function edit_user( $user_id = 0 ) {
 	 */
 	do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
 
-	if ( $errors->get_error_codes() )
+	if ( $errors->get_error_codes() ) {
 		return $errors;
+	}
 
 	if ( $update ) {
 		$user_id = wp_update_user( $user );
@@ -255,8 +273,9 @@ function get_editable_roles() {
 function get_user_to_edit( $user_id ) {
 	$user = get_userdata( $user_id );
 
-	if ( $user )
+	if ( $user ) {
 		$user->filter = 'edit';
+	}
 
 	return $user;
 }
@@ -273,7 +292,7 @@ function get_user_to_edit( $user_id ) {
  */
 function get_users_drafts( $user_id ) {
 	global $wpdb;
-	$query = $wpdb->prepare("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id);
+	$query = $wpdb->prepare( "SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id );
 
 	/**
 	 * Filters the user's drafts query string.
@@ -309,11 +328,12 @@ function wp_delete_user( $id, $reassign = null ) {
 		return false;
 	}
 
-	$id = (int) $id;
+	$id   = (int) $id;
 	$user = new WP_User( $id );
 
-	if ( !$user->exists() )
+	if ( ! $user->exists() ) {
 		return false;
+	}
 
 	// Normalize $reassign to null or a user ID. 'novalue' was an older default.
 	if ( 'novalue' === $reassign ) {
@@ -353,31 +373,35 @@ function wp_delete_user( $id, $reassign = null ) {
 		 */
 		$post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
 		$post_types_to_delete = implode( "', '", $post_types_to_delete );
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
+		$post_ids             = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
 		if ( $post_ids ) {
-			foreach ( $post_ids as $post_id )
+			foreach ( $post_ids as $post_id ) {
 				wp_delete_post( $post_id );
+			}
 		}
 
 		// Clean links
-		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
+		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
 
 		if ( $link_ids ) {
-			foreach ( $link_ids as $link_id )
-				wp_delete_link($link_id);
+			foreach ( $link_ids as $link_id ) {
+				wp_delete_link( $link_id );
+			}
 		}
 	} else {
 		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-		$wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
+		$wpdb->update( $wpdb->posts, array( 'post_author' => $reassign ), array( 'post_author' => $id ) );
 		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id )
+			foreach ( $post_ids as $post_id ) {
 				clean_post_cache( $post_id );
+			}
 		}
-		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
-		$wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
+		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+		$wpdb->update( $wpdb->links, array( 'link_owner' => $reassign ), array( 'link_owner' => $id ) );
 		if ( ! empty( $link_ids ) ) {
-			foreach ( $link_ids as $link_id )
+			foreach ( $link_ids as $link_id ) {
 				clean_bookmark_cache( $link_id );
+			}
 		}
 	}
 
@@ -386,8 +410,9 @@ function wp_delete_user( $id, $reassign = null ) {
 		remove_user_from_blog( $id, get_current_blog_id() );
 	} else {
 		$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-		foreach ( $meta as $mid )
+		foreach ( $meta as $mid ) {
 			delete_metadata_by_mid( 'user', $mid );
+		}
 
 		$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
 	}
@@ -415,10 +440,10 @@ function wp_delete_user( $id, $reassign = null ) {
  *
  * @param int $id User ID.
  */
-function wp_revoke_user($id) {
+function wp_revoke_user( $id ) {
 	$id = (int) $id;
 
-	$user = new WP_User($id);
+	$user = new WP_User( $id );
 	$user->remove_all_caps();
 }
 
@@ -429,16 +454,17 @@ function wp_revoke_user($id) {
  *
  * @param false $errors Deprecated.
  */
-function default_password_nag_handler($errors = false) {
+function default_password_nag_handler( $errors = false ) {
 	global $user_ID;
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag') )
+	if ( ! get_user_option( 'default_password_nag' ) ) {
 		return;
+	}
 
 	// get_user_setting = JS saved UI setting. else no-js-fallback code.
-	if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
-		delete_user_setting('default_password_nag');
-		update_user_option($user_ID, 'default_password_nag', false, true);
+	if ( 'hide' == get_user_setting( 'default_password_nag' ) || isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag'] ) {
+		delete_user_setting( 'default_password_nag' );
+		update_user_option( $user_ID, 'default_password_nag', false, true );
 	}
 }
 
@@ -448,17 +474,18 @@ function default_password_nag_handler($errors = false) {
  * @param int    $user_ID
  * @param object $old_data
  */
-function default_password_nag_edit_user($user_ID, $old_data) {
+function default_password_nag_edit_user( $user_ID, $old_data ) {
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag', $user_ID) )
+	if ( ! get_user_option( 'default_password_nag', $user_ID ) ) {
 		return;
+	}
 
-	$new_data = get_userdata($user_ID);
+	$new_data = get_userdata( $user_ID );
 
 	// Remove the nag if the password has been changed.
 	if ( $new_data->user_pass != $old_data->user_pass ) {
-		delete_user_setting('default_password_nag');
-		update_user_option($user_ID, 'default_password_nag', false, true);
+		delete_user_setting( 'default_password_nag' );
+		update_user_option( $user_ID, 'default_password_nag', false, true );
 	}
 }
 
@@ -470,16 +497,17 @@ function default_password_nag_edit_user($user_ID, $old_data) {
 function default_password_nag() {
 	global $pagenow;
 	// Short-circuit it.
-	if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
+	if ( 'profile.php' == $pagenow || ! get_user_option( 'default_password_nag' ) ) {
 		return;
+	}
 
 	echo '<div class="error default-password-nag">';
 	echo '<p>';
-	echo '<strong>' . __('Notice:') . '</strong> ';
-	_e('You&rsquo;re using the auto-generated password for your account. Would you like to change it?');
+	echo '<strong>' . __( 'Notice:' ) . '</strong> ';
+	_e( 'You&rsquo;re using the auto-generated password for your account. Would you like to change it?' );
 	echo '</p><p>';
-	printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', get_edit_profile_url() . '#password' );
-	printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
+	printf( '<a href="%s">' . __( 'Yes, take me to my profile page' ) . '</a> | ', get_edit_profile_url() . '#password' );
+	printf( '<a href="%s" id="default-password-nag-no">' . __( 'No thanks, do not remind me again' ) . '</a>', '?default_password_nag=0' );
 	echo '</p></div>';
 }
 
@@ -487,7 +515,8 @@ function default_password_nag() {
  * @since 3.5.0
  * @access private
  */
-function delete_users_add_js() { ?>
+function delete_users_add_js() {
+	?>
 <script>
 jQuery(document).ready( function($) {
 	var submit = $('#submit').prop('disabled', true);
@@ -511,30 +540,33 @@ jQuery(document).ready( function($) {
  *
  * @param object $user User data object
  */
-function use_ssl_preference($user) {
+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>
+		<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
 }
 
 /**
- *
  * @param string $text
  * @return string
  */
 function admin_created_user_email( $text ) {
 	$roles = get_editable_roles();
-	$role = $roles[ $_REQUEST['role'] ];
+	$role  = $roles[ $_REQUEST['role'] ];
 	/* translators: 1: Site name, 2: site URL, 3: role */
-	return sprintf( __( 'Hi,
+	return sprintf(
+		__(
+			'Hi,
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 If you do not want to join this site please ignore
 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'] ) ) );
+%%s'
+		), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) )
+	);
 }
diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index f25af863f0..0cf647c3f4 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -22,29 +22,41 @@ function wp_list_widgets() {
 	$done = array();
 
 	foreach ( $sort as $widget ) {
-		if ( in_array( $widget['callback'], $done, true ) ) // We already showed this multi-widget
+		if ( in_array( $widget['callback'], $done, true ) ) { // We already showed this multi-widget
 			continue;
-
-		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
-		$done[] = $widget['callback'];
-
-		if ( ! isset( $widget['params'][0] ) )
-			$widget['params'][0] = array();
-
-		$args = array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template' );
-
-		if ( isset($wp_registered_widget_controls[$widget['id']]['id_base']) && isset($widget['params'][0]['number']) ) {
-			$id_base = $wp_registered_widget_controls[$widget['id']]['id_base'];
-			$args['_temp_id'] = "$id_base-__i__";
-			$args['_multi_num'] = next_widget_id_number($id_base);
-			$args['_add'] = 'multi';
-		} else {
-			$args['_add'] = 'single';
-			if ( $sidebar )
-				$args['_hide'] = '1';
 		}
 
-		$args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
+		$sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
+		$done[]  = $widget['callback'];
+
+		if ( ! isset( $widget['params'][0] ) ) {
+			$widget['params'][0] = array();
+		}
+
+		$args = array(
+			'widget_id'   => $widget['id'],
+			'widget_name' => $widget['name'],
+			'_display'    => 'template',
+		);
+
+		if ( isset( $wp_registered_widget_controls[ $widget['id'] ]['id_base'] ) && isset( $widget['params'][0]['number'] ) ) {
+			$id_base            = $wp_registered_widget_controls[ $widget['id'] ]['id_base'];
+			$args['_temp_id']   = "$id_base-__i__";
+			$args['_multi_num'] = next_widget_id_number( $id_base );
+			$args['_add']       = 'multi';
+		} else {
+			$args['_add'] = 'single';
+			if ( $sidebar ) {
+				$args['_hide'] = '1';
+			}
+		}
+
+		$args = wp_list_widget_controls_dynamic_sidebar(
+			array(
+				0 => $args,
+				1 => $widget['params'][0],
+			)
+		);
 		call_user_func_array( 'wp_widget_control', $args );
 	}
 }
@@ -120,23 +132,22 @@ function wp_list_widget_controls_dynamic_sidebar( $params ) {
 	$i++;
 
 	$widget_id = $params[0]['widget_id'];
-	$id = isset($params[0]['_temp_id']) ? $params[0]['_temp_id'] : $widget_id;
-	$hidden = isset($params[0]['_hide']) ? ' style="display:none;"' : '';
+	$id        = isset( $params[0]['_temp_id'] ) ? $params[0]['_temp_id'] : $widget_id;
+	$hidden    = isset( $params[0]['_hide'] ) ? ' style="display:none;"' : '';
 
 	$params[0]['before_widget'] = "<div id='widget-{$i}_{$id}' class='widget'$hidden>";
-	$params[0]['after_widget'] = "</div>";
-	$params[0]['before_title'] = "%BEG_OF_TITLE%"; // deprecated
-	$params[0]['after_title'] = "%END_OF_TITLE%"; // deprecated
-	if ( is_callable( $wp_registered_widgets[$widget_id]['callback'] ) ) {
-		$wp_registered_widgets[$widget_id]['_callback'] = $wp_registered_widgets[$widget_id]['callback'];
-		$wp_registered_widgets[$widget_id]['callback'] = 'wp_widget_control';
+	$params[0]['after_widget']  = '</div>';
+	$params[0]['before_title']  = '%BEG_OF_TITLE%'; // deprecated
+	$params[0]['after_title']   = '%END_OF_TITLE%'; // deprecated
+	if ( is_callable( $wp_registered_widgets[ $widget_id ]['callback'] ) ) {
+		$wp_registered_widgets[ $widget_id ]['_callback'] = $wp_registered_widgets[ $widget_id ]['callback'];
+		$wp_registered_widgets[ $widget_id ]['callback']  = 'wp_widget_control';
 	}
 
 	return $params;
 }
 
 /**
- *
  * @global array $wp_registered_widgets
  *
  * @param string $id_base
@@ -147,8 +158,9 @@ function next_widget_id_number( $id_base ) {
 	$number = 1;
 
 	foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) )
-			$number = max($number, $matches[1]);
+		if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) ) {
+			$number = max( $number, $matches[1] );
+		}
 	}
 	$number++;
 
@@ -172,56 +184,58 @@ function next_widget_id_number( $id_base ) {
 function wp_widget_control( $sidebar_args ) {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $sidebars_widgets;
 
-	$widget_id = $sidebar_args['widget_id'];
-	$sidebar_id = isset($sidebar_args['id']) ? $sidebar_args['id'] : false;
-	$key = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[$sidebar_id] ) : '-1'; // position of widget in sidebar
-	$control = isset($wp_registered_widget_controls[$widget_id]) ? $wp_registered_widget_controls[$widget_id] : array();
-	$widget = $wp_registered_widgets[$widget_id];
+	$widget_id  = $sidebar_args['widget_id'];
+	$sidebar_id = isset( $sidebar_args['id'] ) ? $sidebar_args['id'] : false;
+	$key        = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ] ) : '-1'; // position of widget in sidebar
+	$control    = isset( $wp_registered_widget_controls[ $widget_id ] ) ? $wp_registered_widget_controls[ $widget_id ] : array();
+	$widget     = $wp_registered_widgets[ $widget_id ];
 
-	$id_format = $widget['id'];
-	$widget_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
-	$id_base = isset($control['id_base']) ? $control['id_base'] : $widget_id;
-	$width = isset($control['width']) ? $control['width'] : '';
-	$height = isset($control['height']) ? $control['height'] : '';
-	$multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : '';
-	$add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : '';
+	$id_format     = $widget['id'];
+	$widget_number = isset( $control['params'][0]['number'] ) ? $control['params'][0]['number'] : '';
+	$id_base       = isset( $control['id_base'] ) ? $control['id_base'] : $widget_id;
+	$width         = isset( $control['width'] ) ? $control['width'] : '';
+	$height        = isset( $control['height'] ) ? $control['height'] : '';
+	$multi_number  = isset( $sidebar_args['_multi_num'] ) ? $sidebar_args['_multi_num'] : '';
+	$add_new       = isset( $sidebar_args['_add'] ) ? $sidebar_args['_add'] : '';
 
-	$before_form = isset( $sidebar_args['before_form'] ) ? $sidebar_args['before_form'] : '<form method="post">';
-	$after_form = isset( $sidebar_args['after_form'] ) ? $sidebar_args['after_form'] : '</form>';
+	$before_form           = isset( $sidebar_args['before_form'] ) ? $sidebar_args['before_form'] : '<form method="post">';
+	$after_form            = isset( $sidebar_args['after_form'] ) ? $sidebar_args['after_form'] : '</form>';
 	$before_widget_content = isset( $sidebar_args['before_widget_content'] ) ? $sidebar_args['before_widget_content'] : '<div class="widget-content">';
-	$after_widget_content = isset( $sidebar_args['after_widget_content'] ) ? $sidebar_args['after_widget_content'] : '</div>';
+	$after_widget_content  = isset( $sidebar_args['after_widget_content'] ) ? $sidebar_args['after_widget_content'] : '</div>';
 
 	$query_arg = array( 'editwidget' => $widget['id'] );
 	if ( $add_new ) {
 		$query_arg['addnew'] = 1;
 		if ( $multi_number ) {
-			$query_arg['num'] = $multi_number;
+			$query_arg['num']  = $multi_number;
 			$query_arg['base'] = $id_base;
 		}
 	} else {
 		$query_arg['sidebar'] = $sidebar_id;
-		$query_arg['key'] = $key;
+		$query_arg['key']     = $key;
 	}
 
 	/*
 	 * We aren't showing a widget control, we're outputting a template
 	 * for a multi-widget control.
 	 */
-	if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
+	if ( isset( $sidebar_args['_display'] ) && 'template' == $sidebar_args['_display'] && $widget_number ) {
 		// number == -1 implies a template where id numbers are replaced by a generic '__i__'
 		$control['params'][0]['number'] = -1;
 		// With id_base widget id's are constructed like {$id_base}-{$id_number}.
-		if ( isset($control['id_base']) )
+		if ( isset( $control['id_base'] ) ) {
 			$id_format = $control['id_base'] . '-__i__';
+		}
 	}
 
-	$wp_registered_widgets[$widget_id]['callback'] = $wp_registered_widgets[$widget_id]['_callback'];
-	unset($wp_registered_widgets[$widget_id]['_callback']);
+	$wp_registered_widgets[ $widget_id ]['callback'] = $wp_registered_widgets[ $widget_id ]['_callback'];
+	unset( $wp_registered_widgets[ $widget_id ]['_callback'] );
 
 	$widget_title = esc_html( strip_tags( $sidebar_args['widget_name'] ) );
-	$has_form = 'noform';
+	$has_form     = 'noform';
 
-	echo $sidebar_args['before_widget']; ?>
+	echo $sidebar_args['before_widget'];
+	?>
 	<div class="widget-top">
 	<div class="widget-title-action">
 		<button type="button" class="widget-action hide-if-no-js" aria-expanded="false">
@@ -244,7 +258,7 @@ function wp_widget_control( $sidebar_args ) {
 	if ( isset( $control['callback'] ) ) {
 		$has_form = call_user_func_array( $control['callback'], $control['params'] );
 	} else {
-		echo "\t\t<p>" . __('There are no options for this widget.') . "</p>\n";
+		echo "\t\t<p>" . __( 'There are no options for this widget.' ) . "</p>\n";
 	}
 
 	$noform_class = '';
@@ -253,13 +267,13 @@ function wp_widget_control( $sidebar_args ) {
 	}
 	?>
 	<?php echo $after_widget_content; ?>
-	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
-	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
-	<input type="hidden" name="widget-width" class="widget-width" value="<?php echo esc_attr($width); ?>" />
-	<input type="hidden" name="widget-height" class="widget-height" value="<?php echo esc_attr($height); ?>" />
-	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
-	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
-	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr($add_new); ?>" />
+	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr( $id_format ); ?>" />
+	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr( $id_base ); ?>" />
+	<input type="hidden" name="widget-width" class="widget-width" value="<?php echo esc_attr( $width ); ?>" />
+	<input type="hidden" name="widget-height" class="widget-height" value="<?php echo esc_attr( $height ); ?>" />
+	<input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr( $widget_number ); ?>" />
+	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr( $multi_number ); ?>" />
+	<input type="hidden" name="add_new" class="add_new" value="<?php echo esc_attr( $add_new ); ?>" />
 
 	<div class="widget-control-actions">
 		<div class="alignleft">
@@ -279,7 +293,7 @@ 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
 	echo $sidebar_args['after_widget'];
@@ -288,10 +302,9 @@ function wp_widget_control( $sidebar_args ) {
 }
 
 /**
- *
  * @param string $classes
  * @return string
  */
-function wp_widgets_access_body_class($classes) {
+function wp_widgets_access_body_class( $classes ) {
 	return "$classes widgets_access ";
 }
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 783a43b23f..d58de5b53f 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -10,7 +10,7 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 /** Load WordPress dashboard API */
-require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
 
 wp_dashboard_setup();
 
@@ -20,74 +20,88 @@ if ( current_user_can( 'install_plugins' ) ) {
 	wp_enqueue_script( 'plugin-install' );
 	wp_enqueue_script( 'updates' );
 }
-if ( current_user_can( 'upload_files' ) )
+if ( current_user_can( 'upload_files' ) ) {
 	wp_enqueue_script( 'media-upload' );
+}
 add_thickbox();
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
-$title = __('Dashboard');
+$title       = __( 'Dashboard' );
 $parent_file = 'index.php';
 
 $help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab above the screen title.' ) . '</p>';
 
 $screen = get_current_screen();
 
-$screen->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
-	'content' => $help,
-) );
+$screen->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $help,
+	)
+);
 
 // Help tabs
 
 $help  = '<p>' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '</p>';
 $help .= '<p>' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '</p>';
 
-$screen->add_help_tab( array(
-	'id'      => 'help-navigation',
-	'title'   => __( 'Navigation' ),
-	'content' => $help,
-) );
+$screen->add_help_tab(
+	array(
+		'id'      => 'help-navigation',
+		'title'   => __( 'Navigation' ),
+		'content' => $help,
+	)
+);
 
 $help  = '<p>' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '</p>';
 $help .= '<p>' . __( '<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '</p>';
 $help .= '<p>' . __( '<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '</p>';
 $help .= '<p>' . __( '<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.' ) . '</p>';
 
-$screen->add_help_tab( array(
-	'id'      => 'help-layout',
-	'title'   => __( 'Layout' ),
-	'content' => $help,
-) );
+$screen->add_help_tab(
+	array(
+		'id'      => 'help-layout',
+		'title'   => __( 'Layout' ),
+		'content' => $help,
+	)
+);
 
-$help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
-if ( current_user_can( 'edit_posts' ) )
+$help = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
+if ( current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( '<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
+}
 	$help .= '<p>' . __( '<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
-if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
-if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
+}
+if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 	$help .= '<p>' . sprintf(
 		/* translators: %s: WordPress Planet URL */
 		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.' ),
 		__( 'https://planet.wordpress.org/' )
 	) . '</p>';
-else
+} else {
 	$help .= '<p>' . sprintf(
 		/* translators: %s: WordPress Planet URL */
 		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.' ),
 		__( 'https://planet.wordpress.org/' )
 	) . '</p>';
-if ( current_user_can( 'edit_theme_options' ) )
+}
+if ( current_user_can( 'edit_theme_options' ) ) {
 	$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
+}
 
-$screen->add_help_tab( array(
-	'id'      => 'help-content',
-	'title'   => __( 'Content' ),
-	'content' => $help,
-) );
+$screen->add_help_tab(
+	array(
+		'id'      => 'help-content',
+		'title'   => __( 'Content' ),
+		'content' => $help,
+	)
+);
 
 unset( $help );
 
@@ -103,14 +117,17 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>
 
-<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
+<?php
+if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
 	$classes = 'welcome-panel';
 
 	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
 	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
-	if ( $hide )
-		$classes .= ' hidden'; ?>
+	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-helper.php b/wp-admin/install-helper.php
index 42eb31e303..c13f302784 100644
--- a/wp-admin/install-helper.php
+++ b/wp-admin/install-helper.php
@@ -35,73 +35,73 @@
  */
 
 /** Load WordPress Bootstrap */
-require_once(dirname(dirname(__FILE__)).'/wp-load.php');
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-if ( ! function_exists('maybe_create_table') ) :
-/**
- * Create database table, if it doesn't already exist.
- *
- * @since 1.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string $table_name Database table name.
- * @param string $create_ddl Create database table SQL.
- * @return bool False on error, true if already exists or success.
- */
-function maybe_create_table($table_name, $create_ddl) {
-	global $wpdb;
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-		if ($table == $table_name) {
-			return true;
+if ( ! function_exists( 'maybe_create_table' ) ) :
+	/**
+	 * Create database table, if it doesn't already exist.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $table_name Database table name.
+	 * @param string $create_ddl Create database table SQL.
+	 * @return bool False on error, true if already exists or success.
+	 */
+	function maybe_create_table( $table_name, $create_ddl ) {
+		global $wpdb;
+		foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) {
+			if ( $table == $table_name ) {
+				return true;
+			}
 		}
-	}
-	// Didn't find it, so try to create it.
-	$wpdb->query($create_ddl);
+		// Didn't find it, so try to create it.
+		$wpdb->query( $create_ddl );
 
-	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-		if ($table == $table_name) {
-			return true;
+		// We cannot directly tell that whether this succeeded!
+		foreach ( $wpdb->get_col( 'SHOW TABLES', 0 ) as $table ) {
+			if ( $table == $table_name ) {
+				return true;
+			}
 		}
+		return false;
 	}
-	return false;
-}
 endif;
 
-if ( ! function_exists('maybe_add_column') ) :
-/**
- * Add column to database table, if column doesn't already exist in table.
- *
- * @since 1.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string $table_name Database table name
- * @param string $column_name Table column name
- * @param string $create_ddl SQL to add column to table.
- * @return bool False on failure. True, if already exists or was successful.
- */
-function maybe_add_column($table_name, $column_name, $create_ddl) {
-	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+if ( ! function_exists( 'maybe_add_column' ) ) :
+	/**
+	 * Add column to database table, if column doesn't already exist in table.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $table_name Database table name
+	 * @param string $column_name Table column name
+	 * @param string $create_ddl SQL to add column to table.
+	 * @return bool False on failure. True, if already exists or was successful.
+	 */
+	function maybe_add_column( $table_name, $column_name, $create_ddl ) {
+		global $wpdb;
+		foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
 
-		if ($column == $column_name) {
-			return true;
+			if ( $column == $column_name ) {
+				return true;
+			}
 		}
-	}
 
-	// Didn't find it, so try to create it.
-	$wpdb->query($create_ddl);
+		// Didn't find it, so try to create it.
+		$wpdb->query( $create_ddl );
 
-	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-		if ($column == $column_name) {
-			return true;
+		// We cannot directly tell that whether this succeeded!
+		foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
+			if ( $column == $column_name ) {
+				return true;
+			}
 		}
+		return false;
 	}
-	return false;
-}
 endif;
 
 /**
@@ -116,17 +116,17 @@ endif;
  * @param string $drop_ddl SQL statement to drop column.
  * @return bool False on failure, true on success or doesn't exist.
  */
-function maybe_drop_column($table_name, $column_name, $drop_ddl) {
+function maybe_drop_column( $table_name, $column_name, $drop_ddl ) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-		if ($column == $column_name) {
+	foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
+		if ( $column == $column_name ) {
 
 			// Found it, so try to drop it.
-			$wpdb->query($drop_ddl);
+			$wpdb->query( $drop_ddl );
 
 			// We cannot directly tell that whether this succeeded!
-			foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-				if ($column == $column_name) {
+			foreach ( $wpdb->get_col( "DESC $table_name", 0 ) as $column ) {
+				if ( $column == $column_name ) {
 					return false;
 				}
 			}
@@ -165,32 +165,32 @@ function maybe_drop_column($table_name, $column_name, $drop_ddl) {
  * @param mixed  $extra      Optional. Extra value.
  * @return bool True, if matches. False, if not matching.
  */
-function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) {
+function check_column( $table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null ) {
 	global $wpdb;
-	$diffs = 0;
-	$results = $wpdb->get_results("DESC $table_name");
+	$diffs   = 0;
+	$results = $wpdb->get_results( "DESC $table_name" );
 
-	foreach ($results as $row ) {
+	foreach ( $results as $row ) {
 
-		if ($row->Field == $col_name) {
+		if ( $row->Field == $col_name ) {
 
 			// Got our column, check the params.
-			if (($col_type != null) && ($row->Type != $col_type)) {
+			if ( ( $col_type != null ) && ( $row->Type != $col_type ) ) {
 				++$diffs;
 			}
-			if (($is_null != null) && ($row->Null != $is_null)) {
+			if ( ( $is_null != null ) && ( $row->Null != $is_null ) ) {
 				++$diffs;
 			}
-			if (($key != null) && ($row->Key  != $key)) {
+			if ( ( $key != null ) && ( $row->Key != $key ) ) {
 				++$diffs;
 			}
-			if (($default != null) && ($row->Default != $default)) {
+			if ( ( $default != null ) && ( $row->Default != $default ) ) {
 				++$diffs;
 			}
-			if (($extra != null) && ($row->Extra != $extra)) {
+			if ( ( $extra != null ) && ( $row->Extra != $extra ) ) {
 				++$diffs;
 			}
-			if ($diffs > 0) {
+			if ( $diffs > 0 ) {
 				return false;
 			}
 			return true;
diff --git a/wp-admin/install.php b/wp-admin/install.php
index 59740ba6e7..019e907b35 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -76,7 +76,7 @@ function display_header( $body_classes = '' ) {
 		wp_admin_css( 'dashicons', true );
 	?>
 </head>
-<body class="wp-core-ui<?php echo $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
@@ -94,7 +94,7 @@ function display_header( $body_classes = '' ) {
 function display_setup_form( $error = null ) {
 	global $wpdb;
 
-	$sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) );
+	$sql        = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->users ) );
 	$user_table = ( $wpdb->get_var( $sql ) != null );
 
 	// Ensure that Blogs appear in search engines by default.
@@ -104,8 +104,8 @@ function display_setup_form( $error = null ) {
 	}
 
 	$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
-	$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
-	$admin_email  = isset( $_POST['admin_email']  ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
+	$user_name    = isset( $_POST['user_name'] ) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
+	$admin_email  = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
 
 	if ( ! is_null( $error ) ) {
 ?>
@@ -119,17 +119,19 @@ function display_setup_form( $error = null ) {
 			<td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="user_login"><?php _e('Username'); ?></label></th>
+			<th scope="row"><label for="user_login"><?php _e( 'Username' ); ?></label></th>
 			<td>
 			<?php
 			if ( $user_table ) {
-				_e('User(s) already exists.');
+				_e( 'User(s) already exists.' );
 				echo '<input name="user_name" type="hidden" value="admin" />';
 			} else {
-				?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
+				?>
+				<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
-			} ?>
+			}
+			?>
 			</td>
 		</tr>
 		<?php if ( ! $user_table ) : ?>
@@ -186,16 +188,18 @@ function display_setup_form( $error = null ) {
 				<fieldset>
 					<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' ) ) { ?>
+					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/>
+						<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 ); ?> />
 						<label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
 						<p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
 						<?php
 						/** This action is documented in wp-admin/options-reading.php */
 						do_action( 'blog_privacy_selector' );
-					} else { ?>
+					} 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>
@@ -229,23 +233,23 @@ if ( is_blog_installed() ) {
  */
 global $wp_version, $required_php_version, $required_mysql_version;
 
-$php_version    = phpversion();
-$mysql_version  = $wpdb->db_version();
-$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-$mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
+$php_version   = phpversion();
+$mysql_version = $wpdb->db_version();
+$php_compat    = version_compare( $php_version, $required_php_version, '>=' );
+$mysql_compat  = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
 
-if ( !$mysql_compat && !$php_compat ) {
+if ( ! $mysql_compat && ! $php_compat ) {
 	/* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
 	$compat = sprintf( __( 'You cannot install 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 );
-} elseif ( !$php_compat ) {
+} elseif ( ! $php_compat ) {
 	/* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
 	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
-} elseif ( !$mysql_compat ) {
+} elseif ( ! $mysql_compat ) {
 	/* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
 	$compat = sprintf( __( 'You cannot install 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 );
 }
 
-if ( !$mysql_compat || !$php_compat ) {
+if ( ! $mysql_compat || ! $php_compat ) {
 	display_header();
 	die( '<h1>' . __( 'Insufficient Requirements' ) . '</h1><p>' . $compat . '</p></body></html>' );
 }
@@ -288,7 +292,7 @@ if ( ! empty( $_REQUEST['language'] ) ) {
 
 $scripts_to_print = array( 'jquery' );
 
-switch($step) {
+switch ( $step ) {
 	case 0: // Step 0
 		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
 			$scripts_to_print[] = 'language-chooser';
@@ -325,25 +329,26 @@ switch($step) {
 		break;
 	case 2:
 		if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
-			$loaded_language = $language;
+			$loaded_language      = $language;
 			$GLOBALS['wp_locale'] = new WP_Locale();
 		} else {
 			$loaded_language = 'en_US';
 		}
 
-		if ( ! empty( $wpdb->error ) )
+		if ( ! empty( $wpdb->error ) ) {
 			wp_die( $wpdb->error->get_error_message() );
+		}
 
 		$scripts_to_print[] = 'user-profile';
 
 		display_header();
 		// Fill in the data we gathered
-		$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
-		$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
-		$admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : '';
-		$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
-		$admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
-		$public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 1;
+		$weblog_title         = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
+		$user_name            = isset( $_POST['user_name'] ) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
+		$admin_password       = isset( $_POST['admin_password'] ) ? wp_unslash( $_POST['admin_password'] ) : '';
+		$admin_password_check = isset( $_POST['admin_password2'] ) ? wp_unslash( $_POST['admin_password2'] ) : '';
+		$admin_email          = isset( $_POST['admin_email'] ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
+		$public               = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 1;
 
 		// Check email address.
 		$error = false;
@@ -384,11 +389,13 @@ switch($step) {
 	</tr>
 	<tr>
 		<th><?php _e( 'Password' ); ?></th>
-		<td><?php
-		if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
-			<code><?php echo esc_html( $result['password'] ) ?></code><br />
+		<td>
+		<?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>
+			<p><?php echo $result['password_message']; ?></p>
 		</td>
 	</tr>
 </table>
diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php
index 423c6680e5..ff617d5777 100644
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -9,19 +9,21 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('manage_links') )
-	wp_die(__('Sorry, you are not allowed to add links to this site.'));
+if ( ! current_user_can( 'manage_links' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to add links to this site.' ) );
+}
 
-$title = __('Add New Link');
+$title       = __( 'Add New Link' );
 $parent_file = 'link-manager.php';
 
-wp_reset_vars( array('action', 'cat_id', 'link_id' ) );
+wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
 
-wp_enqueue_script('link');
-wp_enqueue_script('xfn');
+wp_enqueue_script( 'link' );
+wp_enqueue_script( 'xfn' );
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 $link = get_default_link_to_edit();
 include( ABSPATH . 'wp-admin/edit-link-form.php' );
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 402da73b10..0a0a6767a6 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -8,10 +8,11 @@
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'manage_links' ) )
+if ( ! current_user_can( 'manage_links' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
+}
 
-$wp_list_table = _get_list_table('WP_Links_List_Table');
+$wp_list_table = _get_list_table( 'WP_Links_List_Table' );
 
 // Handle bulk deletes
 $doaction = $wp_list_table->current_action();
@@ -20,7 +21,7 @@ if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) {
 	check_admin_referer( 'bulk-bookmarks' );
 
 	$redirect_to = admin_url( 'link-manager.php' );
-	$bulklinks = (array) $_REQUEST['linkcheck'];
+	$bulklinks   = (array) $_REQUEST['linkcheck'];
 
 	if ( 'delete' == $doaction ) {
 		foreach ( $bulklinks as $link_id ) {
@@ -43,45 +44,54 @@ if ( $doaction && isset( $_REQUEST['linkcheck'] ) ) {
 
 $wp_list_table->prepare_items();
 
-$title = __('Links');
+$title     = __( 'Links' );
 $this_file = $parent_file = 'link-manager.php';
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
-    '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
-    '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'deleting-links',
-'title'		=> __('Deleting Links'),
-'content'	=>
-    '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Links_Screen">Documentation on Managing Links</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			 '<p>' . sprintf( __( 'You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.' ), 'widgets.php' ) . '</p>' .
+			 '<p>' . __( 'Links may be separated into Link Categories; these are different than the categories used on your posts.' ) . '</p>' .
+			 '<p>' . __( 'You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.' ) . '</p>',
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'deleting-links',
+		'title'   => __( 'Deleting Links' ),
+		'content' =>
+			 '<p>' . __( 'If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.' ) . '</p>',
+	)
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_list' => __( 'Links list' ),
-) );
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Links_Screen">Documentation on Managing Links</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+);
+
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_list' => __( 'Links list' ),
+	)
+);
 
 include_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( ! current_user_can('manage_links') )
-	wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
+if ( ! current_user_can( 'manage_links' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
+}
 
 ?>
 
 <div class="wrap nosubsub">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <a href="link-add.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'link' ); ?></a>
 
@@ -95,12 +105,12 @@ if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
 <hr class="wp-header-end">
 
 <?php
-if ( isset($_REQUEST['deleted']) ) {
+if ( isset( $_REQUEST['deleted'] ) ) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>';
 	$deleted = (int) $_REQUEST['deleted'];
-	printf(_n('%s link deleted.', '%s links deleted', $deleted), $deleted);
+	printf( _n( '%s link deleted.', '%s links deleted', $deleted ), $deleted );
 	echo '</p></div>';
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
 }
 ?>
 
diff --git a/wp-admin/link-parse-opml.php b/wp-admin/link-parse-opml.php
index 42bf52cefc..287d66c5b4 100644
--- a/wp-admin/link-parse-opml.php
+++ b/wp-admin/link-parse-opml.php
@@ -6,8 +6,9 @@
  * @subpackage Administration
  */
 
-if ( ! defined('ABSPATH') )
+if ( ! defined( 'ABSPATH' ) ) {
 	die();
+}
 
 /**
  * @global string $opml
@@ -30,7 +31,7 @@ global $opml;
  * @param string $tagName XML element name.
  * @param array $attrs XML element attributes.
  */
-function startElement($parser, $tagName, $attrs) {
+function startElement( $parser, $tagName, $attrs ) {
 	global $names, $urls, $targets, $descriptions, $feeds;
 
 	if ( 'OUTLINE' === $tagName ) {
@@ -50,11 +51,11 @@ function startElement($parser, $tagName, $attrs) {
 		}
 
 		// Save the data away.
-		$names[] = $name;
-		$urls[] = $url;
-		$targets[] = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] :  '';
-		$feeds[] = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] :  '';
-		$descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] :  '';
+		$names[]        = $name;
+		$urls[]         = $url;
+		$targets[]      = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] : '';
+		$feeds[]        = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] : '';
+		$descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] : '';
 	} // End if outline.
 }
 
@@ -67,7 +68,7 @@ function startElement($parser, $tagName, $attrs) {
  * @param mixed $parser XML Parser resource.
  * @param string $tagName XML tag name.
  */
-function endElement($parser, $tagName) {
+function endElement( $parser, $tagName ) {
 	// Nothing to do.
 }
 
@@ -80,7 +81,7 @@ if ( ! function_exists( 'xml_parser_create' ) ) {
 $xml_parser = xml_parser_create();
 
 // Set the functions to handle opening and closing tags
-xml_set_element_handler($xml_parser, "startElement", "endElement");
+xml_set_element_handler( $xml_parser, 'startElement', 'endElement' );
 
 if ( ! xml_parse( $xml_parser, $opml, true ) ) {
 	printf(
@@ -92,4 +93,4 @@ if ( ! xml_parse( $xml_parser, $opml, true ) ) {
 }
 
 // Free up memory used by the XML parser
-xml_parser_free($xml_parser);
+xml_parser_free( $xml_parser );
diff --git a/wp-admin/link.php b/wp-admin/link.php
index bcfe578fb0..ed293bc80b 100644
--- a/wp-admin/link.php
+++ b/wp-admin/link.php
@@ -14,104 +14,112 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 
 wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can( 'manage_links' ) ) {
 	wp_link_manager_disabled_message();
+}
 
-if ( !empty($_POST['deletebookmarks']) )
+if ( ! empty( $_POST['deletebookmarks'] ) ) {
 	$action = 'deletebookmarks';
-if ( !empty($_POST['move']) )
+}
+if ( ! empty( $_POST['move'] ) ) {
 	$action = 'move';
-if ( !empty($_POST['linkcheck']) )
+}
+if ( ! empty( $_POST['linkcheck'] ) ) {
 	$linkcheck = $_POST['linkcheck'];
+}
 
-$this_file = admin_url('link-manager.php');
+$this_file = admin_url( 'link-manager.php' );
 
-switch ($action) {
-	case 'deletebookmarks' :
-		check_admin_referer('bulk-bookmarks');
+switch ( $action ) {
+	case 'deletebookmarks':
+		check_admin_referer( 'bulk-bookmarks' );
 
 		// For each link id (in $linkcheck[]) change category to selected value.
-		if (count($linkcheck) == 0) {
-			wp_redirect($this_file);
+		if ( count( $linkcheck ) == 0 ) {
+			wp_redirect( $this_file );
 			exit;
 		}
 
 		$deleted = 0;
-		foreach ($linkcheck as $link_id) {
+		foreach ( $linkcheck as $link_id ) {
 			$link_id = (int) $link_id;
 
-			if ( wp_delete_link($link_id) )
+			if ( wp_delete_link( $link_id ) ) {
 				$deleted++;
+			}
 		}
 
-		wp_redirect("$this_file?deleted=$deleted");
+		wp_redirect( "$this_file?deleted=$deleted" );
 		exit;
 
-	case 'move' :
-		check_admin_referer('bulk-bookmarks');
+	case 'move':
+		check_admin_referer( 'bulk-bookmarks' );
 
 		// For each link id (in $linkcheck[]) change category to selected value.
-		if (count($linkcheck) == 0) {
-			wp_redirect($this_file);
+		if ( count( $linkcheck ) == 0 ) {
+			wp_redirect( $this_file );
 			exit;
 		}
-		$all_links = join(',', $linkcheck);
+		$all_links = join( ',', $linkcheck );
 		/*
 		 * Should now have an array of links we can change:
 		 *     $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
 		 */
 
-		wp_redirect($this_file);
+		wp_redirect( $this_file );
 		exit;
 
-	case 'add' :
-		check_admin_referer('add-bookmark');
+	case 'add':
+		check_admin_referer( 'add-bookmark' );
 
 		$redir = wp_get_referer();
-		if ( add_link() )
+		if ( add_link() ) {
 			$redir = add_query_arg( 'added', 'true', $redir );
+		}
 
 		wp_redirect( $redir );
 		exit;
 
-	case 'save' :
+	case 'save':
 		$link_id = (int) $_POST['link_id'];
-		check_admin_referer('update-bookmark_' . $link_id);
+		check_admin_referer( 'update-bookmark_' . $link_id );
 
-		edit_link($link_id);
+		edit_link( $link_id );
 
-		wp_redirect($this_file);
+		wp_redirect( $this_file );
 		exit;
 
-	case 'delete' :
+	case 'delete':
 		$link_id = (int) $_GET['link_id'];
-		check_admin_referer('delete-bookmark_' . $link_id);
+		check_admin_referer( 'delete-bookmark_' . $link_id );
 
-		wp_delete_link($link_id);
+		wp_delete_link( $link_id );
 
-		wp_redirect($this_file);
+		wp_redirect( $this_file );
 		exit;
 
-	case 'edit' :
-		wp_enqueue_script('link');
-		wp_enqueue_script('xfn');
+	case 'edit':
+		wp_enqueue_script( 'link' );
+		wp_enqueue_script( 'xfn' );
 
-		if ( wp_is_mobile() )
+		if ( wp_is_mobile() ) {
 			wp_enqueue_script( 'jquery-touch-punch' );
+		}
 
-		$parent_file = 'link-manager.php';
+		$parent_file  = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
-		$title = __('Edit Link');
+		$title        = __( 'Edit Link' );
 
 		$link_id = (int) $_GET['link_id'];
 
-		if (!$link = get_link_to_edit($link_id))
-			wp_die(__('Link not found.'));
+		if ( ! $link = get_link_to_edit( $link_id ) ) {
+			wp_die( __( 'Link not found.' ) );
+		}
 
 		include( ABSPATH . 'wp-admin/edit-link-form.php' );
 		include( ABSPATH . 'wp-admin/admin-footer.php' );
 		break;
 
-	default :
+	default:
 		break;
 }
diff --git a/wp-admin/load-scripts.php b/wp-admin/load-scripts.php
index d536c1925a..8a0ee3c17f 100644
--- a/wp-admin/load-scripts.php
+++ b/wp-admin/load-scripts.php
@@ -5,7 +5,7 @@
  *
  * Set this to error_reporting( -1 ) for debugging.
  */
-error_reporting(0);
+error_reporting( 0 );
 
 /** Set ABSPATH for execution */
 if ( ! defined( 'ABSPATH' ) ) {
@@ -15,26 +15,28 @@ if ( ! defined( 'ABSPATH' ) ) {
 define( 'WPINC', 'wp-includes' );
 
 $load = $_GET['load'];
-if ( is_array( $load ) )
+if ( is_array( $load ) ) {
 	$load = implode( '', $load );
+}
 
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
 $load = array_unique( explode( ',', $load ) );
 
-if ( empty($load) )
+if ( empty( $load ) ) {
 	exit;
+}
 
 require( ABSPATH . 'wp-admin/includes/noop.php' );
 require( ABSPATH . WPINC . '/script-loader.php' );
 require( ABSPATH . WPINC . '/version.php' );
 
-$compress = ( isset($_GET['c']) && $_GET['c'] );
-$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
+$compress       = ( isset( $_GET['c'] ) && $_GET['c'] );
+$force_gzip     = ( $compress && 'gzip' == $_GET['c'] );
 $expires_offset = 31536000; // 1 year
-$out = '';
+$out            = '';
 
 $wp_scripts = new WP_Scripts();
-wp_default_scripts($wp_scripts);
+wp_default_scripts( $wp_scripts );
 
 if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
@@ -46,25 +48,26 @@ if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_
 }
 
 foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_scripts->registered) )
+	if ( ! array_key_exists( $handle, $wp_scripts->registered ) ) {
 		continue;
+	}
 
-	$path = ABSPATH . $wp_scripts->registered[$handle]->src;
-	$out .= get_file($path) . "\n";
+	$path = ABSPATH . $wp_scripts->registered[ $handle ]->src;
+	$out .= get_file( $path ) . "\n";
 }
 
-header("Etag: $wp_version");
-header('Content-Type: application/javascript; charset=UTF-8');
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
-header("Cache-Control: public, max-age=$expires_offset");
+header( "Etag: $wp_version" );
+header( 'Content-Type: application/javascript; charset=UTF-8' );
+header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expires_offset ) . ' GMT' );
+header( "Cache-Control: public, max-age=$expires_offset" );
 
-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
-	header('Vary: Accept-Encoding'); // Handle proxies
-	if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
-		header('Content-Encoding: deflate');
+if ( $compress && ! ini_get( 'zlib.output_compression' ) && 'ob_gzhandler' != ini_get( 'output_handler' ) && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
+	header( 'Vary: Accept-Encoding' ); // Handle proxies
+	if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) {
+		header( 'Content-Encoding: deflate' );
 		$out = gzdeflate( $out, 3 );
-	} elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
-		header('Content-Encoding: gzip');
+	} elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) {
+		header( 'Content-Encoding: gzip' );
 		$out = gzencode( $out, 3 );
 	}
 }
diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index de20881418..82dacef60a 100644
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -5,7 +5,7 @@
  *
  * Set this to error_reporting( -1 ) for debugging
  */
-error_reporting(0);
+error_reporting( 0 );
 
 /** Set ABSPATH for execution */
 if ( ! defined( 'ABSPATH' ) ) {
@@ -25,17 +25,18 @@ if ( is_array( $load ) ) {
 $load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
 $load = array_unique( explode( ',', $load ) );
 
-if ( empty($load) )
+if ( empty( $load ) ) {
 	exit;
+}
 
-$compress = ( isset($_GET['c']) && $_GET['c'] );
-$force_gzip = ( $compress && 'gzip' == $_GET['c'] );
-$rtl = ( isset($_GET['dir']) && 'rtl' == $_GET['dir'] );
+$compress       = ( isset( $_GET['c'] ) && $_GET['c'] );
+$force_gzip     = ( $compress && 'gzip' == $_GET['c'] );
+$rtl            = ( isset( $_GET['dir'] ) && 'rtl' == $_GET['dir'] );
 $expires_offset = 31536000; // 1 year
-$out = '';
+$out            = '';
 
 $wp_styles = new WP_Styles();
-wp_default_styles($wp_styles);
+wp_default_styles( $wp_styles );
 
 if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
@@ -47,10 +48,11 @@ if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_
 }
 
 foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_styles->registered) )
+	if ( ! array_key_exists( $handle, $wp_styles->registered ) ) {
 		continue;
+	}
 
-	$style = $wp_styles->registered[$handle];
+	$style = $wp_styles->registered[ $handle ];
 
 	if ( empty( $style->src ) ) {
 		continue;
@@ -69,24 +71,24 @@ foreach ( $load as $handle ) {
 		$content = str_replace( '../images/', '../' . WPINC . '/images/', $content );
 		$content = str_replace( '../js/tinymce/', '../' . WPINC . '/js/tinymce/', $content );
 		$content = str_replace( '../fonts/', '../' . WPINC . '/fonts/', $content );
-		$out .= $content;
+		$out    .= $content;
 	} else {
 		$out .= str_replace( '../images/', 'images/', $content );
 	}
 }
 
-header("Etag: $wp_version");
-header('Content-Type: text/css; charset=UTF-8');
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
-header("Cache-Control: public, max-age=$expires_offset");
+header( "Etag: $wp_version" );
+header( 'Content-Type: text/css; charset=UTF-8' );
+header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expires_offset ) . ' GMT' );
+header( "Cache-Control: public, max-age=$expires_offset" );
 
-if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
-	header('Vary: Accept-Encoding'); // Handle proxies
-	if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
-		header('Content-Encoding: deflate');
+if ( $compress && ! ini_get( 'zlib.output_compression' ) && 'ob_gzhandler' != ini_get( 'output_handler' ) && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
+	header( 'Vary: Accept-Encoding' ); // Handle proxies
+	if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) {
+		header( 'Content-Encoding: deflate' );
 		$out = gzdeflate( $out, 3 );
-	} elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
-		header('Content-Encoding: gzip');
+	} elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) {
+		header( 'Content-Encoding: gzip' );
 		$out = gzencode( $out, 3 );
 	}
 }
diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php
index 163d6b5f1e..01bda0e41f 100644
--- a/wp-admin/maint/repair.php
+++ b/wp-admin/maint/repair.php
@@ -5,7 +5,7 @@
  * @package WordPress
  * @subpackage Database
  */
-define('WP_REPAIRING', true);
+define( 'WP_REPAIRING', true );
 
 require_once( dirname( dirname( dirname( __FILE__ ) ) ) . '/wp-load.php' );
 
@@ -68,19 +68,18 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 		// Translators: 1: wp-config.php; 2: Secret key service URL.
 		echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
 	}
-
 } elseif ( isset( $_GET['repair'] ) ) {
 
 	echo '<h1 class="screen-reader-text">' . __( 'Database repair results' ) . '</h1>';
 
 	$optimize = 2 == $_GET['repair'];
-	$okay = true;
+	$okay     = true;
 	$problems = array();
 
 	$tables = $wpdb->tables();
 
 	// Sitecategories may not exist if global terms are disabled.
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->sitecategories ) );
+	$query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->sitecategories ) );
 	if ( is_multisite() && ! $wpdb->get_var( $query ) ) {
 		unset( $tables['sitecategories'] );
 	}
@@ -104,7 +103,7 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 			printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
 		} else {
 			/* translators: 1: table name, 2: error message, */
-			printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , "<code>$table</code>", "<code>$check->Msg_text</code>" );
+			printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
 
 			$repair = $wpdb->get_row( "REPAIR TABLE $table" );
 
@@ -115,8 +114,8 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 			} else {
 				/* translators: 1: table name, 2: error message, */
 				echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
-				$problems[$table] = $check->Msg_text;
-				$okay = false;
+				$problems[ $table ] = $check->Msg_text;
+				$okay               = false;
 			}
 		}
 
@@ -124,7 +123,7 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 			$check = $wpdb->get_row( "ANALYZE TABLE $table" );
 
 			echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
-			if ( 'Table is already up to date' == $check->Msg_text )  {
+			if ( 'Table is already up to date' == $check->Msg_text ) {
 				/* translators: %s: table name */
 				printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
 			} else {
@@ -144,10 +143,11 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 	}
 
 	if ( $problems ) {
-		printf( '<p>' . __('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.') . '</p>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
+		printf( '<p>' . __( 'Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.' ) . '</p>', __( 'https://wordpress.org/support/forum/how-to-and-troubleshooting' ) );
 		$problem_output = '';
-		foreach ( $problems as $table => $problem )
+		foreach ( $problems as $table => $problem ) {
 			$problem_output .= "$table: $problem\n";
+		}
 		echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( $problem_output ) . '</textarea></p>';
 	} else {
 		echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
@@ -156,10 +156,11 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) || ! WP_ALLOW_REPAIR ) {
 
 	echo '<h1 class="screen-reader-text">' . __( 'WordPress database repair' ) . '</h1>';
 
-	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
+	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) {
 		echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
-	else
+	} 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>
diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php
index 75ddb16b3f..060e43dbb2 100644
--- a/wp-admin/media-new.php
+++ b/wp-admin/media-new.php
@@ -12,21 +12,23 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if (!current_user_can('upload_files'))
-	wp_die(__('Sorry, you are not allowed to upload files.'));
+if ( ! current_user_can( 'upload_files' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+}
 
-wp_enqueue_script('plupload-handlers');
+wp_enqueue_script( 'plupload-handlers' );
 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
 		$post_id = 0;
+	}
 }
 
 if ( $_POST ) {
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
-		check_admin_referer('media-form');
+	if ( isset( $_POST['html-upload'] ) && ! empty( $_FILES ) ) {
+		check_admin_referer( 'media-form' );
 		// Upload File button was clicked
 		$upload_id = media_handle_upload( 'async-upload', $post_id );
 		if ( is_wp_error( $upload_id ) ) {
@@ -37,37 +39,40 @@ if ( $_POST ) {
 	exit;
 }
 
-$title = __('Upload New Media');
+$title       = __( 'Upload New Media' );
 $parent_file = 'upload.php';
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . __('You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:') . '</p>' .
-	'<ul>' .
-		'<li>' . __('<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.') . '</li>' .
-		'<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
-		'<li>' . __('Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.') . '</li>' .
-	'</ul>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				 '<p>' . __( 'You can upload media files here without creating a post first. This allows you to upload files to use with posts and pages later and/or to get a web link for a particular file that you can share. There are three options for uploading files:' ) . '</p>' .
+				 '<ul>' .
+					 '<li>' . __( '<strong>Drag and drop</strong> your files into the area below. Multiple files are allowed.' ) . '</li>' .
+					 '<li>' . __( 'Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.' ) . '</li>' .
+					 '<li>' . __( 'Revert to the <strong>Browser Uploader</strong> by clicking the link below the drag and drop box.' ) . '</li>' .
+				 '</ul>',
+	)
+);
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen">Documentation on Uploading Media Files</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/Media_Add_New_Screen">Documentation on Uploading Media Files</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 $form_class = 'media-upload-form type-form validate';
 
-if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
+if ( get_user_setting( 'uploader' ) || isset( $_GET['browser-uploader'] ) ) {
 	$form_class .= ' html-uploader';
+}
 ?>
 <div class="wrap">
 	<h1><?php echo esc_html( $title ); ?></h1>
 
-	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
+	<form enctype="multipart/form-data" method="post" action="<?php echo admin_url( 'media-new.php' ); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
 
 	<?php media_upload_form(); ?>
 
@@ -75,7 +80,7 @@ if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) )
 	var post_id = <?php echo $post_id; ?>, shortform = 3;
 	</script>
 	<input type="hidden" name="post_id" id="post_id" value="<?php echo $post_id; ?>" />
-	<?php wp_nonce_field('media-form'); ?>
+	<?php wp_nonce_field( 'media-form' ); ?>
 	<div id="media-items" class="hide-if-no-js"></div>
 	</form>
 </div>
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index ebede4e8f8..7b0bd53806 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -9,8 +9,9 @@
  * @subpackage Administration
  */
 
-if ( ! isset( $_GET['inline'] ) )
-	define( 'IFRAME_REQUEST' , true );
+if ( ! isset( $_GET['inline'] ) ) {
+	define( 'IFRAME_REQUEST', true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -19,20 +20,20 @@ if ( ! current_user_can( 'upload_files' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to upload files.' ), 403 );
 }
 
-wp_enqueue_script('plupload-handlers');
-wp_enqueue_script('image-edit');
-wp_enqueue_script('set-post-thumbnail' );
-wp_enqueue_style('imgareaselect');
+wp_enqueue_script( 'plupload-handlers' );
+wp_enqueue_script( 'image-edit' );
+wp_enqueue_script( 'set-post-thumbnail' );
+wp_enqueue_style( 'imgareaselect' );
 wp_enqueue_script( 'media-gallery' );
 
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
 
 // IDs should be integers
-$ID = isset($ID) ? (int) $ID : 0;
-$post_id = isset($post_id)? (int) $post_id : 0;
+$ID      = isset( $ID ) ? (int) $ID : 0;
+$post_id = isset( $post_id ) ? (int) $post_id : 0;
 
 // Require an ID for the edit screen.
-if ( isset( $action ) && $action == 'edit' && !$ID ) {
+if ( isset( $action ) && $action == 'edit' && ! $ID ) {
 	wp_die(
 		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Invalid item ID.' ) . '</p>',
@@ -40,7 +41,7 @@ if ( isset( $action ) && $action == 'edit' && !$ID ) {
 	);
 }
 
-if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) {
+if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post', $_REQUEST['post_id'] ) ) {
 	wp_die(
 		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
 		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
@@ -49,8 +50,8 @@ if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQU
 }
 
 // Upload type: image, video, file, ..?
-if ( isset($_GET['type']) ) {
-	$type = strval($_GET['type']);
+if ( isset( $_GET['type'] ) ) {
+	$type = strval( $_GET['type'] );
 } else {
 	/**
 	 * Filters the default media upload type in the legacy (pre-3.5.0) media popup.
@@ -64,8 +65,8 @@ if ( isset($_GET['type']) ) {
 }
 
 // Tab: gallery, library, or type-specific.
-if ( isset($_GET['tab']) ) {
-	$tab = strval($_GET['tab']);
+if ( isset( $_GET['tab'] ) ) {
+	$tab = strval( $_GET['tab'] );
 } else {
 	/**
 	 * Filters the default tab in the legacy (pre-3.5.0) media popup.
@@ -80,7 +81,7 @@ if ( isset($_GET['tab']) ) {
 $body_id = 'media-upload';
 
 // Let the action code decide how to handle the request.
-if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
+if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab, media_upload_tabs() ) ) {
 	/**
 	 * Fires inside specific upload-type views in the legacy (pre-3.5.0)
 	 * media popup based on the current tab.
diff --git a/wp-admin/media.php b/wp-admin/media.php
index be3cecad98..95fcd28249 100644
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -9,141 +9,167 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-$parent_file = 'upload.php';
+$parent_file  = 'upload.php';
 $submenu_file = 'upload.php';
 
-wp_reset_vars(array('action'));
+wp_reset_vars( array( 'action' ) );
 
 switch ( $action ) {
-case 'editattachment' :
-	$attachment_id = (int) $_POST['attachment_id'];
-	check_admin_referer('media-form');
+	case 'editattachment':
+		$attachment_id = (int) $_POST['attachment_id'];
+		check_admin_referer( 'media-form' );
 
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-	$errors = media_upload_form_handler();
-
-	if ( empty($errors) ) {
-		$location = 'media.php';
-		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
-				$location = $referer;
+		if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this attachment.' ) );
 		}
-		if ( false !== strpos($location, 'upload.php') ) {
-			$location = remove_query_arg('message', $location);
-			$location = add_query_arg('posted',	$attachment_id, $location);
-		} elseif ( false !== strpos($location, 'media.php') ) {
-			$location = add_query_arg('message', 'updated', $location);
+
+		$errors = media_upload_form_handler();
+
+		if ( empty( $errors ) ) {
+			$location = 'media.php';
+			if ( $referer = wp_get_original_referer() ) {
+				if ( false !== strpos( $referer, 'upload.php' ) || ( url_to_postid( $referer ) == $attachment_id ) ) {
+					$location = $referer;
+				}
+			}
+			if ( false !== strpos( $location, 'upload.php' ) ) {
+				$location = remove_query_arg( 'message', $location );
+				$location = add_query_arg( 'posted', $attachment_id, $location );
+			} elseif ( false !== strpos( $location, 'media.php' ) ) {
+				$location = add_query_arg( 'message', 'updated', $location );
+			}
+			wp_redirect( $location );
+			exit;
 		}
-		wp_redirect($location);
-		exit;
-	}
 
-	// No break.
-case 'edit' :
-	$title = __('Edit Media');
+		// No break.
+	case 'edit':
+		$title = __( 'Edit Media' );
 
-	if ( empty($errors) )
-		$errors = null;
-
-	if ( empty( $_GET['attachment_id'] ) ) {
-		wp_redirect( admin_url('upload.php') );
-		exit();
-	}
-	$att_id = (int) $_GET['attachment_id'];
-
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-	$att = get_post($att_id);
-
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn&#8217;t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn&#8217;t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can&#8217;t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
-
-	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-
-	wp_enqueue_script( 'wp-ajax-response' );
-	wp_enqueue_script('image-edit');
-	wp_enqueue_style('imgareaselect');
-
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' =>
-			'<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
-			'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-			'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-			'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-	) );
-
-	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
-	);
-
-	require( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$parent_file = 'upload.php';
-	$message = '';
-	$class = '';
-	if ( isset($_GET['message']) ) {
-		switch ( $_GET['message'] ) {
-			case 'updated' :
-				$message = __('Media file updated.');
-				$class = 'updated';
-				break;
+		if ( empty( $errors ) ) {
+			$errors = null;
 		}
-	}
-	if ( $message )
-		echo "<div id='message' class='$class'><p>$message</p></div>\n";
 
-?>
+		if ( empty( $_GET['attachment_id'] ) ) {
+			wp_redirect( admin_url( 'upload.php' ) );
+			exit();
+		}
+		$att_id = (int) $_GET['attachment_id'];
 
-<div class="wrap">
-<h1 class="wp-heading-inline"><?php
+		if ( ! current_user_can( 'edit_post', $att_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this attachment.' ) );
+		}
+
+		$att = get_post( $att_id );
+
+		if ( empty( $att->ID ) ) {
+			wp_die( __( 'You attempted to edit an attachment that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		}
+		if ( 'attachment' !== $att->post_type ) {
+			wp_die( __( 'You attempted to edit an item that isn&#8217;t an attachment. Please go back and try again.' ) );
+		}
+		if ( $att->post_status == 'trash' ) {
+			wp_die( __( 'You can&#8217;t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.' ) );
+		}
+
+		add_filter( 'attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2 );
+
+		wp_enqueue_script( 'wp-ajax-response' );
+		wp_enqueue_script( 'image-edit' );
+		wp_enqueue_style( 'imgareaselect' );
+
+		get_current_screen()->add_help_tab(
+			array(
+				'id'      => 'overview',
+				'title'   => __( 'Overview' ),
+				'content' =>
+					  '<p>' . __( 'This screen allows you to edit five fields for metadata in a file within the media library.' ) . '</p>' .
+					  '<p>' . __( 'For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.' ) . '</p>' .
+					  '<p>' . __( 'Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.' ) . '</p>' .
+					  '<p>' . __( 'Remember to click Update Media to save metadata entered or changed.' ) . '</p>',
+			)
+		);
+
+		get_current_screen()->set_help_sidebar(
+			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+			'<p>' . __( '<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media">Documentation on Edit Media</a>' ) . '</p>' .
+			'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+		);
+
+		require( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$parent_file = 'upload.php';
+		$message     = '';
+		$class       = '';
+		if ( isset( $_GET['message'] ) ) {
+			switch ( $_GET['message'] ) {
+				case 'updated':
+					$message = __( 'Media file updated.' );
+					$class   = 'updated';
+					break;
+			}
+		}
+		if ( $message ) {
+			echo "<div id='message' class='$class'><p>$message</p></div>\n";
+		}
+
+	?>
+
+	<div class="wrap">
+	<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?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>
+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 } ?>
 
-<hr class="wp-header-end">
+	<hr class="wp-header-end">
 
-<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 ); ?>
-</p>
+	<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 ); ?>
+	</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 ) ); ?>
-</div>
-</div>
+	<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,
+		)
+	);
+?>
+	</div>
+	</div>
 
-<?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 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' ); ?>
 
-</form>
+	</form>
 
-</div>
+	</div>
 
-<?php
+	<?php
 
 	require( ABSPATH . 'wp-admin/admin-footer.php' );
 
-	exit;
+		exit;
 
-default:
-	wp_redirect( admin_url('upload.php') );
-	exit;
+	default:
+		wp_redirect( admin_url( 'upload.php' ) );
+		exit;
 
 }
diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index c253db454c..c86e907f45 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -11,10 +11,10 @@
  *
  * @global string $self
  */
-$self = preg_replace('|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF']);
-$self = preg_replace('|^.*/wp-admin/|i', '', $self);
-$self = preg_replace('|^.*/plugins/|i', '', $self);
-$self = preg_replace('|^.*/mu-plugins/|i', '', $self);
+$self = preg_replace( '|^.*/wp-admin/network/|i', '', $_SERVER['PHP_SELF'] );
+$self = preg_replace( '|^.*/wp-admin/|i', '', $self );
+$self = preg_replace( '|^.*/plugins/|i', '', $self );
+$self = preg_replace( '|^.*/mu-plugins/|i', '', $self );
 
 /**
  * For when admin-header is included from within a function.
@@ -72,41 +72,43 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 	// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
 	foreach ( $menu as $key => $item ) {
 		$admin_is_parent = false;
-		$class = array();
+		$class           = array();
 		$aria_attributes = '';
-		$aria_hidden = '';
-		$is_separator = false;
+		$aria_hidden     = '';
+		$is_separator    = false;
 
 		if ( $first ) {
 			$class[] = 'wp-first-item';
-			$first = false;
+			$first   = false;
 		}
 
 		$submenu_items = array();
-		if ( ! empty( $submenu[$item[2]] ) ) {
-			$class[] = 'wp-has-submenu';
-			$submenu_items = $submenu[$item[2]];
+		if ( ! empty( $submenu[ $item[2] ] ) ) {
+			$class[]       = 'wp-has-submenu';
+			$submenu_items = $submenu[ $item[2] ];
 		}
 
-		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
+		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty( $typenow ) && $self == $item[2] ) ) {
 			if ( ! empty( $submenu_items ) ) {
 				$class[] = 'wp-has-current-submenu wp-menu-open';
 			} else {
-				$class[] = 'current';
+				$class[]          = 'current';
 				$aria_attributes .= 'aria-current="page"';
 			}
 		} else {
 			$class[] = 'wp-not-current-submenu';
-			if ( ! empty( $submenu_items ) )
+			if ( ! empty( $submenu_items ) ) {
 				$aria_attributes .= 'aria-haspopup="true"';
+			}
 		}
 
-		if ( ! empty( $item[4] ) )
+		if ( ! empty( $item[4] ) ) {
 			$class[] = esc_attr( $item[4] );
+		}
 
-		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
-		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
-		$img = $img_style = '';
+		$class     = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+		$id        = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+		$img       = $img_style = '';
 		$img_class = ' dashicons-before';
 
 		if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
@@ -125,11 +127,11 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 			if ( 'none' === $item[6] || 'div' === $item[6] ) {
 				$img = '<br />';
 			} elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
-				$img = '<br />';
+				$img       = '<br />';
 				$img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
 				$img_class = ' svg';
 			} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
-				$img = '<br />';
+				$img       = '<br />';
 				$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
 			}
 		}
@@ -148,10 +150,11 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 			echo '<div class="separator"></div>';
 		} elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
 			$submenu_items = array_values( $submenu_items );  // Re-index.
-			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
-			$menu_file = $submenu_items[0][2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+			$menu_hook     = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+			$menu_file     = $submenu_items[0][2];
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
 				$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
@@ -161,8 +164,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
 			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
 			$menu_file = $item[2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
 				$menu_file = substr( $menu_file, 0, $pos );
+			}
 			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
 				$admin_is_parent = true;
 				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
@@ -179,36 +183,38 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
 			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
 			foreach ( $submenu_items as $sub_key => $sub_item ) {
-				if ( ! current_user_can( $sub_item[1] ) )
+				if ( ! current_user_can( $sub_item[1] ) ) {
 					continue;
+				}
 
-				$class = array();
+				$class           = array();
 				$aria_attributes = '';
 				if ( $first ) {
 					$class[] = 'wp-first-item';
-					$first = false;
+					$first   = false;
 				}
 
 				$menu_file = $item[2];
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
+				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
 					$menu_file = substr( $menu_file, 0, $pos );
+				}
 
 				// Handle current for post_type=post|page|foo pages, which won't match $self.
 				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
 
 				if ( isset( $submenu_file ) ) {
 					if ( $submenu_file == $sub_item[2] ) {
-						$class[] = 'current';
+						$class[]          = 'current';
 						$aria_attributes .= ' aria-current="page"';
 					}
-				// If plugin_page is set the parent must either match the current page or not physically exist.
-				// This allows plugin pages with the same hook to exist under different parents.
+					// If plugin_page is set the parent must either match the current page or not physically exist.
+					// This allows plugin pages with the same hook to exist under different parents.
 				} elseif (
 					( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
-					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists( $menu_file ) === false ) )
 				) {
-					$class[] = 'current';
+					$class[]          = 'current';
 					$aria_attributes .= ' aria-current="page"';
 				}
 
@@ -218,19 +224,21 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 
 				$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
 
-				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
-				$sub_file = $sub_item[2];
-				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
-					$sub_file = substr($sub_file, 0, $pos);
+				$menu_hook = get_plugin_page_hook( $sub_item[2], $item[2] );
+				$sub_file  = $sub_item[2];
+				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) ) {
+					$sub_file = substr( $sub_file, 0, $pos );
+				}
 
-				$title = wptexturize($sub_item[0]);
+				$title = wptexturize( $sub_item[0] );
 
 				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
 					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
+					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) ) {
 						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
-					else
+					} else {
 						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+					}
 
 					$sub_item_url = esc_url( $sub_item_url );
 					echo "<li$class><a href='$sub_item_url'$class$aria_attributes>$title</a></li>";
@@ -238,9 +246,9 @@ function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
 					echo "<li$class><a href='{$sub_item[2]}'$class$aria_attributes>$title</a></li>";
 				}
 			}
-			echo "</ul>";
+			echo '</ul>';
 		}
-		echo "</li>";
+		echo '</li>';
 	}
 
 	echo '<li id="collapse-menu" class="hide-if-no-js">' .
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 990ddf7dbe..6e6ea90721 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -20,12 +20,12 @@
  * @global array $menu
  */
 
-$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
+$menu[2] = array( __( 'Dashboard' ), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
 
-$submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
+$submenu['index.php'][0] = array( __( 'Home' ), 'read', 'index.php' );
 
 if ( is_multisite() ) {
-	$submenu[ 'index.php' ][5] = array( __('My Sites'), 'read', 'my-sites.php' );
+	$submenu['index.php'][5] = array( __( 'My Sites' ), 'read', 'my-sites.php' );
 }
 
 if ( ! is_multisite() || current_user_can( 'update_core' ) ) {
@@ -42,7 +42,7 @@ if ( ! is_multisite() ) {
 	} else {
 		$cap = 'update_languages';
 	}
-	$submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), $cap, 'update-core.php');
+	$submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}'><span class='update-count'>" . number_format_i18n( $update_data['counts']['total'] ) . '</span></span>' ), $cap, 'update-core.php' );
 	unset( $cap );
 }
 
@@ -50,24 +50,25 @@ $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
 // $menu[5] = Posts
 
-$menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
-	$submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php');
+$menu[10]                     = array( __( 'Media' ), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' );
+	$submenu['upload.php'][5] = array( __( 'Library' ), 'upload_files', 'upload.php' );
 	/* translators: add new file */
-	$submenu['upload.php'][10] = array( _x('Add New', 'file'), 'upload_files', 'media-new.php');
-	$i = 15;
-	foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu )
-			continue;
-
-		$submenu['upload.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=attachment' );
+	$submenu['upload.php'][10] = array( _x( 'Add New', 'file' ), 'upload_files', 'media-new.php' );
+	$i                         = 15;
+foreach ( get_taxonomies_for_attachments( 'objects' ) as $tax ) {
+	if ( ! $tax->show_ui || ! $tax->show_in_menu ) {
+		continue;
 	}
+
+	$submenu['upload.php'][ $i++ ] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&amp;post_type=attachment' );
+}
 	unset( $tax, $i );
 
-$menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
-	$submenu['link-manager.php'][5] = array( _x('All Links', 'admin menu'), 'manage_links', 'link-manager.php' );
+$menu[15]                           = array( __( 'Links' ), 'manage_links', 'link-manager.php', '', 'menu-top menu-icon-links', 'menu-links', 'dashicons-admin-links' );
+	$submenu['link-manager.php'][5] = array( _x( 'All Links', 'admin menu' ), 'manage_links', 'link-manager.php' );
 	/* translators: add new links */
-	$submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' );
-	$submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
+	$submenu['link-manager.php'][10] = array( _x( 'Add New', 'link' ), 'manage_links', 'link-add.php' );
+	$submenu['link-manager.php'][15] = array( __( 'Link Categories' ), 'manage_categories', 'edit-tags.php?taxonomy=link_category' );
 
 // $menu[20] = Pages
 
@@ -75,7 +76,7 @@ $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-to
 if ( current_user_can( 'edit_posts' ) ) {
 	$awaiting_mod = wp_count_comments();
 	$awaiting_mod = $awaiting_mod->moderated;
-	$menu[25] = array(
+	$menu[25]     = array(
 		sprintf( __( 'Comments %s' ), '<span class="awaiting-mod count-' . absint( $awaiting_mod ) . '"><span class="pending-count">' . number_format_i18n( $awaiting_mod ) . '</span></span>' ),
 		'edit_posts',
 		'edit-comments.php',
@@ -87,19 +88,26 @@ if ( current_user_can( 'edit_posts' ) ) {
 	unset( $awaiting_mod );
 }
 
-$submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'edit-comments.php' );
+$submenu['edit-comments.php'][0] = array( __( 'All Comments' ), 'edit_posts', 'edit-comments.php' );
 
 $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group
 
-$types = (array) get_post_types( array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) );
+$types   = (array) get_post_types(
+	array(
+		'show_ui'      => true,
+		'_builtin'     => false,
+		'show_in_menu' => true,
+	)
+);
 $builtin = array( 'post', 'page' );
 foreach ( array_merge( $builtin, $types ) as $ptype ) {
 	$ptype_obj = get_post_type_object( $ptype );
 	// Check if it should be a submenu.
-	if ( $ptype_obj->show_in_menu !== true )
+	if ( $ptype_obj->show_in_menu !== true ) {
 		continue;
+	}
 	$ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
-	$ptype_for_id = sanitize_html_class( $ptype );
+	$ptype_for_id        = sanitize_html_class( $ptype );
 
 	$menu_icon = 'dashicons-admin-post';
 	if ( is_string( $ptype_obj->menu_icon ) ) {
@@ -116,13 +124,13 @@ foreach ( array_merge( $builtin, $types ) as $ptype ) {
 	$menu_class = 'menu-top menu-icon-' . $ptype_for_id;
 	// 'post' special case
 	if ( 'post' === $ptype ) {
-		$menu_class .= ' open-if-no-js';
-		$ptype_file = "edit.php";
-		$post_new_file = "post-new.php";
-		$edit_tags_file = "edit-tags.php?taxonomy=%s";
+		$menu_class    .= ' open-if-no-js';
+		$ptype_file     = 'edit.php';
+		$post_new_file  = 'post-new.php';
+		$edit_tags_file = 'edit-tags.php?taxonomy=%s';
 	} else {
-		$ptype_file = "edit.php?post_type=$ptype";
-		$post_new_file = "post-new.php?post_type=$ptype";
+		$ptype_file     = "edit.php?post_type=$ptype";
+		$post_new_file  = "post-new.php?post_type=$ptype";
 		$edit_tags_file = "edit-tags.php?taxonomy=%s&amp;post_type=$ptype";
 	}
 
@@ -135,47 +143,49 @@ foreach ( array_merge( $builtin, $types ) as $ptype ) {
 	 * If $ptype_menu_position is already populated or will be populated
 	 * by a hard-coded value below, increment the position.
 	 */
-	$core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
-	while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
+	$core_menu_positions = array( 59, 60, 65, 70, 75, 80, 85, 99 );
+	while ( isset( $menu[ $ptype_menu_position ] ) || in_array( $ptype_menu_position, $core_menu_positions ) ) {
 		$ptype_menu_position++;
+	}
 
-	$menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, $ptype_file, '', $menu_class, $ptype_menu_id, $menu_icon );
-	$submenu[ $ptype_file ][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  $ptype_file );
-	$submenu[ $ptype_file ][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, $post_new_file );
+	$menu[ $ptype_menu_position ] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, $ptype_file, '', $menu_class, $ptype_menu_id, $menu_icon );
+	$submenu[ $ptype_file ][5]    = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, $ptype_file );
+	$submenu[ $ptype_file ][10]   = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, $post_new_file );
 
 	$i = 15;
 	foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
-		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) )
+		if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array( $ptype, (array) $tax->object_type, true ) ) {
 			continue;
+		}
 
-		$submenu[ $ptype_file ][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, sprintf( $edit_tags_file, $tax->name ) );
+		$submenu[ $ptype_file ][ $i++ ] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, sprintf( $edit_tags_file, $tax->name ) );
 	}
 }
 unset( $ptype, $ptype_obj, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax, $post_new_file );
 
 $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
 
-$appearance_cap = current_user_can( 'switch_themes') ? 'switch_themes' : 'edit_theme_options';
+$appearance_cap = current_user_can( 'switch_themes' ) ? 'switch_themes' : 'edit_theme_options';
 
-$menu[60] = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
+$menu[60]                     = array( __( 'Appearance' ), $appearance_cap, 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
 	$submenu['themes.php'][5] = array( __( 'Themes' ), $appearance_cap, 'themes.php' );
 
-	$customize_url = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
+	$customize_url            = add_query_arg( 'return', urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ), 'customize.php' );
 	$submenu['themes.php'][6] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' );
 
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
-		$submenu['themes.php'][10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' );
-	}
+if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
+	$submenu['themes.php'][10] = array( __( 'Menus' ), 'edit_theme_options', 'nav-menus.php' );
+}
 
-	if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize') ) {
-		$customize_header_url = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
-		$submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
-	}
+if ( current_theme_supports( 'custom-header' ) && current_user_can( 'customize' ) ) {
+	$customize_header_url      = add_query_arg( array( 'autofocus' => array( 'control' => 'header_image' ) ), $customize_url );
+	$submenu['themes.php'][15] = array( __( 'Header' ), $appearance_cap, esc_url( $customize_header_url ), '', 'hide-if-no-customize' );
+}
 
-	if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize') ) {
-		$customize_background_url = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
-		$submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
-	}
+if ( current_theme_supports( 'custom-background' ) && current_user_can( 'customize' ) ) {
+	$customize_background_url  = add_query_arg( array( 'autofocus' => array( 'control' => 'background_image' ) ), $customize_url );
+	$submenu['themes.php'][20] = array( __( 'Background' ), $appearance_cap, esc_url( $customize_background_url ), '', 'hide-if-no-customize' );
+}
 
 	unset( $customize_url );
 
@@ -183,7 +193,7 @@ unset( $appearance_cap );
 
 // Add 'Editor' to the bottom of the Appearance menu.
 if ( ! is_multisite() ) {
-	add_action('admin_menu', '_add_themes_utility_last', 101);
+	add_action( 'admin_menu', '_add_themes_utility_last', 101 );
 }
 /**
  * Adds the (theme) 'Editor' link to the bottom of the Appearance menu.
@@ -193,94 +203,98 @@ if ( ! is_multisite() ) {
  */
 function _add_themes_utility_last() {
 	// Must use API on the admin_menu hook, direct modification is only possible on/before the _admin_menu hook
-	add_submenu_page('themes.php', _x('Editor', 'theme editor'), _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
+	add_submenu_page( 'themes.php', _x( 'Editor', 'theme editor' ), _x( 'Editor', 'theme editor' ), 'edit_themes', 'theme-editor.php' );
 }
 
 $count = '';
 if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) {
-	if ( ! isset( $update_data ) )
+	if ( ! isset( $update_data ) ) {
 		$update_data = wp_get_update_data();
-	$count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
+	}
+	$count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . '</span></span>';
 }
 
-$menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
+$menu[65] = array( sprintf( __( 'Plugins %s' ), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
 
-$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );
+$submenu['plugins.php'][5] = array( __( 'Installed Plugins' ), 'activate_plugins', 'plugins.php' );
 
-	if ( ! is_multisite() ) {
-		/* translators: add new plugin */
-		$submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
-		$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
-	}
+if ( ! is_multisite() ) {
+	/* translators: add new plugin */
+	$submenu['plugins.php'][10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' );
+	$submenu['plugins.php'][15] = array( _x( 'Editor', 'plugin editor' ), 'edit_plugins', 'plugin-editor.php' );
+}
 
 unset( $update_data );
 
-if ( current_user_can('list_users') )
-	$menu[70] = array( __('Users'), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
-else
-	$menu[70] = array( __('Profile'), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+if ( current_user_can( 'list_users' ) ) {
+	$menu[70] = array( __( 'Users' ), 'list_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+} else {
+	$menu[70] = array( __( 'Profile' ), 'read', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+}
 
-if ( current_user_can('list_users') ) {
+if ( current_user_can( 'list_users' ) ) {
 	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
-	$submenu['users.php'][5] = array(__('All Users'), 'list_users', 'users.php');
+	$submenu['users.php'][5]             = array( __( 'All Users' ), 'list_users', 'users.php' );
 	if ( current_user_can( 'create_users' ) ) {
-		$submenu['users.php'][10] = array(_x('Add New', 'user'), 'create_users', 'user-new.php');
+		$submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' );
 	} elseif ( is_multisite() ) {
-		$submenu['users.php'][10] = array(_x('Add New', 'user'), 'promote_users', 'user-new.php');
+		$submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'promote_users', 'user-new.php' );
 	}
 
-	$submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
+	$submenu['users.php'][15] = array( __( 'Your Profile' ), 'read', 'profile.php' );
 } else {
 	$_wp_real_parent_file['users.php'] = 'profile.php';
-	$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
+	$submenu['profile.php'][5]         = array( __( 'Your Profile' ), 'read', 'profile.php' );
 	if ( current_user_can( 'create_users' ) ) {
-		$submenu['profile.php'][10] = array(__('Add New User'), 'create_users', 'user-new.php');
+		$submenu['profile.php'][10] = array( __( 'Add New User' ), 'create_users', 'user-new.php' );
 	} elseif ( is_multisite() ) {
-		$submenu['profile.php'][10] = array(__('Add New User'), 'promote_users', 'user-new.php');
+		$submenu['profile.php'][10] = array( __( 'Add New User' ), 'promote_users', 'user-new.php' );
 	}
 }
 
-$menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
-	$submenu['tools.php'][5] = array( __('Available Tools'), 'edit_posts', 'tools.php' );
-	$submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
-	$submenu['tools.php'][15] = array( __('Export'), 'export', 'export.php' );
-	if ( is_multisite() && !is_main_site() )
-		$submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' );
-	if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
-		$submenu['tools.php'][50] = array(__('Network Setup'), 'setup_network', 'network.php');
+$menu[75]                     = array( __( 'Tools' ), 'edit_posts', 'tools.php', '', 'menu-top menu-icon-tools', 'menu-tools', 'dashicons-admin-tools' );
+	$submenu['tools.php'][5]  = array( __( 'Available Tools' ), 'edit_posts', 'tools.php' );
+	$submenu['tools.php'][10] = array( __( 'Import' ), 'import', 'import.php' );
+	$submenu['tools.php'][15] = array( __( 'Export' ), 'export', 'export.php' );
+if ( is_multisite() && ! is_main_site() ) {
+	$submenu['tools.php'][25] = array( __( 'Delete Site' ), 'delete_site', 'ms-delete-site.php' );
+}
+if ( ! is_multisite() && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
+	$submenu['tools.php'][50] = array( __( 'Network Setup' ), 'setup_network', 'network.php' );
+}
 
-$menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
-	$submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
-	$submenu['options-general.php'][15] = array(__('Writing'), 'manage_options', 'options-writing.php');
-	$submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
-	$submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
-	$submenu['options-general.php'][30] = array(__('Media'), 'manage_options', 'options-media.php');
-	$submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
+$menu[80]                               = array( __( 'Settings' ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
+	$submenu['options-general.php'][10] = array( _x( 'General', 'settings screen' ), 'manage_options', 'options-general.php' );
+	$submenu['options-general.php'][15] = array( __( 'Writing' ), 'manage_options', 'options-writing.php' );
+	$submenu['options-general.php'][20] = array( __( 'Reading' ), 'manage_options', 'options-reading.php' );
+	$submenu['options-general.php'][25] = array( __( 'Discussion' ), 'manage_options', 'options-discussion.php' );
+	$submenu['options-general.php'][30] = array( __( 'Media' ), 'manage_options', 'options-media.php' );
+	$submenu['options-general.php'][40] = array( __( 'Permalinks' ), 'manage_options', 'options-permalink.php' );
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
 
 $menu[99] = array( '', 'read', 'separator-last', '', 'wp-menu-separator' );
 
 // Back-compat for old top-levels
-$_wp_real_parent_file['post.php'] = 'edit.php';
-$_wp_real_parent_file['post-new.php'] = 'edit.php';
+$_wp_real_parent_file['post.php']       = 'edit.php';
+$_wp_real_parent_file['post-new.php']   = 'edit.php';
 $_wp_real_parent_file['edit-pages.php'] = 'edit.php?post_type=page';
-$_wp_real_parent_file['page-new.php'] = 'edit.php?post_type=page';
+$_wp_real_parent_file['page-new.php']   = 'edit.php?post_type=page';
 $_wp_real_parent_file['wpmu-admin.php'] = 'tools.php';
-$_wp_real_parent_file['ms-admin.php'] = 'tools.php';
+$_wp_real_parent_file['ms-admin.php']   = 'tools.php';
 
 // Ensure backward compatibility.
 $compat = array(
-	'index' => 'dashboard',
-	'edit' => 'posts',
-	'post' => 'posts',
-	'upload' => 'media',
-	'link-manager' => 'links',
-	'edit-pages' => 'pages',
-	'page' => 'pages',
-	'edit-comments' => 'comments',
+	'index'           => 'dashboard',
+	'edit'            => 'posts',
+	'post'            => 'posts',
+	'upload'          => 'media',
+	'link-manager'    => 'links',
+	'edit-pages'      => 'pages',
+	'page'            => 'pages',
+	'edit-comments'   => 'comments',
 	'options-general' => 'settings',
-	'themes' => 'appearance',
-	);
+	'themes'          => 'appearance',
+);
 
-require_once(ABSPATH . 'wp-admin/includes/menu.php');
+require_once( ABSPATH . 'wp-admin/includes/menu.php' );
diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index 13a9b4a3cd..ae375df3e7 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -8,5 +8,5 @@
  * @subpackage Administration
  */
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
-wp_redirect( admin_url('edit-comments.php?comment_status=moderated') );
+wp_redirect( admin_url( 'edit-comments.php?comment_status=moderated' ) );
 exit;
diff --git a/wp-admin/ms-delete-site.php b/wp-admin/ms-delete-site.php
index 76b63f5e75..f909204010 100644
--- a/wp-admin/ms-delete-site.php
+++ b/wp-admin/ms-delete-site.php
@@ -9,11 +9,13 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can( 'delete_site' ) )
-	wp_die(__( 'Sorry, you are not allowed to delete this site.'));
+if ( ! current_user_can( 'delete_site' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to delete this site.' ) );
+}
 
 if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
 	if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
@@ -27,7 +29,7 @@ if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' )
 $blog = get_site();
 $user = wp_get_current_user();
 
-$title = __( 'Delete Site' );
+$title       = __( 'Delete Site' );
 $parent_file = 'tools.php';
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
@@ -45,7 +47,8 @@ if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_P
 	$switched_locale = switch_to_locale( get_locale() );
 
 	/* translators: Do not translate USERNAME, URL_DELETE, SITE_NAME: those are placeholders. */
-	$content = __( "Howdy ###USERNAME###,
+	$content = __(
+		"Howdy ###USERNAME###,
 
 You recently clicked the 'Delete Site' link on your site and filled in a
 form on that page.
@@ -60,7 +63,8 @@ are gone forever.)
 
 Thanks for using the site,
 Webmaster
-###SITE_NAME###" );
+###SITE_NAME###"
+	);
 	/**
 	 * Filters the email content sent when a site in a Multisite network is deleted.
 	 *
@@ -74,33 +78,36 @@ Webmaster
 	$content = str_replace( '###URL_DELETE###', $url_delete, $content );
 	$content = str_replace( '###SITE_NAME###', get_network()->site_name, $content );
 
-	wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
+	wp_mail( get_option( 'admin_email' ), '[ ' . wp_specialchars_decode( get_option( 'blogname' ) ) . ' ] ' . __( 'Delete My Site' ), $content );
 
 	if ( $switched_locale ) {
 		restore_previous_locale();
 	}
 	?>
 
-	<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>
+	<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 } else {
+<?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>
-	<p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p>
+	<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>
+	<p><?php _e( 'Remember, once deleted your site cannot be restored.' ); ?></p>
 
 	<form method="post" name="deletedirect">
-		<?php wp_nonce_field( 'delete-blog' ) ?>
+		<?php wp_nonce_field( 'delete-blog' ); ?>
 		<input type="hidden" name="action" value="deleteblog" />
-		<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php
+		<p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong>
+		<?php
 			printf(
 				/* translators: %s: site address */
 				__( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ),
 				$blog->domain . $blog->path
 			);
-		?></strong></label></p>
+		?>
+		</strong></label></p>
 		<?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
 	</form>
- 	<?php
+	<?php
 }
 echo '</div>';
 
diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php
index 764e937757..6bf5eb6b1b 100644
--- a/wp-admin/ms-options.php
+++ b/wp-admin/ms-options.php
@@ -9,4 +9,4 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_redirect( network_admin_url('settings.php') );
+wp_redirect( network_admin_url( 'settings.php' ) );
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index 4f2f2a9b51..79602cb07f 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -9,5 +9,5 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_redirect( network_admin_url('sites.php') );
+wp_redirect( network_admin_url( 'sites.php' ) );
 exit;
diff --git a/wp-admin/ms-themes.php b/wp-admin/ms-themes.php
index 1a03c66652..4b86ac9684 100644
--- a/wp-admin/ms-themes.php
+++ b/wp-admin/ms-themes.php
@@ -9,5 +9,5 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_redirect( network_admin_url('themes.php') );
+wp_redirect( network_admin_url( 'themes.php' ) );
 exit;
diff --git a/wp-admin/ms-upgrade-network.php b/wp-admin/ms-upgrade-network.php
index ebf5d27a95..892ab964c7 100644
--- a/wp-admin/ms-upgrade-network.php
+++ b/wp-admin/ms-upgrade-network.php
@@ -9,5 +9,5 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_redirect( network_admin_url('upgrade.php') );
+wp_redirect( network_admin_url( 'upgrade.php' ) );
 exit;
diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php
index cc89815058..1b00514ec3 100644
--- a/wp-admin/ms-users.php
+++ b/wp-admin/ms-users.php
@@ -9,5 +9,5 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-wp_redirect( network_admin_url('users.php') );
+wp_redirect( network_admin_url( 'users.php' ) );
 exit;
diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php
index e07ce7760a..588afb06a0 100644
--- a/wp-admin/my-sites.php
+++ b/wp-admin/my-sites.php
@@ -9,11 +9,13 @@
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
-if ( ! current_user_can('read') )
+if ( ! current_user_can( 'read' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ) );
+}
 
 $action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
 
@@ -32,20 +34,22 @@ if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
 	}
 }
 
-$title = __( 'My Sites' );
+$title       = __( 'My Sites' );
 $parent_file = 'index.php';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-		'<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.') . '</p>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			'<p>' . __( 'This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Dashboard_My_Sites_Screen">Documentation on My Sites</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/Dashboard_My_Sites_Screen">Documentation on My Sites</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -55,9 +59,11 @@ if ( $updated ) { ?>
 <?php } ?>
 
 <div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?php
 if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) {
@@ -110,10 +116,10 @@ else :
 	foreach ( $blogs as $user_blog ) {
 		switch_to_blog( $user_blog->userblog_id );
 
-		echo "<li>";
+		echo '<li>';
 		echo "<h3>{$user_blog->blogname}</h3>";
 
-		$actions = "<a href='" . esc_url( home_url() ). "'>" . __( 'Visit' ) . '</a>';
+		$actions = "<a href='" . esc_url( home_url() ) . "'>" . __( 'Visit' ) . '</a>';
 
 		if ( current_user_can( 'read' ) ) {
 			$actions .= " | <a href='" . esc_url( admin_url() ) . "'>" . __( 'Dashboard' ) . '</a>';
@@ -132,14 +138,17 @@ else :
 
 		/** This filter is documented in wp-admin/my-sites.php */
 		echo apply_filters( 'myblogs_options', '', $user_blog );
-		echo "</li>";
+		echo '</li>';
 
 		restore_current_blog();
-	}?>
+	}
+	?>
 	</ul>
 	<?php
 	if ( count( $blogs ) > 1 || has_action( 'myblogs_allblogs_options' ) || has_filter( 'myblogs_options' ) ) {
-		?><input type="hidden" name="action" value="updateblogsettings" /><?php
+		?>
+		<input type="hidden" name="action" value="updateblogsettings" />
+		<?php
 		wp_nonce_field( 'update-my-sites' );
 		submit_button();
 	}
diff --git a/wp-admin/nav-menus.php b/wp-admin/nav-menus.php
index c0c6db312c..c73a05878a 100644
--- a/wp-admin/nav-menus.php
+++ b/wp-admin/nav-menus.php
@@ -15,8 +15,9 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 // Load all the nav menu interface functions
 require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
 
-if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
+if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) ) {
 	wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
+}
 
 // Permissions Check
 if ( ! current_user_can( 'edit_theme_options' ) ) {
@@ -29,8 +30,9 @@ if ( ! current_user_can( 'edit_theme_options' ) ) {
 
 wp_enqueue_script( 'nav-menu' );
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 // Container for any messages displayed to the user
 $messages = array();
@@ -42,9 +44,9 @@ $nav_menu_selected_title = '';
 $nav_menu_selected_id = isset( $_REQUEST['menu'] ) ? (int) $_REQUEST['menu'] : 0;
 
 // Get existing menu locations assignments
-$locations = get_registered_nav_menus();
+$locations      = get_registered_nav_menus();
 $menu_locations = get_nav_menu_locations();
-$num_locations = count( array_keys( $locations ) );
+$num_locations  = count( array_keys( $locations ) );
 
 // Allowed actions: add, update, delete
 $action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';
@@ -58,22 +60,22 @@ _wp_expand_nav_menu_post_data();
 switch ( $action ) {
 	case 'add-menu-item':
 		check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-		if ( isset( $_REQUEST['nav-menu-locations'] ) )
+		if ( isset( $_REQUEST['nav-menu-locations'] ) ) {
 			set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
-		elseif ( isset( $_REQUEST['menu-item'] ) )
+		} elseif ( isset( $_REQUEST['menu-item'] ) ) {
 			wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		}
 		break;
-	case 'move-down-menu-item' :
-
+	case 'move-down-menu-item':
 		// Moving down a menu item is the same as moving up the next in order.
 		check_admin_referer( 'move-menu_item' );
 		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
 		if ( is_nav_menu_item( $menu_item_id ) ) {
 			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
 			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
-				$menu_id = (int) $menus[0];
+				$menu_id            = (int) $menus[0];
 				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$menu_item_data     = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
@@ -81,17 +83,17 @@ switch ( $action ) {
 				foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
 					if ( isset( $ordered_menu_item_object->ID ) ) {
 						if ( isset( $ordered_menu_item_object->menu_order ) ) {
-							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
-							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
+							$dbids_to_orders[ $ordered_menu_item_object->ID ]         = $ordered_menu_item_object->menu_order;
+							$orders_to_dbids[ $ordered_menu_item_object->menu_order ] = $ordered_menu_item_object->ID;
 						}
 					}
 				}
 
 				// Get next in order.
 				if (
-					isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
+					isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] + 1 ] )
 				) {
-					$next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
+					$next_item_id   = $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] + 1 ];
 					$next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
 
 					// If not siblings of same parent, bubble menu item up but keep order.
@@ -108,13 +110,13 @@ switch ( $action ) {
 						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
 
 						if ( ! is_wp_error( $parent_object ) ) {
-							$parent_data = (array) $parent_object;
+							$parent_data                        = (array) $parent_object;
 							$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
 							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 
 						}
 
-					// Make menu item a child of its next sibling.
+						// Make menu item a child of its next sibling.
 					} else {
 						$next_item_data['menu_order'] = $next_item_data['menu_order'] - 1;
 						$menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
@@ -122,31 +124,31 @@ switch ( $action ) {
 						$menu_item_data['menu_item_parent'] = $next_item_data['ID'];
 						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 
-						wp_update_post($menu_item_data);
-						wp_update_post($next_item_data);
+						wp_update_post( $menu_item_data );
+						wp_update_post( $next_item_data );
 					}
 
-				// The item is last but still has a parent, so bubble up.
+					// The item is last but still has a parent, so bubble up.
 				} elseif (
 					! empty( $menu_item_data['menu_item_parent'] ) &&
 					in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
 				) {
-					$menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
+					$menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true );
 					update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
 				}
 			}
 		}
 
 		break;
-	case 'move-up-menu-item' :
+	case 'move-up-menu-item':
 		check_admin_referer( 'move-menu_item' );
 		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
 		if ( is_nav_menu_item( $menu_item_id ) ) {
 			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
 			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
-				$menu_id = (int) $menus[0];
+				$menu_id            = (int) $menus[0];
 				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$menu_item_data     = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
@@ -154,23 +156,23 @@ switch ( $action ) {
 				foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
 					if ( isset( $ordered_menu_item_object->ID ) ) {
 						if ( isset( $ordered_menu_item_object->menu_order ) ) {
-							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
-							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
+							$dbids_to_orders[ $ordered_menu_item_object->ID ]         = $ordered_menu_item_object->menu_order;
+							$orders_to_dbids[ $ordered_menu_item_object->menu_order ] = $ordered_menu_item_object->ID;
 						}
 					}
 				}
 
 				// If this menu item is not first.
-				if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
+				if ( ! empty( $dbids_to_orders[ $menu_item_id ] ) && ! empty( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) ) {
 
 					// If this menu item is a child of the previous.
 					if (
 						! empty( $menu_item_data['menu_item_parent'] ) &&
 						in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
-						isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) &&
-						( $menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] )
+						isset( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) &&
+						( $menu_item_data['menu_item_parent'] == $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] )
 					) {
-						$parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
+						$parent_db_id  = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
 						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
 
 						if ( ! is_wp_error( $parent_object ) ) {
@@ -181,27 +183,28 @@ switch ( $action ) {
 							 * make menu item a child also of it.
 							 */
 							if (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
+								! empty( $dbids_to_orders[ $parent_db_id ] ) &&
+								! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] ) &&
 								! empty( $parent_data['menu_item_parent'] )
 							) {
 								$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
 
-							/*
-							 * Else if there is something before parent and parent not a child of it,
-							 * make menu item a child of that something's parent
-							 */
+								/*
+								* Else if there is something before parent and parent not a child of it,
+								* make menu item a child of that something's parent
+								*/
 							} elseif (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
+								! empty( $dbids_to_orders[ $parent_db_id ] ) &&
+								! empty( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ] )
 							) {
-								$_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
-								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) )
+								$_possible_parent_id = (int) get_post_meta( $orders_to_dbids[ $dbids_to_orders[ $parent_db_id ] - 1 ], '_menu_item_menu_item_parent', true );
+								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) ) {
 									$menu_item_data['menu_item_parent'] = $_possible_parent_id;
-								else
+								} else {
 									$menu_item_data['menu_item_parent'] = 0;
+								}
 
-							// Else there isn't something before the parent.
+								// Else there isn't something before the parent.
 							} else {
 								$menu_item_data['menu_item_parent'] = 0;
 							}
@@ -214,22 +217,22 @@ switch ( $action ) {
 
 							// Save changes.
 							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
-							wp_update_post($menu_item_data);
-							wp_update_post($parent_data);
+							wp_update_post( $menu_item_data );
+							wp_update_post( $parent_data );
 						}
 
-					// Else this menu item is not a child of the previous.
+						// Else this menu item is not a child of the previous.
 					} elseif (
 						empty( $menu_item_data['menu_order'] ) ||
 						empty( $menu_item_data['menu_item_parent'] ) ||
 						! in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) ||
-						empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
-						$orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
+						empty( $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] ) ||
+						$orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ] != $menu_item_data['menu_item_parent']
 					) {
 						// Just make it a child of the previous; keep the order.
-						$menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
+						$menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[ $dbids_to_orders[ $menu_item_id ] - 1 ];
 						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
-						wp_update_post($menu_item_data);
+						wp_update_post( $menu_item_data );
 					}
 				}
 			}
@@ -241,8 +244,9 @@ switch ( $action ) {
 
 		check_admin_referer( 'delete-menu_item_' . $menu_item_id );
 
-		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) {
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu item has been successfully deleted.' ) . '</p></div>';
+		}
 		break;
 
 	case 'delete':
@@ -255,30 +259,34 @@ switch ( $action ) {
 			unset( $_REQUEST['menu'] );
 		}
 
-		if ( ! isset( $deletion ) )
+		if ( ! isset( $deletion ) ) {
 			break;
+		}
 
-		if ( is_wp_error( $deletion ) )
+		if ( is_wp_error( $deletion ) ) {
 			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
-		else
+		} else {
 			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+		}
 		break;
 
 	case 'delete_menus':
 		check_admin_referer( 'nav_menus_bulk_actions' );
 		foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
-			if ( ! is_nav_menu( $menu_id_to_delete ) )
+			if ( ! is_nav_menu( $menu_id_to_delete ) ) {
 				continue;
+			}
 
 			$deletion = wp_delete_nav_menu( $menu_id_to_delete );
 			if ( is_wp_error( $deletion ) ) {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+				$messages[]     = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
 				$deletion_error = true;
 			}
 		}
 
-		if ( empty( $deletion_error ) )
+		if ( empty( $deletion_error ) ) {
 			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		}
 		break;
 
 	case 'update':
@@ -286,14 +294,15 @@ switch ( $action ) {
 
 		// Remove menu locations that have been unchecked.
 		foreach ( $locations as $location => $description ) {
-			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
+			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ) {
 				unset( $menu_locations[ $location ] );
+			}
 		}
 
 		// Merge new and existing menu locations if any new ones are set.
 		if ( isset( $_POST['menu-locations'] ) ) {
 			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+			$menu_locations     = array_merge( $menu_locations, $new_menu_locations );
 		}
 
 		// Set menu locations.
@@ -304,16 +313,17 @@ switch ( $action ) {
 			$new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
 
 			if ( $new_menu_title ) {
-				$_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
+				$_nav_menu_selected_id = wp_update_nav_menu_object( 0, array( 'menu-name' => $new_menu_title ) );
 
 				if ( is_wp_error( $_nav_menu_selected_id ) ) {
 					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
-					$nav_menu_selected_id = $_nav_menu_selected_id;
+					$_menu_object            = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$nav_menu_selected_id    = $_nav_menu_selected_id;
 					$nav_menu_selected_title = $_menu_object->name;
-					if ( isset( $_REQUEST['menu-item'] ) )
+					if ( isset( $_REQUEST['menu-item'] ) ) {
 						wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
+					}
 					if ( isset( $_REQUEST['zero-menu-state'] ) ) {
 						// If there are menu items, add them
 						wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
@@ -326,10 +336,11 @@ switch ( $action ) {
 						set_theme_mod( 'nav_menu_locations', $locations );
 					}
 					if ( isset( $_REQUEST['use-location'] ) ) {
-						$locations = get_registered_nav_menus();
+						$locations      = get_registered_nav_menus();
 						$menu_locations = get_nav_menu_locations();
-						if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
+						if ( isset( $locations[ $_REQUEST['use-location'] ] ) ) {
 							$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
+						}
 						set_theme_mod( 'nav_menu_locations', $menu_locations );
 					}
 
@@ -341,7 +352,7 @@ switch ( $action ) {
 				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
 			}
 
-		// Update existing menu.
+			// Update existing menu.
 		} else {
 
 			$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
@@ -356,9 +367,9 @@ switch ( $action ) {
 				$_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
 				if ( is_wp_error( $_nav_menu_selected_id ) ) {
 					$_menu_object = $_nav_menu_selected_id;
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+					$messages[]   = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$_menu_object            = wp_get_nav_menu_object( $_nav_menu_selected_id );
 					$nav_menu_selected_title = $_menu_object->name;
 				}
 			}
@@ -387,7 +398,7 @@ switch ( $action ) {
 			check_admin_referer( 'save-menu-locations' );
 
 			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+			$menu_locations     = array_merge( $menu_locations, $new_menu_locations );
 			// Set menu locations
 			set_theme_mod( 'nav_menu_locations', $menu_locations );
 
@@ -397,7 +408,7 @@ switch ( $action ) {
 }
 
 // Get all nav menus.
-$nav_menus = wp_get_nav_menus();
+$nav_menus  = wp_get_nav_menus();
 $menu_count = count( $nav_menus );
 
 // Are we on the add new screen?
@@ -409,26 +420,26 @@ $locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action']
  * If we have one theme location, and zero menus, we take them right
  * into editing their first menu.
  */
-$page_count = wp_count_posts( 'page' );
+$page_count                  = wp_count_posts( 'page' );
 $one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
 
 $nav_menus_l10n = array(
 	'oneThemeLocationNoMenus' => $one_theme_location_no_menus,
-	'moveUp'       => __( 'Move up one' ),
-	'moveDown'     => __( 'Move down one' ),
-	'moveToTop'    => __( 'Move to the top' ),
+	'moveUp'                  => __( 'Move up one' ),
+	'moveDown'                => __( 'Move down one' ),
+	'moveToTop'               => __( 'Move to the top' ),
 	/* translators: %s: previous item name */
-	'moveUnder'    => __( 'Move under %s' ),
+	'moveUnder'               => __( 'Move under %s' ),
 	/* translators: %s: previous item name */
-	'moveOutFrom'  => __( 'Move out from under %s' ),
+	'moveOutFrom'             => __( 'Move out from under %s' ),
 	/* translators: %s: previous item name */
-	'under'        => __( 'Under %s' ),
+	'under'                   => __( 'Under %s' ),
 	/* translators: %s: previous item name */
-	'outFrom'      => __( 'Out from under %s' ),
+	'outFrom'                 => __( 'Out from under %s' ),
 	/* translators: 1: item name, 2: item position, 3: total number of items */
-	'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+	'menuFocus'               => __( '%1$s. Menu item %2$d of %3$d.' ),
 	/* translators: 1: item name, 2: item position, 3: parent item name */
-	'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+	'subMenuFocus'            => __( '%1$s. Sub item number %2$d under %3$s.' ),
 );
 wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
 
@@ -436,21 +447,25 @@ wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
  * Redirect to add screen if there are no menus and this users has either zero,
  * or more than 1 theme locations.
  */
-if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
+if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus ) {
 	wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
+}
 
 // Get recently edited nav menu.
 $recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
-if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
+if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) ) {
 	$recently_edited = $nav_menu_selected_id;
+}
 
 // Use $recently_edited if none are selected.
-if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
+if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) ) {
 	$nav_menu_selected_id = $recently_edited;
+}
 
 // On deletion of menu, if another menu exists, show it.
-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
+if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] ) {
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
+}
 
 // Set $nav_menu_selected_id to 0 if no menus.
 if ( $one_theme_location_no_menus ) {
@@ -461,23 +476,24 @@ if ( $one_theme_location_no_menus ) {
 }
 
 // Update the user's setting.
-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
+if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) ) {
 	update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
+}
 
 // If there's a menu, get its name.
 if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
-	$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
+	$_menu_object            = wp_get_nav_menu_object( $nav_menu_selected_id );
 	$nav_menu_selected_title = ! is_wp_error( $_menu_object ) ? $_menu_object->name : '';
 }
 
 // Generate truncated menu names.
 foreach ( (array) $nav_menus as $key => $_nav_menu ) {
-	$nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '&hellip;' );
+	$nav_menus[ $key ]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '&hellip;' );
 }
 
 // Retrieve menu locations.
 if ( current_theme_supports( 'menus' ) ) {
-	$locations = get_registered_nav_menus();
+	$locations      = get_registered_nav_menus();
 	$menu_locations = get_nav_menu_locations();
 }
 
@@ -492,12 +508,11 @@ $_wp_nav_menu_max_depth = 0;
 
 // Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth.
 if ( is_nav_menu( $nav_menu_selected_id ) ) {
-	$menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
+	$menu_items  = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
 	$edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
 }
 
 /**
- *
  * @global int $_wp_nav_menu_max_depth
  *
  * @param string $classes
@@ -508,68 +523,77 @@ function wp_nav_menu_max_depth( $classes ) {
 	return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
 }
 
-add_filter('admin_body_class', 'wp_nav_menu_max_depth');
+add_filter( 'admin_body_class', 'wp_nav_menu_max_depth' );
 
 wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
 
-if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
+if ( ! current_theme_supports( 'menus' ) && ! $num_locations ) {
 	$messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Navigation Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+}
 
 if ( ! $locations_screen ) : // Main tab
-	$overview  = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
+	$overview = '<p>' . __( 'This screen is used for managing your navigation menus.' ) . '</p>';
 	/* translators: 1: Widgets admin screen URL, 2 and 3: The name of the default themes */
 	$overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Navigation Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the navigation menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Sixteen', 'Twenty Seventeen' ) . '</p>';
 	$overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
 	$overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
 	$overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
-		'content' => $overview
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' => $overview,
+		)
+	);
 
 	$menu_management  = '<p>' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '</p>';
 	$menu_management .= '<ul><li>' . __( 'To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>' ) . '</li>';
 	$menu_management .= '<li>' . __( 'If you haven&#8217;t yet created any menus, <strong>click the &#8217;create a new menu&#8217; link</strong> to get started' ) . '</li></ul>';
 	$menu_management .= '<p>' . __( 'You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'menu-management',
-		'title'   => __( 'Menu Management' ),
-		'content' => $menu_management
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'menu-management',
+			'title'   => __( 'Menu Management' ),
+			'content' => $menu_management,
+		)
+	);
 
 	$editing_menus  = '<p>' . __( 'Each navigation menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';
 	$editing_menus .= '<p>' . __( '<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>';
 	$editing_menus .= '<ul><li>' . __( 'Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>' ) . '</li>';
-	$editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';
+	$editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>' ) . '</li>';
 	$editing_menus .= '<li>' . __( 'To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu' ) . '</li>';
 	$editing_menus .= '<li>' . __( 'Delete a menu item by <strong>expanding it and clicking the Remove link</strong>' ) . '</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'editing-menus',
-		'title'   => __( 'Editing Menus' ),
-		'content' => $editing_menus
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'editing-menus',
+			'title'   => __( 'Editing Menus' ),
+			'content' => $editing_menus,
+		)
+	);
 else : // Locations Tab.
 	$locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
 	$locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';
 	$locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';
 	$locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'locations-overview',
-		'title'   => __( 'Overview' ),
-		'content' => $locations_overview
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'locations-overview',
+			'title'   => __( 'Overview' ),
+			'content' => $locations_overview,
+		)
+	);
 endif;
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Menus_Screen">Documentation on Menus</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/Appearance_Menus_Screen">Documentation on Menus</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 // Get the admin header.
@@ -582,10 +606,14 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
 		printf(
 			' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-			esc_url( add_query_arg( array(
-				array( 'autofocus' => $focus ),
-				'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
-			), admin_url( 'customize.php' ) ) ),
+			esc_url(
+				add_query_arg(
+					array(
+						array( 'autofocus' => $focus ),
+						'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+					), admin_url( 'customize.php' )
+				)
+			),
 			__( 'Manage with Live Preview' )
 		);
 	endif;
@@ -601,7 +629,12 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	<h2 class="nav-tab-wrapper wp-clearfix">
 		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php echo $nav_tab_active_class; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab
+								<?php
+								if ( $locations_screen ) {
+									echo ' nav-tab-active';}
+?>
+"><?php esc_html_e( 'Manage Locations' ); ?></a>
 		<?php
 			endif;
 		?>
@@ -616,7 +649,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 		if ( 1 == $num_locations ) {
 			echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
 		} 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>';
+			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">
@@ -636,13 +669,13 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 							<select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
 								<option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
 								<?php
-									foreach ( $nav_menus as $menu ) :
-										$data_orig = '';
-										$selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id;
-										if ( $selected ) {
-											$data_orig = 'data-orig="true"';
-										}
-										?>
+								foreach ( $nav_menus as $menu ) :
+									$data_orig = '';
+									$selected  = isset( $menu_locations[ $_location ] ) && $menu_locations[ $_location ] == $menu->term_id;
+									if ( $selected ) {
+										$data_orig = 'data-orig="true"';
+									}
+									?>
 									<option <?php echo $data_orig; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
 										<?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
 									</option>
@@ -651,13 +684,36 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 							<div class="locations-row-links">
 								<?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
 								<span class="locations-edit-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => $menu_locations[$_location] ), admin_url( 'nav-menus.php' ) ) ); ?>">
+									<a href="
+									<?php
+									echo esc_url(
+										add_query_arg(
+											array(
+												'action' => 'edit',
+												'menu'   => $menu_locations[ $_location ],
+											), admin_url( 'nav-menus.php' )
+										)
+									);
+?>
+">
 										<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
 									</a>
 								</span>
 								<?php endif; ?>
 								<span class="locations-add-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, 'use-location' => $_location ), admin_url( 'nav-menus.php' ) ) ); ?>">
+									<a href="
+									<?php
+									echo esc_url(
+										add_query_arg(
+											array(
+												'action' => 'edit',
+												'menu'   => 0,
+												'use-location' => $_location,
+											), admin_url( 'nav-menus.php' )
+										)
+									);
+?>
+">
 										<?php _ex( 'Use new menu', 'menu' ); ?>
 									</a>
 								</span>
@@ -678,12 +734,24 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	 *
 	 * @since 3.6.0
 	 */
-	do_action( 'after_menu_locations_table' ); ?>
+	do_action( 'after_menu_locations_table' );
+	?>
 	<?php else : ?>
 	<div class="manage-menus">
- 		<?php if ( $menu_count < 2 ) : ?>
+		<?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>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+			<?php
+			printf(
+				__( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url(
+					add_query_arg(
+						array(
+							'action' => 'edit',
+							'menu'   => 0,
+						), admin_url( 'nav-menus.php' )
+					)
+				)
+			);
+?>
 		</span><!-- /add-edit-menu-action -->
 		<?php else : ?>
 			<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
@@ -696,7 +764,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 				<?php foreach ( (array) $nav_menus as $_nav_menu ) : ?>
 					<option value="<?php echo esc_attr( $_nav_menu->term_id ); ?>" <?php selected( $_nav_menu->term_id, $nav_menu_selected_id ); ?>>
 						<?php
-						echo esc_html( $_nav_menu->truncated_name ) ;
+						echo esc_html( $_nav_menu->truncated_name );
 
 						if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
 							$locations_assigned_to_this_menu = array();
@@ -717,7 +785,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 							// Adds ellipses following the number of locations defined in $assigned_locations.
 							if ( ! empty( $assigned_locations ) ) {
-								printf( ' (%1$s%2$s)',
+								printf(
+									' (%1$s%2$s)',
 									implode( ', ', $assigned_locations ),
 									count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' &hellip;' : ''
 								);
@@ -729,16 +798,27 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 			</select>
 			<span class="submit-btn"><input type="submit" class="button" value="<?php esc_attr_e( 'Select' ); ?>"></span>
 			<span class="add-new-menu-action">
-				<?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+				<?php
+				printf(
+					__( 'or <a href="%s">create a new menu</a>.' ), esc_url(
+						add_query_arg(
+							array(
+								'action' => 'edit',
+								'menu'   => 0,
+							), admin_url( 'nav-menus.php' )
+						)
+					)
+				);
+?>
 			</span><!-- /add-new-menu-action -->
 		</form>
 	<?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">
@@ -759,9 +839,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';
+			}
 			?>
 				<div class="menu-edit <?php echo $new_screen_class; ?>">
 					<input type="hidden" name="nav-menu-data">
@@ -776,10 +856,12 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 						$menu_name_val = 'value="' . esc_attr( 'Menu 1' ) . '"';
 					?>
 						<input type="hidden" name="zero-menu-state" value="true" />
-					<?php } else {
+					<?php
+					} else {
 						$menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
-					} ?>
- 					<input type="hidden" name="action" value="update" />
+					}
+					?>
+					 <input type="hidden" name="action" value="update" />
 					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
 					<div id="nav-menu-header">
 						<div class="major-publishing-actions wp-clearfix">
@@ -796,9 +878,9 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 							<h3><?php _e( 'Menu Structure' ); ?></h3>
 							<?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; ?>>
@@ -821,27 +903,29 @@ require_once( ABSPATH . 'wp-admin/admin-header.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
 								if ( ! isset( $auto_add ) ) {
 									$auto_add = get_option( 'nav_menu_options' );
-									if ( ! isset( $auto_add['auto_add'] ) )
+									if ( ! isset( $auto_add['auto_add'] ) ) {
 										$auto_add = false;
-									elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) )
+									} elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) ) {
 										$auto_add = true;
-									else
+									} else {
 										$auto_add = false;
-								} ?>
+									}
+								}
+								?>
 
 								<fieldset class="menu-settings-group auto-add-pages">
 									<legend class="menu-settings-group-name howto"><?php _e( 'Auto add pages' ); ?></legend>
 									<div class="menu-settings-input checkbox-input">
-										<input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label>
+										<input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf( __( 'Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label>
 									</div>
 								</fieldset>
 
@@ -854,12 +938,15 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 											<input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
 											<label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
 											<?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
-												<span class="theme-location-set"><?php
+												<span class="theme-location-set">
+												<?php
 													/* translators: %s: menu name */
-													printf( _x( '(Currently set to: %s)', 'menu location' ),
+													printf(
+														_x( '(Currently set to: %s)', 'menu location' ),
 														wp_get_nav_menu_object( $menu_locations[ $location ] )->name
 													);
-												?></span>
+												?>
+												</span>
 											<?php endif; ?>
 										</div>
 										<?php endforeach; ?>
@@ -874,7 +961,20 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 						<div class="major-publishing-actions wp-clearfix">
 							<?php if ( 0 != $menu_count && ! $add_new_screen ) : ?>
 							<span class="delete-action">
-								<a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'delete', 'menu' => $nav_menu_selected_id ), admin_url( 'nav-menus.php' ) ), 'delete-nav_menu-' . $nav_menu_selected_id) ); ?>"><?php _e('Delete Menu'); ?></a>
+								<a class="submitdelete deletion menu-delete" href="
+								<?php
+								echo esc_url(
+									wp_nonce_url(
+										add_query_arg(
+											array(
+												'action' => 'delete',
+												'menu'   => $nav_menu_selected_id,
+											), admin_url( 'nav-menus.php' )
+										), 'delete-nav_menu-' . $nav_menu_selected_id
+									)
+								);
+?>
+"><?php _e( 'Delete Menu' ); ?></a>
 							</span><!-- END .delete-action -->
 							<?php endif; ?>
 							<div class="publishing-action">
diff --git a/wp-admin/network.php b/wp-admin/network.php
index d0effdb1c5..f238c2eab1 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -49,31 +49,33 @@ if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALL
 }
 
 if ( is_network_admin() ) {
-	$title = __( 'Network Setup' );
+	$title       = __( 'Network Setup' );
 	$parent_file = 'settings.php';
 } else {
-	$title = __( 'Create a Network of WordPress Sites' );
+	$title       = __( 'Create a Network of WordPress Sites' );
 	$parent_file = 'tools.php';
 }
 
-$network_help = '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
-	'<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your installation. Fill out the network details, and click Install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
-	'<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
-	'<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
-	'<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .
-	'<p>' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.') . '</p>' .
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
+$network_help = '<p>' . __( 'This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.' ) . '</p>' .
+	'<p>' . __( 'Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your installation. Fill out the network details, and click Install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).' ) . '</p>' .
+	'<p>' . __( 'The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.' ) . '</p>' .
+	'<p>' . __( 'Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).' ) . '</p>' .
+	'<p>' . __( 'Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.' ) . '</p>' .
+	'<p>' . __( 'The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.' ) . '</p>' .
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>' ) . '</p>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'network',
-	'title'   => __('Network'),
-	'content' => $network_help,
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'network',
+		'title'   => __( 'Network' ),
+		'content' => $network_help,
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Create_A_Network">Documentation on Creating a Network</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Tools_Network_Screen">Documentation on the Network Screen</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
@@ -93,14 +95,15 @@ if ( $_POST ) {
 	// Create network tables.
 	install_network();
 	$base              = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
-	$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
+	$subdomain_install = allow_subdomain_install() ? ! empty( $_POST['subdomain_install'] ) : false;
 	if ( ! network_domain_check() ) {
 		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
 		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
+			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() ) {
 				network_step2( $result );
-			else
+			} else {
 				network_step1( $result );
+			}
 		} else {
 			network_step2();
 		}
diff --git a/wp-admin/network/index.php b/wp-admin/network/index.php
index f4a1aa6423..829a7eb723 100644
--- a/wp-admin/network/index.php
+++ b/wp-admin/network/index.php
@@ -13,42 +13,47 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 /** Load WordPress dashboard API */
 require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
 
-if ( ! current_user_can( 'manage_network' ) )
+if ( ! current_user_can( 'manage_network' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
-$title = __( 'Dashboard' );
+$title       = __( 'Dashboard' );
 $parent_file = 'index.php';
 
-$overview = '<p>' . __( 'Welcome to your Network Admin. This area of the Administration Screens is used for managing all aspects of your Multisite Network.' ) . '</p>';
+$overview  = '<p>' . __( 'Welcome to your Network Admin. This area of the Administration Screens is used for managing all aspects of your Multisite Network.' ) . '</p>';
 $overview .= '<p>' . __( 'From here you can:' ) . '</p>';
 $overview .= '<ul><li>' . __( 'Add and manage sites or users' ) . '</li>';
 $overview .= '<li>' . __( 'Install and activate themes or plugins' ) . '</li>';
 $overview .= '<li>' . __( 'Update your network' ) . '</li>';
 $overview .= '<li>' . __( 'Modify global network settings' ) . '</li></ul>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
-	'content' => $overview
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $overview,
+	)
+);
 
-$quick_tasks = '<p>' . __( 'The Right Now widget on this screen provides current user and site counts on your network.' ) . '</p>';
+$quick_tasks  = '<p>' . __( 'The Right Now widget on this screen provides current user and site counts on your network.' ) . '</p>';
 $quick_tasks .= '<ul><li>' . __( 'To add a new user, <strong>click Create a New User</strong>.' ) . '</li>';
 $quick_tasks .= '<li>' . __( 'To add a new site, <strong>click Create a New Site</strong>.' ) . '</li></ul>';
 $quick_tasks .= '<p>' . __( 'To search for a user or site, use the search boxes.' ) . '</p>';
 $quick_tasks .= '<ul><li>' . __( 'To search for a user, <strong>enter an email address or username</strong>. Use a wildcard to search for a partial username, such as user&#42;.' ) . '</li>';
 $quick_tasks .= '<li>' . __( 'To search for a site, <strong>enter the path or domain</strong>.' ) . '</li></ul>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'quick-tasks',
-	'title'   => __( 'Quick Tasks' ),
-	'content' => $quick_tasks
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'quick-tasks',
+		'title'   => __( 'Quick Tasks' ),
+		'content' => $quick_tasks,
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin">Documentation on the Network Admin</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin">Documentation on the Network Admin</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
 );
 
 wp_dashboard_setup();
diff --git a/wp-admin/network/menu.php b/wp-admin/network/menu.php
index e21deb8b94..707fcc23f1 100644
--- a/wp-admin/network/menu.php
+++ b/wp-admin/network/menu.php
@@ -8,7 +8,7 @@
  */
 
 /* translators: Network menu item */
-$menu[2] = array(__('Dashboard'), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard');
+$menu[2] = array( __( 'Dashboard' ), 'manage_network', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
 
 $submenu['index.php'][0] = array( __( 'Home' ), 'read', 'index.php' );
 
@@ -24,7 +24,7 @@ if ( current_user_can( 'update_core' ) ) {
 
 $update_data = wp_get_update_data();
 if ( $update_data['counts']['total'] ) {
-	$submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}'><span class='update-count'>" . number_format_i18n( $update_data['counts']['total'] ) . "</span></span>" ), $cap, 'update-core.php' );
+	$submenu['index.php'][10] = array( sprintf( __( 'Updates %s' ), "<span class='update-plugins count-{$update_data['counts']['total']}'><span class='update-count'>" . number_format_i18n( $update_data['counts']['total'] ) . '</span></span>' ), $cap, 'update-core.php' );
 } else {
 	$submenu['index.php'][10] = array( __( 'Updates' ), $cap, 'update-core.php' );
 }
@@ -36,39 +36,39 @@ $submenu['index.php'][15] = array( __( 'Upgrade Network' ), 'upgrade_network', '
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
 /* translators: Sites menu item */
-$menu[5] = array(__('Sites'), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-multisite');
-$submenu['sites.php'][5]  = array( __('All Sites'), 'manage_sites', 'sites.php' );
-$submenu['sites.php'][10]  = array( _x('Add New', 'site'), 'create_sites', 'site-new.php' );
+$menu[5]                  = array( __( 'Sites' ), 'manage_sites', 'sites.php', '', 'menu-top menu-icon-site', 'menu-site', 'dashicons-admin-multisite' );
+$submenu['sites.php'][5]  = array( __( 'All Sites' ), 'manage_sites', 'sites.php' );
+$submenu['sites.php'][10] = array( _x( 'Add New', 'site' ), 'create_sites', 'site-new.php' );
 
-$menu[10] = array(__('Users'), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users');
-$submenu['users.php'][5]  = array( __('All Users'), 'manage_network_users', 'users.php' );
-$submenu['users.php'][10]  = array( _x('Add New', 'user'), 'create_users', 'user-new.php' );
+$menu[10]                 = array( __( 'Users' ), 'manage_network_users', 'users.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+$submenu['users.php'][5]  = array( __( 'All Users' ), 'manage_network_users', 'users.php' );
+$submenu['users.php'][10] = array( _x( 'Add New', 'user' ), 'create_users', 'user-new.php' );
 
 if ( current_user_can( 'update_themes' ) && $update_data['counts']['themes'] ) {
-	$menu[15] = array(sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . "</span></span>" ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
+	$menu[15] = array( sprintf( __( 'Themes %s' ), "<span class='update-plugins count-{$update_data['counts']['themes']}'><span class='theme-count'>" . number_format_i18n( $update_data['counts']['themes'] ) . '</span></span>' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
 } else {
 	$menu[15] = array( __( 'Themes' ), 'manage_network_themes', 'themes.php', '', 'menu-top menu-icon-appearance', 'menu-appearance', 'dashicons-admin-appearance' );
 }
-$submenu['themes.php'][5]  = array( __('Installed Themes'), 'manage_network_themes', 'themes.php' );
-$submenu['themes.php'][10] = array( _x('Add New', 'theme'), 'install_themes', 'theme-install.php' );
-$submenu['themes.php'][15] = array( _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php' );
+$submenu['themes.php'][5]  = array( __( 'Installed Themes' ), 'manage_network_themes', 'themes.php' );
+$submenu['themes.php'][10] = array( _x( 'Add New', 'theme' ), 'install_themes', 'theme-install.php' );
+$submenu['themes.php'][15] = array( _x( 'Editor', 'theme editor' ), 'edit_themes', 'theme-editor.php' );
 
 if ( current_user_can( 'update_plugins' ) && $update_data['counts']['plugins'] ) {
-	$menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins');
+	$menu[20] = array( sprintf( __( 'Plugins %s' ), "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n( $update_data['counts']['plugins'] ) . '</span></span>' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
 } else {
-	$menu[20] = array( __('Plugins'), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
+	$menu[20] = array( __( 'Plugins' ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'dashicons-admin-plugins' );
 }
-$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'manage_network_plugins', 'plugins.php' );
-$submenu['plugins.php'][10] = array( _x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php' );
-$submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
+$submenu['plugins.php'][5]  = array( __( 'Installed Plugins' ), 'manage_network_plugins', 'plugins.php' );
+$submenu['plugins.php'][10] = array( _x( 'Add New', 'plugin' ), 'install_plugins', 'plugin-install.php' );
+$submenu['plugins.php'][15] = array( _x( 'Editor', 'plugin editor' ), 'edit_plugins', 'plugin-editor.php' );
 
-$menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings');
+$menu[25] = array( __( 'Settings' ), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
 if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
-	$submenu['settings.php'][5]  = array( __('Network Settings'), 'manage_network_options', 'settings.php' );
-	$submenu['settings.php'][10] = array( __('Network Setup'), 'setup_network', 'setup.php' );
+	$submenu['settings.php'][5]  = array( __( 'Network Settings' ), 'manage_network_options', 'settings.php' );
+	$submenu['settings.php'][10] = array( __( 'Network Setup' ), 'setup_network', 'setup.php' );
 }
-unset($update_data);
+unset( $update_data );
 
 $menu[99] = array( '', 'exist', 'separator-last', '', 'wp-menu-separator' );
 
-require_once(ABSPATH . 'wp-admin/includes/menu.php');
+require_once( ABSPATH . 'wp-admin/includes/menu.php' );
diff --git a/wp-admin/network/plugin-install.php b/wp-admin/network/plugin-install.php
index 26b3b0c867..f771f63a88 100644
--- a/wp-admin/network/plugin-install.php
+++ b/wp-admin/network/plugin-install.php
@@ -7,8 +7,9 @@
  * @since 3.1.0
  */
 
-if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 28330e0c4e..0bf31f4e02 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -13,18 +13,19 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 /** WordPress Translation Installation API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! current_user_can( 'manage_network_options' ) )
+if ( ! current_user_can( 'manage_network_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
-$title = __( 'Network Settings' );
+$title       = __( 'Network Settings' );
 $parent_file = 'settings.php';
 
 // Handle network admin email change requests
-if ( ! empty( $_GET[ 'network_admin_hash' ] ) ) {
+if ( ! empty( $_GET['network_admin_hash'] ) ) {
 	$new_admin_details = get_site_option( 'network_admin_hash' );
-	$redirect = 'settings.php?updated=false';
-	if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'network_admin_hash' ] ) && ! empty( $new_admin_details[ 'newemail' ] ) ) {
-		update_site_option( 'admin_email', $new_admin_details[ 'newemail' ] );
+	$redirect          = 'settings.php?updated=false';
+	if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details['hash'], $_GET['network_admin_hash'] ) && ! empty( $new_admin_details['newemail'] ) ) {
+		update_site_option( 'admin_email', $new_admin_details['newemail'] );
 		delete_site_option( 'network_admin_hash' );
 		delete_site_option( 'new_admin_email' );
 		$redirect = 'settings.php?updated=true';
@@ -41,24 +42,26 @@ if ( ! empty( $_GET[ 'network_admin_hash' ] ) ) {
 
 add_action( 'admin_head', 'network_settings_add_js' );
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(
+	array(
 		'id'      => 'overview',
-		'title'   => __('Overview'),
+		'title'   => __( 'Overview' ),
 		'content' =>
-			'<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
-			'<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
-			'<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
-			'<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .
-			'<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .
+			'<p>' . __( 'This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.' ) . '</p>' .
+			'<p>' . __( 'Operational settings has fields for the network&#8217;s name and admin email.' ) . '</p>' .
+			'<p>' . __( 'Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.' ) . '</p>' .
+			'<p>' . __( 'New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.' ) . '</p>' .
+			'<p>' . __( 'Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).' ) . '</p>' .
 			'<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
-			'<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' .
-			'<p>' . __('Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.') . '</p>'
-) );
+			'<p>' . __( 'Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.' ) . '</p>' .
+			'<p>' . __( 'Super admins can no longer be added on the Options screen. You must now go to the list of existing users on Network Admin > Users and click on Username or the Edit action link below that name. This goes to an Edit User page where you can check a box to grant super admin privileges.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen">Documentation on Network Settings</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/Network_Admin_Settings_Screen">Documentation on Network Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 if ( $_POST ) {
@@ -67,18 +70,41 @@ if ( $_POST ) {
 
 	check_admin_referer( 'siteoptions' );
 
-	$checked_options = array( 'menu_items' => array(), 'registrationnotification' => 'no', 'upload_space_check_disabled' => 1, 'add_new_users' => 0 );
+	$checked_options = array(
+		'menu_items'                  => array(),
+		'registrationnotification'    => 'no',
+		'upload_space_check_disabled' => 1,
+		'add_new_users'               => 0,
+	);
 	foreach ( $checked_options as $option_name => $option_unchecked_value ) {
-		if ( ! isset( $_POST[$option_name] ) )
-			$_POST[$option_name] = $option_unchecked_value;
+		if ( ! isset( $_POST[ $option_name ] ) ) {
+			$_POST[ $option_name ] = $option_unchecked_value;
+		}
 	}
 
 	$options = array(
-		'registrationnotification', 'registration', 'add_new_users', 'menu_items',
-		'upload_space_check_disabled', 'blog_upload_space', 'upload_filetypes', 'site_name',
-		'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
-		'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
-		'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'new_admin_email',
+		'registrationnotification',
+		'registration',
+		'add_new_users',
+		'menu_items',
+		'upload_space_check_disabled',
+		'blog_upload_space',
+		'upload_filetypes',
+		'site_name',
+		'first_post',
+		'first_page',
+		'first_comment',
+		'first_comment_url',
+		'first_comment_author',
+		'welcome_email',
+		'welcome_user_email',
+		'fileupload_maxk',
+		'global_terms_enabled',
+		'illegal_names',
+		'limited_email_domains',
+		'banned_email_domains',
+		'WPLANG',
+		'new_admin_email',
 		'first_comment_email',
 	);
 
@@ -91,9 +117,10 @@ if ( $_POST ) {
 	}
 
 	foreach ( $options as $option_name ) {
-		if ( ! isset($_POST[$option_name]) )
+		if ( ! isset( $_POST[ $option_name ] ) ) {
 			continue;
-		$value = wp_unslash( $_POST[$option_name] );
+		}
+		$value = wp_unslash( $_POST[ $option_name ] );
 		update_site_option( $option_name, $value );
 	}
 
@@ -111,7 +138,8 @@ if ( $_POST ) {
 include( ABSPATH . 'wp-admin/admin-header.php' );
 
 if ( isset( $_GET['updated'] ) ) {
-	?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ) ?></p></div><?php
+	?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ); ?></p></div>
+	<?php
 }
 ?>
 
@@ -122,24 +150,26 @@ if ( isset( $_GET['updated'] ) ) {
 		<h2><?php _e( 'Operational Settings' ); ?></h2>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
+				<th scope="row"><label for="site_name"><?php _e( 'Network Title' ); ?></label></th>
 				<td>
-					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( get_network()->site_name ) ?>" />
+					<input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( get_network()->site_name ); ?>" />
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th>
+				<th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ); ?></label></th>
 				<td>
-					<input name="new_admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ) ?>" />
+					<input name="new_admin_email" type="email" id="admin_email" aria-describedby="admin-email-desc" class="regular-text" value="<?php echo esc_attr( get_site_option( 'admin_email' ) ); ?>" />
 					<p class="description" id="admin-email-desc">
 						<?php _e( 'This address is used for admin purposes. 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
 					$new_admin_email = get_site_option( 'new_admin_email' );
-					if ( $new_admin_email && $new_admin_email != get_site_option( 'admin_email' ) ) : ?>
+					if ( $new_admin_email && $new_admin_email != get_site_option( 'admin_email' ) ) :
+					?>
 						<div class="updated inline">
-						<p><?php
+						<p>
+						<?php
 							printf(
 								/* translators: %s: new network admin email */
 								__( 'There is a pending change of the network admin email to %s.' ),
@@ -150,7 +180,8 @@ if ( isset( $_GET['updated'] ) ) {
 								esc_url( wp_nonce_url( network_admin_url( 'settings.php?dismiss=new_network_admin_email' ), 'dismiss_new_network_admin_email' ) ),
 								__( 'Cancel' )
 							);
-						?></p>
+						?>
+						</p>
 						</div>
 					<?php endif; ?>
 				</td>
@@ -159,80 +190,87 @@ if ( isset( $_GET['updated'] ) ) {
 		<h2><?php _e( 'Registration Settings' ); ?></h2>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Allow new registrations' ) ?></th>
+				<th scope="row"><?php _e( 'Allow new registrations' ); ?></th>
 				<?php
-				if ( !get_site_option( 'registration' ) )
+				if ( ! get_site_option( 'registration' ) ) {
 					update_site_option( 'registration', 'none' );
+				}
 				$reg = get_site_option( 'registration' );
 				?>
 				<td>
 					<fieldset>
-					<legend class="screen-reader-text"><?php _e( 'New registrations settings' ) ?></legend>
-					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none') ?> /> <?php _e( 'Registration is disabled' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user') ?> /> <?php _e( 'User accounts may be registered' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog') ?> /> <?php _e( 'Logged in users may register new sites' ); ?></label><br />
-					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all') ?> /> <?php _e( 'Both sites and user accounts can be registered' ); ?></label>
-					<?php if ( is_subdomain_install() ) {
+					<legend class="screen-reader-text"><?php _e( 'New registrations settings' ); ?></legend>
+					<label><input name="registration" type="radio" id="registration1" value="none"<?php checked( $reg, 'none' ); ?> /> <?php _e( 'Registration is disabled' ); ?></label><br />
+					<label><input name="registration" type="radio" id="registration2" value="user"<?php checked( $reg, 'user' ); ?> /> <?php _e( 'User accounts may be registered' ); ?></label><br />
+					<label><input name="registration" type="radio" id="registration3" value="blog"<?php checked( $reg, 'blog' ); ?> /> <?php _e( 'Logged in users may register new sites' ); ?></label><br />
+					<label><input name="registration" type="radio" id="registration4" value="all"<?php checked( $reg, 'all' ); ?> /> <?php _e( 'Both sites and user accounts can be registered' ); ?></label>
+					<?php
+					if ( is_subdomain_install() ) {
 						echo '<p class="description">';
 						/* translators: 1: NOBLOGREDIRECT 2: wp-config.php */
-						printf( __( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
+						printf(
+							__( 'If registration is disabled, please set %1$s in %2$s to a URL you will redirect visitors to if they visit a non-existent site.' ),
 							'<code>NOBLOGREDIRECT</code>',
 							'<code>wp-config.php</code>'
 						);
 						echo '</p>';
-					} ?>
+					}
+					?>
 					</fieldset>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><?php _e( 'Registration notification' ) ?></th>
+				<th scope="row"><?php _e( 'Registration notification' ); ?></th>
 				<?php
-				if ( !get_site_option( 'registrationnotification' ) )
+				if ( ! get_site_option( 'registrationnotification' ) ) {
 					update_site_option( 'registrationnotification', 'yes' );
+				}
 				?>
 				<td>
-					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account' ) ?></label>
+					<label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ); ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account' ); ?></label>
 				</td>
 			</tr>
 
 			<tr id="addnewusers">
-				<th scope="row"><?php _e( 'Add New Users' ) ?></th>
+				<th scope="row"><?php _e( 'Add New Users' ); ?></th>
 				<td>
-					<label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ) ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page' ); ?></label>
+					<label><input name="add_new_users" type="checkbox" id="add_new_users" value="1"<?php checked( get_site_option( 'add_new_users' ) ); ?> /> <?php _e( 'Allow site administrators to add new users to their site via the "Users &rarr; Add New" page' ); ?></label>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ) ?></label></th>
+				<th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ); ?></label></th>
 				<td>
-					<input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( " ", (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
+					<input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( ' ', (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
 					<p class="description" id="illegal-names-desc">
-						<?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ) ?>
+						<?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ); ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th>
+				<th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ); ?></label></th>
 				<td>
-					<?php $limited_email_domains = get_site_option( 'limited_email_domains' );
-					$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?>
+					<?php
+					$limited_email_domains = get_site_option( 'limited_email_domains' );
+					$limited_email_domains = str_replace( ' ', "\n", $limited_email_domains );
+					?>
 					<textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
 <?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
 					<p class="description" id="limited-email-domains-desc">
-						<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ) ?>
+						<?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ); ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th>
+				<th scope="row"><label for="banned_email_domains"><?php _e( 'Banned Email Domains' ); ?></label></th>
 				<td>
 					<textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
 <?php echo esc_textarea( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea>
 					<p class="description" id="banned-email-domains-desc">
-						<?php _e( 'If you want to ban domains from site registrations. One domain per line.' ) ?>
+						<?php _e( 'If you want to ban domains from site registrations. One domain per line.' ); ?>
 					</p>
 				</td>
 			</tr>
@@ -242,79 +280,79 @@ if ( isset( $_GET['updated'] ) ) {
 		<table class="form-table">
 
 			<tr>
-				<th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
+				<th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ); ?></label></th>
 				<td>
 					<textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_email' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'welcome_email' ) ); ?></textarea>
 					<p class="description" id="welcome-email-desc">
-						<?php _e( 'The welcome email sent to new site owners.' ) ?>
+						<?php _e( 'The welcome email sent to new site owners.' ); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th>
+				<th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ); ?></label></th>
 				<td>
 					<textarea name="welcome_user_email" id="welcome_user_email" aria-describedby="welcome-user-email-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'welcome_user_email' ) ); ?></textarea>
 					<p class="description" id="welcome-user-email-desc">
-						<?php _e( 'The welcome email sent to new users.' ) ?>
+						<?php _e( 'The welcome email sent to new users.' ); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_post"><?php _e( 'First Post' ) ?></label></th>
+				<th scope="row"><label for="first_post"><?php _e( 'First Post' ); ?></label></th>
 				<td>
 					<textarea name="first_post" id="first_post" aria-describedby="first-post-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_post' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_post' ) ); ?></textarea>
 					<p class="description" id="first-post-desc">
-						<?php _e( 'The first post on a new site.' ) ?>
+						<?php _e( 'The first post on a new site.' ); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_page"><?php _e( 'First Page' ) ?></label></th>
+				<th scope="row"><label for="first_page"><?php _e( 'First Page' ); ?></label></th>
 				<td>
 					<textarea name="first_page" id="first_page" aria-describedby="first-page-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_page' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_page' ) ); ?></textarea>
 					<p class="description" id="first-page-desc">
-						<?php _e( 'The first page on a new site.' ) ?>
+						<?php _e( 'The first page on a new site.' ); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment"><?php _e( 'First Comment' ) ?></label></th>
+				<th scope="row"><label for="first_comment"><?php _e( 'First Comment' ); ?></label></th>
 				<td>
 					<textarea name="first_comment" id="first_comment" aria-describedby="first-comment-desc" rows="5" cols="45" class="large-text">
-<?php echo esc_textarea( get_site_option( 'first_comment' ) ) ?></textarea>
+<?php echo esc_textarea( get_site_option( 'first_comment' ) ); ?></textarea>
 					<p class="description" id="first-comment-desc">
-						<?php _e( 'The first comment on a new site.' ) ?>
+						<?php _e( 'The first comment on a new site.' ); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
+				<th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ); ?></label></th>
 				<td>
-					<input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo esc_attr( get_site_option('first_comment_author') ); ?>" />
+					<input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_author' ) ); ?>" />
 					<p class="description" id="first-comment-author-desc">
-						<?php _e( 'The author of the first comment on a new site.' ) ?>
+						<?php _e( 'The author of the first comment on a new site.' ); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ) ?></label></th>
+				<th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ); ?></label></th>
 				<td>
 					<input type="text" size="40" name="first_comment_email" id="first_comment_email" aria-describedby="first-comment-email-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_email' ) ); ?>" />
 					<p class="description" id="first-comment-email-desc">
-						<?php _e( 'The email address of the first comment author on a new site.' ) ?>
+						<?php _e( 'The email address of the first comment author on a new site.' ); ?>
 					</p>
 				</td>
 			</tr>
 			<tr>
-				<th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
+				<th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ); ?></label></th>
 				<td>
-					<input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ) ?>" />
+					<input type="text" size="40" name="first_comment_url" id="first_comment_url" aria-describedby="first-comment-url-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_url' ) ); ?>" />
 					<p class="description" id="first-comment-url-desc">
-						<?php _e( 'The URL for the first comment on a new site.' ) ?>
+						<?php _e( 'The URL for the first comment on a new site.' ); ?>
 					</p>
 				</td>
 			</tr>
@@ -322,27 +360,27 @@ if ( isset( $_GET['updated'] ) ) {
 		<h2><?php _e( 'Upload Settings' ); ?></h2>
 		<table class="form-table">
 			<tr>
-				<th scope="row"><?php _e( 'Site upload space' ) ?></th>
+				<th scope="row"><?php _e( 'Site upload space' ); ?></th>
 				<td>
-					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ) ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option('blog_upload_space', 100) ) . '" />' ); ?></label><br />
+					<label><input type="checkbox" id="upload_space_check_disabled" name="upload_space_check_disabled" value="0"<?php checked( (bool) get_site_option( 'upload_space_check_disabled' ), false ); ?>/> <?php printf( __( 'Limit total size of files uploaded to %s MB' ), '</label><label><input name="blog_upload_space" type="number" min="0" style="width: 100px" id="blog_upload_space" aria-describedby="blog-upload-space-desc" value="' . esc_attr( get_site_option( 'blog_upload_space', 100 ) ) . '" />' ); ?></label><br />
 					<p class="screen-reader-text" id="blog-upload-space-desc">
-						<?php _e( 'Size in megabytes' ) ?>
+						<?php _e( 'Size in megabytes' ); ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ) ?></label></th>
+				<th scope="row"><label for="upload_filetypes"><?php _e( 'Upload file types' ); ?></label></th>
 				<td>
-					<input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ) ?>" size="45" />
+					<input name="upload_filetypes" type="text" id="upload_filetypes" aria-describedby="upload-filetypes-desc" class="large-text" value="<?php echo esc_attr( get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) ); ?>" size="45" />
 					<p class="description" id="upload-filetypes-desc">
-						<?php _e( 'Allowed file types. Separate types by spaces.' ) ?>
+						<?php _e( 'Allowed file types. Separate types by spaces.' ); ?>
 					</p>
 				</td>
 			</tr>
 
 			<tr>
-				<th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
+				<th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ); ?></label></th>
 				<td>
 					<?php
 						printf(
@@ -352,14 +390,14 @@ if ( isset( $_GET['updated'] ) ) {
 						);
 					?>
 					<p class="screen-reader-text" id="fileupload-maxk-desc">
-						<?php _e( 'Size in kilobytes' ) ?>
+						<?php _e( 'Size in kilobytes' ); ?>
 					</p>
 				</td>
 			</tr>
 		</table>
 
 		<?php
-		$languages = get_available_languages();
+		$languages    = get_available_languages();
 		$translations = wp_get_available_translations();
 		if ( ! empty( $languages ) || ! empty( $translations ) ) {
 			?>
@@ -374,14 +412,16 @@ if ( isset( $_GET['updated'] ) ) {
 							$lang = '';
 						}
 
-						wp_dropdown_languages( array(
-							'name'         => 'WPLANG',
-							'id'           => 'WPLANG',
-							'selected'     => $lang,
-							'languages'    => $languages,
-							'translations' => $translations,
-							'show_available_translations' => current_user_can( 'install_languages' ),
-						) );
+						wp_dropdown_languages(
+							array(
+								'name'         => 'WPLANG',
+								'id'           => 'WPLANG',
+								'selected'     => $lang,
+								'languages'    => $languages,
+								'translations' => $translations,
+								'show_available_translations' => current_user_can( 'install_languages' ),
+							)
+						);
 						?>
 					</td>
 				</tr>
@@ -412,14 +452,14 @@ if ( isset( $_GET['updated'] ) ) {
 			 *
 			 * @param array $admin_menus The menu items available.
 			 */
-			$menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
+			$menu_items   = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
 			$fieldset_end = '';
 			if ( count( (array) $menu_items ) > 1 ) {
 				echo '<fieldset><legend class="screen-reader-text">' . __( 'Enable menus' ) . '</legend>';
 				$fieldset_end = '</fieldset>';
 			}
 			foreach ( (array) $menu_items as $key => $val ) {
-				echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
+				echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[ $key ] ) ? checked( $menu_perms[ $key ], '1', false ) : '' ) . ' /> ' . esc_html( $val ) . '</label><br/>';
 			}
 			echo $fieldset_end;
 			?>
@@ -433,7 +473,8 @@ if ( isset( $_GET['updated'] ) ) {
 		 *
 		 * @since MU (3.0.0)
 		 */
-		do_action( 'wpmu_options' ); ?>
+		do_action( 'wpmu_options' );
+		?>
 		<?php submit_button(); ?>
 	</form>
 </div>
diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index 4c0630837f..83e05ae867 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -20,7 +20,7 @@ get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() )
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
 if ( ! $id ) {
-	wp_die( __('Invalid site ID.') );
+	wp_die( __( 'Invalid site ID.' ) );
 }
 
 $details = get_site( $id );
@@ -33,7 +33,7 @@ if ( ! can_edit_network( $details->site_id ) ) {
 }
 
 $parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
-$is_main_site = is_main_site( $id );
+$is_main_site  = is_main_site( $id );
 
 if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 	check_admin_referer( 'edit-site' );
@@ -43,13 +43,13 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 	// Rewrite rules can't be flushed during switch to blog.
 	delete_option( 'rewrite_rules' );
 
-	$blog_data = wp_unslash( $_POST['blog'] );
+	$blog_data           = wp_unslash( $_POST['blog'] );
 	$blog_data['scheme'] = $parsed_scheme;
 
 	if ( $is_main_site ) {
 		// On the network's main site, don't allow the domain or path to change.
 		$blog_data['domain'] = $details->domain;
-		$blog_data['path'] = $details->path;
+		$blog_data['path']   = $details->path;
 	} else {
 		// For any other site, the scheme, domain, and path can all be changed. We first
 		// need to ensure a scheme has been provided, otherwise fallback to the existing.
@@ -67,10 +67,10 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 
 		$blog_data['scheme'] = $update_parsed_url['scheme'];
 		$blog_data['domain'] = $update_parsed_url['host'];
-		$blog_data['path'] = $update_parsed_url['path'];
+		$blog_data['path']   = $update_parsed_url['path'];
 	}
 
-	$existing_details = get_site( $id );
+	$existing_details     = get_site( $id );
 	$blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
 	foreach ( $blog_data_checkboxes as $c ) {
 		if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
@@ -85,7 +85,7 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 	// Maybe update home and siteurl options.
 	$new_details = get_site( $id );
 
-	$old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
+	$old_home_url    = trailingslashit( esc_url( get_option( 'home' ) ) );
 	$old_home_parsed = parse_url( $old_home_url );
 
 	if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
@@ -93,7 +93,7 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 		update_option( 'home', $new_home_url );
 	}
 
-	$old_site_url = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
+	$old_site_url    = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
 	$old_site_parsed = parse_url( $old_site_url );
 
 	if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
@@ -102,7 +102,14 @@ if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 	}
 
 	restore_current_blog();
-	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php' ) );
+	wp_redirect(
+		add_query_arg(
+			array(
+				'update' => 'updated',
+				'id'     => $id,
+			), 'site-info.php'
+		)
+	);
 	exit;
 }
 
@@ -116,7 +123,7 @@ if ( isset( $_GET['update'] ) ) {
 /* translators: %s: site name */
 $title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
 
-$parent_file = 'sites.php';
+$parent_file  = 'sites.php';
 $submenu_file = 'sites.php';
 
 require( ABSPATH . 'wp-admin/admin-header.php' );
@@ -128,10 +135,12 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
-	'blog_id'  => $id,
-	'selected' => 'site-info'
-) );
+network_edit_site_nav(
+	array(
+		'blog_id'  => $id,
+		'selected' => 'site-info',
+	)
+);
 
 if ( ! empty( $messages ) ) {
 	foreach ( $messages as $msg ) {
@@ -141,18 +150,20 @@ if ( ! empty( $messages ) ) {
 ?>
 <form method="post" action="site-info.php?action=update-site">
 	<?php wp_nonce_field( 'edit-site' ); ?>
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 	<table class="form-table">
 		<?php
 		// The main site of the network should not be updated on this page.
-		if ( $is_main_site ) : ?>
+		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.
-		else : ?>
+		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>
@@ -160,12 +171,12 @@ if ( ! empty( $messages ) ) {
 		<?php endif; ?>
 
 		<tr class="form-field">
-			<th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ) ?></label></th>
-			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td>
+			<th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ); ?></label></th>
+			<td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ); ?>" /></td>
 		</tr>
 		<tr class="form-field">
 			<th scope="row"><label for="blog_last_updated"><?php _e( 'Last Updated' ); ?></label></th>
-			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td>
+			<td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ); ?>" /></td>
 		</tr>
 		<?php
 		$attribute_fields = array( 'public' => __( 'Public' ) );
@@ -180,9 +191,14 @@ if ( ! empty( $messages ) ) {
 			<th scope="row"><?php _e( 'Attributes' ); ?></th>
 			<td>
 			<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Set site attributes' ) ?></legend>
+			<legend class="screen-reader-text"><?php _e( 'Set site attributes' ); ?></legend>
 			<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
-				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
+				<label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" 
+																	<?php
+																	checked( (bool) $details->$field_key, true );
+																	disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) );
+?>
+ />
 				<?php echo $field_label; ?></label><br/>
 			<?php endforeach; ?>
 			<fieldset>
diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index 1e59a13142..318da58478 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -17,30 +17,34 @@ if ( ! current_user_can( 'create_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to add sites to this network.' ) );
 }
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-		'<p>' . __('This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.') . '</p>' .
-		'<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			'<p>' . __( 'This screen is for Super Admins to add new sites to the network. This is not affected by the registration settings.' ) . '</p>' .
+			'<p>' . __( 'If the admin email for the new site does not exist in the database, a new user will also be created.' ) . '</p>',
+	)
 );
 
-if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+);
+
+if ( isset( $_REQUEST['action'] ) && 'add-site' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
 
-	if ( ! is_array( $_POST['blog'] ) )
+	if ( ! is_array( $_POST['blog'] ) ) {
 		wp_die( __( 'Can&#8217;t create an empty site.' ) );
+	}
 
-	$blog = $_POST['blog'];
+	$blog   = $_POST['blog'];
 	$domain = '';
-	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
+	if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) ) {
 		$domain = strtolower( $blog['domain'] );
+	}
 
 	// If not a subdomain installation, make sure the domain isn't a reserved word
 	if ( ! is_subdomain_install() ) {
@@ -49,7 +53,8 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 		if ( in_array( $domain, $subdirectory_reserved_names ) ) {
 			wp_die(
 				/* translators: %s: reserved names list */
-				sprintf( __( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ),
+				sprintf(
+					__( 'The following words are reserved for use by WordPress functions and cannot be used as blog names: %s' ),
 					'<code>' . implode( '</code>, <code>', $subdirectory_reserved_names ) . '</code>'
 				)
 			);
@@ -59,7 +64,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 	$title = $blog['title'];
 
 	$meta = array(
-		'public' => 1
+		'public' => 1,
 	);
 
 	// Handle translation installation for the new site.
@@ -76,8 +81,9 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 		}
 	}
 
-	if ( empty( $domain ) )
+	if ( empty( $domain ) ) {
 		wp_die( __( 'Missing or invalid site address.' ) );
+	}
 
 	if ( isset( $blog['email'] ) && '' === trim( $blog['email'] ) ) {
 		wp_die( __( 'Missing email address.' ) );
@@ -97,8 +103,8 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 	}
 
 	$password = 'N/A';
-	$user_id = email_exists($email);
-	if ( !$user_id ) { // Create a new user with a random password
+	$user_id  = email_exists( $email );
+	if ( ! $user_id ) { // Create a new user with a random password
 		/**
 		 * Fires immediately before a new user is created via the network site-new.php page.
 		 *
@@ -113,7 +119,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 			wp_die( __( 'The domain or path entered conflicts with an existing username.' ) );
 		}
 		$password = wp_generate_password( 12, false );
-		$user_id = wpmu_create_user( $domain, $password, $email );
+		$user_id  = wpmu_create_user( $domain, $password, $email );
 		if ( false === $user_id ) {
 			wp_die( __( 'There was an error creating the user.' ) );
 		}
@@ -132,7 +138,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 	$id = wpmu_create_blog( $newdomain, $path, $title, $user_id, $meta, get_current_network_id() );
 	$wpdb->show_errors();
 	if ( ! is_wp_error( $id ) ) {
-		if ( ! is_super_admin( $user_id ) && !get_user_option( 'primary_blog', $user_id ) ) {
+		if ( ! is_super_admin( $user_id ) && ! get_user_option( 'primary_blog', $user_id ) ) {
 			update_user_option( $user_id, 'primary_blog', $id, true );
 		}
 
@@ -145,10 +151,12 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
 			),
 			sprintf(
 				/* translators: 1: user login, 2: site url, 3: site name/title */
-				__( 'New site created by %1$s
+				__(
+					'New site created by %1$s
 
 Address: %2$s
-Name: %3$s' ),
+Name: %3$s'
+				),
 				$current_user->user_login,
 				get_site_url( $id ),
 				wp_unslash( $title )
@@ -160,25 +168,33 @@ Name: %3$s' ),
 			)
 		);
 		wpmu_welcome_notification( $id, $user_id, $password, $title, array( 'public' => 1 ) );
-		wp_redirect( add_query_arg( array( 'update' => 'added', 'id' => $id ), 'site-new.php' ) );
+		wp_redirect(
+			add_query_arg(
+				array(
+					'update' => 'added',
+					'id'     => $id,
+				), 'site-new.php'
+			)
+		);
 		exit;
 	} else {
 		wp_die( $id->get_error_message() );
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if ( isset( $_GET['update'] ) ) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] )
+	if ( 'added' == $_GET['update'] ) {
 		$messages[] = sprintf(
 			/* translators: 1: dashboard url, 2: network admin edit url */
 			__( 'Site added. <a href="%1$s">Visit Dashboard</a> or <a href="%2$s">Edit Site</a>' ),
 			esc_url( get_admin_url( absint( $_GET['id'] ) ) ),
 			network_admin_url( 'site-info.php?id=' . absint( $_GET['id'] ) )
 		);
+	}
 }
 
-$title = __('Add New Site');
+$title       = __( 'Add New Site' );
 $parent_file = 'sites.php';
 
 wp_enqueue_script( 'user-suggest' );
@@ -191,26 +207,32 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 <h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
+	foreach ( $messages as $msg ) {
 		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	}
+}
+?>
 <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' ) ?>
+<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ); ?>
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ) ?></label></th>
+			<th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ); ?></label></th>
 			<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"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
-			<?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" />
-			<?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" />
+<?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">
-			<th scope="row"><label for="site-title"><?php _e( 'Site Title' ) ?></label></th>
+			<th scope="row"><label for="site-title"><?php _e( 'Site Title' ); ?></label></th>
 			<td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
 		</tr>
 		<?php
@@ -230,24 +252,26 @@ if ( ! empty( $messages ) ) {
 						$lang = '';
 					}
 
-					wp_dropdown_languages( array(
-						'name'                        => 'WPLANG',
-						'id'                          => 'site-language',
-						'selected'                    => $lang,
-						'languages'                   => $languages,
-						'translations'                => $translations,
-						'show_available_translations' => current_user_can( 'install_languages' ),
-					) );
+					wp_dropdown_languages(
+						array(
+							'name'                        => 'WPLANG',
+							'id'                          => 'site-language',
+							'selected'                    => $lang,
+							'languages'                   => $languages,
+							'translations'                => $translations,
+							'show_available_translations' => current_user_can( 'install_languages' ),
+						)
+					);
 					?>
 				</td>
 			</tr>
 		<?php endif; // Languages. ?>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></th>
+			<th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ); ?></label></th>
 			<td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and a link to set the password will be mailed to this email address.' ) ?></td>
+			<td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ); ?><br /><?php _e( 'The username and a link to set the password will be mailed to this email address.' ); ?></td>
 		</tr>
 	</table>
 
diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php
index b6e9bc47b5..488a541abc 100644
--- a/wp-admin/network/site-settings.php
+++ b/wp-admin/network/site-settings.php
@@ -10,28 +10,31 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit this site.' ) );
+}
 
 get_current_screen()->add_help_tab( get_site_screen_help_tab_args() );
 get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() );
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
-if ( ! $id )
-	wp_die( __('Invalid site ID.') );
+if ( ! $id ) {
+	wp_die( __( 'Invalid site ID.' ) );
+}
 
 $details = get_site( $id );
 if ( ! $details ) {
 	wp_die( __( 'The requested site does not exist.' ) );
 }
 
-if ( !can_edit_network( $details->site_id ) )
+if ( ! can_edit_network( $details->site_id ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 $is_main_site = is_main_site( $id );
 
-if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_array( $_POST['option'] ) ) {
+if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] && is_array( $_POST['option'] ) ) {
 	check_admin_referer( 'edit-site' );
 
 	switch_to_blog( $id );
@@ -40,8 +43,9 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_ar
 	foreach ( (array) $_POST['option'] as $key => $val ) {
 		$key = wp_unslash( $key );
 		$val = wp_unslash( $val );
-		if ( $key === 0 || is_array( $val ) || in_array($key, $skip_options) )
+		if ( $key === 0 || is_array( $val ) || in_array( $key, $skip_options ) ) {
 			continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options
+		}
 		update_option( $key, $val );
 	}
 
@@ -56,20 +60,28 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] && is_ar
 	do_action( 'wpmu_update_blog_options', $id );
 
 	restore_current_blog();
-	wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-settings.php') );
+	wp_redirect(
+		add_query_arg(
+			array(
+				'update' => 'updated',
+				'id'     => $id,
+			), 'site-settings.php'
+		)
+	);
 	exit;
 }
 
-if ( isset($_GET['update']) ) {
+if ( isset( $_GET['update'] ) ) {
 	$messages = array();
-	if ( 'updated' == $_GET['update'] )
-		$messages[] = __('Site options updated.');
+	if ( 'updated' == $_GET['update'] ) {
+		$messages[] = __( 'Site options updated.' );
+	}
 }
 
 /* translators: %s: site name */
 $title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
 
-$parent_file = 'sites.php';
+$parent_file  = 'sites.php';
 $submenu_file = 'sites.php';
 
 require( ABSPATH . 'wp-admin/admin-header.php' );
@@ -82,58 +94,64 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 
 <?php
 
-network_edit_site_nav( array(
-	'blog_id'  => $id,
-	'selected' => 'site-settings'
-) );
+network_edit_site_nav(
+	array(
+		'blog_id'  => $id,
+		'selected' => 'site-settings',
+	)
+);
 
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
+	foreach ( $messages as $msg ) {
 		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	}
+}
+?>
 <form method="post" action="site-settings.php?action=update-site">
 	<?php wp_nonce_field( 'edit-site' ); ?>
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 	<table class="form-table">
 		<?php
 		$blog_prefix = $wpdb->get_blog_prefix( $id );
-		$sql = "SELECT * FROM {$blog_prefix}options
+		$sql         = "SELECT * FROM {$blog_prefix}options
 			WHERE option_name NOT LIKE %s
 			AND option_name NOT LIKE %s";
-		$query = $wpdb->prepare( $sql,
+		$query       = $wpdb->prepare(
+			$sql,
 			$wpdb->esc_like( '_' ) . '%',
 			'%' . $wpdb->esc_like( 'user_roles' )
 		);
-		$options = $wpdb->get_results( $query );
+		$options     = $wpdb->get_results( $query );
 		foreach ( $options as $option ) {
-			if ( $option->option_name == 'default_role' )
+			if ( $option->option_name == 'default_role' ) {
 				$editblog_default_role = $option->option_value;
+			}
 			$disabled = false;
-			$class = 'all-options';
+			$class    = 'all-options';
 			if ( is_serialized( $option->option_value ) ) {
 				if ( is_serialized_string( $option->option_value ) ) {
 					$option->option_value = esc_html( maybe_unserialize( $option->option_value ) );
 				} else {
 					$option->option_value = 'SERIALIZED DATA';
-					$disabled = true;
-					$class = 'all-options disabled';
+					$disabled             = true;
+					$class                = 'all-options disabled';
 				}
 			}
 			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>
+					<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
 			} 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>
+					<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' ) ) ) { ?>
-					<td><code><?php echo esc_html( $option->option_value ) ?></code></td>
+					<td><code><?php echo esc_html( $option->option_value ); ?></code></td>
 					<?php } else { ?>
-					<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>
+					<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
diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php
index 34beed95e0..497de2aa98 100644
--- a/wp-admin/network/site-themes.php
+++ b/wp-admin/network/site-themes.php
@@ -10,28 +10,31 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage themes for this site.' ) );
+}
 
 get_current_screen()->add_help_tab( get_site_screen_help_tab_args() );
 get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter site themes list' ),
-	'heading_pagination' => __( 'Site themes list navigation' ),
-	'heading_list'       => __( 'Site themes list' ),
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter site themes list' ),
+		'heading_pagination' => __( 'Site themes list navigation' ),
+		'heading_list'       => __( 'Site themes list' ),
+	)
+);
 
-$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
+$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
 
 $action = $wp_list_table->current_action();
 
-$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
+$s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
-$temp_args = array( 'enabled', 'disabled', 'error' );
+$temp_args              = array( 'enabled', 'disabled', 'error' );
 $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
-$referer = remove_query_arg( $temp_args, wp_get_referer() );
+$referer                = remove_query_arg( $temp_args, wp_get_referer() );
 
 if ( ! empty( $_REQUEST['paged'] ) ) {
 	$referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
@@ -39,8 +42,9 @@ if ( ! empty( $_REQUEST['paged'] ) ) {
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
-if ( ! $id )
-	wp_die( __('Invalid site ID.') );
+if ( ! $id ) {
+	wp_die( __( 'Invalid site ID.' ) );
+}
 
 $wp_list_table->prepare_items();
 
@@ -49,8 +53,9 @@ if ( ! $details ) {
 	wp_die( __( 'The requested site does not exist.' ) );
 }
 
-if ( !can_edit_network( $details->site_id ) )
+if ( ! can_edit_network( $details->site_id ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 $is_main_site = is_main_site( $id );
 
@@ -61,35 +66,38 @@ if ( $action ) {
 	switch ( $action ) {
 		case 'enable':
 			check_admin_referer( 'enable-theme_' . $_GET['theme'] );
-			$theme = $_GET['theme'];
+			$theme  = $_GET['theme'];
 			$action = 'enabled';
-			$n = 1;
-			if ( !$allowed_themes )
+			$n      = 1;
+			if ( ! $allowed_themes ) {
 				$allowed_themes = array( $theme => true );
-			else
-				$allowed_themes[$theme] = true;
+			} else {
+				$allowed_themes[ $theme ] = true;
+			}
 			break;
 		case 'disable':
 			check_admin_referer( 'disable-theme_' . $_GET['theme'] );
-			$theme = $_GET['theme'];
+			$theme  = $_GET['theme'];
 			$action = 'disabled';
-			$n = 1;
-			if ( !$allowed_themes )
+			$n      = 1;
+			if ( ! $allowed_themes ) {
 				$allowed_themes = array();
-			else
-				unset( $allowed_themes[$theme] );
+			} else {
+				unset( $allowed_themes[ $theme ] );
+			}
 			break;
 		case 'enable-selected':
 			check_admin_referer( 'bulk-themes' );
 			if ( isset( $_POST['checked'] ) ) {
 				$themes = (array) $_POST['checked'];
 				$action = 'enabled';
-				$n = count( $themes );
-				foreach ( (array) $themes as $theme )
+				$n      = count( $themes );
+				foreach ( (array) $themes as $theme ) {
 					$allowed_themes[ $theme ] = true;
+				}
 			} else {
 				$action = 'error';
-				$n = 'none';
+				$n      = 'none';
 			}
 			break;
 		case 'disable-selected':
@@ -97,19 +105,20 @@ if ( $action ) {
 			if ( isset( $_POST['checked'] ) ) {
 				$themes = (array) $_POST['checked'];
 				$action = 'disabled';
-				$n = count( $themes );
-				foreach ( (array) $themes as $theme )
+				$n      = count( $themes );
+				foreach ( (array) $themes as $theme ) {
 					unset( $allowed_themes[ $theme ] );
+				}
 			} else {
 				$action = 'error';
-				$n = 'none';
+				$n      = 'none';
 			}
 			break;
 		default:
 			if ( isset( $_POST['checked'] ) ) {
 				check_admin_referer( 'bulk-themes' );
 				$themes = (array) $_POST['checked'];
-				$n = count( $themes );
+				$n      = count( $themes );
 				$screen = get_current_screen()->id;
 
 				/**
@@ -130,14 +139,21 @@ if ( $action ) {
 				$referer = apply_filters( "handle_network_bulk_actions-{$screen}", $referer, $action, $themes, $id );
 			} else {
 				$action = 'error';
-				$n = 'none';
+				$n      = 'none';
 			}
 	}
 
 	update_option( 'allowedthemes', $allowed_themes );
 	restore_current_blog();
 
-	wp_safe_redirect( add_query_arg( array( 'id' => $id, $action => $n ), $referer ) );
+	wp_safe_redirect(
+		add_query_arg(
+			array(
+				'id'    => $id,
+				$action => $n,
+			), $referer
+		)
+	);
 	exit;
 }
 
@@ -152,7 +168,7 @@ add_screen_option( 'per_page' );
 /* translators: %s: site name */
 $title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
 
-$parent_file = 'sites.php';
+$parent_file  = 'sites.php';
 $submenu_file = 'sites.php';
 
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -162,10 +178,12 @@ require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
-	'blog_id'  => $id,
-	'selected' => 'site-themes'
-) );
+network_edit_site_nav(
+	array(
+		'blog_id'  => $id,
+		'selected' => 'site-themes',
+	)
+);
 
 if ( isset( $_GET['enabled'] ) ) {
 	$enabled = absint( $_GET['enabled'] );
@@ -185,23 +203,24 @@ if ( isset( $_GET['enabled'] ) ) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
 } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
 	echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
-} ?>
+}
+?>
 
-<p><?php _e( 'Network enabled themes are not shown on this screen.' ) ?></p>
+<p><?php _e( 'Network enabled themes are not shown on this screen.' ); ?></p>
 
 <form method="get">
 <?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
-<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 </form>
 
 <?php $wp_list_table->views(); ?>
 
 <form method="post" action="site-themes.php?action=update-site">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 
 <?php $wp_list_table->display(); ?>
 
 </form>
 
 </div>
-<?php include(ABSPATH . 'wp-admin/admin-footer.php'); ?>
+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 94cb07718d..d1a125b844 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -10,23 +10,26 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('manage_sites') )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to edit this site.' ), 403 );
+}
 
-$wp_list_table = _get_list_table('WP_Users_List_Table');
+$wp_list_table = _get_list_table( 'WP_Users_List_Table' );
 $wp_list_table->prepare_items();
 
 get_current_screen()->add_help_tab( get_site_screen_help_tab_args() );
 get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter site users list' ),
-	'heading_pagination' => __( 'Site users list navigation' ),
-	'heading_list'       => __( 'Site users list' ),
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter site users list' ),
+		'heading_pagination' => __( 'Site users list navigation' ),
+		'heading_list'       => __( 'Site users list' ),
+	)
+);
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
-$referer = remove_query_arg( 'update', wp_get_referer() );
+$referer                = remove_query_arg( 'update', wp_get_referer() );
 
 if ( ! empty( $_REQUEST['paged'] ) ) {
 	$referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
@@ -34,16 +37,18 @@ if ( ! empty( $_REQUEST['paged'] ) ) {
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
-if ( ! $id )
-	wp_die( __('Invalid site ID.') );
+if ( ! $id ) {
+	wp_die( __( 'Invalid site ID.' ) );
+}
 
 $details = get_site( $id );
 if ( ! $details ) {
 	wp_die( __( 'The requested site does not exist.' ) );
 }
 
-if ( ! can_edit_network( $details->site_id ) )
+if ( ! can_edit_network( $details->site_id ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 $is_main_site = is_main_site( $id );
 
@@ -60,11 +65,11 @@ if ( $action ) {
 			if ( ! is_array( $_POST['user'] ) || empty( $user['username'] ) || empty( $user['email'] ) ) {
 				$update = 'err_new';
 			} else {
-				$password = wp_generate_password( 12, false);
-				$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
+				$password = wp_generate_password( 12, false );
+				$user_id  = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
 
 				if ( false === $user_id ) {
-		 			$update = 'err_new_dup';
+					$update = 'err_new_dup';
 				} else {
 					$result = add_user_to_blog( $id, $user_id, $_POST['new_role'] );
 
@@ -87,10 +92,10 @@ if ( $action ) {
 
 		case 'adduser':
 			check_admin_referer( 'add-user', '_wpnonce_add-user' );
-			if ( !empty( $_POST['newuser'] ) ) {
-				$update = 'adduser';
+			if ( ! empty( $_POST['newuser'] ) ) {
+				$update  = 'adduser';
 				$newuser = $_POST['newuser'];
-				$user = get_user_by( 'login', $newuser );
+				$user    = get_user_by( 'login', $newuser );
 				if ( $user && $user->exists() ) {
 					if ( ! is_user_member_of_blog( $user->ID, $id ) ) {
 						$result = add_user_to_blog( $id, $user->ID, $_POST['new_role'] );
@@ -134,7 +139,7 @@ if ( $action ) {
 		case 'promote':
 			check_admin_referer( 'bulk-users' );
 			$editable_roles = get_editable_roles();
-			$role = false;
+			$role           = false;
 			if ( ! empty( $_REQUEST['new_role2'] ) ) {
 				$role = $_REQUEST['new_role2'];
 			} elseif ( ! empty( $_REQUEST['new_role'] ) ) {
@@ -147,7 +152,7 @@ if ( $action ) {
 
 			if ( isset( $_REQUEST['users'] ) ) {
 				$userids = $_REQUEST['users'];
-				$update = 'promote';
+				$update  = 'promote';
 				foreach ( $userids as $user_id ) {
 					$user_id = (int) $user_id;
 
@@ -175,7 +180,7 @@ if ( $action ) {
 			$userids = $_REQUEST['users'];
 			/** This action is documented in wp-admin/network/site-themes.php */
 			$referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $userids, $id );
-			$update = $action;
+			$update  = $action;
 			break;
 	}
 
@@ -195,7 +200,7 @@ add_screen_option( 'per_page' );
 /* translators: %s: site name */
 $title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
 
-$parent_file = 'sites.php';
+$parent_file  = 'sites.php';
 $submenu_file = 'sites.php';
 
 /**
@@ -205,8 +210,9 @@ $submenu_file = 'sites.php';
  *
  * @param bool $bool Whether to show the Add Existing User form. Default true.
  */
-if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) )
+if ( ! wp_is_large_network( 'users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) {
 	wp_enqueue_script( 'user-suggest' );
+}
 
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
@@ -220,58 +226,61 @@ var current_site_id = <?php echo $id; ?>;
 <p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
 <?php
 
-network_edit_site_nav( array(
-	'blog_id'  => $id,
-	'selected' => 'site-users'
-) );
+network_edit_site_nav(
+	array(
+		'blog_id'  => $id,
+		'selected' => 'site-users',
+	)
+);
 
-if ( isset($_GET['update']) ) :
-	switch($_GET['update']) {
-	case 'adduser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
-		break;
-	case 'err_add_member':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
-		break;
-	case 'err_add_fail':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User could not be added to this site.' ) . '</p></div>';
-		break;
-	case 'err_add_notfound':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
-		break;
-	case 'promote':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
-		break;
-	case 'err_promote':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
-		break;
-	case 'remove':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
-		break;
-	case 'err_remove':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
-		break;
-	case 'newuser':
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
-		break;
-	case 'err_new':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
-		break;
-	case 'err_new_dup':
-		echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
-		break;
+if ( isset( $_GET['update'] ) ) :
+	switch ( $_GET['update'] ) {
+		case 'adduser':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User added.' ) . '</p></div>';
+			break;
+		case 'err_add_member':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User is already a member of this site.' ) . '</p></div>';
+			break;
+		case 'err_add_fail':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'User could not be added to this site.' ) . '</p></div>';
+			break;
+		case 'err_add_notfound':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username of an existing user.' ) . '</p></div>';
+			break;
+		case 'promote':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+			break;
+		case 'err_promote':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to change role.' ) . '</p></div>';
+			break;
+		case 'remove':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+			break;
+		case 'err_remove':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Select a user to remove.' ) . '</p></div>';
+			break;
+		case 'newuser':
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . __( 'User created.' ) . '</p></div>';
+			break;
+		case 'err_new':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Enter the username and email.' ) . '</p></div>';
+			break;
+		case 'err_new_dup':
+			echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'Duplicated username or email address.' ) . '</p></div>';
+			break;
 	}
-endif; ?>
+endif;
+?>
 
 <form class="search-form" method="get">
 <?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
-<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 </form>
 
 <?php $wp_list_table->views(); ?>
 
 <form method="post" action="site-users.php?action=update-site">
-	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 
 <?php $wp_list_table->display(); ?>
 
@@ -286,10 +295,11 @@ endif; ?>
 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 ) ) : ?>
+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 ) ?>" />
+	<input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
 	<table class="form-table">
 		<tr>
 			<th scope="row"><label for="newuser"><?php _e( 'Username' ); ?></label></th>
@@ -306,7 +316,7 @@ if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_us
 			</select></td>
 		</tr>
 	</table>
-	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
+	<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>
 	<?php submit_button( __( 'Add User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-existing-user' ) ); ?>
 </form>
 <?php endif; ?>
@@ -319,17 +329,18 @@ 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 ) ) : ?>
+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 ) ?>" />
+<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 ); ?>" />
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="user_username"><?php _e( 'Username' ) ?></label></th>
+			<th scope="row"><label for="user_username"><?php _e( 'Username' ); ?></label></th>
 			<td><input type="text" class="regular-text" name="user[username]" id="user_username" /></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="user_email"><?php _e( 'Email' ) ?></label></th>
+			<th scope="row"><label for="user_email"><?php _e( 'Email' ); ?></label></th>
 			<td><input type="text" class="regular-text" name="user[email]" id="user_email" /></td>
 		</tr>
 		<tr>
@@ -343,10 +354,10 @@ if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_use
 			</select></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
+			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></td>
 		</tr>
 	</table>
-	<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
+	<?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ); ?>
 	<?php submit_button( __( 'Add New User' ), 'primary', 'add-user', true, array( 'id' => 'submit-add-user' ) ); ?>
 </form>
 <?php endif; ?>
diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index 21b2c0dc60..9d0324e86e 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -10,43 +10,48 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_sites' ) )
+if ( ! current_user_can( 'manage_sites' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 $wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
-$pagenum = $wp_list_table->get_pagenum();
+$pagenum       = $wp_list_table->get_pagenum();
 
-$title = __( 'Sites' );
+$title       = __( 'Sites' );
 $parent_file = 'sites.php';
 
 add_screen_option( 'per_page' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-		'<p>' . __('Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
-		'<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
-		'<p>' . __('Hovering over each site reveals seven options (three for the primary site):') . '</p>' .
-		'<ul><li>' . __('An Edit link to a separate Edit Site screen.') . '</li>' .
-		'<li>' . __('Dashboard leads to the Dashboard for that site.') . '</li>' .
-		'<li>' . __('Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.') . '</li>' .
-		'<li>' . __('Delete which is a permanent action after the confirmation screens.') . '</li>' .
-		'<li>' . __('Visit to go to the front-end site live.') . '</li></ul>' .
-		'<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' .
-		'<p>' . __('Clicking on bold headings can re-sort this table.') . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			'<p>' . __( 'Add New takes you to the Add New Site screen. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.' ) . '</p>' .
+			'<p>' . __( 'This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.' ) . '</p>' .
+			'<p>' . __( 'Hovering over each site reveals seven options (three for the primary site):' ) . '</p>' .
+			'<ul><li>' . __( 'An Edit link to a separate Edit Site screen.' ) . '</li>' .
+			'<li>' . __( 'Dashboard leads to the Dashboard for that site.' ) . '</li>' .
+			'<li>' . __( 'Deactivate, Archive, and Spam which lead to confirmation screens. These actions can be reversed later.' ) . '</li>' .
+			'<li>' . __( 'Delete which is a permanent action after the confirmation screens.' ) . '</li>' .
+			'<li>' . __( 'Visit to go to the front-end site live.' ) . '</li></ul>' .
+			'<p>' . __( 'The site ID is used internally, and is not shown on the front end of the site or to users/viewers.' ) . '</p>' .
+			'<p>' . __( 'Clicking on bold headings can re-sort this table.' ) . '</p>',
+	)
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_pagination' => __( 'Sites list navigation' ),
-	'heading_list'       => __( 'Sites list' ),
-) );
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Sites_Screen">Documentation on Site Management</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+);
+
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_pagination' => __( 'Sites list navigation' ),
+		'heading_list'       => __( 'Sites list' ),
+	)
+);
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
@@ -122,15 +127,16 @@ if ( isset( $_GET['action'] ) ) {
 	switch ( $_GET['action'] ) {
 
 		case 'deleteblog':
-			if ( ! current_user_can( 'delete_sites' ) )
+			if ( ! current_user_can( 'delete_sites' ) ) {
 				wp_die( __( 'Sorry, you are not allowed to access this page.' ), '', array( 'response' => 403 ) );
+			}
 
 			$updated_action = 'not_deleted';
 			if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) {
 				wpmu_delete_blog( $id, true );
 				$updated_action = 'delete';
 			}
-		break;
+			break;
 
 		case 'delete_sites':
 			check_admin_referer( 'ms-delete-sites' );
@@ -143,7 +149,7 @@ if ( isset( $_GET['action'] ) ) {
 				}
 
 				if ( ! current_user_can( 'delete_site', $site_id ) ) {
-					$site = get_site( $site_id );
+					$site         = get_site( $site_id );
 					$site_address = untrailingslashit( $site->domain . $site->path );
 
 					wp_die( sprintf( __( 'Sorry, you are not allowed to delete the site %s.' ), $site_address ), 403 );
@@ -172,8 +178,9 @@ if ( isset( $_GET['action'] ) ) {
 										<?php wp_nonce_field( 'ms-delete-sites', '_wpnonce', false ); ?>
 										<p><?php _e( 'You are about to delete the following sites:' ); ?></p>
 										<ul class="ul-disc">
-											<?php foreach ( $_POST['allblogs'] as $site_id ) :
-												$site = get_site( $site_id );
+											<?php
+											foreach ( $_POST['allblogs'] as $site_id ) :
+												$site         = get_site( $site_id );
 												$site_address = untrailingslashit( $site->domain . $site->path );
 												?>
 												<li>
@@ -194,7 +201,7 @@ if ( isset( $_GET['action'] ) ) {
 							case 'notspam':
 								$updated_action = ( 'spam' === $doaction ) ? 'all_spam' : 'all_notspam';
 								update_blog_status( $val, 'spam', ( 'spam' === $doaction ) ? '1' : '0' );
-							break;
+								break;
 						}
 					} else {
 						wp_die( __( 'Sorry, you are not allowed to change the current site.' ) );
@@ -202,7 +209,7 @@ if ( isset( $_GET['action'] ) ) {
 				}
 				if ( ! in_array( $doaction, array( 'delete', 'spam', 'notspam' ), true ) ) {
 					$redirect_to = wp_get_referer();
-					$blogs = (array) $_POST['allblogs'];
+					$blogs       = (array) $_POST['allblogs'];
 					/** This action is documented in wp-admin/network/site-themes.php */
 					$redirect_to = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $redirect_to, $doaction, $blogs, $id );
 					wp_safe_redirect( $redirect_to );
@@ -216,12 +223,12 @@ if ( isset( $_GET['action'] ) ) {
 				wp_redirect( $location );
 				exit();
 			}
-		break;
+			break;
 
 		case 'archiveblog':
 		case 'unarchiveblog':
 			update_blog_status( $id, 'archived', ( 'archiveblog' === $_GET['action'] ) ? '1' : '0' );
-		break;
+			break;
 
 		case 'activateblog':
 			update_blog_status( $id, 'deleted', '0' );
@@ -234,7 +241,7 @@ if ( isset( $_GET['action'] ) ) {
 			 * @param string $id The ID of the activated site.
 			 */
 			do_action( 'activate_blog', $id );
-		break;
+			break;
 
 		case 'deactivateblog':
 			/**
@@ -246,17 +253,17 @@ if ( isset( $_GET['action'] ) ) {
 			 */
 			do_action( 'deactivate_blog', $id );
 			update_blog_status( $id, 'deleted', '1' );
-		break;
+			break;
 
 		case 'unspamblog':
 		case 'spamblog':
 			update_blog_status( $id, 'spam', ( 'spamblog' === $_GET['action'] ) ? '1' : '0' );
-		break;
+			break;
 
 		case 'unmatureblog':
 		case 'matureblog':
 			update_blog_status( $id, 'mature', ( 'matureblog' === $_GET['action'] ) ? '1' : '0' );
-		break;
+			break;
 	}
 
 	if ( empty( $updated_action ) && array_key_exists( $_GET['action'], $manage_actions ) ) {
@@ -274,37 +281,37 @@ if ( isset( $_GET['updated'] ) ) {
 	switch ( $_GET['updated'] ) {
 		case 'all_notspam':
 			$msg = __( 'Sites removed from spam.' );
-		break;
+			break;
 		case 'all_spam':
 			$msg = __( 'Sites marked as spam.' );
-		break;
+			break;
 		case 'all_delete':
 			$msg = __( 'Sites deleted.' );
-		break;
+			break;
 		case 'delete':
 			$msg = __( 'Site deleted.' );
-		break;
+			break;
 		case 'not_deleted':
 			$msg = __( 'Sorry, you are not allowed to delete that site.' );
-		break;
+			break;
 		case 'archiveblog':
 			$msg = __( 'Site archived.' );
-		break;
+			break;
 		case 'unarchiveblog':
 			$msg = __( 'Site unarchived.' );
-		break;
+			break;
 		case 'activateblog':
 			$msg = __( 'Site activated.' );
-		break;
+			break;
 		case 'deactivateblog':
 			$msg = __( 'Site deactivated.' );
-		break;
+			break;
 		case 'unspamblog':
 			$msg = __( 'Site removed from spam.' );
-		break;
+			break;
 		case 'spamblog':
 			$msg = __( 'Site marked as spam.' );
-		break;
+			break;
 		default:
 			/**
 			 * Filters a specific, non-default site-updated message in the Network admin.
@@ -317,11 +324,12 @@ if ( isset( $_GET['updated'] ) ) {
 			 * @param string $msg The update message. Default 'Settings saved'.
 			 */
 			$msg = apply_filters( 'network_sites_updated_message_' . $_GET['updated'], __( 'Settings saved.' ) );
-		break;
+			break;
 	}
 
-	if ( ! empty( $msg ) )
+	if ( ! empty( $msg ) ) {
 		$msg = '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
 }
 
 $wp_list_table->prepare_items();
@@ -332,8 +340,8 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 <div class="wrap">
 <h1 class="wp-heading-inline"><?php _e( 'Sites' ); ?></h1>
 
-<?php if ( current_user_can( 'create_sites') ) : ?>
-	<a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
+<?php if ( current_user_can( 'create_sites' ) ) : ?>
+	<a href="<?php echo network_admin_url( 'site-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
 <?php endif; ?>
 
 <?php
diff --git a/wp-admin/network/theme-install.php b/wp-admin/network/theme-install.php
index 4d4ee5ce86..486c74780b 100644
--- a/wp-admin/network/theme-install.php
+++ b/wp-admin/network/theme-install.php
@@ -7,8 +7,9 @@
  * @since 3.1.0
  */
 
-if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) )
+if ( isset( $_GET['tab'] ) && ( 'theme-information' == $_GET['tab'] ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index 2b22847760..fbfa8b46b7 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -10,40 +10,42 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('manage_network_themes') )
+if ( ! current_user_can( 'manage_network_themes' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) );
+}
 
-$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 
 $action = $wp_list_table->current_action();
 
-$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
+$s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
-$temp_args = array( 'enabled', 'disabled', 'deleted', 'error' );
+$temp_args              = array( 'enabled', 'disabled', 'deleted', 'error' );
 $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
-$referer = remove_query_arg( $temp_args, wp_get_referer() );
+$referer                = remove_query_arg( $temp_args, wp_get_referer() );
 
 if ( $action ) {
 	switch ( $action ) {
 		case 'enable':
-			check_admin_referer('enable-theme_' . $_GET['theme']);
+			check_admin_referer( 'enable-theme_' . $_GET['theme'] );
 			WP_Theme::network_enable_theme( $_GET['theme'] );
-			if ( false === strpos( $referer, '/network/themes.php' ) )
+			if ( false === strpos( $referer, '/network/themes.php' ) ) {
 				wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
-			else
+			} else {
 				wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
+			}
 			exit;
 		case 'disable':
-			check_admin_referer('disable-theme_' . $_GET['theme']);
+			check_admin_referer( 'disable-theme_' . $_GET['theme'] );
 			WP_Theme::network_disable_theme( $_GET['theme'] );
 			wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
 			exit;
 		case 'enable-selected':
-			check_admin_referer('bulk-themes');
+			check_admin_referer( 'bulk-themes' );
 			$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-			if ( empty($themes) ) {
+			if ( empty( $themes ) ) {
 				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
@@ -51,43 +53,44 @@ if ( $action ) {
 			wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
 			exit;
 		case 'disable-selected':
-			check_admin_referer('bulk-themes');
+			check_admin_referer( 'bulk-themes' );
 			$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
-			if ( empty($themes) ) {
+			if ( empty( $themes ) ) {
 				wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
 				exit;
 			}
 			WP_Theme::network_disable_theme( (array) $themes );
 			wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
 			exit;
-		case 'update-selected' :
+		case 'update-selected':
 			check_admin_referer( 'bulk-themes' );
 
-			if ( isset( $_GET['themes'] ) )
+			if ( isset( $_GET['themes'] ) ) {
 				$themes = explode( ',', $_GET['themes'] );
-			elseif ( isset( $_POST['checked'] ) )
+			} elseif ( isset( $_POST['checked'] ) ) {
 				$themes = (array) $_POST['checked'];
-			else
+			} else {
 				$themes = array();
+			}
 
-			$title = __( 'Update Themes' );
+			$title       = __( 'Update Themes' );
 			$parent_file = 'themes.php';
 
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 			echo '<div class="wrap">';
 			echo '<h1>' . esc_html( $title ) . '</h1>';
 
-			$url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
-			$url = wp_nonce_url($url, 'bulk-update-themes');
+			$url = self_admin_url( 'update.php?action=update-selected-themes&amp;themes=' . urlencode( join( ',', $themes ) ) );
+			$url = wp_nonce_url( $url, 'bulk-update-themes' );
 
 			echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
 			echo '</div>';
-			require_once(ABSPATH . 'wp-admin/admin-footer.php');
+			require_once( ABSPATH . 'wp-admin/admin-footer.php' );
 			exit;
 		case 'delete-selected':
 			if ( ! current_user_can( 'delete_themes' ) ) {
-				wp_die( __('Sorry, you are not allowed to delete themes for this site.') );
+				wp_die( __( 'Sorry, you are not allowed to delete themes for this site.' ) );
 			}
 
 			check_admin_referer( 'bulk-themes' );
@@ -111,7 +114,7 @@ if ( $action ) {
 				$theme_info[ $theme ] = wp_get_theme( $theme );
 			}
 
-			include(ABSPATH . 'wp-admin/update.php');
+			include( ABSPATH . 'wp-admin/update.php' );
 
 			$parent_file = 'themes.php';
 
@@ -132,14 +135,14 @@ if ( $action ) {
 				<?php endif; ?>
 					<ul class="ul-disc">
 					<?php
-						foreach ( $theme_info as $theme ) {
-							echo '<li>' . sprintf(
-								/* translators: 1: theme name, 2: theme author */
-								_x( '%1$s by %2$s', 'theme' ),
-								'<strong>' . $theme->display( 'Name' ) . '</strong>',
-								'<em>' . $theme->display( 'Author' ) . '</em>'
-							) . '</li>';
-						}
+					foreach ( $theme_info as $theme ) {
+						echo '<li>' . sprintf(
+							/* translators: 1: theme name, 2: theme author */
+							_x( '%1$s by %2$s', 'theme' ),
+							'<strong>' . $theme->display( 'Name' ) . '</strong>',
+							'<em>' . $theme->display( 'Author' ) . '</em>'
+						) . '</li>';
+					}
 					?>
 					</ul>
 				<?php if ( 1 == $themes_to_delete ) : ?>
@@ -147,21 +150,21 @@ if ( $action ) {
 				<?php else : ?>
 					<p><?php _e( 'Are you sure you wish to delete these themes?' ); ?></p>
 				<?php endif; ?>
-				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
+				<form method="post" action="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
 					<input type="hidden" name="action" value="delete-selected" />
 					<?php
-						foreach ( (array) $themes as $theme ) {
-							echo '<input type="hidden" name="checked[]" value="' . esc_attr($theme) . '" />';
-						}
+					foreach ( (array) $themes as $theme ) {
+						echo '<input type="hidden" name="checked[]" value="' . esc_attr( $theme ) . '" />';
+					}
 
 						wp_nonce_field( 'bulk-themes' );
 
-						if ( 1 == $themes_to_delete ) {
-							submit_button( __( 'Yes, delete this theme' ), '', 'submit', false );
-						} else {
-							submit_button( __( 'Yes, delete these themes' ), '', 'submit', false );
-						}
+					if ( 1 == $themes_to_delete ) {
+						submit_button( __( 'Yes, delete this theme' ), '', 'submit', false );
+					} else {
+						submit_button( __( 'Yes, delete these themes' ), '', 'submit', false );
+					}
 					?>
 				</form>
 				<?php
@@ -172,25 +175,35 @@ if ( $action ) {
 				</form>
 			</div>
 				<?php
-				require_once(ABSPATH . 'wp-admin/admin-footer.php');
+				require_once( ABSPATH . 'wp-admin/admin-footer.php' );
 				exit;
 			} // Endif verify-delete
 
 			foreach ( $themes as $theme ) {
-				$delete_result = delete_theme( $theme, esc_url( add_query_arg( array(
-					'verify-delete' => 1,
-					'action' => 'delete-selected',
-					'checked' => $_REQUEST['checked'],
-					'_wpnonce' => $_REQUEST['_wpnonce']
-				), network_admin_url( 'themes.php' ) ) ) );
+				$delete_result = delete_theme(
+					$theme, esc_url(
+						add_query_arg(
+							array(
+								'verify-delete' => 1,
+								'action'        => 'delete-selected',
+								'checked'       => $_REQUEST['checked'],
+								'_wpnonce'      => $_REQUEST['_wpnonce'],
+							), network_admin_url( 'themes.php' )
+						)
+					)
+				);
 			}
 
 			$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
-			wp_redirect( add_query_arg( array(
-				'deleted' => count( $themes ),
-				'paged' => $paged,
-				's' => $s
-			), network_admin_url( 'themes.php' ) ) );
+			wp_redirect(
+				add_query_arg(
+					array(
+						'deleted' => count( $themes ),
+						'paged'   => $paged,
+						's'       => $s,
+					), network_admin_url( 'themes.php' )
+				)
+			);
 			exit;
 		default:
 			$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
@@ -206,7 +219,6 @@ if ( $action ) {
 			wp_safe_redirect( $referer );
 			exit;
 	}
-
 }
 
 $wp_list_table->prepare_items();
@@ -215,34 +227,38 @@ add_thickbox();
 
 add_screen_option( 'per_page' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-		'<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
-		'<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
-		'<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.') . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Themes_Screen">Documentation on Network Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			'<p>' . __( 'This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.' ) . '</p>' .
+			'<p>' . __( 'If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.' ) . '</p>' .
+			'<p>' . __( 'Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.' ) . '</p>',
+	)
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter themes list' ),
-	'heading_pagination' => __( 'Themes list navigation' ),
-	'heading_list'       => __( 'Themes list' ),
-) );
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Themes_Screen">Documentation on Network Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+);
 
-$title = __('Themes');
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter themes list' ),
+		'heading_pagination' => __( 'Themes list navigation' ),
+		'heading_list'       => __( 'Themes list' ),
+	)
+);
+
+$title       = __( 'Themes' );
 $parent_file = 'themes.php';
 
 wp_enqueue_script( 'updates' );
 wp_enqueue_script( 'theme-preview' );
 
-require_once(ABSPATH . 'wp-admin/admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 ?>
 
@@ -302,13 +318,14 @@ if ( isset( $_GET['enabled'] ) ) {
 <?php
 $wp_list_table->views();
 
-if ( 'broken' == $status )
+if ( 'broken' == $status ) {
 	echo '<p class="clear">' . __( 'The following themes are installed but incomplete.' ) . '</p>';
+}
 ?>
 
 <form id="bulk-action-form" method="post">
-<input type="hidden" name="theme_status" value="<?php echo esc_attr($status) ?>" />
-<input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
+<input type="hidden" name="theme_status" value="<?php echo esc_attr( $status ); ?>" />
+<input type="hidden" name="paged" value="<?php echo esc_attr( $page ); ?>" />
 
 <?php $wp_list_table->display(); ?>
 </form>
@@ -320,4 +337,4 @@ wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 wp_print_update_row_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/network/update.php b/wp-admin/network/update.php
index db63968d10..62dc7a96e7 100644
--- a/wp-admin/network/update.php
+++ b/wp-admin/network/update.php
@@ -7,8 +7,9 @@
  * @since 3.1.0
  */
 
-if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
+if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
diff --git a/wp-admin/network/upgrade.php b/wp-admin/network/upgrade.php
index f6b2e29f20..3cc16a1721 100644
--- a/wp-admin/network/upgrade.php
+++ b/wp-admin/network/upgrade.php
@@ -12,22 +12,24 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 
 require_once( ABSPATH . WPINC . '/http.php' );
 
-$title = __( 'Upgrade Network' );
+$title       = __( 'Upgrade Network' );
 $parent_file = 'upgrade.php';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-		'<p>' . __('Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.') . '</p>' .
-		'<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
-		'<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			'<p>' . __( 'Only use this screen once you have updated to a new version of WordPress through Updates/Available Updates (via the Network Administration navigation menu or the Toolbar). Clicking the Upgrade Network button will step through each site in the network, five at a time, and make sure any database updates are applied.' ) . '</p>' .
+			'<p>' . __( 'If a version update to core has not happened, clicking this button won&#8217;t affect anything.' ) . '</p>' .
+			'<p>' . __( 'If this process fails for any reason, users logging in to their sites will force the same update.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Updates_Screen">Documentation on Upgrade Network</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/Network_Admin_Updates_Screen">Documentation on Upgrade Network</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -39,11 +41,11 @@ if ( ! current_user_can( 'upgrade_network' ) ) {
 echo '<div class="wrap">';
 echo '<h1>' . __( 'Upgrade Network' ) . '</h1>';
 
-$action = isset($_GET['action']) ? $_GET['action'] : 'show';
+$action = isset( $_GET['action'] ) ? $_GET['action'] : 'show';
 
 switch ( $action ) {
-	case "upgrade":
-		$n = ( isset($_GET['n']) ) ? intval($_GET['n']) : 0;
+	case 'upgrade':
+		$n = ( isset( $_GET['n'] ) ) ? intval( $_GET['n'] ) : 0;
 
 		if ( $n < 5 ) {
 			/**
@@ -53,42 +55,48 @@ switch ( $action ) {
 			update_site_option( 'wpmu_upgrade_site', $wp_db_version );
 		}
 
-		$site_ids = get_sites( array(
-			'spam'       => 0,
-			'deleted'    => 0,
-			'archived'   => 0,
-			'network_id' => get_current_network_id(),
-			'number'     => 5,
-			'offset'     => $n,
-			'fields'     => 'ids',
-			'order'      => 'DESC',
-			'orderby'    => 'id',
-		) );
+		$site_ids = get_sites(
+			array(
+				'spam'       => 0,
+				'deleted'    => 0,
+				'archived'   => 0,
+				'network_id' => get_current_network_id(),
+				'number'     => 5,
+				'offset'     => $n,
+				'fields'     => 'ids',
+				'order'      => 'DESC',
+				'orderby'    => 'id',
+			)
+		);
 		if ( empty( $site_ids ) ) {
 			echo '<p>' . __( 'All done!' ) . '</p>';
 			break;
 		}
-		echo "<ul>";
+		echo '<ul>';
 		foreach ( (array) $site_ids as $site_id ) {
 			switch_to_blog( $site_id );
-			$siteurl = site_url();
+			$siteurl     = site_url();
 			$upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
 			restore_current_blog();
 
 			echo "<li>$siteurl</li>";
 
-			$response = wp_remote_get( $upgrade_url, array(
-				'timeout'     => 120,
-				'httpversion' => '1.1',
-				'sslverify'   => false,
-			) );
+			$response = wp_remote_get(
+				$upgrade_url, array(
+					'timeout'     => 120,
+					'httpversion' => '1.1',
+					'sslverify'   => false,
+				)
+			);
 			if ( is_wp_error( $response ) ) {
-				wp_die( sprintf(
-					/* translators: 1: site url, 2: server error message */
-					__( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
-					$siteurl,
-					'<em>' . $response->get_error_message() . '</em>'
-				) );
+				wp_die(
+					sprintf(
+						/* translators: 1: site url, 2: server error message */
+						__( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
+						$siteurl,
+						'<em>' . $response->get_error_message() . '</em>'
+					)
+				);
 			}
 
 			/**
@@ -108,17 +116,18 @@ switch ( $action ) {
 			 */
 			do_action( 'wpmu_upgrade_site', $site_id );
 		}
-		echo "</ul>";
-		?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
+		echo '</ul>';
+		?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ( $n + 5 ); ?>"><?php _e( 'Next Sites' ); ?></a></p>
 		<script type="text/javascript">
 		<!--
 		function nextpage() {
-			location.href = "upgrade.php?action=upgrade&n=<?php echo ($n + 5) ?>";
+			location.href = "upgrade.php?action=upgrade&n=<?php echo ( $n + 5 ); ?>";
 		}
 		setTimeout( "nextpage()", 250 );
 		//-->
-		</script><?php
-	break;
+		</script>
+		<?php
+		break;
 	case 'show':
 	default:
 		if ( get_site_option( 'wpmu_upgrade_site' ) != $GLOBALS['wp_db_version'] ) :
@@ -136,7 +145,7 @@ switch ( $action ) {
 		 * @since MU (3.0.0)
 		 */
 		do_action( 'wpmu_upgrade_page' );
-	break;
+		break;
 }
 ?>
 </div>
diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index 3d9bb67b2d..57f54124ca 100644
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -10,43 +10,48 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('create_users') )
-	wp_die(__('Sorry, you are not allowed to add users to this network.'));
+if ( ! current_user_can( 'create_users' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to add users to this network.' ) );
+}
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-		'<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
-		'<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			'<p>' . __( 'Add User will set up a new user account on the network and send that person an email with username and password.' ) . '</p>' .
+			'<p>' . __( 'Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.' ) . '</p>',
+	)
 );
 
-if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+);
+
+if ( isset( $_REQUEST['action'] ) && 'add-user' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-user', '_wpnonce_add-user' );
 
-	if ( ! current_user_can( 'manage_network_users' ) )
+	if ( ! current_user_can( 'manage_network_users' ) ) {
 		wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	}
 
-	if ( ! is_array( $_POST['user'] ) )
+	if ( ! is_array( $_POST['user'] ) ) {
 		wp_die( __( 'Cannot create an empty user.' ) );
+	}
 
 	$user = wp_unslash( $_POST['user'] );
 
 	$user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
-	if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
-		$add_user_errors = $user_details[ 'errors' ];
+	if ( is_wp_error( $user_details['errors'] ) && ! empty( $user_details['errors']->errors ) ) {
+		$add_user_errors = $user_details['errors'];
 	} else {
-		$password = wp_generate_password( 12, false);
-		$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
+		$password = wp_generate_password( 12, false );
+		$user_id  = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
 
 		if ( ! $user_id ) {
-	 		$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
+			$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
 		} else {
 			/**
 			 * Fires after a new user has been created via the network user-new.php page.
@@ -56,13 +61,20 @@ if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
 			 * @param int $user_id ID of the newly created user.
 			 */
 			do_action( 'network_user_new_created_user', $user_id );
-			wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
+			wp_redirect(
+				add_query_arg(
+					array(
+						'update'  => 'added',
+						'user_id' => $user_id,
+					), 'user-new.php'
+				)
+			);
 			exit;
 		}
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if ( isset( $_GET['update'] ) ) {
 	$messages = array();
 	if ( 'added' == $_GET['update'] ) {
 		$edit_link = '';
@@ -82,7 +94,7 @@ if ( isset($_GET['update']) ) {
 	}
 }
 
-$title = __('Add New User');
+$title       = __( 'Add New User' );
 $parent_file = 'users.php';
 
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
@@ -91,30 +103,33 @@ require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 <h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
+	foreach ( $messages as $msg ) {
 		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
 }
 
-if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
+if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) {
+?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+		foreach ( $add_user_errors->get_error_messages() as $message ) {
+			echo "<p>$message</p>";
+		}
 		?>
 	</div>
 <?php } ?>
-	<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post" novalidate="novalidate">
+	<form action="<?php echo network_admin_url( 'user-new.php?action=add-user' ); ?>" id="adduser" method="post" novalidate="novalidate">
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
+			<th scope="row"><label for="username"><?php _e( 'Username' ); ?></label></th>
 			<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
+			<th scope="row"><label for="email"><?php _e( 'Email' ); ?></label></th>
 			<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
+			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ); ?></td>
 		</tr>
 	</table>
 	<?php
@@ -126,7 +141,7 @@ if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
 	do_action( 'network_user_new_form' );
 
 	wp_nonce_field( 'add-user', '_wpnonce_add-user' );
-	submit_button( __('Add User'), 'primary', 'add-user' );
+	submit_button( __( 'Add User' ), 'primary', 'add-user' );
 	?>
 	</form>
 </div>
diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php
index b9eeb7f078..3ae8f6f1b6 100644
--- a/wp-admin/network/users.php
+++ b/wp-admin/network/users.php
@@ -10,8 +10,9 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_network_users' ) )
+if ( ! current_user_can( 'manage_network_users' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+}
 
 if ( isset( $_GET['action'] ) ) {
 	/** This action is documented in wp-admin/network/edit.php */
@@ -19,16 +20,17 @@ if ( isset( $_GET['action'] ) ) {
 
 	switch ( $_GET['action'] ) {
 		case 'deleteuser':
-			if ( ! current_user_can( 'manage_network_users' ) )
+			if ( ! current_user_can( 'manage_network_users' ) ) {
 				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			check_admin_referer( 'deleteuser' );
 
 			$id = intval( $_GET['id'] );
 			if ( $id != '0' && $id != '1' ) {
 				$_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays
-				$title = __( 'Users' );
-				$parent_file = 'users.php';
+				$title             = __( 'Users' );
+				$parent_file       = 'users.php';
 				require_once( ABSPATH . 'wp-admin/admin-header.php' );
 				echo '<div class="wrap">';
 				confirm_delete_users( $_POST['allusers'] );
@@ -40,22 +42,24 @@ if ( isset( $_GET['action'] ) ) {
 			exit();
 
 		case 'allusers':
-			if ( !current_user_can( 'manage_network_users' ) )
+			if ( ! current_user_can( 'manage_network_users' ) ) {
 				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
-			if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
+			if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
 				check_admin_referer( 'bulk-users-network' );
 
-				$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
+				$doaction     = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
 				$userfunction = '';
 
 				foreach ( (array) $_POST['allusers'] as $user_id ) {
-					if ( !empty( $user_id ) ) {
+					if ( ! empty( $user_id ) ) {
 						switch ( $doaction ) {
 							case 'delete':
-								if ( ! current_user_can( 'delete_users' ) )
+								if ( ! current_user_can( 'delete_users' ) ) {
 									wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
-								$title = __( 'Users' );
+								}
+								$title       = __( 'Users' );
 								$parent_file = 'users.php';
 								require_once( ABSPATH . 'wp-admin/admin-header.php' );
 								echo '<div class="wrap">';
@@ -66,26 +70,29 @@ if ( isset( $_GET['action'] ) ) {
 
 							case 'spam':
 								$user = get_userdata( $user_id );
-								if ( is_super_admin( $user->ID ) )
+								if ( is_super_admin( $user->ID ) ) {
 									wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network administrator.' ), esc_html( $user->user_login ) ) );
+								}
 
 								$userfunction = 'all_spam';
-								$blogs = get_blogs_of_user( $user_id, true );
+								$blogs        = get_blogs_of_user( $user_id, true );
 								foreach ( (array) $blogs as $details ) {
-									if ( $details->userblog_id != get_network()->site_id ) // main blog not a spam !
+									if ( $details->userblog_id != get_network()->site_id ) { // main blog not a spam !
 										update_blog_status( $details->userblog_id, 'spam', '1' );
+									}
 								}
 								update_user_status( $user_id, 'spam', '1' );
-							break;
+								break;
 
 							case 'notspam':
 								$userfunction = 'all_notspam';
-								$blogs = get_blogs_of_user( $user_id, true );
-								foreach ( (array) $blogs as $details )
+								$blogs        = get_blogs_of_user( $user_id, true );
+								foreach ( (array) $blogs as $details ) {
 									update_blog_status( $details->userblog_id, 'spam', '0' );
+								}
 
 								update_user_status( $user_id, 'spam', '0' );
-							break;
+								break;
 						}
 					}
 				}
@@ -101,55 +108,76 @@ if ( isset( $_GET['action'] ) ) {
 					exit();
 				}
 
-				wp_safe_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $userfunction ), wp_get_referer() ) );
+				wp_safe_redirect(
+					add_query_arg(
+						array(
+							'updated' => 'true',
+							'action'  => $userfunction,
+						), wp_get_referer()
+					)
+				);
 			} else {
 				$location = network_admin_url( 'users.php' );
 
-				if ( ! empty( $_REQUEST['paged'] ) )
+				if ( ! empty( $_REQUEST['paged'] ) ) {
 					$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+				}
 				wp_redirect( $location );
 			}
 			exit();
 
 		case 'dodelete':
 			check_admin_referer( 'ms-users-delete' );
-			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
+			if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) ) {
 				wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+			}
 
 			if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
 				foreach ( $_POST['blog'] as $id => $users ) {
 					foreach ( $users as $blogid => $user_id ) {
-						if ( ! current_user_can( 'delete_user', $id ) )
+						if ( ! current_user_can( 'delete_user', $id ) ) {
 							continue;
+						}
 
-						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][$blogid][$id] )
+						if ( ! empty( $_POST['delete'] ) && 'reassign' == $_POST['delete'][ $blogid ][ $id ] ) {
 							remove_user_from_blog( $id, $blogid, $user_id );
-						else
+						} else {
 							remove_user_from_blog( $id, $blogid );
+						}
 					}
 				}
 			}
 			$i = 0;
-			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
+			if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) ) {
 				foreach ( $_POST['user'] as $id ) {
-					if ( ! current_user_can( 'delete_user', $id ) )
+					if ( ! current_user_can( 'delete_user', $id ) ) {
 						continue;
+					}
 					wpmu_delete_user( $id );
 					$i++;
 				}
+			}
 
-			if ( $i == 1 )
+			if ( $i == 1 ) {
 				$deletefunction = 'delete';
-			else
+			} else {
 				$deletefunction = 'all_delete';
+			}
 
-			wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
+			wp_redirect(
+				add_query_arg(
+					array(
+						'updated' => 'true',
+						'action'  => $deletefunction,
+					), network_admin_url( 'users.php' )
+				)
+			);
 			exit();
 	}
 }
 
-$wp_list_table = _get_list_table('WP_MS_Users_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_MS_Users_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 $wp_list_table->prepare_items();
 $total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
 
@@ -157,34 +185,38 @@ if ( $pagenum > $total_pages && $total_pages > 0 ) {
 	wp_redirect( add_query_arg( 'paged', $total_pages ) );
 	exit;
 }
-$title = __( 'Users' );
+$title       = __( 'Users' );
 $parent_file = 'users.php';
 
 add_screen_option( 'per_page' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' =>
-		'<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
-		'<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
-		'<p>' . __('You can also go to the user&#8217;s profile page by clicking on the individual username.') . '</p>' .
-		'<p>' . __( 'You can sort the table by clicking on any of the table headings and switch between list and excerpt views by using the icons above the users list.' ) . '</p>' .
-		'<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '</p>' .
-		'<p>' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+			'<p>' . __( 'This table shows all users across the network and the sites to which they are assigned.' ) . '</p>' .
+			'<p>' . __( 'Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to their Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.' ) . '</p>' .
+			'<p>' . __( 'You can also go to the user&#8217;s profile page by clicking on the individual username.' ) . '</p>' .
+			'<p>' . __( 'You can sort the table by clicking on any of the table headings and switch between list and excerpt views by using the icons above the users list.' ) . '</p>' .
+			'<p>' . __( 'The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.' ) . '</p>' .
+			'<p>' . __( 'You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.' ) . '</p>',
+	)
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter users list' ),
-	'heading_pagination' => __( 'Users list navigation' ),
-	'heading_list'       => __( 'Users list' ),
-) );
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>' ) . '</p>'
+);
+
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter users list' ),
+		'heading_pagination' => __( 'Users list navigation' ),
+		'heading_list'       => __( 'Users list' ),
+	)
+);
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
@@ -195,19 +227,19 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 		switch ( $_REQUEST['action'] ) {
 			case 'delete':
 				_e( 'User deleted.' );
-			break;
+				break;
 			case 'all_spam':
 				_e( 'Users marked as spam.' );
-			break;
+				break;
 			case 'all_notspam':
 				_e( 'Users removed from spam.' );
-			break;
+				break;
 			case 'all_delete':
 				_e( 'Users deleted.' );
-			break;
+				break;
 			case 'add':
 				_e( 'User added.' );
-			break;
+				break;
 		}
 		?>
 	</p></div>
@@ -218,8 +250,10 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
 	<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
+	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;
 
 	if ( strlen( $usersearch ) ) {
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 6227bae5c2..54ca278ea9 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -8,25 +8,28 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
-$title = __('Discussion Settings');
+$title       = __( 'Discussion Settings' );
 $parent_file = 'options-general.php';
 
 add_action( 'admin_print_footer_scripts', 'options_discussion_add_js' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.' ) . '</p>' .
+			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Discussion_Screen">Documentation on Discussion Settings</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/Settings_Discussion_Screen">Documentation on Discussion Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -36,49 +39,54 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php">
-<?php settings_fields('discussion'); ?>
+<?php settings_fields( 'discussion' ); ?>
 
 <table class="form-table">
 <tr>
-<th scope="row"><?php _e('Default article settings'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings'); ?></span></legend>
+<th scope="row"><?php _e( 'Default article settings' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default article settings' ); ?></span></legend>
 <label for="default_pingback_flag">
-<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
-<?php _e('Attempt to notify any blogs linked to from the article'); ?></label>
+<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked( '1', get_option( 'default_pingback_flag' ) ); ?> />
+<?php _e( 'Attempt to notify any blogs linked to from the article' ); ?></label>
 <br />
 <label for="default_ping_status">
-<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
-<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks) on new articles'); ?></label>
+<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked( 'open', get_option( 'default_ping_status' ) ); ?> />
+<?php _e( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ); ?></label>
 <br />
 <label for="default_comment_status">
-<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
-<?php _e('Allow people to post comments on new articles'); ?></label>
+<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked( 'open', get_option( 'default_comment_status' ) ); ?> />
+<?php _e( 'Allow people to post comments on new articles' ); ?></label>
 <br />
 <p class="description"><?php echo '(' . __( 'These settings may be overridden for individual articles.' ) . ')'; ?></p>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Other comment settings'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
-<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and email'); ?></label>
+<th scope="row"><?php _e( 'Other comment settings' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Other comment settings' ); ?></span></legend>
+<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked( '1', get_option( 'require_name_email' ) ); ?> /> <?php _e( 'Comment author must fill out name and email' ); ?></label>
 <br />
 <label for="comment_registration">
-<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
-<?php _e('Users must be registered and logged in to comment'); ?>
-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
+<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked( '1', get_option( 'comment_registration' ) ); ?> />
+<?php _e( 'Users must be registered and logged in to comment' ); ?>
+<?php
+if ( ! get_option( 'users_can_register' ) && is_multisite() ) {
+	echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' );}
+?>
 </label>
 <br />
 
 <label for="close_comments_for_old_posts">
-<input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked('1', get_option('close_comments_for_old_posts')); ?> />
-<?php printf(
+<input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked( '1', get_option( 'close_comments_for_old_posts' ) ); ?> />
+<?php
+printf(
 	__( 'Automatically close comments on articles older than %s days' ),
 	'</label> <label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr( get_option( 'close_comments_days_old' ) ) . '" class="small-text" />'
-); ?>
+);
+?>
 </label>
 <br />
 <label for="thread_comments">
-<input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked('1', get_option('thread_comments')); ?> />
+<input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked( '1', get_option( 'thread_comments' ) ); ?> />
 <?php
 /**
  * Filters the maximum depth of threaded/nested comments.
@@ -91,98 +99,112 @@ $maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
 
 $thread_comments_depth = '</label> <label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">';
 for ( $i = 2; $i <= $maxdeep; $i++ ) {
-	$thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
-	if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
+	$thread_comments_depth .= "<option value='" . esc_attr( $i ) . "'";
+	if ( get_option( 'thread_comments_depth' ) == $i ) {
+		$thread_comments_depth .= " selected='selected'";
+	}
 	$thread_comments_depth .= ">$i</option>";
 }
 $thread_comments_depth .= '</select>';
 
-printf( __('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth );
+printf( __( 'Enable threaded (nested) comments %s levels deep' ), $thread_comments_depth );
 
-?></label>
+?>
+</label>
 <br />
 <label for="page_comments">
 <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
 <?php
 $default_comments_page = '</label> <label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
-if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
-if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('first') . '</option></select>';
+if ( 'newest' == get_option( 'default_comments_page' ) ) {
+	$default_comments_page .= ' selected="selected"';
+}
+$default_comments_page .= '>' . __( 'last' ) . '</option><option value="oldest"';
+if ( 'oldest' == get_option( 'default_comments_page' ) ) {
+	$default_comments_page .= ' selected="selected"';
+}
+$default_comments_page .= '>' . __( 'first' ) . '</option></select>';
 printf(
 	/* translators: 1: Form field control for number of top level comments per page, 2: Form field control for the 'first' or 'last' page */
 	__( 'Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default' ),
 	'</label> <label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr( get_option( 'comments_per_page' ) ) . '" class="small-text" />',
 	$default_comments_page
 );
-?></label>
+?>
+</label>
 <br />
-<label for="comment_order"><?php
+<label for="comment_order">
+<?php
 
 $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
-if ( 'asc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('older') . '</option><option value="desc"';
-if ( 'desc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('newer') . '</option></select>';
+if ( 'asc' == get_option( 'comment_order' ) ) {
+	$comment_order .= ' selected="selected"';
+}
+$comment_order .= '>' . __( 'older' ) . '</option><option value="desc"';
+if ( 'desc' == get_option( 'comment_order' ) ) {
+	$comment_order .= ' selected="selected"';
+}
+$comment_order .= '>' . __( 'newer' ) . '</option></select>';
 
-printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
+printf( __( 'Comments should be displayed with the %s comments at the top of each page' ), $comment_order );
 
-?></label>
+?>
+</label>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Email me whenever'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Email me whenever'); ?></span></legend>
+<th scope="row"><?php _e( 'Email me whenever' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Email me whenever' ); ?></span></legend>
 <label for="comments_notify">
-<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
-<?php _e('Anyone posts a comment'); ?> </label>
+<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked( '1', get_option( 'comments_notify' ) ); ?> />
+<?php _e( 'Anyone posts a comment' ); ?> </label>
 <br />
 <label for="moderation_notify">
-<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
-<?php _e('A comment is held for moderation'); ?> </label>
+<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked( '1', get_option( 'moderation_notify' ) ); ?> />
+<?php _e( 'A comment is held for moderation' ); ?> </label>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Before a comment appears'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears'); ?></span></legend>
+<th scope="row"><?php _e( 'Before a comment appears' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Before a comment appears' ); ?></span></legend>
 <label for="comment_moderation">
-<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
-<?php _e('Comment must be manually approved'); ?> </label>
+<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked( '1', get_option( 'comment_moderation' ) ); ?> />
+<?php _e( 'Comment must be manually approved' ); ?> </label>
 <br />
-<label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment'); ?></label>
+<label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked( '1', get_option( 'comment_whitelist' ) ); ?> /> <?php _e( 'Comment author must have a previously approved comment' ); ?></label>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Comment Moderation'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
-<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
+<th scope="row"><?php _e( 'Comment Moderation' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Moderation' ); ?></span></legend>
+<p><label for="comment_max_links"><?php printf( __( 'Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)' ), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr( get_option( 'comment_max_links' ) ) . '" class="small-text" />' ); ?></label></p>
 
-<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP address, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<p><label for="moderation_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
 <p>
 <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Comment Blacklist'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
-<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<th scope="row"><?php _e( 'Comment Blacklist' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Blacklist' ); ?></span></legend>
+<p><label for="blacklist_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
 <p>
 <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
-<?php do_settings_fields('discussion', 'default'); ?>
+<?php do_settings_fields( 'discussion', 'default' ); ?>
 </table>
 
-<h2 class="title"><?php _e('Avatars'); ?></h2>
+<h2 class="title"><?php _e( 'Avatars' ); ?></h2>
 
-<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
+<p><?php _e( 'An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.' ); ?></p>
 
 <?php
 // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?
 
-$show_avatars = get_option( 'show_avatars' );
+$show_avatars       = get_option( 'show_avatars' );
 $show_avatars_class = '';
 if ( ! $show_avatars ) {
 	$show_avatars_class = ' hide-if-js';
@@ -191,8 +213,8 @@ if ( ! $show_avatars ) {
 
 <table class="form-table">
 <tr>
-<th scope="row"><?php _e('Avatar Display'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
+<th scope="row"><?php _e( 'Avatar Display' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Avatar Display' ); ?></span></legend>
 	<label for="show_avatars">
 		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( $show_avatars, 1 ); ?> />
 		<?php _e( 'Show Avatars' ); ?>
@@ -200,43 +222,43 @@ if ( ! $show_avatars ) {
 </fieldset></td>
 </tr>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
-<th scope="row"><?php _e('Maximum Rating'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
+<th scope="row"><?php _e( 'Maximum Rating' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Maximum Rating' ); ?></span></legend>
 
 <?php
 $ratings = array(
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'G' => __('G &#8212; Suitable for all audiences'),
+	'G'  => __( 'G &#8212; Suitable for all audiences' ),
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'),
+	'PG' => __( 'PG &#8212; Possibly offensive, usually for audiences 13 and above' ),
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'R' => __('R &#8212; Intended for adult audiences above 17'),
+	'R'  => __( 'R &#8212; Intended for adult audiences above 17' ),
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'X' => __('X &#8212; Even more mature than above')
+	'X'  => __( 'X &#8212; Even more mature than above' ),
 );
-foreach ($ratings as $key => $rating) :
-	$selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
-	echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr($key) . "' $selected/> $rating</label><br />";
+foreach ( $ratings as $key => $rating ) :
+	$selected = ( get_option( 'avatar_rating' ) == $key ) ? 'checked="checked"' : '';
+	echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr( $key ) . "' $selected/> $rating</label><br />";
 endforeach;
 ?>
 
 </fieldset></td>
 </tr>
 <tr class="avatar-settings<?php echo $show_avatars_class; ?>">
-<th scope="row"><?php _e('Default Avatar'); ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
+<th scope="row"><?php _e( 'Default Avatar' ); ?></th>
+<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default Avatar' ); ?></span></legend>
 
-<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.'); ?><br />
+<?php _e( 'For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.' ); ?><br />
 
 <?php
 $avatar_defaults = array(
-	'mystery' => __('Mystery Person'),
-	'blank' => __('Blank'),
-	'gravatar_default' => __('Gravatar Logo'),
-	'identicon' => __('Identicon (Generated)'),
-	'wavatar' => __('Wavatar (Generated)'),
-	'monsterid' => __('MonsterID (Generated)'),
-	'retro' => __('Retro (Generated)')
+	'mystery'          => __( 'Mystery Person' ),
+	'blank'            => __( 'Blank' ),
+	'gravatar_default' => __( 'Gravatar Logo' ),
+	'identicon'        => __( 'Identicon (Generated)' ),
+	'wavatar'          => __( 'Wavatar (Generated)' ),
+	'monsterid'        => __( 'MonsterID (Generated)' ),
+	'retro'            => __( 'Retro (Generated)' ),
 );
 /**
  * Filters the default avatars.
@@ -249,15 +271,15 @@ $avatar_defaults = array(
  * @param array $avatar_defaults Array of default avatars.
  */
 $avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
-$default = get_option( 'avatar_default', 'mystery' );
-$avatar_list = '';
+$default         = get_option( 'avatar_default', 'mystery' );
+$avatar_list     = '';
 
 // Force avatars on to display these choices
 add_filter( 'pre_option_show_avatars', '__return_true', 100 );
 
 foreach ( $avatar_defaults as $default_key => $default_name ) {
-	$selected = ($default == $default_key) ? 'checked="checked" ' : '';
-	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
+	$selected     = ( $default == $default_key ) ? 'checked="checked" ' : '';
+	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr( $default_key ) . "' {$selected}/> ";
 	$avatar_list .= get_avatar( $user_email, 32, $default_key, '', array( 'force_default' => true ) );
 	$avatar_list .= ' ' . $default_name . '</label>';
 	$avatar_list .= '<br />';
@@ -277,10 +299,10 @@ echo apply_filters( 'default_avatar_select', $avatar_list );
 
 </fieldset></td>
 </tr>
-<?php do_settings_fields('discussion', 'avatars'); ?>
+<?php do_settings_fields( 'discussion', 'avatars' ); ?>
 </table>
 
-<?php do_settings_sections('discussion'); ?>
+<?php do_settings_sections( 'discussion' ); ?>
 
 <?php submit_button(); ?>
 </form>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index ecf4857eb2..6b8fbb1eed 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -12,38 +12,41 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 /** WordPress Translation Installation API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
-$title = __('General Settings');
+$title       = __( 'General Settings' );
 $parent_file = 'options-general.php';
 /* translators: date and time format for exact current time, mainly about timezones, see https://secure.php.net/date */
-$timezone_format = _x('Y-m-d H:i:s', 'timezone date format');
+$timezone_format = _x( 'Y-m-d H:i:s', 'timezone date format' );
 
-add_action('admin_head', 'options_general_add_js');
+add_action( 'admin_head', 'options_general_add_js' );
 
-$options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
-	'<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>';
+$options_help = '<p>' . __( 'The fields on this screen determine some of the basics of your site setup.' ) . '</p>' .
+	'<p>' . __( 'Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.' ) . '</p>';
 
 if ( ! is_multisite() ) {
-	$options_help .= '<p>' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '</p>' .
-		'<p>' . __('If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.') . '</p>';
+	$options_help .= '<p>' . __( 'The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.' ) . '</p>' .
+		'<p>' . __( 'If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.' ) . '</p>';
 }
 
 $options_help .= '<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
 	'<p>' . __( 'UTC means Coordinated Universal Time.' ) . '</p>' .
 	'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => $options_help,
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $options_help,
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_General_Screen">Documentation on General Settings</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/Settings_General_Screen">Documentation on General Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -53,48 +56,50 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php" novalidate="novalidate">
-<?php settings_fields('general'); ?>
+<?php settings_fields( 'general' ); ?>
 
 <table class="form-table">
 
 <tr>
-<th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
-<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></td>
+<th scope="row"><label for="blogname"><?php _e( 'Site Title' ); ?></label></th>
+<td><input name="blogname" type="text" id="blogname" value="<?php form_option( 'blogname' ); ?>" class="regular-text" /></td>
 </tr>
 
 <tr>
-<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
-<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ) ?></p></td>
+<th scope="row"><label for="blogdescription"><?php _e( 'Tagline' ); ?></label></th>
+<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" />
+<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ); ?></p></td>
 </tr>
 
 <?php
-	if ( !is_multisite() ) {
-		$wp_site_url_class = $wp_home_class = '';
-		if ( defined( 'WP_SITEURL' ) ) {
-			$wp_site_url_class = ' disabled';
-		}
-		if ( defined( 'WP_HOME' ) ) {
-			$wp_home_class = ' disabled';
-		}
+if ( ! is_multisite() ) {
+	$wp_site_url_class = $wp_home_class = '';
+	if ( defined( 'WP_SITEURL' ) ) {
+		$wp_site_url_class = ' disabled';
+	}
+	if ( defined( 'WP_HOME' ) ) {
+		$wp_home_class = ' disabled';
+	}
 ?>
 
 <tr>
-<th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
+<th scope="row"><label for="siteurl"><?php _e( 'WordPress Address (URL)' ); ?></label></th>
 <td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php echo $wp_site_url_class; ?>" /></td>
 </tr>
 
 <tr>
-<th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
+<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' ) ) : ?>
-<p class="description" id="home-description"><?php
+<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' )
 	);
-?></p>
+?>
+</p>
 <?php endif; ?>
 </td>
 </tr>
@@ -107,9 +112,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. 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
 $new_admin_email = get_option( 'new_admin_email' );
-if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) : ?>
+if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) :
+?>
 	<div class="updated inline">
-	<p><?php
+	<p>
+	<?php
 		printf(
 			/* translators: %s: new admin email */
 			__( 'There is a pending change of the admin email to %s.' ),
@@ -120,7 +127,8 @@ if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) : ?>
 			esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
 			__( 'Cancel' )
 		);
-	?></p>
+	?>
+	</p>
 	</div>
 <?php endif; ?>
 </td>
@@ -129,23 +137,24 @@ if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) : ?>
 <?php if ( ! is_multisite() ) { ?>
 
 <tr>
-<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>
+<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>
 </fieldset></td>
 </tr>
 
 <tr>
-<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
+<th scope="row"><label for="default_role"><?php _e( 'New User Default Role' ); ?></label></th>
 <td>
-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
+<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option( 'default_role' ) ); ?></select>
 </td>
 </tr>
 
-<?php }
+<?php
+}
 
-$languages = get_available_languages();
+$languages    = get_available_languages();
 $translations = wp_get_available_translations();
 if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
 	$languages[] = WPLANG;
@@ -161,14 +170,16 @@ if ( ! empty( $languages ) || ! empty( $translations ) ) {
 				$locale = '';
 			}
 
-			wp_dropdown_languages( array(
-				'name'         => 'WPLANG',
-				'id'           => 'WPLANG',
-				'selected'     => $locale,
-				'languages'    => $languages,
-				'translations' => $translations,
-				'show_available_translations' => current_user_can( 'install_languages' ),
-			) );
+			wp_dropdown_languages(
+				array(
+					'name'                        => 'WPLANG',
+					'id'                          => 'WPLANG',
+					'selected'                    => $locale,
+					'languages'                   => $languages,
+					'translations'                => $translations,
+					'show_available_translations' => current_user_can( 'install_languages' ),
+				)
+			);
 
 			// Add note about deprecated WPLANG constant.
 			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
@@ -176,11 +187,11 @@ if ( ! empty( $languages ) || ! empty( $translations ) ) {
 					|| ! is_multisite() && current_user_can( 'manage_options' ) ) {
 					?>
 					<p class="description">
-						<strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
+						<strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %1$s constant in your %2$s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
 					</p>
 					<?php
 				}
-				_deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
+				_deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %1$s constant in your %2$s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
 			}
 			?>
 		</td>
@@ -190,27 +201,29 @@ if ( ! empty( $languages ) || ! empty( $translations ) ) {
 ?>
 <tr>
 <?php
-$current_offset = get_option('gmt_offset');
-$tzstring = get_option('timezone_string');
+$current_offset = get_option( 'gmt_offset' );
+$tzstring       = get_option( 'timezone_string' );
 
 $check_zone_info = true;
 
 // Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos($tzstring,'Etc/GMT') )
+if ( false !== strpos( $tzstring, 'Etc/GMT' ) ) {
 	$tzstring = '';
+}
 
-if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
+if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
 	$check_zone_info = false;
-	if ( 0 == $current_offset )
+	if ( 0 == $current_offset ) {
 		$tzstring = 'UTC+0';
-	elseif ($current_offset < 0)
+	} elseif ( $current_offset < 0 ) {
 		$tzstring = 'UTC' . $current_offset;
-	else
+	} else {
 		$tzstring = 'UTC+' . $current_offset;
+	}
 }
 
 ?>
-<th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
+<th scope="row"><label for="timezone_string"><?php _e( 'Timezone' ); ?></label></th>
 <td>
 
 <select id="timezone_string" name="timezone_string" aria-describedby="timezone-description">
@@ -220,20 +233,26 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <p class="description" id="timezone-description"><?php _e( 'Choose either a city in the same timezone as you or a UTC timezone offset.' ); ?></p>
 
 <p class="timezone-info">
-	<span id="utc-time"><?php
+	<span id="utc-time">
+	<?php
 		/* translators: 1: UTC abbreviation, 2: UTC time */
-		printf( __( 'Universal time (%1$s) is %2$s.' ),
+		printf(
+			__( 'Universal time (%1$s) is %2$s.' ),
 			'<abbr>' . __( 'UTC' ) . '</abbr>',
 			'<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
 		);
-	?></span>
+	?>
+	</span>
 <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
-	<span id="local-time"><?php
+	<span id="local-time">
+	<?php
 		/* translators: %s: local time */
-		printf( __( 'Local time is %s.' ),
+		printf(
+			__( 'Local time is %s.' ),
 			'<code>' . date_i18n( $timezone_format ) . '</code>'
 		);
-	?></span>
+	?>
+	</span>
 <?php endif; ?>
 </p>
 
@@ -242,25 +261,26 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <span>
 	<?php
 	// Set TZ so localtime works.
-	date_default_timezone_set($tzstring);
-	$now = localtime(time(), true);
-	if ( $now['tm_isdst'] )
-		_e('This timezone is currently in daylight saving time.');
-	else
-		_e('This timezone is currently in standard time.');
+	date_default_timezone_set( $tzstring );
+	$now = localtime( time(), true );
+	if ( $now['tm_isdst'] ) {
+		_e( 'This timezone is currently in daylight saving time.' );
+	} else {
+		_e( 'This timezone is currently in standard time.' );
+	}
 	?>
 	<br />
 	<?php
 	$allowed_zones = timezone_identifiers_list();
 
-	if ( in_array( $tzstring, $allowed_zones) ) {
-		$found = false;
-		$date_time_zone_selected = new DateTimeZone($tzstring);
-		$tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
-		$right_now = time();
-		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
+	if ( in_array( $tzstring, $allowed_zones ) ) {
+		$found                   = false;
+		$date_time_zone_selected = new DateTimeZone( $tzstring );
+		$tz_offset               = timezone_offset_get( $date_time_zone_selected, date_create() );
+		$right_now               = time();
+		foreach ( timezone_transitions_get( $date_time_zone_selected ) as $tr ) {
 			if ( $tr['ts'] > $right_now ) {
-			    $found = true;
+				$found = true;
 				break;
 			}
 		}
@@ -269,11 +289,12 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 			echo ' ';
 			$message = $tr['isdst'] ?
 				/* translators: %s: date and time  */
-				__( 'Daylight saving time begins on: %s.')  :
+				__( 'Daylight saving time begins on: %s.' ) :
 				/* translators: %s: date and time  */
 				__( 'Standard time begins on: %s.' );
 			// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-			printf( $message,
+			printf(
+				$message,
 				'<code>' . date_i18n(
 					__( 'F j, Y' ) . ' ' . __( 'g:i a' ),
 					$tr['ts'] + ( $tz_offset - $tr['offset'] )
@@ -284,7 +305,7 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 		}
 	}
 	// Set back to UTC.
-	date_default_timezone_set('UTC');
+	date_default_timezone_set( 'UTC' );
 	?>
 	</span>
 </p>
@@ -293,30 +314,30 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 
 </tr>
 <tr>
-<th scope="row"><?php _e('Date Format') ?></th>
+<th scope="row"><?php _e( 'Date Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Date Format' ); ?></span></legend>
 <?php
 	/**
-	* Filters the default date formats.
-	*
-	* @since 2.7.0
-	* @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
-	*
-	* @param array $default_date_formats Array of default date formats.
-	*/
+	 * Filters the default date formats.
+	 *
+	 * @since 2.7.0
+	 * @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
+	 *
+	 * @param array $default_date_formats Array of default date formats.
+	 */
 	$date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
 
 	$custom = true;
 
-	foreach ( $date_formats as $format ) {
-		echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
-		if ( get_option('date_format') === $format ) { // checked() uses "==" rather than "==="
-			echo " checked='checked'";
-			$custom = false;
-		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+foreach ( $date_formats as $format ) {
+	echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
+	if ( get_option( 'date_format' ) === $format ) { // checked() uses "==" rather than "==="
+		echo " checked='checked'";
+		$custom = false;
 	}
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+}
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
@@ -331,29 +352,29 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 </td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Time Format') ?></th>
+<th scope="row"><?php _e( 'Time Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Time Format' ); ?></span></legend>
 <?php
 	/**
-	* Filters the default time formats.
-	*
-	* @since 2.7.0
-	*
-	* @param array $default_time_formats Array of default time formats.
-	*/
+	 * Filters the default time formats.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param array $default_time_formats Array of default time formats.
+	 */
 	$time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
 
 	$custom = true;
 
-	foreach ( $time_formats as $format ) {
-		echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
-		if ( get_option('time_format') === $format ) { // checked() uses "==" rather than "==="
-			echo " checked='checked'";
-			$custom = false;
-		}
-		echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+foreach ( $time_formats as $format ) {
+	echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
+	if ( get_option( 'time_format' ) === $format ) { // checked() uses "==" rather than "==="
+		echo " checked='checked'";
+		$custom = false;
 	}
+	echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
+}
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
@@ -364,13 +385,13 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 		'<p><strong>' . __( 'Preview:' ) . '</strong> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
 		"<span class='spinner'></span>\n" . '</p>';
 
-	echo "\t<p class='date-time-doc'>" . __('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
+	echo "\t<p class='date-time-doc'>" . __( '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.' ) . "</p>\n";
 ?>
 	</fieldset>
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
+<th scope="row"><label for="start_of_week"><?php _e( 'Week Starts On' ); ?></label></th>
 <td><select name="start_of_week" id="start_of_week">
 <?php
 /**
@@ -378,17 +399,17 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
  */
 global $wp_locale;
 
-for ($day_index = 0; $day_index <= 6; $day_index++) :
-	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
-	echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
+for ( $day_index = 0; $day_index <= 6; $day_index++ ) :
+	$selected = ( get_option( 'start_of_week' ) == $day_index ) ? 'selected="selected"' : '';
+	echo "\n\t<option value='" . esc_attr( $day_index ) . "' $selected>" . $wp_locale->get_weekday( $day_index ) . '</option>';
 endfor;
 ?>
 </select></td>
 </tr>
-<?php do_settings_fields('general', 'default'); ?>
+<?php do_settings_fields( 'general', 'default' ); ?>
 </table>
 
-<?php do_settings_sections('general'); ?>
+<?php do_settings_sections( 'general' ); ?>
 
 <?php submit_button(); ?>
 </form>
diff --git a/wp-admin/options-head.php b/wp-admin/options-head.php
index bee3ae7e67..a0e3a3307c 100644
--- a/wp-admin/options-head.php
+++ b/wp-admin/options-head.php
@@ -12,7 +12,7 @@ wp_reset_vars( array( 'action' ) );
 
 if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {
 	// For back-compat with plugins that don't use the Settings API and just set updated=1 in the redirect.
-	add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	add_settings_error( 'general', 'settings_updated', __( 'Settings saved.' ), 'updated' );
 }
 
 settings_errors();
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index a0f8a9ebdb..4f585a10da 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -9,30 +9,33 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
-
-$title = __('Media Settings');
-$parent_file = 'options-general.php';
-
-$media_options_help = '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>';
-
-if ( ! is_multisite() && ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) ) {
-	$media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>';
 }
 
-$media_options_help .= '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
+$title       = __( 'Media Settings' );
+$parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => $media_options_help,
-) );
+$media_options_help = '<p>' . __( 'You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.' ) . '</p>';
+
+if ( ! is_multisite() && ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) ) {
+	$media_options_help .= '<p>' . __( 'Uploading Files allows you to choose the folder and path for storing your uploaded files.' ) . '</p>';
+}
+
+$media_options_help .= '<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>';
+
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $media_options_help,
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Media_Screen">Documentation on Media Settings</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/Settings_Media_Screen">Documentation on Media Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -43,81 +46,84 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form action="options.php" method="post">
-<?php settings_fields('media'); ?>
+<?php settings_fields( 'media' ); ?>
 
-<h2 class="title"><?php _e('Image sizes') ?></h2>
+<h2 class="title"><?php _e( 'Image sizes' ); ?></h2>
 <p><?php _e( 'The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.' ); ?></p>
 
 <table class="form-table">
 <tr>
-<th scope="row"><?php _e('Thumbnail size') ?></th>
+<th scope="row"><?php _e( 'Thumbnail size' ); ?></th>
 <td>
-<label for="thumbnail_size_w"><?php _e('Width'); ?></label>
-<input name="thumbnail_size_w" type="number" step="1" min="0" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" class="small-text" />
-<label for="thumbnail_size_h"><?php _e('Height'); ?></label>
-<input name="thumbnail_size_h" type="number" step="1" min="0" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" class="small-text" />
-<p><input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked('1', get_option('thumbnail_crop')); ?>/>
-<label for="thumbnail_crop"><?php _e('Crop thumbnail to exact dimensions (normally thumbnails are proportional)'); ?></label></p>
+<label for="thumbnail_size_w"><?php _e( 'Width' ); ?></label>
+<input name="thumbnail_size_w" type="number" step="1" min="0" id="thumbnail_size_w" value="<?php form_option( 'thumbnail_size_w' ); ?>" class="small-text" />
+<label for="thumbnail_size_h"><?php _e( 'Height' ); ?></label>
+<input name="thumbnail_size_h" type="number" step="1" min="0" id="thumbnail_size_h" value="<?php form_option( 'thumbnail_size_h' ); ?>" class="small-text" />
+<p><input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked( '1', get_option( 'thumbnail_crop' ) ); ?>/>
+<label for="thumbnail_crop"><?php _e( 'Crop thumbnail to exact dimensions (normally thumbnails are proportional)' ); ?></label></p>
 </td>
 </tr>
 
 <tr>
-<th scope="row"><?php _e('Medium size') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Medium size'); ?></span></legend>
-<label for="medium_size_w"><?php _e('Max Width'); ?></label>
-<input name="medium_size_w" type="number" step="1" min="0" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" class="small-text" />
+<th scope="row"><?php _e( 'Medium size' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Medium size' ); ?></span></legend>
+<label for="medium_size_w"><?php _e( 'Max Width' ); ?></label>
+<input name="medium_size_w" type="number" step="1" min="0" id="medium_size_w" value="<?php form_option( 'medium_size_w' ); ?>" class="small-text" />
 <br />
-<label for="medium_size_h"><?php _e('Max Height'); ?></label>
-<input name="medium_size_h" type="number" step="1" min="0" id="medium_size_h" value="<?php form_option('medium_size_h'); ?>" class="small-text" />
+<label for="medium_size_h"><?php _e( 'Max Height' ); ?></label>
+<input name="medium_size_h" type="number" step="1" min="0" id="medium_size_h" value="<?php form_option( 'medium_size_h' ); ?>" class="small-text" />
 </fieldset></td>
 </tr>
 
 <tr>
-<th scope="row"><?php _e('Large size') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Large size'); ?></span></legend>
-<label for="large_size_w"><?php _e('Max Width'); ?></label>
-<input name="large_size_w" type="number" step="1" min="0" id="large_size_w" value="<?php form_option('large_size_w'); ?>" class="small-text" />
+<th scope="row"><?php _e( 'Large size' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Large size' ); ?></span></legend>
+<label for="large_size_w"><?php _e( 'Max Width' ); ?></label>
+<input name="large_size_w" type="number" step="1" min="0" id="large_size_w" value="<?php form_option( 'large_size_w' ); ?>" class="small-text" />
 <br />
-<label for="large_size_h"><?php _e('Max Height'); ?></label>
-<input name="large_size_h" type="number" step="1" min="0" id="large_size_h" value="<?php form_option('large_size_h'); ?>" class="small-text" />
+<label for="large_size_h"><?php _e( 'Max Height' ); ?></label>
+<input name="large_size_h" type="number" step="1" min="0" id="large_size_h" value="<?php form_option( 'large_size_h' ); ?>" class="small-text" />
 </fieldset></td>
 </tr>
 
-<?php do_settings_fields('media', 'default'); ?>
+<?php do_settings_fields( 'media', 'default' ); ?>
 </table>
 
 <?php
 /**
  * @global array $wp_settings
  */
-if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) : ?>
-<h2 class="title"><?php _e('Embeds') ?></h2>
+if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) :
+?>
+<h2 class="title"><?php _e( 'Embeds' ); ?></h2>
 <table class="form-table">
 <?php do_settings_fields( 'media', 'embeds' ); ?>
 </table>
 <?php endif; ?>
 
-<?php if ( !is_multisite() ) : ?>
-<h2 class="title"><?php _e('Uploading Files'); ?></h2>
+<?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') ) ) :
+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
+<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>' );
-?></p>
+?>
+</p>
 </td>
 </tr>
 
 <tr>
-<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
-<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
-<p class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></p>
+<th scope="row"><label for="upload_url_path"><?php _e( 'Full URL path to files' ); ?></label></th>
+<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option( 'upload_url_path' ) ); ?>" class="regular-text code" />
+<p class="description"><?php _e( 'Configuring this is optional. By default, it should be blank.' ); ?></p>
 </td>
 </tr>
 <tr>
@@ -127,17 +133,17 @@ if ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content
 <td class="td-full">
 <?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'); ?>
+<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' ); ?>
 </label>
 </td>
 </tr>
 
-<?php do_settings_fields('media', 'uploads'); ?>
+<?php do_settings_fields( 'media', 'uploads' ); ?>
 </table>
 <?php endif; ?>
 
-<?php do_settings_sections('media'); ?>
+<?php do_settings_sections( 'media' ); ?>
 
 <?php submit_button(); ?>
 
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 4b55a796fb..6dfd9bfc2b 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -9,50 +9,58 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
-$title = __('Permalink Settings');
+$title       = __( 'Permalink Settings' );
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
-		'<p>' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
-
-get_current_screen()->add_help_tab( array(
-	'id'      => 'permalink-settings',
-	'title'   => __('Permalink Settings'),
-	'content' => '<p>' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '</p>' .
-		'<p>' . __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.' ) . '</p>' .
-		'<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
-
-get_current_screen()->add_help_tab( array(
-	'id'      => 'custom-structures',
-	'title'   => __('Custom Structures'),
-	'content' => '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Permalinks_Screen">Documentation on Permalinks Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Permalinks">Documentation on Using Permalinks</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.' ) . '</p>' .
+			'<p>' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '</p>' .
+			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
+	)
 );
 
-$home_path = get_home_path();
-$iis7_permalinks = iis7_supports_permalinks();
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'permalink-settings',
+		'title'   => __( 'Permalink Settings' ),
+		'content' => '<p>' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '</p>' .
+			'<p>' . __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.' ) . '</p>' .
+			'<p>' . __( 'When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.' ) . '</p>' .
+			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
+	)
+);
+
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'custom-structures',
+		'title'   => __( 'Custom Structures' ),
+		'content' => '<p>' . __( 'The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.' ) . '</p>' .
+			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
+	)
+);
+
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Settings_Permalinks_Screen">Documentation on Permalinks Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Using_Permalinks">Documentation on Using Permalinks</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+);
+
+$home_path           = get_home_path();
+$iis7_permalinks     = iis7_supports_permalinks();
 $permalink_structure = get_option( 'permalink_structure' );
 
 $prefix = $blog_prefix = '';
-if ( ! got_url_rewrite() )
+if ( ! got_url_rewrite() ) {
 	$prefix = '/index.php';
+}
 
 /**
  * In a subdirectory configuration of multisite, the `/blog` prefix is used by
@@ -64,22 +72,23 @@ if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpo
 	$blog_prefix = '/blog';
 }
 
-$category_base       = get_option( 'category_base' );
-$tag_base            = get_option( 'tag_base' );
-$update_required     = false;
+$category_base   = get_option( 'category_base' );
+$tag_base        = get_option( 'tag_base' );
+$update_required = false;
 
 if ( $iis7_permalinks ) {
-	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') )
+	if ( ( ! file_exists( $home_path . 'web.config' ) && win_is_writable( $home_path ) ) || win_is_writable( $home_path . 'web.config' ) ) {
 		$writable = true;
-	else
+	} else {
 		$writable = false;
+	}
 } elseif ( $is_nginx ) {
 	$writable = false;
 } else {
 	if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
 		$writable = true;
 	} else {
-		$writable = false;
+		$writable        = false;
 		$existing_rules  = array_filter( extract_from_markers( $home_path . '.htaccess', 'WordPress' ) );
 		$new_rules       = array_filter( explode( "\n", $wp_rewrite->mod_rewrite_rules() ) );
 		$update_required = ( $new_rules !== $existing_rules );
@@ -88,21 +97,23 @@ if ( $iis7_permalinks ) {
 
 $using_index_permalinks = $wp_rewrite->using_index_permalinks();
 
-if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
-	check_admin_referer('update-permalink');
+if ( isset( $_POST['permalink_structure'] ) || isset( $_POST['category_base'] ) ) {
+	check_admin_referer( 'update-permalink' );
 
 	if ( isset( $_POST['permalink_structure'] ) ) {
-		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
+		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] ) {
 			$permalink_structure = $_POST['selection'];
-		else
+		} else {
 			$permalink_structure = $_POST['permalink_structure'];
+		}
 
 		if ( ! empty( $permalink_structure ) ) {
 			$permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-			if ( $prefix && $blog_prefix )
+			if ( $prefix && $blog_prefix ) {
 				$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
-			else
+			} else {
 				$permalink_structure = $blog_prefix . $permalink_structure;
+			}
 		}
 
 		$permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
@@ -112,15 +123,17 @@ if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
 
 	if ( isset( $_POST['category_base'] ) ) {
 		$category_base = $_POST['category_base'];
-		if ( ! empty( $category_base ) )
-			$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		if ( ! empty( $category_base ) ) {
+			$category_base = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		}
 		$wp_rewrite->set_category_base( $category_base );
 	}
 
 	if ( isset( $_POST['tag_base'] ) ) {
 		$tag_base = $_POST['tag_base'];
-		if ( ! empty( $tag_base ) )
-			$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		if ( ! empty( $tag_base ) ) {
+			$tag_base = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		}
 		$wp_rewrite->set_tag_base( $tag_base );
 	}
 
@@ -154,21 +167,23 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form name="form" action="options-permalink.php" method="post">
-<?php wp_nonce_field('update-permalink') ?>
+<?php wp_nonce_field( 'update-permalink' ); ?>
 
-	<p><?php
+	<p>
+	<?php
 		printf(
 			/* translators: %s: Codex URL */
 			__( '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>
+	?>
+	</p>
 
 <?php
 if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
 	$permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
-	$category_base = preg_replace( '|^/?blog|', '', $category_base );
-	$tag_base = preg_replace( '|^/?blog|', '', $tag_base );
+	$category_base       = preg_replace( '|^/?blog|', '', $category_base );
+	$tag_base            = preg_replace( '|^/?blog|', '', $tag_base );
 }
 
 $structures = array(
@@ -179,37 +194,37 @@ $structures = array(
 	4 => $prefix . '/%postname%/',
 );
 ?>
-<h2 class="title"><?php _e('Common Settings'); ?></h2>
+<h2 class="title"><?php _e( 'Common Settings' ); ?></h2>
 <table class="form-table permalink-structure">
 	<tr>
-		<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e( 'Plain' ); ?></label></th>
-		<td><code><?php echo get_option('home'); ?>/?p=123</code></td>
+		<th><label><input name="selection" type="radio" value="" <?php checked( '', $permalink_structure ); ?> /> <?php _e( 'Plain' ); ?></label></th>
+		<td><code><?php echo get_option( 'home' ); ?>/?p=123</code></td>
 	</tr>
 	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<th><label><input name="selection" type="radio" value="<?php echo esc_attr( $structures[1] ); ?>" <?php checked( $structures[1], $permalink_structure ); ?> /> <?php _e( 'Day and name' ); ?></label></th>
+		<td><code><?php echo get_option( 'home' ) . $blog_prefix . $prefix . '/' . date( 'Y' ) . '/' . date( 'm' ) . '/' . date( 'd' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
 	</tr>
 	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<th><label><input name="selection" type="radio" value="<?php echo esc_attr( $structures[2] ); ?>" <?php checked( $structures[2], $permalink_structure ); ?> /> <?php _e( 'Month and name' ); ?></label></th>
+		<td><code><?php echo get_option( 'home' ) . $blog_prefix . $prefix . '/' . date( 'Y' ) . '/' . date( 'm' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
 	</tr>
 	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123'; ?></code></td>
+		<th><label><input name="selection" type="radio" value="<?php echo esc_attr( $structures[3] ); ?>" <?php checked( $structures[3], $permalink_structure ); ?> /> <?php _e( 'Numeric' ); ?></label></th>
+		<td><code><?php echo get_option( 'home' ) . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123'; ?></code></td>
 	</tr>
 	<tr>
-		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[4]); ?>" <?php checked($structures[4], $permalink_structure); ?> /> <?php _e('Post name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<th><label><input name="selection" type="radio" value="<?php echo esc_attr( $structures[4] ); ?>" <?php checked( $structures[4], $permalink_structure ); ?> /> <?php _e( 'Post name' ); ?></label></th>
+		<td><code><?php echo get_option( 'home' ) . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
 	</tr>
 	<tr>
 		<th>
-			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
-			<?php _e('Custom Structure'); ?>
+			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( ! in_array( $permalink_structure, $structures ) ); ?> />
+			<?php _e( 'Custom Structure' ); ?>
 			</label>
 		</th>
 		<td>
-			<code><?php echo get_option('home') . $blog_prefix; ?></code>
-			<input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
+			<code><?php echo get_option( 'home' ) . $blog_prefix; ?></code>
+			<input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr( $permalink_structure ); ?>" class="regular-text code" />
 			<div class="available-structure-tags hide-if-no-js">
 				<div id="custom_selection_updated" aria-live="assertive" class="screen-reader-text"></div>
 				<?php
@@ -260,10 +275,10 @@ $structures = array(
 							?>
 							<li>
 								<button type="button"
-								        class="button button-secondary"
-								        aria-label="<?php echo esc_attr( sprintf( $explanation, $tag ) ); ?>"
-								        data-added="<?php echo esc_attr( sprintf( $structure_tag_added, $tag ) ); ?>"
-								        data-used="<?php echo esc_attr( sprintf( $structure_tag_already_used, $tag ) ); ?>">
+										class="button button-secondary"
+										aria-label="<?php echo esc_attr( sprintf( $explanation, $tag ) ); ?>"
+										data-added="<?php echo esc_attr( sprintf( $structure_tag_added, $tag ) ); ?>"
+										data-used="<?php echo esc_attr( sprintf( $structure_tag_already_used, $tag ) ); ?>">
 									<?php echo '%' . $tag . '%'; ?>
 								</button>
 							</li>
@@ -277,32 +292,38 @@ $structures = array(
 	</tr>
 </table>
 
-<h2 class="title"><?php _e('Optional'); ?></h2>
-<p><?php
+<h2 class="title"><?php _e( 'Optional' ); ?></h2>
+<p>
+<?php
 /* translators: %s: placeholder that must come at the start of the URL */
-printf( __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix ); ?></p>
+printf( __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix );
+?>
+</p>
 
 <table class="form-table">
 	<tr>
-		<th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
+		<th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e( 'Category base' ); ?></label></th>
 		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
 	</tr>
 	<tr>
-		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
+		<th><label for="tag_base"><?php _e( 'Tag base' ); ?></label></th>
+		<td><?php echo $blog_prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr( $tag_base ); ?>" class="regular-text code" /></td>
 	</tr>
-	<?php do_settings_fields('permalink', 'optional'); ?>
+	<?php do_settings_fields( 'permalink', 'optional' ); ?>
 </table>
 
-<?php do_settings_sections('permalink'); ?>
+<?php do_settings_sections( 'permalink' ); ?>
 
 <?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') ) : ?>
-<p><?php
+<?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' ) ) :
+		?>
+<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.' ),
@@ -311,20 +332,24 @@ printf( __( 'If you like, you may enter custom structures for your category and
 		'<kbd>CTRL + a</kbd>',
 		'<code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code>'
 	);
-?></p>
+?>
+</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
+<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>'
 	);
-?></p>
+?>
+</p>
 		<?php else : ?>
-<p><?php
+<p>
+<?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.' ),
@@ -332,25 +357,31 @@ printf( __( 'If you like, you may enter custom structures for your category and
 		'<code>web.config</code>',
 		'<kbd>CTRL + a</kbd>'
 	);
-?></p>
+?>
+</p>
 <form action="options-permalink.php" method="post">
-<?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>
+<?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
+<p>
+<?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>
+?>
+</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 else:
-	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) : ?>
-<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.' ),
@@ -358,9 +389,10 @@ printf( __( 'If you like, you may enter custom structures for your category and
 		__( 'https://codex.wordpress.org/Changing_File_Permissions' ),
 		'<kbd>CTRL + a</kbd>'
 	);
-?></p>
+?>
+</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 d673066159..313046cf30 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -9,34 +9,39 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
-$title = __( 'Reading Settings' );
+$title       = __( 'Reading Settings' );
 $parent_file = 'options-general.php';
 
-add_action('admin_head', 'options_reading_add_js');
+add_action( 'admin_head', 'options_reading_add_js' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
-		'<p>' . sprintf(__('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 <a href="%s">Pages</a>. One will become the homepage, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page') . '</p>' .
-		'<p>' . __('You can also control the display of your content in RSS feeds, including the maximum number of posts to display and whether to show full text or a summary.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'This screen contains the settings that affect the display of your content.' ) . '</p>' .
+			'<p>' . sprintf( __( '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 <a href="%s">Pages</a>. One will become the homepage, and the other will be where your posts are displayed.' ), 'post-new.php?post_type=page' ) . '</p>' .
+			'<p>' . __( 'You can also control the display of your content in RSS feeds, including the maximum number of posts to display and whether to show full text or a summary.' ) . '</p>' .
+			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
+	)
+);
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'site-visibility',
-	'title'   => has_action( 'blog_privacy_selector' ) ? __( 'Site Visibility' ) : __( 'Search Engine Visibility' ),
-	'content' => '<p>' . __( 'You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to &#8220;Discourage search engines from indexing this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.' ) . '</p>' .
-		'<p>' . __( 'When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.' ) . '</p>',
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'site-visibility',
+		'title'   => has_action( 'blog_privacy_selector' ) ? __( 'Site Visibility' ) : __( 'Search Engine Visibility' ),
+		'content' => '<p>' . __( 'You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to &#8220;Discourage search engines from indexing this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.' ) . '</p>' .
+			'<p>' . __( 'When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Reading_Screen">Documentation on Reading Settings</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/Settings_Reading_Screen">Documentation on Reading Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -49,21 +54,23 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <?php
 settings_fields( 'reading' );
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading', 'default', array( 'label_for' => 'blog_charset' ) );
+}
 ?>
 
 <?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' );
+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' ) )
+	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>
@@ -80,8 +87,36 @@ else :
 	</label>
 	</p>
 <ul>
-	<li><label for="page_on_front"><?php printf( __( 'Homepage: %s' ), wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_on_front' ) ) ) ); ?></label></li>
-	<li><label for="page_for_posts"><?php printf( __( 'Posts page: %s' ), wp_dropdown_pages( array( 'name' => 'page_for_posts', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_for_posts' ) ) ) ); ?></label></li>
+	<li><label for="page_on_front">
+	<?php
+	printf(
+		__( 'Homepage: %s' ), wp_dropdown_pages(
+			array(
+				'name'              => 'page_on_front',
+				'echo'              => 0,
+				'show_option_none'  => __( '&mdash; Select &mdash;' ),
+				'option_none_value' => '0',
+				'selected'          => get_option( 'page_on_front' ),
+			)
+		)
+	);
+?>
+</label></li>
+	<li><label for="page_for_posts">
+	<?php
+	printf(
+		__( 'Posts page: %s' ), wp_dropdown_pages(
+			array(
+				'name'              => 'page_for_posts',
+				'echo'              => 0,
+				'show_option_none'  => __( '&mdash; Select &mdash;' ),
+				'option_none_value' => '0',
+				'selected'          => get_option( 'page_for_posts' ),
+			)
+		)
+	);
+?>
+</label></li>
 </ul>
 <?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>
@@ -111,9 +146,9 @@ else :
 <th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </th>
 <td><fieldset><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', get_option('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', get_option('blog_public')); ?> />
+	<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked( '1', get_option( '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', get_option( 'blog_public' ) ); ?> />
 	<label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
 	<p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
 	<?php
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index afc3fb9e9e..d9eb5c8429 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -9,41 +9,48 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
-$title = __('Writing Settings');
+$title       = __( 'Writing Settings' );
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.' ) . '</p>' .
+			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
+	)
+);
 
 /** This filter is documented in wp-admin/options.php */
 if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'options-postemail',
-		'title'   => __( 'Post Via Email' ),
-		'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress installation an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'options-postemail',
+			'title'   => __( 'Post Via Email' ),
+			'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress installation an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
+		)
+	);
 }
 
 /** This filter is documented in wp-admin/options-writing.php */
 if ( apply_filters( 'enable_update_services_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'options-services',
-		'title'   => __( 'Update Services' ),
-		'content' => '<p>' . __( 'If desired, WordPress will automatically alert various services of your new posts.' ) . '</p>',
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'options-services',
+			'title'   => __( 'Update Services' ),
+			'content' => '<p>' . __( 'If desired, WordPress will automatically alert various services of your new posts.' ) . '</p>',
+		)
+	);
 }
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Writing_Screen">Documentation on Writing Settings</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/Settings_Writing_Screen">Documentation on Writing Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -53,25 +60,33 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php">
-<?php settings_fields('writing'); ?>
+<?php settings_fields( 'writing' ); ?>
 
 <table class="form-table">
 <?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
 <tr>
-<th scope="row"><?php _e('Formatting') ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
+<th scope="row"><?php _e( 'Formatting' ); ?></th>
+<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 />
-<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>
+<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 />
+<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>
 <?php endif; ?>
 <tr>
-<th scope="row"><label for="default_category"><?php _e('Default Post Category') ?></label></th>
+<th scope="row"><label for="default_category"><?php _e( 'Default Post Category' ); ?></label></th>
 <td>
 <?php
-wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_category', 'orderby' => 'name', 'selected' => get_option('default_category'), 'hierarchical' => true));
+wp_dropdown_categories(
+	array(
+		'hide_empty'   => 0,
+		'name'         => 'default_category',
+		'orderby'      => 'name',
+		'selected'     => get_option( 'default_category' ),
+		'hierarchical' => true,
+	)
+);
 ?>
 </td>
 </tr>
@@ -80,11 +95,11 @@ $post_formats = get_post_format_strings();
 unset( $post_formats['standard'] );
 ?>
 <tr>
-<th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
+<th scope="row"><label for="default_post_format"><?php _e( 'Default Post Format' ); ?></label></th>
 <td>
 	<select name="default_post_format" id="default_post_format">
 		<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
-<?php foreach ( $post_formats as $format_slug => $format_name ): ?>
+<?php foreach ( $post_formats as $format_slug => $format_name ) : ?>
 		<option<?php selected( get_option( 'default_post_format' ), $format_slug ); ?> value="<?php echo esc_attr( $format_slug ); ?>"><?php echo esc_html( $format_name ); ?></option>
 <?php endforeach; ?>
 	</select>
@@ -94,18 +109,27 @@ unset( $post_formats['standard'] );
 if ( get_option( 'link_manager_enabled' ) ) :
 ?>
 <tr>
-<th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
+<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'));
+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; ?>
 
 <?php
-do_settings_fields('writing', 'default');
-do_settings_fields('writing', 'remote_publishing'); // A deprecated section.
+do_settings_fields( 'writing', 'default' );
+do_settings_fields( 'writing', 'remote_publishing' ); // A deprecated section.
 ?>
 </table>
 
@@ -113,8 +137,9 @@ do_settings_fields('writing', 'remote_publishing'); // A deprecated section.
 /** 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
+<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.' ),
@@ -122,35 +147,44 @@ printf(
 	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) ),
 	sprintf( '<kbd>%s</kbd>', wp_generate_password( 8, false ) )
 );
-?></p>
+?>
+</p>
 
 <table class="form-table">
 <tr>
-<th scope="row"><label for="mailserver_url"><?php _e('Mail Server') ?></label></th>
-<td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" class="regular-text code" />
-<label for="mailserver_port"><?php _e('Port') ?></label>
-<input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" class="small-text" />
+<th scope="row"><label for="mailserver_url"><?php _e( 'Mail Server' ); ?></label></th>
+<td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option( 'mailserver_url' ); ?>" class="regular-text code" />
+<label for="mailserver_port"><?php _e( 'Port' ); ?></label>
+<input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option( 'mailserver_port' ); ?>" class="small-text" />
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="mailserver_login"><?php _e('Login Name') ?></label></th>
-<td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" class="regular-text ltr" /></td>
+<th scope="row"><label for="mailserver_login"><?php _e( 'Login Name' ); ?></label></th>
+<td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option( 'mailserver_login' ); ?>" class="regular-text ltr" /></td>
 </tr>
 <tr>
-<th scope="row"><label for="mailserver_pass"><?php _e('Password') ?></label></th>
+<th scope="row"><label for="mailserver_pass"><?php _e( 'Password' ); ?></label></th>
 <td>
-<input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option('mailserver_pass'); ?>" class="regular-text ltr" />
+<input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option( 'mailserver_pass' ); ?>" class="regular-text ltr" />
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="default_email_category"><?php _e('Default Mail Category') ?></label></th>
+<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));
+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 } ?>
 
@@ -164,35 +198,39 @@ wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_email_categor
  */
 if ( apply_filters( 'enable_update_services_configuration', true ) ) {
 ?>
-<h2 class="title"><?php _e( 'Update Services' ) ?></h2>
+<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
+	<p><label for="ping_sites">
+	<?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>
+	?>
+	</label></p>
 
-	<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
+	<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option( 'ping_sites' ) ); ?></textarea>
 
 <?php else : ?>
 
-	<p><?php
+	<p>
+	<?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>
+	?>
+	</p>
 
 <?php endif; ?>
 <?php } // enable_update_services_configuration ?>
 
-<?php do_settings_sections('writing'); ?>
+<?php do_settings_sections( 'writing' ); ?>
 
 <?php submit_button(); ?>
 </form>
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 3124017e9d..b2ecfc816e 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -18,16 +18,16 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-$title = __('Settings');
-$this_file = 'options.php';
+$title       = __( 'Settings' );
+$this_file   = 'options.php';
 $parent_file = 'options-general.php';
 
-wp_reset_vars(array('action', 'option_page'));
+wp_reset_vars( array( 'action', 'option_page' ) );
 
 $capability = 'manage_options';
 
 // This is for back compat and will eventually be removed.
-if ( empty($option_page) ) {
+if ( empty( $option_page ) ) {
 	$option_page = 'options';
 } else {
 
@@ -53,11 +53,11 @@ if ( ! current_user_can( $capability ) ) {
 }
 
 // Handle admin email change requests
-if ( ! empty( $_GET[ 'adminhash' ] ) ) {
+if ( ! empty( $_GET['adminhash'] ) ) {
 	$new_admin_details = get_option( 'adminhash' );
-	$redirect = 'options-general.php?updated=false';
-	if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'adminhash' ] ) && ! empty( $new_admin_details[ 'newemail' ] ) ) {
-		update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
+	$redirect          = 'options-general.php?updated=false';
+	if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details['hash'], $_GET['adminhash'] ) && ! empty( $new_admin_details['newemail'] ) ) {
+		update_option( 'admin_email', $new_admin_details['newemail'] );
 		delete_option( 'adminhash' );
 		delete_option( 'new_admin_email' );
 		$redirect = 'options-general.php?updated=true';
@@ -80,41 +80,44 @@ if ( is_multisite() && ! current_user_can( 'manage_network_options' ) && 'update
 	);
 }
 
-$whitelist_options = array(
-	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG', 'new_admin_email' ),
+$whitelist_options         = array(
+	'general'    => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG', 'new_admin_email' ),
 	'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
-	'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
-	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
-	'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )
+	'media'      => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
+	'reading'    => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
+	'writing'    => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' ),
 );
 $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
 
-$mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
+$mail_options = array( 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass' );
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	$whitelist_options['reading'][] = 'blog_charset';
+}
 
 if ( get_site_option( 'initial_db_version' ) < 32453 ) {
 	$whitelist_options['writing'][] = 'use_smilies';
 	$whitelist_options['writing'][] = 'use_balanceTags';
 }
 
-if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
+if ( ! is_multisite() ) {
+	if ( ! defined( 'WP_SITEURL' ) ) {
 		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
+	}
+	if ( ! defined( 'WP_HOME' ) ) {
 		$whitelist_options['general'][] = 'home';
+	}
 
 	$whitelist_options['general'][] = 'users_can_register';
 	$whitelist_options['general'][] = 'default_role';
 
-	$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+	$whitelist_options['writing']   = array_merge( $whitelist_options['writing'], $mail_options );
 	$whitelist_options['writing'][] = 'ping_sites';
 
 	$whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
 	// If upload_url_path and upload_path are both default values, they're locked.
-	if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
+	if ( get_option( 'upload_url_path' ) || ( get_option( 'upload_path' ) != 'wp-content/uploads' && get_option( 'upload_path' ) ) ) {
 		$whitelist_options['media'][] = 'upload_path';
 		$whitelist_options['media'][] = 'upload_url_path';
 	}
@@ -126,8 +129,9 @@ if ( !is_multisite() ) {
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
-		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+	if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+		$whitelist_options['writing'] = array_merge( $whitelist_options['writing'], $mail_options );
+	}
 }
 
 /**
@@ -143,7 +147,7 @@ $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
  * If $_GET['action'] == 'update' we are saving settings sent from a settings page
  */
 if ( 'update' == $action ) {
-	if ( 'options' == $option_page && !isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
+	if ( 'options' == $option_page && ! isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
 		$unregistered = true;
 		check_admin_referer( 'update-options' );
 	} else {
@@ -151,28 +155,31 @@ if ( 'update' == $action ) {
 		check_admin_referer( $option_page . '-options' );
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
+	if ( ! isset( $whitelist_options[ $option_page ] ) ) {
 		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	}
 
 	if ( 'options' == $option_page ) {
 		if ( is_multisite() && ! current_user_can( 'manage_network_options' ) ) {
 			wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
 		}
-		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
+		$options = explode( ',', wp_unslash( $_POST['page_options'] ) );
 	} else {
 		$options = $whitelist_options[ $option_page ];
 	}
 
 	if ( 'general' == $option_page ) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
+		if ( ! empty( $_POST['date_format'] ) && isset( $_POST['date_format_custom'] ) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) ) {
 			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
+		}
+		if ( ! empty( $_POST['time_format'] ) && isset( $_POST['time_format_custom'] ) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) ) {
 			$_POST['time_format'] = $_POST['time_format_custom'];
+		}
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
-		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
-			$_POST['gmt_offset'] = $_POST['timezone_string'];
-			$_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
+		if ( ! empty( $_POST['timezone_string'] ) && preg_match( '/^UTC[+-]/', $_POST['timezone_string'] ) ) {
+			$_POST['gmt_offset']      = $_POST['timezone_string'];
+			$_POST['gmt_offset']      = preg_replace( '/UTC\+?/', '', $_POST['gmt_offset'] );
 			$_POST['timezone_string'] = '';
 		}
 
@@ -192,7 +199,8 @@ if ( 'update' == $action ) {
 
 		foreach ( $options as $option ) {
 			if ( $unregistered ) {
-				_deprecated_argument( 'options.php', '2.7.0',
+				_deprecated_argument(
+					'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' ),
@@ -202,7 +210,7 @@ if ( 'update' == $action ) {
 			}
 
 			$option = trim( $option );
-			$value = null;
+			$value  = null;
 			if ( isset( $_POST[ $option ] ) ) {
 				$value = $_POST[ $option ];
 				if ( ! is_array( $value ) ) {
@@ -220,7 +228,7 @@ if ( 'update' == $action ) {
 		 */
 		unset( $GLOBALS['locale'] );
 		$user_language_new = get_user_locale();
-		if ( $user_language_old !== $user_language_new  ) {
+		if ( $user_language_old !== $user_language_new ) {
 			load_default_textdomain( $user_language_new );
 		}
 	}
@@ -229,14 +237,15 @@ if ( 'update' == $action ) {
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
-		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
-	set_transient('settings_errors', get_settings_errors(), 30);
+	if ( ! count( get_settings_errors() ) ) {
+		add_settings_error( 'general', 'settings_updated', __( 'Settings saved.' ), 'updated' );
+	}
+	set_transient( 'settings_errors', get_settings_errors(), 30 );
 
 	/**
 	 * Redirect back to the settings page that was submitted
 	 */
-	$goback = add_query_arg( 'settings-updated', 'true',  wp_get_referer() );
+	$goback = add_query_arg( 'settings-updated', 'true', wp_get_referer() );
 	wp_redirect( $goback );
 	exit;
 }
@@ -246,7 +255,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 <div class="wrap">
 	<h1><?php esc_html_e( 'All Settings' ); ?></h1>
 	<form name="form" action="options.php" method="post" id="all-options">
-		<?php wp_nonce_field('options-options') ?>
+		<?php wp_nonce_field( 'options-options' ); ?>
 		<input type="hidden" name="action" value="update" />
 		<input type="hidden" name="option_page" value="options" />
 		<table class="form-table">
@@ -255,35 +264,38 @@ $options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_nam
 
 foreach ( (array) $options as $option ) :
 	$disabled = false;
-	if ( $option->option_name == '' )
+	if ( $option->option_name == '' ) {
 		continue;
+	}
 	if ( is_serialized( $option->option_value ) ) {
 		if ( is_serialized_string( $option->option_value ) ) {
 			// This is a serialized string, so we should display it.
-			$value = maybe_unserialize( $option->option_value );
+			$value               = maybe_unserialize( $option->option_value );
 			$options_to_update[] = $option->option_name;
-			$class = 'all-options';
+			$class               = 'all-options';
 		} else {
-			$value = 'SERIALIZED DATA';
+			$value    = 'SERIALIZED DATA';
 			$disabled = true;
-			$class = 'all-options disabled';
+			$class    = 'all-options disabled';
 		}
 	} else {
-		$value = $option->option_value;
+		$value               = $option->option_value;
 		$options_to_update[] = $option->option_name;
-		$class = 'all-options';
+		$class               = 'all-options';
 	}
 	$name = esc_attr( $option->option_name );
 	?>
 <tr>
-	<th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
+	<th scope="row"><label for="<?php echo $name; ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
 <td>
 <?php if ( strpos( $value, "\n" ) !== false ) : ?>
-	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
-		echo esc_textarea( $value );
-	?></textarea>
-	<?php else: ?>
-		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
+	<textarea class="<?php echo $class; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>" cols="30" rows="5">
+								<?php
+								echo esc_textarea( $value );
+	?>
+	</textarea>
+	<?php else : ?>
+		<input class="regular-text <?php echo $class; ?>" type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr( $value ); ?>"<?php disabled( $disabled, true ); ?> />
 	<?php endif ?></td>
 </tr>
 <?php endforeach; ?>
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index 783194bddd..341f9884fe 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -14,10 +14,11 @@ if ( is_multisite() && ! is_network_admin() ) {
 	exit();
 }
 
-if ( !current_user_can('edit_plugins') )
-	wp_die( __('Sorry, you are not allowed to edit plugins for this site.') );
+if ( ! current_user_can( 'edit_plugins' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to edit plugins for this site.' ) );
+}
 
-$title = __("Edit Plugins");
+$title       = __( 'Edit Plugins' );
 $parent_file = 'plugins.php';
 
 $plugins = get_plugins();
@@ -34,7 +35,7 @@ if ( empty( $plugins ) ) {
 	exit;
 }
 
-$file = '';
+$file   = '';
 $plugin = '';
 if ( isset( $_REQUEST['file'] ) ) {
 	$file = wp_unslash( $_REQUEST['file'] );
@@ -66,17 +67,17 @@ if ( empty( $plugin ) ) {
 	}
 }
 
-$plugin_files = get_plugin_files($plugin);
+$plugin_files = get_plugin_files( $plugin );
 
 if ( empty( $file ) ) {
 	$file = $plugin_files[0];
 }
 
-$file = validate_file_to_edit($file, $plugin_files);
+$file      = validate_file_to_edit( $file, $plugin_files );
 $real_file = WP_PLUGIN_DIR . '/' . $file;
 
 // Handle fallback editing of file when JavaScript is not available.
-$edit_error = null;
+$edit_error     = null;
 $posted_content = null;
 if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 	$r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );
@@ -86,14 +87,16 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 			$posted_content = wp_unslash( $_POST['newcontent'] );
 		}
 	} else {
-		wp_redirect( add_query_arg(
-			array(
-				'a' => 1, // This means "success" for some reason.
-				'plugin' => $plugin,
-				'file' => $file,
-			),
-			admin_url( 'plugin-editor.php' )
-		) );
+		wp_redirect(
+			add_query_arg(
+				array(
+					'a'      => 1, // This means "success" for some reason.
+					'plugin' => $plugin,
+					'file'   => $file,
+				),
+				admin_url( 'plugin-editor.php' )
+			)
+		);
 		exit;
 	}
 }
@@ -101,40 +104,43 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 	// List of allowable extensions
 	$editable_extensions = wp_get_plugin_file_editable_extensions( $plugin );
 
-	if ( ! is_file($real_file) ) {
-		wp_die(sprintf('<p>%s</p>', __('No such file exists! Double check the name and try again.')));
-	} else {
-		// Get the extension of the file
-		if ( preg_match('/\.([^.]+)$/', $real_file, $matches) ) {
-			$ext = strtolower($matches[1]);
-			// If extension is not in the acceptable list, skip it
-			if ( !in_array( $ext, $editable_extensions) )
-				wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
+if ( ! is_file( $real_file ) ) {
+	wp_die( sprintf( '<p>%s</p>', __( 'No such file exists! Double check the name and try again.' ) ) );
+} else {
+	// Get the extension of the file
+	if ( preg_match( '/\.([^.]+)$/', $real_file, $matches ) ) {
+		$ext = strtolower( $matches[1] );
+		// If extension is not in the acceptable list, skip it
+		if ( ! in_array( $ext, $editable_extensions ) ) {
+			wp_die( sprintf( '<p>%s</p>', __( 'Files of this type are not editable.' ) ) );
 		}
 	}
+}
 
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'overview',
-	'title'		=> __('Overview'),
-	'content'	=>
-		'<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '</p>' .
-		'<p>' . __('Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
-		'<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.') . '</p>' .
-		'<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>' .
-		'<ul>' .
-		'<li id="editor-keyboard-trap-help-2">' . __( 'In the editing area, the Tab key enters a tab character.' ) . '</li>' .
-		'<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>' .
-		'<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>' .
-		'</ul>' .
-		'<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.') . '</p>' .
-		( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' =>
+					 '<p>' . __( 'You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.' ) . '</p>' .
+					 '<p>' . __( 'Choose a plugin to edit from the dropdown menu and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.' ) . '</p>' .
+					 '<p>' . __( 'The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.' ) . '</p>' .
+					 '<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>' .
+					 '<ul>' .
+					 '<li id="editor-keyboard-trap-help-2">' . __( 'In the editing area, the Tab key enters a tab character.' ) . '</li>' .
+					 '<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>' .
+					 '<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>' .
+					 '</ul>' .
+					 '<p>' . __( 'If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.' ) . '</p>' .
+					 ( is_network_admin() ? '<p>' . __( 'Any edits to files from this screen will be reflected on all sites in the network.' ) . '</p>' : '' ),
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Editor_Screen">Documentation on Editing Plugins</a>') . '</p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Writing_a_Plugin">Documentation on Writing Plugins</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/Plugins_Editor_Screen">Documentation on Editing Plugins</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://codex.wordpress.org/Writing_a_Plugin">Documentation on Writing Plugins</a>' ) . '</p>' .
+		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 
 	$settings = array(
@@ -144,9 +150,9 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 	wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'jQuery( function( $ ) { wp.themePluginEditor.init( $( "#template" ), %s ); } )', wp_json_encode( $settings ) ) );
 	wp_add_inline_script( 'wp-theme-plugin-editor', sprintf( 'wp.themePluginEditor.themeOrPlugin = "plugin";' ) );
 
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
+	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-	update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
+	update_recently_edited( WP_PLUGIN_DIR . '/' . $file );
 
 	if ( ! empty( $posted_content ) ) {
 		$content = $posted_content;
@@ -157,10 +163,10 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 	if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
 		$functions = wp_doc_link_parse( $content );
 
-		if ( !empty($functions) ) {
-			$docs_select = '<select name="docs-list" id="docs-list">';
+		if ( ! empty( $functions ) ) {
+			$docs_select  = '<select name="docs-list" id="docs-list">';
 			$docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';
-			foreach ( $functions as $function) {
+			foreach ( $functions as $function ) {
 				$docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';
 			}
 			$docs_select .= '</select>';
@@ -209,19 +215,20 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 </div>
 <div class="alignright">
 	<form action="plugin-editor.php" method="get">
-		<strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong>
+		<strong><label for="plugin"><?php _e( 'Select plugin to edit:' ); ?> </label></strong>
 		<select name="plugin" id="plugin">
 <?php
-	foreach ( $plugins as $plugin_key => $a_plugin ) {
-		$plugin_name = $a_plugin['Name'];
-		if ( $plugin_key == $plugin )
-			$selected = " selected='selected'";
-		else
-			$selected = '';
-		$plugin_name = esc_attr($plugin_name);
-		$plugin_key = esc_attr($plugin_key);
-		echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
+foreach ( $plugins as $plugin_key => $a_plugin ) {
+	$plugin_name = $a_plugin['Name'];
+	if ( $plugin_key == $plugin ) {
+		$selected = " selected='selected'";
+	} else {
+		$selected = '';
 	}
+	$plugin_name = esc_attr( $plugin_name );
+	$plugin_key  = esc_attr( $plugin_key );
+	echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
+}
 ?>
 		</select>
 		<?php submit_button( __( 'Select' ), '', 'Submit', false ); ?>
@@ -236,7 +243,7 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 	<?php
 	$plugin_editable_files = array();
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( preg_match('/\.([^.]+)$/', $plugin_file, $matches ) && in_array( $matches[1], $editable_extensions ) ) {
+		if ( preg_match( '/\.([^.]+)$/', $plugin_file, $matches ) && in_array( $matches[1], $editable_extensions ) ) {
 			$plugin_editable_files[] = $plugin_file;
 		}
 	}
@@ -257,14 +264,14 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 			<input type="hidden" name="file" value="<?php echo esc_attr( $file ); ?>" />
 			<input type="hidden" name="plugin" value="<?php echo esc_attr( $plugin ); ?>" />
 		</div>
-		<?php if ( !empty( $docs_select ) ) : ?>
-		<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" /></div>
+		<?php if ( ! empty( $docs_select ) ) : ?>
+		<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e( 'Documentation:' ); ?></label> <?php echo $docs_select; ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ); ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&amp;redirect=true'); }" /></div>
 		<?php endif; ?>
-<?php if ( is_writeable($real_file) ) : ?>
+<?php if ( is_writeable( $real_file ) ) : ?>
 	<div class="editor-notices">
 		<?php if ( in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) ) { ?>
 			<div class="notice notice-warning inline active-plugin-edit-warning">
-			<p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended.'); ?></p>
+			<p><?php _e( '<strong>Warning:</strong> Making changes to active plugins is not recommended.' ); ?></p>
 		</div>
 		<?php } ?>
 	</div>
@@ -273,7 +280,7 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 		<span class="spinner"></span>
 	</p>
 <?php else : ?>
-	<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
+	<p><em><?php _e( 'You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.' ); ?></em></p>
 <?php endif; ?>
 <?php wp_print_file_editor_templates(); ?>
 </form>
@@ -283,7 +290,7 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 $dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
 if ( ! in_array( 'plugin_editor_notice', $dismissed_pointers, true ) ) :
 	// Get a back URL
-	$referer = wp_get_referer();
+	$referer                    = wp_get_referer();
 	$excluded_referer_basenames = array( 'plugin-editor.php', 'wp-login.php' );
 
 	if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
@@ -311,4 +318,4 @@ if ( ! in_array( 'plugin_editor_notice', $dismissed_pointers, true ) ) :
 <?php
 endif; // editor warning notice
 
-include(ABSPATH . "wp-admin/admin-footer.php");
+include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index 855beb613d..fe5f414cd1 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -6,24 +6,26 @@
  * @subpackage Administration
  */
 // TODO route this pages via a specific iframe handler instead of the do_action below
-if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /**
  * WordPress Administration Bootstrap.
  */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('install_plugins') )
-	wp_die(__('Sorry, you are not allowed to install plugins on this site.'));
+if ( ! current_user_can( 'install_plugins' ) ) {
+	wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+}
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'plugin-install.php' ) );
 	exit();
 }
 
-$wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_Plugin_Install_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 
 if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
 	$location = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
@@ -45,12 +47,13 @@ if ( $pagenum > $total_pages && $total_pages > 0 ) {
 	exit;
 }
 
-$title = __( 'Add Plugins' );
+$title       = __( 'Add Plugins' );
 $parent_file = 'plugins.php';
 
 wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
+if ( 'plugin-information' != $tab ) {
 	add_thickbox();
+}
 
 $body_id = $tab;
 
@@ -75,49 +78,58 @@ if ( 'upload' !== $tab ) {
 	do_action( 'install_plugins_pre_upload' );
 }
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . sprintf( __('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s">WordPress Plugin Directory</a> are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/plugins/' ) ) . '</p>' .
-	'<p>' . __( 'You can find new plugins to install by searching or browsing the directory right here in your own Plugins section.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				 '<p>' . sprintf( __( 'Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s">WordPress Plugin Directory</a> are compatible with the license WordPress uses.' ), __( 'https://wordpress.org/plugins/' ) ) . '</p>' .
+				 '<p>' . __( 'You can find new plugins to install by searching or browsing the directory right here in your own Plugins section.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>',
 
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'adding-plugins',
-'title'		=> __('Adding Plugins'),
-'content'	=>
-	'<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
-	'<p>' . __( 'If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links above the plugins list. These sections rotate regularly.' ) . '</p>' .
-	'<p>' . __( 'You can also browse a user&#8217;s favorite plugins, by using the Favorites link above the plugins list and entering their WordPress.org username.' ) . '</p>' .
-	'<p>' . __( 'If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload Plugin button above the plugins list. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.' ) . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Add_New_Screen">Documentation on Installing Plugins</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'adding-plugins',
+		'title'   => __( 'Adding Plugins' ),
+		'content' =>
+				 '<p>' . __( 'If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.' ) . '</p>' .
+				 '<p>' . __( 'If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links above the plugins list. These sections rotate regularly.' ) . '</p>' .
+				 '<p>' . __( 'You can also browse a user&#8217;s favorite plugins, by using the Favorites link above the plugins list and entering their WordPress.org username.' ) . '</p>' .
+				 '<p>' . __( 'If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload Plugin button above the plugins list. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.' ) . '</p>',
+	)
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter plugins list' ),
-	'heading_pagination' => __( 'Plugins list navigation' ),
-	'heading_list'       => __( 'Plugins list' ),
-) );
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Plugins_Add_New_Screen">Documentation on Installing Plugins</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+);
+
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter plugins list' ),
+		'heading_pagination' => __( 'Plugins list navigation' ),
+		'heading_list'       => __( 'Plugins list' ),
+	)
+);
 
 /**
  * WordPress Administration Template Header.
  */
-include(ABSPATH . 'wp-admin/admin-header.php');
+include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 <div class="wrap <?php echo esc_attr( "plugin-install-tab-$tab" ); ?>">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?php
 if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
-	printf( ' <a href="%s" class="upload-view-toggle page-title-action"><span class="upload">%s</span><span class="browse">%s</span></a>',
+	printf(
+		' <a href="%s" class="upload-view-toggle page-title-action"><span class="upload">%s</span><span class="browse">%s</span></a>',
 		( 'upload' === $tab ) ? self_admin_url( 'plugin-install.php' ) : self_admin_url( 'plugin-install.php?tab=upload' ),
 		__( 'Upload Plugin' ),
 		__( 'Browse Plugins' )
@@ -155,7 +167,8 @@ if ( 'upload' !== $tab ) {
  *
  * @param int $paged The current page number of the plugins list table.
  */
-do_action( "install_plugins_{$tab}", $paged ); ?>
+do_action( "install_plugins_{$tab}", $paged );
+?>
 
 	<span class="spinner"></span>
 </div>
@@ -167,4 +180,4 @@ wp_print_admin_notice_templates();
 /**
  * WordPress Administration Template Footer.
  */
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index b92a7964e6..271f13de8f 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -9,19 +9,20 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('activate_plugins') )
+if ( ! current_user_can( 'activate_plugins' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage plugins for this site.' ) );
+}
 
-$wp_list_table = _get_list_table('WP_Plugins_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 
 $action = $wp_list_table->current_action();
 
-$plugin = isset($_REQUEST['plugin']) ? wp_unslash( $_REQUEST['plugin'] ) : '';
-$s = isset($_REQUEST['s']) ? urlencode( wp_unslash( $_REQUEST['s'] ) ) : '';
+$plugin = isset( $_REQUEST['plugin'] ) ? wp_unslash( $_REQUEST['plugin'] ) : '';
+$s      = isset( $_REQUEST['s'] ) ? urlencode( wp_unslash( $_REQUEST['s'] ) ) : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
-$_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
+$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce' ), $_SERVER['REQUEST_URI'] );
 
 wp_enqueue_script( 'updates' );
 
@@ -34,20 +35,20 @@ if ( $action ) {
 			}
 
 			if ( is_multisite() && ! is_network_admin() && is_network_only_plugin( $plugin ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+				wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );
 				exit;
 			}
 
-			check_admin_referer('activate-plugin_' . $plugin);
+			check_admin_referer( 'activate-plugin_' . $plugin );
 
-			$result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin() );
+			$result = activate_plugin( $plugin, self_admin_url( 'plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin() );
 			if ( is_wp_error( $result ) ) {
 				if ( 'unexpected_output' == $result->get_error_code() ) {
-					$redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . urlencode( $plugin ) . "&plugin_status=$status&paged=$page&s=$s");
-					wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
+					$redirect = self_admin_url( 'plugins.php?error=true&charsout=' . strlen( $result->get_error_data() ) . '&plugin=' . urlencode( $plugin ) . "&plugin_status=$status&paged=$page&s=$s" );
+					wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) );
 					exit;
 				} else {
-					wp_die($result);
+					wp_die( $result );
 				}
 			}
 
@@ -61,20 +62,21 @@ if ( $action ) {
 				update_site_option( 'recently_activated', $recent );
 			}
 
-			if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
-				wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
-			} else if ( isset($_GET['from']) && 'press-this' == $_GET['from'] ) {
-				wp_redirect( self_admin_url( "press-this.php") );
+			if ( isset( $_GET['from'] ) && 'import' == $_GET['from'] ) {
+				wp_redirect( self_admin_url( 'import.php?import=' . str_replace( '-importer', '', dirname( $plugin ) ) ) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
+			} elseif ( isset( $_GET['from'] ) && 'press-this' == $_GET['from'] ) {
+				wp_redirect( self_admin_url( 'press-this.php' ) );
 			} else {
-				wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
+				wp_redirect( self_admin_url( "plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s" ) ); // overrides the ?error=true one above
 			}
 			exit;
 
 		case 'activate-selected':
-			if ( ! current_user_can('activate_plugins') )
-				wp_die(__('Sorry, you are not allowed to activate plugins for this site.'));
+			if ( ! current_user_can( 'activate_plugins' ) ) {
+				wp_die( __( 'Sorry, you are not allowed to activate plugins for this site.' ) );
+			}
 
-			check_admin_referer('bulk-plugins');
+			check_admin_referer( 'bulk-plugins' );
 
 			$plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
 
@@ -98,17 +100,17 @@ if ( $action ) {
 				}
 			}
 
-			if ( empty($plugins) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if ( empty( $plugins ) ) {
+				wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );
 				exit;
 			}
 
-			activate_plugins($plugins, self_admin_url('plugins.php?error=true'), is_network_admin() );
+			activate_plugins( $plugins, self_admin_url( 'plugins.php?error=true' ), is_network_admin() );
 
 			if ( ! is_network_admin() ) {
-				$recent = (array) get_option('recently_activated' );
+				$recent = (array) get_option( 'recently_activated' );
 			} else {
-				$recent = (array) get_site_option('recently_activated' );
+				$recent = (array) get_site_option( 'recently_activated' );
 			}
 
 			foreach ( $plugins as $plugin ) {
@@ -121,35 +123,35 @@ if ( $action ) {
 				update_site_option( 'recently_activated', $recent );
 			}
 
-			wp_redirect( self_admin_url("plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+			wp_redirect( self_admin_url( "plugins.php?activate-multi=true&plugin_status=$status&paged=$page&s=$s" ) );
 			exit;
 
-		case 'update-selected' :
-
+		case 'update-selected':
 			check_admin_referer( 'bulk-plugins' );
 
-			if ( isset( $_GET['plugins'] ) )
+			if ( isset( $_GET['plugins'] ) ) {
 				$plugins = explode( ',', wp_unslash( $_GET['plugins'] ) );
-			elseif ( isset( $_POST['checked'] ) )
+			} elseif ( isset( $_POST['checked'] ) ) {
 				$plugins = (array) wp_unslash( $_POST['checked'] );
-			else
+			} else {
 				$plugins = array();
+			}
 
-			$title = __( 'Update Plugins' );
+			$title       = __( 'Update Plugins' );
 			$parent_file = 'plugins.php';
 
 			wp_enqueue_script( 'updates' );
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+			require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 			echo '<div class="wrap">';
 			echo '<h1>' . esc_html( $title ) . '</h1>';
 
-			$url = self_admin_url('update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) ));
-			$url = wp_nonce_url($url, 'bulk-update-plugins');
+			$url = self_admin_url( 'update.php?action=update-selected&amp;plugins=' . urlencode( join( ',', $plugins ) ) );
+			$url = wp_nonce_url( $url, 'bulk-update-plugins' );
 
 			echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
 			echo '</div>';
-			require_once(ABSPATH . 'wp-admin/admin-footer.php');
+			require_once( ABSPATH . 'wp-admin/admin-footer.php' );
 			exit;
 
 		case 'error_scrape':
@@ -157,17 +159,18 @@ if ( $action ) {
 				wp_die( __( 'Sorry, you are not allowed to activate this plugin.' ) );
 			}
 
-			check_admin_referer('plugin-activation-error_' . $plugin);
+			check_admin_referer( 'plugin-activation-error_' . $plugin );
 
-			$valid = validate_plugin($plugin);
-			if ( is_wp_error($valid) )
-				wp_die($valid);
+			$valid = validate_plugin( $plugin );
+			if ( is_wp_error( $valid ) ) {
+				wp_die( $valid );
+			}
 
 			if ( ! WP_DEBUG ) {
 				error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 			}
 
-			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
+			@ini_set( 'display_errors', true ); //Ensure that Fatal errors are displayed.
 			// Go back to "sandbox" scope so we get the same errors as before
 			plugin_sandbox_scrape( $plugin );
 			/** This action is documented in wp-admin/includes/plugin.php */
@@ -179,10 +182,10 @@ if ( $action ) {
 				wp_die( __( 'Sorry, you are not allowed to deactivate this plugin.' ) );
 			}
 
-			check_admin_referer('deactivate-plugin_' . $plugin);
+			check_admin_referer( 'deactivate-plugin_' . $plugin );
 
 			if ( ! is_network_admin() && is_plugin_active_for_network( $plugin ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+				wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );
 				exit;
 			}
 
@@ -194,18 +197,19 @@ if ( $action ) {
 				update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
 			}
 
-			if ( headers_sent() )
+			if ( headers_sent() ) {
 				echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
-			else
-				wp_redirect( self_admin_url("plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s") );
+			} else {
+				wp_redirect( self_admin_url( "plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) );
+			}
 			exit;
 
 		case 'deactivate-selected':
 			if ( ! current_user_can( 'deactivate_plugins' ) ) {
-				wp_die(__('Sorry, you are not allowed to deactivate plugins for this site.'));
+				wp_die( __( 'Sorry, you are not allowed to deactivate plugins for this site.' ) );
 			}
 
-			check_admin_referer('bulk-plugins');
+			check_admin_referer( 'bulk-plugins' );
 
 			$plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
 			// Do not deactivate plugins which are already deactivated.
@@ -221,10 +225,9 @@ if ( $action ) {
 						unset( $plugins[ $i ] );
 					}
 				}
-
 			}
-			if ( empty($plugins) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+			if ( empty( $plugins ) ) {
+				wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );
 				exit;
 			}
 
@@ -241,24 +244,24 @@ if ( $action ) {
 				update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
 			}
 
-			wp_redirect( self_admin_url("plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s") );
+			wp_redirect( self_admin_url( "plugins.php?deactivate-multi=true&plugin_status=$status&paged=$page&s=$s" ) );
 			exit;
 
 		case 'delete-selected':
-			if ( ! current_user_can('delete_plugins') ) {
-				wp_die(__('Sorry, you are not allowed to delete plugins for this site.'));
+			if ( ! current_user_can( 'delete_plugins' ) ) {
+				wp_die( __( 'Sorry, you are not allowed to delete plugins for this site.' ) );
 			}
 
-			check_admin_referer('bulk-plugins');
+			check_admin_referer( 'bulk-plugins' );
 
 			//$_POST = from the plugin form; $_GET = from the FTP details screen.
 			$plugins = isset( $_REQUEST['checked'] ) ? (array) wp_unslash( $_REQUEST['checked'] ) : array();
 			if ( empty( $plugins ) ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+				wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );
 				exit;
 			}
 
-			$plugins = array_filter($plugins, 'is_plugin_inactive'); // Do not allow to delete Activated plugins.
+			$plugins = array_filter( $plugins, 'is_plugin_inactive' ); // Do not allow to delete Activated plugins.
 			if ( empty( $plugins ) ) {
 				wp_redirect( self_admin_url( "plugins.php?error=true&main=true&plugin_status=$status&paged=$page&s=$s" ) );
 				exit;
@@ -268,46 +271,46 @@ if ( $action ) {
 			// validate_file() returns truthy for invalid files
 			$invalid_plugin_files = array_filter( $plugins, 'validate_file' );
 			if ( $invalid_plugin_files ) {
-				wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+				wp_redirect( self_admin_url( "plugins.php?plugin_status=$status&paged=$page&s=$s" ) );
 				exit;
 			}
 
-			include(ABSPATH . 'wp-admin/update.php');
+			include( ABSPATH . 'wp-admin/update.php' );
 
 			$parent_file = 'plugins.php';
 
-			if ( ! isset($_REQUEST['verify-delete']) ) {
-				wp_enqueue_script('jquery');
-				require_once(ABSPATH . 'wp-admin/admin-header.php');
+			if ( ! isset( $_REQUEST['verify-delete'] ) ) {
+				wp_enqueue_script( 'jquery' );
+				require_once( ABSPATH . 'wp-admin/admin-header.php' );
 				?>
 			<div class="wrap">
 				<?php
-					$plugin_info = array();
+					$plugin_info              = array();
 					$have_non_network_plugins = false;
-					foreach ( (array) $plugins as $plugin ) {
-						$plugin_slug = dirname( $plugin );
+				foreach ( (array) $plugins as $plugin ) {
+					$plugin_slug = dirname( $plugin );
 
-						if ( '.' == $plugin_slug ) {
-							if ( $data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) ) {
-								$plugin_info[ $plugin ] = $data;
-								$plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
-								if ( ! $plugin_info[ $plugin ]['Network'] ) {
-									$have_non_network_plugins = true;
-								}
+					if ( '.' == $plugin_slug ) {
+						if ( $data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) ) {
+							$plugin_info[ $plugin ]                     = $data;
+							$plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
+							if ( ! $plugin_info[ $plugin ]['Network'] ) {
+								$have_non_network_plugins = true;
 							}
-						} else {
-							// Get plugins list from that folder.
-							if ( $folder_plugins = get_plugins( '/' . $plugin_slug ) ) {
-								foreach ( $folder_plugins as $plugin_file => $data ) {
-									$plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data );
-									$plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
-									if ( ! $plugin_info[ $plugin_file ]['Network'] ) {
-										$have_non_network_plugins = true;
-									}
+						}
+					} else {
+						// Get plugins list from that folder.
+						if ( $folder_plugins = get_plugins( '/' . $plugin_slug ) ) {
+							foreach ( $folder_plugins as $plugin_file => $data ) {
+								$plugin_info[ $plugin_file ]                     = _get_plugin_data_markup_translate( $plugin_file, $data );
+								$plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
+								if ( ! $plugin_info[ $plugin_file ]['Network'] ) {
+									$have_non_network_plugins = true;
 								}
 							}
 						}
 					}
+				}
 					$plugins_to_delete = count( $plugin_info );
 				?>
 				<?php if ( 1 == $plugins_to_delete ) : ?>
@@ -316,7 +319,7 @@ if ( $action ) {
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This plugin may be active on other sites in the network.' ); ?></p></div>
 					<?php endif; ?>
 					<p><?php _e( 'You are about to remove the following plugin:' ); ?></p>
-				<?php else: ?>
+				<?php else : ?>
 					<h1><?php _e( 'Delete Plugins' ); ?></h1>
 					<?php if ( $have_non_network_plugins && is_network_admin() ) : ?>
 						<div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These plugins may be active on other sites in the network.' ); ?></p></div>
@@ -333,26 +336,29 @@ if ( $action ) {
 								$data_to_delete = true;
 							} else {
 								/* translators: 1: plugin name, 2: plugin author */
-								echo '<li>', sprintf( _x('%1$s by %2$s', 'plugin' ), '<strong>' . $plugin['Name'] . '</strong>', '<em>' . $plugin['AuthorName'] ) . '</em>', '</li>';
+								echo '<li>', sprintf( _x( '%1$s by %2$s', 'plugin' ), '<strong>' . $plugin['Name'] . '</strong>', '<em>' . $plugin['AuthorName'] ) . '</em>', '</li>';
 							}
 						}
 						?>
 					</ul>
-				<p><?php
-				if ( $data_to_delete )
-					_e('Are you sure you wish to delete these files and data?');
-				else
-					_e('Are you sure you wish to delete these files?');
-				?></p>
-				<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
+				<p>
+				<?php
+				if ( $data_to_delete ) {
+					_e( 'Are you sure you wish to delete these files and data?' );
+				} else {
+					_e( 'Are you sure you wish to delete these files?' );
+				}
+				?>
+				</p>
+				<form method="post" action="<?php echo esc_url( $_SERVER['REQUEST_URI'] ); ?>" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
 					<input type="hidden" name="action" value="delete-selected" />
 					<?php
-						foreach ( (array) $plugins as $plugin ) {
-							echo '<input type="hidden" name="checked[]" value="' . esc_attr( $plugin ) . '" />';
-						}
+					foreach ( (array) $plugins as $plugin ) {
+						echo '<input type="hidden" name="checked[]" value="' . esc_attr( $plugin ) . '" />';
+					}
 					?>
-					<?php wp_nonce_field('bulk-plugins') ?>
+					<?php wp_nonce_field( 'bulk-plugins' ); ?>
 					<?php submit_button( $data_to_delete ? __( 'Yes, delete these files and data' ) : __( 'Yes, delete these files' ), '', 'submit', false ); ?>
 				</form>
 				<?php
@@ -363,7 +369,7 @@ if ( $action ) {
 				</form>
 			</div>
 				<?php
-				require_once(ABSPATH . 'wp-admin/admin-footer.php');
+				require_once( ABSPATH . 'wp-admin/admin-footer.php' );
 				exit;
 			} else {
 				$plugins_to_delete = count( $plugins );
@@ -371,8 +377,8 @@ if ( $action ) {
 
 			$delete_result = delete_plugins( $plugins );
 
-			set_transient('plugins_delete_result_' . $user_ID, $delete_result); //Store the result in a cache rather than a URL param due to object type & length
-			wp_redirect( self_admin_url("plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s") );
+			set_transient( 'plugins_delete_result_' . $user_ID, $delete_result ); //Store the result in a cache rather than a URL param due to object type & length
+			wp_redirect( self_admin_url( "plugins.php?deleted=$plugins_to_delete&plugin_status=$status&paged=$page&s=$s" ) );
 			exit;
 
 		case 'clear-recent-list':
@@ -385,8 +391,8 @@ if ( $action ) {
 
 		default:
 			if ( isset( $_POST['checked'] ) ) {
-				check_admin_referer('bulk-plugins');
-				$plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
+				check_admin_referer( 'bulk-plugins' );
+				$plugins  = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array();
 				$sendback = wp_get_referer();
 
 				/** This action is documented in wp-admin/edit-comments.php */
@@ -396,56 +402,61 @@ if ( $action ) {
 			}
 			break;
 	}
-
 }
 
 $wp_list_table->prepare_items();
 
-wp_enqueue_script('plugin-install');
+wp_enqueue_script( 'plugin-install' );
 add_thickbox();
 
 add_screen_option( 'per_page', array( 'default' => 999 ) );
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
-	'<p>' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
-	'<p>' . sprintf(
-		/* translators: %s: WordPress Plugin Directory URL */
-		__( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
-		__( 'https://wordpress.org/plugins/' )
-	) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'compatibility-problems',
-'title'		=> __('Troubleshooting'),
-'content'	=>
-	'<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>' .
-	'<p>' . sprintf(
-		/* translators: WP_PLUGIN_DIR constant value */
-		__( 'If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
-		'<code>' . WP_PLUGIN_DIR . '</code>'
-	) . '</p>'
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Managing_Plugins#Plugin_Management">Documentation on Managing Plugins</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				 '<p>' . __( 'Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.' ) . '</p>' .
+				 '<p>' . __( 'The search for installed plugins will search for terms in their name, description, or author.' ) . ' <span id="live-search-desc" class="hide-if-no-js">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
+				'<p>' . sprintf(
+					/* translators: %s: WordPress Plugin Directory URL */
+					 __( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
+					__( 'https://wordpress.org/plugins/' )
+				) . '</p>',
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'compatibility-problems',
+		'title'   => __( 'Troubleshooting' ),
+		'content' =>
+				 '<p>' . __( 'Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.' ) . '</p>' .
+				'<p>' . sprintf(
+					/* translators: WP_PLUGIN_DIR constant value */
+					 __( 'If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
+					'<code>' . WP_PLUGIN_DIR . '</code>'
+				) . '</p>',
+	)
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter plugins list' ),
-	'heading_pagination' => __( 'Plugins list navigation' ),
-	'heading_list'       => __( 'Plugins list' ),
-) );
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Managing_Plugins#Plugin_Management">Documentation on Managing Plugins</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+);
 
-$title = __('Plugins');
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter plugins list' ),
+		'heading_pagination' => __( 'Plugins list navigation' ),
+		'heading_list'       => __( 'Plugins list' ),
+	)
+);
+
+$title       = __( 'Plugins' );
 $parent_file = 'plugins.php';
 
-require_once(ABSPATH . 'wp-admin/admin-header.php');
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 $invalid = validate_active_plugins();
 if ( ! empty( $invalid ) ) {
@@ -455,42 +466,49 @@ if ( ! empty( $invalid ) ) {
 			/* translators: 1: plugin file 2: error message */
 			__( 'The plugin %1$s has been <strong>deactivated</strong> due to an error: %2$s' ),
 			'<code>' . esc_html( $plugin_file ) . '</code>',
-			$error->get_error_message() );
+			$error->get_error_message()
+		);
 		echo '</p></div>';
 	}
 }
 ?>
 
-<?php if ( isset($_GET['error']) ) :
+<?php
+if ( isset( $_GET['error'] ) ) :
 
-	if ( isset( $_GET['main'] ) )
+	if ( isset( $_GET['main'] ) ) {
 		$errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
-	elseif ( isset($_GET['charsout']) )
-		$errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
-	else
-		$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
+	} elseif ( isset( $_GET['charsout'] ) ) {
+		$errmsg = sprintf( __( 'The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.' ), $_GET['charsout'] );
+	} else {
+		$errmsg = __( 'Plugin could not be activated because it triggered a <strong>fatal error</strong>.' );
+	}
 	?>
 	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
 	<?php
-		if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) {
-			$iframe_url = add_query_arg( array(
+	if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) {
+		$iframe_url = add_query_arg(
+			array(
 				'action'   => 'error_scrape',
 				'plugin'   => urlencode( $plugin ),
 				'_wpnonce' => urlencode( $_GET['_error_nonce'] ),
-			), admin_url( 'plugins.php' ) );
-		?>
-		<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
+			), admin_url( 'plugins.php' )
+		);
+	?>
+	<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
 	<?php
-		}
+	}
 	?>
 	</div>
-<?php elseif ( isset($_GET['deleted']) ) :
+<?php
+elseif ( isset( $_GET['deleted'] ) ) :
 		$delete_result = get_transient( 'plugins_delete_result_' . $user_ID );
 		// Delete it once we're done.
 		delete_transient( 'plugins_delete_result_' . $user_ID );
 
-		if ( is_wp_error($delete_result) ) : ?>
-		<div id="message" class="error notice is-dismissible"><p><?php printf( __('Plugin could not be deleted due to an error: %s'), $delete_result->get_error_message() ); ?></p></div>
+	if ( is_wp_error( $delete_result ) ) :
+		?>
+		<div id="message" class="error notice is-dismissible"><p><?php printf( __( 'Plugin could not be deleted due to an error: %s' ), $delete_result->get_error_message() ); ?></p></div>
 		<?php else : ?>
 		<div id="message" class="updated notice is-dismissible">
 			<p>
@@ -504,25 +522,28 @@ if ( ! empty( $invalid ) ) {
 			</p>
 		</div>
 		<?php endif; ?>
-<?php elseif ( isset($_GET['activate']) ) : ?>
-	<div id="message" class="updated notice is-dismissible"><p><?php _e('Plugin <strong>activated</strong>.') ?></p></div>
-<?php elseif (isset($_GET['activate-multi'])) : ?>
-	<div id="message" class="updated notice is-dismissible"><p><?php _e('Selected plugins <strong>activated</strong>.'); ?></p></div>
-<?php elseif ( isset($_GET['deactivate']) ) : ?>
-	<div id="message" class="updated notice is-dismissible"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p></div>
-<?php elseif (isset($_GET['deactivate-multi'])) : ?>
-	<div id="message" class="updated notice is-dismissible"><p><?php _e('Selected plugins <strong>deactivated</strong>.'); ?></p></div>
+<?php elseif ( isset( $_GET['activate'] ) ) : ?>
+	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin <strong>activated</strong>.' ); ?></p></div>
+<?php elseif ( isset( $_GET['activate-multi'] ) ) : ?>
+	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Selected plugins <strong>activated</strong>.' ); ?></p></div>
+<?php elseif ( isset( $_GET['deactivate'] ) ) : ?>
+	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin <strong>deactivated</strong>.' ); ?></p></div>
+<?php elseif ( isset( $_GET['deactivate-multi'] ) ) : ?>
+	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'Selected plugins <strong>deactivated</strong>.' ); ?></p></div>
 <?php elseif ( 'update-selected' == $action ) : ?>
-	<div id="message" class="updated notice is-dismissible"><p><?php _e('All selected plugins are up to date.'); ?></p></div>
+	<div id="message" class="updated notice is-dismissible"><p><?php _e( 'All selected plugins are up to date.' ); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?php
-if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
+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
 }
@@ -559,8 +580,8 @@ do_action( 'pre_current_active_plugins', $plugins['all'] );
 
 <form method="post" id="bulk-action-form">
 
-<input type="hidden" name="plugin_status" value="<?php echo esc_attr($status) ?>" />
-<input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />
+<input type="hidden" name="plugin_status" value="<?php echo esc_attr( $status ); ?>" />
+<input type="hidden" name="paged" value="<?php echo esc_attr( $page ); ?>" />
 
 <?php $wp_list_table->display(); ?>
 </form>
@@ -573,4 +594,4 @@ wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 wp_print_update_row_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index 46e402ab0c..7c09650b85 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -18,7 +18,7 @@ global $post_type, $post_type_object, $post;
 
 if ( ! isset( $_GET['post_type'] ) ) {
 	$post_type = 'post';
-} elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) ) {
+} elseif ( in_array( $_GET['post_type'], get_post_types( array( 'show_ui' => true ) ) ) ) {
 	$post_type = $_GET['post_type'];
 } else {
 	wp_die( __( 'Invalid post type.' ) );
@@ -26,18 +26,19 @@ if ( ! isset( $_GET['post_type'] ) ) {
 $post_type_object = get_post_type_object( $post_type );
 
 if ( 'post' == $post_type ) {
-	$parent_file = 'edit.php';
+	$parent_file  = 'edit.php';
 	$submenu_file = 'post-new.php';
 } elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
+	if ( wp_redirect( admin_url( 'media-new.php' ) ) ) {
 		exit;
+	}
 } else {
 	$submenu_file = "post-new.php?post_type=$post_type";
 	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
 		$parent_file = $post_type_object->show_in_menu;
 		// What if there isn't a post-new.php item for this post type?
 		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
-			if (	isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
+			if ( isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
 				// Fall back to edit.php for that post type, if it exists
 				$submenu_file = "edit.php?post_type=$post_type";
 			} else {
@@ -67,7 +68,7 @@ if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
 	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
 }
 
-$post = get_default_post_to_edit( $post_type, true );
+$post    = get_default_post_to_edit( $post_type, true );
 $post_ID = $post->ID;
 
 /** This filter is documented in wp-admin/post.php */
diff --git a/wp-admin/post.php b/wp-admin/post.php
index cfae678cf8..7fe38636af 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -11,17 +11,18 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-$parent_file = 'edit.php';
+$parent_file  = 'edit.php';
 $submenu_file = 'edit.php';
 
 wp_reset_vars( array( 'action' ) );
 
-if ( isset( $_GET['post'] ) )
- 	$post_id = $post_ID = (int) $_GET['post'];
-elseif ( isset( $_POST['post_ID'] ) )
- 	$post_id = $post_ID = (int) $_POST['post_ID'];
-else
- 	$post_id = $post_ID = 0;
+if ( isset( $_GET['post'] ) ) {
+	$post_id = $post_ID = (int) $_GET['post'];
+} elseif ( isset( $_POST['post_ID'] ) ) {
+	$post_id = $post_ID = (int) $_POST['post_ID'];
+} else {
+	$post_id = $post_ID = 0;
+}
 
 /**
  * @global string  $post_type
@@ -30,18 +31,20 @@ else
  */
 global $post_type, $post_type_object, $post;
 
-if ( $post_id )
+if ( $post_id ) {
 	$post = get_post( $post_id );
+}
 
 if ( $post ) {
-	$post_type = $post->post_type;
+	$post_type        = $post->post_type;
 	$post_type_object = get_post_type_object( $post_type );
 }
 
-if ( isset( $_POST['deletepost'] ) )
+if ( isset( $_POST['deletepost'] ) ) {
 	$action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+} elseif ( isset( $_POST['wp-preview'] ) && 'dopreview' == $_POST['wp-preview'] ) {
 	$action = 'preview';
+}
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
@@ -56,238 +59,266 @@ if ( ! $sendback ||
 		}
 	}
 } else {
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+	$sendback = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'ids' ), $sendback );
 }
 
-switch($action) {
-case 'post-quickdraft-save':
-	// Check nonce and capabilities
-	$nonce = $_REQUEST['_wpnonce'];
-	$error_msg = false;
+switch ( $action ) {
+	case 'post-quickdraft-save':
+		// Check nonce and capabilities
+		$nonce     = $_REQUEST['_wpnonce'];
+		$error_msg = false;
 
-	// For output of the quickdraft dashboard widget
-	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+		// For output of the quickdraft dashboard widget
+		require_once ABSPATH . 'wp-admin/includes/dashboard.php';
 
-	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+		if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
+			$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+		}
 
-	if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
+			exit;
+		}
+
+		if ( $error_msg ) {
+			return wp_dashboard_quick_press( $error_msg );
+		}
+
+		$post = get_post( $_REQUEST['post_ID'] );
+		check_admin_referer( 'add-' . $post->post_type );
+
+		$_POST['comment_status'] = get_default_comment_status( $post->post_type );
+		$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
+
+		edit_post();
+		wp_dashboard_quick_press();
 		exit;
-	}
 
-	if ( $error_msg )
-		return wp_dashboard_quick_press( $error_msg );
-
-	$post = get_post( $_REQUEST['post_ID'] );
-	check_admin_referer( 'add-' . $post->post_type );
-
-	$_POST['comment_status'] = get_default_comment_status( $post->post_type );
-	$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
-
-	edit_post();
-	wp_dashboard_quick_press();
-	exit;
-
-case 'postajaxpost':
-case 'post':
-	check_admin_referer( 'add-' . $post_type );
-	$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
-	redirect_post( $post_id );
-	exit();
-
-case 'edit':
-	$editing = true;
-
-	if ( empty( $post_id ) ) {
-		wp_redirect( admin_url('post.php') );
+	case 'postajaxpost':
+	case 'post':
+		check_admin_referer( 'add-' . $post_type );
+		$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
+		redirect_post( $post_id );
 		exit();
-	}
 
-	if ( ! $post )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	case 'edit':
+		$editing = true;
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Invalid post type.' ) );
+		if ( empty( $post_id ) ) {
+			wp_redirect( admin_url( 'post.php' ) );
+			exit();
+		}
 
-	if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
-	}
+		if ( ! $post ) {
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		}
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+		if ( ! $post_type_object ) {
+			wp_die( __( 'Invalid post type.' ) );
+		}
 
-	if ( 'trash' == $post->post_status )
-		wp_die( __( 'You can&#8217;t edit this item because it is in the Trash. Please restore it and try again.' ) );
+		if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+		}
 
-	if ( ! empty( $_GET['get-post-lock'] ) ) {
-		check_admin_referer( 'lock-post_' . $post_id );
-		wp_set_post_lock( $post_id );
-		wp_redirect( get_edit_post_link( $post_id, 'url' ) );
-		exit();
-	}
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+		}
 
-	$post_type = $post->post_type;
-	if ( 'post' == $post_type ) {
-		$parent_file = "edit.php";
-		$submenu_file = "edit.php";
-		$post_new_file = "post-new.php";
-	} elseif ( 'attachment' == $post_type ) {
-		$parent_file = 'upload.php';
-		$submenu_file = 'upload.php';
-		$post_new_file = 'media-new.php';
-	} else {
-		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
-			$parent_file = $post_type_object->show_in_menu;
-		else
-			$parent_file = "edit.php?post_type=$post_type";
-		$submenu_file = "edit.php?post_type=$post_type";
-		$post_new_file = "post-new.php?post_type=$post_type";
-	}
+		if ( 'trash' == $post->post_status ) {
+			wp_die( __( 'You can&#8217;t edit this item because it is in the Trash. Please restore it and try again.' ) );
+		}
+
+		if ( ! empty( $_GET['get-post-lock'] ) ) {
+			check_admin_referer( 'lock-post_' . $post_id );
+			wp_set_post_lock( $post_id );
+			wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+			exit();
+		}
+
+		$post_type = $post->post_type;
+		if ( 'post' == $post_type ) {
+			$parent_file   = 'edit.php';
+			$submenu_file  = 'edit.php';
+			$post_new_file = 'post-new.php';
+		} elseif ( 'attachment' == $post_type ) {
+			$parent_file   = 'upload.php';
+			$submenu_file  = 'upload.php';
+			$post_new_file = 'media-new.php';
+		} else {
+			if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+				$parent_file = $post_type_object->show_in_menu;
+			} else {
+				$parent_file = "edit.php?post_type=$post_type";
+			}
+			$submenu_file  = "edit.php?post_type=$post_type";
+			$post_new_file = "post-new.php?post_type=$post_type";
+		}
+
+		/**
+		 * Allows replacement of the editor.
+		 *
+		 * @since 4.9.0
+		 *
+		 * @param boolean      Whether to replace the editor. Default false.
+		 * @param object $post Post object.
+		 */
+		if ( apply_filters( 'replace_editor', false, $post ) === true ) {
+			break;
+		}
+
+		if ( ! wp_check_post_lock( $post->ID ) ) {
+			$active_post_lock = wp_set_post_lock( $post->ID );
+
+			if ( 'attachment' !== $post_type ) {
+				wp_enqueue_script( 'autosave' );
+			}
+		}
+
+		$title = $post_type_object->labels->edit_item;
+		$post  = get_post( $post_id, OBJECT, 'edit' );
+
+		if ( post_type_supports( $post_type, 'comments' ) ) {
+			wp_enqueue_script( 'admin-comments' );
+			enqueue_comment_hotkeys_js();
+		}
+
+		include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
 
-	/**
-	 * Allows replacement of the editor.
-	 *
-	 * @since 4.9.0
-	 *
-	 * @param boolean      Whether to replace the editor. Default false.
-	 * @param object $post Post object.
-	 */
-	if ( apply_filters( 'replace_editor', false, $post ) === true ) {
 		break;
-	}
 
-	if ( ! wp_check_post_lock( $post->ID ) ) {
-		$active_post_lock = wp_set_post_lock( $post->ID );
+	case 'editattachment':
+		check_admin_referer( 'update-post_' . $post_id );
 
-		if ( 'attachment' !== $post_type )
-			wp_enqueue_script('autosave');
-	}
+		// Don't let these be changed
+		unset( $_POST['guid'] );
+		$_POST['post_type'] = 'attachment';
 
-	$title = $post_type_object->labels->edit_item;
-	$post = get_post($post_id, OBJECT, 'edit');
+		// Update the thumbnail filename
+		$newmeta          = wp_get_attachment_metadata( $post_id, true );
+		$newmeta['thumb'] = $_POST['thumb'];
 
-	if ( post_type_supports($post_type, 'comments') ) {
-		wp_enqueue_script('admin-comments');
-		enqueue_comment_hotkeys_js();
-	}
+		wp_update_attachment_metadata( $post_id, $newmeta );
 
-	include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+	case 'editpost':
+		check_admin_referer( 'update-post_' . $post_id );
 
-	break;
+		$post_id = edit_post();
 
-case 'editattachment':
-	check_admin_referer('update-post_' . $post_id);
+		// Session cookie flag that the post was saved
+		if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
+			setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
+		}
 
-	// Don't let these be changed
-	unset($_POST['guid']);
-	$_POST['post_type'] = 'attachment';
+		redirect_post( $post_id ); // Send user on their way while we keep working
 
-	// Update the thumbnail filename
-	$newmeta = wp_get_attachment_metadata( $post_id, true );
-	$newmeta['thumb'] = $_POST['thumb'];
+		exit();
 
-	wp_update_attachment_metadata( $post_id, $newmeta );
+	case 'trash':
+		check_admin_referer( 'trash-post_' . $post_id );
 
-case 'editpost':
-	check_admin_referer('update-post_' . $post_id);
+		if ( ! $post ) {
+			wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+		}
 
-	$post_id = edit_post();
+		if ( ! $post_type_object ) {
+			wp_die( __( 'Invalid post type.' ) );
+		}
 
-	// Session cookie flag that the post was saved
-	if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
-		setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, is_ssl() );
-	}
+		if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+		}
 
-	redirect_post($post_id); // Send user on their way while we keep working
+		if ( $user_id = wp_check_post_lock( $post_id ) ) {
+			$user = get_userdata( $user_id );
+			wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+		}
 
-	exit();
+		if ( ! wp_trash_post( $post_id ) ) {
+			wp_die( __( 'Error in moving to Trash.' ) );
+		}
 
-case 'trash':
-	check_admin_referer('trash-post_' . $post_id);
+		wp_redirect(
+			add_query_arg(
+				array(
+					'trashed' => 1,
+					'ids'     => $post_id,
+				), $sendback
+			)
+		);
+		exit();
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	case 'untrash':
+		check_admin_referer( 'untrash-post_' . $post_id );
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Invalid post type.' ) );
+		if ( ! $post ) {
+			wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+		}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+		if ( ! $post_type_object ) {
+			wp_die( __( 'Invalid post type.' ) );
+		}
 
-	if ( $user_id = wp_check_post_lock( $post_id ) ) {
-		$user = get_userdata( $user_id );
-		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
-	}
+		if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+		}
 
-	if ( ! wp_trash_post( $post_id ) )
-		wp_die( __( 'Error in moving to Trash.' ) );
+		if ( ! wp_untrash_post( $post_id ) ) {
+			wp_die( __( 'Error in restoring from Trash.' ) );
+		}
 
-	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
-	exit();
+		wp_redirect( add_query_arg( 'untrashed', 1, $sendback ) );
+		exit();
 
-case 'untrash':
-	check_admin_referer('untrash-post_' . $post_id);
+	case 'delete':
+		check_admin_referer( 'delete-post_' . $post_id );
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+		if ( ! $post ) {
+			wp_die( __( 'This item has already been deleted.' ) );
+		}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Invalid post type.' ) );
+		if ( ! $post_type_object ) {
+			wp_die( __( 'Invalid post type.' ) );
+		}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+		if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+		}
 
-	if ( ! wp_untrash_post( $post_id ) )
-		wp_die( __( 'Error in restoring from Trash.' ) );
+		if ( $post->post_type == 'attachment' ) {
+			$force = ( ! MEDIA_TRASH );
+			if ( ! wp_delete_attachment( $post_id, $force ) ) {
+				wp_die( __( 'Error in deleting.' ) );
+			}
+		} else {
+			if ( ! wp_delete_post( $post_id, true ) ) {
+				wp_die( __( 'Error in deleting.' ) );
+			}
+		}
 
-	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
-	exit();
+		wp_redirect( add_query_arg( 'deleted', 1, $sendback ) );
+		exit();
 
-case 'delete':
-	check_admin_referer('delete-post_' . $post_id);
+	case 'preview':
+		check_admin_referer( 'update-post_' . $post_id );
 
-	if ( ! $post )
-		wp_die( __( 'This item has already been deleted.' ) );
+		$url = post_preview();
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Invalid post type.' ) );
+		wp_redirect( $url );
+		exit();
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+	default:
+		/**
+		 * Fires for a given custom post action request.
+		 *
+		 * The dynamic portion of the hook name, `$action`, refers to the custom post action.
+		 *
+		 * @since 4.6.0
+		 *
+		 * @param int $post_id Post ID sent with the request.
+		 */
+		do_action( "post_action_{$action}", $post_id );
 
-	if ( $post->post_type == 'attachment' ) {
-		$force = ( ! MEDIA_TRASH );
-		if ( ! wp_delete_attachment( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
-	} else {
-		if ( ! wp_delete_post( $post_id, true ) )
-			wp_die( __( 'Error in deleting.' ) );
-	}
-
-	wp_redirect( add_query_arg('deleted', 1, $sendback) );
-	exit();
-
-case 'preview':
-	check_admin_referer( 'update-post_' . $post_id );
-
-	$url = post_preview();
-
-	wp_redirect($url);
-	exit();
-
-default:
-	/**
-	 * Fires for a given custom post action request.
-	 *
-	 * The dynamic portion of the hook name, `$action`, refers to the custom post action.
-	 *
-	 * @since 4.6.0
-	 *
-	 * @param int $post_id Post ID sent with the request.
-	 */
-	do_action( "post_action_{$action}", $post_id );
-
-	wp_redirect( admin_url('edit.php') );
-	exit();
+		wp_redirect( admin_url( 'edit.php' ) );
+		exit();
 } // end switch
 include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php
index ddf0d6c7aa..8f97728fec 100644
--- a/wp-admin/press-this.php
+++ b/wp-admin/press-this.php
@@ -6,7 +6,7 @@
  * @subpackage Press_This
  */
 
-define( 'IFRAME_REQUEST' , true );
+define( 'IFRAME_REQUEST', true );
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -27,11 +27,15 @@ function wp_load_press_this() {
 		$wp_press_this->html();
 	} elseif ( current_user_can( 'activate_plugins' ) ) {
 		if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
-			$url = wp_nonce_url( add_query_arg( array(
-				'action' => 'activate',
-				'plugin' => $plugin_file,
-				'from'   => 'press-this',
-			), admin_url( 'plugins.php' ) ), 'activate-plugin_' . $plugin_file );
+			$url    = wp_nonce_url(
+				add_query_arg(
+					array(
+						'action' => 'activate',
+						'plugin' => $plugin_file,
+						'from'   => 'press-this',
+					), admin_url( 'plugins.php' )
+				), 'activate-plugin_' . $plugin_file
+			);
 			$action = sprintf(
 				'<a href="%1$s" aria-label="%2$s">%2$s</a>',
 				esc_url( $url ),
@@ -39,11 +43,15 @@ function wp_load_press_this() {
 			);
 		} else {
 			if ( is_main_site() ) {
-				$url = wp_nonce_url( add_query_arg( array(
-					'action' => 'install-plugin',
-					'plugin' => $plugin_slug,
-					'from'   => 'press-this',
-				), self_admin_url( 'update.php' ) ), 'install-plugin_' . $plugin_slug );
+				$url    = wp_nonce_url(
+					add_query_arg(
+						array(
+							'action' => 'install-plugin',
+							'plugin' => $plugin_slug,
+							'from'   => 'press-this',
+						), 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>',
 					esc_url( $url ),
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 0f33eb2c9c..577925aba7 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -12,7 +12,7 @@
  * @since 2.5.0
  * @var bool
  */
-define('IS_PROFILE_PAGE', true);
+define( 'IS_PROFILE_PAGE', true );
 
 /** Load User Editing Page */
 require_once( dirname( __FILE__ ) . '/user-edit.php' );
diff --git a/wp-admin/revision.php b/wp-admin/revision.php
index c86f78a451..18719a1dde 100644
--- a/wp-admin/revision.php
+++ b/wp-admin/revision.php
@@ -25,67 +25,81 @@ wp_reset_vars( array( 'revision', 'action', 'from', 'to' ) );
 $revision_id = absint( $revision );
 
 $from = is_numeric( $from ) ? absint( $from ) : null;
-if ( ! $revision_id )
+if ( ! $revision_id ) {
 	$revision_id = absint( $to );
+}
 $redirect = 'edit.php';
 
 switch ( $action ) {
-case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+	case 'restore':
+		if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+			break;
+		}
+
+		if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) {
+			break;
+		}
+
+		if ( ! $post = get_post( $revision->post_parent ) ) {
+			break;
+		}
+
+		// Restore if revisions are enabled or this is an autosave.
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
+
+		// Don't allow revision restore when post is locked
+		if ( wp_check_post_lock( $post->ID ) ) {
+			break;
+		}
+
+		check_admin_referer( "restore-post_{$revision->ID}" );
+
+		wp_restore_post_revision( $revision->ID );
+		$redirect = add_query_arg(
+			array(
+				'message'  => 5,
+				'revision' => $revision->ID,
+			), get_edit_post_link( $post->ID, 'url' )
+		);
 		break;
+	case 'view':
+	case 'edit':
+	default:
+		if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+			break;
+		}
+		if ( ! $post = get_post( $revision->post_parent ) ) {
+			break;
+		}
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+		if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) ) {
+			break;
+		}
+
+		// Revisions disabled and we're not looking at an autosave
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
+
+		$post_edit_link = get_edit_post_link();
+		$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+		/* translators: 1: Post title */
+		$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+		$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
+		$title          = __( 'Revisions' );
+
+		$redirect = false;
 		break;
-
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
-
-	// Restore if revisions are enabled or this is an autosave.
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
-
-	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
-		break;
-
-	check_admin_referer( "restore-post_{$revision->ID}" );
-
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
-	break;
-case 'view' :
-case 'edit' :
-default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
-
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
-
-	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
-
-	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	/* translators: 1: Post title */
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
-	$title          = __( 'Revisions' );
-
-	$redirect = false;
-	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( ! $redirect && empty( $post->post_type ) )
+if ( ! $redirect && empty( $post->post_type ) ) {
 	$redirect = 'edit.php';
+}
 
 if ( ! empty( $redirect ) ) {
 	wp_redirect( $redirect );
@@ -93,10 +107,11 @@ if ( ! empty( $redirect ) ) {
 }
 
 // This is so that the correct "Edit" menu item is selected.
-if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
+if ( ! empty( $post->post_type ) && 'post' != $post->post_type ) {
 	$parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
-else
+} else {
 	$parent_file = $submenu_file = 'edit.php';
+}
 
 wp_enqueue_script( 'revisions' );
 wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
@@ -110,11 +125,13 @@ $revisions_overview .= '<ul><li>' . __( 'To navigate between revisions, <strong>
 $revisions_overview .= '<li>' . __( 'Compare two different revisions by <strong>selecting the &#8220;Compare any two revisions&#8221; box</strong> to the side.' ) . '</li>';
 $revisions_overview .= '<li>' . __( 'To restore a revision, <strong>click Restore This Revision</strong>.' ) . '</li></ul>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'revisions-overview',
-	'title'   => __( 'Overview' ),
-	'content' => $revisions_overview
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'revisions-overview',
+		'title'   => __( 'Overview' ),
+		'content' => $revisions_overview,
+	)
+);
 
 $revisions_sidebar  = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 $revisions_sidebar .= '<p>' . __( '<a href="https://codex.wordpress.org/Revision_Management">Revisions Management</a>' ) . '</p>';
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 6274a1aa73..d746fd6c64 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -12,19 +12,19 @@
 /**
  * We are installing.
  */
-define('WP_INSTALLING', true);
+define( 'WP_INSTALLING', true );
 
 /**
  * We are blissfully unaware of anything.
  */
-define('WP_SETUP_CONFIG', true);
+define( 'WP_SETUP_CONFIG', true );
 
 /**
  * Disable error reporting
  *
  * Set this to error_reporting( -1 ) for debugging
  */
-error_reporting(0);
+error_reporting( 0 );
 
 if ( ! defined( 'ABSPATH' ) ) {
 	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
@@ -46,16 +46,19 @@ if ( file_exists( ABSPATH . 'wp-config-sample.php' ) ) {
 } elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) ) {
 	$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
 } else {
-	wp_die( sprintf(
-		/* translators: %s: wp-config-sample.php */
-		__( 'Sorry, I need a %s file to work from. Please re-upload this file to your WordPress installation.' ),
-		'<code>wp-config-sample.php</code>'
-	) );
+	wp_die(
+		sprintf(
+			/* translators: %s: wp-config-sample.php */
+			__( 'Sorry, I need a %s file to work from. Please re-upload this file to your WordPress installation.' ),
+			'<code>wp-config-sample.php</code>'
+		)
+	);
 }
 
 // Check if wp-config.php has been created
 if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
-	wp_die( '<p>' . sprintf(
+	wp_die(
+		'<p>' . sprintf(
 			/* translators: 1: wp-config.php 2: install.php */
 			__( 'The file %1$s already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
 			'<code>wp-config.php</code>',
@@ -66,7 +69,8 @@ if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
 
 // Check if wp-config.php exists above the root directory but is not part of another installation
 if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
-	wp_die( '<p>' . sprintf(
+	wp_die(
+		'<p>' . sprintf(
 			/* translators: 1: wp-config.php 2: install.php */
 			__( 'The file %1$s already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href="%2$s">installing now</a>.' ),
 			'<code>wp-config.php</code>',
@@ -89,12 +93,12 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
  * @param string|array $body_classes
  */
 function setup_config_display_header( $body_classes = array() ) {
-	$body_classes = (array) $body_classes;
+	$body_classes   = (array) $body_classes;
 	$body_classes[] = 'wp-core-ui';
-	$dir_attr = '';
+	$dir_attr       = '';
 	if ( is_rtl() ) {
 		$body_classes[] = 'rtl';
-		$dir_attr = ' dir="rtl"';
+		$dir_attr       = ' dir="rtl"';
 	}
 
 	header( 'Content-Type: text/html; charset=utf-8' );
@@ -120,7 +124,7 @@ if ( ! empty( $_REQUEST['language'] ) ) {
 	$language = $GLOBALS['wp_local_package'];
 }
 
-switch($step) {
+switch ( $step ) {
 	case -1:
 		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
 			setup_config_display_header( 'language-chooser' );
@@ -151,8 +155,8 @@ switch($step) {
 			$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>
+<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>
 	<li><?php _e( 'Database name' ); ?></li>
 	<li><?php _e( 'Database username' ); ?></li>
@@ -160,30 +164,37 @@ switch($step) {
 	<li><?php _e( 'Database host' ); ?></li>
 	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
 </ol>
-<p><?php
+<p>
+<?php
 	/* translators: %s: wp-config.php */
-	printf( __( 'We&#8217;re going to use this information to create a %s file.' ),
+	printf(
+		__( 'We&#8217;re going to use this information to create a %s file.' ),
 		'<code>wp-config.php</code>'
 	);
 	?>
-	<strong><?php
+	<strong>
+	<?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.' ),
+		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>
+	?>
+	</strong>
 	<?php
 	/* translators: %s: Codex URL */
-	printf( __( 'Need more help? <a href="%s">We got it</a>.' ),
+	printf(
+		__( 'Need more help? <a href="%s">We got it</a>.' ),
 		__( 'https://codex.wordpress.org/Editing_wp-config.php' )
 	);
-?></p>
+?>
+</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
-	break;
+		break;
 
 	case 1:
 		load_default_textdomain( $language );
@@ -191,7 +202,7 @@ switch($step) {
 
 		setup_config_display_header();
 	?>
-<h1 class="screen-reader-text"><?php _e( 'Set up your database connection' ) ?></h1>
+<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>
 	<table class="form-table">
@@ -213,10 +224,12 @@ switch($step) {
 		<tr>
 			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
-			<td><?php
+			<td>
+			<?php
 				/* translators: %s: localhost */
-				printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ),'<code>localhost</code>' );
-			?></td>
+				printf( __( 'You should be able to get this info from your web host, if %s doesn&#8217;t work.' ), '<code>localhost</code>' );
+			?>
+			</td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
@@ -224,162 +237,176 @@ 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'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
+	<?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
-	break;
+		break;
 
 	case 2:
-	load_default_textdomain( $language );
-	$GLOBALS['wp_locale'] = new WP_Locale();
+		load_default_textdomain( $language );
+		$GLOBALS['wp_locale'] = new WP_Locale();
 
-	$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
-	$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
-	$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
-	$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
-	$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+		$dbname = trim( wp_unslash( $_POST['dbname'] ) );
+		$uname  = trim( wp_unslash( $_POST['uname'] ) );
+		$pwd    = trim( wp_unslash( $_POST['pwd'] ) );
+		$dbhost = trim( wp_unslash( $_POST['dbhost'] ) );
+		$prefix = trim( wp_unslash( $_POST['prefix'] ) );
 
-	$step_1 = 'setup-config.php?step=1';
-	$install = 'install.php';
-	if ( isset( $_REQUEST['noapi'] ) ) {
-		$step_1 .= '&amp;noapi';
-	}
-
-	if ( ! empty( $language ) ) {
-		$step_1 .= '&amp;language=' . $language;
-		$install .= '?language=' . $language;
-	} else {
-		$install .= '?language=en_US';
-	}
-
-	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
-
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
-
-	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
-
-	// Test the db connection.
-	/**#@+
-	 * @ignore
-	 */
-	define('DB_NAME', $dbname);
-	define('DB_USER', $uname);
-	define('DB_PASSWORD', $pwd);
-	define('DB_HOST', $dbhost);
-	/**#@-*/
-
-	// Re-construct $wpdb with these new values.
-	unset( $wpdb );
-	require_wp_db();
-
-	/*
-	 * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
-	 * fire this manually. We'll fail here if the values are no good.
-	 */
-	$wpdb->db_connect();
-
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
-
-	$errors = $wpdb->hide_errors();
-	$wpdb->query( "SELECT $prefix" );
-	$wpdb->show_errors( $errors );
-	if ( ! $wpdb->last_error ) {
-		// MySQL was able to parse the prefix as a value, which we don't want. Bail.
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
-	}
-
-	// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
-	try {
-		$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
-		$max = strlen($chars) - 1;
-		for ( $i = 0; $i < 8; $i++ ) {
-			$key = '';
-			for ( $j = 0; $j < 64; $j++ ) {
-				$key .= substr( $chars, random_int( 0, $max ), 1 );
-			}
-			$secret_keys[] = $key;
-		}
-	} catch ( Exception $ex ) {
-		$no_api = isset( $_POST['noapi'] );
-
-		if ( ! $no_api ) {
-			$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+		$step_1  = 'setup-config.php?step=1';
+		$install = 'install.php';
+		if ( isset( $_REQUEST['noapi'] ) ) {
+			$step_1 .= '&amp;noapi';
 		}
 
-		if ( $no_api || is_wp_error( $secret_keys ) ) {
-			$secret_keys = array();
-			for ( $i = 0; $i < 8; $i++ ) {
-				$secret_keys[] = wp_generate_password( 64, true, true );
-			}
+		if ( ! empty( $language ) ) {
+			$step_1  .= '&amp;language=' . $language;
+			$install .= '?language=' . $language;
 		} else {
-			$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-			foreach ( $secret_keys as $k => $v ) {
-				$secret_keys[$k] = substr( $v, 28, 64 );
+			$install .= '?language=en_US';
+		}
+
+		$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+
+		if ( empty( $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+		}
+
+		// Validate $prefix: it can only contain letters, numbers and underscores.
+		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+		}
+
+		// Test the db connection.
+		/**#@+
+		 *
+		 * @ignore
+		 */
+		define( 'DB_NAME', $dbname );
+		define( 'DB_USER', $uname );
+		define( 'DB_PASSWORD', $pwd );
+		define( 'DB_HOST', $dbhost );
+		/**#@-*/
+
+		// Re-construct $wpdb with these new values.
+		unset( $wpdb );
+		require_wp_db();
+
+		/*
+		* The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
+		* fire this manually. We'll fail here if the values are no good.
+		*/
+		$wpdb->db_connect();
+
+		if ( ! empty( $wpdb->error ) ) {
+			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+		}
+
+		$errors = $wpdb->hide_errors();
+		$wpdb->query( "SELECT $prefix" );
+		$wpdb->show_errors( $errors );
+		if ( ! $wpdb->last_error ) {
+			// MySQL was able to parse the prefix as a value, which we don't want. Bail.
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
+		}
+
+		// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
+		try {
+			$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_ []{}<>~`+=,.;:/?|';
+			$max   = strlen( $chars ) - 1;
+			for ( $i = 0; $i < 8; $i++ ) {
+				$key = '';
+				for ( $j = 0; $j < 64; $j++ ) {
+					$key .= substr( $chars, random_int( 0, $max ), 1 );
+				}
+				$secret_keys[] = $key;
+			}
+		} catch ( Exception $ex ) {
+			$no_api = isset( $_POST['noapi'] );
+
+			if ( ! $no_api ) {
+				$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+			}
+
+			if ( $no_api || is_wp_error( $secret_keys ) ) {
+				$secret_keys = array();
+				for ( $i = 0; $i < 8; $i++ ) {
+					$secret_keys[] = wp_generate_password( 64, true, true );
+				}
+			} else {
+				$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
+				foreach ( $secret_keys as $k => $v ) {
+					$secret_keys[ $k ] = substr( $v, 28, 64 );
+				}
 			}
 		}
-	}
 
-	$key = 0;
-	foreach ( $config_file as $line_num => $line ) {
-		if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-			$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
-			continue;
+		$key = 0;
+		foreach ( $config_file as $line_num => $line ) {
+			if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
+				$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+				continue;
+			}
+
+			if ( ! preg_match( '/^define\(\s*\'([A-Z_]+)\',([ ]+)/', $line, $match ) ) {
+				continue;
+			}
+
+			$constant = $match[1];
+			$padding  = $match[2];
+
+			switch ( $constant ) {
+				case 'DB_NAME':
+				case 'DB_USER':
+				case 'DB_PASSWORD':
+				case 'DB_HOST':
+					$config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "' );\r\n";
+					break;
+				case 'DB_CHARSET':
+					if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
+						$config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'utf8mb4' );\r\n";
+					}
+					break;
+				case 'AUTH_KEY':
+				case 'SECURE_AUTH_KEY':
+				case 'LOGGED_IN_KEY':
+				case 'NONCE_KEY':
+				case 'AUTH_SALT':
+				case 'SECURE_AUTH_SALT':
+				case 'LOGGED_IN_SALT':
+				case 'NONCE_SALT':
+					$config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . $secret_keys[ $key++ ] . "' );\r\n";
+					break;
+			}
 		}
+		unset( $line );
 
-		if ( ! preg_match( '/^define\(\s*\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
-			continue;
-
-		$constant = $match[1];
-		$padding  = $match[2];
-
-		switch ( $constant ) {
-			case 'DB_NAME'     :
-			case 'DB_USER'     :
-			case 'DB_PASSWORD' :
-			case 'DB_HOST'     :
-				$config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "' );\r\n";
-				break;
-			case 'DB_CHARSET'  :
-				if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
-					$config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'utf8mb4' );\r\n";
-				}
-				break;
-			case 'AUTH_KEY'         :
-			case 'SECURE_AUTH_KEY'  :
-			case 'LOGGED_IN_KEY'    :
-			case 'NONCE_KEY'        :
-			case 'AUTH_SALT'        :
-			case 'SECURE_AUTH_SALT' :
-			case 'LOGGED_IN_SALT'   :
-			case 'NONCE_SALT'       :
-				$config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "' );\r\n";
-				break;
-		}
-	}
-	unset( $line );
-
-	if ( ! is_writable(ABSPATH) ) :
-		setup_config_display_header();
-?>
-<p><?php
+		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>' );
-?></p>
-<p><?php
+?>
+</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>' );
-?></p>
-<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
-		foreach ( $config_file as $line ) {
-			echo htmlentities($line, ENT_COMPAT, 'UTF-8');
-		}
-?></textarea>
+?>
+</p>
+<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly">
+<?php
+foreach ( $config_file as $line ) {
+	echo htmlentities( $line, ENT_COMPAT, 'UTF-8' );
+}
+?>
+</textarea>
 <p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the installation.&#8221;' ); ?></p>
 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the installation' ); ?></a></p>
 <script>
@@ -397,10 +424,11 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
 		 * file one level up, which is for the develop repo.
 		 */
-		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) ) {
 			$path_to_wp_config = ABSPATH . 'wp-config.php';
-		else
+		} else {
 			$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+		}
 
 		$handle = fopen( $path_to_wp_config, 'w' );
 		foreach ( $config_file as $line ) {
@@ -410,13 +438,13 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
 		chmod( $path_to_wp_config, 0666 );
 		setup_config_display_header();
 ?>
-<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
+<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
 	endif;
-	break;
+		break;
 }
 ?>
 <?php wp_print_scripts( 'language-chooser' ); ?>
diff --git a/wp-admin/term.php b/wp-admin/term.php
index 96ab0eb34b..b8331828b4 100644
--- a/wp-admin/term.php
+++ b/wp-admin/term.php
@@ -58,10 +58,12 @@ if ( 'post' != $post_type ) {
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_pagination' => $tax->labels->items_list_navigation,
-	'heading_list'       => $tax->labels->items_list,
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_pagination' => $tax->labels->items_list_navigation,
+		'heading_list'       => $tax->labels->items_list,
+	)
+);
 wp_enqueue_script( 'admin-tags' );
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 include( ABSPATH . 'wp-admin/edit-tag-form.php' );
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 5d0f2c6499..f5b789e828 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -14,39 +14,42 @@ if ( is_multisite() && ! is_network_admin() ) {
 	exit();
 }
 
-if ( !current_user_can('edit_themes') )
-	wp_die('<p>'.__('Sorry, you are not allowed to edit templates for this site.').'</p>');
+if ( ! current_user_can( 'edit_themes' ) ) {
+	wp_die( '<p>' . __( 'Sorry, you are not allowed to edit templates for this site.' ) . '</p>' );
+}
 
-$title = __("Edit Themes");
+$title       = __( 'Edit Themes' );
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . __( 'You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.' ) . '</p>' .
-	'<p>' . __( 'Begin by choosing a theme to edit from the dropdown menu and clicking the Select button. A list then appears of the theme&#8217;s template files. Clicking once on any file name causes the file to appear in the large Editor box.' ) . '</p>' .
-	'<p>' . __( 'For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.' ) . '</p>' .
-	'<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>' .
-	'<ul>' .
-	'<li id="editor-keyboard-trap-help-2">' . __( 'In the editing area, the Tab key enters a tab character.' ) . '</li>' .
-	'<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>' .
-	'<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>' .
-	'</ul>' .
-	'<p>' . __( 'After typing in your edits, click Update File.' ) . '</p>' .
-	'<p>' . __( '<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.' ) . '</p>' .
-	/* translators: %s: link to codex article about child themes */
-	'<p>' . sprintf( __( 'Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ) . '</p>' .
-	( is_network_admin() ? '<p>' . __( 'Any edits to files from this screen will be reflected on all sites in the network.' ) . '</p>' : '' ),
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				 '<p>' . __( 'You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.' ) . '</p>' .
+				 '<p>' . __( 'Begin by choosing a theme to edit from the dropdown menu and clicking the Select button. A list then appears of the theme&#8217;s template files. Clicking once on any file name causes the file to appear in the large Editor box.' ) . '</p>' .
+				 '<p>' . __( 'For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Look Up takes you to a web page with reference material about that particular function.' ) . '</p>' .
+				 '<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>' .
+				 '<ul>' .
+				 '<li id="editor-keyboard-trap-help-2">' . __( 'In the editing area, the Tab key enters a tab character.' ) . '</li>' .
+				 '<li id="editor-keyboard-trap-help-3">' . __( 'To move away from this area, press the Esc key followed by the Tab key.' ) . '</li>' .
+				 '<li id="editor-keyboard-trap-help-4">' . __( 'Screen reader users: when in forms mode, you may need to press the Esc key twice.' ) . '</li>' .
+				 '</ul>' .
+				 '<p>' . __( 'After typing in your edits, click Update File.' ) . '</p>' .
+				 '<p>' . __( '<strong>Advice:</strong> think very carefully about your site crashing if you are live-editing the theme currently in use.' ) . '</p>' .
+				 /* translators: %s: link to codex article about child themes */
+				 '<p>' . sprintf( __( 'Upgrading to a newer version of the same theme will override changes made here. To avoid this, consider creating a <a href="%s">child theme</a> instead.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ) . '</p>' .
+				 ( is_network_admin() ? '<p>' . __( 'Any edits to files from this screen will be reflected on all sites in the network.' ) . '</p>' : '' ),
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Theme_Development">Documentation on Theme Development</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Template_Tags">Documentation on Template Tags</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/Theme_Development">Documentation on Theme Development</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Editing_Files">Documentation on Editing Files</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Template_Tags">Documentation on Template Tags</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
@@ -76,12 +79,12 @@ foreach ( $file_types as $type ) {
 	switch ( $type ) {
 		case 'php':
 			$allowed_files += $theme->get_files( 'php', -1 );
-			$has_templates = ! empty( $allowed_files );
+			$has_templates  = ! empty( $allowed_files );
 			break;
 		case 'css':
-			$style_files = $theme->get_files( 'css', -1 );
+			$style_files                = $theme->get_files( 'css', -1 );
 			$allowed_files['style.css'] = $style_files['style.css'];
-			$allowed_files += $style_files;
+			$allowed_files             += $style_files;
 			break;
 		default:
 			$allowed_files += $theme->get_files( $type, -1 );
@@ -99,16 +102,16 @@ if ( isset( $allowed_files['style.css'] ) ) {
 
 if ( empty( $file ) ) {
 	$relative_file = 'style.css';
-	$file = $allowed_files['style.css'];
+	$file          = $allowed_files['style.css'];
 } else {
 	$relative_file = wp_unslash( $file );
-	$file = $theme->get_stylesheet_directory() . '/' . $relative_file;
+	$file          = $theme->get_stylesheet_directory() . '/' . $relative_file;
 }
 
 validate_file_to_edit( $file, $allowed_files );
 
 // Handle fallback editing of file when JavaScript is not available.
-$edit_error = null;
+$edit_error     = null;
 $posted_content = null;
 if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 	$r = wp_edit_theme_plugin_file( wp_unslash( $_POST ) );
@@ -118,14 +121,16 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 			$posted_content = wp_unslash( $_POST['newcontent'] );
 		}
 	} else {
-		wp_redirect( add_query_arg(
-			array(
-				'a' => 1, // This means "success" for some reason.
-				'theme' => $stylesheet,
-				'file' => $relative_file,
-			),
-			admin_url( 'theme-editor.php' )
-		) );
+		wp_redirect(
+			add_query_arg(
+				array(
+					'a'     => 1, // This means "success" for some reason.
+					'theme' => $stylesheet,
+					'file'  => $relative_file,
+				),
+				admin_url( 'theme-editor.php' )
+			)
+		);
 		exit;
 	}
 }
@@ -141,20 +146,21 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 
 	update_recently_edited( $file );
 
-	if ( ! is_file( $file ) )
+	if ( ! is_file( $file ) ) {
 		$error = true;
+	}
 
 	$content = '';
 	if ( ! empty( $posted_content ) ) {
 		$content = $posted_content;
 	} elseif ( ! $error && filesize( $file ) > 0 ) {
-		$f = fopen($file, 'r');
-		$content = fread($f, filesize($file));
+		$f       = fopen( $file, 'r' );
+		$content = fread( $f, filesize( $file ) );
 
 		if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
 			$functions = wp_doc_link_parse( $content );
 
-			$docs_select = '<select name="docs-list" id="docs-list">';
+			$docs_select  = '<select name="docs-list" id="docs-list">';
 			$docs_select .= '<option value="">' . esc_attr__( 'Function Name&hellip;' ) . '</option>';
 			foreach ( $functions as $function ) {
 				$docs_select .= '<option value="' . esc_attr( urlencode( $function ) ) . '">' . htmlspecialchars( $function ) . '()</option>';
@@ -165,12 +171,12 @@ if ( 'POST' === $_SERVER['REQUEST_METHOD'] ) {
 		$content = esc_textarea( $content );
 	}
 
-$file_description = get_file_description( $relative_file );
-$file_show = array_search( $file, array_filter( $allowed_files ) );
-$description = esc_html( $file_description );
-if ( $file_description != $file_show ) {
-	$description .= ' <span>(' . esc_html( $file_show ) . ')</span>';
-}
+	$file_description = get_file_description( $relative_file );
+	$file_show        = array_search( $file, array_filter( $allowed_files ) );
+	$description      = esc_html( $file_description );
+	if ( $file_description != $file_show ) {
+		$description .= ' <span>(' . esc_html( $file_show ) . ')</span>';
+	}
 ?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
@@ -202,19 +208,26 @@ if ( $file_description != $file_show ) {
 
 <div class="fileedit-sub">
 <div class="alignleft">
-<h2><?php echo $theme->display( 'Name' ); if ( $description ) echo ': ' . $description; ?></h2>
+<h2>
+<?php
+echo $theme->display( 'Name' );
+if ( $description ) {
+	echo ': ' . $description;}
+?>
+</h2>
 </div>
 <div class="alignright">
 	<form action="theme-editor.php" method="get">
-		<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
+		<strong><label for="theme"><?php _e( 'Select theme to edit:' ); ?> </label></strong>
 		<select name="theme" id="theme">
 <?php
 foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
-	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() )
+	if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() ) {
 		continue;
+	}
 
 	$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
-	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
+	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display( 'Name' ) . '</option>';
 }
 ?>
 		</select>
@@ -224,8 +237,9 @@ foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_them
 <br class="clear" />
 </div>
 <?php
-if ( $theme->errors() )
+if ( $theme->errors() ) {
 	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+}
 ?>
 <div id="templateside">
 	<h2 id="theme-files-label"><?php _e( 'Theme Files' ); ?></h2>
@@ -234,8 +248,10 @@ if ( $theme->errors() )
 			<li class="howto">
 				<?php
 				/* translators: %s: link to edit parent theme */
-				echo sprintf( __( 'This child theme inherits templates from a parent theme, %s.' ),
-					sprintf( '<a href="%s">%s</a>',
+				echo sprintf(
+					__( 'This child theme inherits templates from a parent theme, %s.' ),
+					sprintf(
+						'<a href="%s">%s</a>',
 						self_admin_url( 'theme-editor.php?theme=' . urlencode( $theme->get_template() ) ),
 						$theme->parent()->display( 'Name' )
 					)
@@ -251,9 +267,11 @@ if ( $theme->errors() )
 	</ul>
 </div>
 
-<?php if ( $error ) :
-	echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
-else : ?>
+<?php
+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>
@@ -265,9 +283,9 @@ else : ?>
 		</div>
 	<?php if ( ! empty( $functions ) ) : ?>
 		<div id="documentation" class="hide-if-no-js">
-		<label for="docs-list"><?php _e('Documentation:') ?></label>
+		<label for="docs-list"><?php _e( 'Documentation:' ); ?></label>
 		<?php echo $docs_select; ?>
-		<input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ) ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ) ?>&amp;redirect=true'); }" />
+		<input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ); ?>" onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'https://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_user_locale() ); ?>&amp;version=<?php echo urlencode( get_bloginfo( 'version' ) ); ?>&amp;redirect=true'); }" />
 		</div>
 	<?php endif; ?>
 
@@ -276,7 +294,10 @@ else : ?>
 			<?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
 				<div class="notice notice-warning inline">
 					<p>
-						<?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
+						<?php
+						if ( is_writeable( $file ) ) {
+?>
+<strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
 						<?php _e( 'This is a file in your current parent theme.' ); ?>
 					</p>
 				</div>
@@ -288,7 +309,7 @@ else : ?>
 			<span class="spinner"></span>
 		</p>
 	<?php else : ?>
-		<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
+		<p><em><?php _e( 'You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.' ); ?></em></p>
 	<?php endif; ?>
 	</div>
 	<?php wp_print_file_editor_templates(); ?>
@@ -302,7 +323,7 @@ endif; // $error
 $dismissed_pointers = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
 if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :
 	// Get a back URL
-	$referer = wp_get_referer();
+	$referer                    = wp_get_referer();
 	$excluded_referer_basenames = array( 'theme-editor.php', 'wp-login.php' );
 
 	if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
@@ -338,4 +359,4 @@ if ( ! in_array( 'theme_editor_notice', $dismissed_pointers, true ) ) :
 <?php
 endif; // editor warning notice
 
-include(ABSPATH . 'wp-admin/admin-footer.php' );
+include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/theme-install.php b/wp-admin/theme-install.php
index 43f105f377..975735cc51 100644
--- a/wp-admin/theme-install.php
+++ b/wp-admin/theme-install.php
@@ -12,15 +12,16 @@ require( ABSPATH . 'wp-admin/includes/theme-install.php' );
 
 wp_reset_vars( array( 'tab' ) );
 
-if ( ! current_user_can('install_themes') )
+if ( ! current_user_can( 'install_themes' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+}
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'theme-install.php' ) );
 	exit();
 }
 
-$title = __( 'Add Themes' );
+$title       = __( 'Add Themes' );
 $parent_file = 'themes.php';
 
 if ( ! is_network_admin() ) {
@@ -39,35 +40,37 @@ foreach ( $installed_themes as $k => $v ) {
 	}
 }
 
-wp_localize_script( 'theme', '_wpThemeSettings', array(
-	'themes'   => false,
-	'settings' => array(
-		'isInstall'  => true,
-		'canInstall' => current_user_can( 'install_themes' ),
-		'installURI' => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
-		'adminUrl'   => parse_url( self_admin_url(), PHP_URL_PATH )
-	),
-	'l10n' => array(
-		'addNew'              => __( 'Add New Theme' ),
-		'search'              => __( 'Search Themes' ),
-		'searchPlaceholder'   => __( 'Search themes...' ), // placeholder (no ellipsis)
-		'upload'              => __( 'Upload Theme' ),
-		'back'                => __( 'Back' ),
-		'error'               => sprintf(
-			/* translators: %s: support forums URL */
-			__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-			__( 'https://wordpress.org/support/' )
+wp_localize_script(
+	'theme', '_wpThemeSettings', array(
+		'themes'          => false,
+		'settings'        => array(
+			'isInstall'  => true,
+			'canInstall' => current_user_can( 'install_themes' ),
+			'installURI' => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
+			'adminUrl'   => parse_url( self_admin_url(), PHP_URL_PATH ),
 		),
-		'tryAgain'            => __( 'Try Again' ),
-		'themesFound'         => __( 'Number of Themes found: %d' ),
-		'noThemesFound'       => __( 'No themes found. Try a different search.' ),
-		'collapseSidebar'     => __( 'Collapse Sidebar' ),
-		'expandSidebar'       => __( 'Expand Sidebar' ),
-		/* translators: accessibility text */
-		'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
-	),
-	'installedThemes' => array_keys( $installed_themes ),
-) );
+		'l10n'            => array(
+			'addNew'              => __( 'Add New Theme' ),
+			'search'              => __( 'Search Themes' ),
+			'searchPlaceholder'   => __( 'Search themes...' ), // placeholder (no ellipsis)
+			'upload'              => __( 'Upload Theme' ),
+			'back'                => __( 'Back' ),
+			'error'               => sprintf(
+				/* translators: %s: support forums URL */
+				__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
+				__( 'https://wordpress.org/support/' )
+			),
+			'tryAgain'            => __( 'Try Again' ),
+			'themesFound'         => __( 'Number of Themes found: %d' ),
+			'noThemesFound'       => __( 'No themes found. Try a different search.' ),
+			'collapseSidebar'     => __( 'Collapse Sidebar' ),
+			'expandSidebar'       => __( 'Expand Sidebar' ),
+			/* translators: accessibility text */
+			'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
+		),
+		'installedThemes' => array_keys( $installed_themes ),
+	)
+);
 
 wp_enqueue_script( 'theme' );
 wp_enqueue_script( 'updates' );
@@ -87,41 +90,45 @@ if ( $tab ) {
 
 $help_overview =
 	'<p>' . sprintf(
-			/* translators: %s: Theme Directory URL */
+		/* translators: %s: Theme Directory URL */
 			__( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
-			__( 'https://wordpress.org/themes/' )
-		) . '</p>' .
+		__( 'https://wordpress.org/themes/' )
+	) . '</p>' .
 	'<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
 	'<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
 	'<p>' . sprintf(
-			/* translators: %s: /wp-content/themes */
+		/* translators: %s: /wp-content/themes */
 			__( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.' ),
-			'<code>/wp-content/themes</code>'
-		) . '</p>';
+		'<code>/wp-content/themes</code>'
+	) . '</p>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => $help_overview
-) );
-
-$help_installing =
-	'<p>' . __('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.') . '</p>' .
-	'<p>' . __('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.') . '</p>';
-
-get_current_screen()->add_help_tab( array(
-	'id'      => 'installing',
-	'title'   => __('Previewing and Installing'),
-	'content' => $help_installing
-) );
-
-get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes">Documentation on Adding New Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $help_overview,
+	)
 );
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+$help_installing =
+	'<p>' . __( 'Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.' ) . '</p>' .
+	'<p>' . __( 'To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.' ) . '</p>';
+
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'installing',
+		'title'   => __( 'Previewing and Installing' ),
+		'content' => $help_installing,
+	)
+);
+
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes">Documentation on Adding New Themes</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+);
+
+include( ABSPATH . 'wp-admin/admin-header.php' );
 
 ?>
 <div class="wrap">
@@ -357,4 +364,4 @@ if ( $tab ) {
 wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index be3d09d6f3..b399f92f67 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -17,9 +17,9 @@ if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_op
 	);
 }
 
-if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
+if ( current_user_can( 'switch_themes' ) && isset( $_GET['action'] ) ) {
 	if ( 'activate' == $_GET['action'] ) {
-		check_admin_referer('switch-theme_' . $_GET['stylesheet']);
+		check_admin_referer( 'switch-theme_' . $_GET['stylesheet'] );
 		$theme = wp_get_theme( $_GET['stylesheet'] );
 
 		if ( ! $theme->exists() || ! $theme->is_allowed() ) {
@@ -31,10 +31,10 @@ if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
 		}
 
 		switch_theme( $theme->get_stylesheet() );
-		wp_redirect( admin_url('themes.php?activated=true') );
+		wp_redirect( admin_url( 'themes.php?activated=true' ) );
 		exit;
 	} elseif ( 'delete' == $_GET['action'] ) {
-		check_admin_referer('delete-theme_' . $_GET['stylesheet']);
+		check_admin_referer( 'delete-theme_' . $_GET['stylesheet'] );
 		$theme = wp_get_theme( $_GET['stylesheet'] );
 
 		if ( ! current_user_can( 'delete_themes' ) ) {
@@ -64,12 +64,12 @@ if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
 	}
 }
 
-$title = __('Manage Themes');
+$title       = __( 'Manage Themes' );
 $parent_file = 'themes.php';
 
 // Help tab: Overview
 if ( current_user_can( 'switch_themes' ) ) {
-	$help_overview  = '<p>' . __( 'This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.' ) . '</p>' .
+	$help_overview = '<p>' . __( 'This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.' ) . '</p>' .
 		'<p>' . __( 'From this screen you can:' ) . '</p>' .
 		'<ul><li>' . __( 'Hover or tap to see Activate and Live Preview buttons' ) . '</li>' .
 		'<li>' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '</li>' .
@@ -77,40 +77,46 @@ if ( current_user_can( 'switch_themes' ) ) {
 		'<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>' .
 		'<p>' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
-		'content' => $help_overview
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' => $help_overview,
+		)
+	);
 } // switch_themes
 
 // Help tab: Adding Themes
 if ( current_user_can( 'install_themes' ) ) {
 	if ( is_multisite() ) {
-		$help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
+		$help_install = '<p>' . __( 'Installing themes on Multisite can only be done from the Network Admin section.' ) . '</p>';
 	} else {
-		$help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional themes from the <a href="%s">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), __( 'https://wordpress.org/themes/' ) ) . '</p>';
+		$help_install = '<p>' . sprintf( __( 'If you would like to see more themes to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional themes from the <a href="%s">WordPress Theme Directory</a>. Themes in the WordPress Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ), __( 'https://wordpress.org/themes/' ) ) . '</p>';
 	}
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'adding-themes',
-		'title'   => __('Adding Themes'),
-		'content' => $help_install
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'adding-themes',
+			'title'   => __( 'Adding Themes' ),
+			'content' => $help_install,
+		)
+	);
 } // install_themes
 
 // Help tab: Previewing and Customizing
 if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
 	$help_customize =
-		'<p>' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '</p>'.
+		'<p>' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '</p>' .
 		'<p>' . __( 'The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Publish &amp; Activate button above the menu.' ) . '</p>' .
 		'<p>' . __( 'When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again.' ) . '</p>';
 
-	get_current_screen()->add_help_tab( array(
-		'id'		=> 'customize-preview-themes',
-		'title'		=> __( 'Previewing and Customizing' ),
-		'content'	=> $help_customize
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'customize-preview-themes',
+			'title'   => __( 'Previewing and Customizing' ),
+			'content' => $help_customize,
+		)
+	);
 } // edit_theme_options && customize
 
 get_current_screen()->set_help_sidebar(
@@ -126,22 +132,24 @@ if ( current_user_can( 'switch_themes' ) ) {
 }
 wp_reset_vars( array( 'theme', 'search' ) );
 
-wp_localize_script( 'theme', '_wpThemeSettings', array(
-	'themes'   => $themes,
-	'settings' => array(
-		'canInstall'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
-		'installURI'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
-		'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
-		'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),
-	),
- 	'l10n' => array(
- 		'addNew'            => __( 'Add New Theme' ),
- 		'search'            => __( 'Search Installed Themes' ),
- 		'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
-		'themesFound'       => __( 'Number of Themes found: %d' ),
-		'noThemesFound'     => __( 'No themes found. Try a different search.' ),
-  	),
-) );
+wp_localize_script(
+	'theme', '_wpThemeSettings', array(
+		'themes'   => $themes,
+		'settings' => array(
+			'canInstall'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
+			'installURI'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
+			'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
+			'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),
+		),
+		'l10n'     => array(
+			'addNew'            => __( 'Add New Theme' ),
+			'search'            => __( 'Search Installed Themes' ),
+			'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
+			'themesFound'       => __( 'Number of Themes found: %d' ),
+			'noThemesFound'     => __( 'No themes found. Try a different search.' ),
+		),
+	)
+);
 
 add_thickbox();
 wp_enqueue_script( 'theme' );
@@ -163,16 +171,21 @@ 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 elseif ( isset($_GET['activated']) ) :
-		if ( isset( $_GET['previewed'] ) ) { ?>
+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
+elseif ( isset( $_GET['activated'] ) ) :
+	if ( isset( $_GET['previewed'] ) ) {
+		?>
 		<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
 		<?php } else { ?>
-<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div><?php
-		}
-	elseif ( isset($_GET['deleted']) ) : ?>
-<div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
+<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
+																		<?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
@@ -192,44 +205,47 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
 
 	// Pretend you didn't see this.
 	$current_theme_actions = array();
-	if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
-		foreach ( (array) $submenu['themes.php'] as $item) {
-			$class = '';
-			if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) )
-				continue;
-			// 0 = name, 1 = capability, 2 = file
-			if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
-				$class = ' current';
-			if ( !empty($submenu[$item[2]]) ) {
-				$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
-				$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-				if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-					$current_theme_actions[] = "<a class='button$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
-				else
-					$current_theme_actions[] = "<a class='button$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
-			} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
-				$menu_file = $item[2];
+if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
+	foreach ( (array) $submenu['themes.php'] as $item ) {
+		$class = '';
+		if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) {
+			continue;
+		}
+		// 0 = name, 1 = capability, 2 = file
+		if ( ( strcmp( $self, $item[2] ) == 0 && empty( $parent_file ) ) || ( $parent_file && ( $item[2] == $parent_file ) ) ) {
+			$class = ' current';
+		}
+		if ( ! empty( $submenu[ $item[2] ] ) ) {
+			$submenu[ $item[2] ] = array_values( $submenu[ $item[2] ] ); // Re-index.
+			$menu_hook           = get_plugin_page_hook( $submenu[ $item[2] ][0][2], $item[2] );
+			if ( file_exists( WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}" ) || ! empty( $menu_hook ) ) {
+				$current_theme_actions[] = "<a class='button$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+			} else {
+				$current_theme_actions[] = "<a class='button$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+			}
+		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+			$menu_file = $item[2];
 
-				if ( current_user_can( 'customize' ) ) {
-					if ( 'custom-header' === $menu_file ) {
-						$current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
-					} elseif ( 'custom-background' === $menu_file ) {
-						$current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
-					}
+			if ( current_user_can( 'customize' ) ) {
+				if ( 'custom-header' === $menu_file ) {
+					$current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
+				} elseif ( 'custom-background' === $menu_file ) {
+					$current_theme_actions[] = "<a class='button hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
 				}
+			}
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
-					$menu_file = substr( $menu_file, 0, $pos );
-				}
+			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
+				$menu_file = substr( $menu_file, 0, $pos );
+			}
 
-				if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
-					$current_theme_actions[] = "<a class='button$class' href='{$item[2]}'>{$item[0]}</a>";
-				} else {
-					$current_theme_actions[] = "<a class='button$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";
-				}
+			if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
+				$current_theme_actions[] = "<a class='button$class' href='{$item[2]}'>{$item[0]}</a>";
+			} else {
+				$current_theme_actions[] = "<a class='button$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";
 			}
 		}
 	}
+}
 
 ?>
 
@@ -318,21 +334,21 @@ 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 ) ) ) {
+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>
+<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_delete  = current_user_can( 'delete_themes' );
 $can_install = current_user_can( 'install_themes' );
 ?>
 <table>
 	<tr>
-		<th><?php _ex('Name', 'theme name'); ?></th>
-		<th><?php _e('Description'); ?></th>
+		<th><?php _ex( 'Name', 'theme name' ); ?></th>
+		<th><?php _e( 'Description' ); ?></th>
 		<?php if ( $can_delete ) { ?>
 			<td></td>
 		<?php } ?>
@@ -347,10 +363,12 @@ $can_install = current_user_can( 'install_themes' );
 			<?php
 			if ( $can_delete ) {
 				$stylesheet = $broken_theme->get_stylesheet();
-				$delete_url = add_query_arg( array(
-					'action'     => 'delete',
-					'stylesheet' => urlencode( $stylesheet ),
-				), admin_url( 'themes.php' ) );
+				$delete_url = add_query_arg(
+					array(
+						'action'     => 'delete',
+						'stylesheet' => urlencode( $stylesheet ),
+					), admin_url( 'themes.php' )
+				);
 				$delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
 				?>
 				<td><a href="<?php echo esc_url( $delete_url ); ?>" class="button delete-theme"><?php _e( 'Delete' ); ?></a></td>
@@ -359,13 +377,15 @@ $can_install = current_user_can( 'install_themes' );
 
 			if ( $can_install && 'theme_no_parent' === $broken_theme->errors()->get_error_code() ) {
 				$parent_theme_name = $broken_theme->get( 'Template' );
-				$parent_theme = themes_api( 'theme_information', array( 'slug' => urlencode( $parent_theme_name ) ) );
+				$parent_theme      = themes_api( 'theme_information', array( 'slug' => urlencode( $parent_theme_name ) ) );
 
 				if ( ! is_wp_error( $parent_theme ) ) {
-					$install_url = add_query_arg( array(
-						'action' => 'install-theme',
-						'theme'  => urlencode( $parent_theme_name ),
-					), admin_url( 'update.php' ) );
+					$install_url = add_query_arg(
+						array(
+							'action' => 'install-theme',
+							'theme'  => urlencode( $parent_theme_name ),
+						), admin_url( 'update.php' )
+					);
 					$install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
 					?>
 					<td><a href="<?php echo esc_url( $install_url ); ?>" class="button install-theme"><?php _e( 'Install Parent Theme' ); ?></a></td>
@@ -512,8 +532,10 @@ wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 wp_print_update_row_templates();
 
-wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-	'totals'  => wp_get_update_data(),
-) );
+wp_localize_script(
+	'updates', '_wpUpdatesItemCounts', array(
+		'totals' => wp_get_update_data(),
+	)
+);
 
 require( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 02b679b91e..f6f10bee7e 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -19,11 +19,11 @@ if ( is_multisite() && ! is_network_admin() ) {
 	exit();
 }
 
-if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) )
+if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+}
 
 /**
- *
  * @global string $wp_local_package
  * @global wpdb   $wpdb
  *
@@ -32,55 +32,59 @@ if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes'
  * @param object $update
  */
 function list_core_update( $update ) {
- 	global $wp_local_package, $wpdb;
-  	static $first_pass = true;
+	global $wp_local_package, $wpdb;
+	static $first_pass = true;
 
 	$wp_version = get_bloginfo( 'version' );
 
- 	if ( 'en_US' == $update->locale && 'en_US' == get_locale() )
- 		$version_string = $update->current;
- 	// If the only available update is a partial builds, it doesn't need a language-specific version string.
- 	elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) )
- 		$version_string = $update->current;
- 	else
- 		$version_string = sprintf( "%s&ndash;<strong>%s</strong>", $update->current, $update->locale );
+	if ( 'en_US' == $update->locale && 'en_US' == get_locale() ) {
+		$version_string = $update->current;
+	} // If the only available update is a partial builds, it doesn't need a language-specific version string.
+	elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) {
+		$version_string = $update->current;
+	} else {
+		$version_string = sprintf( '%s&ndash;<strong>%s</strong>', $update->current, $update->locale );
+	}
 
 	$current = false;
-	if ( !isset($update->response) || 'latest' == $update->response )
+	if ( ! isset( $update->response ) || 'latest' == $update->response ) {
 		$current = true;
-	$submit = __('Update Now');
-	$form_action = 'update-core.php?action=do-core-upgrade';
-	$php_version    = phpversion();
-	$mysql_version  = $wpdb->db_version();
-	$show_buttons = true;
+	}
+	$submit        = __( 'Update Now' );
+	$form_action   = 'update-core.php?action=do-core-upgrade';
+	$php_version   = phpversion();
+	$mysql_version = $wpdb->db_version();
+	$show_buttons  = true;
 	if ( 'development' == $update->response ) {
-		$message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically:');
+		$message = __( 'You are using a development version of WordPress. You can update to the latest nightly build automatically:' );
 	} else {
 		if ( $current ) {
-			$message = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string );
-			$submit = __('Re-install Now');
+			$message     = sprintf( __( 'If you need to re-install version %s, you can do so here:' ), $version_string );
+			$submit      = __( 'Re-install Now' );
 			$form_action = 'update-core.php?action=do-core-reinstall';
 		} else {
-			$php_compat     = version_compare( $php_version, $update->php_version, '>=' );
-			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+			$php_compat = version_compare( $php_version, $update->php_version, '>=' );
+			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
 				$mysql_compat = true;
-			else
+			} else {
 				$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
+			}
 
-			if ( !$mysql_compat && !$php_compat )
+			if ( ! $mysql_compat && ! $php_compat ) {
 				/* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Minimum required MySQL version number, 4: Current PHP version number, 5: Current MySQL version number */
-				$message = sprintf( __('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.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
-			elseif ( !$php_compat )
+				$message = sprintf( __( '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.' ), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
+			} elseif ( ! $php_compat ) {
 				/* translators: 1: WordPress version number, 2: Minimum required PHP version number, 3: Current PHP version number */
-				$message = sprintf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
-			elseif ( !$mysql_compat )
+				$message = sprintf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $update->current, $update->php_version, $php_version );
+			} elseif ( ! $mysql_compat ) {
 				/* translators: 1: WordPress version number, 2: Minimum required MySQL version number, 3: Current MySQL version number */
-				$message = sprintf( __('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.'), $update->current, $update->mysql_version, $mysql_version );
-			else
-				/* translators: 1: WordPress version number, 2: WordPress version number including locale if necessary */
-				$message = 	sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically:'), $update->current, $version_string);
-			if ( !$mysql_compat || !$php_compat )
+				$message = sprintf( __( '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.' ), $update->current, $update->mysql_version, $mysql_version );
+			} else {              /* translators: 1: WordPress version number, 2: WordPress version number including locale if necessary */
+				$message = sprintf( __( 'You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically:' ), $update->current, $version_string );
+			}
+			if ( ! $mysql_compat || ! $php_compat ) {
 				$show_buttons = false;
+			}
 		}
 	}
 
@@ -88,10 +92,10 @@ function list_core_update( $update ) {
 	echo $message;
 	echo '</p>';
 	echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
-	wp_nonce_field('upgrade-core');
+	wp_nonce_field( 'upgrade-core' );
 	echo '<p>';
-	echo '<input name="version" value="'. esc_attr($update->current) .'" type="hidden"/>';
-	echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
+	echo '<input name="version" value="' . esc_attr( $update->current ) . '" type="hidden"/>';
+	echo '<input name="locale" value="' . esc_attr( $update->locale ) . '" type="hidden"/>';
 	if ( $show_buttons ) {
 		if ( $first_pass ) {
 			submit_button( $submit, $current ? '' : 'primary regular', 'upgrade', false );
@@ -100,17 +104,19 @@ function list_core_update( $update ) {
 			submit_button( $submit, '', 'upgrade', false );
 		}
 	}
-	if ( 'en_US' != $update->locale )
-		if ( !isset( $update->dismissed ) || !$update->dismissed )
+	if ( 'en_US' != $update->locale ) {
+		if ( ! isset( $update->dismissed ) || ! $update->dismissed ) {
 			submit_button( __( 'Hide this update' ), '', 'dismiss', false );
-		else
+		} else {
 			submit_button( __( 'Bring back this update' ), '', 'undismiss', false );
+		}
+	}
 	echo '</p>';
-	if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) )
-	    echo '<p class="hint">'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'</p>';
-	// Partial builds don't need language-specific warnings.
+	if ( 'en_US' != $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
+		echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.' ) . '</p>';
+	} // Partial builds don't need language-specific warnings.
 	elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
-	    echo '<p class="hint">'.sprintf( __('You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.'), $update->response != 'development' ? $update->current : '' ).'</p>';
+		echo '<p class="hint">' . sprintf( __( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ), $update->response != 'development' ? $update->current : '' ) . '</p>';
 	}
 	echo '</form>';
 
@@ -120,11 +126,16 @@ function list_core_update( $update ) {
  * @since 2.7.0
  */
 function dismissed_updates() {
-	$dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) );
+	$dismissed = get_core_updates(
+		array(
+			'dismissed' => true,
+			'available' => false,
+		)
+	);
 	if ( $dismissed ) {
 
-		$show_text = esc_js(__('Show hidden updates'));
-		$hide_text = esc_js(__('Hide hidden updates'));
+		$show_text = esc_js( __( 'Show hidden updates' ) );
+		$hide_text = esc_js( __( 'Hide hidden updates' ) );
 	?>
 	<script type="text/javascript">
 
@@ -135,13 +146,13 @@ function dismissed_updates() {
 		});
 	</script>
 	<?php
-		echo '<p class="hide-if-no-js"><a id="show-dismissed" href="#">'.__('Show hidden updates').'</a></p>';
+		echo '<p class="hide-if-no-js"><a id="show-dismissed" href="#">' . __( 'Show hidden updates' ) . '</a></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>';
 	}
 }
@@ -158,29 +169,30 @@ function core_upgrade_preamble() {
 	global $required_php_version, $required_mysql_version;
 
 	$wp_version = get_bloginfo( 'version' );
-	$updates = get_core_updates();
+	$updates    = get_core_updates();
 
-	if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
+	if ( ! isset( $updates[0]->response ) || 'latest' == $updates[0]->response ) {
 		echo '<h2>';
-		_e('You have the latest version of WordPress.');
+		_e( 'You have the latest version of WordPress.' );
 
 		if ( wp_http_supports( array( 'ssl' ) ) ) {
 			require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-			$upgrader = new WP_Automatic_Updater;
+			$upgrader            = new WP_Automatic_Updater;
 			$future_minor_update = (object) array(
 				'current'       => $wp_version . '.1.next.minor',
 				'version'       => $wp_version . '.1.next.minor',
 				'php_version'   => $required_php_version,
 				'mysql_version' => $required_mysql_version,
 			);
-			$should_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
-			if ( $should_auto_update )
+			$should_auto_update  = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
+			if ( $should_auto_update ) {
 				echo ' ' . __( 'Future security updates will be applied automatically.' );
+			}
 		}
 		echo '</h2>';
 	} else {
 		echo '<div class="notice notice-warning"><p>';
-		_e('<strong>Important:</strong> before updating, please <a href="https://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="https://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
+		_e( '<strong>Important:</strong> before updating, please <a href="https://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="https://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.' );
 		echo '</p></div>';
 
 		echo '<h2 class="response">';
@@ -210,16 +222,16 @@ function core_upgrade_preamble() {
 		echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>';
 	} elseif ( ! $updates ) {
 		list( $normalized_version ) = explode( '-', $wp_version );
-		echo '<p>' . sprintf( __( '<a href="%s">Learn more about WordPress %s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
+		echo '<p>' . sprintf( __( '<a href="%1$s">Learn more about WordPress %2$s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
 	}
 	dismissed_updates();
 }
 
 function list_plugin_updates() {
-	$wp_version = get_bloginfo( 'version' );
+	$wp_version     = get_bloginfo( 'version' );
 	$cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
 
-	require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
+	require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
 	$plugins = get_plugin_updates();
 	if ( empty( $plugins ) ) {
 		echo '<h2>' . __( 'Plugins' ) . '</h2>';
@@ -229,16 +241,17 @@ function list_plugin_updates() {
 	$form_action = 'update-core.php?action=do-plugin-upgrade';
 
 	$core_updates = get_core_updates();
-	if ( !isset($core_updates[0]->response) || 'latest' == $core_updates[0]->response || 'development' == $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=') )
+	if ( ! isset( $core_updates[0]->response ) || 'latest' == $core_updates[0]->response || 'development' == $core_updates[0]->response || version_compare( $core_updates[0]->current, $cur_wp_version, '=' ) ) {
 		$core_update_version = false;
-	else
+	} else {
 		$core_update_version = $core_updates[0]->current;
+	}
 	?>
 <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'); ?>
-<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
+<?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>
 	<tr>
@@ -249,82 +262,86 @@ function list_plugin_updates() {
 
 	<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 );
+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', '1x', '2x', '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', '1x', '2x', '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);
-		} elseif ( isset($plugin_data->update->compatibility->{$cur_wp_version}) ) {
-			$compat = $plugin_data->update->compatibility->{$cur_wp_version};
-			$compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $cur_wp_version, $compat->percent, $compat->votes, $compat->total_votes);
+	// 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 );
+	} elseif ( isset( $plugin_data->update->compatibility->{$cur_wp_version} ) ) {
+		$compat = $plugin_data->update->compatibility->{$cur_wp_version};
+		$compat = '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)' ), $cur_wp_version, $compat->percent, $compat->votes, $compat->total_votes );
+	} 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 );
+		} elseif ( isset( $plugin_data->update->compatibility->{$core_update_version} ) ) {
+			$update_compat = $plugin_data->update->compatibility->{$core_update_version};
+			$compat       .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)' ), $core_update_version, $update_compat->percent, $update_compat->votes, $update_compat->total_votes );
 		} 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 );
-			} elseif ( isset( $plugin_data->update->compatibility->{$core_update_version} ) ) {
-				$update_compat = $plugin_data->update->compatibility->{$core_update_version};
-				$compat .= '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $core_update_version, $update_compat->percent, $update_compat->votes, $update_compat->total_votes);
-			} 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 = '';
+			$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 = '';
+	}
 
-		$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 );
-		?>
-		<tr>
-			<td class="check-column">
-				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
-				<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text"><?php
-					/* translators: %s: plugin name */
-					printf( __( 'Select %s' ),
-						$plugin_data->Name
-					);
-				?></label>
+	$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 ); ?>" />
+			<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
+										<?php
+										/* translators: %s: plugin name */
+										printf(
+											__( 'Select %s' ),
+											$plugin_data->Name
+										);
+				?>
+				</label>
 			</td>
 			<td class="plugin-title"><p>
 				<?php echo $icon; ?>
 				<strong><?php echo $plugin_data->Name; ?></strong>
 				<?php
-					/* translators: 1: plugin version, 2: new version */
-					printf( __( 'You have version %1$s installed. Update to %2$s.' ),
-						$plugin_data->Version,
-						$plugin_data->update->new_version
-					);
-					echo ' ' . $details . $compat . $upgrade_notice;
-				?>
+				/* translators: 1: plugin version, 2: new version */
+				printf(
+					__( 'You have version %1$s installed. Update to %2$s.' ),
+					$plugin_data->Version,
+					$plugin_data->update->new_version
+				);
+				echo ' ' . $details . $compat . $upgrade_notice;
+			?>
 			</p></td>
 		</tr>
 		<?php
-	}
+}
 ?>
 	</tbody>
 
@@ -335,7 +352,7 @@ function list_plugin_updates() {
 	</tr>
 	</tfoot>
 </table>
-<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
+<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Plugins' ); ?>" name="upgrade" /></p>
 </form>
 <?php
 }
@@ -357,8 +374,8 @@ function list_theme_updates() {
 <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'); ?>
-<p><input id="upgrade-themes" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
+<?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>
 	<tr>
@@ -369,33 +386,37 @@ function list_theme_updates() {
 
 	<tbody class="plugins">
 <?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 ); ?>" />
-				<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text"><?php
-					/* translators: %s: theme name */
-					printf( __( 'Select %s' ),
-						$theme->display( 'Name' )
-					);
-				?></label>
+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 ); ?>" />
+			<label for="<?php echo $checkbox_id; ?>" class="screen-reader-text">
+										<?php
+										/* translators: %s: theme name */
+										printf(
+											__( 'Select %s' ),
+											$theme->display( 'Name' )
+										);
+				?>
+				</label>
 			</td>
 			<td class="plugin-title"><p>
 				<img src="<?php echo esc_url( $theme->get_screenshot() ); ?>" width="85" height="64" class="updates-table-screenshot" alt="" />
 				<strong><?php echo $theme->display( 'Name' ); ?></strong>
 				<?php
-					/* translators: 1: theme version, 2: new version */
-					printf( __( 'You have version %1$s installed. Update to %2$s.' ),
-						$theme->display( 'Version' ),
-						$theme->update['new_version']
-					);
-				?>
+				/* translators: 1: theme version, 2: new version */
+				printf(
+					__( 'You have version %1$s installed. Update to %2$s.' ),
+					$theme->display( 'Version' ),
+					$theme->update['new_version']
+				);
+			?>
 			</p></td>
 		</tr>
 		<?php
-	}
+}
 ?>
 	</tbody>
 
@@ -406,7 +427,7 @@ function list_theme_updates() {
 	</tr>
 	</tfoot>
 </table>
-<p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e('Update Themes'); ?>" name="upgrade" /></p>
+<p><input id="upgrade-themes-2" class="button" type="submit" value="<?php esc_attr_e( 'Update Themes' ); ?>" name="upgrade" /></p>
 </form>
 <?php
 }
@@ -449,17 +470,19 @@ function do_core_upgrade( $reinstall = false ) {
 
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
-	if ( $reinstall )
+	if ( $reinstall ) {
 		$url = 'update-core.php?action=do-core-reinstall';
-	else
+	} else {
 		$url = 'update-core.php?action=do-core-upgrade';
-	$url = wp_nonce_url($url, 'upgrade-core');
+	}
+	$url = wp_nonce_url( $url, 'upgrade-core' );
 
-	$version = isset( $_POST['version'] )? $_POST['version'] : false;
-	$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
-	$update = find_core_update( $version, $locale );
-	if ( !$update )
+	$version = isset( $_POST['version'] ) ? $_POST['version'] : false;
+	$locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
+	$update  = find_core_update( $version, $locale );
+	if ( ! $update ) {
 		return;
+	}
 
 	// Allow relaxed file ownership writes for User-initiated upgrades when the API specifies
 	// that it's safe to do so. This only happens when there are no new files to create.
@@ -470,44 +493,49 @@ function do_core_upgrade( $reinstall = false ) {
 	<h1><?php _e( 'Update WordPress' ); ?></h1>
 <?php
 
-	if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
-		echo '</div>';
-		return;
-	}
+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( $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->get_error_code() ) {
-		foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-			show_message($message);
-		echo '</div>';
-		return;
+if ( $wp_filesystem->errors->get_error_code() ) {
+	foreach ( $wp_filesystem->errors->get_error_messages() as $message ) {
+		show_message( $message );
 	}
+	echo '</div>';
+	return;
+}
 
-	if ( $reinstall )
-		$update->response = 'reinstall';
+if ( $reinstall ) {
+	$update->response = 'reinstall';
+}
 
 	add_filter( 'update_feedback', 'show_message' );
 
 	$upgrader = new Core_Upgrader();
-	$result = $upgrader->upgrade( $update, array(
-		'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership
-	) );
+	$result   = $upgrader->upgrade(
+		$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') );
-		echo '</div>';
-		return;
+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;
+}
 
-	show_message( __('WordPress updated successfully') );
+	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>' );
 	show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
 	?>
@@ -522,13 +550,14 @@ function do_core_upgrade( $reinstall = false ) {
  * @since 2.7.0
  */
 function do_dismiss_core_update() {
-	$version = isset( $_POST['version'] )? $_POST['version'] : false;
-	$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
-	$update = find_core_update( $version, $locale );
-	if ( !$update )
+	$version = isset( $_POST['version'] ) ? $_POST['version'] : false;
+	$locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
+	$update  = find_core_update( $version, $locale );
+	if ( ! $update ) {
 		return;
+	}
 	dismiss_core_update( $update );
-	wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
+	wp_redirect( wp_nonce_url( 'update-core.php?action=upgrade-core', 'upgrade-core' ) );
 	exit;
 }
 
@@ -536,36 +565,39 @@ function do_dismiss_core_update() {
  * @since 2.7.0
  */
 function do_undismiss_core_update() {
-	$version = isset( $_POST['version'] )? $_POST['version'] : false;
-	$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
-	$update = find_core_update( $version, $locale );
-	if ( !$update )
+	$version = isset( $_POST['version'] ) ? $_POST['version'] : false;
+	$locale  = isset( $_POST['locale'] ) ? $_POST['locale'] : 'en_US';
+	$update  = find_core_update( $version, $locale );
+	if ( ! $update ) {
 		return;
+	}
 	undismiss_core_update( $version, $locale );
-	wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
+	wp_redirect( wp_nonce_url( 'update-core.php?action=upgrade-core', 'upgrade-core' ) );
 	exit;
 }
 
-$action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core';
+$action = isset( $_GET['action'] ) ? $_GET['action'] : 'upgrade-core';
 
 $upgrade_error = false;
 if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) )
 	&& ! isset( $_POST['checked'] ) ) {
 	$upgrade_error = $action == 'do-theme-upgrade' ? 'themes' : 'plugins';
-	$action = 'upgrade-core';
+	$action        = 'upgrade-core';
 }
 
-$title = __('WordPress Updates');
+$title       = __( 'WordPress Updates' );
 $parent_file = 'index.php';
 
 $updates_overview  = '<p>' . __( 'On this screen, you can update to the latest version of WordPress, as well as update your themes, plugins, and translations from the WordPress.org repositories.' ) . '</p>';
 $updates_overview .= '<p>' . __( 'If an update is available, you&#8127;ll see a notification appear in the Toolbar and navigation menu.' ) . ' ' . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' ) . '</p>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
-	'content' => $updates_overview
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $updates_overview,
+	)
+);
 
 $updates_howto  = '<p>' . __( '<strong>WordPress</strong> &mdash; Updating your WordPress installation is a simple one-click procedure: just <strong>click on the &#8220;Update Now&#8221; button</strong> when you are notified that a new version is available.' ) . ' ' . __( 'In most cases, WordPress will automatically apply maintenance and security updates in the background for you.' ) . '</p>';
 $updates_howto .= '<p>' . __( '<strong>Themes and Plugins</strong> &mdash; To update individual themes or plugins from this screen, use the checkboxes to make your selection, then <strong>click on the appropriate &#8220;Update&#8221; button</strong>. To update all of your themes or plugins at once, you can check the box at the top of the section to select all before clicking the update button.' ) . '</p>';
@@ -574,14 +606,16 @@ if ( 'en_US' != get_locale() ) {
 	$updates_howto .= '<p>' . __( '<strong>Translations</strong> &mdash; The files translating WordPress into your language are updated for you whenever any other updates occur. But if these files are out of date, you can <strong>click the &#8220;Update Translations&#8221;</strong> button.' ) . '</p>';
 }
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'how-to-update',
-	'title'   => __( 'How to Update' ),
-	'content' => $updates_howto
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'how-to-update',
+		'title'   => __( 'How to Update' ),
+		'content' => $updates_howto,
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
 	'<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Updates_Screen">Documentation on Updating WordPress</a>' ) . '</p>' .
 	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
@@ -591,31 +625,32 @@ if ( 'upgrade-core' == $action ) {
 	$force_check = ! empty( $_GET['force-check'] );
 	wp_version_check( array(), $force_check );
 
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
+	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<div class="wrap">
 	<h1><?php _e( 'WordPress Updates' ); ?></h1>
 	<?php
 	if ( $upgrade_error ) {
 		echo '<div class="error"><p>';
-		if ( $upgrade_error == 'themes' )
-			_e('Please select one or more themes to update.');
-		else
-			_e('Please select one or more plugins to update.');
+		if ( $upgrade_error == 'themes' ) {
+			_e( 'Please select one or more themes to update.' );
+		} else {
+			_e( 'Please select one or more plugins to update.' );
+		}
 		echo '</p></div>';
 	}
 
 	$last_update_check = false;
-	$current = get_site_transient( 'update_core' );
+	$current           = get_site_transient( 'update_core' );
 
-	if ( $current && isset ( $current->last_checked ) )	{
+	if ( $current && isset( $current->last_checked ) ) {
 		$last_update_check = $current->last_checked + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
 	}
 
 	echo '<p>';
 	/* translators: %1 date, %2 time. */
 	printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ), $last_update_check ), date_i18n( __( 'g:i a' ), $last_update_check ) );
-	echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php?force-check=1') ) . '">' . __( 'Check Again' ) . '</a>';
+	echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url( 'update-core.php?force-check=1' ) ) . '">' . __( 'Check Again' ) . '</a>';
 	echo '</p>';
 
 	if ( current_user_can( 'update_core' ) ) {
@@ -639,129 +674,146 @@ if ( 'upgrade-core' == $action ) {
 	do_action( 'core_upgrade_preamble' );
 	echo '</div>';
 
-	wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-		'totals'  => wp_get_update_data(),
-	) );
+	wp_localize_script(
+		'updates', '_wpUpdatesItemCounts', array(
+			'totals' => wp_get_update_data(),
+		)
+	);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
 
-	if ( ! current_user_can( 'update_core' ) )
+	if ( ! current_user_can( 'update_core' ) ) {
 		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	}
 
-	check_admin_referer('upgrade-core');
+	check_admin_referer( 'upgrade-core' );
 
 	// Do the (un)dismiss actions before headers, so that they can redirect.
-	if ( isset( $_POST['dismiss'] ) )
+	if ( isset( $_POST['dismiss'] ) ) {
 		do_dismiss_core_update();
-	elseif ( isset( $_POST['undismiss'] ) )
+	} elseif ( isset( $_POST['undismiss'] ) ) {
 		do_undismiss_core_update();
+	}
 
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
-	if ( 'do-core-reinstall' == $action )
+	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	if ( 'do-core-reinstall' == $action ) {
 		$reinstall = true;
-	else
+	} else {
 		$reinstall = false;
+	}
 
-	if ( isset( $_POST['upgrade'] ) )
-		do_core_upgrade($reinstall);
+	if ( isset( $_POST['upgrade'] ) ) {
+		do_core_upgrade( $reinstall );
+	}
 
-	wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-		'totals'  => wp_get_update_data(),
-	) );
+	wp_localize_script(
+		'updates', '_wpUpdatesItemCounts', array(
+			'totals' => wp_get_update_data(),
+		)
+	);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 } elseif ( 'do-plugin-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_plugins' ) )
+	if ( ! current_user_can( 'update_plugins' ) ) {
 		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	}
 
-	check_admin_referer('upgrade-core');
+	check_admin_referer( 'upgrade-core' );
 
 	if ( isset( $_GET['plugins'] ) ) {
 		$plugins = explode( ',', $_GET['plugins'] );
 	} elseif ( isset( $_POST['checked'] ) ) {
 		$plugins = (array) $_POST['checked'];
 	} else {
-		wp_redirect( admin_url('update-core.php') );
+		wp_redirect( admin_url( 'update-core.php' ) );
 		exit;
 	}
 
-	$url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
-	$url = wp_nonce_url($url, 'bulk-update-plugins');
+	$url = 'update.php?action=update-selected&plugins=' . urlencode( implode( ',', $plugins ) );
+	$url = wp_nonce_url( $url, 'bulk-update-plugins' );
 
-	$title = __('Update Plugins');
+	$title = __( 'Update Plugins' );
 
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
+	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	echo '<div class="wrap">';
 	echo '<h1>' . __( 'Update Plugins' ) . '</h1>';
 	echo '<iframe src="', $url, '" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="' . esc_attr__( 'Update progress' ) . '"></iframe>';
 	echo '</div>';
 
-	wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-		'totals'  => wp_get_update_data(),
-	) );
+	wp_localize_script(
+		'updates', '_wpUpdatesItemCounts', array(
+			'totals' => wp_get_update_data(),
+		)
+	);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 } elseif ( 'do-theme-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_themes' ) )
+	if ( ! current_user_can( 'update_themes' ) ) {
 		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	}
 
-	check_admin_referer('upgrade-core');
+	check_admin_referer( 'upgrade-core' );
 
 	if ( isset( $_GET['themes'] ) ) {
 		$themes = explode( ',', $_GET['themes'] );
 	} elseif ( isset( $_POST['checked'] ) ) {
 		$themes = (array) $_POST['checked'];
 	} else {
-		wp_redirect( admin_url('update-core.php') );
+		wp_redirect( admin_url( 'update-core.php' ) );
 		exit;
 	}
 
-	$url = 'update.php?action=update-selected-themes&themes=' . urlencode(implode(',', $themes));
-	$url = wp_nonce_url($url, 'bulk-update-themes');
+	$url = 'update.php?action=update-selected-themes&themes=' . urlencode( implode( ',', $themes ) );
+	$url = wp_nonce_url( $url, 'bulk-update-themes' );
 
-	$title = __('Update Themes');
+	$title = __( 'Update Themes' );
 
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
+	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
 	<div class="wrap">
 		<h1><?php _e( 'Update Themes' ); ?></h1>
-		<iframe src="<?php echo $url ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e( 'Update progress' ); ?>"></iframe>
+		<iframe src="<?php echo $url; ?>" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="<?php esc_attr_e( 'Update progress' ); ?>"></iframe>
 	</div>
 	<?php
 
-	wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-		'totals'  => wp_get_update_data(),
-	) );
+	wp_localize_script(
+		'updates', '_wpUpdatesItemCounts', array(
+			'totals' => wp_get_update_data(),
+		)
+	);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 } elseif ( 'do-translation-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_languages' ) )
+	if ( ! current_user_can( 'update_languages' ) ) {
 		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	}
 
 	check_admin_referer( 'upgrade-translations' );
 
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
-	$url = 'update-core.php?action=do-translation-upgrade';
-	$nonce = 'upgrade-translations';
-	$title = __( 'Update Translations' );
+	$url     = 'update-core.php?action=do-translation-upgrade';
+	$nonce   = 'upgrade-translations';
+	$title   = __( 'Update Translations' );
 	$context = WP_LANG_DIR;
 
 	$upgrader = new Language_Pack_Upgrader( new Language_Pack_Upgrader_Skin( compact( 'url', 'nonce', 'title', 'context' ) ) );
-	$result = $upgrader->bulk_upgrade();
+	$result   = $upgrader->bulk_upgrade();
 
-	wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
-		'totals'  => wp_get_update_data(),
-	) );
+	wp_localize_script(
+		'updates', '_wpUpdatesItemCounts', array(
+			'totals' => wp_get_update_data(),
+		)
+	);
 
 	require_once( ABSPATH . 'wp-admin/admin-footer.php' );
 
diff --git a/wp-admin/update.php b/wp-admin/update.php
index 12b8f565e2..bb7bf8f7bb 100644
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -6,35 +6,38 @@
  * @subpackage Administration
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
-if ( isset($_GET['action']) ) {
-	$plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
-	$theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
-	$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+if ( isset( $_GET['action'] ) ) {
+	$plugin = isset( $_REQUEST['plugin'] ) ? trim( $_REQUEST['plugin'] ) : '';
+	$theme  = isset( $_REQUEST['theme'] ) ? urldecode( $_REQUEST['theme'] ) : '';
+	$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : '';
 
 	if ( 'update-selected' == $action ) {
-		if ( ! current_user_can( 'update_plugins' ) )
+		if ( ! current_user_can( 'update_plugins' ) ) {
 			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-plugins' );
 
-		if ( isset( $_GET['plugins'] ) )
-			$plugins = explode( ',', stripslashes($_GET['plugins']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if ( isset( $_GET['plugins'] ) ) {
+			$plugins = explode( ',', stripslashes( $_GET['plugins'] ) );
+		} elseif ( isset( $_POST['checked'] ) ) {
 			$plugins = (array) $_POST['checked'];
-		else
+		} else {
 			$plugins = array();
+		}
 
-		$plugins = array_map('urldecode', $plugins);
+		$plugins = array_map( 'urldecode', $plugins );
 
-		$url = 'update.php?action=update-selected&amp;plugins=' . urlencode(implode(',', $plugins));
+		$url   = 'update.php?action=update-selected&amp;plugins=' . urlencode( implode( ',', $plugins ) );
 		$nonce = 'bulk-update-plugins';
 
 		wp_enqueue_script( 'updates' );
@@ -46,97 +49,104 @@ if ( isset($_GET['action']) ) {
 		iframe_footer();
 
 	} elseif ( 'upgrade-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+		if ( ! current_user_can( 'update_plugins' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		}
 
-		check_admin_referer('upgrade-plugin_' . $plugin);
+		check_admin_referer( 'upgrade-plugin_' . $plugin );
 
-		$title = __('Update Plugin');
-		$parent_file = 'plugins.php';
+		$title        = __( 'Update Plugin' );
+		$parent_file  = 'plugins.php';
 		$submenu_file = 'plugins.php';
 
 		wp_enqueue_script( 'updates' );
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 		$nonce = 'upgrade-plugin_' . $plugin;
-		$url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
+		$url   = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
-		$upgrader->upgrade($plugin);
+		$upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact( 'title', 'nonce', 'url', 'plugin' ) ) );
+		$upgrader->upgrade( $plugin );
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 
-	} elseif ('activate-plugin' == $action ) {
-		if ( ! current_user_can('update_plugins') )
-			wp_die(__('Sorry, you are not allowed to update plugins for this site.'));
+	} elseif ( 'activate-plugin' == $action ) {
+		if ( ! current_user_can( 'update_plugins' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
+		}
 
-		check_admin_referer('activate-plugin_' . $plugin);
-		if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-			wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
+		check_admin_referer( 'activate-plugin_' . $plugin );
+		if ( ! isset( $_GET['failure'] ) && ! isset( $_GET['success'] ) ) {
+			wp_redirect( admin_url( 'update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce'] ) );
 			activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
-			wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
+			wp_redirect( admin_url( 'update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce'] ) );
 			die();
 		}
-		iframe_header( __('Plugin Reactivation'), true );
-		if ( isset($_GET['success']) )
-			echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
+		iframe_header( __( 'Plugin Reactivation' ), true );
+		if ( isset( $_GET['success'] ) ) {
+			echo '<p>' . __( 'Plugin reactivated successfully.' ) . '</p>';
+		}
 
-		if ( isset($_GET['failure']) ){
-			echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
+		if ( isset( $_GET['failure'] ) ) {
+			echo '<p>' . __( 'Plugin failed to reactivate due to a fatal error.' ) . '</p>';
 
 			error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
-			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
+			@ini_set( 'display_errors', true ); //Ensure that Fatal errors are displayed.
 			wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
 			include( WP_PLUGIN_DIR . '/' . $plugin );
 		}
 		iframe_footer();
 	} elseif ( 'install-plugin' == $action ) {
 
-		if ( ! current_user_can('install_plugins') )
+		if ( ! current_user_can( 'install_plugins' ) ) {
 			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 
 		check_admin_referer( 'install-plugin_' . $plugin );
-		$api = plugins_api( 'plugin_information', array(
-			'slug' => $plugin,
-			'fields' => array(
-				'short_description' => false,
-				'sections' => false,
-				'requires' => false,
-				'rating' => false,
-				'ratings' => false,
-				'downloaded' => false,
-				'last_updated' => false,
-				'added' => false,
-				'tags' => false,
-				'compatibility' => false,
-				'homepage' => false,
-				'donate_link' => false,
-			),
-		) );
+		$api = plugins_api(
+			'plugin_information', array(
+				'slug'   => $plugin,
+				'fields' => array(
+					'short_description' => false,
+					'sections'          => false,
+					'requires'          => false,
+					'rating'            => false,
+					'ratings'           => false,
+					'downloaded'        => false,
+					'last_updated'      => false,
+					'added'             => false,
+					'tags'              => false,
+					'compatibility'     => false,
+					'homepage'          => false,
+					'donate_link'       => false,
+				),
+			)
+		);
 
 		if ( is_wp_error( $api ) ) {
-	 		wp_die( $api );
+			wp_die( $api );
 		}
 
-		$title = __('Plugin Installation');
-		$parent_file = 'plugins.php';
+		$title        = __( 'Plugin Installation' );
+		$parent_file  = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-		$title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
+		$title = sprintf( __( 'Installing Plugin: %s' ), $api->name . ' ' . $api->version );
 		$nonce = 'install-plugin_' . $plugin;
-		$url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
-		if ( isset($_GET['from']) )
-			$url .= '&from=' . urlencode(stripslashes($_GET['from']));
+		$url   = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
+		if ( isset( $_GET['from'] ) ) {
+			$url .= '&from=' . urlencode( stripslashes( $_GET['from'] ) );
+		}
 
 		$type = 'web'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
-		$upgrader->install($api->download_link);
+		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ) );
+		$upgrader->install( $api->download_link );
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 	} elseif ( 'upload-plugin' == $action ) {
 
@@ -144,65 +154,69 @@ if ( isset($_GET['action']) ) {
 			wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
 		}
 
-		check_admin_referer('plugin-upload');
+		check_admin_referer( 'plugin-upload' );
 
-		$file_upload = new File_Upload_Upgrader('pluginzip', 'package');
+		$file_upload = new File_Upload_Upgrader( 'pluginzip', 'package' );
 
-		$title = __('Upload Plugin');
-		$parent_file = 'plugins.php';
+		$title        = __( 'Upload Plugin' );
+		$parent_file  = 'plugins.php';
 		$submenu_file = 'plugin-install.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-		$title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf( __( 'Installing Plugin from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) );
 		$nonce = 'plugin-upload';
-		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
-		$type = 'upload'; //Install plugin type, From Web or an Upload.
+		$url   = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-plugin' );
+		$type  = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact( 'type', 'title', 'nonce', 'url' ) ) );
+		$result   = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
+		if ( $result || is_wp_error( $result ) ) {
 			$file_upload->cleanup();
+		}
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 	} elseif ( 'upgrade-theme' == $action ) {
 
-		if ( ! current_user_can('update_themes') )
-			wp_die(__('Sorry, you are not allowed to update themes for this site.'));
+		if ( ! current_user_can( 'update_themes' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		}
 
-		check_admin_referer('upgrade-theme_' . $theme);
+		check_admin_referer( 'upgrade-theme_' . $theme );
 
 		wp_enqueue_script( 'updates' );
 
-		$title = __('Update Theme');
-		$parent_file = 'themes.php';
+		$title        = __( 'Update Theme' );
+		$parent_file  = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
 		$nonce = 'upgrade-theme_' . $theme;
-		$url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
+		$url   = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
 
-		$upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
-		$upgrader->upgrade($theme);
+		$upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact( 'title', 'nonce', 'url', 'theme' ) ) );
+		$upgrader->upgrade( $theme );
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 	} elseif ( 'update-selected-themes' == $action ) {
-		if ( ! current_user_can( 'update_themes' ) )
+		if ( ! current_user_can( 'update_themes' ) ) {
 			wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
+		}
 
 		check_admin_referer( 'bulk-update-themes' );
 
-		if ( isset( $_GET['themes'] ) )
-			$themes = explode( ',', stripslashes($_GET['themes']) );
-		elseif ( isset( $_POST['checked'] ) )
+		if ( isset( $_GET['themes'] ) ) {
+			$themes = explode( ',', stripslashes( $_GET['themes'] ) );
+		} elseif ( isset( $_POST['checked'] ) ) {
 			$themes = (array) $_POST['checked'];
-		else
+		} else {
 			$themes = array();
+		}
 
-		$themes = array_map('urldecode', $themes);
+		$themes = array_map( 'urldecode', $themes );
 
-		$url = 'update.php?action=update-selected-themes&amp;themes=' . urlencode(implode(',', $themes));
+		$url   = 'update.php?action=update-selected-themes&amp;themes=' . urlencode( implode( ',', $themes ) );
 		$nonce = 'bulk-update-themes';
 
 		wp_enqueue_script( 'updates' );
@@ -214,32 +228,41 @@ if ( isset($_GET['action']) ) {
 		iframe_footer();
 	} elseif ( 'install-theme' == $action ) {
 
-		if ( ! current_user_can('install_themes') )
+		if ( ! current_user_can( 'install_themes' ) ) {
 			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+		}
 
 		include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
 
 		check_admin_referer( 'install-theme_' . $theme );
-		$api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
+		$api = themes_api(
+			'theme_information', array(
+				'slug'   => $theme,
+				'fields' => array(
+					'sections' => false,
+					'tags'     => false,
+				),
+			)
+		); //Save on a bit of bandwidth.
 
 		if ( is_wp_error( $api ) ) {
 			wp_die( $api );
 		}
 
-		$title = __('Install Themes');
-		$parent_file = 'themes.php';
+		$title        = __( 'Install Themes' );
+		$parent_file  = 'themes.php';
 		$submenu_file = 'themes.php';
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-		$title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
+		$title = sprintf( __( 'Installing Theme: %s' ), $api->name . ' ' . $api->version );
 		$nonce = 'install-theme_' . $theme;
-		$url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
-		$type = 'web'; //Install theme type, From Web or an Upload.
+		$url   = 'update.php?action=install-theme&theme=' . urlencode( $theme );
+		$type  = 'web'; //Install theme type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
-		$upgrader->install($api->download_link);
+		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact( 'title', 'url', 'nonce', 'plugin', 'api' ) ) );
+		$upgrader->install( $api->download_link );
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 	} elseif ( 'upload-theme' == $action ) {
 
@@ -247,28 +270,29 @@ if ( isset($_GET['action']) ) {
 			wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
 		}
 
-		check_admin_referer('theme-upload');
+		check_admin_referer( 'theme-upload' );
 
-		$file_upload = new File_Upload_Upgrader('themezip', 'package');
+		$file_upload = new File_Upload_Upgrader( 'themezip', 'package' );
 
-		$title = __('Upload Theme');
-		$parent_file = 'themes.php';
+		$title        = __( 'Upload Theme' );
+		$parent_file  = 'themes.php';
 		$submenu_file = 'theme-install.php';
 
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-		$title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
+		$title = sprintf( __( 'Installing Theme from uploaded file: %s' ), esc_html( basename( $file_upload->filename ) ) );
 		$nonce = 'theme-upload';
-		$url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
-		$type = 'upload'; //Install plugin type, From Web or an Upload.
+		$url   = add_query_arg( array( 'package' => $file_upload->id ), 'update.php?action=upload-theme' );
+		$type  = 'upload'; //Install plugin type, From Web or an Upload.
 
-		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-		$result = $upgrader->install( $file_upload->package );
+		$upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact( 'type', 'title', 'nonce', 'url' ) ) );
+		$result   = $upgrader->install( $file_upload->package );
 
-		if ( $result || is_wp_error($result) )
+		if ( $result || is_wp_error( $result ) ) {
 			$file_upload->cleanup();
+		}
 
-		include(ABSPATH . 'wp-admin/admin-footer.php');
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 
 	} else {
 		/**
diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php
index 139759b995..0669ead7b0 100644
--- a/wp-admin/upgrade-functions.php
+++ b/wp-admin/upgrade-functions.php
@@ -8,5 +8,5 @@
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/upgrade.php' );
-require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+_deprecated_file( basename( __FILE__ ), '2.5.0', 'wp-admin/includes/upgrade.php' );
+require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index 03940b01f5..bd9419d506 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -22,12 +22,13 @@ nocache_headers();
 timer_start();
 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-delete_site_transient('update_core');
+delete_site_transient( 'update_core' );
 
-if ( isset( $_GET['step'] ) )
+if ( isset( $_GET['step'] ) ) {
 	$step = $_GET['step'];
-else
+} else {
 	$step = 0;
+}
 
 // Do it. No output.
 if ( 'upgrade_db' === $step ) {
@@ -45,13 +46,14 @@ global $wp_version, $required_php_version, $required_mysql_version;
 
 $step = (int) $step;
 
-$php_version    = phpversion();
-$mysql_version  = $wpdb->db_version();
-$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+$php_version   = phpversion();
+$mysql_version = $wpdb->db_version();
+$php_compat    = version_compare( $php_version, $required_php_version, '>=' );
+if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
 	$mysql_compat = true;
-else
+} else {
 	$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+}
 
 @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
 ?>
@@ -70,43 +72,46 @@ else
 <body class="wp-core-ui">
 <p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 
-<?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
+<?php if ( get_option( 'db_version' ) == $wp_db_version || ! is_blog_installed() ) : ?>
 
 <h1><?php _e( 'No Update Required' ); ?></h1>
 <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 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 );
-	elseif ( !$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. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
-	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
+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 );
+	} elseif ( ! $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. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
+	} 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 else :
-switch ( $step ) :
-	case 0:
-		$goback = wp_get_referer();
-		if ( $goback ) {
-			$goback = esc_url_raw( $goback );
-			$goback = urlencode( $goback );
-		}
-?>
-<h1><?php _e( 'Database Update Required' ); ?></h1>
+<?php
+else :
+	switch ( $step ) :
+		case 0:
+			$goback = wp_get_referer();
+			if ( $goback ) {
+				$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
-		break;
-	case 1:
-		wp_upgrade();
+			break;
+		case 1:
+			wp_upgrade();
 
-			$backto = !empty($_GET['backto']) ? wp_unslash( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
+			$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>
+			$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>
 
@@ -119,7 +124,7 @@ switch ( $step ) :
 -->
 
 <?php
-		break;
+			break;
 endswitch;
 endif;
 ?>
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index 9c4057bf7a..f38348004b 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -9,10 +9,11 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('upload_files') )
+if ( ! current_user_can( 'upload_files' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+}
 
-$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
+$mode  = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
 
 if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) {
@@ -30,7 +31,7 @@ if ( 'grid' === $mode ) {
 	$q = $_GET;
 	// let JS handle this
 	unset( $q['s'] );
-	$vars = wp_edit_attachments_query_vars( $q );
+	$vars   = wp_edit_attachments_query_vars( $q );
 	$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
 	foreach ( $vars as $key => $value ) {
 		if ( ! $value || in_array( $key, $ignore ) ) {
@@ -38,28 +39,34 @@ if ( 'grid' === $mode ) {
 		}
 	}
 
-	wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
-		'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
-		'queryVars' => (object) $vars
-	) );
+	wp_localize_script(
+		'media-grid', '_wpMediaGridSettings', array(
+			'adminUrl'  => parse_url( self_admin_url(), PHP_URL_PATH ),
+			'queryVars' => (object) $vars,
+		)
+	);
 
-	get_current_screen()->add_help_tab( array(
-		'id'		=> 'overview',
-		'title'		=> __( 'Overview' ),
-		'content'	=>
-			'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
-			'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
-			'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>'
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'overview',
+			'title'   => __( 'Overview' ),
+			'content' =>
+				'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
+				'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
+				'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>',
+		)
+	);
 
-	get_current_screen()->add_help_tab( array(
-		'id'		=> 'attachment-details',
-		'title'		=> __( 'Attachment Details' ),
-		'content'	=>
-			'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
-			'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
-			'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>'
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'attachment-details',
+			'title'   => __( 'Attachment Details' ),
+			'content' =>
+				'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
+				'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
+				'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>',
+		)
+	);
 
 	get_current_screen()->set_help_sidebar(
 		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
@@ -67,28 +74,34 @@ if ( 'grid' === $mode ) {
 		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 	);
 
-	$title = __('Media Library');
+	$title       = __( 'Media Library' );
 	$parent_file = 'upload.php';
 
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
-	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
+	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query(); ?>">
 		<h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
 
 		<?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
+		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
 		}
 		?>
 
 		<hr class="wp-header-end">
 
 		<div class="error hide-if-js">
-			<p><?php printf(
+			<p>
+			<?php
+			printf(
 				/* translators: %s: list view URL */
 				__( 'The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.' ),
 				'upload.php?mode=list'
-			); ?></p>
+			);
+			?>
+			</p>
 		</div>
 	</div>
 	<?php
@@ -96,14 +109,14 @@ if ( 'grid' === $mode ) {
 	exit;
 }
 
-$wp_list_table = _get_list_table('WP_Media_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
+$wp_list_table = _get_list_table( 'WP_Media_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
 
 // Handle bulk actions
 $doaction = $wp_list_table->current_action();
 
 if ( $doaction ) {
-	check_admin_referer('bulk-media');
+	check_admin_referer( 'bulk-media' );
 
 	if ( 'delete_all' == $doaction ) {
 		$post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
@@ -116,8 +129,9 @@ if ( $doaction ) {
 
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
+		if ( false !== strpos( $referer, 'upload.php' ) ) {
 			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		}
 	}
 
 	switch ( $doaction ) {
@@ -130,38 +144,52 @@ if ( $doaction ) {
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset( $post_ids ) ) {
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
-
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
 			}
-			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
+			foreach ( (array) $post_ids as $post_id ) {
+				if ( ! current_user_can( 'delete_post', $post_id ) ) {
+					wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+				}
+
+				if ( ! wp_trash_post( $post_id ) ) {
+					wp_die( __( 'Error in moving to Trash.' ) );
+				}
+			}
+			$location = add_query_arg(
+				array(
+					'trashed' => count( $post_ids ),
+					'ids'     => join( ',', $post_ids ),
+				), $location
+			);
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset( $post_ids ) ) {
 				break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
+				if ( ! current_user_can( 'delete_post', $post_id ) ) {
 					wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+				}
 
-				if ( !wp_untrash_post( $post_id ) )
+				if ( ! wp_untrash_post( $post_id ) ) {
 					wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
+			if ( ! isset( $post_ids ) ) {
 				break;
+			}
 			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
+				if ( ! current_user_can( 'delete_post', $post_id_del ) ) {
 					wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+				}
 
-				if ( !wp_delete_attachment( $post_id_del ) )
+				if ( ! wp_delete_attachment( $post_id_del ) ) {
 					wp_die( __( 'Error in deleting.' ) );
+				}
 			}
 			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;
@@ -179,33 +207,39 @@ if ( $doaction ) {
 
 $wp_list_table->prepare_items();
 
-$title = __('Media Library');
+$title       = __( 'Media Library' );
 $parent_file = 'upload.php';
 
 wp_enqueue_script( 'media' );
 
 add_screen_option( 'per_page' );
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
-	'<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
-	'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'actions-links',
-'title'		=> __('Available Actions'),
-'content'	=>
-	'<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'attaching-files',
-'title'		=> __('Attaching Files'),
-'content'	=>
-	'<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				 '<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
+				 '<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
+				 '<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>',
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'actions-links',
+		'title'   => __( 'Available Actions' ),
+		'content' =>
+				 '<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>',
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'attaching-files',
+		'title'   => __( 'Attaching Files' ),
+		'content' =>
+				 '<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
@@ -213,11 +247,13 @@ get_current_screen()->set_help_sidebar(
 	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter media items list' ),
-	'heading_pagination' => __( 'Media items list navigation' ),
-	'heading_list'       => __( 'Media items list' ),
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter media items list' ),
+		'heading_pagination' => __( 'Media items list navigation' ),
+		'heading_list'       => __( 'Media items list' ),
+	)
+);
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
@@ -226,8 +262,10 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 <h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
 
 <?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
+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
 }
 
 if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
@@ -241,8 +279,8 @@ if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
 <?php
 $message = '';
 if ( ! empty( $_GET['posted'] ) ) {
-	$message = __( 'Media file updated.' );
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
+	$message                = __( 'Media file updated.' );
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
 }
 
 if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
@@ -252,7 +290,7 @@ if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file attached.', '%s media files attached.', $attached );
 	}
-	$message = sprintf( $message, number_format_i18n( $attached ) );
+	$message                = sprintf( $message, number_format_i18n( $attached ) );
 	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
 }
 
@@ -263,7 +301,7 @@ if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file detached.', '%s media files detached.', $detached );
 	}
-	$message = sprintf( $message, number_format_i18n( $detached ) );
+	$message                = sprintf( $message, number_format_i18n( $detached ) );
 	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
 }
 
@@ -274,8 +312,8 @@ if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
 	}
-	$message = sprintf( $message, number_format_i18n( $deleted ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
+	$message                = sprintf( $message, number_format_i18n( $deleted ) );
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
 }
 
 if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
@@ -285,9 +323,9 @@ if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
 	}
-	$message = sprintf( $message, number_format_i18n( $trashed ) );
-	$message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
+	$message                = sprintf( $message, number_format_i18n( $trashed ) );
+	$message               .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
 }
 
 if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
@@ -297,22 +335,23 @@ if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] )
 		/* translators: %s: number of media files */
 		$message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
 	}
-	$message = sprintf( $message, number_format_i18n( $untrashed ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
+	$message                = sprintf( $message, number_format_i18n( $untrashed ) );
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'untrashed' ), $_SERVER['REQUEST_URI'] );
 }
 
 $messages[1] = __( 'Media file updated.' );
 $messages[2] = __( 'Media file permanently deleted.' );
 $messages[3] = __( 'Error saving media file.' );
-$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __( 'Undo' ) . '</a>';
+$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids=' . ( isset( $_GET['ids'] ) ? $_GET['ids'] : '' ), 'bulk-media' ) ) . '">' . __( 'Undo' ) . '</a>';
 $messages[5] = __( 'Media file restored from the trash.' );
 
 if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-	$message = $messages[ $_GET['message'] ];
-	$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
+	$message                = $messages[ $_GET['message'] ];
+	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message' ), $_SERVER['REQUEST_URI'] );
 }
 
-if ( !empty($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 71b66b7db1..7e443c42c3 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -11,19 +11,21 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 
 wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
 
-$user_id = (int) $user_id;
+$user_id      = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
+if ( ! defined( 'IS_PROFILE_PAGE' ) ) {
 	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+}
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE ) {
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
-	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
-	wp_die( __('Invalid user ID.') );
+} elseif ( ! $user_id && ! IS_PROFILE_PAGE ) {
+	wp_die( __( 'Invalid user ID.' ) );
+} elseif ( ! get_userdata( $user_id ) ) {
+	wp_die( __( 'Invalid user ID.' ) );
+}
 
-wp_enqueue_script('user-profile');
+wp_enqueue_script( 'user-profile' );
 
 if ( IS_PROFILE_PAGE ) {
 	$title = __( 'Profile' );
@@ -32,34 +34,38 @@ if ( IS_PROFILE_PAGE ) {
 	$title = __( 'Edit User %s' );
 }
 
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if ( current_user_can( 'edit_users' ) && ! IS_PROFILE_PAGE ) {
 	$submenu_file = 'users.php';
-else
+} else {
 	$submenu_file = 'profile.php';
+}
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if ( current_user_can( 'edit_users' ) && ! is_user_admin() ) {
 	$parent_file = 'users.php';
-else
+} else {
 	$parent_file = 'profile.php';
+}
 
-$profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
-	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
+$profile_help = '<p>' . __( 'Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.' ) . '</p>' .
+	'<p>' . __( 'You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.' ) . '</p>' .
 	'<p>' . __( 'You can select the language you wish to use while using the WordPress administration screen without affecting the language site visitors see.' ) . '</p>' .
-	'<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
+	'<p>' . __( 'Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.' ) . '</p>' .
 	'<p>' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '</p>' .
-	'<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
-	'<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
+	'<p>' . __( 'Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.' ) . '</p>' .
+	'<p>' . __( 'Remember to click the Update Profile button when you are finished.' ) . '</p>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => $profile_help,
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $profile_help,
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen">Documentation on User Profiles</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/Users_Your_Profile_Screen">Documentation on User Profiles</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 $wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );
@@ -88,12 +94,12 @@ if ( is_multisite()
 }
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
-if ( IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
+if ( IS_PROFILE_PAGE && isset( $_GET['newuseremail'] ) && $current_user->ID ) {
 	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
-	if ( $new_email && hash_equals( $new_email[ 'hash' ], $_GET[ 'newuseremail' ] ) ) {
-		$user = new stdClass;
-		$user->ID = $current_user->ID;
-		$user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
+	if ( $new_email && hash_equals( $new_email['hash'], $_GET['newuseremail'] ) ) {
+		$user             = new stdClass;
+		$user->ID         = $current_user->ID;
+		$user->user_email = esc_html( trim( $new_email['newemail'] ) );
 		if ( is_multisite() && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
 			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
 		}
@@ -107,89 +113,91 @@ if ( IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID )
 } elseif ( IS_PROFILE_PAGE && ! empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' === $_GET['dismiss'] ) {
 	check_admin_referer( 'dismiss-' . $current_user->ID . '_new_email' );
 	delete_user_meta( $current_user->ID, '_new_email' );
-	wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
+	wp_redirect( add_query_arg( array( 'updated' => 'true' ), self_admin_url( 'profile.php' ) ) );
 	die();
 }
 
-switch ($action) {
-case 'update':
+switch ( $action ) {
+	case 'update':
+		check_admin_referer( 'update-user_' . $user_id );
 
-check_admin_referer('update-user_' . $user_id);
+		if ( ! current_user_can( 'edit_user', $user_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+		}
 
-if ( !current_user_can('edit_user', $user_id) )
-	wp_die(__('Sorry, you are not allowed to edit this user.'));
+		if ( IS_PROFILE_PAGE ) {
+			/**
+			 * Fires before the page loads on the 'Your Profile' editing screen.
+			 *
+			 * The action only fires if the current user is editing their own profile.
+			 *
+			 * @since 2.0.0
+			 *
+			 * @param int $user_id The user ID.
+			 */
+			do_action( 'personal_options_update', $user_id );
+		} else {
+			/**
+			 * Fires before the page loads on the 'Edit User' screen.
+			 *
+			 * @since 2.7.0
+			 *
+			 * @param int $user_id The user ID.
+			 */
+			do_action( 'edit_user_profile_update', $user_id );
+		}
 
-if ( IS_PROFILE_PAGE ) {
-	/**
-	 * Fires before the page loads on the 'Your Profile' editing screen.
-	 *
-	 * The action only fires if the current user is editing their own profile.
-	 *
-	 * @since 2.0.0
-	 *
-	 * @param int $user_id The user ID.
-	 */
-	do_action( 'personal_options_update', $user_id );
-} else {
-	/**
-	 * Fires before the page loads on the 'Edit User' screen.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param int $user_id The user ID.
-	 */
-	do_action( 'edit_user_profile_update', $user_id );
-}
+		// Update the email address in signups, if present.
+		if ( is_multisite() ) {
+			$user = get_userdata( $user_id );
 
-// Update the email address in signups, if present.
-if ( is_multisite() ) {
-	$user = get_userdata( $user_id );
+			if ( $user->user_login && isset( $_POST['email'] ) && is_email( $_POST['email'] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
+				$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST['email'], $user_login ) );
+			}
+		}
 
-	if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
-		$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
-	}
-}
+		// Update the user.
+		$errors = edit_user( $user_id );
 
-// Update the user.
-$errors = edit_user( $user_id );
+		// Grant or revoke super admin status if requested.
+		if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && ! isset( $super_admins ) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
+			empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
+		}
 
-// Grant or revoke super admin status if requested.
-if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
-	empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
-}
+		if ( ! is_wp_error( $errors ) ) {
+			$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
+			if ( $wp_http_referer ) {
+				$redirect = add_query_arg( 'wp_http_referer', urlencode( $wp_http_referer ), $redirect );
+			}
+			wp_redirect( $redirect );
+			exit;
+		}
 
-if ( !is_wp_error( $errors ) ) {
-	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
-		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
-	wp_redirect($redirect);
-	exit;
-}
+	default:
+		$profileuser = get_user_to_edit( $user_id );
 
-default:
-$profileuser = get_user_to_edit($user_id);
+		if ( ! current_user_can( 'edit_user', $user_id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+		}
 
-if ( !current_user_can('edit_user', $user_id) )
-	wp_die(__('Sorry, you are not allowed to edit this user.'));
+		$title    = sprintf( $title, $profileuser->display_name );
+		$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
 
-$title = sprintf( $title, $profileuser->display_name );
-$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+	?>
 
-include(ABSPATH . 'wp-admin/admin-header.php');
-?>
-
-<?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 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 ) : ?>
-	<p><strong><?php _e('Profile updated.') ?></strong></p>
-	<?php else: ?>
-	<p><strong><?php _e('User updated.') ?></strong></p>
+	<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 ) : ?>
-	<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>
+	<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; ?>
@@ -205,33 +213,39 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?php
 if ( ! IS_PROFILE_PAGE ) {
-	if ( current_user_can( 'create_users' ) ) { ?>
+	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">
 
-<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php
-	/**
-	 * Fires inside the your-profile form tag on the user editing screen.
-	 *
-	 * @since 3.0.0
-	 */
-	do_action( 'user_edit_form_tag' );
-?>>
-<?php wp_nonce_field('update-user_' . $user_id) ?>
+<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"
+											<?php
+											/**
+											 * Fires inside the your-profile form tag on the user editing screen.
+											 *
+											 * @since 3.0.0
+											 */
+											do_action( 'user_edit_form_tag' );
+	?>
+	>
+	<?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); ?>" />
+	<input type="hidden" name="wp_http_referer" value="<?php echo esc_url( $wp_http_referer ); ?>" />
 <?php endif; ?>
 <p>
 <input type="hidden" name="from" value="profile" />
@@ -257,9 +271,9 @@ $show_syntax_highlighting_preference = (
 	||
 	// Edit themes.
 	user_can( $profileuser, 'edit_themes' )
-);
-?>
-<?php if ( $show_syntax_highlighting_preference ) : ?>
+	);
+	?>
+	<?php if ( $show_syntax_highlighting_preference ) : ?>
 	<tr class="user-syntax-highlighting-wrap">
 		<th scope="row"><?php _e( 'Syntax Highlighting' ); ?></th>
 		<td>
@@ -267,10 +281,11 @@ $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
+<th scope="row"><?php _e( 'Admin Color Scheme' ); ?></th>
+<td>
+<?php
 	/**
 	 * Fires in the 'Admin Color Scheme' section of the user editing screen.
 	 *
@@ -283,19 +298,21 @@ $show_syntax_highlighting_preference = (
 	 * @param int $user_id The user ID.
 	 */
 	do_action( 'admin_color_scheme_picker', $user_id );
-?></td>
+?>
+</td>
 </tr>
 <?php
 endif; // $_wp_admin_css_colors
-if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
+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>
+<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>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
 <th scope="row"><?php _e( 'Toolbar' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Toolbar') ?></span></legend>
+<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 />
@@ -305,7 +322,8 @@ if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
 
 <?php
 $languages = get_available_languages();
-if ( $languages ) : ?>
+if ( $languages ) :
+?>
 <tr class="user-language-wrap">
 	<th scope="row">
 		<?php /* translators: The user language selection field label */ ?>
@@ -321,14 +339,16 @@ if ( $languages ) : ?>
 			$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>
@@ -349,30 +369,30 @@ 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 );
-	}
+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>
 
 <table class="form-table">
 	<tr class="user-user-login-wrap">
-		<th><label for="user_login"><?php _e('Username'); ?></label></th>
-		<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>
+		<th><label for="user_login"><?php _e( 'Username' ); ?></label></th>
+		<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() ) : ?>
-<tr class="user-role-wrap"><th><label for="role"><?php _e('Role') ?></label></th>
+<?php if ( ! IS_PROFILE_PAGE && ! is_network_admin() ) : ?>
+<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
@@ -380,19 +400,22 @@ $user_roles = array_intersect( array_values( $profileuser->roles ), array_keys(
 $user_role  = reset( $user_roles );
 
 // print the full list of roles with the primary one selected.
-wp_dropdown_roles($user_role);
+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>';
+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 endif; //!IS_PROFILE_PAGE
+<?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>
+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 ) ) : ?>
 <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>
@@ -403,68 +426,73 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 <?php } ?>
 
 <tr class="user-first-name-wrap">
-	<th><label for="first_name"><?php _e('First Name') ?></label></th>
-	<td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr($profileuser->first_name) ?>" class="regular-text" /></td>
+	<th><label for="first_name"><?php _e( 'First Name' ); ?></label></th>
+	<td><input type="text" name="first_name" id="first_name" value="<?php echo esc_attr( $profileuser->first_name ); ?>" class="regular-text" /></td>
 </tr>
 
 <tr class="user-last-name-wrap">
-	<th><label for="last_name"><?php _e('Last Name') ?></label></th>
-	<td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr($profileuser->last_name) ?>" class="regular-text" /></td>
+	<th><label for="last_name"><?php _e( 'Last Name' ); ?></label></th>
+	<td><input type="text" name="last_name" id="last_name" value="<?php echo esc_attr( $profileuser->last_name ); ?>" class="regular-text" /></td>
 </tr>
 
 <tr class="user-nickname-wrap">
-	<th><label for="nickname"><?php _e('Nickname'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr($profileuser->nickname) ?>" class="regular-text" /></td>
+	<th><label for="nickname"><?php _e( 'Nickname' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
+	<td><input type="text" name="nickname" id="nickname" value="<?php echo esc_attr( $profileuser->nickname ); ?>" class="regular-text" /></td>
 </tr>
 
 <tr class="user-display-name-wrap">
-	<th><label for="display_name"><?php _e('Display name publicly as') ?></label></th>
+	<th><label for="display_name"><?php _e( 'Display name publicly as' ); ?></label></th>
 	<td>
 		<select name="display_name" id="display_name">
 		<?php
-			$public_display = array();
-			$public_display['display_nickname']  = $profileuser->nickname;
-			$public_display['display_username']  = $profileuser->user_login;
+			$public_display                     = array();
+			$public_display['display_nickname'] = $profileuser->nickname;
+			$public_display['display_username'] = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
-				$public_display['display_firstname'] = $profileuser->first_name;
+		if ( ! empty( $profileuser->first_name ) ) {
+			$public_display['display_firstname'] = $profileuser->first_name;
+		}
 
-			if ( !empty($profileuser->last_name) )
-				$public_display['display_lastname'] = $profileuser->last_name;
+		if ( ! empty( $profileuser->last_name ) ) {
+			$public_display['display_lastname'] = $profileuser->last_name;
+		}
 
-			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
-			}
+		if ( ! empty( $profileuser->first_name ) && ! empty( $profileuser->last_name ) ) {
+			$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
+			$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+		}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
-				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+		if ( ! in_array( $profileuser->display_name, $public_display ) ) { // Only add this if it isn't duplicated elsewhere
+			$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+		}
 
 			$public_display = array_map( 'trim', $public_display );
 			$public_display = array_unique( $public_display );
 
-			foreach ( $public_display as $id => $item ) {
+		foreach ( $public_display as $id => $item ) {
 		?>
-			<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
+		<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
 		<?php
-			}
+		}
 		?>
 		</select>
-	</td>
-</tr>
-</table>
+		</td>
+	</tr>
+	</table>
 
-<h2><?php _e( 'Contact Info' ); ?></h2>
+	<h2><?php _e( 'Contact Info' ); ?></h2>
 
-<table class="form-table">
-<tr class="user-email-wrap">
-	<th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
-	<?php
-	$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
+	<table class="form-table">
+	<tr class="user-email-wrap">
+		<th><label for="email"><?php _e( 'Email' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
+		<td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ); ?>" class="regular-text ltr" />
+		<?php
+		$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.' ),
@@ -475,50 +503,51 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 			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; ?>
-	</td>
-</tr>
-
-<tr class="user-url-wrap">
-	<th><label for="url"><?php _e('Website') ?></label></th>
-	<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 ) {
-?>
-<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 );
 		?>
-	</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
-	}
-?>
-</table>
+		</p>
+		</div>
+		<?php endif; ?>
+	</td>
+	</tr>
 
-<h2><?php IS_PROFILE_PAGE ? _e( 'About Yourself' ) : _e( 'About the user' ); ?></h2>
+	<tr class="user-url-wrap">
+	<th><label for="url"><?php _e( 'Website' ); ?></label></th>
+	<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 ) {
+	?>
+	<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 );
+	?>
+	</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
+	}
+	?>
+	</table>
+
+	<h2><?php IS_PROFILE_PAGE ? _e( 'About Yourself' ) : _e( 'About the user' ); ?></h2>
 
 <table class="form-table">
 <tr class="user-description-wrap">
-	<th><label for="description"><?php _e('Biographical Info'); ?></label></th>
+	<th><label for="description"><?php _e( 'Biographical Info' ); ?></label></th>
 	<td><textarea name="description" id="description" rows="5" cols="30"><?php echo $profileuser->description; // textarea_escaped ?></textarea>
-	<p class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p></td>
+	<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' ) ) : ?>
@@ -526,15 +555,17 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 	<th><?php _e( 'Profile Picture' ); ?></th>
 	<td>
 		<?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 = '';
-			}
+		<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 = '';
+		}
 
 			/**
 			 * Filters the user profile picture description displayed under the Gravatar.
@@ -546,27 +577,28 @@ 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>
+		?>
+		</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 ) ) :
-?>
-</table>
+	<?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>
+	<h2><?php _e( 'Account Management' ); ?></h2>
 <table class="form-table">
 <tr id="password" class="user-pass1-wrap">
 	<th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
@@ -607,7 +639,8 @@ if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profi
 <?php endif; ?>
 
 <?php
-if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
+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">
@@ -642,9 +675,9 @@ if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
 	</tr>
 <?php endif; ?>
 
-</table>
+	</table>
 
-<?php
+	<?php
 	if ( IS_PROFILE_PAGE ) {
 		/**
 		 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
@@ -666,38 +699,40 @@ if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
 		 */
 		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 )
+	<?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>
+	) :
+	?>
+	<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 );
+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>
@@ -706,14 +741,14 @@ if ( count( $profileuser->caps ) > count( $profileuser->roles )
 <?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); ?>" />
+<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
-break;
+		break;
 }
 ?>
 <script type="text/javascript">
@@ -722,4 +757,4 @@ break;
 	}
 </script>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php');
+include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 641fd822fd..59e68dad76 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -29,24 +29,24 @@ if ( is_multisite() ) {
 	add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
 }
 
-if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
+if ( isset( $_REQUEST['action'] ) && 'adduser' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-user', '_wpnonce_add-user' );
 
 	$user_details = null;
-	$user_email = wp_unslash( $_REQUEST['email'] );
+	$user_email   = wp_unslash( $_REQUEST['email'] );
 	if ( false !== strpos( $user_email, '@' ) ) {
 		$user_details = get_user_by( 'email', $user_email );
 	} else {
 		if ( current_user_can( 'manage_network_users' ) ) {
 			$user_details = get_user_by( 'login', $user_email );
 		} else {
-			wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
+			wp_redirect( add_query_arg( array( 'update' => 'enter_email' ), 'user-new.php' ) );
 			die();
 		}
 	}
 
-	if ( !$user_details ) {
-		wp_redirect( add_query_arg( array('update' => 'does_not_exist'), 'user-new.php' ) );
+	if ( ! $user_details ) {
+		wp_redirect( add_query_arg( array( 'update' => 'does_not_exist' ), 'user-new.php' ) );
 		die();
 	}
 
@@ -60,26 +60,42 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
 
 	// Adding an existing user to this blog
 	$new_user_email = $user_details->user_email;
-	$redirect = 'user-new.php';
-	$username = $user_details->user_login;
-	$user_id = $user_details->ID;
+	$redirect       = 'user-new.php';
+	$username       = $user_details->user_login;
+	$user_id        = $user_details->ID;
 	if ( $username != null && array_key_exists( $blog_id, get_blogs_of_user( $user_id ) ) ) {
-		$redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+		$redirect = add_query_arg( array( 'update' => 'addexisting' ), 'user-new.php' );
 	} else {
-		if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-			$result = add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
+		if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
+			$result = add_existing_user_to_blog(
+				array(
+					'user_id' => $user_id,
+					'role'    => $_REQUEST['role'],
+				)
+			);
 
 			if ( ! is_wp_error( $result ) ) {
-				$redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $user_id ), 'user-new.php' );
+				$redirect = add_query_arg(
+					array(
+						'update'  => 'addnoconfirmation',
+						'user_id' => $user_id,
+					), 'user-new.php'
+				);
 			} else {
 				$redirect = add_query_arg( array( 'update' => 'could_not_add' ), 'user-new.php' );
 			}
 		} else {
 			$newuser_key = wp_generate_password( 20, false );
-			add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
+			add_option(
+				'new_user_' . $newuser_key, array(
+					'user_id' => $user_id,
+					'email'   => $user_details->user_email,
+					'role'    => $_REQUEST['role'],
+				)
+			);
 
 			$roles = get_editable_roles();
-			$role = $roles[ $_REQUEST['role'] ];
+			$role  = $roles[ $_REQUEST['role'] ];
 
 			/**
 			 * Fires immediately after a user is invited to join a site, but before the notification is sent.
@@ -95,25 +111,27 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
 			$switched_locale = switch_to_locale( get_user_locale( $user_details ) );
 
 			/* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
-			$message = __( 'Hi,
+			$message = __(
+				'Hi,
 
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 
 Please click the following link to confirm the invite:
-%4$s' );
+%4$s'
+			);
 			wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
 
 			if ( $switched_locale ) {
 				restore_previous_locale();
 			}
 
-			$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
+			$redirect = add_query_arg( array( 'update' => 'add' ), 'user-new.php' );
 		}
 	}
 	wp_redirect( $redirect );
 	die();
-} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
+} elseif ( isset( $_REQUEST['action'] ) && 'createuser' == $_REQUEST['action'] ) {
 	check_admin_referer( 'create-user', '_wpnonce_create-user' );
 
 	if ( ! current_user_can( 'create_users' ) ) {
@@ -130,19 +148,20 @@ Please click the following link to confirm the invite:
 		if ( is_wp_error( $user_id ) ) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
+			if ( current_user_can( 'list_users' ) ) {
 				$redirect = 'users.php?update=add&id=' . $user_id;
-			else
+			} else {
 				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
+			}
 			wp_redirect( $redirect );
 			die();
 		}
 	} else {
 		// Adding a new user to this site
 		$new_user_email = wp_unslash( $_REQUEST['email'] );
-		$user_details = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );
-		if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
-			$add_user_errors = $user_details[ 'errors' ];
+		$user_details   = wpmu_validate_user_signup( $_REQUEST['user_login'], $new_user_email );
+		if ( is_wp_error( $user_details['errors'] ) && ! empty( $user_details['errors']->errors ) ) {
+			$add_user_errors = $user_details['errors'];
 		} else {
 			/**
 			 * Filters the user_login, also known as the username, before it is added to the site.
@@ -152,23 +171,33 @@ Please click the following link to confirm the invite:
 			 * @param string $user_login The sanitized username.
 			 */
 			$new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
+			if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
 				add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
 				add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
 			}
-			wpmu_signup_user( $new_user_login, $new_user_email, array( 'add_to_blog' => get_current_blog_id(), 'new_role' => $_REQUEST['role'] ) );
-			if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-				$key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
+			wpmu_signup_user(
+				$new_user_login, $new_user_email, array(
+					'add_to_blog' => get_current_blog_id(),
+					'new_role'    => $_REQUEST['role'],
+				)
+			);
+			if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
+				$key      = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
 				$new_user = wpmu_activate_signup( $key );
 				if ( is_wp_error( $new_user ) ) {
 					$redirect = add_query_arg( array( 'update' => 'addnoconfirmation' ), 'user-new.php' );
 				} elseif ( ! is_user_member_of_blog( $new_user['user_id'] ) ) {
 					$redirect = add_query_arg( array( 'update' => 'created_could_not_add' ), 'user-new.php' );
 				} else {
-					$redirect = add_query_arg( array( 'update' => 'addnoconfirmation', 'user_id' => $new_user['user_id'] ), 'user-new.php' );
+					$redirect = add_query_arg(
+						array(
+							'update'  => 'addnoconfirmation',
+							'user_id' => $new_user['user_id'],
+						), 'user-new.php'
+					);
 				}
 			} else {
-				$redirect = add_query_arg( array('update' => 'newuserconfirmation'), 'user-new.php' );
+				$redirect = add_query_arg( array( 'update' => 'newuserconfirmation' ), 'user-new.php' );
 			}
 			wp_redirect( $redirect );
 			die();
@@ -176,52 +205,57 @@ Please click the following link to confirm the invite:
 	}
 }
 
-$title = __('Add New User');
+$title       = __( 'Add New User' );
 $parent_file = 'users.php';
 
 $do_both = false;
-if ( is_multisite() && current_user_can('promote_users') && current_user_can('create_users') )
+if ( is_multisite() && current_user_can( 'promote_users' ) && current_user_can( 'create_users' ) ) {
 	$do_both = true;
-
-$help = '<p>' . __('To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.') . '</p>';
-
-if ( is_multisite() ) {
-	$help .= '<p>' . __('Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.') . '</p>' .
-	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.') . '</p>';
-} else {
-	$help .= '<p>' . __('New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.') . '</p>' .
-
-	'<p>' . __('By default, new users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don&#8217;t want to send the new user a welcome email.') . '</p>';
 }
 
-$help .= '<p>' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '</p>';
+$help = '<p>' . __( 'To add a new user to your site, fill in the form on this screen and click the Add New User button at the bottom.' ) . '</p>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => $help,
-) );
+if ( is_multisite() ) {
+	$help .= '<p>' . __( 'Because this is a multisite installation, you may add accounts that already exist on the Network by specifying a username or email, and defining a role. For more options, such as specifying a password, you have to be a Network Administrator and use the hover link under an existing user&#8217;s name to Edit the user profile under Network Admin > All Users.' ) . '</p>' .
+	'<p>' . __( 'New users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain their password. Check the box if you don&#8217;t want the user to receive a welcome email.' ) . '</p>';
+} else {
+	$help .= '<p>' . __( 'New users are automatically assigned a password, which they can change after logging in. You can view or edit the assigned password by clicking the Show Password button. The username cannot be changed once the user has been added.' ) . '</p>' .
 
-get_current_screen()->add_help_tab( array(
-'id'      => 'user-roles',
-'title'   => __('User Roles'),
-'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
-				'<ul>' .
-				'<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
-				'<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
-				'<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
-				'<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
-				'<li>' . __('Administrators have access to all the administration features.') . '</li>' .
-				'</ul>'
-) );
+	'<p>' . __( 'By default, new users will receive an email letting them know they&#8217;ve been added as a user for your site. This email will also contain a password reset link. Uncheck the box if you don&#8217;t want to send the new user a welcome email.' ) . '</p>';
+}
 
-get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen">Documentation on Adding New Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+$help .= '<p>' . __( 'Remember to click the Add New User button at the bottom of this screen when you are finished.' ) . '</p>';
+
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $help,
+	)
 );
 
-wp_enqueue_script('wp-ajax-response');
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'user-roles',
+		'title'   => __( 'User Roles' ),
+		'content' => '<p>' . __( 'Here is a basic overview of the different user roles and the permissions associated with each one:' ) . '</p>' .
+							 '<ul>' .
+							 '<li>' . __( 'Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.' ) . '</li>' .
+							 '<li>' . __( 'Contributors can write and manage their posts but not publish posts or upload media files.' ) . '</li>' .
+							 '<li>' . __( 'Authors can publish and manage their own posts, and are able to upload files.' ) . '</li>' .
+							 '<li>' . __( 'Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.' ) . '</li>' .
+							 '<li>' . __( 'Administrators have access to all the administration features.' ) . '</li>' .
+							 '</ul>',
+	)
+);
+
+get_current_screen()->set_help_sidebar(
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Users_Add_New_Screen">Documentation on Adding New Users</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+);
+
+wp_enqueue_script( 'wp-ajax-response' );
 wp_enqueue_script( 'user-profile' );
 
 /**
@@ -239,7 +273,7 @@ if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_netw
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( isset($_GET['update']) ) {
+if ( isset( $_GET['update'] ) ) {
 	$messages = array();
 	if ( is_multisite() ) {
 		$edit_link = '';
@@ -251,13 +285,13 @@ if ( isset($_GET['update']) ) {
 		}
 
 		switch ( $_GET['update'] ) {
-			case "newuserconfirmation":
-				$messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.');
+			case 'newuserconfirmation':
+				$messages[] = __( 'Invitation email sent to new user. A confirmation link must be clicked before their account is created.' );
 				break;
-			case "add":
-				$messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.');
+			case 'add':
+				$messages[] = __( 'Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.' );
 				break;
-			case "addnoconfirmation":
+			case 'addnoconfirmation':
 				if ( empty( $edit_link ) ) {
 					$messages[] = __( 'User has been added to your site.' );
 				} else {
@@ -265,58 +299,66 @@ if ( isset($_GET['update']) ) {
 					$messages[] = sprintf( __( 'User has been added to your site. <a href="%s">Edit user</a>' ), $edit_link );
 				}
 				break;
-			case "addexisting":
-				$messages[] = __('That user is already a member of this site.');
+			case 'addexisting':
+				$messages[] = __( 'That user is already a member of this site.' );
 				break;
-			case "could_not_add":
+			case 'could_not_add':
 				$add_user_errors = new WP_Error( 'could_not_add', __( 'That user could not be added to this site.' ) );
 				break;
-			case "created_could_not_add":
+			case 'created_could_not_add':
 				$add_user_errors = new WP_Error( 'created_could_not_add', __( 'User has been created, but could not be added to this site.' ) );
 				break;
-			case "does_not_exist":
+			case 'does_not_exist':
 				$add_user_errors = new WP_Error( 'does_not_exist', __( 'The requested user does not exist.' ) );
 				break;
-			case "enter_email":
+			case 'enter_email':
 				$add_user_errors = new WP_Error( 'enter_email', __( 'Please enter a valid email address.' ) );
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
-			$messages[] = __('User added.');
+		if ( 'add' == $_GET['update'] ) {
+			$messages[] = __( 'User added.' );
+		}
 	}
 }
 ?>
 <div class="wrap">
-<h1 id="add-new-user"><?php
+<h1 id="add-new-user">
+<?php
 if ( current_user_can( 'create_users' ) ) {
 	_e( 'Add New User' );
 } elseif ( current_user_can( 'promote_users' ) ) {
 	_e( 'Add Existing User' );
-} ?>
+}
+?>
 </h1>
 
-<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
+<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
-				echo "<li>$err</li>\n";
+		foreach ( $errors->get_error_messages() as $err ) {
+			echo "<li>$err</li>\n";
+		}
 		?>
 		</ul>
 	</div>
-<?php endif;
+<?php
+endif;
 
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
+	foreach ( $messages as $msg ) {
 		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	}
+}
+?>
 
-<?php if ( isset($add_user_errors) && is_wp_error( $add_user_errors ) ) : ?>
+<?php if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) : ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+		foreach ( $add_user_errors->get_error_messages() as $message ) {
+			echo "<p>$message</p>";
+		}
 		?>
 	</div>
 <?php endif; ?>
@@ -324,28 +366,31 @@ if ( ! empty( $messages ) ) {
 
 <?php
 if ( is_multisite() && current_user_can( 'promote_users' ) ) {
-	if ( $do_both )
+	if ( $do_both ) {
 		echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
+	}
 	if ( ! current_user_can( 'manage_network_users' ) ) {
 		echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
-		$label = __('Email');
+		$label = __( 'Email' );
 		$type  = 'email';
 	} else {
 		echo '<p>' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
-		$label = __('Email or Username');
+		$label = __( 'Email or Username' );
 		$type  = 'text';
 	}
 ?>
-<form method="post" name="adduser" id="adduser" class="validate" novalidate="novalidate"<?php
+<form method="post" name="adduser" id="adduser" class="validate" novalidate="novalidate"
+<?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">
@@ -353,9 +398,9 @@ if ( is_multisite() && current_user_can( 'promote_users' ) ) {
 		<td><input name="email" type="<?php echo $type; ?>" id="adduser-email" class="wp-suggest-user" value="" /></td>
 	</tr>
 	<tr class="form-field">
-		<th scope="row"><label for="adduser-role"><?php _e('Role'); ?></label></th>
+		<th scope="row"><label for="adduser-role"><?php _e( 'Role' ); ?></label></th>
 		<td><select name="role" id="adduser-role">
-			<?php wp_dropdown_roles( get_option('default_role') ); ?>
+			<?php wp_dropdown_roles( get_option( 'default_role' ) ); ?>
 			</select>
 		</td>
 	</tr>
@@ -388,51 +433,54 @@ do_action( 'user_new_form', 'add-existing-user' );
 <?php
 } // is_multisite()
 
-if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
+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
+<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
 	/** 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'] );
 
-$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_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_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>
+		<th scope="row"><label for="user_login"><?php _e( 'Username' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
 		<td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr( $new_user_login ); ?>" aria-required="true" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
 	</tr>
 	<tr class="form-field form-required">
-		<th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
+		<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>
+		<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>
 	</tr>
 	<tr class="form-field">
-		<th scope="row"><label for="last_name"><?php _e('Last Name') ?> </label></th>
-		<td><input name="last_name" type="text" id="last_name" value="<?php echo esc_attr($new_user_lastname); ?>" /></td>
+		<th scope="row"><label for="last_name"><?php _e( 'Last Name' ); ?> </label></th>
+		<td><input name="last_name" type="text" id="last_name" value="<?php echo esc_attr( $new_user_lastname ); ?>" /></td>
 	</tr>
 	<tr class="form-field">
-		<th scope="row"><label for="url"><?php _e('Website') ?></label></th>
+		<th scope="row"><label for="url"><?php _e( 'Website' ); ?></label></th>
 		<td><input name="url" type="url" id="url" class="code" value="<?php echo esc_attr( $new_user_uri ); ?>" /></td>
 	</tr>
 	<tr class="form-field form-required user-pass1-wrap">
@@ -477,7 +525,7 @@ $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unsl
 		</td>
 	</tr>
 	<tr>
-		<th scope="row"><?php _e( 'Send User Notification' ) ?></th>
+		<th scope="row"><?php _e( 'Send User Notification' ); ?></th>
 		<td>
 			<input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked( $new_user_send_notification ); ?> />
 			<label for="send_user_notification"><?php _e( 'Send the new user an email about their account.' ); ?></label>
@@ -485,12 +533,13 @@ $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unsl
 	</tr>
 <?php } // !is_multisite ?>
 	<tr class="form-field">
-		<th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
+		<th scope="row"><label for="role"><?php _e( 'Role' ); ?></label></th>
 		<td><select name="role" id="role">
 			<?php
-			if ( !$new_user_role )
-				$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
-			wp_dropdown_roles($new_user_role);
+			if ( ! $new_user_role ) {
+				$new_user_role = ! empty( $current_role ) ? $current_role : get_option( 'default_role' );
+			}
+			wp_dropdown_roles( $new_user_role );
 			?>
 			</select>
 		</td>
diff --git a/wp-admin/user/admin.php b/wp-admin/user/admin.php
index 3d5063c0d7..9df8f2029e 100644
--- a/wp-admin/user/admin.php
+++ b/wp-admin/user/admin.php
@@ -7,9 +7,9 @@
  * @since 3.1.0
  */
 
-define('WP_USER_ADMIN', true);
+define( 'WP_USER_ADMIN', true );
 
-require_once( dirname(dirname(__FILE__)) . '/admin.php');
+require_once( dirname( dirname( __FILE__ ) ) . '/admin.php' );
 
 if ( ! is_multisite() ) {
 	wp_redirect( admin_url() );
diff --git a/wp-admin/user/menu.php b/wp-admin/user/menu.php
index 637bd036cb..47ef784208 100644
--- a/wp-admin/user/menu.php
+++ b/wp-admin/user/menu.php
@@ -7,16 +7,16 @@
  * @since 3.1.0
  */
 
-$menu[2] = array(__('Dashboard'), 'exist', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard');
+$menu[2] = array( __( 'Dashboard' ), 'exist', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
 
 $menu[4] = array( '', 'exist', 'separator1', '', 'wp-menu-separator' );
 
-$menu[70] = array( __('Profile'), 'exist', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
+$menu[70] = array( __( 'Profile' ), 'exist', 'profile.php', '', 'menu-top menu-icon-users', 'menu-users', 'dashicons-admin-users' );
 
 $menu[99] = array( '', 'exist', 'separator-last', '', 'wp-menu-separator' );
 
 $_wp_real_parent_file['users.php'] = 'profile.php';
-$compat = array();
-$submenu = array();
+$compat                            = array();
+$submenu                           = array();
 
-require_once(ABSPATH . 'wp-admin/includes/menu.php');
+require_once( ABSPATH . 'wp-admin/includes/menu.php' );
diff --git a/wp-admin/users.php b/wp-admin/users.php
index ffee1db008..ac47c392c4 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -18,214 +18,236 @@ if ( ! current_user_can( 'list_users' ) ) {
 	);
 }
 
-$wp_list_table = _get_list_table('WP_Users_List_Table');
-$pagenum = $wp_list_table->get_pagenum();
-$title = __('Users');
-$parent_file = 'users.php';
+$wp_list_table = _get_list_table( 'WP_Users_List_Table' );
+$pagenum       = $wp_list_table->get_pagenum();
+$title         = __( 'Users' );
+$parent_file   = 'users.php';
 
 add_screen_option( 'per_page' );
 
 // contextual help - choose Help on the top right of admin panel to preview this.
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
-					'<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>'
-) ) ;
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.' ) . '</p>' .
+						'<p>' . __( 'To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.' ) . '</p>',
+	)
+);
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'screen-content',
-	'title'   => __('Screen Content'),
-	'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
-					'<ul>' .
-					'<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
-					'<li>' . __( 'You can filter the list of users by User Role using the text links above the users list to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.' ) . '</li>' .
-					'<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
-					'</ul>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'screen-content',
+		'title'   => __( 'Screen Content' ),
+		'content' => '<p>' . __( 'You can customize the display of this screen in a number of ways:' ) . '</p>' .
+						'<ul>' .
+						'<li>' . __( 'You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.' ) . '</li>' .
+						'<li>' . __( 'You can filter the list of users by User Role using the text links above the users list to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.' ) . '</li>' .
+						'<li>' . __( 'You can view all posts made by a user by clicking on the number under the Posts column.' ) . '</li>' .
+						'</ul>',
+	)
+);
 
-$help = '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
+$help = '<p>' . __( 'Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:' ) . '</p>' .
 	'<ul>' .
-	'<li>' . __('<strong>Edit</strong> takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
+	'<li>' . __( '<strong>Edit</strong> takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.' ) . '</li>';
 
-if ( is_multisite() )
+if ( is_multisite() ) {
 	$help .= '<li>' . __( '<strong>Remove</strong> allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
-else
+} else {
 	$help .= '<li>' . __( '<strong>Delete</strong> brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
+}
 
 $help .= '</ul>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'action-links',
-	'title'   => __('Available Actions'),
-	'content' => $help,
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'action-links',
+		'title'   => __( 'Available Actions' ),
+		'content' => $help,
+	)
+);
 unset( $help );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Screen">Documentation on Managing Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Roles_and_Capabilities">Descriptions of Roles and Capabilities</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/Users_Screen">Documentation on Managing Users</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Roles_and_Capabilities">Descriptions of Roles and Capabilities</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter users list' ),
-	'heading_pagination' => __( 'Users list navigation' ),
-	'heading_list'       => __( 'Users list' ),
-) );
+get_current_screen()->set_screen_reader_content(
+	array(
+		'heading_views'      => __( 'Filter users list' ),
+		'heading_pagination' => __( 'Users list navigation' ),
+		'heading_list'       => __( 'Users list' ),
+	)
+);
 
-if ( empty($_REQUEST) ) {
-	$referer = '<input type="hidden" name="wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
-} elseif ( isset($_REQUEST['wp_http_referer']) ) {
-	$redirect = remove_query_arg(array('wp_http_referer', 'updated', 'delete_count'), wp_unslash( $_REQUEST['wp_http_referer'] ) );
-	$referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr($redirect) . '" />';
+if ( empty( $_REQUEST ) ) {
+	$referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
+} elseif ( isset( $_REQUEST['wp_http_referer'] ) ) {
+	$redirect = remove_query_arg( array( 'wp_http_referer', 'updated', 'delete_count' ), wp_unslash( $_REQUEST['wp_http_referer'] ) );
+	$referer  = '<input type="hidden" name="wp_http_referer" value="' . esc_attr( $redirect ) . '" />';
 } else {
 	$redirect = 'users.php';
-	$referer = '';
+	$referer  = '';
 }
 
 $update = '';
 
 switch ( $wp_list_table->current_action() ) {
 
-/* Bulk Dropdown menu Role changes */
-case 'promote':
-	check_admin_referer('bulk-users');
+	/* Bulk Dropdown menu Role changes */
+	case 'promote':
+		check_admin_referer( 'bulk-users' );
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );
-
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
-
-	$editable_roles = get_editable_roles();
-	$role = false;
-	if ( ! empty( $_REQUEST['new_role2'] ) ) {
-		$role = $_REQUEST['new_role2'];
-	} elseif ( ! empty( $_REQUEST['new_role'] ) ) {
-		$role = $_REQUEST['new_role'];
-	}
-
-	if ( ! $role || empty( $editable_roles[ $role ] ) ) {
-		wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
-	}
-
-	$userids = $_REQUEST['users'];
-	$update = 'promote';
-	foreach ( $userids as $id ) {
-		$id = (int) $id;
-
-		if ( ! current_user_can('promote_user', $id) )
+		if ( ! current_user_can( 'promote_users' ) ) {
 			wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );
-		// The new role of the current user must also have the promote_users cap or be a multisite super admin
-		if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap('promote_users')
+		}
+
+		if ( empty( $_REQUEST['users'] ) ) {
+			wp_redirect( $redirect );
+			exit();
+		}
+
+		$editable_roles = get_editable_roles();
+		$role           = false;
+		if ( ! empty( $_REQUEST['new_role2'] ) ) {
+			$role = $_REQUEST['new_role2'];
+		} elseif ( ! empty( $_REQUEST['new_role'] ) ) {
+			$role = $_REQUEST['new_role'];
+		}
+
+		if ( ! $role || empty( $editable_roles[ $role ] ) ) {
+			wp_die( __( 'Sorry, you are not allowed to give users that role.' ), 403 );
+		}
+
+		$userids = $_REQUEST['users'];
+		$update  = 'promote';
+		foreach ( $userids as $id ) {
+			$id = (int) $id;
+
+			if ( ! current_user_can( 'promote_user', $id ) ) {
+				wp_die( __( 'Sorry, you are not allowed to edit this user.' ), 403 );
+			}
+			// The new role of the current user must also have the promote_users cap or be a multisite super admin
+			if ( $id == $current_user->ID && ! $wp_roles->role_objects[ $role ]->has_cap( 'promote_users' )
 			&& ! ( is_multisite() && current_user_can( 'manage_network_users' ) ) ) {
-				$update = 'err_admin_role';
-				continue;
+					$update = 'err_admin_role';
+					continue;
+			}
+
+			// If the user doesn't already belong to the blog, bail.
+			if ( is_multisite() && ! is_user_member_of_blog( $id ) ) {
+				wp_die(
+					'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+					'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
+					403
+				);
+			}
+
+			$user = get_userdata( $id );
+			$user->set_role( $role );
 		}
 
-		// If the user doesn't already belong to the blog, bail.
-		if ( is_multisite() && !is_user_member_of_blog( $id ) ) {
-			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'One of the selected users is not a member of this site.' ) . '</p>',
-				403
-			);
-		}
-
-		$user = get_userdata( $id );
-		$user->set_role( $role );
-	}
-
-	wp_redirect(add_query_arg('update', $update, $redirect));
-	exit();
-
-case 'dodelete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.'), 400 );
-
-	check_admin_referer('delete-users');
-
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
+		wp_redirect( add_query_arg( 'update', $update, $redirect ) );
 		exit();
-	}
 
-	$userids = array_map( 'intval', (array) $_REQUEST['users'] );
-
-	if ( empty( $_REQUEST['delete_option'] ) ) {
-		$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
-		$url = str_replace( '&amp;', '&', wp_nonce_url( $url, 'bulk-users' ) );
-		wp_redirect( $url );
-		exit;
-	}
-
-	if ( ! current_user_can( 'delete_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to delete users.' ), 403 );
-
-	$update = 'del';
-	$delete_count = 0;
-
-	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die( __( 'Sorry, you are not allowed to delete that user.' ), 403 );
-
-		if ( $id == $current_user->ID ) {
-			$update = 'err_admin_del';
-			continue;
+	case 'dodelete':
+		if ( is_multisite() ) {
+			wp_die( __( 'User deletion is not allowed from this screen.' ), 400 );
 		}
-		switch ( $_REQUEST['delete_option'] ) {
-		case 'delete':
-			wp_delete_user( $id );
-			break;
-		case 'reassign':
-			wp_delete_user( $id, $_REQUEST['reassign_user'] );
-			break;
+
+		check_admin_referer( 'delete-users' );
+
+		if ( empty( $_REQUEST['users'] ) ) {
+			wp_redirect( $redirect );
+			exit();
 		}
-		++$delete_count;
-	}
 
-	$redirect = add_query_arg( array('delete_count' => $delete_count, 'update' => $update), $redirect);
-	wp_redirect($redirect);
-	exit();
-
-case 'delete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.'), 400 );
-
-	check_admin_referer('bulk-users');
-
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
-
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to delete users.' ) );
-
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
-	else
 		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-	$users_have_content = false;
-	if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) {
-		$users_have_content = true;
-	} elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . " ) LIMIT 1" ) ) {
-		$users_have_content = true;
-	}
+		if ( empty( $_REQUEST['delete_option'] ) ) {
+			$url = self_admin_url( 'users.php?action=delete&users[]=' . implode( '&users[]=', $userids ) . '&error=true' );
+			$url = str_replace( '&amp;', '&', wp_nonce_url( $url, 'bulk-users' ) );
+			wp_redirect( $url );
+			exit;
+		}
 
-	if ( $users_have_content ) {
-		add_action( 'admin_head', 'delete_users_add_js' );
-	}
+		if ( ! current_user_can( 'delete_users' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to delete users.' ), 403 );
+		}
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
-?>
-<form method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('delete-users') ?>
+		$update       = 'del';
+		$delete_count = 0;
+
+		foreach ( $userids as $id ) {
+			if ( ! current_user_can( 'delete_user', $id ) ) {
+				wp_die( __( 'Sorry, you are not allowed to delete that user.' ), 403 );
+			}
+
+			if ( $id == $current_user->ID ) {
+				$update = 'err_admin_del';
+				continue;
+			}
+			switch ( $_REQUEST['delete_option'] ) {
+				case 'delete':
+					wp_delete_user( $id );
+					break;
+				case 'reassign':
+					wp_delete_user( $id, $_REQUEST['reassign_user'] );
+					break;
+			}
+			++$delete_count;
+		}
+
+		$redirect = add_query_arg(
+			array(
+				'delete_count' => $delete_count,
+				'update'       => $update,
+			), $redirect
+		);
+		wp_redirect( $redirect );
+		exit();
+
+	case 'delete':
+		if ( is_multisite() ) {
+			wp_die( __( 'User deletion is not allowed from this screen.' ), 400 );
+		}
+
+		check_admin_referer( 'bulk-users' );
+
+		if ( empty( $_REQUEST['users'] ) && empty( $_REQUEST['user'] ) ) {
+			wp_redirect( $redirect );
+			exit();
+		}
+
+		if ( ! current_user_can( 'delete_users' ) ) {
+			$errors = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to delete users.' ) );
+		}
+
+		if ( empty( $_REQUEST['users'] ) ) {
+			$userids = array( intval( $_REQUEST['user'] ) );
+		} else {
+			$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		}
+
+		$users_have_content = false;
+		if ( $wpdb->get_var( "SELECT ID FROM {$wpdb->posts} WHERE post_author IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+			$users_have_content = true;
+		} elseif ( $wpdb->get_var( "SELECT link_id FROM {$wpdb->links} WHERE link_owner IN( " . implode( ',', $userids ) . ' ) LIMIT 1' ) ) {
+			$users_have_content = true;
+		}
+
+		if ( $users_have_content ) {
+			add_action( 'admin_head', 'delete_users_add_js' );
+		}
+
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+	?>
+	<form method="post" name="updateusers" id="updateusers">
+	<?php wp_nonce_field( 'delete-users' ); ?>
 <?php echo $referer; ?>
 
 <div class="wrap">
@@ -245,24 +267,26 @@ case 'delete':
 <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++;
-		}
+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 ) : ?>
-		<input type="hidden" name="delete_option" value="delete" />
-	<?php else: ?>
+		if ( ! $users_have_content ) :
+	?>
+			<input type="hidden" name="delete_option" value="delete" />
+		<?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 : ?>
@@ -270,16 +294,22 @@ case 'delete':
 		<?php endif; ?>
 		<ul style="list-style:none;">
 			<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
-			<?php _e('Delete all content.'); ?></label></li>
+			<?php _e( 'Delete all content.' ); ?></label></li>
 			<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
-			<?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
-			wp_dropdown_users( array(
-				'name' => 'reassign_user',
-				'exclude' => array_diff( $userids, array( $current_user->ID ) ),
-				'show' => 'display_name_with_login',
-			) ); ?></li>
+			<?php
+			echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
+			wp_dropdown_users(
+				array(
+					'name'    => 'reassign_user',
+					'exclude' => array_diff( $userids, array( $current_user->ID ) ),
+					'show'    => 'display_name_with_login',
+				)
+			);
+			?>
+			</li>
 		</ul></fieldset>
-	<?php endif;
+	<?php
+	endif;
 	/**
 	 * Fires at the end of the delete users form prior to the confirm button.
 	 *
@@ -292,70 +322,74 @@ case 'delete':
 	do_action( 'delete_user_form', $current_user, $userids );
 	?>
 	<input type="hidden" name="action" value="dodelete" />
-	<?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 submit_button( __( 'Confirm Deletion' ), 'primary' ); ?>
+	<?php else : ?>
+	<p><?php _e( 'There are no valid users selected for deletion.' ); ?></p>
+	<?php endif; ?>
+	</div>
+	</form>
+	<?php
 
-break;
+		break;
 
-case 'doremove':
-	check_admin_referer('remove-users');
+	case 'doremove':
+		check_admin_referer( 'remove-users' );
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ), 400 );
-
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
-		exit;
-	}
-
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to remove users.' ), 403 );
-
-	$userids = $_REQUEST['users'];
-
-	$update = 'remove';
- 	foreach ( $userids as $id ) {
-		$id = (int) $id;
-		if ( !current_user_can('remove_user', $id) ) {
-			$update = 'err_admin_remove';
-			continue;
+		if ( ! is_multisite() ) {
+			wp_die( __( 'You can&#8217;t remove users.' ), 400 );
 		}
-		remove_user_from_blog($id, $blog_id);
-	}
 
-	$redirect = add_query_arg( array('update' => $update), $redirect);
-	wp_redirect($redirect);
-	exit;
+		if ( empty( $_REQUEST['users'] ) ) {
+			wp_redirect( $redirect );
+			exit;
+		}
 
-case 'remove':
+		if ( ! current_user_can( 'remove_users' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to remove users.' ), 403 );
+		}
 
-	check_admin_referer('bulk-users');
-
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ), 400 );
-
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
-
-	if ( !current_user_can('remove_users') )
-		$error = new WP_Error('edit_users', __('Sorry, you are not allowed to remove users.'));
-
-	if ( empty($_REQUEST['users']) )
-		$userids = array(intval($_REQUEST['user']));
-	else
 		$userids = $_REQUEST['users'];
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
-?>
-<form method="post" name="updateusers" id="updateusers">
-<?php wp_nonce_field('remove-users') ?>
+		$update = 'remove';
+		foreach ( $userids as $id ) {
+			$id = (int) $id;
+			if ( ! current_user_can( 'remove_user', $id ) ) {
+				$update = 'err_admin_remove';
+				continue;
+			}
+			remove_user_from_blog( $id, $blog_id );
+		}
+
+		$redirect = add_query_arg( array( 'update' => $update ), $redirect );
+		wp_redirect( $redirect );
+		exit;
+
+	case 'remove':
+		check_admin_referer( 'bulk-users' );
+
+		if ( ! is_multisite() ) {
+			wp_die( __( 'You can&#8217;t remove users.' ), 400 );
+		}
+
+		if ( empty( $_REQUEST['users'] ) && empty( $_REQUEST['user'] ) ) {
+			wp_redirect( $redirect );
+			exit();
+		}
+
+		if ( ! current_user_can( 'remove_users' ) ) {
+			$error = new WP_Error( 'edit_users', __( 'Sorry, you are not allowed to remove users.' ) );
+		}
+
+		if ( empty( $_REQUEST['users'] ) ) {
+			$userids = array( intval( $_REQUEST['user'] ) );
+		} else {
+			$userids = $_REQUEST['users'];
+		}
+
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+	?>
+	<form method="post" name="updateusers" id="updateusers">
+	<?php wp_nonce_field( 'remove-users' ); ?>
 <?php echo $referer; ?>
 
 <div class="wrap">
@@ -370,130 +404,144 @@ case 'remove':
 <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;
-		}
- 	}
- 	?>
-</ul>
-<?php if ( $go_remove ) : ?>
+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 ) : ?>
 		<input type="hidden" name="action" value="doremove" />
-		<?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
-
-break;
-
-default:
-
-	if ( !empty($_GET['_wp_http_referer']) ) {
-		wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
-		exit;
-	}
-
-	if ( $wp_list_table->current_action() && ! empty( $_REQUEST['users'] ) ) {
-		$userids = $_REQUEST['users'];
-		$sendback = wp_get_referer();
-
-		/** This action is documented in wp-admin/edit-comments.php */
-		$sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $wp_list_table->current_action(), $userids );
-
-		wp_safe_redirect( $sendback );
-		exit;
-	}
-
-	$wp_list_table->prepare_items();
-	$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
-	if ( $pagenum > $total_pages && $total_pages > 0 ) {
-		wp_redirect( add_query_arg( 'paged', $total_pages ) );
-		exit;
-	}
-
-	include( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$messages = array();
-	if ( isset($_GET['update']) ) :
-		switch($_GET['update']) {
-		case 'del':
-		case 'del_many':
-			$delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
-			if ( 1 == $delete_count ) {
-				$message = __( 'User deleted.' );
-			} else {
-				$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
-			}
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
-			break;
-		case 'add':
-			if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
-				/* translators: %s: edit page url */
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
-					esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-						self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
-			} else {
-				$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
-			}
-			break;
-		case 'promote':
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Changed roles.') . '</p></div>';
-			break;
-		case 'err_admin_role':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('The current user&#8217;s role must have user editing capabilities.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other user roles have been changed.') . '</p></div>';
-			break;
-		case 'err_admin_del':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __('You can&#8217;t delete the current user.') . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('Other users have been deleted.') . '</p></div>';
-			break;
-		case 'remove':
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('User removed from this site.') . '</p></div>';
-			break;
-		case 'err_admin_remove':
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __("You can't remove the current user.") . '</p></div>';
-			$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __('Other users have been removed.') . '</p></div>';
-			break;
-		}
-	endif; ?>
-
-<?php if ( isset($errors) && is_wp_error( $errors ) ) : ?>
-	<div class="error">
-		<ul>
-		<?php
-			foreach ( $errors->get_error_messages() as $err )
-				echo "<li>$err</li>\n";
-		?>
-		</ul>
+		<?php submit_button( __( 'Confirm Removal' ), 'primary' ); ?>
+	<?php else : ?>
+	<p><?php _e( 'There are no valid users selected for removal.' ); ?></p>
+	<?php endif; ?>
 	</div>
-<?php endif;
+	</form>
+	<?php
 
-if ( ! empty($messages) ) {
-	foreach ( $messages as $msg )
+		break;
+
+	default:
+		if ( ! empty( $_GET['_wp_http_referer'] ) ) {
+			wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+			exit;
+		}
+
+		if ( $wp_list_table->current_action() && ! empty( $_REQUEST['users'] ) ) {
+			$userids  = $_REQUEST['users'];
+			$sendback = wp_get_referer();
+
+			/** This action is documented in wp-admin/edit-comments.php */
+			$sendback = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $sendback, $wp_list_table->current_action(), $userids );
+
+			wp_safe_redirect( $sendback );
+			exit;
+		}
+
+		$wp_list_table->prepare_items();
+		$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+		if ( $pagenum > $total_pages && $total_pages > 0 ) {
+			wp_redirect( add_query_arg( 'paged', $total_pages ) );
+			exit;
+		}
+
+		include( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$messages = array();
+		if ( isset( $_GET['update'] ) ) :
+			switch ( $_GET['update'] ) {
+				case 'del':
+				case 'del_many':
+					$delete_count = isset( $_GET['delete_count'] ) ? (int) $_GET['delete_count'] : 0;
+					if ( 1 == $delete_count ) {
+						$message = __( 'User deleted.' );
+					} else {
+						$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+					}
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $delete_count ) ) . '</p></div>';
+					break;
+				case 'add':
+					if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
+						/* translators: %s: edit page url */
+						$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf(
+							__( 'New user created. <a href="%s">Edit user</a>' ),
+							esc_url(
+								add_query_arg(
+									'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
+									self_admin_url( 'user-edit.php?user_id=' . $user_id )
+								)
+							)
+						) . '</p></div>';
+					} else {
+						$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'New user created.' ) . '</p></div>';
+					}
+					break;
+				case 'promote':
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Changed roles.' ) . '</p></div>';
+					break;
+				case 'err_admin_role':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'The current user&#8217;s role must have user editing capabilities.' ) . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other user roles have been changed.' ) . '</p></div>';
+					break;
+				case 'err_admin_del':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'You can&#8217;t delete the current user.' ) . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Other users have been deleted.' ) . '</p></div>';
+					break;
+				case 'remove':
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'User removed from this site.' ) . '</p></div>';
+					break;
+				case 'err_admin_remove':
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( "You can't remove the current user." ) . '</p></div>';
+					$messages[] = '<div id="message" class="updated notice is-dismissible fade"><p>' . __( 'Other users have been removed.' ) . '</p></div>';
+					break;
+			}
+		endif;
+	?>
+
+	<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
+		<div class="error">
+			<ul>
+			<?php
+			foreach ( $errors->get_error_messages() as $err ) {
+				echo "<li>$err</li>\n";
+			}
+			?>
+			</ul>
+		</div>
+	<?php
+	endif;
+
+if ( ! empty( $messages ) ) {
+	foreach ( $messages as $msg ) {
 		echo $msg;
-} ?>
+	}
+}
+?>
 
-<div class="wrap">
-<h1 class="wp-heading-inline"><?php
+	<div class="wrap">
+	<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?php
-if ( current_user_can( 'create_users' ) ) { ?>
+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 ) ) {
 	/* translators: %s: search keywords */
@@ -519,7 +567,7 @@ if ( strlen( $usersearch ) ) {
 <br class="clear" />
 </div>
 <?php
-break;
+		break;
 
 } // end of the $doaction switch
 
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index d967c5ccb5..533767023a 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -10,7 +10,7 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
 /** WordPress Administration Widgets API */
-require_once(ABSPATH . 'wp-admin/includes/widgets.php');
+require_once( ABSPATH . 'wp-admin/includes/widgets.php' );
 
 if ( ! current_user_can( 'edit_theme_options' ) ) {
 	wp_die(
@@ -21,7 +21,7 @@ if ( ! current_user_can( 'edit_theme_options' ) ) {
 }
 
 $widgets_access = get_user_setting( 'widgets_access' );
-if ( isset($_GET['widgets-access']) ) {
+if ( isset( $_GET['widgets-access'] ) ) {
 	check_admin_referer( 'widgets-access' );
 
 	$widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off';
@@ -31,10 +31,11 @@ if ( isset($_GET['widgets-access']) ) {
 if ( 'on' == $widgets_access ) {
 	add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
 } else {
-	wp_enqueue_script('admin-widgets');
+	wp_enqueue_script( 'admin-widgets' );
 
-	if ( wp_is_mobile() )
+	if ( wp_is_mobile() ) {
 		wp_enqueue_script( 'jquery-touch-punch' );
+	}
 }
 
 /**
@@ -45,36 +46,42 @@ if ( 'on' == $widgets_access ) {
  */
 do_action( 'sidebar_admin_setup' );
 
-$title = __( 'Widgets' );
+$title       = __( 'Widgets' );
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
-'id'		=> 'overview',
-'title'		=> __('Overview'),
-'content'	=>
-	'<p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
-	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'removing-reusing',
-'title'		=> __('Removing and Reusing'),
-'content'	=>
-	'<p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
-	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
-	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
-'id'		=> 'missing-widgets',
-'title'		=> __('Missing Widgets'),
-'content'	=>
-	'<p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>' .
-		'<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.') . '</p>'
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' =>
+				 '<p>' . __( 'Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.' ) . '</p>
+	<p>' . __( 'The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.' ) . '</p>',
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'removing-reusing',
+		'title'   => __( 'Removing and Reusing' ),
+		'content' =>
+				 '<p>' . __( 'If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.' ) . '</p>
+	<p>' . __( 'Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.' ) . '</p>
+	<p>' . __( 'Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.' ) . '</p>',
+	)
+);
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'missing-widgets',
+		'title'   => __( 'Missing Widgets' ),
+		'content' =>
+				 '<p>' . __( 'Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.' ) . '</p>' .
+					 '<p>' . __( 'When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen">Documentation on Widgets</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/Appearance_Widgets_Screen">Documentation on Widgets</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
 );
 
 if ( ! current_theme_supports( 'widgets' ) ) {
@@ -84,25 +91,29 @@ if ( ! current_theme_supports( 'widgets' ) ) {
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if ( empty( $sidebars_widgets ) ) {
 	$sidebars_widgets = wp_get_widget_defaults();
+}
 
 foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
+	if ( 'wp_inactive_widgets' == $sidebar_id ) {
 		continue;
+	}
 
 	if ( ! is_registered_sidebar( $sidebar_id ) ) {
 		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
-			register_sidebar(array(
-				'name' => __( 'Inactive Sidebar (not used)' ),
-				'id' => $sidebar_id,
-				'class' => 'inactive-sidebar orphan-sidebar',
-				'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
-				'before_widget' => '',
-				'after_widget' => '',
-				'before_title' => '',
-				'after_title' => '',
-			));
+			register_sidebar(
+				array(
+					'name'          => __( 'Inactive Sidebar (not used)' ),
+					'id'            => $sidebar_id,
+					'class'         => 'inactive-sidebar orphan-sidebar',
+					'description'   => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
+					'before_widget' => '',
+					'after_widget'  => '',
+					'before_title'  => '',
+					'after_title'   => '',
+				)
+			);
 		} else {
 			unset( $sidebars_widgets[ $sidebar_id ] );
 		}
@@ -110,50 +121,57 @@ foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
 }
 
 // register the inactive_widgets area as sidebar
-register_sidebar(array(
-	'name' => __('Inactive Widgets'),
-	'id' => 'wp_inactive_widgets',
-	'class' => 'inactive-sidebar',
-	'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
-	'before_widget' => '',
-	'after_widget' => '',
-	'before_title' => '',
-	'after_title' => '',
-));
+register_sidebar(
+	array(
+		'name'          => __( 'Inactive Widgets' ),
+		'id'            => 'wp_inactive_widgets',
+		'class'         => 'inactive-sidebar',
+		'description'   => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
+		'before_widget' => '',
+		'after_widget'  => '',
+		'before_title'  => '',
+		'after_title'   => '',
+	)
+);
 
 retrieve_widgets();
 
 // We're saving a widget without js
-if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
+if ( isset( $_POST['savewidget'] ) || isset( $_POST['removewidget'] ) ) {
 	$widget_id = $_POST['widget-id'];
-	check_admin_referer("save-delete-widget-$widget_id");
+	check_admin_referer( "save-delete-widget-$widget_id" );
 
-	$number = isset($_POST['multi_number']) ? (int) $_POST['multi_number'] : '';
+	$number = isset( $_POST['multi_number'] ) ? (int) $_POST['multi_number'] : '';
 	if ( $number ) {
 		foreach ( $_POST as $key => $val ) {
-			if ( is_array($val) && preg_match('/__i__|%i%/', key($val)) ) {
-				$_POST[$key] = array( $number => array_shift($val) );
+			if ( is_array( $val ) && preg_match( '/__i__|%i%/', key( $val ) ) ) {
+				$_POST[ $key ] = array( $number => array_shift( $val ) );
 				break;
 			}
 		}
 	}
 
 	$sidebar_id = $_POST['sidebar'];
-	$position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0;
+	$position   = isset( $_POST[ $sidebar_id . '_position' ] ) ? (int) $_POST[ $sidebar_id . '_position' ] - 1 : 0;
 
 	$id_base = $_POST['id_base'];
-	$sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
+	$sidebar = isset( $sidebars_widgets[ $sidebar_id ] ) ? $sidebars_widgets[ $sidebar_id ] : array();
 
 	// Delete.
-	if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
+	if ( isset( $_POST['removewidget'] ) && $_POST['removewidget'] ) {
 
-		if ( !in_array($widget_id, $sidebar, true) ) {
-			wp_redirect( admin_url('widgets.php?error=0') );
+		if ( ! in_array( $widget_id, $sidebar, true ) ) {
+			wp_redirect( admin_url( 'widgets.php?error=0' ) );
 			exit;
 		}
 
-		$sidebar = array_diff( $sidebar, array($widget_id) );
-		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+		$sidebar = array_diff( $sidebar, array( $widget_id ) );
+		$_POST   = array(
+			'sidebar'            => $sidebar_id,
+			'widget-' . $id_base => array(),
+			'the-widget-id'      => $widget_id,
+			'delete_widget'      => '1',
+		);
 
 		/**
 		 * Fires immediately after a widget has been marked for deletion.
@@ -170,8 +188,9 @@ if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
 	$_POST['widget-id'] = $sidebar;
 
 	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
+		if ( $name != $id_base || ! is_callable( $control['callback'] ) ) {
 			continue;
+		}
 
 		ob_start();
 			call_user_func_array( $control['callback'], $control['params'] );
@@ -180,19 +199,20 @@ if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
 		break;
 	}
 
-	$sidebars_widgets[$sidebar_id] = $sidebar;
+	$sidebars_widgets[ $sidebar_id ] = $sidebar;
 
 	// Remove old position.
-	if ( !isset($_POST['delete_widget']) ) {
+	if ( ! isset( $_POST['delete_widget'] ) ) {
 		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+			if ( is_array( $sb ) ) {
+				$sidebars_widgets[ $key ] = array_diff( $sb, array( $widget_id ) );
+			}
 		}
-		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
+		array_splice( $sidebars_widgets[ $sidebar_id ], $position, 0, $widget_id );
 	}
 
-	wp_set_sidebars_widgets($sidebars_widgets);
-	wp_redirect( admin_url('widgets.php?message=0') );
+	wp_set_sidebars_widgets( $sidebars_widgets );
+	wp_redirect( admin_url( 'widgets.php?message=0' ) );
 	exit;
 }
 
@@ -202,13 +222,13 @@ if ( isset( $_POST['removeinactivewidgets'] ) ) {
 
 	if ( $_POST['removeinactivewidgets'] ) {
 		foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
-			$pieces = explode( '-', $widget_id );
+			$pieces       = explode( '-', $widget_id );
 			$multi_number = array_pop( $pieces );
-			$id_base = implode( '-', $pieces );
-			$widget = get_option( 'widget_' . $id_base );
-			unset( $widget[$multi_number] );
+			$id_base      = implode( '-', $pieces );
+			$widget       = get_option( 'widget_' . $id_base );
+			unset( $widget[ $multi_number ] );
 			update_option( 'widget_' . $id_base, $widget );
-			unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+			unset( $sidebars_widgets['wp_inactive_widgets'][ $key ] );
 		}
 
 		wp_set_sidebars_widgets( $sidebars_widgets );
@@ -219,50 +239,53 @@ if ( isset( $_POST['removeinactivewidgets'] ) ) {
 }
 
 // Output the widget form without js
-if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
+if ( isset( $_GET['editwidget'] ) && $_GET['editwidget'] ) {
 	$widget_id = $_GET['editwidget'];
 
-	if ( isset($_GET['addnew']) ) {
+	if ( isset( $_GET['addnew'] ) ) {
 		// Default to the first sidebar
-		$keys = array_keys( $wp_registered_sidebars );
+		$keys    = array_keys( $wp_registered_sidebars );
 		$sidebar = reset( $keys );
 
-		if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget
+		if ( isset( $_GET['base'] ) && isset( $_GET['num'] ) ) { // multi-widget
 			// Copy minimal info from an existing instance of this widget to a new instance
 			foreach ( $wp_registered_widget_controls as $control ) {
 				if ( $_GET['base'] === $control['id_base'] ) {
-					$control_callback = $control['callback'];
-					$multi_number = (int) $_GET['num'];
-					$control['params'][0]['number'] = -1;
-					$widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number;
-					$wp_registered_widget_controls[$control['id']] = $control;
+					$control_callback                                = $control['callback'];
+					$multi_number                                    = (int) $_GET['num'];
+					$control['params'][0]['number']                  = -1;
+					$widget_id                                       = $control['id'] = $control['id_base'] . '-' . $multi_number;
+					$wp_registered_widget_controls[ $control['id'] ] = $control;
 					break;
 				}
 			}
 		}
 	}
 
-	if ( isset($wp_registered_widget_controls[$widget_id]) && !isset($control) ) {
-		$control = $wp_registered_widget_controls[$widget_id];
+	if ( isset( $wp_registered_widget_controls[ $widget_id ] ) && ! isset( $control ) ) {
+		$control          = $wp_registered_widget_controls[ $widget_id ];
 		$control_callback = $control['callback'];
-	} elseif ( !isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id]) ) {
-		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
+	} elseif ( ! isset( $wp_registered_widget_controls[ $widget_id ] ) && isset( $wp_registered_widgets[ $widget_id ] ) ) {
+		$name = esc_html( strip_tags( $wp_registered_widgets[ $widget_id ]['name'] ) );
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( ! isset( $name ) ) {
+		$name = esc_html( strip_tags( $control['name'] ) );
+	}
 
-	if ( !isset($sidebar) )
-		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	if ( ! isset( $sidebar ) ) {
+		$sidebar = isset( $_GET['sidebar'] ) ? $_GET['sidebar'] : 'wp_inactive_widgets';
+	}
 
-	if ( !isset($multi_number) )
-		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
+	if ( ! isset( $multi_number ) ) {
+		$multi_number = isset( $control['params'][0]['number'] ) ? $control['params'][0]['number'] : '';
+	}
 
-	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
+	$id_base = isset( $control['id_base'] ) ? $control['id_base'] : $control['id'];
 
 	// Show the widget form.
-	$width = ' style="width:' . max($control['width'], 350) . 'px"';
-	$key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
+	$width = ' style="width:' . max( $control['width'], 350 ) . 'px"';
+	$key   = isset( $_GET['key'] ) ? (int) $_GET['key'] : 0;
 
 	require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 	<div class="wrap">
@@ -273,57 +296,64 @@ 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"; ?>
+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>
+	<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>
+	<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;';
+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();
 		} else {
-			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++;
+			$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 );
-				echo "\t\t<option value='$i'$selected> $i </option>\n";
-			}
-			echo "\t\t</select>\n";
 		}
-		echo "</td></tr>\n";
-	} ?>
+		$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</select>\n";
+	}
+	echo "</td></tr>\n";
+}
+	?>
 	</tbody></table>
 	</div>
 
 	<div class="widget-control-actions">
 <?php
-	if ( isset($_GET['addnew']) ) { ?>
-	<a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
+if ( isset( $_GET['addnew'] ) ) {
+	?>
+	<a href="widgets.php" class="button alignleft"><?php _e( 'Cancel' ); ?></a>
 <?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"); ?>
+} 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" ); ?>
 	<br class="clear" />
 	</div>
 	</form>
@@ -335,32 +365,37 @@ if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
 }
 
 $messages = array(
-	__('Changes saved.')
+	__( 'Changes saved.' ),
 );
 
 $errors = array(
-	__('Error while saving.'),
-	__('Error in displaying the widget settings form.')
+	__( 'Error while saving.' ),
+	__( 'Error in displaying the widget settings form.' ),
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require_once( ABSPATH . 'wp-admin/admin-header.php' );
+?>
 
 <div class="wrap">
-<h1 class="wp-heading-inline"><?php
+<h1 class="wp-heading-inline">
+<?php
 echo esc_html( $title );
-?></h1>
+?>
+</h1>
 
 <?php
 if ( current_user_can( 'customize' ) ) {
 	printf(
 		' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-		esc_url( add_query_arg(
-			array(
-				array( 'autofocus' => array( 'panel' => 'widgets' ) ),
-				'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) )
-			),
-			admin_url( 'customize.php' )
-		) ),
+		esc_url(
+			add_query_arg(
+				array(
+					array( 'autofocus' => array( 'panel' => 'widgets' ) ),
+					'return' => urlencode( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+				),
+				admin_url( 'customize.php' )
+			)
+		),
 		__( 'Manage with Live Preview' )
 	);
 }
@@ -368,11 +403,11 @@ if ( current_user_can( 'customize' ) ) {
 
 <hr class="wp-header-end">
 
-<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
-<div id="message" class="updated notice is-dismissible"><p><?php echo $messages[$_GET['message']]; ?></p></div>
+<?php if ( isset( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) { ?>
+<div id="message" class="updated notice is-dismissible"><p><?php echo $messages[ $_GET['message'] ]; ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) { ?>
-<div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
+<?php if ( isset( $_GET['error'] ) && isset( $errors[ $_GET['error'] ] ) ) { ?>
+<div id="message" class="error"><p><?php echo $errors[ $_GET['error'] ]; ?></p></div>
 <?php } ?>
 
 <?php
@@ -381,7 +416,8 @@ if ( current_user_can( 'customize' ) ) {
  *
  * @since 3.0.0
  */
-do_action( 'widgets_admin_page' ); ?>
+do_action( 'widgets_admin_page' );
+?>
 
 <div class="widget-liquid-left">
 <div id="widgets-left">
@@ -395,7 +431,7 @@ do_action( 'widgets_admin_page' ); ?>
 		</div>
 		<div class="widget-holder">
 			<div class="sidebar-description">
-				<p class="description"><?php _e('To activate a widget drag it to a sidebar or click on it. To deactivate a widget and delete its settings, drag it back.'); ?></p>
+				<p class="description"><?php _e( 'To activate a widget drag it to a sidebar or click on it. To deactivate a widget and delete its settings, drag it back.' ); ?></p>
 			</div>
 			<div id="widget-list">
 				<?php wp_list_widgets(); ?>
@@ -411,8 +447,9 @@ $theme_sidebars = array();
 foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
 	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
+		if ( ! empty( $registered_sidebar['class'] ) ) {
 			$wrap_class .= ' ' . $registered_sidebar['class'];
+		}
 
 		$is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id'];
 		?>
@@ -427,7 +464,7 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
 							<?php
 							$attributes = array( 'id' => 'inactive-widgets-control-remove' );
 
-							if ( empty($sidebars_widgets['wp_inactive_widgets']) ) {
+							if ( empty( $sidebars_widgets['wp_inactive_widgets'] ) ) {
 								$attributes['disabled'] = '';
 							}
 
@@ -447,7 +484,7 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
 		<?php
 
 	} else {
-		$theme_sidebars[$sidebar] = $registered_sidebar;
+		$theme_sidebars[ $sidebar ] = $registered_sidebar;
 	}
 }
 
@@ -456,9 +493,9 @@ foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
 </div>
 <?php
 
-$i = $split = 0;
+$i                    = $split = 0;
 $single_sidebar_class = '';
-$sidebars_count = count( $theme_sidebars );
+$sidebars_count       = count( $theme_sidebars );
 
 if ( $sidebars_count > 1 ) {
 	$split = ceil( $sidebars_count / 2 );
@@ -474,11 +511,13 @@ if ( $sidebars_count > 1 ) {
 
 foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
+	if ( ! empty( $registered_sidebar['class'] ) ) {
 		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	}
 
-	if ( $i > 0 )
+	if ( $i > 0 ) {
 		$wrap_class .= ' closed';
+	}
 
 	if ( $split && $i == $split ) {
 		?>
diff --git a/wp-blog-header.php b/wp-blog-header.php
index 3a7cfb69ed..a8b1efc7b5 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -5,12 +5,12 @@
  * @package WordPress
  */
 
-if ( !isset($wp_did_header) ) {
+if ( ! isset( $wp_did_header ) ) {
 
 	$wp_did_header = true;
 
 	// Load the WordPress library.
-	require_once( dirname(__FILE__) . '/wp-load.php' );
+	require_once( dirname( __FILE__ ) . '/wp-load.php' );
 
 	// Set up the WordPress query.
 	wp();
diff --git a/wp-comments-post.php b/wp-comments-post.php
index 2c421d327a..39bc5a81cf 100644
--- a/wp-comments-post.php
+++ b/wp-comments-post.php
@@ -11,14 +11,14 @@ if ( 'POST' != $_SERVER['REQUEST_METHOD'] ) {
 		$protocol = 'HTTP/1.0';
 	}
 
-	header('Allow: POST');
-	header("$protocol 405 Method Not Allowed");
-	header('Content-Type: text/plain');
+	header( 'Allow: POST' );
+	header( "$protocol 405 Method Not Allowed" );
+	header( 'Content-Type: text/plain' );
 	exit;
 }
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require( dirname( __FILE__ ) . '/wp-load.php' );
 
 nocache_headers();
 
@@ -26,7 +26,12 @@ $comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
 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( 'response' => $data, 'back_link' => true ) );
+		wp_die(
+			'<p>' . $comment->get_error_message() . '</p>', __( 'Comment Submission Failure' ), array(
+				'response'  => $data,
+				'back_link' => true,
+			)
+		);
 	} else {
 		exit;
 	}
diff --git a/wp-config-sample.php b/wp-config-sample.php
index 7cfaf3291f..7312c6ede1 100644
--- a/wp-config-sample.php
+++ b/wp-config-sample.php
@@ -20,22 +20,22 @@
 
 // ** MySQL settings - You can get this info from your web host ** //
 /** The name of the database for WordPress */
-define('DB_NAME', 'database_name_here');
+define( 'DB_NAME', 'database_name_here' );
 
 /** MySQL database username */
-define('DB_USER', 'username_here');
+define( 'DB_USER', 'username_here' );
 
 /** MySQL database password */
-define('DB_PASSWORD', 'password_here');
+define( 'DB_PASSWORD', 'password_here' );
 
 /** MySQL hostname */
-define('DB_HOST', 'localhost');
+define( 'DB_HOST', 'localhost' );
 
 /** Database Charset to use in creating database tables. */
-define('DB_CHARSET', 'utf8');
+define( 'DB_CHARSET', 'utf8' );
 
 /** The Database Collate type. Don't change this if in doubt. */
-define('DB_COLLATE', '');
+define( 'DB_COLLATE', '' );
 
 /**#@+
  * Authentication Unique Keys and Salts.
@@ -46,14 +46,14 @@ define('DB_COLLATE', '');
  *
  * @since 2.6.0
  */
-define('AUTH_KEY',         'put your unique phrase here');
-define('SECURE_AUTH_KEY',  'put your unique phrase here');
-define('LOGGED_IN_KEY',    'put your unique phrase here');
-define('NONCE_KEY',        'put your unique phrase here');
-define('AUTH_SALT',        'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT',   'put your unique phrase here');
-define('NONCE_SALT',       'put your unique phrase here');
+define( 'AUTH_KEY',         'put your unique phrase here' );
+define( 'SECURE_AUTH_KEY',  'put your unique phrase here' );
+define( 'LOGGED_IN_KEY',    'put your unique phrase here' );
+define( 'NONCE_KEY',        'put your unique phrase here' );
+define( 'AUTH_SALT',        'put your unique phrase here' );
+define( 'SECURE_AUTH_SALT', 'put your unique phrase here' );
+define( 'LOGGED_IN_SALT',   'put your unique phrase here' );
+define( 'NONCE_SALT',       'put your unique phrase here' );
 
 /**#@-*/
 
@@ -63,7 +63,7 @@ define('NONCE_SALT',       'put your unique phrase here');
  * You can have multiple installations in one database if you give each
  * a unique prefix. Only numbers, letters, and underscores please!
  */
-$table_prefix  = 'wp_';
+$table_prefix = 'wp_';
 
 /**
  * For developers: WordPress debugging mode.
@@ -77,13 +77,14 @@ $table_prefix  = 'wp_';
  *
  * @link https://codex.wordpress.org/Debugging_in_WordPress
  */
-define('WP_DEBUG', false);
+define( 'WP_DEBUG', false );
 
 /* That's all, stop editing! Happy blogging. */
 
 /** Absolute path to the WordPress directory. */
-if ( !defined('ABSPATH') )
-	define('ABSPATH', dirname(__FILE__) . '/');
+if ( ! defined( 'ABSPATH' ) ) {
+	define( 'ABSPATH', dirname( __FILE__ ) . '/' );
+}
 
 /** Sets up WordPress vars and included files. */
-require_once(ABSPATH . 'wp-settings.php');
+require_once( ABSPATH . 'wp-settings.php' );
diff --git a/wp-content/plugins/hello.php b/wp-content/plugins/hello.php
index 2b1e07b59e..cd9b375689 100644
--- a/wp-content/plugins/hello.php
+++ b/wp-content/plugins/hello.php
@@ -79,4 +79,4 @@ function dolly_css() {
 
 add_action( 'admin_head', 'dolly_css' );
 
-?>
+
diff --git a/wp-content/themes/twentyeleven/404.php b/wp-content/themes/twentyeleven/404.php
index 63437b9ae1..d4fe3dd029 100644
--- a/wp-content/themes/twentyeleven/404.php
+++ b/wp-content/themes/twentyeleven/404.php
@@ -27,14 +27,29 @@ get_header(); ?>
 					<div class="widget">
 						<h2 class="widgettitle"><?php _e( 'Most Used Categories', 'twentyeleven' ); ?></h2>
 						<ul>
-						<?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
+						<?php
+						wp_list_categories(
+							array(
+								'orderby'    => 'count',
+								'order'      => 'DESC',
+								'show_count' => 1,
+								'title_li'   => '',
+								'number'     => 10,
+							)
+						);
+?>
 						</ul>
 					</div>
 
 					<?php
 					/* 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( 'count' => 0, 'dropdown' => 1 ), array( 'after_title' => '</h2>' . $archive_content ) );
+					the_widget(
+						'WP_Widget_Archives', array(
+							'count'    => 0,
+							'dropdown' => 1,
+						), array( 'after_title' => '</h2>' . $archive_content )
+					);
 					?>
 
 					<?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
@@ -45,4 +60,4 @@ get_header(); ?>
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/archive.php b/wp-content/themes/twentyeleven/archive.php
index 2f54972bd8..605ac21ced 100644
--- a/wp-content/themes/twentyeleven/archive.php
+++ b/wp-content/themes/twentyeleven/archive.php
@@ -36,7 +36,10 @@ get_header(); ?>
 				<?php twentyeleven_content_nav( 'nav-above' ); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?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 274d5b87a4..e25a72142e 100644
--- a/wp-content/themes/twentyeleven/author.php
+++ b/wp-content/themes/twentyeleven/author.php
@@ -42,7 +42,8 @@ get_header(); ?>
 
 				<?php
 				// If a user has filled out their description, show a bio on their entries.
-				if ( get_the_author_meta( 'description' ) ) : ?>
+				if ( get_the_author_meta( 'description' ) ) :
+				?>
 				<div id="author-info">
 					<div id="author-avatar">
 						<?php
@@ -64,7 +65,10 @@ get_header(); ?>
 				<?php endif; ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+?>
 
 					<?php
 						/*
@@ -98,4 +102,4 @@ get_header(); ?>
 		</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/category.php b/wp-content/themes/twentyeleven/category.php
index cd64f4490f..fcd71a3789 100644
--- a/wp-content/themes/twentyeleven/category.php
+++ b/wp-content/themes/twentyeleven/category.php
@@ -15,29 +15,34 @@ get_header(); ?>
 			<?php if ( have_posts() ) : ?>
 
 				<header class="page-header">
-					<h1 class="page-title"><?php
+					<h1 class="page-title">
+					<?php
 						printf( __( 'Category Archives: %s', 'twentyeleven' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-					?></h1>
+					?>
+					</h1>
 
 					<?php
 						$category_description = category_description();
-						if ( ! empty( $category_description ) ) {
-							/**
-							 * Filter the default Twenty Eleven category description.
-							 *
-							 * @since Twenty Eleven 1.0
-							 *
-							 * @param string The default category description HTML.
-							 */
-							echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
-						}
+					if ( ! empty( $category_description ) ) {
+						/**
+						 * Filter the default Twenty Eleven category description.
+						 *
+						 * @since Twenty Eleven 1.0
+						 *
+						 * @param string The default category description HTML.
+						 */
+						echo apply_filters( 'category_archive_meta', '<div class="category-archive-meta">' . $category_description . '</div>' );
+					}
 					?>
 				</header>
 
 				<?php twentyeleven_content_nav( 'nav-above' ); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+?>
 
 					<?php
 						/*
diff --git a/wp-content/themes/twentyeleven/comments.php b/wp-content/themes/twentyeleven/comments.php
index e774e83647..11f95e0329 100644
--- a/wp-content/themes/twentyeleven/comments.php
+++ b/wp-content/themes/twentyeleven/comments.php
@@ -31,8 +31,10 @@
 	<?php if ( have_comments() ) : ?>
 		<h2 id="comments-title">
 			<?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>' );
+				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>'
+				);
 			?>
 		</h2>
 
@@ -70,8 +72,9 @@
 		 * If there are no comments and comments are closed, let's leave a little note, shall we?
 		 * 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>
+		if ( ! comments_open() && get_comments_number() ) :
+		?>
+		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyeleven' ); ?></p>
 		<?php endif; ?>
 
 	<?php endif; // have_comments() ?>
diff --git a/wp-content/themes/twentyeleven/content-aside.php b/wp-content/themes/twentyeleven/content-aside.php
index 387403d62b..aab63455a6 100644
--- a/wp-content/themes/twentyeleven/content-aside.php
+++ b/wp-content/themes/twentyeleven/content-aside.php
@@ -33,7 +33,14 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+					'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 bd31b32009..9340f5f1be 100644
--- a/wp-content/themes/twentyeleven/content-featured.php
+++ b/wp-content/themes/twentyeleven/content-featured.php
@@ -20,18 +20,25 @@ global $feature_class;
 
 	<div class="entry-summary">
 		<?php the_excerpt(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php
+		wp_link_pages(
+			array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'after'  => '</div>',
+			)
+		);
+?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
 		<?php
 			/* translators: used between list items, there is a space after the comma */
 			$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-			if ( '' != $tag_list ) {
-				$utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			} else {
-				$utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			}
+		if ( '' != $tag_list ) {
+			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+		} else {
+			$utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+		}
 			printf(
 				$utility_text,
 				/* translators: used between list items, there is a space after the comma */
diff --git a/wp-content/themes/twentyeleven/content-gallery.php b/wp-content/themes/twentyeleven/content-gallery.php
index e88797811b..a35b9c039f 100644
--- a/wp-content/themes/twentyeleven/content-gallery.php
+++ b/wp-content/themes/twentyeleven/content-gallery.php
@@ -32,24 +32,37 @@
 		<div class="entry-content">
 			<?php if ( post_password_required() ) : ?>
 				<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php else :
+			<?php
+			else :
 				$images = twentyeleven_get_gallery_images();
 				if ( $images ) :
 					$total_images = count( $images );
-					$image = reset( $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 -->
+	</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 )
-					); ?></em></p>
-			<?php endif; // end twentyeleven_get_gallery_images() check ?>
+	<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 )
+				);
+								?>
+					</em></p>
+						<?php endif; // end twentyeleven_get_gallery_images() check ?>
 			<?php the_excerpt(); ?>
 		<?php endif; ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php
+		wp_link_pages(
+			array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'after'  => '</div>',
+			)
+		);
+?>
 	</div><!-- .entry-content -->
 	<?php endif; ?>
 
@@ -58,23 +71,28 @@
 		<?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
 			/* 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 ?>
 		<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 ?>
 
diff --git a/wp-content/themes/twentyeleven/content-image.php b/wp-content/themes/twentyeleven/content-image.php
index 2497690869..e28e8a0c95 100644
--- a/wp-content/themes/twentyeleven/content-image.php
+++ b/wp-content/themes/twentyeleven/content-image.php
@@ -27,13 +27,21 @@
 
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+					'after'  => '</div>',
+				)
+			);
+?>
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
 			<div class="entry-meta">
 				<?php
-					printf( __( '<a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s" rel="author">%6$s</a></span></span>', 'twentyeleven' ),
+					printf(
+						__( '<a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s" rel="author">%6$s</a></span></span>', 'twentyeleven' ),
 						esc_url( get_permalink() ),
 						get_the_date( 'c' ),
 						get_the_date(),
@@ -47,16 +55,17 @@
 				<?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 ); ?>
+				<?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
 					/* translators: used between list items, there is a space after the comma */
 					$tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-					if ( $tags_list ): ?>
+				if ( $tags_list ) :
+					?>
 				<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 ); ?>
 				</span>
diff --git a/wp-content/themes/twentyeleven/content-intro.php b/wp-content/themes/twentyeleven/content-intro.php
index 6b9099cf82..5fe87ffadb 100644
--- a/wp-content/themes/twentyeleven/content-intro.php
+++ b/wp-content/themes/twentyeleven/content-intro.php
@@ -15,7 +15,14 @@
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php
+		wp_link_pages(
+			array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'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 04e673016e..88e710e86f 100644
--- a/wp-content/themes/twentyeleven/content-link.php
+++ b/wp-content/themes/twentyeleven/content-link.php
@@ -33,7 +33,14 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+					'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 800a695090..accf1e7a3b 100644
--- a/wp-content/themes/twentyeleven/content-page.php
+++ b/wp-content/themes/twentyeleven/content-page.php
@@ -15,7 +15,14 @@
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php
+		wp_link_pages(
+			array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'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 2bf20cdf29..3eb9409751 100644
--- a/wp-content/themes/twentyeleven/content-quote.php
+++ b/wp-content/themes/twentyeleven/content-quote.php
@@ -33,7 +33,14 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+					'after'  => '</div>',
+				)
+			);
+?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
@@ -42,23 +49,28 @@
 			<?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
 				/* 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 ?>
 			<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 ?>
 
diff --git a/wp-content/themes/twentyeleven/content-single.php b/wp-content/themes/twentyeleven/content-single.php
index 11ac986b53..be4915d6b5 100644
--- a/wp-content/themes/twentyeleven/content-single.php
+++ b/wp-content/themes/twentyeleven/content-single.php
@@ -21,7 +21,14 @@
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php
+		wp_link_pages(
+			array(
+				'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+				'after'  => '</div>',
+			)
+		);
+?>
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
@@ -31,13 +38,13 @@
 
 			/* translators: used between list items, there is a space after the comma */
 			$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-			if ( '' != $tag_list ) {
-				$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			} elseif ( '' != $categories_list ) {
-				$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			} else {
-				$utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
-			}
+		if ( '' != $tag_list ) {
+			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+		} elseif ( '' != $categories_list ) {
+			$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+		} else {
+			$utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+		}
 
 			printf(
 				$utility_text,
diff --git a/wp-content/themes/twentyeleven/content-status.php b/wp-content/themes/twentyeleven/content-status.php
index afcf823d89..7a0bf90647 100644
--- a/wp-content/themes/twentyeleven/content-status.php
+++ b/wp-content/themes/twentyeleven/content-status.php
@@ -46,7 +46,14 @@
 			</div>
 
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+					'after'  => '</div>',
+				)
+			);
+?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentyeleven/content.php b/wp-content/themes/twentyeleven/content.php
index 1f5e50faee..797726d7c5 100644
--- a/wp-content/themes/twentyeleven/content.php
+++ b/wp-content/themes/twentyeleven/content.php
@@ -39,7 +39,14 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+					'after'  => '</div>',
+				)
+			);
+?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
@@ -49,11 +56,13 @@
 			<?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 is_object_in_taxonomy( get_post_type(), 'category' ) ?>
@@ -61,13 +70,16 @@
 			<?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 ?>
 			<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 is_object_in_taxonomy( get_post_type(), 'post_tag' ) ?>
diff --git a/wp-content/themes/twentyeleven/footer.php b/wp-content/themes/twentyeleven/footer.php
index a0466770e4..b14ba70a24 100644
--- a/wp-content/themes/twentyeleven/footer.php
+++ b/wp-content/themes/twentyeleven/footer.php
@@ -19,8 +19,9 @@
 				 * A sidebar in the footer? Yep. You can customize
 				 * your footer with three columns of widgets.
 				 */
-				if ( ! is_404() )
-					get_sidebar( 'footer' );
+			if ( ! is_404() ) {
+				get_sidebar( 'footer' );
+			}
 			?>
 
 			<div id="site-generator">
@@ -33,4 +34,4 @@
 <?php wp_footer(); ?>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/wp-content/themes/twentyeleven/functions.php b/wp-content/themes/twentyeleven/functions.php
index 4d6ab74e9e..0349823c2b 100644
--- a/wp-content/themes/twentyeleven/functions.php
+++ b/wp-content/themes/twentyeleven/functions.php
@@ -39,216 +39,223 @@
  */
 
 // Set the content width based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 584;
+}
 
 /*
  * Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run.
  */
 add_action( 'after_setup_theme', 'twentyeleven_setup' );
 
-if ( ! function_exists( 'twentyeleven_setup' ) ):
-/**
- * Set up theme defaults and registers support for various WordPress features.
- *
- * Note that this function is hooked into the after_setup_theme hook, which runs
- * before the init hook. The init hook is too late for some features, such as indicating
- * support post thumbnails.
- *
- * To override twentyeleven_setup() in a child theme, add your own twentyeleven_setup to your child theme's
- * functions.php file.
- *
- * @uses load_theme_textdomain()    For translation/localization support.
- * @uses add_editor_style()         To style the visual editor.
- * @uses add_theme_support()        To add support for post thumbnails, automatic feed links, custom headers
- * 	                                and backgrounds, and post formats.
- * @uses register_nav_menus()       To add support for navigation menus.
- * @uses register_default_headers() To register the default custom header images provided with the theme.
- * @uses set_post_thumbnail_size()  To set a custom post thumbnail size.
- *
- * @since Twenty Eleven 1.0
- */
-function twentyeleven_setup() {
-
-	/*
-	 * Make Twenty Eleven available for translation.
-	 * Translations can be added to the /languages/ directory.
-	 * If you're building a theme based on Twenty Eleven, use
-	 * a find and replace to change 'twentyeleven' to the name
-	 * of your theme in all the template files.
+if ( ! function_exists( 'twentyeleven_setup' ) ) :
+	/**
+	 * Set up theme defaults and registers support for various WordPress features.
+	 *
+	 * Note that this function is hooked into the after_setup_theme hook, which runs
+	 * before the init hook. The init hook is too late for some features, such as indicating
+	 * support post thumbnails.
+	 *
+	 * To override twentyeleven_setup() in a child theme, add your own twentyeleven_setup to your child theme's
+	 * functions.php file.
+	 *
+	 * @uses load_theme_textdomain()    For translation/localization support.
+	 * @uses add_editor_style()         To style the visual editor.
+	 * @uses add_theme_support()        To add support for post thumbnails, automatic feed links, custom headers
+	 *                                  and backgrounds, and post formats.
+	 * @uses register_nav_menus()       To add support for navigation menus.
+	 * @uses register_default_headers() To register the default custom header images provided with the theme.
+	 * @uses set_post_thumbnail_size()  To set a custom post thumbnail size.
+	 *
+	 * @since Twenty Eleven 1.0
 	 */
-	load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+	function twentyeleven_setup() {
 
-	// This theme styles the visual editor with editor-style.css to match the theme style.
-	add_editor_style();
-
-	// Load up our theme options page and related code.
-	require( get_template_directory() . '/inc/theme-options.php' );
-
-	// Grab Twenty Eleven's Ephemera widget.
-	require( get_template_directory() . '/inc/widgets.php' );
-
-	// Add default posts and comments RSS feed links to <head>.
-	add_theme_support( 'automatic-feed-links' );
-
-	// This theme uses wp_nav_menu() in one location.
-	register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
-
-	// Add support for a variety of post formats
-	add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
-
-	$theme_options = twentyeleven_get_theme_options();
-	if ( 'dark' == $theme_options['color_scheme'] )
-		$default_background_color = '1d1d1d';
-	else
-		$default_background_color = 'e2e2e2';
-
-	// Add support for custom backgrounds.
-	add_theme_support( 'custom-background', array(
 		/*
-		 * Let WordPress know what our default background color is.
-		 * This is dependent on our current color scheme.
+		 * Make Twenty Eleven available for translation.
+		 * Translations can be added to the /languages/ directory.
+		 * If you're building a theme based on Twenty Eleven, use
+		 * a find and replace to change 'twentyeleven' to the name
+		 * of your theme in all the template files.
 		 */
-		'default-color' => $default_background_color,
-	) );
+		load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
 
-	// This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
-	add_theme_support( 'post-thumbnails' );
+		// This theme styles the visual editor with editor-style.css to match the theme style.
+		add_editor_style();
 
-	// Add support for custom headers.
-	$custom_header_support = array(
-		// The default header text color.
-		'default-text-color' => '000',
-		// The height and width of our custom header.
-		/**
-		 * Filter the Twenty Eleven default header image width.
-		 *
-		 * @since Twenty Eleven 1.0
-		 *
-		 * @param int The default header image width in pixels. Default 1000.
+		// Load up our theme options page and related code.
+		require( get_template_directory() . '/inc/theme-options.php' );
+
+		// Grab Twenty Eleven's Ephemera widget.
+		require( get_template_directory() . '/inc/widgets.php' );
+
+		// Add default posts and comments RSS feed links to <head>.
+		add_theme_support( 'automatic-feed-links' );
+
+		// This theme uses wp_nav_menu() in one location.
+		register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
+
+		// Add support for a variety of post formats
+		add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
+
+		$theme_options = twentyeleven_get_theme_options();
+		if ( 'dark' == $theme_options['color_scheme'] ) {
+			$default_background_color = '1d1d1d';
+		} else {
+			$default_background_color = 'e2e2e2';
+		}
+
+		// Add support for custom backgrounds.
+		add_theme_support(
+			'custom-background', array(
+				/*
+				* Let WordPress know what our default background color is.
+				* This is dependent on our current color scheme.
+				*/
+				'default-color' => $default_background_color,
+			)
+		);
+
+		// This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
+		add_theme_support( 'post-thumbnails' );
+
+		// Add support for custom headers.
+		$custom_header_support = array(
+			// The default header text color.
+			'default-text-color'     => '000',
+			// The height and width of our custom header.
+			/**
+			 * Filter the Twenty Eleven default header image width.
+			 *
+			 * @since Twenty Eleven 1.0
+			 *
+			 * @param int The default header image width in pixels. Default 1000.
+			 */
+			'width'                  => apply_filters( 'twentyeleven_header_image_width', 1000 ),
+			/**
+			 * Filter the Twenty Eleven default header image height.
+			 *
+			 * @since Twenty Eleven 1.0
+			 *
+			 * @param int The default header image height in pixels. Default 288.
+			 */
+			   'height'              => apply_filters( 'twentyeleven_header_image_height', 288 ),
+			// Support flexible heights.
+			'flex-height'            => true,
+			// Random image rotation by default.
+			'random-default'         => true,
+			// Callback for styling the header.
+			'wp-head-callback'       => 'twentyeleven_header_style',
+			// Callback for styling the header preview in the admin.
+			'admin-head-callback'    => 'twentyeleven_admin_header_style',
+			// Callback used to display the header preview in the admin.
+			'admin-preview-callback' => 'twentyeleven_admin_header_image',
+		);
+
+		add_theme_support( 'custom-header', $custom_header_support );
+
+		if ( ! function_exists( 'get_custom_header' ) ) {
+			// This is all for compatibility with versions of WordPress prior to 3.4.
+			define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] );
+			define( 'HEADER_IMAGE', '' );
+			define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
+			define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
+			add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] );
+			add_custom_background();
+		}
+
+		/*
+		 * We'll be using post thumbnails for custom header images on posts and pages.
+		 * We want them to be the size of the header image that we just defined.
+		 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
 		 */
-		'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
-		/**
-		 * Filter the Twenty Eleven default header image height.
-		 *
-		 * @since Twenty Eleven 1.0
-		 *
-		 * @param int The default header image height in pixels. Default 288.
+		set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
+
+		/*
+		 * Add Twenty Eleven's custom image sizes.
+		 * Used for large feature (header) images.
 		 */
-		'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
-		// Support flexible heights.
-		'flex-height' => true,
-		// Random image rotation by default.
-		'random-default' => true,
-		// Callback for styling the header.
-		'wp-head-callback' => 'twentyeleven_header_style',
-		// Callback for styling the header preview in the admin.
-		'admin-head-callback' => 'twentyeleven_admin_header_style',
-		// Callback used to display the header preview in the admin.
-		'admin-preview-callback' => 'twentyeleven_admin_header_image',
-	);
+		add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
+		// Used for featured posts if a large-feature doesn't exist.
+		add_image_size( 'small-feature', 500, 300 );
 
-	add_theme_support( 'custom-header', $custom_header_support );
+		// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
+		register_default_headers(
+			array(
+				'wheel'      => array(
+					'url'           => '%s/images/headers/wheel.jpg',
+					'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Wheel', 'twentyeleven' ),
+				),
+				'shore'      => array(
+					'url'           => '%s/images/headers/shore.jpg',
+					'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Shore', 'twentyeleven' ),
+				),
+				'trolley'    => array(
+					'url'           => '%s/images/headers/trolley.jpg',
+					'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Trolley', 'twentyeleven' ),
+				),
+				'pine-cone'  => array(
+					'url'           => '%s/images/headers/pine-cone.jpg',
+					'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Pine Cone', 'twentyeleven' ),
+				),
+				'chessboard' => array(
+					'url'           => '%s/images/headers/chessboard.jpg',
+					'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Chessboard', 'twentyeleven' ),
+				),
+				'lanterns'   => array(
+					'url'           => '%s/images/headers/lanterns.jpg',
+					'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Lanterns', 'twentyeleven' ),
+				),
+				'willow'     => array(
+					'url'           => '%s/images/headers/willow.jpg',
+					'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Willow', 'twentyeleven' ),
+				),
+				'hanoi'      => array(
+					'url'           => '%s/images/headers/hanoi.jpg',
+					'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Hanoi Plant', 'twentyeleven' ),
+				),
+			)
+		);
 
-	if ( ! function_exists( 'get_custom_header' ) ) {
-		// This is all for compatibility with versions of WordPress prior to 3.4.
-		define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] );
-		define( 'HEADER_IMAGE', '' );
-		define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
-		define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
-		add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] );
-		add_custom_background();
+		// Indicate widget sidebars can use selective refresh in the Customizer.
+		add_theme_support( 'customize-selective-refresh-widgets' );
 	}
-
-	/*
-	 * We'll be using post thumbnails for custom header images on posts and pages.
-	 * We want them to be the size of the header image that we just defined.
-	 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
-	 */
-	set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
-
-	/*
-	 * Add Twenty Eleven's custom image sizes.
-	 * Used for large feature (header) images.
-	 */
-	add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
-	// Used for featured posts if a large-feature doesn't exist.
-	add_image_size( 'small-feature', 500, 300 );
-
-	// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
-	register_default_headers( array(
-		'wheel' => array(
-			'url' => '%s/images/headers/wheel.jpg',
-			'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Wheel', 'twentyeleven' )
-		),
-		'shore' => array(
-			'url' => '%s/images/headers/shore.jpg',
-			'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Shore', 'twentyeleven' )
-		),
-		'trolley' => array(
-			'url' => '%s/images/headers/trolley.jpg',
-			'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Trolley', 'twentyeleven' )
-		),
-		'pine-cone' => array(
-			'url' => '%s/images/headers/pine-cone.jpg',
-			'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Pine Cone', 'twentyeleven' )
-		),
-		'chessboard' => array(
-			'url' => '%s/images/headers/chessboard.jpg',
-			'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Chessboard', 'twentyeleven' )
-		),
-		'lanterns' => array(
-			'url' => '%s/images/headers/lanterns.jpg',
-			'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Lanterns', 'twentyeleven' )
-		),
-		'willow' => array(
-			'url' => '%s/images/headers/willow.jpg',
-			'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Willow', 'twentyeleven' )
-		),
-		'hanoi' => array(
-			'url' => '%s/images/headers/hanoi.jpg',
-			'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Hanoi Plant', 'twentyeleven' )
-		)
-	) );
-
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
 endif; // twentyeleven_setup
 
 if ( ! function_exists( 'twentyeleven_header_style' ) ) :
-/**
- * Styles the header image and text displayed on the blog.
- *
- * @since Twenty Eleven 1.0
- */
-function twentyeleven_header_style() {
-	$text_color = get_header_textcolor();
+	/**
+	 * Styles the header image and text displayed on the blog.
+	 *
+	 * @since Twenty Eleven 1.0
+	 */
+	function twentyeleven_header_style() {
+		$text_color = get_header_textcolor();
 
-	// If no custom options for text are set, let's bail.
-	if ( $text_color == HEADER_TEXTCOLOR )
-		return;
+		// If no custom options for text are set, let's bail.
+		if ( $text_color == HEADER_TEXTCOLOR ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles. Let's do this.
-	?>
-	<style type="text/css" id="twentyeleven-header-css">
-	<?php
+		// If we get this far, we have custom styles. Let's do this.
+		?>
+		<style type="text/css" id="twentyeleven-header-css">
+		<?php
 		// Has the text been hidden?
 		if ( 'blank' == $text_color ) :
 	?>
@@ -269,19 +276,19 @@ function twentyeleven_header_style() {
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // twentyeleven_header_style
 
 if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
-/**
- * Styles the header image displayed on the Appearance > Header admin panel.
- *
- * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
- *
- * @since Twenty Eleven 1.0
- */
-function twentyeleven_admin_header_style() {
-?>
+	/**
+	 * Styles the header image displayed on the Appearance > Header admin panel.
+	 *
+	 * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
+	 *
+	 * @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;
@@ -305,12 +312,12 @@ function twentyeleven_admin_header_style() {
 	}
 	<?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(); ?>;
-		}
+	#site-title a,
+	#site-description {
+		color: #<?php echo get_header_textcolor(); ?>;
+	}
 	<?php endif; ?>
 	#headimg img {
 		max-width: 1000px;
@@ -318,35 +325,38 @@ function twentyeleven_admin_header_style() {
 		width: 100%;
 	}
 	</style>
-<?php
-}
+	<?php
+	}
 endif; // twentyeleven_admin_header_style
 
 if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
-/**
- * Custom header image markup displayed on the Appearance > Header admin panel.
- *
- * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
- *
- * @since Twenty Eleven 1.0
- */
-function twentyeleven_admin_header_image() { ?>
-	<div id="headimg">
-		<?php
-		$color = get_header_textcolor();
-		$image = get_header_image();
-		$style = 'display: none;';
-		if ( $color && $color != 'blank' ) {
-			$style = 'color: #' . $color . ';';
-		}
-		?>
-		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
+	/**
+	 * Custom header image markup displayed on the Appearance > Header admin panel.
+	 *
+	 * Referenced via add_theme_support('custom-header') in twentyeleven_setup().
+	 *
+	 * @since Twenty Eleven 1.0
+	 */
+	function twentyeleven_admin_header_image() {
+
+?>
+		<div id="headimg">
+			<?php
+			$color = get_header_textcolor();
+			$image = get_header_image();
+			$style = 'display: none;';
+			if ( $color && $color != 'blank' ) {
+				$style = 'color: #' . $color . ';';
+			}
+			?>
+			<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></div>
-  		<?php if ( $image ) : ?>
+		<?php if ( $image ) : ?>
 			<img src="<?php echo esc_url( $image ); ?>" alt="" />
 		<?php endif; ?>
-	</div>
-<?php }
+		</div>
+	<?php
+	}
 endif; // twentyeleven_admin_header_image
 
 /**
@@ -367,16 +377,16 @@ function twentyeleven_excerpt_length( $length ) {
 add_filter( 'excerpt_length', 'twentyeleven_excerpt_length' );
 
 if ( ! function_exists( 'twentyeleven_continue_reading_link' ) ) :
-/**
- * Return a "Continue Reading" link for excerpts
- *
- * @since Twenty Eleven 1.0
- *
- * @return string The "Continue Reading" HTML link.
- */
-function twentyeleven_continue_reading_link() {
-	return ' <a href="'. esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
-}
+	/**
+	 * Return a "Continue Reading" link for excerpts
+	 *
+	 * @since Twenty Eleven 1.0
+	 *
+	 * @return string The "Continue Reading" HTML link.
+	 */
+	function twentyeleven_continue_reading_link() {
+		return ' <a href="' . esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
+	}
 endif; // twentyeleven_continue_reading_link
 
 /**
@@ -428,8 +438,9 @@ add_filter( 'get_the_excerpt', 'twentyeleven_custom_excerpt_more' );
  * @return array The filtered page menu arguments.
  */
 function twentyeleven_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+	if ( ! isset( $args['show_home'] ) ) {
 		$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
@@ -445,76 +456,88 @@ function twentyeleven_widgets_init() {
 
 	register_widget( 'Twenty_Eleven_Ephemera_Widget' );
 
-	register_sidebar( array(
-		'name' => __( 'Main Sidebar', 'twentyeleven' ),
-		'id' => 'sidebar-1',
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Main Sidebar', 'twentyeleven' ),
+			'id'            => 'sidebar-1',
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'Showcase Sidebar', 'twentyeleven' ),
-		'id' => 'sidebar-2',
-		'description' => __( 'The sidebar for the optional Showcase Template', 'twentyeleven' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Showcase Sidebar', 'twentyeleven' ),
+			'id'            => 'sidebar-2',
+			'description'   => __( 'The sidebar for the optional Showcase Template', 'twentyeleven' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area One', 'twentyeleven' ),
-		'id' => 'sidebar-3',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Footer Area One', 'twentyeleven' ),
+			'id'            => 'sidebar-3',
+			'description'   => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area Two', 'twentyeleven' ),
-		'id' => 'sidebar-4',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Footer Area Two', 'twentyeleven' ),
+			'id'            => 'sidebar-4',
+			'description'   => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area Three', 'twentyeleven' ),
-		'id' => 'sidebar-5',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Footer Area Three', 'twentyeleven' ),
+			'id'            => 'sidebar-5',
+			'description'   => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentyeleven_widgets_init' );
 
 if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
-/**
- * Display navigation to next/previous pages when applicable.
- *
- * @since Twenty Eleven 1.0
- *
- * @param string $html_id The HTML id attribute.
- */
-function twentyeleven_content_nav( $html_id ) {
-	global $wp_query;
+	/**
+	 * Display navigation to next/previous pages when applicable.
+	 *
+	 * @since Twenty Eleven 1.0
+	 *
+	 * @param string $html_id The HTML id attribute.
+	 */
+	function twentyeleven_content_nav( $html_id ) {
+		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 endif;
-}
+		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
+	endif;
+	}
 endif; // twentyeleven_content_nav
 
 /**
@@ -531,8 +554,9 @@ function twentyeleven_get_first_url() {
 	$content = get_the_content();
 	$has_url = function_exists( 'get_url_in_content' ) ? get_url_in_content( $content ) : false;
 
-	if ( ! $has_url )
+	if ( ! $has_url ) {
 		$has_url = twentyeleven_url_grabber();
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
@@ -546,8 +570,9 @@ function twentyeleven_get_first_url() {
  * @return string|bool URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
-	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
+	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) ) {
 		return false;
+	}
 
 	return esc_url_raw( $matches[1] );
 }
@@ -560,14 +585,17 @@ function twentyeleven_url_grabber() {
 function twentyeleven_footer_sidebar_class() {
 	$count = 0;
 
-	if ( is_active_sidebar( 'sidebar-3' ) )
+	if ( is_active_sidebar( 'sidebar-3' ) ) {
 		$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-4' ) )
+	if ( is_active_sidebar( 'sidebar-4' ) ) {
 		$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-5' ) )
+	if ( is_active_sidebar( 'sidebar-5' ) ) {
 		$count++;
+	}
 
 	$class = '';
 
@@ -583,102 +611,117 @@ function twentyeleven_footer_sidebar_class() {
 			break;
 	}
 
-	if ( $class )
+	if ( $class ) {
 		echo 'class="' . esc_attr( $class ) . '"';
+	}
 }
 
 if ( ! function_exists( 'twentyeleven_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments template
- * simply create your own twentyeleven_comment(), and that function will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Eleven 1.0
- *
- * @param object $comment The comment object.
- * @param array  $args    An array of comment arguments. @see get_comment_reply_link()
- * @param int    $depth   The depth of the comment.
- */
-function twentyeleven_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
-		case 'pingback' :
-		case 'trackback' :
-	?>
-	<li class="post pingback">
+	/**
+	 * Template for comments and pingbacks.
+	 *
+	 * To override this walker in a child theme without modifying the comments template
+	 * simply create your own twentyeleven_comment(), and that function will be used instead.
+	 *
+	 * Used as a callback by wp_list_comments() for displaying the comments.
+	 *
+	 * @since Twenty Eleven 1.0
+	 *
+	 * @param object $comment The comment object.
+	 * @param array  $args    An array of comment arguments. @see get_comment_reply_link()
+	 * @param int    $depth   The depth of the comment.
+	 */
+	function twentyeleven_comment( $comment, $args, $depth ) {
+		$GLOBALS['comment'] = $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
-			break;
-		default :
-	?>
-	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+				break;
+			default:
+		?>
+		<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
 		<article id="comment-<?php comment_ID(); ?>" class="comment">
 			<footer class="comment-meta">
 				<div class="comment-author vcard">
 					<?php
 						$avatar_size = 68;
-						if ( '0' != $comment->comment_parent )
-							$avatar_size = 39;
+					if ( '0' != $comment->comment_parent ) {
+						$avatar_size = 39;
+					}
 
 						echo get_avatar( $comment, $avatar_size );
 
 						/* translators: 1: comment author, 2: date and time */
-						printf( __( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ),
+						printf(
+							__( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ),
 							sprintf( '<span class="fn">%s</span>', get_comment_author_link() ),
-							sprintf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+							sprintf(
+								'<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
 								esc_url( get_comment_link( $comment->comment_ID ) ),
 								get_comment_time( 'c' ),
 								/* translators: 1: date, 2: time */
 								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 -->
+						<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+					</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.', 'twentyeleven' ); ?></em>
 					<br />
 				<?php endif; ?>
 
-			</footer>
+				</footer>
 
-			<div class="comment-content"><?php comment_text(); ?></div>
+				<div class="comment-content"><?php comment_text(); ?></div>
 
-			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div><!-- .reply -->
-		</article><!-- #comment-## -->
+				<div class="reply">
+					<?php
+					comment_reply_link(
+						array_merge(
+							$args, array(
+								'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ),
+								'depth'      => $depth,
+								'max_depth'  => $args['max_depth'],
+							)
+						)
+					);
+?>
+				</div><!-- .reply -->
+			</article><!-- #comment-## -->
 
-	<?php
-			break;
-	endswitch;
-}
+		<?php
+				break;
+		endswitch;
+	}
 endif; // ends check for twentyeleven_comment()
 
 if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
-/**
- * Print HTML with meta information for the current post-date/time and author.
- *
- * Create your own twentyeleven_posted_on to override in a child theme
- *
- * @since Twenty Eleven 1.0
- */
-function twentyeleven_posted_on() {
-	printf( __( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ),
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
-		get_the_author()
-	);
-}
+	/**
+	 * Print HTML with meta information for the current post-date/time and author.
+	 *
+	 * Create your own twentyeleven_posted_on to override in a child theme
+	 *
+	 * @since Twenty Eleven 1.0
+	 */
+	function twentyeleven_posted_on() {
+		printf(
+			__( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ),
+			esc_url( get_permalink() ),
+			esc_attr( get_the_time() ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( get_the_date() ),
+			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+			esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
+			get_the_author()
+		);
+	}
 endif;
 
 /**
@@ -694,11 +737,13 @@ endif;
  */
 function twentyeleven_body_classes( $classes ) {
 
-	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
+	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() ) {
 		$classes[] = 'single-author';
+	}
 
-	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
+	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) ) {
 		$classes[] = 'singular';
+	}
 
 	return $classes;
 }
@@ -719,26 +764,30 @@ function twentyeleven_get_gallery_images() {
 
 	if ( function_exists( 'get_post_galleries' ) ) {
 		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
+		if ( isset( $galleries[0]['ids'] ) ) {
 			$images = explode( ',', $galleries[0]['ids'] );
+		}
 	} else {
 		$pattern = get_shortcode_regex();
 		preg_match( "/$pattern/s", get_the_content(), $match );
 		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
+		if ( isset( $atts['ids'] ) ) {
 			$images = explode( ',', $atts['ids'] );
+		}
 	}
 
 	if ( ! $images ) {
-		$images = get_posts( array(
-			'fields'         => 'ids',
-			'numberposts'    => 999,
-			'order'          => 'ASC',
-			'orderby'        => 'menu_order',
-			'post_mime_type' => 'image',
-			'post_parent'    => get_the_ID(),
-			'post_type'      => 'attachment',
-		) );
+		$images = get_posts(
+			array(
+				'fields'         => 'ids',
+				'numberposts'    => 999,
+				'order'          => 'ASC',
+				'orderby'        => 'menu_order',
+				'post_mime_type' => 'image',
+				'post_parent'    => get_the_ID(),
+				'post_type'      => 'attachment',
+			)
+		);
 	}
 
 	return $images;
diff --git a/wp-content/themes/twentyeleven/header.php b/wp-content/themes/twentyeleven/header.php
index a2ad51a211..df8f7eeef9 100644
--- a/wp-content/themes/twentyeleven/header.php
+++ b/wp-content/themes/twentyeleven/header.php
@@ -24,7 +24,8 @@
 <head>
 <meta charset="<?php bloginfo( 'charset' ); ?>" />
 <meta name="viewport" content="width=device-width" />
-<title><?php
+<title>
+<?php
 	// Print the <title> tag based on what is being viewed.
 	global $page, $paged;
 
@@ -35,14 +36,17 @@
 
 	// Add the blog description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
-		echo " | $site_description";
+if ( $site_description && ( is_home() || is_front_page() ) ) {
+	echo " | $site_description";
+}
 
 	// Add a page number if necessary:
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
-		echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ) );
+if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+	echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyeleven' ), max( $paged, $page ) ) );
+}
 
-	?></title>
+	?>
+	</title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
@@ -54,8 +58,9 @@
 	 * We add some JavaScript to pages with the comment form
 	 * to support sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && get_option( 'thread_comments' ) )
-		wp_enqueue_script( 'comment-reply' );
+if ( is_singular() && get_option( 'thread_comments' ) ) {
+	wp_enqueue_script( 'comment-reply' );
+}
 
 	/*
 	 * Always have wp_head() just before the closing </head>
@@ -78,39 +83,39 @@
 			<?php
 				// Check to see if the header image has been removed
 				$header_image = get_header_image();
-				if ( $header_image ) :
-					// Compatibility with versions of WordPress prior to 3.4.
-					if ( function_exists( 'get_custom_header' ) ) {
-						/*
-						 * We need to figure out what the minimum width should be for our featured image.
-						 * This result would be the suggested width if the theme were to implement flexible widths.
-						 */
-						$header_image_width = get_theme_support( 'custom-header', 'width' );
-					} else {
-						$header_image_width = HEADER_IMAGE_WIDTH;
-					}
-					?>
+			if ( $header_image ) :
+				// Compatibility with versions of WordPress prior to 3.4.
+				if ( function_exists( 'get_custom_header' ) ) {
+					/*
+					 * We need to figure out what the minimum width should be for our featured image.
+					 * This result would be the suggested width if the theme were to implement flexible widths.
+					 */
+					$header_image_width = get_theme_support( 'custom-header', 'width' );
+				} else {
+					$header_image_width = HEADER_IMAGE_WIDTH;
+				}
+				?>
 			<a href="<?php echo esc_url( home_url( '/' ) ); ?>">
 				<?php
-					/*
-					 * The header image.
-					 * Check if this is a post or page, if it has a thumbnail, and if it's a big one
-					 */
-					if ( is_singular() && has_post_thumbnail( $post->ID ) &&
-							( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
-							$image[1] >= $header_image_width ) :
-						// Houston, we have a new header image!
-						echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-					else :
-						// Compatibility with versions of WordPress prior to 3.4.
-						if ( function_exists( 'get_custom_header' ) ) {
-							$header_image_width  = get_custom_header()->width;
-							$header_image_height = get_custom_header()->height;
-						} else {
-							$header_image_width  = HEADER_IMAGE_WIDTH;
-							$header_image_height = HEADER_IMAGE_HEIGHT;
-						}
-						?>
+				/*
+				 * The header image.
+				 * Check if this is a post or page, if it has a thumbnail, and if it's a big one
+				 */
+				if ( is_singular() && has_post_thumbnail( $post->ID ) &&
+						( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
+						$image[1] >= $header_image_width ) :
+					// Houston, we have a new header image!
+					echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
+				else :
+					// Compatibility with versions of WordPress prior to 3.4.
+					if ( function_exists( 'get_custom_header' ) ) {
+						$header_image_width  = get_custom_header()->width;
+						$header_image_height = get_custom_header()->height;
+					} else {
+						$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 echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
 				<?php endif; // end check for featured image or standard header ?>
 			</a>
@@ -118,15 +123,15 @@
 
 			<?php
 				// Has the text been hidden?
-				if ( 'blank' == get_header_textcolor() ) :
-					$header_image_class = '';
-					if ( $header_image ) {
-						$header_image_class = ' with-image';
-					}
+			if ( 'blank' == get_header_textcolor() ) :
+				$header_image_class = '';
+				if ( $header_image ) {
+					$header_image_class = ' with-image';
+				}
 			?>
-				<div class="only-search<?php echo $header_image_class; ?>">
-				<?php get_search_form(); ?>
-				</div>
+			<div class="only-search<?php echo $header_image_class; ?>">
+			<?php get_search_form(); ?>
+			</div>
 			<?php
 				else :
 			?>
diff --git a/wp-content/themes/twentyeleven/image.php b/wp-content/themes/twentyeleven/image.php
index 5c855904f6..ea20928542 100644
--- a/wp-content/themes/twentyeleven/image.php
+++ b/wp-content/themes/twentyeleven/image.php
@@ -12,12 +12,15 @@ get_header(); ?>
 		<div id="primary" class="image-attachment">
 			<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+				?>
 
 				<nav id="nav-single">
 					<h3 class="assistive-text"><?php _e( 'Image navigation', 'twentyeleven' ); ?></h3>
-					<span class="nav-previous"><?php previous_image_link( false, __( '&larr; Previous' , 'twentyeleven' ) ); ?></span>
-					<span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;' , 'twentyeleven' ) ); ?></span>
+					<span class="nav-previous"><?php previous_image_link( false, __( '&larr; Previous', 'twentyeleven' ) ); ?></span>
+					<span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;', 'twentyeleven' ) ); ?></span>
 				</nav><!-- #nav-single -->
 
 					<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -27,7 +30,8 @@ get_header(); ?>
 							<div class="entry-meta">
 								<?php
 									$metadata = wp_get_attachment_metadata();
-									printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', 'twentyeleven' ),
+									printf(
+										__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', 'twentyeleven' ),
 										esc_attr( get_the_time() ),
 										get_the_date(),
 										esc_url( wp_get_attachment_url() ),
@@ -52,37 +56,51 @@ get_header(); ?>
 	 * 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;
+	$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 ( 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
-									/**
-									 * Filter the Twenty Eleven default attachment size.
-									 *
-									 * @since Twenty Eleven 1.0
-									 *
-									 * @param int The height and width attachment size dimensions in pixels. Default 848.
-									 */
-									$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>
+									<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
+														<?php
+														/**
+														 * Filter the Twenty Eleven default attachment size.
+														 *
+														 * @since Twenty Eleven 1.0
+														 *
+														 * @param int The height and width attachment size dimensions in pixels. Default 848.
+														 */
+														$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 ) ) : ?>
 									<div class="entry-caption">
@@ -95,7 +113,14 @@ get_header(); ?>
 
 							<div class="entry-description">
 								<?php the_content(); ?>
-								<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+								<?php
+								wp_link_pages(
+									array(
+										'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>',
+										'after'  => '</div>',
+									)
+								);
+?>
 							</div><!-- .entry-description -->
 
 						</div><!-- .entry-content -->
@@ -109,4 +134,4 @@ get_header(); ?>
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/inc/theme-options.php b/wp-content/themes/twentyeleven/inc/theme-options.php
index e71ab9a167..8974b151e9 100644
--- a/wp-content/themes/twentyeleven/inc/theme-options.php
+++ b/wp-content/themes/twentyeleven/inc/theme-options.php
@@ -59,8 +59,8 @@ function twentyeleven_theme_options_init() {
 		'general'                                   // Settings section. Same as the first argument in the add_settings_section() above
 	);
 
-	add_settings_field( 'link_color', __( 'Link Color',     'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );
-	add_settings_field( 'layout',     __( 'Default Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout',     'theme_options', 'general' );
+	add_settings_field( 'link_color', __( 'Link Color', 'twentyeleven' ), 'twentyeleven_settings_field_link_color', 'theme_options', 'general' );
+	add_settings_field( 'layout', __( 'Default Layout', 'twentyeleven' ), 'twentyeleven_settings_field_layout', 'theme_options', 'general' );
 }
 add_action( 'admin_init', 'twentyeleven_theme_options_init' );
 
@@ -99,8 +99,9 @@ function twentyeleven_theme_options_add_page() {
 		'twentyeleven_theme_options_render_page' // Function that renders the options page
 	);
 
-	if ( ! $theme_page )
+	if ( ! $theme_page ) {
 		return;
+	}
 
 	add_action( "load-$theme_page", 'twentyeleven_theme_options_help' );
 }
@@ -124,10 +125,11 @@ function twentyeleven_theme_options_help() {
 
 	if ( method_exists( $screen, 'add_help_tab' ) ) {
 		// WordPress 3.3.0
-		$screen->add_help_tab( array(
-			'title' => __( 'Overview', 'twentyeleven' ),
-			'id' => 'theme-options-help',
-			'content' => $help,
+		$screen->add_help_tab(
+			array(
+				'title'   => __( 'Overview', 'twentyeleven' ),
+				'id'      => 'theme-options-help',
+				'content' => $help,
 			)
 		);
 
@@ -146,15 +148,15 @@ function twentyeleven_theme_options_help() {
 function twentyeleven_color_schemes() {
 	$color_scheme_options = array(
 		'light' => array(
-			'value' => 'light',
-			'label' => __( 'Light', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/light.png',
+			'value'              => 'light',
+			'label'              => __( 'Light', 'twentyeleven' ),
+			'thumbnail'          => get_template_directory_uri() . '/inc/images/light.png',
 			'default_link_color' => '#1b8be0',
 		),
-		'dark' => array(
-			'value' => 'dark',
-			'label' => __( 'Dark', 'twentyeleven' ),
-			'thumbnail' => get_template_directory_uri() . '/inc/images/dark.png',
+		'dark'  => array(
+			'value'              => 'dark',
+			'label'              => __( 'Dark', 'twentyeleven' ),
+			'thumbnail'          => get_template_directory_uri() . '/inc/images/dark.png',
 			'default_link_color' => '#e4741f',
 		),
 	);
@@ -177,18 +179,18 @@ function twentyeleven_color_schemes() {
 function twentyeleven_layouts() {
 	$layout_options = array(
 		'content-sidebar' => array(
-			'value' => 'content-sidebar',
-			'label' => __( 'Content on left', 'twentyeleven' ),
+			'value'     => 'content-sidebar',
+			'label'     => __( 'Content on left', 'twentyeleven' ),
 			'thumbnail' => get_template_directory_uri() . '/inc/images/content-sidebar.png',
 		),
 		'sidebar-content' => array(
-			'value' => 'sidebar-content',
-			'label' => __( 'Content on right', 'twentyeleven' ),
+			'value'     => 'sidebar-content',
+			'label'     => __( 'Content on right', 'twentyeleven' ),
 			'thumbnail' => get_template_directory_uri() . '/inc/images/sidebar-content.png',
 		),
-		'content' => array(
-			'value' => 'content',
-			'label' => __( 'One-column, no sidebar', 'twentyeleven' ),
+		'content'         => array(
+			'value'     => 'content',
+			'label'     => __( 'One-column, no sidebar', 'twentyeleven' ),
 			'thumbnail' => get_template_directory_uri() . '/inc/images/content.png',
 		),
 	);
@@ -217,8 +219,9 @@ function twentyeleven_get_default_theme_options() {
 		'theme_layout' => 'content-sidebar',
 	);
 
-	if ( is_rtl() )
+	if ( is_rtl() ) {
 		$default_theme_options['theme_layout'] = 'sidebar-content';
+	}
 
 	/**
 	 * Filter the Twenty Eleven default options.
@@ -238,16 +241,17 @@ function twentyeleven_get_default_theme_options() {
  * @param string $color_scheme Optional. Color scheme.
  *                             Default null (or the active color scheme).
  * @return string The default link color.
-*/
+ */
 function twentyeleven_get_default_link_color( $color_scheme = null ) {
 	if ( null === $color_scheme ) {
-		$options = twentyeleven_get_theme_options();
+		$options      = twentyeleven_get_theme_options();
 		$color_scheme = $options['color_scheme'];
 	}
 
 	$color_schemes = twentyeleven_color_schemes();
-	if ( ! isset( $color_schemes[ $color_scheme ] ) )
+	if ( ! isset( $color_schemes[ $color_scheme ] ) ) {
 		return false;
+	}
 
 	return $color_schemes[ $color_scheme ]['default_link_color'];
 }
@@ -364,19 +368,22 @@ function twentyeleven_theme_options_validate( $input ) {
 	$output = $defaults = twentyeleven_get_default_theme_options();
 
 	// Color scheme must be in our array of color scheme options
-	if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) )
+	if ( isset( $input['color_scheme'] ) && array_key_exists( $input['color_scheme'], twentyeleven_color_schemes() ) ) {
 		$output['color_scheme'] = $input['color_scheme'];
+	}
 
 	// Our defaults for the link color may have changed, based on the color scheme.
 	$output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
 
 	// Link color must be 3 or 6 hexadecimal characters
-	if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) )
+	if ( isset( $input['link_color'] ) && preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) ) {
 		$output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
+	}
 
 	// Theme layout must be in our array of theme layout options
-	if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) )
+	if ( isset( $input['theme_layout'] ) && array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) ) {
 		$output['theme_layout'] = $input['theme_layout'];
+	}
 
 	/**
 	 * Filter the Twenty Eleven sanitized form input array.
@@ -396,11 +403,12 @@ function twentyeleven_theme_options_validate( $input ) {
  * @since Twenty Eleven 1.0
  */
 function twentyeleven_enqueue_color_scheme() {
-	$options = twentyeleven_get_theme_options();
+	$options      = twentyeleven_get_theme_options();
 	$color_scheme = $options['color_scheme'];
 
-	if ( 'dark' == $color_scheme )
+	if ( 'dark' == $color_scheme ) {
 		wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
+	}
 
 	/**
 	 * Fires after the styles for the Twenty Eleven color scheme are enqueued.
@@ -421,14 +429,15 @@ add_action( 'wp_enqueue_scripts', 'twentyeleven_enqueue_color_scheme' );
  * @since Twenty Eleven 1.0
  */
 function twentyeleven_print_link_color_style() {
-	$options = twentyeleven_get_theme_options();
+	$options    = twentyeleven_get_theme_options();
 	$link_color = $options['link_color'];
 
 	$default_options = twentyeleven_get_default_theme_options();
 
 	// Don't do anything if the current link color is the default.
-	if ( $default_options['link_color'] == $link_color )
+	if ( $default_options['link_color'] == $link_color ) {
 		return;
+	}
 ?>
 	<style>
 		/* Link color */
@@ -469,20 +478,22 @@ add_action( 'wp_head', 'twentyeleven_print_link_color_style' );
  * @param array $existing_classes An array of existing body classes.
  */
 function twentyeleven_layout_classes( $existing_classes ) {
-	$options = twentyeleven_get_theme_options();
+	$options        = twentyeleven_get_theme_options();
 	$current_layout = $options['theme_layout'];
 
-	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) )
+	if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) ) {
 		$classes = array( 'two-column' );
-	else
+	} else {
 		$classes = array( 'one-column' );
+	}
 
-	if ( 'content-sidebar' == $current_layout )
+	if ( 'content-sidebar' == $current_layout ) {
 		$classes[] = 'right-sidebar';
-	elseif ( 'sidebar-content' == $current_layout )
+	} elseif ( 'sidebar-content' == $current_layout ) {
 		$classes[] = 'left-sidebar';
-	else
+	} else {
 		$classes[] = $current_layout;
+	}
 
 	/**
 	 * Filter the Twenty Eleven layout body classes.
@@ -506,31 +517,37 @@ add_filter( 'body_class', 'twentyeleven_layout_classes' );
  * @param object $wp_customize Customizer object.
  */
 function twentyeleven_customize_register( $wp_customize ) {
-	$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
+	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
+	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
 	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
-			'selector' => '#site-title a',
-			'container_inclusive' => false,
-			'render_callback' => 'twentyeleven_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-			'selector' => '#site-description',
-			'container_inclusive' => false,
-			'render_callback' => 'twentyeleven_customize_partial_blogdescription',
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'blogname', array(
+				'selector'            => '#site-title a',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentyeleven_customize_partial_blogname',
+			)
+		);
+		$wp_customize->selective_refresh->add_partial(
+			'blogdescription', array(
+				'selector'            => '#site-description',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentyeleven_customize_partial_blogdescription',
+			)
+		);
 	}
 
 	$options  = twentyeleven_get_theme_options();
 	$defaults = twentyeleven_get_default_theme_options();
 
-	$wp_customize->add_setting( 'twentyeleven_theme_options[color_scheme]', array(
-		'default'    => $defaults['color_scheme'],
-		'type'       => 'option',
-		'capability' => 'edit_theme_options',
-	) );
+	$wp_customize->add_setting(
+		'twentyeleven_theme_options[color_scheme]', array(
+			'default'    => $defaults['color_scheme'],
+			'type'       => 'option',
+			'capability' => 'edit_theme_options',
+		)
+	);
 
 	$schemes = twentyeleven_color_schemes();
 	$choices = array();
@@ -538,40 +555,52 @@ function twentyeleven_customize_register( $wp_customize ) {
 		$choices[ $scheme['value'] ] = $scheme['label'];
 	}
 
-	$wp_customize->add_control( 'twentyeleven_color_scheme', array(
-		'label'    => __( 'Color Scheme', 'twentyeleven' ),
-		'section'  => 'colors',
-		'settings' => 'twentyeleven_theme_options[color_scheme]',
-		'type'     => 'radio',
-		'choices'  => $choices,
-		'priority' => 5,
-	) );
+	$wp_customize->add_control(
+		'twentyeleven_color_scheme', array(
+			'label'    => __( 'Color Scheme', 'twentyeleven' ),
+			'section'  => 'colors',
+			'settings' => 'twentyeleven_theme_options[color_scheme]',
+			'type'     => 'radio',
+			'choices'  => $choices,
+			'priority' => 5,
+		)
+	);
 
 	// Link Color (added to Color Scheme section in Customizer)
-	$wp_customize->add_setting( 'twentyeleven_theme_options[link_color]', array(
-		'default'           => twentyeleven_get_default_link_color( $options['color_scheme'] ),
-		'type'              => 'option',
-		'sanitize_callback' => 'sanitize_hex_color',
-		'capability'        => 'edit_theme_options',
-	) );
+	$wp_customize->add_setting(
+		'twentyeleven_theme_options[link_color]', array(
+			'default'           => twentyeleven_get_default_link_color( $options['color_scheme'] ),
+			'type'              => 'option',
+			'sanitize_callback' => 'sanitize_hex_color',
+			'capability'        => 'edit_theme_options',
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'link_color', array(
-		'label'    => __( 'Link Color', 'twentyeleven' ),
-		'section'  => 'colors',
-		'settings' => 'twentyeleven_theme_options[link_color]',
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'link_color', array(
+				'label'    => __( 'Link Color', 'twentyeleven' ),
+				'section'  => 'colors',
+				'settings' => 'twentyeleven_theme_options[link_color]',
+			)
+		)
+	);
 
 	// Default Layout
-	$wp_customize->add_section( 'twentyeleven_layout', array(
-		'title'    => __( 'Layout', 'twentyeleven' ),
-		'priority' => 50,
-	) );
+	$wp_customize->add_section(
+		'twentyeleven_layout', array(
+			'title'    => __( 'Layout', 'twentyeleven' ),
+			'priority' => 50,
+		)
+	);
 
-	$wp_customize->add_setting( 'twentyeleven_theme_options[theme_layout]', array(
-		'type'              => 'option',
-		'default'           => $defaults['theme_layout'],
-		'sanitize_callback' => 'sanitize_key',
-	) );
+	$wp_customize->add_setting(
+		'twentyeleven_theme_options[theme_layout]', array(
+			'type'              => 'option',
+			'default'           => $defaults['theme_layout'],
+			'sanitize_callback' => 'sanitize_key',
+		)
+	);
 
 	$layouts = twentyeleven_layouts();
 	$choices = array();
@@ -579,11 +608,13 @@ function twentyeleven_customize_register( $wp_customize ) {
 		$choices[ $layout['value'] ] = $layout['label'];
 	}
 
-	$wp_customize->add_control( 'twentyeleven_theme_options[theme_layout]', array(
-		'section'    => 'twentyeleven_layout',
-		'type'       => 'radio',
-		'choices'    => $choices,
-	) );
+	$wp_customize->add_control(
+		'twentyeleven_theme_options[theme_layout]', array(
+			'section' => 'twentyeleven_layout',
+			'type'    => 'radio',
+			'choices' => $choices,
+		)
+	);
 }
 add_action( 'customize_register', 'twentyeleven_customize_register' );
 
diff --git a/wp-content/themes/twentyeleven/inc/widgets.php b/wp-content/themes/twentyeleven/inc/widgets.php
index 9b007f4af2..08ab7f7bad 100644
--- a/wp-content/themes/twentyeleven/inc/widgets.php
+++ b/wp-content/themes/twentyeleven/inc/widgets.php
@@ -18,11 +18,13 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 	 * @since Twenty Eleven 2.2
 	 */
 	function __construct() {
-		parent::__construct( '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,
-		) );
+		parent::__construct(
+			'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,
+			)
+		);
 		$this->alt_option_name = 'widget_twentyeleven_ephemera';
 
 		add_action( 'save_post', array( &$this, 'flush_widget_cache' ) );
@@ -46,15 +48,17 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 	 *
 	 * @param array $args     An array of standard parameters for widgets in this theme.
 	 * @param array $instance An array of settings for this widget instance.
-	 **/
+	 */
 	function widget( $args, $instance ) {
 		$cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
 
-		if ( ! is_array( $cache ) )
+		if ( ! is_array( $cache ) ) {
 			$cache = array();
+		}
 
-		if ( ! isset( $args['widget_id'] ) )
+		if ( ! isset( $args['widget_id'] ) ) {
 			$args['widget_id'] = null;
+		}
 
 		if ( ! is_customize_preview() && isset( $cache[ $args['widget_id'] ] ) ) {
 			echo $cache[ $args['widget_id'] ];
@@ -67,11 +71,13 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 		/** This filter is documented in wp-includes/default-widgets.php */
 		$args['title'] = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Ephemera', 'twentyeleven' ) : $instance['title'], $instance, $this->id_base );
 
-		if ( ! isset( $instance['number'] ) )
+		if ( ! isset( $instance['number'] ) ) {
 			$instance['number'] = '10';
+		}
 
-		if ( ! $args['number'] = absint( $instance['number'] ) )
+		if ( ! $args['number'] = absint( $instance['number'] ) ) {
 			$args['number'] = 10;
+		}
 
 		$ephemera_args = array(
 			'order'          => 'DESC',
@@ -88,7 +94,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 				),
 			),
 		);
-		$ephemera = new WP_Query( $ephemera_args );
+		$ephemera      = new WP_Query( $ephemera_args );
 
 		if ( $ephemera->have_posts() ) :
 			echo $args['before_widget'];
@@ -97,7 +103,10 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 			echo $args['after_title'];
 			?>
 			<ol>
-			<?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
+			<?php
+			while ( $ephemera->have_posts() ) :
+				$ephemera->the_post();
+?>
 
 				<?php if ( 'link' != get_post_format() ) : ?>
 
@@ -128,7 +137,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 			// Reset the post globals as this query will have stomped on it
 			wp_reset_postdata();
 
-		// end check for ephemeral posts
+			// end check for ephemeral posts
 		endif;
 
 		$cache[ $args['widget_id'] ] = ob_get_flush();
@@ -145,16 +154,17 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 	 * where any validation should be dealt with.
 	 *
 	 * @since Twenty Eleven 1.0
-	 **/
+	 */
 	function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
-		$instance['title'] = strip_tags( $new_instance['title'] );
+		$instance           = $old_instance;
+		$instance['title']  = strip_tags( $new_instance['title'] );
 		$instance['number'] = (int) $new_instance['number'];
 		$this->flush_widget_cache();
 
 		$alloptions = wp_cache_get( 'alloptions', 'options' );
-		if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) )
+		if ( isset( $alloptions['widget_twentyeleven_ephemera'] ) ) {
 			delete_option( 'widget_twentyeleven_ephemera' );
+		}
 
 		return $instance;
 	}
@@ -174,9 +184,9 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
 	 * Displays the form for this widget on the Widgets page of the WP Admin area.
 	 *
 	 * @since Twenty Eleven 1.0
-	 **/
+	 */
 	function form( $instance ) {
-		$title = isset( $instance['title']) ? esc_attr( $instance['title'] ) : '';
+		$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>
diff --git a/wp-content/themes/twentyeleven/index.php b/wp-content/themes/twentyeleven/index.php
index 1dd72c8f62..a67445bfff 100644
--- a/wp-content/themes/twentyeleven/index.php
+++ b/wp-content/themes/twentyeleven/index.php
@@ -22,7 +22,10 @@ get_header(); ?>
 				<?php twentyeleven_content_nav( 'nav-above' ); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?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 349810704a..166823479b 100644
--- a/wp-content/themes/twentyeleven/page.php
+++ b/wp-content/themes/twentyeleven/page.php
@@ -17,7 +17,10 @@ get_header(); ?>
 		<div id="primary">
 			<div id="content" role="main">
 
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+?>
 
 					<?php get_template_part( 'content', 'page' ); ?>
 
@@ -28,4 +31,4 @@ get_header(); ?>
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/search.php b/wp-content/themes/twentyeleven/search.php
index 0da1e4e57c..81188fadf7 100644
--- a/wp-content/themes/twentyeleven/search.php
+++ b/wp-content/themes/twentyeleven/search.php
@@ -21,7 +21,10 @@ get_header(); ?>
 				<?php twentyeleven_content_nav( 'nav-above' ); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+?>
 
 					<?php
 						/*
@@ -56,4 +59,4 @@ get_header(); ?>
 		</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/showcase.php b/wp-content/themes/twentyeleven/showcase.php
index bc9e4c9ac9..f869871b79 100644
--- a/wp-content/themes/twentyeleven/showcase.php
+++ b/wp-content/themes/twentyeleven/showcase.php
@@ -23,15 +23,19 @@ get_header(); ?>
 		<div id="primary" class="showcase">
 			<div id="content" role="main">
 
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+					?>
 
 				<?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; ?>
@@ -46,13 +50,13 @@ get_header(); ?>
 					$sticky = get_option( 'sticky_posts' );
 
 					// Proceed only if sticky posts exist.
-					if ( ! empty( $sticky ) ) :
+				if ( ! empty( $sticky ) ) :
 
 					$featured_args = array(
-						'post__in' => $sticky,
-						'post_status' => 'publish',
+						'post__in'       => $sticky,
+						'post_status'    => 'publish',
 						'posts_per_page' => 10,
-						'no_found_rows' => true,
+						'no_found_rows'  => true,
 					);
 
 					// The Featured Posts query.
@@ -61,33 +65,35 @@ get_header(); ?>
 					// Proceed only if published posts exist
 					if ( $featured->have_posts() ) :
 
-					/*
-					 * We will need to count featured posts starting from zero
-					 * to create the slider navigation.
-					 */
-					$counter_slider = 0;
+						/*
+						* We will need to count featured posts starting from zero
+						* to create the slider navigation.
+						*/
+						$counter_slider = 0;
 
-					// Compatibility with versions of WordPress prior to 3.4.
-					if ( function_exists( 'get_custom_header' ) )
-						$header_image_width = get_theme_support( 'custom-header', 'width' );
-					else
-						$header_image_width = HEADER_IMAGE_WIDTH;
-				?>
+						// Compatibility with versions of WordPress prior to 3.4.
+						if ( function_exists( 'get_custom_header' ) ) {
+							$header_image_width = get_theme_support( 'custom-header', 'width' );
+						} else {
+							$header_image_width = HEADER_IMAGE_WIDTH;
+						}
+					?>
 
-				<div class="featured-posts">
+					<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();
+				// Let's roll.
+				while ( $featured->have_posts() ) :
+					$featured->the_post();
 
 					// 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.
-					 */
+					* 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() ) {
@@ -107,54 +113,57 @@ get_header(); ?>
 
 					<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
+						/*
+						 * 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
+					<?php
 					// Show slider only if we have more than one featured post.
 					if ( $featured->post_count > 1 ) :
-				?>
-				<nav class="feature-slider">
+					?>
+					<nav class="feature-slider">
 					<ul>
 					<?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 = '';
-						?>
-						<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;	?>
+					// 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; ?>
 					</ul>
-				</nav>
-				<?php endif; // End check for more than one sticky post. ?>
-				</div><!-- .featured-posts -->
-				<?php endif; // End check for published posts. ?>
+					</nav>
+					<?php endif; // End check for more than one sticky post. ?>
+					</div><!-- .featured-posts -->
+					<?php endif; // End check for published posts. ?>
 				<?php endif; // End check for sticky posts. ?>
 
 				<section class="recent-posts">
@@ -164,13 +173,13 @@ get_header(); ?>
 
 					// Display our recent posts, showing full content for the very latest, ignoring Aside posts.
 					$recent_args = array(
-						'order' => 'DESC',
-						'post__not_in' => get_option( 'sticky_posts' ),
-						'tax_query' => array(
+						'order'         => 'DESC',
+						'post__not_in'  => get_option( 'sticky_posts' ),
+						'tax_query'     => array(
 							array(
 								'taxonomy' => 'post_format',
-								'terms' => array( 'post-format-aside', 'post-format-link', 'post-format-quote', 'post-format-status' ),
-								'field' => 'slug',
+								'terms'    => array( 'post-format-aside', 'post-format-link', 'post-format-quote', 'post-format-status' ),
+								'field'    => 'slug',
 								'operator' => 'NOT IN',
 							),
 						),
@@ -181,7 +190,8 @@ get_header(); ?>
 					$recent = new WP_Query( $recent_args );
 
 					// The first Recent post is displayed normally
-					if ( $recent->have_posts() ) : $recent->the_post();
+					if ( $recent->have_posts() ) :
+						$recent->the_post();
 
 						// Set $more to 0 in order to only get the first part of the post.
 						global $more;
@@ -194,7 +204,9 @@ get_header(); ?>
 					endif;
 
 					// For all other recent posts, just display the title and comment status.
-					while ( $recent->have_posts() ) : $recent->the_post(); ?>
+					while ( $recent->have_posts() ) :
+						$recent->the_post();
+					?>
 
 						<li class="entry-title">
 							<a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a>
@@ -207,8 +219,9 @@ get_header(); ?>
 					endwhile;
 
 					// If we had some posts, close the <ol>
-					if ( $recent->post_count > 0 )
+					if ( $recent->post_count > 0 ) {
 						echo '</ol>';
+					}
 					?>
 				</section><!-- .recent-posts -->
 
@@ -216,7 +229,12 @@ get_header(); ?>
 					<?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
 
 						<?php
-						the_widget( 'Twenty_Eleven_Ephemera_Widget', '', array( 'before_title' => '<h3 class="widget-title">', 'after_title' => '</h3>' ) );
+						the_widget(
+							'Twenty_Eleven_Ephemera_Widget', '', array(
+								'before_title' => '<h3 class="widget-title">',
+								'after_title'  => '</h3>',
+							)
+						);
 						?>
 
 					<?php endif; // end sidebar widget area ?>
@@ -225,4 +243,4 @@ get_header(); ?>
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/sidebar-footer.php b/wp-content/themes/twentyeleven/sidebar-footer.php
index 659469e659..d7f0a00f8f 100644
--- a/wp-content/themes/twentyeleven/sidebar-footer.php
+++ b/wp-content/themes/twentyeleven/sidebar-footer.php
@@ -15,11 +15,12 @@
 	 *
 	 * If none of the sidebars have widgets, then let's bail early.
 	 */
-	if (   ! is_active_sidebar( 'sidebar-3'  )
+if ( ! is_active_sidebar( 'sidebar-3' )
 		&& ! is_active_sidebar( 'sidebar-4' )
-		&& ! is_active_sidebar( 'sidebar-5'  )
-	)
-		return;
+		&& ! is_active_sidebar( 'sidebar-5' )
+	) {
+	return;
+}
 	// If we get this far, we have widgets. Let do this.
 ?>
 <div id="supplementary" <?php twentyeleven_footer_sidebar_class(); ?>>
@@ -40,4 +41,4 @@
 		<?php dynamic_sidebar( 'sidebar-5' ); ?>
 	</div><!-- #third .widget-area -->
 	<?php endif; ?>
-</div><!-- #supplementary -->
\ No newline at end of file
+</div><!-- #supplementary -->
diff --git a/wp-content/themes/twentyeleven/sidebar-page.php b/wp-content/themes/twentyeleven/sidebar-page.php
index 6fc3b86fed..032bc06021 100644
--- a/wp-content/themes/twentyeleven/sidebar-page.php
+++ b/wp-content/themes/twentyeleven/sidebar-page.php
@@ -14,7 +14,10 @@ get_header(); ?>
 		<div id="primary">
 			<div id="content" role="main">
 
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+?>
 
 					<?php get_template_part( 'content', 'page' ); ?>
 
@@ -26,4 +29,4 @@ get_header(); ?>
 		</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/sidebar.php b/wp-content/themes/twentyeleven/sidebar.php
index c9afedcdfc..fb53e58b92 100644
--- a/wp-content/themes/twentyeleven/sidebar.php
+++ b/wp-content/themes/twentyeleven/sidebar.php
@@ -7,7 +7,7 @@
  * @since Twenty Eleven 1.0
  */
 
-$options = twentyeleven_get_theme_options();
+$options        = twentyeleven_get_theme_options();
 $current_layout = $options['theme_layout'];
 
 if ( 'content' != $current_layout ) :
@@ -33,4 +33,4 @@ if ( 'content' != $current_layout ) :
 
 			<?php endif; // end sidebar widget area ?>
 		</div><!-- #secondary .widget-area -->
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/wp-content/themes/twentyeleven/single.php b/wp-content/themes/twentyeleven/single.php
index 861c50c439..0250e943f9 100644
--- a/wp-content/themes/twentyeleven/single.php
+++ b/wp-content/themes/twentyeleven/single.php
@@ -12,7 +12,10 @@ get_header(); ?>
 		<div id="primary">
 			<div id="content" role="main">
 
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+?>
 
 					<nav id="nav-single">
 						<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
@@ -29,4 +32,4 @@ get_header(); ?>
 			</div><!-- #content -->
 		</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyeleven/tag.php b/wp-content/themes/twentyeleven/tag.php
index 7c2fdf80b2..84bc48e9bc 100644
--- a/wp-content/themes/twentyeleven/tag.php
+++ b/wp-content/themes/twentyeleven/tag.php
@@ -15,29 +15,34 @@ get_header(); ?>
 			<?php if ( have_posts() ) : ?>
 
 				<header class="page-header">
-					<h1 class="page-title"><?php
+					<h1 class="page-title">
+					<?php
 						printf( __( 'Tag Archives: %s', 'twentyeleven' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-					?></h1>
+					?>
+					</h1>
 
 					<?php
 						$tag_description = tag_description();
-						if ( ! empty( $tag_description ) ) {
-							/**
-							 * Filter the default Twenty Eleven tag description.
-							 *
-							 * @since Twenty Eleven 1.0
-							 *
-							 * @param string The default tag description.
-							 */
-							echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
-						}
+					if ( ! empty( $tag_description ) ) {
+						/**
+						 * Filter the default Twenty Eleven tag description.
+						 *
+						 * @since Twenty Eleven 1.0
+						 *
+						 * @param string The default tag description.
+						 */
+						echo apply_filters( 'tag_archive_meta', '<div class="tag-archive-meta">' . $tag_description . '</div>' );
+					}
 					?>
 				</header>
 
 				<?php twentyeleven_content_nav( 'nav-above' ); ?>
 
 				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php
+				while ( have_posts() ) :
+					the_post();
+?>
 
 					<?php
 						/*
diff --git a/wp-content/themes/twentyfifteen/archive.php b/wp-content/themes/twentyfifteen/archive.php
index bb6021e3cb..7d100c5075 100644
--- a/wp-content/themes/twentyfifteen/archive.php
+++ b/wp-content/themes/twentyfifteen/archive.php
@@ -32,7 +32,8 @@ get_header(); ?>
 
 			<?php
 			// Start the Loop.
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				/*
 				 * Include the Post-Format-specific template for the content.
@@ -41,17 +42,19 @@ get_header(); ?>
 				 */
 				get_template_part( 'content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination( array(
-				'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
-				'next_text'          => __( 'Next page', 'twentyfifteen' ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
+					'next_text'          => __( 'Next page', 'twentyfifteen' ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
+				)
+			);
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'content', 'none' );
 
diff --git a/wp-content/themes/twentyfifteen/comments.php b/wp-content/themes/twentyfifteen/comments.php
index 6b97ec394c..1c1b5a4964 100644
--- a/wp-content/themes/twentyfifteen/comments.php
+++ b/wp-content/themes/twentyfifteen/comments.php
@@ -26,23 +26,23 @@ if ( post_password_required() ) {
 		<h2 class="comments-title">
 			<?php
 				$comments_number = get_comments_number();
-				if ( '1' === $comments_number ) {
-					/* translators: %s: post title */
-					printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentyfifteen' ), get_the_title() );
-				} else {
-					printf(
-						/* translators: 1: number of comments, 2: post title */
-						_nx(
-							'%1$s thought on &ldquo;%2$s&rdquo;',
-							'%1$s thoughts on &ldquo;%2$s&rdquo;',
-							$comments_number,
-							'comments title',
-							'twentyfifteen'
-						),
-						number_format_i18n( $comments_number ),
-						get_the_title()
-					);
-				}
+			if ( '1' === $comments_number ) {
+				/* translators: %s: post title */
+				printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentyfifteen' ), get_the_title() );
+			} else {
+				printf(
+					/* translators: 1: number of comments, 2: post title */
+					_nx(
+						'%1$s thought on &ldquo;%2$s&rdquo;',
+						'%1$s thoughts on &ldquo;%2$s&rdquo;',
+						$comments_number,
+						'comments title',
+						'twentyfifteen'
+					),
+					number_format_i18n( $comments_number ),
+					get_the_title()
+				);
+			}
 			?>
 		</h2>
 
@@ -50,11 +50,13 @@ if ( post_password_required() ) {
 
 		<ol class="comment-list">
 			<?php
-				wp_list_comments( array(
-					'style'       => 'ol',
-					'short_ping'  => true,
-					'avatar_size' => 56,
-				) );
+				wp_list_comments(
+					array(
+						'style'       => 'ol',
+						'short_ping'  => true,
+						'avatar_size' => 56,
+					)
+				);
 			?>
 		</ol><!-- .comment-list -->
 
@@ -64,9 +66,9 @@ 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' ) ) :
+	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
 	?>
-		<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
+	<p class="no-comments"><?php _e( 'Comments are closed.', 'twentyfifteen' ); ?></p>
 	<?php endif; ?>
 
 	<?php comment_form(); ?>
diff --git a/wp-content/themes/twentyfifteen/content-link.php b/wp-content/themes/twentyfifteen/content-link.php
index 2beb1f7859..17aaf780a4 100644
--- a/wp-content/themes/twentyfifteen/content-link.php
+++ b/wp-content/themes/twentyfifteen/content-link.php
@@ -15,8 +15,8 @@
 
 	<header class="entry-header">
 		<?php
-			if ( is_single() ) :
-				the_title( sprintf( '<h1 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h1>' );
+		if ( is_single() ) :
+			the_title( sprintf( '<h1 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h1>' );
 			else :
 				the_title( sprintf( '<h2 class="entry-title"><a href="%s">', esc_url( twentyfifteen_get_link_url() ) ), '</a></h2>' );
 			endif;
@@ -27,27 +27,31 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s', 'twentyfifteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s', 'twentyfifteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-				'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
-				'separator'   => '<span class="screen-reader-text">, </span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
+					'separator'   => '<span class="screen-reader-text">, </span>',
+				)
+			);
 		?>
 	</div>
 	<!-- .entry-content -->
 
 	<?php
 		// Author bio.
-		if ( is_single() && get_the_author_meta( 'description' ) ) :
-			get_template_part( 'author-bio' );
+	if ( is_single() && get_the_author_meta( 'description' ) ) :
+		get_template_part( 'author-bio' );
 		endif;
 	?>
 
diff --git a/wp-content/themes/twentyfifteen/content-page.php b/wp-content/themes/twentyfifteen/content-page.php
index 7d37daa740..225eaff3fa 100644
--- a/wp-content/themes/twentyfifteen/content-page.php
+++ b/wp-content/themes/twentyfifteen/content-page.php
@@ -21,14 +21,16 @@
 	<div class="entry-content">
 		<?php the_content(); ?>
 		<?php
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-				'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
-				'separator'   => '<span class="screen-reader-text">, </span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
+					'separator'   => '<span class="screen-reader-text">, </span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfifteen/content.php b/wp-content/themes/twentyfifteen/content.php
index 24756007a6..5ad1580529 100644
--- a/wp-content/themes/twentyfifteen/content.php
+++ b/wp-content/themes/twentyfifteen/content.php
@@ -18,8 +18,8 @@
 
 	<header class="entry-header">
 		<?php
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+		if ( is_single() ) :
+			the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
 			endif;
@@ -29,26 +29,30 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s', 'twentyfifteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s', 'twentyfifteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-				'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
-				'separator'   => '<span class="screen-reader-text">, </span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
+					'separator'   => '<span class="screen-reader-text">, </span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
 	<?php
 		// Author bio.
-		if ( is_single() && get_the_author_meta( 'description' ) ) :
-			get_template_part( 'author-bio' );
+	if ( is_single() && get_the_author_meta( 'description' ) ) :
+		get_template_part( 'author-bio' );
 		endif;
 	?>
 
diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php
index b6161927a1..3f678a9b03 100644
--- a/wp-content/themes/twentyfifteen/functions.php
+++ b/wp-content/themes/twentyfifteen/functions.php
@@ -42,109 +42,133 @@ if ( version_compare( $GLOBALS['wp_version'], '4.1-alpha', '<' ) ) {
 }
 
 if ( ! function_exists( 'twentyfifteen_setup' ) ) :
-/**
- * Sets up theme defaults and registers support for various WordPress features.
- *
- * Note that this function is hooked into the after_setup_theme hook, which
- * runs before the init hook. The init hook is too late for some features, such
- * as indicating support for post thumbnails.
- *
- * @since Twenty Fifteen 1.0
- */
-function twentyfifteen_setup() {
-
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfifteen
-	 * If you're building a theme based on twentyfifteen, use a find and replace
-	 * to change 'twentyfifteen' to the name of your theme in all the template files
-	 */
-	load_theme_textdomain( 'twentyfifteen' );
-
-	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
-
-	/*
-	 * Let WordPress manage the document title.
-	 * By adding theme support, we declare that this theme does not use a
-	 * hard-coded <title> tag in the document head, and expect WordPress to
-	 * provide it for us.
-	 */
-	add_theme_support( 'title-tag' );
-
-	/*
-	 * Enable support for Post Thumbnails on posts and pages.
-	 *
-	 * See: https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
-	 */
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 825, 510, true );
-
-	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu',      'twentyfifteen' ),
-		'social'  => __( 'Social Links Menu', 'twentyfifteen' ),
-	) );
-
-	/*
-	 * Switch default core markup for search form, comment form, and comments
-	 * to output valid HTML5.
-	 */
-	add_theme_support( 'html5', array(
-		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
-
-	/*
-	 * Enable support for Post Formats.
-	 *
-	 * See: https://codex.wordpress.org/Post_Formats
-	 */
-	add_theme_support( 'post-formats', array(
-		'aside', 'image', 'video', 'quote', 'link', 'gallery', 'status', 'audio', 'chat'
-	) );
-
-	/*
-	 * Enable support for custom logo.
-	 *
-	 * @since Twenty Fifteen 1.5
-	 */
-	add_theme_support( 'custom-logo', array(
-		'height'      => 248,
-		'width'       => 248,
-		'flex-height' => true,
-	) );
-
-	$color_scheme  = twentyfifteen_get_color_scheme();
-	$default_color = trim( $color_scheme[0], '#' );
-
-	// Setup the WordPress core custom background feature.
-
 	/**
-	 * Filter Twenty Fifteen custom-header support arguments.
+	 * Sets up theme defaults and registers support for various WordPress features.
+	 *
+	 * Note that this function is hooked into the after_setup_theme hook, which
+	 * runs before the init hook. The init hook is too late for some features, such
+	 * as indicating support for post thumbnails.
 	 *
 	 * @since Twenty Fifteen 1.0
-	 *
-	 * @param array $args {
-	 *     An array of custom-header support arguments.
-	 *
-	 *     @type string $default-color     		Default color of the header.
-	 *     @type string $default-attachment     Default attachment of the header.
-	 * }
 	 */
-	add_theme_support( 'custom-background', apply_filters( 'twentyfifteen_custom_background_args', array(
-		'default-color'      => $default_color,
-		'default-attachment' => 'fixed',
-	) ) );
+	function twentyfifteen_setup() {
 
-	/*
-	 * This theme styles the visual editor to resemble the theme style,
-	 * specifically font, colors, icons, and column width.
-	 */
-	add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
+		/*
+		 * Make theme available for translation.
+		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfifteen
+		 * If you're building a theme based on twentyfifteen, use a find and replace
+		 * to change 'twentyfifteen' to the name of your theme in all the template files
+		 */
+		load_theme_textdomain( 'twentyfifteen' );
 
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
+		// Add default posts and comments RSS feed links to head.
+		add_theme_support( 'automatic-feed-links' );
+
+		/*
+		 * Let WordPress manage the document title.
+		 * By adding theme support, we declare that this theme does not use a
+		 * hard-coded <title> tag in the document head, and expect WordPress to
+		 * provide it for us.
+		 */
+		add_theme_support( 'title-tag' );
+
+		/*
+		 * Enable support for Post Thumbnails on posts and pages.
+		 *
+		 * See: https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
+		 */
+		add_theme_support( 'post-thumbnails' );
+		set_post_thumbnail_size( 825, 510, true );
+
+		// This theme uses wp_nav_menu() in two locations.
+		register_nav_menus(
+			array(
+				'primary' => __( 'Primary Menu', 'twentyfifteen' ),
+				'social'  => __( 'Social Links Menu', 'twentyfifteen' ),
+			)
+		);
+
+		/*
+		 * Switch default core markup for search form, comment form, and comments
+		 * to output valid HTML5.
+		 */
+		add_theme_support(
+			'html5', array(
+				'search-form',
+				'comment-form',
+				'comment-list',
+				'gallery',
+				'caption',
+			)
+		);
+
+		/*
+		 * Enable support for Post Formats.
+		 *
+		 * See: https://codex.wordpress.org/Post_Formats
+		 */
+		add_theme_support(
+			'post-formats', array(
+				'aside',
+				'image',
+				'video',
+				'quote',
+				'link',
+				'gallery',
+				'status',
+				'audio',
+				'chat',
+			)
+		);
+
+		/*
+		 * Enable support for custom logo.
+		 *
+		 * @since Twenty Fifteen 1.5
+		 */
+		add_theme_support(
+			'custom-logo', array(
+				'height'      => 248,
+				'width'       => 248,
+				'flex-height' => true,
+			)
+		);
+
+		$color_scheme  = twentyfifteen_get_color_scheme();
+		$default_color = trim( $color_scheme[0], '#' );
+
+		// Setup the WordPress core custom background feature.
+
+		/**
+		 * Filter Twenty Fifteen custom-header support arguments.
+		 *
+		 * @since Twenty Fifteen 1.0
+		 *
+		 * @param array $args {
+		 *     An array of custom-header support arguments.
+		 *
+		 *     @type string $default-color          Default color of the header.
+		 *     @type string $default-attachment     Default attachment of the header.
+		 * }
+		 */
+		add_theme_support(
+			'custom-background', apply_filters(
+				'twentyfifteen_custom_background_args', array(
+					'default-color'      => $default_color,
+					'default-attachment' => 'fixed',
+				)
+			)
+		);
+
+		/*
+		 * This theme styles the visual editor to resemble the theme style,
+		 * specifically font, colors, icons, and column width.
+		 */
+		add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
+
+		// Indicate widget sidebars can use selective refresh in the Customizer.
+		add_theme_support( 'customize-selective-refresh-widgets' );
+	}
 endif; // twentyfifteen_setup
 add_action( 'after_setup_theme', 'twentyfifteen_setup' );
 
@@ -156,80 +180,84 @@ add_action( 'after_setup_theme', 'twentyfifteen_setup' );
  * @link https://codex.wordpress.org/Function_Reference/register_sidebar
  */
 function twentyfifteen_widgets_init() {
-	register_sidebar( array(
-		'name'          => __( 'Widget Area', 'twentyfifteen' ),
-		'id'            => 'sidebar-1',
-		'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentyfifteen' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</aside>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Widget Area', 'twentyfifteen' ),
+			'id'            => 'sidebar-1',
+			'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentyfifteen' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h2 class="widget-title">',
+			'after_title'   => '</h2>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentyfifteen_widgets_init' );
 
 if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
-/**
- * Register Google fonts for Twenty Fifteen.
- *
- * @since Twenty Fifteen 1.0
- *
- * @return string Google fonts URL for the theme.
- */
-function twentyfifteen_fonts_url() {
-	$fonts_url = '';
-	$fonts     = array();
-	$subsets   = 'latin,latin-ext';
-
-	/*
-	 * Translators: If there are characters in your language that are not supported
-	 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
+	/**
+	 * Register Google fonts for Twenty Fifteen.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 *
+	 * @return string Google fonts URL for the theme.
 	 */
-	if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
-		$fonts[] = 'Noto Sans:400italic,700italic,400,700';
+	function twentyfifteen_fonts_url() {
+		$fonts_url = '';
+		$fonts     = array();
+		$subsets   = 'latin,latin-ext';
+
+		/*
+		 * Translators: If there are characters in your language that are not supported
+		 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
+			$fonts[] = 'Noto Sans:400italic,700italic,400,700';
+		}
+
+		/*
+		 * Translators: If there are characters in your language that are not supported
+		 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
+			$fonts[] = 'Noto Serif:400italic,700italic,400,700';
+		}
+
+		/*
+		 * Translators: If there are characters in your language that are not supported
+		 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
+		 */
+		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
+			$fonts[] = 'Inconsolata:400,700';
+		}
+
+		/*
+		 * Translators: To add an additional character subset specific to your language,
+		 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
+		 */
+		$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
+
+		if ( 'cyrillic' == $subset ) {
+			$subsets .= ',cyrillic,cyrillic-ext';
+		} elseif ( 'greek' == $subset ) {
+			$subsets .= ',greek,greek-ext';
+		} elseif ( 'devanagari' == $subset ) {
+			$subsets .= ',devanagari';
+		} elseif ( 'vietnamese' == $subset ) {
+			$subsets .= ',vietnamese';
+		}
+
+		if ( $fonts ) {
+			$fonts_url = add_query_arg(
+				array(
+					'family' => urlencode( implode( '|', $fonts ) ),
+					'subset' => urlencode( $subsets ),
+				), 'https://fonts.googleapis.com/css'
+			);
+		}
+
+		return $fonts_url;
 	}
-
-	/*
-	 * Translators: If there are characters in your language that are not supported
-	 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
-	 */
-	if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
-		$fonts[] = 'Noto Serif:400italic,700italic,400,700';
-	}
-
-	/*
-	 * Translators: If there are characters in your language that are not supported
-	 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
-	 */
-	if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
-		$fonts[] = 'Inconsolata:400,700';
-	}
-
-	/*
-	 * Translators: To add an additional character subset specific to your language,
-	 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
-	 */
-	$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
-
-	if ( 'cyrillic' == $subset ) {
-		$subsets .= ',cyrillic,cyrillic-ext';
-	} elseif ( 'greek' == $subset ) {
-		$subsets .= ',greek,greek-ext';
-	} elseif ( 'devanagari' == $subset ) {
-		$subsets .= ',devanagari';
-	} elseif ( 'vietnamese' == $subset ) {
-		$subsets .= ',vietnamese';
-	}
-
-	if ( $fonts ) {
-		$fonts_url = add_query_arg( array(
-			'family' => urlencode( implode( '|', $fonts ) ),
-			'subset' => urlencode( $subsets ),
-		), 'https://fonts.googleapis.com/css' );
-	}
-
-	return $fonts_url;
-}
 endif;
 
 /**
@@ -278,10 +306,12 @@ 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(
-		'expand'   => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
-		'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
-	) );
+	wp_localize_script(
+		'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>',
+		)
+	);
 }
 add_action( 'wp_enqueue_scripts', 'twentyfifteen_scripts' );
 
@@ -330,9 +360,9 @@ function twentyfifteen_post_nav_background() {
 		return;
 	}
 
-	if ( $previous &&  has_post_thumbnail( $previous->ID ) ) {
+	if ( $previous && has_post_thumbnail( $previous->ID ) ) {
 		$prevthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $previous->ID ), 'post-thumbnail' );
-		$css .= '
+		$css      .= '
 			.post-navigation .nav-previous { background-image: url(' . esc_url( $prevthumb[0] ) . '); }
 			.post-navigation .nav-previous .post-title, .post-navigation .nav-previous a:hover .post-title, .post-navigation .nav-previous .meta-nav { color: #fff; }
 			.post-navigation .nav-previous a:before { background-color: rgba(0, 0, 0, 0.4); }
@@ -341,7 +371,7 @@ function twentyfifteen_post_nav_background() {
 
 	if ( $next && has_post_thumbnail( $next->ID ) ) {
 		$nextthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $next->ID ), 'post-thumbnail' );
-		$css .= '
+		$css      .= '
 			.post-navigation .nav-next { background-image: url(' . esc_url( $nextthumb[0] ) . '); border-top: 0; }
 			.post-navigation .nav-next .post-title, .post-navigation .nav-next a:hover .post-title, .post-navigation .nav-next .meta-nav { color: #fff; }
 			.post-navigation .nav-next a:before { background-color: rgba(0, 0, 0, 0.4); }
diff --git a/wp-content/themes/twentyfifteen/header.php b/wp-content/themes/twentyfifteen/header.php
index 28de34ed9f..a088d85cea 100644
--- a/wp-content/themes/twentyfifteen/header.php
+++ b/wp-content/themes/twentyfifteen/header.php
@@ -31,16 +31,20 @@
 				<?php
 					twentyfifteen_the_custom_logo();
 
-					if ( is_front_page() && is_home() ) : ?>
+				if ( is_front_page() && is_home() ) :
+					?>
 						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 					<?php else : ?>
 						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
-					<?php endif;
+					<?php
+					endif;
 
 					$description = get_bloginfo( 'description', 'display' );
-					if ( $description || is_customize_preview() ) : ?>
+if ( $description || is_customize_preview() ) :
+					?>
 						<p class="site-description"><?php echo $description; ?></p>
-					<?php endif;
+					<?php
+					endif;
 				?>
 				<button class="secondary-toggle"><?php _e( 'Menu and widgets', 'twentyfifteen' ); ?></button>
 			</div><!-- .site-branding -->
diff --git a/wp-content/themes/twentyfifteen/image.php b/wp-content/themes/twentyfifteen/image.php
index 5a471d40ef..ed07d05d5a 100644
--- a/wp-content/themes/twentyfifteen/image.php
+++ b/wp-content/themes/twentyfifteen/image.php
@@ -14,38 +14,39 @@ get_header(); ?>
 
 			<?php
 				// Start the loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 			?>
 
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-					<nav id="image-navigation" class="navigation image-navigation">
-						<div class="nav-links">
-							<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentyfifteen' ) ); ?></div>
-						</div><!-- .nav-links -->
-					</nav><!-- .image-navigation -->
+				<nav id="image-navigation" class="navigation image-navigation">
+					<div class="nav-links">
+						<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentyfifteen' ) ); ?></div><div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentyfifteen' ) ); ?></div>
+					</div><!-- .nav-links -->
+				</nav><!-- .image-navigation -->
 
-					<header class="entry-header">
-						<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-					</header><!-- .entry-header -->
+				<header class="entry-header">
+					<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+				</header><!-- .entry-header -->
 
-					<div class="entry-content">
+				<div class="entry-content">
 
-						<div class="entry-attachment">
-							<?php
-								/**
-								 * Filter the default Twenty Fifteen image attachment size.
-								 *
-								 * @since Twenty Fifteen 1.0
-								 *
-								 * @param string $image_size Image size. Default 'large'.
-								 */
-								$image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
+					<div class="entry-attachment">
+						<?php
+							/**
+							 * Filter the default Twenty Fifteen image attachment size.
+							 *
+							 * @since Twenty Fifteen 1.0
+							 *
+							 * @param string $image_size Image size. Default 'large'.
+							 */
+							$image_size = apply_filters( 'twentyfifteen_attachment_size', 'large' );
 
-								echo wp_get_attachment_image( get_the_ID(), $image_size );
-							?>
+							echo wp_get_attachment_image( get_the_ID(), $image_size );
+						?>
 
-							<?php if ( has_excerpt() ) : ?>
+						<?php if ( has_excerpt() ) : ?>
 								<div class="entry-caption">
 									<?php the_excerpt(); ?>
 								</div><!-- .entry-caption -->
@@ -54,35 +55,39 @@ get_header(); ?>
 						</div><!-- .entry-attachment -->
 
 						<?php
-							the_content();
-							wp_link_pages( array(
+						the_content();
+						wp_link_pages(
+							array(
 								'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfifteen' ) . '</span>',
 								'after'       => '</div>',
 								'link_before' => '<span>',
 								'link_after'  => '</span>',
 								'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>%',
 								'separator'   => '<span class="screen-reader-text">, </span>',
-							) );
-						?>
+							)
+						);
+					?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-footer">
-						<?php twentyfifteen_entry_meta(); ?>
+					<?php twentyfifteen_entry_meta(); ?>
 						<?php edit_post_link( __( 'Edit', 'twentyfifteen' ), '<span class="edit-link">', '</span>' ); ?>
 					</footer><!-- .entry-footer -->
 
 				</article><!-- #post-## -->
 
 				<?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 are open or we have at least one comment, load up the comment template
+				if ( comments_open() || get_comments_number() ) :
+					comments_template();
 					endif;
 
-					// Previous/next post navigation.
-					the_post_navigation( array(
+				// Previous/next post navigation.
+				the_post_navigation(
+					array(
 						'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentyfifteen' ),
-					) );
+					)
+				);
 
 				// End the loop.
 				endwhile;
diff --git a/wp-content/themes/twentyfifteen/inc/back-compat.php b/wp-content/themes/twentyfifteen/inc/back-compat.php
index 73cd44d11e..2f828d6ed2 100644
--- a/wp-content/themes/twentyfifteen/inc/back-compat.php
+++ b/wp-content/themes/twentyfifteen/inc/back-compat.php
@@ -44,9 +44,11 @@ function twentyfifteen_upgrade_notice() {
  * @since Twenty Fifteen 1.0
  */
 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(
-		'back_link' => true,
-	) );
+	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(
+			'back_link' => true,
+		)
+	);
 }
 add_action( 'load-customize.php', 'twentyfifteen_customize' );
 
diff --git a/wp-content/themes/twentyfifteen/inc/custom-header.php b/wp-content/themes/twentyfifteen/inc/custom-header.php
index 10d0ef1a09..5f90789fe8 100644
--- a/wp-content/themes/twentyfifteen/inc/custom-header.php
+++ b/wp-content/themes/twentyfifteen/inc/custom-header.php
@@ -13,8 +13,8 @@
  * @uses twentyfifteen_header_style()
  */
 function twentyfifteen_custom_header_setup() {
-	$color_scheme        = twentyfifteen_get_color_scheme();
-	$default_text_color  = trim( $color_scheme[4], '#' );
+	$color_scheme       = twentyfifteen_get_color_scheme();
+	$default_text_color = trim( $color_scheme[4], '#' );
 
 	/**
 	 * Filter Twenty Fifteen custom-header support arguments.
@@ -31,12 +31,16 @@ function twentyfifteen_custom_header_setup() {
 	 *                                          displayed on the blog.
 	 * }
 	 */
-	add_theme_support( 'custom-header', apply_filters( 'twentyfifteen_custom_header_args', array(
-		'default-text-color'     => $default_text_color,
-		'width'                  => 954,
-		'height'                 => 1300,
-		'wp-head-callback'       => 'twentyfifteen_header_style',
-	) ) );
+	add_theme_support(
+		'custom-header', apply_filters(
+			'twentyfifteen_custom_header_args', array(
+				'default-text-color' => $default_text_color,
+				'width'              => 954,
+				'height'             => 1300,
+				'wp-head-callback'   => 'twentyfifteen_header_style',
+			)
+		)
+	);
 }
 add_action( 'after_setup_theme', 'twentyfifteen_custom_header_setup' );
 
@@ -53,10 +57,10 @@ function twentyfifteen_hex2rgb( $color ) {
 	$color = trim( $color, '#' );
 
 	if ( strlen( $color ) == 3 ) {
-		$r = hexdec( substr( $color, 0, 1 ).substr( $color, 0, 1 ) );
-		$g = hexdec( substr( $color, 1, 1 ).substr( $color, 1, 1 ) );
-		$b = hexdec( substr( $color, 2, 1 ).substr( $color, 2, 1 ) );
-	} else if ( strlen( $color ) == 6 ) {
+		$r = hexdec( substr( $color, 0, 1 ) . substr( $color, 0, 1 ) );
+		$g = hexdec( substr( $color, 1, 1 ) . substr( $color, 1, 1 ) );
+		$b = hexdec( substr( $color, 2, 1 ) . substr( $color, 2, 1 ) );
+	} elseif ( strlen( $color ) == 6 ) {
 		$r = hexdec( substr( $color, 0, 2 ) );
 		$g = hexdec( substr( $color, 2, 2 ) );
 		$b = hexdec( substr( $color, 4, 2 ) );
@@ -64,29 +68,33 @@ function twentyfifteen_hex2rgb( $color ) {
 		return array();
 	}
 
-	return array( 'red' => $r, 'green' => $g, 'blue' => $b );
+	return array(
+		'red'   => $r,
+		'green' => $g,
+		'blue'  => $b,
+	);
 }
 
 if ( ! function_exists( 'twentyfifteen_header_style' ) ) :
-/**
- * Styles the header image and text displayed on the blog.
- *
- * @since Twenty Fifteen 1.0
- *
- * @see twentyfifteen_custom_header_setup()
- */
-function twentyfifteen_header_style() {
-	$header_image = get_header_image();
+	/**
+	 * Styles the header image and text displayed on the blog.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 *
+	 * @see twentyfifteen_custom_header_setup()
+	 */
+	function twentyfifteen_header_style() {
+		$header_image = get_header_image();
 
-	// If no custom options for text are set, let's bail.
-	if ( empty( $header_image ) && display_header_text() ) {
-		return;
-	}
+		// If no custom options for text are set, let's bail.
+		if ( empty( $header_image ) && display_header_text() ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles. Let's do this.
-	?>
-	<style type="text/css" id="twentyfifteen-header-css">
-	<?php
+		// If we get this far, we have custom styles. Let's do this.
+		?>
+		<style type="text/css" id="twentyfifteen-header-css">
+		<?php
 		// Short header for when there is no Custom Header and Header Text is hidden.
 		if ( empty( $header_image ) && ! display_header_text() ) :
 	?>
@@ -182,7 +190,7 @@ function twentyfifteen_header_style() {
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // twentyfifteen_header_style
 
 /**
diff --git a/wp-content/themes/twentyfifteen/inc/customizer.php b/wp-content/themes/twentyfifteen/inc/customizer.php
index c31c57e8df..9cc00a8ab9 100644
--- a/wp-content/themes/twentyfifteen/inc/customizer.php
+++ b/wp-content/themes/twentyfifteen/inc/customizer.php
@@ -21,61 +21,81 @@ function twentyfifteen_customize_register( $wp_customize ) {
 	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
-			'selector' => '.site-title a',
-			'container_inclusive' => false,
-			'render_callback' => 'twentyfifteen_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-			'selector' => '.site-description',
-			'container_inclusive' => false,
-			'render_callback' => 'twentyfifteen_customize_partial_blogdescription',
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'blogname', array(
+				'selector'            => '.site-title a',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentyfifteen_customize_partial_blogname',
+			)
+		);
+		$wp_customize->selective_refresh->add_partial(
+			'blogdescription', array(
+				'selector'            => '.site-description',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentyfifteen_customize_partial_blogdescription',
+			)
+		);
 	}
 
 	// Add color scheme setting and control.
-	$wp_customize->add_setting( 'color_scheme', array(
-		'default'           => 'default',
-		'sanitize_callback' => 'twentyfifteen_sanitize_color_scheme',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'color_scheme', array(
+			'default'           => 'default',
+			'sanitize_callback' => 'twentyfifteen_sanitize_color_scheme',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( 'color_scheme', array(
-		'label'    => __( 'Base Color Scheme', 'twentyfifteen' ),
-		'section'  => 'colors',
-		'type'     => 'select',
-		'choices'  => twentyfifteen_get_color_scheme_choices(),
-		'priority' => 1,
-	) );
+	$wp_customize->add_control(
+		'color_scheme', array(
+			'label'    => __( 'Base Color Scheme', 'twentyfifteen' ),
+			'section'  => 'colors',
+			'type'     => 'select',
+			'choices'  => twentyfifteen_get_color_scheme_choices(),
+			'priority' => 1,
+		)
+	);
 
 	// Add custom header and sidebar text color setting and control.
-	$wp_customize->add_setting( 'sidebar_textcolor', array(
-		'default'           => $color_scheme[4],
-		'sanitize_callback' => 'sanitize_hex_color',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'sidebar_textcolor', array(
+			'default'           => $color_scheme[4],
+			'sanitize_callback' => 'sanitize_hex_color',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $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',
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$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',
+			)
+		)
+	);
 
 	// Remove the core header textcolor control, as it shares the sidebar text color.
 	$wp_customize->remove_control( 'header_textcolor' );
 
 	// Add custom header and sidebar background color setting and control.
-	$wp_customize->add_setting( 'header_background_color', array(
-		'default'           => $color_scheme[1],
-		'sanitize_callback' => 'sanitize_hex_color',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'header_background_color', array(
+			'default'           => $color_scheme[1],
+			'sanitize_callback' => 'sanitize_hex_color',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $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',
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$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',
+			)
+		)
+	);
 
 	// Add an additional description to the header image section.
 	$wp_customize->get_section( 'header_image' )->description = __( 'Applied to the header on small screens and the sidebar on wide screens.', 'twentyfifteen' );
@@ -145,134 +165,136 @@ function twentyfifteen_get_color_schemes() {
 	 *     }
 	 * }
 	 */
-	return apply_filters( 'twentyfifteen_color_schemes', array(
-		'default' => array(
-			'label'  => __( 'Default', 'twentyfifteen' ),
-			'colors' => array(
-				'#f1f1f1',
-				'#ffffff',
-				'#ffffff',
-				'#333333',
-				'#333333',
-				'#f7f7f7',
+	return apply_filters(
+		'twentyfifteen_color_schemes', array(
+			'default' => array(
+				'label'  => __( 'Default', 'twentyfifteen' ),
+				'colors' => array(
+					'#f1f1f1',
+					'#ffffff',
+					'#ffffff',
+					'#333333',
+					'#333333',
+					'#f7f7f7',
+				),
 			),
-		),
-		'dark'    => array(
-			'label'  => __( 'Dark', 'twentyfifteen' ),
-			'colors' => array(
-				'#111111',
-				'#202020',
-				'#202020',
-				'#bebebe',
-				'#bebebe',
-				'#1b1b1b',
+			'dark'    => array(
+				'label'  => __( 'Dark', 'twentyfifteen' ),
+				'colors' => array(
+					'#111111',
+					'#202020',
+					'#202020',
+					'#bebebe',
+					'#bebebe',
+					'#1b1b1b',
+				),
 			),
-		),
-		'yellow'  => array(
-			'label'  => __( 'Yellow', 'twentyfifteen' ),
-			'colors' => array(
-				'#f4ca16',
-				'#ffdf00',
-				'#ffffff',
-				'#111111',
-				'#111111',
-				'#f1f1f1',
+			'yellow'  => array(
+				'label'  => __( 'Yellow', 'twentyfifteen' ),
+				'colors' => array(
+					'#f4ca16',
+					'#ffdf00',
+					'#ffffff',
+					'#111111',
+					'#111111',
+					'#f1f1f1',
+				),
 			),
-		),
-		'pink'    => array(
-			'label'  => __( 'Pink', 'twentyfifteen' ),
-			'colors' => array(
-				'#ffe5d1',
-				'#e53b51',
-				'#ffffff',
-				'#352712',
-				'#ffffff',
-				'#f1f1f1',
+			'pink'    => array(
+				'label'  => __( 'Pink', 'twentyfifteen' ),
+				'colors' => array(
+					'#ffe5d1',
+					'#e53b51',
+					'#ffffff',
+					'#352712',
+					'#ffffff',
+					'#f1f1f1',
+				),
 			),
-		),
-		'purple'  => array(
-			'label'  => __( 'Purple', 'twentyfifteen' ),
-			'colors' => array(
-				'#674970',
-				'#2e2256',
-				'#ffffff',
-				'#2e2256',
-				'#ffffff',
-				'#f1f1f1',
+			'purple'  => array(
+				'label'  => __( 'Purple', 'twentyfifteen' ),
+				'colors' => array(
+					'#674970',
+					'#2e2256',
+					'#ffffff',
+					'#2e2256',
+					'#ffffff',
+					'#f1f1f1',
+				),
 			),
-		),
-		'blue'   => array(
-			'label'  => __( 'Blue', 'twentyfifteen' ),
-			'colors' => array(
-				'#e9f2f9',
-				'#55c3dc',
-				'#ffffff',
-				'#22313f',
-				'#ffffff',
-				'#f1f1f1',
+			'blue'    => array(
+				'label'  => __( 'Blue', 'twentyfifteen' ),
+				'colors' => array(
+					'#e9f2f9',
+					'#55c3dc',
+					'#ffffff',
+					'#22313f',
+					'#ffffff',
+					'#f1f1f1',
+				),
 			),
-		),
-	) );
+		)
+	);
 }
 
 if ( ! function_exists( 'twentyfifteen_get_color_scheme' ) ) :
-/**
- * Get the current Twenty Fifteen color scheme.
- *
- * @since Twenty Fifteen 1.0
- *
- * @return array An associative array of either the current or default color scheme hex values.
- */
-function twentyfifteen_get_color_scheme() {
-	$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
-	$color_schemes       = twentyfifteen_get_color_schemes();
+	/**
+	 * Get the current Twenty Fifteen color scheme.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 *
+	 * @return array An associative array of either the current or default color scheme hex values.
+	 */
+	function twentyfifteen_get_color_scheme() {
+		$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
+		$color_schemes       = twentyfifteen_get_color_schemes();
 
-	if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
-		return $color_schemes[ $color_scheme_option ]['colors'];
+		if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
+			return $color_schemes[ $color_scheme_option ]['colors'];
+		}
+
+		return $color_schemes['default']['colors'];
 	}
-
-	return $color_schemes['default']['colors'];
-}
 endif; // twentyfifteen_get_color_scheme
 
 if ( ! function_exists( 'twentyfifteen_get_color_scheme_choices' ) ) :
-/**
- * Returns an array of color scheme choices registered for Twenty Fifteen.
- *
- * @since Twenty Fifteen 1.0
- *
- * @return array Array of color schemes.
- */
-function twentyfifteen_get_color_scheme_choices() {
-	$color_schemes                = twentyfifteen_get_color_schemes();
-	$color_scheme_control_options = array();
+	/**
+	 * Returns an array of color scheme choices registered for Twenty Fifteen.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 *
+	 * @return array Array of color schemes.
+	 */
+	function twentyfifteen_get_color_scheme_choices() {
+		$color_schemes                = twentyfifteen_get_color_schemes();
+		$color_scheme_control_options = array();
 
-	foreach ( $color_schemes as $color_scheme => $value ) {
-		$color_scheme_control_options[ $color_scheme ] = $value['label'];
+		foreach ( $color_schemes as $color_scheme => $value ) {
+			$color_scheme_control_options[ $color_scheme ] = $value['label'];
+		}
+
+		return $color_scheme_control_options;
 	}
-
-	return $color_scheme_control_options;
-}
 endif; // twentyfifteen_get_color_scheme_choices
 
 if ( ! function_exists( 'twentyfifteen_sanitize_color_scheme' ) ) :
-/**
- * Sanitization callback for color schemes.
- *
- * @since Twenty Fifteen 1.0
- *
- * @param string $value Color scheme name value.
- * @return string Color scheme name.
- */
-function twentyfifteen_sanitize_color_scheme( $value ) {
-	$color_schemes = twentyfifteen_get_color_scheme_choices();
+	/**
+	 * Sanitization callback for color schemes.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 *
+	 * @param string $value Color scheme name value.
+	 * @return string Color scheme name.
+	 */
+	function twentyfifteen_sanitize_color_scheme( $value ) {
+		$color_schemes = twentyfifteen_get_color_scheme_choices();
 
-	if ( ! array_key_exists( $value, $color_schemes ) ) {
-		$value = 'default';
+		if ( ! array_key_exists( $value, $color_schemes ) ) {
+			$value = 'default';
+		}
+
+		return $value;
 	}
-
-	return $value;
-}
 endif; // twentyfifteen_sanitize_color_scheme
 
 /**
@@ -295,7 +317,7 @@ function twentyfifteen_color_scheme_css() {
 	// Convert main and sidebar text hex color to rgba.
 	$color_textcolor_rgb         = twentyfifteen_hex2rgb( $color_scheme[3] );
 	$color_sidebar_textcolor_rgb = twentyfifteen_hex2rgb( $color_scheme[4] );
-	$colors = array(
+	$colors                      = array(
 		'background_color'            => $color_scheme[0],
 		'header_background_color'     => $color_scheme[1],
 		'box_background_color'        => $color_scheme[2],
@@ -348,20 +370,22 @@ add_action( 'customize_preview_init', 'twentyfifteen_customize_preview_js' );
  * @return string Color scheme CSS.
  */
 function twentyfifteen_get_color_scheme_css( $colors ) {
-	$colors = wp_parse_args( $colors, array(
-		'background_color'            => '',
-		'header_background_color'     => '',
-		'box_background_color'        => '',
-		'textcolor'                   => '',
-		'secondary_textcolor'         => '',
-		'border_color'                => '',
-		'border_focus_color'          => '',
-		'sidebar_textcolor'           => '',
-		'sidebar_border_color'        => '',
-		'sidebar_border_focus_color'  => '',
-		'secondary_sidebar_textcolor' => '',
-		'meta_box_background_color'   => '',
-	) );
+	$colors = wp_parse_args(
+		$colors, array(
+			'background_color'            => '',
+			'header_background_color'     => '',
+			'box_background_color'        => '',
+			'textcolor'                   => '',
+			'secondary_textcolor'         => '',
+			'border_color'                => '',
+			'border_focus_color'          => '',
+			'sidebar_textcolor'           => '',
+			'sidebar_border_color'        => '',
+			'sidebar_border_focus_color'  => '',
+			'secondary_sidebar_textcolor' => '',
+			'meta_box_background_color'   => '',
+		)
+	);
 
 	$css = <<<CSS
 	/* Color Scheme */
diff --git a/wp-content/themes/twentyfifteen/inc/template-tags.php b/wp-content/themes/twentyfifteen/inc/template-tags.php
index 7b4ffeb711..baa98d2114 100644
--- a/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -10,120 +10,127 @@
  */
 
 if ( ! function_exists( 'twentyfifteen_comment_nav' ) ) :
-/**
- * Display navigation to next/previous comments when applicable.
- *
- * @since Twenty Fifteen 1.0
- */
-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">
+	/**
+	 * Display navigation to next/previous comments when applicable.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 */
+	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">
 			<?php
-				if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
-					printf( '<div class="nav-previous">%s</div>', $prev_link );
+			if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
+				printf( '<div class="nav-previous">%s</div>', $prev_link );
 				endif;
 
-				if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
-					printf( '<div class="nav-next">%s</div>', $next_link );
+			if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
+				printf( '<div class="nav-next">%s</div>', $next_link );
 				endif;
 			?>
-		</div><!-- .nav-links -->
-	</nav><!-- .comment-navigation -->
-	<?php
-	endif;
-}
+			</div><!-- .nav-links -->
+		</nav><!-- .comment-navigation -->
+		<?php
+		endif;
+	}
 endif;
 
 if ( ! function_exists( 'twentyfifteen_entry_meta' ) ) :
-/**
- * Prints HTML with meta information for the categories, tags.
- *
- * @since Twenty Fifteen 1.0
- */
-function twentyfifteen_entry_meta() {
-	if ( is_sticky() && is_home() && ! is_paged() ) {
-		printf( '<span class="sticky-post">%s</span>', __( 'Featured', 'twentyfifteen' ) );
-	}
-
-	$format = get_post_format();
-	if ( current_theme_supports( 'post-formats', $format ) ) {
-		printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
-			sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
-			esc_url( get_post_format_link( $format ) ),
-			get_post_format_string( $format )
-		);
-	}
-
-	if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
-		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
-
-		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
-			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+	/**
+	 * Prints HTML with meta information for the categories, tags.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 */
+	function twentyfifteen_entry_meta() {
+		if ( is_sticky() && is_home() && ! is_paged() ) {
+			printf( '<span class="sticky-post">%s</span>', __( 'Featured', 'twentyfifteen' ) );
 		}
 
-		$time_string = sprintf( $time_string,
-			esc_attr( get_the_date( 'c' ) ),
-			get_the_date(),
-			esc_attr( get_the_modified_date( 'c' ) ),
-			get_the_modified_date()
-		);
-
-		printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
-			_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
-			esc_url( get_permalink() ),
-			$time_string
-		);
-	}
-
-	if ( 'post' == get_post_type() ) {
-		if ( is_singular() || is_multi_author() ) {
-			printf( '<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
-				_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
-				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-				get_the_author()
+		$format = get_post_format();
+		if ( current_theme_supports( 'post-formats', $format ) ) {
+			printf(
+				'<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
+				sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
+				esc_url( get_post_format_link( $format ) ),
+				get_post_format_string( $format )
 			);
 		}
 
-		$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
-		if ( $categories_list && twentyfifteen_categorized_blog() ) {
-			printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-				_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
-				$categories_list
+		if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
+			$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
+
+			if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+				$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+			}
+
+			$time_string = sprintf(
+				$time_string,
+				esc_attr( get_the_date( 'c' ) ),
+				get_the_date(),
+				esc_attr( get_the_modified_date( 'c' ) ),
+				get_the_modified_date()
+			);
+
+			printf(
+				'<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
+				_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
+				esc_url( get_permalink() ),
+				$time_string
 			);
 		}
 
-		$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
-		if ( $tags_list && ! is_wp_error( $tags_list ) ) {
-			printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-				_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
-				$tags_list
+		if ( 'post' == get_post_type() ) {
+			if ( is_singular() || is_multi_author() ) {
+				printf(
+					'<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
+					_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
+					esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+					get_the_author()
+				);
+			}
+
+			$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
+			if ( $categories_list && twentyfifteen_categorized_blog() ) {
+				printf(
+					'<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+					_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
+					$categories_list
+				);
+			}
+
+			$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
+			if ( $tags_list && ! is_wp_error( $tags_list ) ) {
+				printf(
+					'<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+					_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
+					$tags_list
+				);
+			}
+		}
+
+		if ( is_attachment() && wp_attachment_is_image() ) {
+			// Retrieve attachment metadata.
+			$metadata = wp_get_attachment_metadata();
+
+			printf(
+				'<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
+				_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
+				esc_url( wp_get_attachment_url() ),
+				$metadata['width'],
+				$metadata['height']
 			);
 		}
-	}
 
-	if ( is_attachment() && wp_attachment_is_image() ) {
-		// Retrieve attachment metadata.
-		$metadata = wp_get_attachment_metadata();
-
-		printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
-			_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
-			esc_url( wp_get_attachment_url() ),
-			$metadata['width'],
-			$metadata['height']
-		);
+		if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
+			echo '<span class="comments-link">';
+			/* translators: %s: post title */
+			comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentyfifteen' ), get_the_title() ) );
+			echo '</span>';
+		}
 	}
-
-	if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
-		echo '<span class="comments-link">';
-		/* translators: %s: post title */
-		comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentyfifteen' ), get_the_title() ) );
-		echo '</span>';
-	}
-}
 endif;
 
 /**
@@ -136,13 +143,15 @@ endif;
 function twentyfifteen_categorized_blog() {
 	if ( false === ( $all_the_cool_cats = get_transient( 'twentyfifteen_categories' ) ) ) {
 		// Create an array of all the categories that are attached to posts.
-		$all_the_cool_cats = get_categories( array(
-			'fields'     => 'ids',
-			'hide_empty' => 1,
+		$all_the_cool_cats = get_categories(
+			array(
+				'fields'     => 'ids',
+				'hide_empty' => 1,
 
-			// We only need to know if there is more than one category.
-			'number'     => 2,
-		) );
+				// We only need to know if there is more than one category.
+				'number'     => 2,
+			)
+		);
 
 		// Count the number of categories that are attached to the posts.
 		$all_the_cool_cats = count( $all_the_cool_cats );
@@ -169,26 +178,26 @@ function twentyfifteen_category_transient_flusher() {
 	delete_transient( 'twentyfifteen_categories' );
 }
 add_action( 'edit_category', 'twentyfifteen_category_transient_flusher' );
-add_action( 'save_post',     'twentyfifteen_category_transient_flusher' );
+add_action( 'save_post', 'twentyfifteen_category_transient_flusher' );
 
 if ( ! function_exists( 'twentyfifteen_post_thumbnail' ) ) :
-/**
- * Display an optional post thumbnail.
- *
- * Wraps the post thumbnail in an anchor element on index views, or a div
- * element when on single views.
- *
- * @since Twenty Fifteen 1.0
- */
-function twentyfifteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-		return;
-	}
+	/**
+	 * Display an optional post thumbnail.
+	 *
+	 * Wraps the post thumbnail in an anchor element on index views, or a div
+	 * element when on single views.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 */
+	function twentyfifteen_post_thumbnail() {
+		if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+			return;
+		}
 
-	if ( is_singular() ) :
-	?>
+		if ( is_singular() ) :
+		?>
 
-	<div class="post-thumbnail">
+		<div class="post-thumbnail">
 		<?php the_post_thumbnail(); ?>
 	</div><!-- .post-thumbnail -->
 
@@ -200,59 +209,61 @@ function twentyfifteen_post_thumbnail() {
 		?>
 	</a>
 
-	<?php endif; // End is_singular()
-}
+	<?php
+	endif; // End is_singular()
+	}
 endif;
 
 if ( ! function_exists( 'twentyfifteen_get_link_url' ) ) :
-/**
- * Return the post URL.
- *
- * Falls back to the post permalink if no URL is found in the post.
- *
- * @since Twenty Fifteen 1.0
- *
- * @see get_url_in_content()
- *
- * @return string The Link format URL.
- */
-function twentyfifteen_get_link_url() {
-	$has_url = get_url_in_content( get_the_content() );
+	/**
+	 * Return the post URL.
+	 *
+	 * Falls back to the post permalink if no URL is found in the post.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 *
+	 * @see get_url_in_content()
+	 *
+	 * @return string The Link format URL.
+	 */
+	function twentyfifteen_get_link_url() {
+		$has_url = get_url_in_content( get_the_content() );
 
-	return $has_url ? $has_url : apply_filters( 'the_permalink', get_permalink() );
-}
+		return $has_url ? $has_url : apply_filters( 'the_permalink', get_permalink() );
+	}
 endif;
 
 if ( ! function_exists( 'twentyfifteen_excerpt_more' ) && ! is_admin() ) :
-/**
- * Replaces "[...]" (appended to automatically generated excerpts) with ... and a 'Continue reading' link.
- *
- * @since Twenty Fifteen 1.0
- *
- * @return string 'Continue reading' link prepended with an ellipsis.
- */
-function twentyfifteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
-		/* translators: %s: Name of current post */
-		sprintf( __( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
+	/**
+	 * Replaces "[...]" (appended to automatically generated excerpts) with ... and a 'Continue reading' link.
+	 *
+	 * @since Twenty Fifteen 1.0
+	 *
+	 * @return string 'Continue reading' link prepended with an ellipsis.
+	 */
+	function twentyfifteen_excerpt_more( $more ) {
+		$link = sprintf(
+			'<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
+			/* translators: %s: Name of current post */
+			sprintf( __( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
 		);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentyfifteen_excerpt_more' );
+		return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentyfifteen_excerpt_more' );
 endif;
 
 if ( ! function_exists( 'twentyfifteen_the_custom_logo' ) ) :
-/**
- * Displays the optional custom logo.
- *
- * Does nothing if the custom logo is not available.
- *
- * @since Twenty Fifteen 1.5
- */
-function twentyfifteen_the_custom_logo() {
-	if ( function_exists( 'the_custom_logo' ) ) {
-		the_custom_logo();
+	/**
+	 * Displays the optional custom logo.
+	 *
+	 * Does nothing if the custom logo is not available.
+	 *
+	 * @since Twenty Fifteen 1.5
+	 */
+	function twentyfifteen_the_custom_logo() {
+		if ( function_exists( 'the_custom_logo' ) ) {
+			the_custom_logo();
+		}
 	}
-}
 endif;
diff --git a/wp-content/themes/twentyfifteen/index.php b/wp-content/themes/twentyfifteen/index.php
index db77651ebf..4ad3d3829d 100644
--- a/wp-content/themes/twentyfifteen/index.php
+++ b/wp-content/themes/twentyfifteen/index.php
@@ -29,7 +29,8 @@ get_header(); ?>
 
 			<?php
 			// Start the loop.
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				/*
 				 * Include the Post-Format-specific template for the content.
@@ -38,17 +39,19 @@ get_header(); ?>
 				 */
 				get_template_part( 'content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination( array(
-				'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
-				'next_text'          => __( 'Next page', 'twentyfifteen' ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
+					'next_text'          => __( 'Next page', 'twentyfifteen' ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
+				)
+			);
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'content', 'none' );
 
diff --git a/wp-content/themes/twentyfifteen/page.php b/wp-content/themes/twentyfifteen/page.php
index 5c7a0b077a..50d0bf1c12 100644
--- a/wp-content/themes/twentyfifteen/page.php
+++ b/wp-content/themes/twentyfifteen/page.php
@@ -18,7 +18,8 @@ get_header(); ?>
 
 		<?php
 		// Start the loop.
-		while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 
 			// Include the page content template.
 			get_template_part( 'content', 'page' );
@@ -28,7 +29,7 @@ get_header(); ?>
 				comments_template();
 			endif;
 
-		// End the loop.
+			// End the loop.
 		endwhile;
 		?>
 
diff --git a/wp-content/themes/twentyfifteen/search.php b/wp-content/themes/twentyfifteen/search.php
index 3352841560..174c9f6f92 100644
--- a/wp-content/themes/twentyfifteen/search.php
+++ b/wp-content/themes/twentyfifteen/search.php
@@ -20,7 +20,9 @@ get_header(); ?>
 
 			<?php
 			// Start the loop.
-			while ( have_posts() ) : the_post(); ?>
+			while ( have_posts() ) :
+				the_post();
+			?>
 
 				<?php
 				/*
@@ -30,17 +32,19 @@ get_header(); ?>
 				 */
 				get_template_part( 'content', 'search' );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination( array(
-				'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
-				'next_text'          => __( 'Next page', 'twentyfifteen' ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => __( 'Previous page', 'twentyfifteen' ),
+					'next_text'          => __( 'Next page', 'twentyfifteen' ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyfifteen' ) . ' </span>',
+				)
+			);
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'content', 'none' );
 
diff --git a/wp-content/themes/twentyfifteen/sidebar.php b/wp-content/themes/twentyfifteen/sidebar.php
index 02308efc37..f2326a8c8f 100644
--- a/wp-content/themes/twentyfifteen/sidebar.php
+++ b/wp-content/themes/twentyfifteen/sidebar.php
@@ -7,17 +7,19 @@
  * @since Twenty Fifteen 1.0
  */
 
-if ( has_nav_menu( 'primary' ) || has_nav_menu( 'social' ) || is_active_sidebar( 'sidebar-1' )  ) : ?>
+if ( has_nav_menu( 'primary' ) || has_nav_menu( 'social' ) || is_active_sidebar( 'sidebar-1' ) ) : ?>
 	<div id="secondary" class="secondary">
 
 		<?php if ( has_nav_menu( 'primary' ) ) : ?>
 			<nav id="site-navigation" class="main-navigation" role="navigation">
 				<?php
 					// Primary navigation menu.
-					wp_nav_menu( array(
-						'menu_class'     => 'nav-menu',
-						'theme_location' => 'primary',
-					) );
+					wp_nav_menu(
+						array(
+							'menu_class'     => 'nav-menu',
+							'theme_location' => 'primary',
+						)
+					);
 				?>
 			</nav><!-- .main-navigation -->
 		<?php endif; ?>
@@ -26,12 +28,14 @@ if ( has_nav_menu( 'primary' ) || has_nav_menu( 'social' ) || is_active_sidebar(
 			<nav id="social-navigation" class="social-navigation" role="navigation">
 				<?php
 					// Social links navigation menu.
-					wp_nav_menu( array(
-						'theme_location' => 'social',
-						'depth'          => 1,
-						'link_before'    => '<span class="screen-reader-text">',
-						'link_after'     => '</span>',
-					) );
+					wp_nav_menu(
+						array(
+							'theme_location' => 'social',
+							'depth'          => 1,
+							'link_before'    => '<span class="screen-reader-text">',
+							'link_after'     => '</span>',
+						)
+					);
 				?>
 			</nav><!-- .social-navigation -->
 		<?php endif; ?>
diff --git a/wp-content/themes/twentyfifteen/single.php b/wp-content/themes/twentyfifteen/single.php
index fda8b5ecdb..4de3a493ad 100644
--- a/wp-content/themes/twentyfifteen/single.php
+++ b/wp-content/themes/twentyfifteen/single.php
@@ -14,7 +14,8 @@ get_header(); ?>
 
 		<?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
@@ -29,16 +30,18 @@ get_header(); ?>
 			endif;
 
 			// Previous/next post navigation.
-			the_post_navigation( array(
-				'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentyfifteen' ) . '</span> ' .
-					'<span class="screen-reader-text">' . __( 'Next post:', 'twentyfifteen' ) . '</span> ' .
-					'<span class="post-title">%title</span>',
-				'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentyfifteen' ) . '</span> ' .
-					'<span class="screen-reader-text">' . __( 'Previous post:', 'twentyfifteen' ) . '</span> ' .
-					'<span class="post-title">%title</span>',
-			) );
+			the_post_navigation(
+				array(
+					'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentyfifteen' ) . '</span> ' .
+						'<span class="screen-reader-text">' . __( 'Next post:', 'twentyfifteen' ) . '</span> ' .
+						'<span class="post-title">%title</span>',
+					'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentyfifteen' ) . '</span> ' .
+						'<span class="screen-reader-text">' . __( 'Previous post:', 'twentyfifteen' ) . '</span> ' .
+						'<span class="post-title">%title</span>',
+				)
+			);
 
-		// End the loop.
+			// End the loop.
 		endwhile;
 		?>
 
diff --git a/wp-content/themes/twentyfourteen/archive.php b/wp-content/themes/twentyfourteen/archive.php
index 6a4deed0f2..e2b4b4145a 100644
--- a/wp-content/themes/twentyfourteen/archive.php
+++ b/wp-content/themes/twentyfourteen/archive.php
@@ -27,8 +27,8 @@ get_header(); ?>
 			<header class="page-header">
 				<h1 class="page-title">
 					<?php
-						if ( is_day() ) :
-							printf( __( 'Daily Archives: %s', 'twentyfourteen' ), get_the_date() );
+					if ( is_day() ) :
+						printf( __( 'Daily Archives: %s', 'twentyfourteen' ), get_the_date() );
 
 						elseif ( is_month() ) :
 							printf( __( 'Monthly Archives: %s', 'twentyfourteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentyfourteen' ) ) );
@@ -46,14 +46,15 @@ get_header(); ?>
 
 			<?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.
diff --git a/wp-content/themes/twentyfourteen/author.php b/wp-content/themes/twentyfourteen/author.php
index a40f209099..90a5bc0bf7 100644
--- a/wp-content/themes/twentyfourteen/author.php
+++ b/wp-content/themes/twentyfourteen/author.php
@@ -45,14 +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.
diff --git a/wp-content/themes/twentyfourteen/category.php b/wp-content/themes/twentyfourteen/category.php
index 97745ff1d6..2264c1e30a 100644
--- a/wp-content/themes/twentyfourteen/category.php
+++ b/wp-content/themes/twentyfourteen/category.php
@@ -22,22 +22,23 @@ get_header(); ?>
 				<?php
 					// Show an optional term description.
 					$term_description = term_description();
-					if ( ! empty( $term_description ) ) :
-						printf( '<div class="taxonomy-description">%s</div>', $term_description );
+				if ( ! empty( $term_description ) ) :
+					printf( '<div class="taxonomy-description">%s</div>', $term_description );
 					endif;
 				?>
 			</header><!-- .archive-header -->
 
 			<?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.
diff --git a/wp-content/themes/twentyfourteen/comments.php b/wp-content/themes/twentyfourteen/comments.php
index d62e91a7c7..a20dc1ec51 100644
--- a/wp-content/themes/twentyfourteen/comments.php
+++ b/wp-content/themes/twentyfourteen/comments.php
@@ -25,23 +25,23 @@ if ( post_password_required() ) {
 	<h2 class="comments-title">
 		<?php
 			$comments_number = get_comments_number();
-			if ( '1' === $comments_number ) {
-				/* translators: %s: post title */
-				printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentyfourteen' ), get_the_title() );
-			} else {
-				printf(
-					/* translators: 1: number of comments, 2: post title */
-					_nx(
-						'%1$s thought on &ldquo;%2$s&rdquo;',
-						'%1$s thoughts on &ldquo;%2$s&rdquo;',
-						$comments_number,
-						'comments title',
-						'twentyfourteen'
-					),
-					number_format_i18n( $comments_number ),
-					get_the_title()
-				);
-			}
+		if ( '1' === $comments_number ) {
+			/* translators: %s: post title */
+			printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentyfourteen' ), get_the_title() );
+		} else {
+			printf(
+				/* translators: 1: number of comments, 2: post title */
+				_nx(
+					'%1$s thought on &ldquo;%2$s&rdquo;',
+					'%1$s thoughts on &ldquo;%2$s&rdquo;',
+					$comments_number,
+					'comments title',
+					'twentyfourteen'
+				),
+				number_format_i18n( $comments_number ),
+				get_the_title()
+			);
+		}
 		?>
 	</h2>
 
@@ -55,11 +55,13 @@ if ( post_password_required() ) {
 
 	<ol class="comment-list">
 		<?php
-			wp_list_comments( array(
-				'style'       => 'ol',
-				'short_ping'  => true,
-				'avatar_size' => 34,
-			) );
+			wp_list_comments(
+				array(
+					'style'       => 'ol',
+					'short_ping'  => true,
+					'avatar_size' => 34,
+				)
+			);
 		?>
 	</ol><!-- .comment-list -->
 
diff --git a/wp-content/themes/twentyfourteen/content-aside.php b/wp-content/themes/twentyfourteen/content-aside.php
index 0401579df0..554416dfea 100644
--- a/wp-content/themes/twentyfourteen/content-aside.php
+++ b/wp-content/themes/twentyfourteen/content-aside.php
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -44,17 +44,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfourteen/content-audio.php b/wp-content/themes/twentyfourteen/content-audio.php
index 9fa9df41d4..8fc2095ada 100644
--- a/wp-content/themes/twentyfourteen/content-audio.php
+++ b/wp-content/themes/twentyfourteen/content-audio.php
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -44,17 +44,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfourteen/content-featured-post.php b/wp-content/themes/twentyfourteen/content-featured-post.php
index 6cc88224b4..d5a16fef20 100644
--- a/wp-content/themes/twentyfourteen/content-featured-post.php
+++ b/wp-content/themes/twentyfourteen/content-featured-post.php
@@ -12,12 +12,12 @@
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>">
 	<?php
 		// Output the featured image.
-		if ( has_post_thumbnail() ) :
-			if ( 'grid' == get_theme_mod( 'featured_content_layout' ) ) {
-				the_post_thumbnail();
-			} else {
-				the_post_thumbnail( 'twentyfourteen-full-width' );
-			}
+	if ( has_post_thumbnail() ) :
+		if ( 'grid' == get_theme_mod( 'featured_content_layout' ) ) {
+			the_post_thumbnail();
+		} else {
+			the_post_thumbnail( 'twentyfourteen-full-width' );
+		}
 		endif;
 	?>
 	</a>
@@ -29,6 +29,6 @@
 		</div><!-- .entry-meta -->
 		<?php endif; ?>
 
-		<?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">','</a></h1>' ); ?>
+		<?php the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' ); ?>
 	</header><!-- .entry-header -->
 </article><!-- #post-## -->
diff --git a/wp-content/themes/twentyfourteen/content-gallery.php b/wp-content/themes/twentyfourteen/content-gallery.php
index 6e3fe83249..db382fef7f 100644
--- a/wp-content/themes/twentyfourteen/content-gallery.php
+++ b/wp-content/themes/twentyfourteen/content-gallery.php
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -44,17 +44,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfourteen/content-image.php b/wp-content/themes/twentyfourteen/content-image.php
index a81e493d06..11aa1e8fd8 100644
--- a/wp-content/themes/twentyfourteen/content-image.php
+++ b/wp-content/themes/twentyfourteen/content-image.php
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -44,17 +44,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfourteen/content-link.php b/wp-content/themes/twentyfourteen/content-link.php
index 858301efc1..5c97986315 100644
--- a/wp-content/themes/twentyfourteen/content-link.php
+++ b/wp-content/themes/twentyfourteen/content-link.php
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -44,17 +44,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfourteen/content-page.php b/wp-content/themes/twentyfourteen/content-page.php
index 98394190b3..6a33baa706 100644
--- a/wp-content/themes/twentyfourteen/content-page.php
+++ b/wp-content/themes/twentyfourteen/content-page.php
@@ -18,12 +18,14 @@
 	<div class="entry-content">
 		<?php
 			the_content();
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 
 			edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' );
 		?>
diff --git a/wp-content/themes/twentyfourteen/content-quote.php b/wp-content/themes/twentyfourteen/content-quote.php
index 10a5d1122b..fa0b899268 100644
--- a/wp-content/themes/twentyfourteen/content-quote.php
+++ b/wp-content/themes/twentyfourteen/content-quote.php
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -44,17 +44,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfourteen/content-video.php b/wp-content/themes/twentyfourteen/content-video.php
index 4c49aaa145..951a13cffa 100644
--- a/wp-content/themes/twentyfourteen/content-video.php
+++ b/wp-content/themes/twentyfourteen/content-video.php
@@ -19,8 +19,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -44,17 +44,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyfourteen/content.php b/wp-content/themes/twentyfourteen/content.php
index e571d8b38a..03eb3e89dc 100644
--- a/wp-content/themes/twentyfourteen/content.php
+++ b/wp-content/themes/twentyfourteen/content.php
@@ -21,8 +21,8 @@
 		<?php
 			endif;
 
-			if ( is_single() ) :
-				the_title( '<h1 class="entry-title">', '</h1>' );
+if ( is_single() ) :
+	the_title( '<h1 class="entry-title">', '</h1>' );
 			else :
 				the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
 			endif;
@@ -30,10 +30,11 @@
 
 		<div class="entry-meta">
 			<?php
-				if ( 'post' == get_post_type() )
-					twentyfourteen_posted_on();
+			if ( 'post' == get_post_type() ) {
+				twentyfourteen_posted_on();
+			}
 
-				if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+			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
@@ -52,17 +53,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 	<?php endif; ?>
diff --git a/wp-content/themes/twentyfourteen/featured-content.php b/wp-content/themes/twentyfourteen/featured-content.php
index c56edf3e24..f9f32dd33b 100644
--- a/wp-content/themes/twentyfourteen/featured-content.php
+++ b/wp-content/themes/twentyfourteen/featured-content.php
@@ -19,11 +19,11 @@
 		do_action( 'twentyfourteen_featured_posts_before' );
 
 		$featured_posts = twentyfourteen_get_featured_posts();
-		foreach ( (array) $featured_posts as $order => $post ) :
-			setup_postdata( $post );
+	foreach ( (array) $featured_posts as $order => $post ) :
+		setup_postdata( $post );
 
-			// Include the featured content template.
-			get_template_part( 'content', 'featured-post' );
+		// Include the featured content template.
+		get_template_part( 'content', 'featured-post' );
 		endforeach;
 
 		/**
diff --git a/wp-content/themes/twentyfourteen/footer.php b/wp-content/themes/twentyfourteen/footer.php
index 519e1288e3..0193c64777 100644
--- a/wp-content/themes/twentyfourteen/footer.php
+++ b/wp-content/themes/twentyfourteen/footer.php
@@ -25,4 +25,4 @@
 
 	<?php wp_footer(); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/wp-content/themes/twentyfourteen/functions.php b/wp-content/themes/twentyfourteen/functions.php
index 2946d19ddb..49deb790ba 100644
--- a/wp-content/themes/twentyfourteen/functions.php
+++ b/wp-content/themes/twentyfourteen/functions.php
@@ -44,79 +44,101 @@ if ( version_compare( $GLOBALS['wp_version'], '3.6', '<' ) ) {
 }
 
 if ( ! function_exists( 'twentyfourteen_setup' ) ) :
-/**
- * Twenty Fourteen setup.
- *
- * Set up theme defaults and registers support for various WordPress features.
- *
- * Note that this function is hooked into the after_setup_theme hook, which
- * runs before the init hook. The init hook is too late for some features, such
- * as indicating support post thumbnails.
- *
- * @since Twenty Fourteen 1.0
- */
-function twentyfourteen_setup() {
-
-	/*
-	 * Make Twenty Fourteen available for translation.
+	/**
+	 * Twenty Fourteen setup.
 	 *
-	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfourteen
-	 * If you're building a theme based on Twenty Fourteen, use a find and
-	 * replace to change 'twentyfourteen' to the name of your theme in all
-	 * template files.
+	 * Set up theme defaults and registers support for various WordPress features.
+	 *
+	 * Note that this function is hooked into the after_setup_theme hook, which
+	 * runs before the init hook. The init hook is too late for some features, such
+	 * as indicating support post thumbnails.
+	 *
+	 * @since Twenty Fourteen 1.0
 	 */
-	load_theme_textdomain( 'twentyfourteen' );
+	function twentyfourteen_setup() {
 
-	// This theme styles the visual editor to resemble the theme style.
-	add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css' ) );
+		/*
+		 * Make Twenty Fourteen available for translation.
+		 *
+		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentyfourteen
+		 * If you're building a theme based on Twenty Fourteen, use a find and
+		 * replace to change 'twentyfourteen' to the name of your theme in all
+		 * template files.
+		 */
+		load_theme_textdomain( 'twentyfourteen' );
 
-	// Add RSS feed links to <head> for posts and comments.
-	add_theme_support( 'automatic-feed-links' );
+		// This theme styles the visual editor to resemble the theme style.
+		add_editor_style( array( 'css/editor-style.css', twentyfourteen_font_url(), 'genericons/genericons.css' ) );
 
-	// Enable support for Post Thumbnails, and declare two sizes.
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 672, 372, true );
-	add_image_size( 'twentyfourteen-full-width', 1038, 576, true );
+		// Add RSS feed links to <head> for posts and comments.
+		add_theme_support( 'automatic-feed-links' );
 
-	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary'   => __( 'Top primary menu', 'twentyfourteen' ),
-		'secondary' => __( 'Secondary menu in left sidebar', 'twentyfourteen' ),
-	) );
+		// Enable support for Post Thumbnails, and declare two sizes.
+		add_theme_support( 'post-thumbnails' );
+		set_post_thumbnail_size( 672, 372, true );
+		add_image_size( 'twentyfourteen-full-width', 1038, 576, true );
 
-	/*
-	 * Switch default core markup for search form, comment form, and comments
-	 * to output valid HTML5.
-	 */
-	add_theme_support( 'html5', array(
-		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+		// This theme uses wp_nav_menu() in two locations.
+		register_nav_menus(
+			array(
+				'primary'   => __( 'Top primary menu', 'twentyfourteen' ),
+				'secondary' => __( 'Secondary menu in left sidebar', 'twentyfourteen' ),
+			)
+		);
 
-	/*
-	 * Enable support for Post Formats.
-	 * See https://codex.wordpress.org/Post_Formats
-	 */
-	add_theme_support( 'post-formats', array(
-		'aside', 'image', 'video', 'audio', 'quote', 'link', 'gallery',
-	) );
+		/*
+		 * Switch default core markup for search form, comment form, and comments
+		 * to output valid HTML5.
+		 */
+		add_theme_support(
+			'html5', array(
+				'search-form',
+				'comment-form',
+				'comment-list',
+				'gallery',
+				'caption',
+			)
+		);
 
-	// This theme allows users to set a custom background.
-	add_theme_support( 'custom-background', apply_filters( 'twentyfourteen_custom_background_args', array(
-		'default-color' => 'f5f5f5',
-	) ) );
+		/*
+		 * Enable support for Post Formats.
+		 * See https://codex.wordpress.org/Post_Formats
+		 */
+		add_theme_support(
+			'post-formats', array(
+				'aside',
+				'image',
+				'video',
+				'audio',
+				'quote',
+				'link',
+				'gallery',
+			)
+		);
 
-	// Add support for featured content.
-	add_theme_support( 'featured-content', array(
-		'featured_content_filter' => 'twentyfourteen_get_featured_posts',
-		'max_posts' => 6,
-	) );
+		// This theme allows users to set a custom background.
+		add_theme_support(
+			'custom-background', apply_filters(
+				'twentyfourteen_custom_background_args', array(
+					'default-color' => 'f5f5f5',
+				)
+			)
+		);
 
-	// This theme uses its own gallery styles.
-	add_filter( 'use_default_gallery_style', '__return_false' );
+		// Add support for featured content.
+		add_theme_support(
+			'featured-content', array(
+				'featured_content_filter' => 'twentyfourteen_get_featured_posts',
+				'max_posts'               => 6,
+			)
+		);
 
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
+		// This theme uses its own gallery styles.
+		add_filter( 'use_default_gallery_style', '__return_false' );
+
+		// Indicate widget sidebars can use selective refresh in the Customizer.
+		add_theme_support( 'customize-selective-refresh-widgets' );
+	}
 endif; // twentyfourteen_setup
 add_action( 'after_setup_theme', 'twentyfourteen_setup' );
 
@@ -170,33 +192,39 @@ function twentyfourteen_widgets_init() {
 	require get_template_directory() . '/inc/widgets.php';
 	register_widget( 'Twenty_Fourteen_Ephemera_Widget' );
 
-	register_sidebar( array(
-		'name'          => __( 'Primary Sidebar', 'twentyfourteen' ),
-		'id'            => 'sidebar-1',
-		'description'   => __( 'Main sidebar that appears on the left.', 'twentyfourteen' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</aside>',
-		'before_title'  => '<h1 class="widget-title">',
-		'after_title'   => '</h1>',
-	) );
-	register_sidebar( array(
-		'name'          => __( 'Content Sidebar', 'twentyfourteen' ),
-		'id'            => 'sidebar-2',
-		'description'   => __( 'Additional sidebar that appears on the right.', 'twentyfourteen' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</aside>',
-		'before_title'  => '<h1 class="widget-title">',
-		'after_title'   => '</h1>',
-	) );
-	register_sidebar( array(
-		'name'          => __( 'Footer Widget Area', 'twentyfourteen' ),
-		'id'            => 'sidebar-3',
-		'description'   => __( 'Appears in the footer section of the site.', 'twentyfourteen' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</aside>',
-		'before_title'  => '<h1 class="widget-title">',
-		'after_title'   => '</h1>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Primary Sidebar', 'twentyfourteen' ),
+			'id'            => 'sidebar-1',
+			'description'   => __( 'Main sidebar that appears on the left.', 'twentyfourteen' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h1 class="widget-title">',
+			'after_title'   => '</h1>',
+		)
+	);
+	register_sidebar(
+		array(
+			'name'          => __( 'Content Sidebar', 'twentyfourteen' ),
+			'id'            => 'sidebar-2',
+			'description'   => __( 'Additional sidebar that appears on the right.', 'twentyfourteen' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h1 class="widget-title">',
+			'after_title'   => '</h1>',
+		)
+	);
+	register_sidebar(
+		array(
+			'name'          => __( 'Footer Widget Area', 'twentyfourteen' ),
+			'id'            => 'sidebar-3',
+			'description'   => __( 'Appears in the footer section of the site.', 'twentyfourteen' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h1 class="widget-title">',
+			'after_title'   => '</h1>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentyfourteen_widgets_init' );
 
@@ -218,7 +246,7 @@ function twentyfourteen_font_url() {
 			'family' => urlencode( 'Lato:300,400,700,900,300italic,400italic,700italic' ),
 			'subset' => urlencode( 'latin,latin-ext' ),
 		);
-		$font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
 	}
 
 	return $font_url;
@@ -257,10 +285,12 @@ 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(
-			'prevText' => __( 'Previous', 'twentyfourteen' ),
-			'nextText' => __( 'Next', 'twentyfourteen' )
-		) );
+		wp_localize_script(
+			'twentyfourteen-slider', 'featuredSliderDefaults', array(
+				'prevText' => __( 'Previous', 'twentyfourteen' ),
+				'nextText' => __( 'Next', 'twentyfourteen' ),
+			)
+		);
 	}
 
 	wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150315', true );
@@ -303,96 +333,99 @@ function twentyfourteen_resource_hints( $urls, $relation_type ) {
 add_filter( 'wp_resource_hints', 'twentyfourteen_resource_hints', 10, 2 );
 
 if ( ! function_exists( 'twentyfourteen_the_attached_image' ) ) :
-/**
- * Print the attached image with a link to the next attached image.
- *
- * @since Twenty Fourteen 1.0
- */
-function twentyfourteen_the_attached_image() {
-	$post                = get_post();
 	/**
-	 * Filter the default Twenty Fourteen attachment size.
+	 * Print the attached image with a link to the next attached image.
 	 *
 	 * @since Twenty Fourteen 1.0
-	 *
-	 * @param array $dimensions {
-	 *     An array of height and width dimensions.
-	 *
-	 *     @type int $height Height of the image in pixels. Default 810.
-	 *     @type int $width  Width of the image in pixels. Default 810.
-	 * }
 	 */
-	$attachment_size     = apply_filters( 'twentyfourteen_attachment_size', array( 810, 810 ) );
-	$next_attachment_url = wp_get_attachment_url();
+	function twentyfourteen_the_attached_image() {
+		$post = get_post();
+		/**
+		 * Filter the default Twenty Fourteen attachment size.
+		 *
+		 * @since Twenty Fourteen 1.0
+		 *
+		 * @param array $dimensions {
+		 *     An array of height and width dimensions.
+		 *
+		 *     @type int $height Height of the image in pixels. Default 810.
+		 *     @type int $width  Width of the image in pixels. Default 810.
+		 * }
+		 */
+		$attachment_size     = apply_filters( 'twentyfourteen_attachment_size', array( 810, 810 ) );
+		$next_attachment_url = wp_get_attachment_url();
 
-	/*
-	 * 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.
-	 */
-	$attachment_ids = get_posts( array(
-		'post_parent'    => $post->post_parent,
-		'fields'         => 'ids',
-		'numberposts'    => -1,
-		'post_status'    => 'inherit',
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image',
-		'order'          => 'ASC',
-		'orderby'        => 'menu_order ID',
-	) );
+		/*
+		 * 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.
+		 */
+		$attachment_ids = get_posts(
+			array(
+				'post_parent'    => $post->post_parent,
+				'fields'         => 'ids',
+				'numberposts'    => -1,
+				'post_status'    => 'inherit',
+				'post_type'      => 'attachment',
+				'post_mime_type' => 'image',
+				'order'          => 'ASC',
+				'orderby'        => 'menu_order ID',
+			)
+		);
 
-	// If there is more than 1 attachment in a gallery...
-	if ( count( $attachment_ids ) > 1 ) {
-		foreach ( $attachment_ids as $idx => $attachment_id ) {
-			if ( $attachment_id == $post->ID ) {
-				$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
-				break;
+		// If there is more than 1 attachment in a gallery...
+		if ( count( $attachment_ids ) > 1 ) {
+			foreach ( $attachment_ids as $idx => $attachment_id ) {
+				if ( $attachment_id == $post->ID ) {
+					$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
+					break;
+				}
+			}
+
+			// get the URL of the next image attachment...
+			if ( $next_id ) {
+				$next_attachment_url = get_attachment_link( $next_id );
+			} // or get the URL of the first image attachment.
+			else {
+				$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
 			}
 		}
 
-		// get the URL of the next image attachment...
-		if ( $next_id ) {
-			$next_attachment_url = get_attachment_link( $next_id );
-		}
-
-		// or get the URL of the first image attachment.
-		else {
-			$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
-		}
+		printf(
+			'<a href="%1$s" rel="attachment">%2$s</a>',
+			esc_url( $next_attachment_url ),
+			wp_get_attachment_image( $post->ID, $attachment_size )
+		);
 	}
-
-	printf( '<a href="%1$s" rel="attachment">%2$s</a>',
-		esc_url( $next_attachment_url ),
-		wp_get_attachment_image( $post->ID, $attachment_size )
-	);
-}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_list_authors' ) ) :
-/**
- * Print a list of all site contributors who published at least one post.
- *
- * @since Twenty Fourteen 1.0
- */
-function twentyfourteen_list_authors() {
-	$contributor_ids = get_users( array(
-		'fields'  => 'ID',
-		'orderby' => 'post_count',
-		'order'   => 'DESC',
-		'who'     => 'authors',
-	) );
+	/**
+	 * Print a list of all site contributors who published at least one post.
+	 *
+	 * @since Twenty Fourteen 1.0
+	 */
+	function twentyfourteen_list_authors() {
+		$contributor_ids = get_users(
+			array(
+				'fields'  => 'ID',
+				'orderby' => 'post_count',
+				'order'   => 'DESC',
+				'who'     => 'authors',
+			)
+		);
 
-	foreach ( $contributor_ids as $contributor_id ) :
-		$post_count = count_user_posts( $contributor_id );
+		foreach ( $contributor_ids as $contributor_id ) :
+			$post_count = count_user_posts( $contributor_id );
 
-		// Move on if user has not published a post (yet).
-		if ( ! $post_count ) {
-			continue;
-		}
-	?>
+			// Move on if user has not published a post (yet).
+			if ( ! $post_count ) {
+				continue;
+			}
+		?>
 
-	<div class="contributor">
+		<div class="contributor">
 		<div class="contributor-info">
 			<div class="contributor-avatar"><?php echo get_avatar( $contributor_id, 132 ); ?></div>
 			<div class="contributor-summary">
@@ -409,7 +442,7 @@ function twentyfourteen_list_authors() {
 
 	<?php
 	endforeach;
-}
+	}
 endif;
 
 /**
@@ -574,9 +607,9 @@ if ( ! class_exists( 'Featured_Content' ) && 'plugins.php' !== $GLOBALS['pagenow
  * `is_customize_preview` function was introduced.
  */
 if ( ! function_exists( 'is_customize_preview' ) ) :
-function is_customize_preview() {
-	global $wp_customize;
+	function is_customize_preview() {
+		global $wp_customize;
 
-	return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
-}
+		return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
+	}
 endif;
diff --git a/wp-content/themes/twentyfourteen/header.php b/wp-content/themes/twentyfourteen/header.php
index 7286d88938..4dec164aee 100644
--- a/wp-content/themes/twentyfourteen/header.php
+++ b/wp-content/themes/twentyfourteen/header.php
@@ -51,7 +51,15 @@
 			<nav id="primary-navigation" class="site-navigation primary-navigation" role="navigation">
 				<button class="menu-toggle"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></button>
 				<a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></a>
-				<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu' ) ); ?>
+				<?php
+				wp_nav_menu(
+					array(
+						'theme_location' => 'primary',
+						'menu_class'     => 'nav-menu',
+						'menu_id'        => 'primary-menu',
+					)
+				);
+?>
 			</nav>
 		</div>
 
diff --git a/wp-content/themes/twentyfourteen/image.php b/wp-content/themes/twentyfourteen/image.php
index 83ac67f68d..999800fa2c 100644
--- a/wp-content/themes/twentyfourteen/image.php
+++ b/wp-content/themes/twentyfourteen/image.php
@@ -18,45 +18,48 @@ get_header();
 
 	<?php
 		// Start the Loop.
-		while ( have_posts() ) : the_post();
+	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>' ); ?>
+		<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<header class="entry-header">
+				<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
 
-					<div class="entry-meta">
+				<div class="entry-meta">
 
-						<span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
+					<span class="entry-date"><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>"><?php echo esc_html( get_the_date() ); ?></time></span>
 
-						<span class="full-size-link"><a href="<?php echo esc_url( wp_get_attachment_url() ); ?>"><?php echo esc_html( $metadata['width'] ); ?> &times; <?php echo esc_html( $metadata['height'] ); ?></a></span>
+					<span class="full-size-link"><a href="<?php echo esc_url( wp_get_attachment_url() ); ?>"><?php echo esc_html( $metadata['width'] ); ?> &times; <?php echo esc_html( $metadata['height'] ); ?></a></span>
 
-						<span class="parent-post-link"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
-						<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
-					</div><!-- .entry-meta -->
-				</header><!-- .entry-header -->
+					<span class="parent-post-link"><a href="<?php echo esc_url( get_permalink( $post->post_parent ) ); ?>" rel="gallery"><?php echo get_the_title( $post->post_parent ); ?></a></span>
+					<?php edit_post_link( __( 'Edit', 'twentyfourteen' ), '<span class="edit-link">', '</span>' ); ?>
+				</div><!-- .entry-meta -->
+			</header><!-- .entry-header -->
 
-				<div class="entry-content">
-					<div class="entry-attachment">
-						<div class="attachment">
-							<?php twentyfourteen_the_attached_image(); ?>
-						</div><!-- .attachment -->
+			<div class="entry-content">
+				<div class="entry-attachment">
+					<div class="attachment">
+						<?php twentyfourteen_the_attached_image(); ?>
+					</div><!-- .attachment -->
 
-						<?php if ( has_excerpt() ) : ?>
+					<?php if ( has_excerpt() ) : ?>
 						<div class="entry-caption">
 							<?php the_excerpt(); ?>
 						</div><!-- .entry-caption -->
 						<?php endif; ?>
-					</div><!-- .entry-attachment -->
+				</div><!-- .entry-attachment -->
 
-					<?php
-						the_content();
-						wp_link_pages( array(
+				<?php
+					the_content();
+					wp_link_pages(
+						array(
 							'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentyfourteen' ) . '</span>',
 							'after'       => '</div>',
 							'link_before' => '<span>',
 							'link_after'  => '</span>',
-						) );
-					?>
+						)
+					);
+				?>
 				</div><!-- .entry-content -->
 			</article><!-- #post-## -->
 
diff --git a/wp-content/themes/twentyfourteen/inc/back-compat.php b/wp-content/themes/twentyfourteen/inc/back-compat.php
index c184d912c7..3943aeefc7 100644
--- a/wp-content/themes/twentyfourteen/inc/back-compat.php
+++ b/wp-content/themes/twentyfourteen/inc/back-compat.php
@@ -44,9 +44,11 @@ function twentyfourteen_upgrade_notice() {
  * @since Twenty Fourteen 1.0
  */
 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(
-		'back_link' => true,
-	) );
+	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(
+			'back_link' => true,
+		)
+	);
 }
 add_action( 'load-customize.php', 'twentyfourteen_customize' );
 
diff --git a/wp-content/themes/twentyfourteen/inc/custom-header.php b/wp-content/themes/twentyfourteen/inc/custom-header.php
index 287b10682d..bfea8976c1 100644
--- a/wp-content/themes/twentyfourteen/inc/custom-header.php
+++ b/wp-content/themes/twentyfourteen/inc/custom-header.php
@@ -35,36 +35,40 @@ function twentyfourteen_custom_header_setup() {
 	 *                                          the Appearance > Header screen.
 	 * }
 	 */
-	add_theme_support( 'custom-header', apply_filters( 'twentyfourteen_custom_header_args', array(
-		'default-text-color'     => 'fff',
-		'width'                  => 1260,
-		'height'                 => 240,
-		'flex-height'            => true,
-		'wp-head-callback'       => 'twentyfourteen_header_style',
-		'admin-head-callback'    => 'twentyfourteen_admin_header_style',
-		'admin-preview-callback' => 'twentyfourteen_admin_header_image',
-	) ) );
+	add_theme_support(
+		'custom-header', apply_filters(
+			'twentyfourteen_custom_header_args', array(
+				'default-text-color'     => 'fff',
+				'width'                  => 1260,
+				'height'                 => 240,
+				'flex-height'            => true,
+				'wp-head-callback'       => 'twentyfourteen_header_style',
+				'admin-head-callback'    => 'twentyfourteen_admin_header_style',
+				'admin-preview-callback' => 'twentyfourteen_admin_header_image',
+			)
+		)
+	);
 }
 add_action( 'after_setup_theme', 'twentyfourteen_custom_header_setup' );
 
 if ( ! function_exists( 'twentyfourteen_header_style' ) ) :
-/**
- * Styles the header image and text displayed on the blog
- *
- * @see twentyfourteen_custom_header_setup().
- *
- */
-function twentyfourteen_header_style() {
-	$text_color = get_header_textcolor();
+	/**
+	 * Styles the header image and text displayed on the blog
+	 *
+	 * @see twentyfourteen_custom_header_setup().
+	 */
+	function twentyfourteen_header_style() {
+		$text_color = get_header_textcolor();
 
-	// If no custom color for text is set, let's bail.
-	if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) )
-		return;
+		// If no custom color for text is set, let's bail.
+		if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles.
-	?>
-	<style type="text/css" id="twentyfourteen-header-css">
-	<?php
+		// If we get this far, we have custom styles.
+		?>
+		<style type="text/css" id="twentyfourteen-header-css">
+		<?php
 		// Has the text been hidden?
 		if ( ! display_header_text() ) :
 	?>
@@ -84,20 +88,20 @@ function twentyfourteen_header_style() {
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // twentyfourteen_header_style
 
 
 if ( ! function_exists( 'twentyfourteen_admin_header_style' ) ) :
-/**
- * Style the header image displayed on the Appearance > Header screen.
- *
- * @see twentyfourteen_custom_header_setup()
- *
- * @since Twenty Fourteen 1.0
- */
-function twentyfourteen_admin_header_style() {
-?>
+	/**
+	 * Style the header image displayed on the Appearance > Header screen.
+	 *
+	 * @see twentyfourteen_custom_header_setup()
+	 *
+	 * @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;
@@ -122,20 +126,20 @@ function twentyfourteen_admin_header_style() {
 		vertical-align: middle;
 	}
 	</style>
-<?php
-}
+	<?php
+	}
 endif; // twentyfourteen_admin_header_style
 
 if ( ! function_exists( 'twentyfourteen_admin_header_image' ) ) :
-/**
- * Create the custom header image markup displayed on the Appearance > Header screen.
- *
- * @see twentyfourteen_custom_header_setup()
- *
- * @since Twenty Fourteen 1.0
- */
-function twentyfourteen_admin_header_image() {
-?>
+	/**
+	 * Create the custom header image markup displayed on the Appearance > Header screen.
+	 *
+	 * @see twentyfourteen_custom_header_setup()
+	 *
+	 * @since Twenty Fourteen 1.0
+	 */
+	function twentyfourteen_admin_header_image() {
+	?>
 	<div id="headimg">
 		<?php if ( get_header_image() ) : ?>
 		<img src="<?php header_image(); ?>" alt="">
@@ -143,5 +147,5 @@ function twentyfourteen_admin_header_image() {
 		<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
-}
+	}
 endif; // twentyfourteen_admin_header_image
diff --git a/wp-content/themes/twentyfourteen/inc/customizer.php b/wp-content/themes/twentyfourteen/inc/customizer.php
index 39289159b5..5a41f188da 100644
--- a/wp-content/themes/twentyfourteen/inc/customizer.php
+++ b/wp-content/themes/twentyfourteen/inc/customizer.php
@@ -16,21 +16,25 @@
  */
 function twentyfourteen_customize_register( $wp_customize ) {
 	// Add postMessage support for site title and description.
-	$wp_customize->get_setting( 'blogname' )->transport          = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport   = 'postMessage';
-	$wp_customize->get_setting( 'header_textcolor' )->transport  = 'postMessage';
+	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
+	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
+	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
-			'selector' => '.site-title a',
-			'container_inclusive' => false,
-			'render_callback' => 'twentyfourteen_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-			'selector' => '.site-description',
-			'container_inclusive' => false,
-			'render_callback' => 'twentyfourteen_customize_partial_blogdescription',
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'blogname', array(
+				'selector'            => '.site-title a',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentyfourteen_customize_partial_blogname',
+			)
+		);
+		$wp_customize->selective_refresh->add_partial(
+			'blogdescription', array(
+				'selector'            => '.site-description',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentyfourteen_customize_partial_blogdescription',
+			)
+		);
 	}
 
 	// Rename the label to "Site Title Color" because this only affects the site title in this theme.
@@ -49,31 +53,38 @@ 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(
-		'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' ),
-			esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ),
-			admin_url( 'edit.php?show_sticky=1' )
-		),
-		'priority'        => 130,
-		'active_callback' => 'is_front_page',
-	) );
+	$wp_customize->add_section(
+		'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' ),
+				esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ),
+				admin_url( 'edit.php?show_sticky=1' )
+			),
+			'priority'        => 130,
+			'active_callback' => 'is_front_page',
+		)
+	);
 
 	// Add the featured content layout setting and control.
-	$wp_customize->add_setting( 'featured_content_layout', array(
-		'default'           => 'grid',
-		'sanitize_callback' => 'twentyfourteen_sanitize_layout',
-	) );
+	$wp_customize->add_setting(
+		'featured_content_layout', array(
+			'default'           => 'grid',
+			'sanitize_callback' => 'twentyfourteen_sanitize_layout',
+		)
+	);
 
-	$wp_customize->add_control( 'featured_content_layout', array(
-		'label'   => __( 'Layout', 'twentyfourteen' ),
-		'section' => 'featured_content',
-		'type'    => 'select',
-		'choices' => array(
-			'grid'   => __( 'Grid',   'twentyfourteen' ),
-			'slider' => __( 'Slider', 'twentyfourteen' ),
-		),
-	) );
+	$wp_customize->add_control(
+		'featured_content_layout', array(
+			'label'   => __( 'Layout', 'twentyfourteen' ),
+			'section' => 'featured_content',
+			'type'    => 'select',
+			'choices' => array(
+				'grid'   => __( 'Grid', 'twentyfourteen' ),
+				'slider' => __( 'Slider', 'twentyfourteen' ),
+			),
+		)
+	);
 }
 add_action( 'customize_register', 'twentyfourteen_customize_register' );
 
@@ -137,16 +148,18 @@ function twentyfourteen_contextual_help() {
 		return;
 	}
 
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'twentyfourteen',
-		'title'   => __( 'Twenty Fourteen', 'twentyfourteen' ),
-		'content' =>
-			'<ul>' .
-				'<li>' . sprintf( __( 'The home page features your choice of up to 6 posts prominently displayed in a grid or slider, controlled by a <a href="%1$s">tag</a>; you can change the tag and layout in <a href="%2$s">Appearance &rarr; Customize</a>. If no posts match the tag, <a href="%3$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ), esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ), admin_url( 'customize.php' ), admin_url( 'edit.php?show_sticky=1' ) ) . '</li>' .
-				'<li>' . sprintf( __( 'Enhance your site design by using <a href="%s">Featured Images</a> for posts you&rsquo;d like to stand out (also known as post thumbnails). This allows you to associate an image with your post without inserting it. Twenty Fourteen uses featured images for posts and pages&mdash;above the title&mdash;and in the Featured Content area on the home page.', 'twentyfourteen' ), 'https://codex.wordpress.org/Post_Thumbnails#Setting_a_Post_Thumbnail' ) . '</li>' .
-				'<li>' . sprintf( __( 'For an in-depth tutorial, and more tips and tricks, visit the <a href="%s">Twenty Fourteen documentation</a>.', 'twentyfourteen' ), 'https://codex.wordpress.org/Twenty_Fourteen' ) . '</li>' .
-			'</ul>',
-	) );
+	get_current_screen()->add_help_tab(
+		array(
+			'id'      => 'twentyfourteen',
+			'title'   => __( 'Twenty Fourteen', 'twentyfourteen' ),
+			'content' =>
+				'<ul>' .
+					'<li>' . sprintf( __( 'The home page features your choice of up to 6 posts prominently displayed in a grid or slider, controlled by a <a href="%1$s">tag</a>; you can change the tag and layout in <a href="%2$s">Appearance &rarr; Customize</a>. If no posts match the tag, <a href="%3$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ), esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ), admin_url( 'customize.php' ), admin_url( 'edit.php?show_sticky=1' ) ) . '</li>' .
+					'<li>' . sprintf( __( 'Enhance your site design by using <a href="%s">Featured Images</a> for posts you&rsquo;d like to stand out (also known as post thumbnails). This allows you to associate an image with your post without inserting it. Twenty Fourteen uses featured images for posts and pages&mdash;above the title&mdash;and in the Featured Content area on the home page.', 'twentyfourteen' ), 'https://codex.wordpress.org/Post_Thumbnails#Setting_a_Post_Thumbnail' ) . '</li>' .
+					'<li>' . sprintf( __( 'For an in-depth tutorial, and more tips and tricks, visit the <a href="%s">Twenty Fourteen documentation</a>.', 'twentyfourteen' ), 'https://codex.wordpress.org/Twenty_Fourteen' ) . '</li>' .
+				'</ul>',
+		)
+	);
 }
 add_action( 'admin_head-themes.php', 'twentyfourteen_contextual_help' );
-add_action( 'admin_head-edit.php',   'twentyfourteen_contextual_help' );
+add_action( 'admin_head-edit.php', 'twentyfourteen_contextual_help' );
diff --git a/wp-content/themes/twentyfourteen/inc/featured-content.php b/wp-content/themes/twentyfourteen/inc/featured-content.php
index ffeb993db8..424e134b99 100644
--- a/wp-content/themes/twentyfourteen/inc/featured-content.php
+++ b/wp-content/themes/twentyfourteen/inc/featured-content.php
@@ -83,15 +83,15 @@ class Featured_Content {
 			self::$max_posts = absint( $theme_support[0]['max_posts'] );
 		}
 
-		add_filter( $filter,                              array( __CLASS__, 'get_featured_posts' )    );
-		add_action( 'customize_register',                 array( __CLASS__, 'customize_register' ), 9 );
-		add_action( 'admin_init',                         array( __CLASS__, 'register_setting'   )    );
-		add_action( 'switch_theme',                       array( __CLASS__, 'delete_transient'   )    );
-		add_action( 'save_post',                          array( __CLASS__, 'delete_transient'   )    );
-		add_action( 'delete_post_tag',                    array( __CLASS__, 'delete_post_tag'    )    );
-		add_action( 'customize_controls_enqueue_scripts', array( __CLASS__, 'enqueue_scripts'    )    );
-		add_action( 'pre_get_posts',                      array( __CLASS__, 'pre_get_posts'      )    );
-		add_action( 'wp_loaded',                          array( __CLASS__, 'wp_loaded'          )    );
+		add_filter( $filter, array( __CLASS__, 'get_featured_posts' ) );
+		add_action( 'customize_register', array( __CLASS__, 'customize_register' ), 9 );
+		add_action( 'admin_init', array( __CLASS__, 'register_setting' ) );
+		add_action( 'switch_theme', array( __CLASS__, 'delete_transient' ) );
+		add_action( 'save_post', array( __CLASS__, 'delete_transient' ) );
+		add_action( 'delete_post_tag', array( __CLASS__, 'delete_post_tag' ) );
+		add_action( 'customize_controls_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
+		add_action( 'pre_get_posts', array( __CLASS__, 'pre_get_posts' ) );
+		add_action( 'wp_loaded', array( __CLASS__, 'wp_loaded' ) );
 	}
 
 	/**
@@ -106,7 +106,7 @@ class Featured_Content {
 	 */
 	public static function wp_loaded() {
 		if ( self::get_setting( 'hide-tag' ) ) {
-			add_filter( 'get_terms',     array( __CLASS__, 'hide_featured_term'     ), 10, 3 );
+			add_filter( 'get_terms', array( __CLASS__, 'hide_featured_term' ), 10, 3 );
 			add_filter( 'get_the_terms', array( __CLASS__, 'hide_the_featured_term' ), 10, 3 );
 		}
 	}
@@ -128,10 +128,12 @@ class Featured_Content {
 			return array();
 		}
 
-		$featured_posts = get_posts( array(
-			'include'        => $post_ids,
-			'posts_per_page' => count( $post_ids ),
-		) );
+		$featured_posts = get_posts(
+			array(
+				'include'        => $post_ids,
+				'posts_per_page' => count( $post_ids ),
+			)
+		);
 
 		return $featured_posts;
 	}
@@ -160,18 +162,20 @@ class Featured_Content {
 
 			if ( $term ) {
 				// Query for featured posts.
-				$featured_ids = get_posts( array(
-					'fields'           => 'ids',
-					'numberposts'      => self::$max_posts,
-					'suppress_filters' => false,
-					'tax_query'        => array(
-						array(
-							'field'    => 'term_id',
-							'taxonomy' => 'post_tag',
-							'terms'    => $term->term_id,
+				$featured_ids = get_posts(
+					array(
+						'fields'           => 'ids',
+						'numberposts'      => self::$max_posts,
+						'suppress_filters' => false,
+						'tax_query'        => array(
+							array(
+								'field'    => 'term_id',
+								'taxonomy' => 'post_tag',
+								'terms'    => $term->term_id,
+							),
 						),
-					),
-				) );
+					)
+				);
 			}
 
 			// Get sticky posts if no Featured Content exists.
@@ -283,7 +287,7 @@ class Featured_Content {
 		}
 
 		$settings['tag-id'] = 0;
-		$settings = self::validate_settings( $settings );
+		$settings           = self::validate_settings( $settings );
 		update_option( 'featured-content', $settings );
 	}
 
@@ -399,40 +403,51 @@ class Featured_Content {
 	 * @param WP_Customize_Manager $wp_customize Customizer object.
 	 */
 	public static function customize_register( $wp_customize ) {
-		$wp_customize->add_section( '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' ),
-				esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ),
-				admin_url( 'edit.php?show_sticky=1' )
-			),
-			'priority'       => 130,
-			'theme_supports' => 'featured-content',
-		) );
+		$wp_customize->add_section(
+			'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' ),
+					esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ),
+					admin_url( 'edit.php?show_sticky=1' )
+				),
+				'priority'       => 130,
+				'theme_supports' => 'featured-content',
+			)
+		);
 
 		// Add Featured Content settings.
-		$wp_customize->add_setting( '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(
-			'default'              => true,
-			'type'                 => 'option',
-			'sanitize_js_callback' => array( __CLASS__, 'delete_transient' ),
-		) );
+		$wp_customize->add_setting(
+			'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(
+				'default'              => true,
+				'type'                 => 'option',
+				'sanitize_js_callback' => array( __CLASS__, 'delete_transient' ),
+			)
+		);
 
 		// Add Featured Content controls.
-		$wp_customize->add_control( 'featured-content[tag-name]', array(
-			'label'    => __( 'Tag Name', 'twentyfourteen' ),
-			'section'  => 'featured_content',
-			'priority' => 20,
-		) );
-		$wp_customize->add_control( 'featured-content[hide-tag]', array(
-			'label'    => __( 'Don&rsquo;t display tag on front end.', 'twentyfourteen' ),
-			'section'  => 'featured_content',
-			'type'     => 'checkbox',
-			'priority' => 30,
-		) );
+		$wp_customize->add_control(
+			'featured-content[tag-name]', array(
+				'label'    => __( 'Tag Name', 'twentyfourteen' ),
+				'section'  => 'featured_content',
+				'priority' => 20,
+			)
+		);
+		$wp_customize->add_control(
+			'featured-content[hide-tag]', array(
+				'label'    => __( 'Don&rsquo;t display tag on front end.', 'twentyfourteen' ),
+				'section'  => 'featured_content',
+				'type'     => 'checkbox',
+				'priority' => 30,
+			)
+		);
 	}
 
 	/**
diff --git a/wp-content/themes/twentyfourteen/inc/template-tags.php b/wp-content/themes/twentyfourteen/inc/template-tags.php
index 1d35d0d5b9..893933164f 100644
--- a/wp-content/themes/twentyfourteen/inc/template-tags.php
+++ b/wp-content/themes/twentyfourteen/inc/template-tags.php
@@ -8,53 +8,55 @@
  */
 
 if ( ! function_exists( 'twentyfourteen_paging_nav' ) ) :
-/**
- * Display navigation to next/previous set of posts when applicable.
- *
- * @since Twenty Fourteen 1.0
- *
- * @global WP_Query   $wp_query   WordPress Query object.
- * @global WP_Rewrite $wp_rewrite WordPress Rewrite object.
- */
-function twentyfourteen_paging_nav() {
-	global $wp_query, $wp_rewrite;
+	/**
+	 * Display navigation to next/previous set of posts when applicable.
+	 *
+	 * @since Twenty Fourteen 1.0
+	 *
+	 * @global WP_Query   $wp_query   WordPress Query object.
+	 * @global WP_Rewrite $wp_rewrite WordPress Rewrite object.
+	 */
+	function twentyfourteen_paging_nav() {
+		global $wp_query, $wp_rewrite;
 
-	// Don't print empty markup if there's only one page.
-	if ( $wp_query->max_num_pages < 2 ) {
-		return;
-	}
+		// Don't print empty markup if there's only one page.
+		if ( $wp_query->max_num_pages < 2 ) {
+			return;
+		}
 
-	$paged        = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
-	$pagenum_link = html_entity_decode( get_pagenum_link() );
-	$query_args   = array();
-	$url_parts    = explode( '?', $pagenum_link );
+		$paged        = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
+		$pagenum_link = html_entity_decode( get_pagenum_link() );
+		$query_args   = array();
+		$url_parts    = explode( '?', $pagenum_link );
 
-	if ( isset( $url_parts[1] ) ) {
-		wp_parse_str( $url_parts[1], $query_args );
-	}
+		if ( isset( $url_parts[1] ) ) {
+			wp_parse_str( $url_parts[1], $query_args );
+		}
 
-	$pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
-	$pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
+		$pagenum_link = remove_query_arg( array_keys( $query_args ), $pagenum_link );
+		$pagenum_link = trailingslashit( $pagenum_link ) . '%_%';
 
-	$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
-	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+		$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
+		$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
 
-	// Set up paginated links.
-	$links = paginate_links( array(
-		'base'     => $pagenum_link,
-		'format'   => $format,
-		'total'    => $wp_query->max_num_pages,
-		'current'  => $paged,
-		'mid_size' => 1,
-		'add_args' => array_map( 'urlencode', $query_args ),
-		'prev_text' => __( '&larr; Previous', 'twentyfourteen' ),
-		'next_text' => __( 'Next &rarr;', 'twentyfourteen' ),
-	) );
+		// Set up paginated links.
+		$links = paginate_links(
+			array(
+				'base'      => $pagenum_link,
+				'format'    => $format,
+				'total'     => $wp_query->max_num_pages,
+				'current'   => $paged,
+				'mid_size'  => 1,
+				'add_args'  => array_map( 'urlencode', $query_args ),
+				'prev_text' => __( '&larr; Previous', 'twentyfourteen' ),
+				'next_text' => __( 'Next &rarr;', 'twentyfourteen' ),
+			)
+		);
 
-	if ( $links ) :
+		if ( $links ) :
 
-	?>
-	<nav class="navigation paging-navigation" role="navigation">
+		?>
+		<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; ?>
@@ -62,62 +64,63 @@ function twentyfourteen_paging_nav() {
 	</nav><!-- .navigation -->
 	<?php
 	endif;
-}
+	}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_post_nav' ) ) :
-/**
- * Display navigation to next/previous post when applicable.
- *
- * @since Twenty Fourteen 1.0
- */
-function twentyfourteen_post_nav() {
-	// Don't print empty markup if there's nowhere to navigate.
-	$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
+	/**
+	 * Display navigation to next/previous post when applicable.
+	 *
+	 * @since Twenty Fourteen 1.0
+	 */
+	function twentyfourteen_post_nav() {
+		// Don't print empty markup if there's nowhere to navigate.
+		$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
+		$next     = get_adjacent_post( false, '', false );
 
-	if ( ! $next && ! $previous ) {
-		return;
-	}
+		if ( ! $next && ! $previous ) {
+			return;
+		}
 
-	?>
-	<nav class="navigation post-navigation" role="navigation">
+		?>
+		<nav class="navigation post-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentyfourteen' ); ?></h1>
 		<div class="nav-links">
 			<?php
 			if ( is_attachment() ) :
 				previous_post_link( '%link', __( '<span class="meta-nav">Published In</span>%title', 'twentyfourteen' ) );
-			else :
-				previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
-				next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
-			endif;
-			?>
-		</div><!-- .nav-links -->
-	</nav><!-- .navigation -->
-	<?php
-}
+				else :
+					previous_post_link( '%link', __( '<span class="meta-nav">Previous Post</span>%title', 'twentyfourteen' ) );
+					next_post_link( '%link', __( '<span class="meta-nav">Next Post</span>%title', 'twentyfourteen' ) );
+				endif;
+				?>
+			</div><!-- .nav-links -->
+		</nav><!-- .navigation -->
+		<?php
+	}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_posted_on' ) ) :
-/**
- * Print HTML with meta information for the current post-date/time and author.
- *
- * @since Twenty Fourteen 1.0
- */
-function twentyfourteen_posted_on() {
-	if ( is_sticky() && is_home() && ! is_paged() ) {
-		echo '<span class="featured-post">' . __( 'Sticky', 'twentyfourteen' ) . '</span>';
-	}
+	/**
+	 * Print HTML with meta information for the current post-date/time and author.
+	 *
+	 * @since Twenty Fourteen 1.0
+	 */
+	function twentyfourteen_posted_on() {
+		if ( is_sticky() && is_home() && ! is_paged() ) {
+			echo '<span class="featured-post">' . __( 'Sticky', 'twentyfourteen' ) . '</span>';
+		}
 
-	// Set up and print post meta information.
-	printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		get_the_author()
-	);
-}
+		// Set up and print post meta information.
+		printf(
+			'<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
+			esc_url( get_permalink() ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( get_the_date() ),
+			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+			get_the_author()
+		);
+	}
 endif;
 
 /**
@@ -130,9 +133,11 @@ endif;
 function twentyfourteen_categorized_blog() {
 	if ( false === ( $all_the_cool_cats = get_transient( 'twentyfourteen_category_count' ) ) ) {
 		// Create an array of all the categories that are attached to posts
-		$all_the_cool_cats = get_categories( array(
-			'hide_empty' => 1,
-		) );
+		$all_the_cool_cats = get_categories(
+			array(
+				'hide_empty' => 1,
+			)
+		);
 
 		// Count the number of categories that are attached to the posts
 		$all_the_cool_cats = count( $all_the_cool_cats );
@@ -159,69 +164,71 @@ function twentyfourteen_category_transient_flusher() {
 	delete_transient( 'twentyfourteen_category_count' );
 }
 add_action( 'edit_category', 'twentyfourteen_category_transient_flusher' );
-add_action( 'save_post',     'twentyfourteen_category_transient_flusher' );
+add_action( 'save_post', 'twentyfourteen_category_transient_flusher' );
 
 if ( ! function_exists( 'twentyfourteen_post_thumbnail' ) ) :
-/**
- * Display an optional post thumbnail.
- *
- * Wraps the post thumbnail in an anchor element on index
- * views, or a div element when on single views.
- *
- * @since Twenty Fourteen 1.0
- * @since Twenty Fourteen 1.4 Was made 'pluggable', or overridable.
- */
-function twentyfourteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-		return;
-	}
+	/**
+	 * Display an optional post thumbnail.
+	 *
+	 * Wraps the post thumbnail in an anchor element on index
+	 * views, or a div element when on single views.
+	 *
+	 * @since Twenty Fourteen 1.0
+	 * @since Twenty Fourteen 1.4 Was made 'pluggable', or overridable.
+	 */
+	function twentyfourteen_post_thumbnail() {
+		if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+			return;
+		}
 
-	if ( is_singular() ) :
-	?>
+		if ( is_singular() ) :
+		?>
 
-	<div class="post-thumbnail">
-	<?php
+		<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();
 		}
-	?>
-	</div>
+		?>
+		</div>
 
-	<?php else : ?>
+		<?php else : ?>
 
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
 	<?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( 'post-thumbnail', array( 'alt' => get_the_title() ) );
-		}
+	if ( ( ! is_active_sidebar( 'sidebar-2' ) || is_page_template( 'page-templates/full-width.php' ) ) ) {
+		the_post_thumbnail( 'twentyfourteen-full-width' );
+	} else {
+		the_post_thumbnail( 'post-thumbnail', array( 'alt' => get_the_title() ) );
+	}
 	?>
 	</a>
 
-	<?php endif; // End is_singular()
-}
+	<?php
+	endif; // End is_singular()
+	}
 endif;
 
 if ( ! function_exists( 'twentyfourteen_excerpt_more' ) && ! is_admin() ) :
-/**
- * Replaces "[...]" (appended to automatically generated excerpts) with ...
- * and a Continue reading link.
- *
- * @since Twenty Fourteen 1.3
- *
- * @param string $more Default Read More excerpt link.
- * @return string Filtered Read More excerpt link.
- */
-function twentyfourteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
+	/**
+	 * Replaces "[...]" (appended to automatically generated excerpts) with ...
+	 * and a Continue reading link.
+	 *
+	 * @since Twenty Fourteen 1.3
+	 *
+	 * @param string $more Default Read More excerpt link.
+	 * @return string Filtered Read More excerpt link.
+	 */
+	function twentyfourteen_excerpt_more( $more ) {
+		$link = sprintf(
+			'<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
 			/* translators: %s: Name of current post */
 			sprintf( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
 		);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentyfourteen_excerpt_more' );
+		return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentyfourteen_excerpt_more' );
 endif;
diff --git a/wp-content/themes/twentyfourteen/inc/widgets.php b/wp-content/themes/twentyfourteen/inc/widgets.php
index 533f34a5b7..3603402215 100644
--- a/wp-content/themes/twentyfourteen/inc/widgets.php
+++ b/wp-content/themes/twentyfourteen/inc/widgets.php
@@ -31,11 +31,13 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 	 * @return Twenty_Fourteen_Ephemera_Widget
 	 */
 	public function __construct() {
-		parent::__construct( '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,
-		) );
+		parent::__construct(
+			'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,
+			)
+		);
 
 		if ( is_active_widget( false, false, $this->id_base ) || is_customize_preview() ) {
 			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
@@ -106,24 +108,26 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 		$number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
 		$title  = apply_filters( 'widget_title', empty( $instance['title'] ) ? $format_string : $instance['title'], $instance, $this->id_base );
 
-		$ephemera = new WP_Query( array(
-			'order'          => 'DESC',
-			'posts_per_page' => $number,
-			'no_found_rows'  => true,
-			'post_status'    => 'publish',
-			'post__not_in'   => get_option( 'sticky_posts' ),
-			'tax_query'      => array(
-				array(
-					'taxonomy' => 'post_format',
-					'terms'    => array( "post-format-$format" ),
-					'field'    => 'slug',
-					'operator' => 'IN',
+		$ephemera = new WP_Query(
+			array(
+				'order'          => 'DESC',
+				'posts_per_page' => $number,
+				'no_found_rows'  => true,
+				'post_status'    => 'publish',
+				'post__not_in'   => get_option( 'sticky_posts' ),
+				'tax_query'      => array(
+					array(
+						'taxonomy' => 'post_format',
+						'terms'    => array( "post-format-$format" ),
+						'field'    => 'slug',
+						'operator' => 'IN',
+					),
 				),
-			),
-		) );
+			)
+		);
 
 		if ( $ephemera->have_posts() ) :
-			$tmp_content_width = $GLOBALS['content_width'];
+			$tmp_content_width        = $GLOBALS['content_width'];
 			$GLOBALS['content_width'] = 306;
 
 			echo $args['before_widget'];
@@ -134,61 +138,65 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 			<ol>
 
 				<?php
-					while ( $ephemera->have_posts() ) :
-						$ephemera->the_post();
-						$tmp_more = $GLOBALS['more'];
-						$GLOBALS['more'] = 0;
+				while ( $ephemera->have_posts() ) :
+					$ephemera->the_post();
+					$tmp_more        = $GLOBALS['more'];
+					$GLOBALS['more'] = 0;
 				?>
 				<li>
 				<article <?php post_class(); ?>>
-					<div class="entry-content">
-						<?php
-							if ( has_post_format( 'gallery' ) ) :
+				<div class="entry-content">
+					<?php
+					if ( has_post_format( 'gallery' ) ) :
 
-								if ( post_password_required() ) :
-									the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
-								else :
-									$images = array();
+						if ( post_password_required() ) :
+							the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
+							else :
+								$images = array();
 
-									$galleries = get_post_galleries( get_the_ID(), false );
-									if ( isset( $galleries[0]['ids'] ) )
-										$images = explode( ',', $galleries[0]['ids'] );
+								$galleries = get_post_galleries( get_the_ID(), false );
+								if ( isset( $galleries[0]['ids'] ) ) {
+									$images = explode( ',', $galleries[0]['ids'] );
+								}
 
-									if ( ! $images ) :
-										$images = get_posts( array(
-											'fields'         => 'ids',
-											'numberposts'    => -1,
-											'order'          => 'ASC',
-											'orderby'        => 'menu_order',
+								if ( ! $images ) :
+									$images = get_posts(
+										array(
+											'fields'      => 'ids',
+											'numberposts' => -1,
+											'order'       => 'ASC',
+											'orderby'     => 'menu_order',
 											'post_mime_type' => 'image',
-											'post_parent'    => get_the_ID(),
-											'post_type'      => 'attachment',
-										) );
-									endif;
+											'post_parent' => get_the_ID(),
+											'post_type'   => 'attachment',
+										)
+									);
+								endif;
 
-									$total_images = count( $images );
+								$total_images = count( $images );
 
-									if ( has_post_thumbnail() ) :
-										$post_thumbnail = get_the_post_thumbnail();
+								if ( has_post_thumbnail() ) :
+									$post_thumbnail = get_the_post_thumbnail();
 									elseif ( $total_images > 0 ) :
 										$image          = reset( $images );
 										$post_thumbnail = wp_get_attachment_image( $image, 'post-thumbnail' );
 									endif;
 
-									if ( ! empty ( $post_thumbnail ) ) :
+									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
-								endif;
+						endif;
 
 							else :
 								the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyfourteen' ) );
@@ -198,20 +206,21 @@ class Twenty_Fourteen_Ephemera_Widget extends WP_Widget {
 
 					<header class="entry-header">
 						<div class="entry-meta">
-							<?php
-								if ( ! has_post_format( 'link' ) ) :
-									the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
-								endif;
+						<?php
+						if ( ! has_post_format( 'link' ) ) :
+							the_title( '<h1 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
+							endif;
 
-								printf( '<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
-									esc_url( get_permalink() ),
-									esc_attr( get_the_date( 'c' ) ),
-									esc_html( get_the_date() ),
-									esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-									get_the_author()
-								);
+							printf(
+								'<span class="entry-date"><a href="%1$s" rel="bookmark"><time class="entry-date" datetime="%2$s">%3$s</time></a></span> <span class="byline"><span class="author vcard"><a class="url fn n" href="%4$s" rel="author">%5$s</a></span></span>',
+								esc_url( get_permalink() ),
+								esc_attr( get_the_date( 'c' ) ),
+								esc_html( get_the_date() ),
+								esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+								get_the_author()
+							);
 
-								if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+						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 endif; ?>
diff --git a/wp-content/themes/twentyfourteen/index.php b/wp-content/themes/twentyfourteen/index.php
index 3f46be21d1..42064cfe86 100644
--- a/wp-content/themes/twentyfourteen/index.php
+++ b/wp-content/themes/twentyfourteen/index.php
@@ -19,30 +19,31 @@ get_header(); ?>
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
 		<?php
-			if ( have_posts() ) :
-				// Start the Loop.
-				while ( have_posts() ) : the_post();
+		if ( have_posts() ) :
+			// Start the Loop.
+			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 post navigation.
-				twentyfourteen_paging_nav();
+			// Previous/next post navigation.
+			twentyfourteen_paging_nav();
 
 			else :
 				// If no content, include the "No posts found" template.
diff --git a/wp-content/themes/twentyfourteen/page-templates/contributors.php b/wp-content/themes/twentyfourteen/page-templates/contributors.php
index 92602ab1cd..b4103e8a2b 100644
--- a/wp-content/themes/twentyfourteen/page-templates/contributors.php
+++ b/wp-content/themes/twentyfourteen/page-templates/contributors.php
@@ -12,35 +12,36 @@ get_header(); ?>
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 			?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-				<?php
-					the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
+			<?php
+				the_title( '<header class="entry-header"><h1 class="entry-title">', '</h1></header><!-- .entry-header -->' );
 
-					// Output the authors list.
-					twentyfourteen_list_authors();
+				// Output the authors list.
+				twentyfourteen_list_authors();
 
-					edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
-				?>
+				edit_post_link( __( 'Edit', 'twentyfourteen' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' );
+			?>
 			</article><!-- #post-## -->
 
 			<?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 are open or we have at least one comment, load up the comment template.
+			if ( comments_open() || get_comments_number() ) {
+				comments_template();
+			}
 				endwhile;
 			?>
 		</div><!-- #content -->
diff --git a/wp-content/themes/twentyfourteen/page-templates/full-width.php b/wp-content/themes/twentyfourteen/page-templates/full-width.php
index 8830c870a5..ea5fa58873 100644
--- a/wp-content/themes/twentyfourteen/page-templates/full-width.php
+++ b/wp-content/themes/twentyfourteen/page-templates/full-width.php
@@ -12,25 +12,26 @@ get_header(); ?>
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
-					// Include the page content template.
-					get_template_part( 'content', 'page' );
+				// Include the page content template.
+				get_template_part( 'content', 'page' );
 
-					// 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 are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 				endwhile;
 			?>
 		</div><!-- #content -->
diff --git a/wp-content/themes/twentyfourteen/page.php b/wp-content/themes/twentyfourteen/page.php
index 44724e9466..bd033aeb48 100644
--- a/wp-content/themes/twentyfourteen/page.php
+++ b/wp-content/themes/twentyfourteen/page.php
@@ -16,25 +16,26 @@ get_header(); ?>
 <div id="main-content" class="main-content">
 
 <?php
-	if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
-		// Include the featured content template.
-		get_template_part( 'featured-content' );
-	}
+if ( is_front_page() && twentyfourteen_has_featured_posts() ) {
+	// Include the featured content template.
+	get_template_part( 'featured-content' );
+}
 ?>
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
-					// Include the page content template.
-					get_template_part( 'content', 'page' );
+				// Include the page content template.
+				get_template_part( 'content', 'page' );
 
-					// 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 are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 				endwhile;
 			?>
 
diff --git a/wp-content/themes/twentyfourteen/search.php b/wp-content/themes/twentyfourteen/search.php
index d90d88a146..6945c40a5f 100644
--- a/wp-content/themes/twentyfourteen/search.php
+++ b/wp-content/themes/twentyfourteen/search.php
@@ -20,14 +20,15 @@ get_header(); ?>
 
 				<?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 post navigation.
diff --git a/wp-content/themes/twentyfourteen/sidebar.php b/wp-content/themes/twentyfourteen/sidebar.php
index be3c8e0280..6117b7f570 100644
--- a/wp-content/themes/twentyfourteen/sidebar.php
+++ b/wp-content/themes/twentyfourteen/sidebar.php
@@ -10,7 +10,7 @@
 <div id="secondary">
 	<?php
 		$description = get_bloginfo( 'description', 'display' );
-		if ( ! empty ( $description ) ) :
+	if ( ! empty( $description ) ) :
 	?>
 	<h2 class="site-description"><?php echo esc_html( $description ); ?></h2>
 	<?php endif; ?>
diff --git a/wp-content/themes/twentyfourteen/single.php b/wp-content/themes/twentyfourteen/single.php
index e089165e58..1940c7329f 100644
--- a/wp-content/themes/twentyfourteen/single.php
+++ b/wp-content/themes/twentyfourteen/single.php
@@ -13,22 +13,23 @@ get_header(); ?>
 		<div id="content" class="site-content" role="main">
 			<?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() );
 
-					// Previous/next post navigation.
-					twentyfourteen_post_nav();
+				// Previous/next post navigation.
+				twentyfourteen_post_nav();
 
-					// 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 are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 				endwhile;
 			?>
 		</div><!-- #content -->
diff --git a/wp-content/themes/twentyfourteen/tag.php b/wp-content/themes/twentyfourteen/tag.php
index 5930d2cf27..663fe5e9f0 100644
--- a/wp-content/themes/twentyfourteen/tag.php
+++ b/wp-content/themes/twentyfourteen/tag.php
@@ -24,22 +24,23 @@ get_header(); ?>
 				<?php
 					// Show an optional term description.
 					$term_description = term_description();
-					if ( ! empty( $term_description ) ) :
-						printf( '<div class="taxonomy-description">%s</div>', $term_description );
+				if ( ! empty( $term_description ) ) :
+					printf( '<div class="taxonomy-description">%s</div>', $term_description );
 					endif;
 				?>
 			</header><!-- .archive-header -->
 
 			<?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.
diff --git a/wp-content/themes/twentyfourteen/taxonomy-post_format.php b/wp-content/themes/twentyfourteen/taxonomy-post_format.php
index f7cee9f7f6..fa7335053c 100644
--- a/wp-content/themes/twentyfourteen/taxonomy-post_format.php
+++ b/wp-content/themes/twentyfourteen/taxonomy-post_format.php
@@ -26,8 +26,8 @@ get_header(); ?>
 			<header class="archive-header">
 				<h1 class="archive-title">
 					<?php
-						if ( is_tax( 'post_format', 'post-format-aside' ) ) :
-							_e( 'Asides', 'twentyfourteen' );
+					if ( is_tax( 'post_format', 'post-format-aside' ) ) :
+						_e( 'Asides', 'twentyfourteen' );
 
 						elseif ( is_tax( 'post_format', 'post-format-image' ) ) :
 							_e( 'Images', 'twentyfourteen' );
@@ -57,14 +57,15 @@ get_header(); ?>
 
 			<?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.
diff --git a/wp-content/themes/twentyseventeen/404.php b/wp-content/themes/twentyseventeen/404.php
index 4a6d11353b..3eb2a30bb7 100644
--- a/wp-content/themes/twentyseventeen/404.php
+++ b/wp-content/themes/twentyseventeen/404.php
@@ -31,4 +31,5 @@ get_header(); ?>
 	</div><!-- #primary -->
 </div><!-- .wrap -->
 
-<?php get_footer();
+<?php
+get_footer();
diff --git a/wp-content/themes/twentyseventeen/archive.php b/wp-content/themes/twentyseventeen/archive.php
index 6f9e03c37e..5a024347ac 100644
--- a/wp-content/themes/twentyseventeen/archive.php
+++ b/wp-content/themes/twentyseventeen/archive.php
@@ -27,10 +27,12 @@ get_header(); ?>
 		<main id="main" class="site-main" role="main">
 
 		<?php
-		if ( have_posts() ) : ?>
+		if ( have_posts() ) :
+		?>
 			<?php
 			/* Start the Loop */
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				/*
 				 * Include the Post-Format-specific template for the content.
@@ -41,21 +43,25 @@ get_header(); ?>
 
 			endwhile;
 
-			the_posts_pagination( array(
-				'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
-				'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+					'next_text'          => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
+				)
+			);
 
 		else :
 
 			get_template_part( 'template-parts/post/content', 'none' );
 
-		endif; ?>
+		endif;
+		?>
 
 		</main><!-- #main -->
 	</div><!-- #primary -->
 	<?php get_sidebar(); ?>
 </div><!-- .wrap -->
 
-<?php get_footer();
+<?php
+get_footer();
diff --git a/wp-content/themes/twentyseventeen/comments.php b/wp-content/themes/twentyseventeen/comments.php
index f93c09eaf1..a8c8f287ae 100644
--- a/wp-content/themes/twentyseventeen/comments.php
+++ b/wp-content/themes/twentyseventeen/comments.php
@@ -27,7 +27,8 @@ if ( post_password_required() ) {
 
 	<?php
 	// You can start editing here -- including this comment!
-	if ( have_comments() ) : ?>
+	if ( have_comments() ) :
+	?>
 		<h2 class="comments-title">
 			<?php
 			$comments_number = get_comments_number();
@@ -53,24 +54,30 @@ if ( post_password_required() ) {
 
 		<ol class="comment-list">
 			<?php
-				wp_list_comments( array(
-					'avatar_size' => 100,
-					'style'       => 'ol',
-					'short_ping'  => true,
-					'reply_text'  => twentyseventeen_get_svg( array( 'icon' => 'mail-reply' ) ) . __( 'Reply', 'twentyseventeen' ),
-				) );
+				wp_list_comments(
+					array(
+						'avatar_size' => 100,
+						'style'       => 'ol',
+						'short_ping'  => true,
+						'reply_text'  => twentyseventeen_get_svg( array( 'icon' => 'mail-reply' ) ) . __( 'Reply', 'twentyseventeen' ),
+					)
+				);
 			?>
 		</ol>
 
-		<?php the_comments_pagination( array(
-			'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous', 'twentyseventeen' ) . '</span>',
-			'next_text' => '<span class="screen-reader-text">' . __( 'Next', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
-		) );
+		<?php
+		the_comments_pagination(
+			array(
+				'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous', 'twentyseventeen' ) . '</span>',
+				'next_text' => '<span class="screen-reader-text">' . __( 'Next', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+			)
+		);
 
 	endif; // Check for have_comments().
 
 	// 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' ) ) : ?>
+	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
diff --git a/wp-content/themes/twentyseventeen/footer.php b/wp-content/themes/twentyseventeen/footer.php
index 504f573f87..8d8086fff5 100644
--- a/wp-content/themes/twentyseventeen/footer.php
+++ b/wp-content/themes/twentyseventeen/footer.php
@@ -21,19 +21,23 @@
 				<?php
 				get_template_part( 'template-parts/footer/footer', 'widgets' );
 
-				if ( has_nav_menu( 'social' ) ) : ?>
+				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( array(
-								'theme_location' => 'social',
-								'menu_class'     => 'social-links-menu',
-								'depth'          => 1,
-								'link_before'    => '<span class="screen-reader-text">',
-								'link_after'     => '</span>' . twentyseventeen_get_svg( array( 'icon' => 'chain' ) ),
-							) );
+							wp_nav_menu(
+								array(
+									'theme_location' => 'social',
+									'menu_class'     => 'social-links-menu',
+									'depth'          => 1,
+									'link_before'    => '<span class="screen-reader-text">',
+									'link_after'     => '</span>' . twentyseventeen_get_svg( array( 'icon' => 'chain' ) ),
+								)
+							);
 						?>
 					</nav><!-- .social-navigation -->
-				<?php endif;
+				<?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 a169ad29db..0c653917c8 100644
--- a/wp-content/themes/twentyseventeen/front-page.php
+++ b/wp-content/themes/twentyseventeen/front-page.php
@@ -17,14 +17,17 @@ get_header(); ?>
 <div id="primary" class="content-area">
 	<main id="main" class="site-main" role="main">
 
-		<?php // Show the selected frontpage content.
+		<?php
+		// Show the selected frontpage content.
 		if ( have_posts() ) :
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 				get_template_part( 'template-parts/page/content', 'front-page' );
 			endwhile;
 		else : // I'm not sure it's possible to have no posts when this page is shown, but WTH.
 			get_template_part( 'template-parts/post/content', 'none' );
-		endif; ?>
+		endif;
+		?>
 
 		<?php
 		// Get each of our panels and show the post data.
@@ -46,9 +49,11 @@ get_header(); ?>
 				twentyseventeen_front_page_section( null, $i );
 			}
 
-	endif; // The if ( 0 !== twentyseventeen_panel_count() ) ends here. ?>
+	endif; // The if ( 0 !== twentyseventeen_panel_count() ) ends here.
+	?>
 
 	</main><!-- #main -->
 </div><!-- #primary -->
 
-<?php get_footer();
+<?php
+get_footer();
diff --git a/wp-content/themes/twentyseventeen/functions.php b/wp-content/themes/twentyseventeen/functions.php
index 9cc891e3ff..2e147a92da 100644
--- a/wp-content/themes/twentyseventeen/functions.php
+++ b/wp-content/themes/twentyseventeen/functions.php
@@ -59,43 +59,51 @@ function twentyseventeen_setup() {
 	$GLOBALS['content_width'] = 525;
 
 	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'top'    => __( 'Top Menu', 'twentyseventeen' ),
-		'social' => __( 'Social Links Menu', 'twentyseventeen' ),
-	) );
+	register_nav_menus(
+		array(
+			'top'    => __( 'Top Menu', 'twentyseventeen' ),
+			'social' => __( 'Social Links Menu', 'twentyseventeen' ),
+		)
+	);
 
 	/*
 	 * Switch default core markup for search form, comment form, and comments
 	 * to output valid HTML5.
 	 */
-	add_theme_support( 'html5', array(
-		'comment-form',
-		'comment-list',
-		'gallery',
-		'caption',
-	) );
+	add_theme_support(
+		'html5', array(
+			'comment-form',
+			'comment-list',
+			'gallery',
+			'caption',
+		)
+	);
 
 	/*
 	 * Enable support for Post Formats.
 	 *
 	 * See: https://codex.wordpress.org/Post_Formats
 	 */
-	add_theme_support( 'post-formats', array(
-		'aside',
-		'image',
-		'video',
-		'quote',
-		'link',
-		'gallery',
-		'audio',
-	) );
+	add_theme_support(
+		'post-formats', array(
+			'aside',
+			'image',
+			'video',
+			'quote',
+			'link',
+			'gallery',
+			'audio',
+		)
+	);
 
 	// Add theme support for Custom Logo.
-	add_theme_support( 'custom-logo', array(
-		'width'       => 250,
-		'height'      => 250,
-		'flex-width'  => true,
-	) );
+	add_theme_support(
+		'custom-logo', array(
+			'width'      => 250,
+			'height'     => 250,
+			'flex-width' => true,
+		)
+	);
 
 	// Add theme support for selective refresh for widgets.
 	add_theme_support( 'customize-selective-refresh-widgets' );
@@ -103,12 +111,12 @@ function twentyseventeen_setup() {
 	/*
 	 * This theme styles the visual editor to resemble the theme style,
 	 * specifically font, colors, and column width.
- 	 */
+	  */
 	add_editor_style( array( 'assets/css/editor-style.css', twentyseventeen_fonts_url() ) );
 
 	// Define and register starter content to showcase the theme on new sites.
 	$starter_content = array(
-		'widgets' => array(
+		'widgets'     => array(
 			// Place three core-defined widgets in the sidebar area.
 			'sidebar-1' => array(
 				'text_business_info',
@@ -129,15 +137,15 @@ function twentyseventeen_setup() {
 		),
 
 		// Specify the core-defined pages to create and add custom thumbnails to some of them.
-		'posts' => array(
+		'posts'       => array(
 			'home',
-			'about' => array(
+			'about'            => array(
 				'thumbnail' => '{{image-sandwich}}',
 			),
-			'contact' => array(
+			'contact'          => array(
 				'thumbnail' => '{{image-espresso}}',
 			),
-			'blog' => array(
+			'blog'             => array(
 				'thumbnail' => '{{image-coffee}}',
 			),
 			'homepage-section' => array(
@@ -149,27 +157,27 @@ function twentyseventeen_setup() {
 		'attachments' => array(
 			'image-espresso' => array(
 				'post_title' => _x( 'Espresso', 'Theme starter content', 'twentyseventeen' ),
-				'file' => 'assets/images/espresso.jpg', // URL relative to the template directory.
+				'file'       => 'assets/images/espresso.jpg', // URL relative to the template directory.
 			),
 			'image-sandwich' => array(
 				'post_title' => _x( 'Sandwich', 'Theme starter content', 'twentyseventeen' ),
-				'file' => 'assets/images/sandwich.jpg',
+				'file'       => 'assets/images/sandwich.jpg',
 			),
-			'image-coffee' => array(
+			'image-coffee'   => array(
 				'post_title' => _x( 'Coffee', 'Theme starter content', 'twentyseventeen' ),
-				'file' => 'assets/images/coffee.jpg',
+				'file'       => 'assets/images/coffee.jpg',
 			),
 		),
 
 		// Default to a static front page and assign the front and posts pages.
-		'options' => array(
-			'show_on_front' => 'page',
-			'page_on_front' => '{{home}}',
+		'options'     => array(
+			'show_on_front'  => 'page',
+			'page_on_front'  => '{{home}}',
 			'page_for_posts' => '{{blog}}',
 		),
 
 		// Set the front page section theme mods to the IDs of the core-registered pages.
-		'theme_mods' => array(
+		'theme_mods'  => array(
 			'panel_1' => '{{homepage-section}}',
 			'panel_2' => '{{about}}',
 			'panel_3' => '{{blog}}',
@@ -177,10 +185,10 @@ function twentyseventeen_setup() {
 		),
 
 		// Set up nav menus for each of the two areas registered in the theme.
-		'nav_menus' => array(
+		'nav_menus'   => array(
 			// Assign a menu to the "top" location.
-			'top' => array(
-				'name' => __( 'Top Menu', 'twentyseventeen' ),
+			'top'    => array(
+				'name'  => __( 'Top Menu', 'twentyseventeen' ),
 				'items' => array(
 					'link_home', // Note that the core "home" page is actually a link in case a static front page is not used.
 					'page_about',
@@ -191,7 +199,7 @@ function twentyseventeen_setup() {
 
 			// Assign a menu to the "social" location.
 			'social' => array(
-				'name' => __( 'Social Links Menu', 'twentyseventeen' ),
+				'name'  => __( 'Social Links Menu', 'twentyseventeen' ),
 				'items' => array(
 					'link_yelp',
 					'link_facebook',
@@ -311,35 +319,41 @@ add_filter( 'wp_resource_hints', 'twentyseventeen_resource_hints', 10, 2 );
  * @link https://developer.wordpress.org/themes/functionality/sidebars/#registering-a-sidebar
  */
 function twentyseventeen_widgets_init() {
-	register_sidebar( array(
-		'name'          => __( 'Blog Sidebar', 'twentyseventeen' ),
-		'id'            => 'sidebar-1',
-		'description'   => __( 'Add widgets here to appear in your sidebar on blog posts and archive pages.', 'twentyseventeen' ),
-		'before_widget' => '<section id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</section>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Blog Sidebar', 'twentyseventeen' ),
+			'id'            => 'sidebar-1',
+			'description'   => __( 'Add widgets here to appear in your sidebar on blog posts and archive pages.', 'twentyseventeen' ),
+			'before_widget' => '<section id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</section>',
+			'before_title'  => '<h2 class="widget-title">',
+			'after_title'   => '</h2>',
+		)
+	);
 
-	register_sidebar( array(
-		'name'          => __( 'Footer 1', 'twentyseventeen' ),
-		'id'            => 'sidebar-2',
-		'description'   => __( 'Add widgets here to appear in your footer.', 'twentyseventeen' ),
-		'before_widget' => '<section id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</section>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Footer 1', 'twentyseventeen' ),
+			'id'            => 'sidebar-2',
+			'description'   => __( 'Add widgets here to appear in your footer.', 'twentyseventeen' ),
+			'before_widget' => '<section id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</section>',
+			'before_title'  => '<h2 class="widget-title">',
+			'after_title'   => '</h2>',
+		)
+	);
 
-	register_sidebar( array(
-		'name'          => __( 'Footer 2', 'twentyseventeen' ),
-		'id'            => 'sidebar-3',
-		'description'   => __( 'Add widgets here to appear in your footer.', 'twentyseventeen' ),
-		'before_widget' => '<section id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</section>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Footer 2', 'twentyseventeen' ),
+			'id'            => 'sidebar-3',
+			'description'   => __( 'Add widgets here to appear in your footer.', 'twentyseventeen' ),
+			'before_widget' => '<section id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</section>',
+			'before_title'  => '<h2 class="widget-title">',
+			'after_title'   => '</h2>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentyseventeen_widgets_init' );
 
@@ -357,7 +371,8 @@ function twentyseventeen_excerpt_more( $link ) {
 		return $link;
 	}
 
-	$link = sprintf( '<p class="link-more"><a href="%1$s" class="more-link">%2$s</a></p>',
+	$link = sprintf(
+		'<p class="link-more"><a href="%1$s" class="more-link">%2$s</a></p>',
 		esc_url( get_permalink( get_the_ID() ) ),
 		/* translators: %s: Name of current post */
 		sprintf( __( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ), get_the_title( get_the_ID() ) )
@@ -407,7 +422,8 @@ function twentyseventeen_colors_css_wrap() {
 	<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' );
 
 /**
@@ -442,14 +458,19 @@ function twentyseventeen_scripts() {
 	wp_enqueue_script( 'twentyseventeen-skip-link-focus-fix', get_theme_file_uri( '/assets/js/skip-link-focus-fix.js' ), array(), '1.0', true );
 
 	$twentyseventeen_l10n = array(
-		'quote'          => twentyseventeen_get_svg( array( 'icon' => 'quote-right' ) ),
+		'quote' => twentyseventeen_get_svg( array( 'icon' => 'quote-right' ) ),
 	);
 
 	if ( has_nav_menu( 'top' ) ) {
 		wp_enqueue_script( 'twentyseventeen-navigation', get_theme_file_uri( '/assets/js/navigation.js' ), array( 'jquery' ), '1.0', true );
-		$twentyseventeen_l10n['expand']         = __( 'Expand child menu', 'twentyseventeen' );
-		$twentyseventeen_l10n['collapse']       = __( 'Collapse child menu', 'twentyseventeen' );
-		$twentyseventeen_l10n['icon']           = twentyseventeen_get_svg( array( 'icon' => 'angle-down', 'fallback' => true ) );
+		$twentyseventeen_l10n['expand']   = __( 'Expand child menu', 'twentyseventeen' );
+		$twentyseventeen_l10n['collapse'] = __( 'Collapse child menu', 'twentyseventeen' );
+		$twentyseventeen_l10n['icon']     = twentyseventeen_get_svg(
+			array(
+				'icon'     => 'angle-down',
+				'fallback' => true,
+			)
+		);
 	}
 
 	wp_enqueue_script( 'twentyseventeen-global', get_theme_file_uri( '/assets/js/global.js' ), array( 'jquery' ), '1.0', true );
@@ -544,7 +565,7 @@ add_filter( 'wp_get_attachment_image_attributes', 'twentyseventeen_post_thumbnai
 function twentyseventeen_front_page_template( $template ) {
 	return is_home() ? '' : $template;
 }
-add_filter( 'frontpage_template',  'twentyseventeen_front_page_template' );
+add_filter( 'frontpage_template', 'twentyseventeen_front_page_template' );
 
 /**
  * Modifies tag cloud widget arguments to display all tags in the same font size
diff --git a/wp-content/themes/twentyseventeen/inc/back-compat.php b/wp-content/themes/twentyseventeen/inc/back-compat.php
index 4772f5621a..fad87f91ba 100644
--- a/wp-content/themes/twentyseventeen/inc/back-compat.php
+++ b/wp-content/themes/twentyseventeen/inc/back-compat.php
@@ -48,9 +48,11 @@ function twentyseventeen_upgrade_notice() {
  * @global string $wp_version WordPress version.
  */
 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(
-		'back_link' => true,
-	) );
+	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(
+			'back_link' => true,
+		)
+	);
 }
 add_action( 'load-customize.php', 'twentyseventeen_customize' );
 
diff --git a/wp-content/themes/twentyseventeen/inc/color-patterns.php b/wp-content/themes/twentyseventeen/inc/color-patterns.php
index 74d5031dbb..2eaca03131 100644
--- a/wp-content/themes/twentyseventeen/inc/color-patterns.php
+++ b/wp-content/themes/twentyseventeen/inc/color-patterns.php
@@ -20,10 +20,10 @@ function twentyseventeen_custom_colors_css() {
 	 *
 	 * @param int $saturation Color saturation level.
 	 */
-	$saturation = absint( apply_filters( 'twentyseventeen_custom_colors_saturation', 50 ) );
+	$saturation         = absint( apply_filters( 'twentyseventeen_custom_colors_saturation', 50 ) );
 	$reduced_saturation = ( .8 * $saturation ) . '%';
-	$saturation = $saturation . '%';
-	$css = '
+	$saturation         = $saturation . '%';
+	$css                = '
 /**
  * Twenty Seventeen: Color Patterns
  *
diff --git a/wp-content/themes/twentyseventeen/inc/custom-header.php b/wp-content/themes/twentyseventeen/inc/custom-header.php
index 6e19a7f98b..1cc6114a98 100644
--- a/wp-content/themes/twentyseventeen/inc/custom-header.php
+++ b/wp-content/themes/twentyseventeen/inc/custom-header.php
@@ -24,53 +24,59 @@ function twentyseventeen_custom_header_setup() {
 	 * @param array $args {
 	 *     An array of custom-header support arguments.
 	 *
-	 *     @type string $default-image     		Default image of the header.
+	 *     @type string $default-image          Default image of the header.
 	 *     @type string $default_text_color     Default color of the header text.
 	 *     @type int    $width                  Width in pixels of the custom header image. Default 954.
 	 *     @type int    $height                 Height in pixels of the custom header image. Default 1300.
 	 *     @type string $wp-head-callback       Callback function used to styles the header image and text
 	 *                                          displayed on the blog.
-	 *     @type string $flex-height     		Flex support for height of header.
+	 *     @type string $flex-height            Flex support for height of header.
 	 * }
 	 */
-	add_theme_support( 'custom-header', apply_filters( 'twentyseventeen_custom_header_args', array(
-		'default-image'      => get_parent_theme_file_uri( '/assets/images/header.jpg' ),
-		'width'              => 2000,
-		'height'             => 1200,
-		'flex-height'        => true,
-		'video'              => true,
-		'wp-head-callback'   => 'twentyseventeen_header_style',
-	) ) );
+	add_theme_support(
+		'custom-header', apply_filters(
+			'twentyseventeen_custom_header_args', array(
+				'default-image'    => get_parent_theme_file_uri( '/assets/images/header.jpg' ),
+				'width'            => 2000,
+				'height'           => 1200,
+				'flex-height'      => true,
+				'video'            => true,
+				'wp-head-callback' => 'twentyseventeen_header_style',
+			)
+		)
+	);
 
-	register_default_headers( array(
-		'default-image' => array(
-			'url'           => '%s/assets/images/header.jpg',
-			'thumbnail_url' => '%s/assets/images/header.jpg',
-			'description'   => __( 'Default Header Image', 'twentyseventeen' ),
-		),
-	) );
+	register_default_headers(
+		array(
+			'default-image' => array(
+				'url'           => '%s/assets/images/header.jpg',
+				'thumbnail_url' => '%s/assets/images/header.jpg',
+				'description'   => __( 'Default Header Image', 'twentyseventeen' ),
+			),
+		)
+	);
 }
 add_action( 'after_setup_theme', 'twentyseventeen_custom_header_setup' );
 
 if ( ! function_exists( 'twentyseventeen_header_style' ) ) :
-/**
- * Styles the header image and text displayed on the blog.
- *
- * @see twentyseventeen_custom_header_setup().
- */
-function twentyseventeen_header_style() {
-	$header_text_color = get_header_textcolor();
+	/**
+	 * Styles the header image and text displayed on the blog.
+	 *
+	 * @see twentyseventeen_custom_header_setup().
+	 */
+	function twentyseventeen_header_style() {
+		$header_text_color = get_header_textcolor();
 
-	// If no custom options for text are set, let's bail.
-	// get_header_textcolor() options: add_theme_support( 'custom-header' ) is default, hide text (returns 'blank') or any hex value.
-	if ( get_theme_support( 'custom-header', 'default-text-color' ) === $header_text_color ) {
-		return;
-	}
+		// If no custom options for text are set, let's bail.
+		// get_header_textcolor() options: add_theme_support( 'custom-header' ) is default, hide text (returns 'blank') or any hex value.
+		if ( get_theme_support( 'custom-header', 'default-text-color' ) === $header_text_color ) {
+			return;
+		}
 
-	// If we get this far, we have custom styles. Let's do this.
-	?>
-	<style id="twentyseventeen-custom-header-styles" type="text/css">
-	<?php
+		// If we get this far, we have custom styles. Let's do this.
+		?>
+		<style id="twentyseventeen-custom-header-styles" type="text/css">
+		<?php
 		// Has the text been hidden?
 		if ( 'blank' === $header_text_color ) :
 	?>
@@ -106,7 +112,7 @@ function twentyseventeen_header_style() {
 	<?php endif; ?>
 	</style>
 	<?php
-}
+	}
 endif; // End of twentyseventeen_header_style.
 
 /**
@@ -116,7 +122,7 @@ endif; // End of twentyseventeen_header_style.
  * @return array The filtered video settings.
  */
 function twentyseventeen_video_controls( $settings ) {
-	$settings['l10n']['play'] = '<span class="screen-reader-text">' . __( 'Play background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'play' ) );
+	$settings['l10n']['play']  = '<span class="screen-reader-text">' . __( 'Play background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'play' ) );
 	$settings['l10n']['pause'] = '<span class="screen-reader-text">' . __( 'Pause background video', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'pause' ) );
 	return $settings;
 }
diff --git a/wp-content/themes/twentyseventeen/inc/customizer.php b/wp-content/themes/twentyseventeen/inc/customizer.php
index bc6bbea31c..abc27fb057 100644
--- a/wp-content/themes/twentyseventeen/inc/customizer.php
+++ b/wp-content/themes/twentyseventeen/inc/customizer.php
@@ -13,77 +13,97 @@
  * @param WP_Customize_Manager $wp_customize Theme Customizer object.
  */
 function twentyseventeen_customize_register( $wp_customize ) {
-	$wp_customize->get_setting( 'blogname' )->transport          = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport   = 'postMessage';
-	$wp_customize->get_setting( 'header_textcolor' )->transport  = 'postMessage';
+	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
+	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
+	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
-	$wp_customize->selective_refresh->add_partial( 'blogname', array(
-		'selector' => '.site-title a',
-		'render_callback' => 'twentyseventeen_customize_partial_blogname',
-	) );
-	$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-		'selector' => '.site-description',
-		'render_callback' => 'twentyseventeen_customize_partial_blogdescription',
-	) );
+	$wp_customize->selective_refresh->add_partial(
+		'blogname', array(
+			'selector'        => '.site-title a',
+			'render_callback' => 'twentyseventeen_customize_partial_blogname',
+		)
+	);
+	$wp_customize->selective_refresh->add_partial(
+		'blogdescription', array(
+			'selector'        => '.site-description',
+			'render_callback' => 'twentyseventeen_customize_partial_blogdescription',
+		)
+	);
 
 	/**
 	 * Custom colors.
 	 */
-	$wp_customize->add_setting( 'colorscheme', array(
-		'default'           => 'light',
-		'transport'         => 'postMessage',
-		'sanitize_callback' => 'twentyseventeen_sanitize_colorscheme',
-	) );
+	$wp_customize->add_setting(
+		'colorscheme', array(
+			'default'           => 'light',
+			'transport'         => 'postMessage',
+			'sanitize_callback' => 'twentyseventeen_sanitize_colorscheme',
+		)
+	);
 
-	$wp_customize->add_setting( 'colorscheme_hue', array(
-		'default'           => 250,
-		'transport'         => 'postMessage',
-		'sanitize_callback' => 'absint', // The hue is stored as a positive integer.
-	) );
+	$wp_customize->add_setting(
+		'colorscheme_hue', array(
+			'default'           => 250,
+			'transport'         => 'postMessage',
+			'sanitize_callback' => 'absint', // The hue is stored as a positive integer.
+		)
+	);
 
-	$wp_customize->add_control( 'colorscheme', array(
-		'type'    => 'radio',
-		'label'    => __( 'Color Scheme', 'twentyseventeen' ),
-		'choices'  => array(
-			'light'  => __( 'Light', 'twentyseventeen' ),
-			'dark'   => __( 'Dark', 'twentyseventeen' ),
-			'custom' => __( 'Custom', 'twentyseventeen' ),
-		),
-		'section'  => 'colors',
-		'priority' => 5,
-	) );
+	$wp_customize->add_control(
+		'colorscheme', array(
+			'type'     => 'radio',
+			'label'    => __( 'Color Scheme', 'twentyseventeen' ),
+			'choices'  => array(
+				'light'  => __( 'Light', 'twentyseventeen' ),
+				'dark'   => __( 'Dark', 'twentyseventeen' ),
+				'custom' => __( 'Custom', 'twentyseventeen' ),
+			),
+			'section'  => 'colors',
+			'priority' => 5,
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'colorscheme_hue', array(
-		'mode' => 'hue',
-		'section'  => 'colors',
-		'priority' => 6,
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'colorscheme_hue', array(
+				'mode'     => 'hue',
+				'section'  => 'colors',
+				'priority' => 6,
+			)
+		)
+	);
 
 	/**
 	 * Theme options.
 	 */
-	$wp_customize->add_section( 'theme_options', array(
-		'title'    => __( 'Theme Options', 'twentyseventeen' ),
-		'priority' => 130, // Before Additional CSS.
-	) );
+	$wp_customize->add_section(
+		'theme_options', array(
+			'title'    => __( 'Theme Options', 'twentyseventeen' ),
+			'priority' => 130, // Before Additional CSS.
+		)
+	);
 
-	$wp_customize->add_setting( 'page_layout', array(
-		'default'           => 'two-column',
-		'sanitize_callback' => 'twentyseventeen_sanitize_page_layout',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'page_layout', array(
+			'default'           => 'two-column',
+			'sanitize_callback' => 'twentyseventeen_sanitize_page_layout',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( 'page_layout', array(
-		'label'       => __( 'Page Layout', 'twentyseventeen' ),
-		'section'     => 'theme_options',
-		'type'        => 'radio',
-		'description' => __( 'When the two-column layout is assigned, the page title is in one column and content is in the other.', 'twentyseventeen' ),
-		'choices'     => array(
-			'one-column' => __( 'One Column', 'twentyseventeen' ),
-			'two-column' => __( 'Two Column', 'twentyseventeen' ),
-		),
-		'active_callback' => 'twentyseventeen_is_view_with_layout_option',
-	) );
+	$wp_customize->add_control(
+		'page_layout', array(
+			'label'           => __( 'Page Layout', 'twentyseventeen' ),
+			'section'         => 'theme_options',
+			'type'            => 'radio',
+			'description'     => __( 'When the two-column layout is assigned, the page title is in one column and content is in the other.', 'twentyseventeen' ),
+			'choices'         => array(
+				'one-column' => __( 'One Column', 'twentyseventeen' ),
+				'two-column' => __( 'Two Column', 'twentyseventeen' ),
+			),
+			'active_callback' => 'twentyseventeen_is_view_with_layout_option',
+		)
+	);
 
 	/**
 	 * Filter number of front page sections in Twenty Seventeen.
@@ -96,27 +116,33 @@ 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(
-			'default'           => false,
-			'sanitize_callback' => 'absint',
-			'transport'         => 'postMessage',
-		) );
+		$wp_customize->add_setting(
+			'panel_' . $i, array(
+				'default'           => false,
+				'sanitize_callback' => 'absint',
+				'transport'         => 'postMessage',
+			)
+		);
 
-		$wp_customize->add_control( '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' ) ),
-			'section'        => 'theme_options',
-			'type'           => 'dropdown-pages',
-			'allow_addition' => true,
-			'active_callback' => 'twentyseventeen_is_static_front_page',
-		) );
+		$wp_customize->add_control(
+			'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' ) ),
+				'section'         => 'theme_options',
+				'type'            => 'dropdown-pages',
+				'allow_addition'  => true,
+				'active_callback' => 'twentyseventeen_is_static_front_page',
+			)
+		);
 
-		$wp_customize->selective_refresh->add_partial( 'panel_' . $i, array(
-			'selector'            => '#panel' . $i,
-			'render_callback'     => 'twentyseventeen_front_page_section',
-			'container_inclusive' => true,
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'panel_' . $i, array(
+				'selector'            => '#panel' . $i,
+				'render_callback'     => 'twentyseventeen_front_page_section',
+				'container_inclusive' => true,
+			)
+		);
 	}
 }
 add_action( 'customize_register', 'twentyseventeen_customize_register' );
diff --git a/wp-content/themes/twentyseventeen/inc/icon-functions.php b/wp-content/themes/twentyseventeen/inc/icon-functions.php
index 3425f740df..87572bcecd 100644
--- a/wp-content/themes/twentyseventeen/inc/icon-functions.php
+++ b/wp-content/themes/twentyseventeen/inc/icon-functions.php
@@ -46,10 +46,10 @@ function twentyseventeen_get_svg( $args = array() ) {
 
 	// Set defaults.
 	$defaults = array(
-		'icon'        => '',
-		'title'       => '',
-		'desc'        => '',
-		'fallback'    => false,
+		'icon'     => '',
+		'title'    => '',
+		'desc'     => '',
+		'fallback' => false,
 	);
 
 	// Parse args.
diff --git a/wp-content/themes/twentyseventeen/inc/template-functions.php b/wp-content/themes/twentyseventeen/inc/template-functions.php
index 9ecbe56a84..d51b897406 100644
--- a/wp-content/themes/twentyseventeen/inc/template-functions.php
+++ b/wp-content/themes/twentyseventeen/inc/template-functions.php
@@ -59,7 +59,7 @@ function twentyseventeen_body_classes( $classes ) {
 	}
 
 	// Get the colorscheme or the default if there isn't one.
-	$colors = twentyseventeen_sanitize_colorscheme( get_theme_mod( 'colorscheme', 'light' ) );
+	$colors    = twentyseventeen_sanitize_colorscheme( get_theme_mod( 'colorscheme', 'light' ) );
 	$classes[] = 'colors-' . $colors;
 
 	return $classes;
diff --git a/wp-content/themes/twentyseventeen/inc/template-tags.php b/wp-content/themes/twentyseventeen/inc/template-tags.php
index a99230d963..8fec665a28 100644
--- a/wp-content/themes/twentyseventeen/inc/template-tags.php
+++ b/wp-content/themes/twentyseventeen/inc/template-tags.php
@@ -10,83 +10,84 @@
  */
 
 if ( ! function_exists( 'twentyseventeen_posted_on' ) ) :
-/**
- * Prints HTML with meta information for the current post-date/time and author.
- */
-function twentyseventeen_posted_on() {
+	/**
+	 * Prints HTML with meta information for the current post-date/time and author.
+	 */
+	function twentyseventeen_posted_on() {
 
-	// Get the author name; wrap it in a link.
-	$byline = sprintf(
-		/* translators: %s: post author */
-		__( 'by %s', 'twentyseventeen' ),
-		'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . get_the_author() . '</a></span>'
-	);
+		// Get the author name; wrap it in a link.
+		$byline = sprintf(
+			/* translators: %s: post author */
+			__( 'by %s', 'twentyseventeen' ),
+			'<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . get_the_author() . '</a></span>'
+		);
 
-	// Finally, let's write all of this to the page.
-	echo '<span class="posted-on">' . twentyseventeen_time_link() . '</span><span class="byline"> ' . $byline . '</span>';
-}
+		// Finally, let's write all of this to the page.
+		echo '<span class="posted-on">' . twentyseventeen_time_link() . '</span><span class="byline"> ' . $byline . '</span>';
+	}
 endif;
 
 
 if ( ! function_exists( 'twentyseventeen_time_link' ) ) :
-/**
- * Gets a nicely formatted string for the published date.
- */
-function twentyseventeen_time_link() {
-	$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
-	if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
-		$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+	/**
+	 * Gets a nicely formatted string for the published date.
+	 */
+	function twentyseventeen_time_link() {
+		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
+		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+		}
+
+		$time_string = sprintf(
+			$time_string,
+			get_the_date( DATE_W3C ),
+			get_the_date(),
+			get_the_modified_date( DATE_W3C ),
+			get_the_modified_date()
+		);
+
+		// Wrap the time string in a link, and preface it with 'Posted on'.
+		return sprintf(
+			/* translators: %s: post date */
+			__( '<span class="screen-reader-text">Posted on</span> %s', 'twentyseventeen' ),
+			'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
+		);
 	}
-
-	$time_string = sprintf( $time_string,
-		get_the_date( DATE_W3C ),
-		get_the_date(),
-		get_the_modified_date( DATE_W3C ),
-		get_the_modified_date()
-	);
-
-	// Wrap the time string in a link, and preface it with 'Posted on'.
-	return sprintf(
-		/* translators: %s: post date */
-		__( '<span class="screen-reader-text">Posted on</span> %s', 'twentyseventeen' ),
-		'<a href="' . esc_url( get_permalink() ) . '" rel="bookmark">' . $time_string . '</a>'
-	);
-}
 endif;
 
 
 if ( ! function_exists( 'twentyseventeen_entry_footer' ) ) :
-/**
- * Prints HTML with meta information for the categories, tags and comments.
- */
-function twentyseventeen_entry_footer() {
+	/**
+	 * Prints HTML with meta information for the categories, tags and comments.
+	 */
+	function twentyseventeen_entry_footer() {
 
-	/* translators: used between list items, there is a space after the comma */
-	$separate_meta = __( ', ', 'twentyseventeen' );
+		/* translators: used between list items, there is a space after the comma */
+		$separate_meta = __( ', ', 'twentyseventeen' );
 
-	// Get Categories for posts.
-	$categories_list = get_the_category_list( $separate_meta );
+		// Get Categories for posts.
+		$categories_list = get_the_category_list( $separate_meta );
 
-	// Get Tags for posts.
-	$tags_list = get_the_tag_list( '', $separate_meta );
+		// Get Tags for posts.
+		$tags_list = get_the_tag_list( '', $separate_meta );
 
-	// We don't want to output .entry-footer if it will be empty, so make sure its not.
-	if ( ( ( twentyseventeen_categorized_blog() && $categories_list ) || $tags_list ) || get_edit_post_link() ) {
+		// We don't want to output .entry-footer if it will be empty, so make sure its not.
+		if ( ( ( twentyseventeen_categorized_blog() && $categories_list ) || $tags_list ) || get_edit_post_link() ) {
 
-		echo '<footer class="entry-footer">';
+			echo '<footer class="entry-footer">';
 
 			if ( 'post' === get_post_type() ) {
 				if ( ( $categories_list && twentyseventeen_categorized_blog() ) || $tags_list ) {
 					echo '<span class="cat-tags-links">';
 
 						// Make sure there's more than one category before displaying.
-						if ( $categories_list && twentyseventeen_categorized_blog() ) {
-							echo '<span class="cat-links">' . twentyseventeen_get_svg( array( 'icon' => 'folder-open' ) ) . '<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' . $categories_list . '</span>';
-						}
+					if ( $categories_list && twentyseventeen_categorized_blog() ) {
+						echo '<span class="cat-links">' . twentyseventeen_get_svg( array( 'icon' => 'folder-open' ) ) . '<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' . $categories_list . '</span>';
+					}
 
-						if ( $tags_list && ! is_wp_error( $tags_list ) ) {
-							echo '<span class="tags-links">' . twentyseventeen_get_svg( array( 'icon' => 'hashtag' ) ) . '<span class="screen-reader-text">' . __( 'Tags', 'twentyseventeen' ) . '</span>' . $tags_list . '</span>';
-						}
+					if ( $tags_list && ! is_wp_error( $tags_list ) ) {
+						echo '<span class="tags-links">' . twentyseventeen_get_svg( array( 'icon' => 'hashtag' ) ) . '<span class="screen-reader-text">' . __( 'Tags', 'twentyseventeen' ) . '</span>' . $tags_list . '</span>';
+					}
 
 					echo '</span>';
 				}
@@ -94,32 +95,32 @@ function twentyseventeen_entry_footer() {
 
 			twentyseventeen_edit_link();
 
-		echo '</footer> <!-- .entry-footer -->';
+			echo '</footer> <!-- .entry-footer -->';
+		}
 	}
-}
 endif;
 
 
 if ( ! function_exists( 'twentyseventeen_edit_link' ) ) :
-/**
- * Returns an accessibility-friendly link to edit a post or page.
- *
- * This also gives us a little context about what exactly we're editing
- * (post or page?) so that users understand a bit more where they are in terms
- * of the template hierarchy and their content. Helpful when/if the single-page
- * layout with multiple posts/pages shown gets confusing.
- */
-function twentyseventeen_edit_link() {
-	edit_post_link(
-		sprintf(
-			/* translators: %s: Name of current post */
-			__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-			get_the_title()
-		),
-		'<span class="edit-link">',
-		'</span>'
-	);
-}
+	/**
+	 * Returns an accessibility-friendly link to edit a post or page.
+	 *
+	 * This also gives us a little context about what exactly we're editing
+	 * (post or page?) so that users understand a bit more where they are in terms
+	 * of the template hierarchy and their content. Helpful when/if the single-page
+	 * layout with multiple posts/pages shown gets confusing.
+	 */
+	function twentyseventeen_edit_link() {
+		edit_post_link(
+			sprintf(
+				/* translators: %s: Name of current post */
+				__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+				get_the_title()
+			),
+			'<span class="edit-link">',
+			'</span>'
+		);
+	}
 endif;
 
 /**
@@ -132,7 +133,7 @@ function twentyseventeen_front_page_section( $partial = null, $id = 0 ) {
 	if ( is_a( $partial, 'WP_Customize_Partial' ) ) {
 		// Find out the id and set it up during a selective refresh.
 		global $twentyseventeencounter;
-		$id = str_replace( 'panel_', '', $partial->id );
+		$id                     = str_replace( 'panel_', '', $partial->id );
 		$twentyseventeencounter = $id;
 	}
 
@@ -161,12 +162,14 @@ function twentyseventeen_categorized_blog() {
 
 	if ( false === $category_count ) {
 		// Create an array of all the categories that are attached to posts.
-		$categories = get_categories( array(
-			'fields'     => 'ids',
-			'hide_empty' => 1,
-			// We only need to know if there is more than one category.
-			'number'     => 2,
-		) );
+		$categories = get_categories(
+			array(
+				'fields'     => 'ids',
+				'hide_empty' => 1,
+				// We only need to know if there is more than one category.
+				'number'     => 2,
+			)
+		);
 
 		// Count the number of categories that are attached to the posts.
 		$category_count = count( $categories );
@@ -194,4 +197,4 @@ function twentyseventeen_category_transient_flusher() {
 	delete_transient( 'twentyseventeen_categories' );
 }
 add_action( 'edit_category', 'twentyseventeen_category_transient_flusher' );
-add_action( 'save_post',     'twentyseventeen_category_transient_flusher' );
+add_action( 'save_post', 'twentyseventeen_category_transient_flusher' );
diff --git a/wp-content/themes/twentyseventeen/index.php b/wp-content/themes/twentyseventeen/index.php
index 78d1b4c93e..3eab9ff656 100644
--- a/wp-content/themes/twentyseventeen/index.php
+++ b/wp-content/themes/twentyseventeen/index.php
@@ -35,7 +35,8 @@ get_header(); ?>
 			if ( have_posts() ) :
 
 				/* Start the Loop */
-				while ( have_posts() ) : the_post();
+				while ( have_posts() ) :
+					the_post();
 
 					/*
 					 * Include the Post-Format-specific template for the content.
@@ -46,11 +47,13 @@ get_header(); ?>
 
 				endwhile;
 
-				the_posts_pagination( array(
-					'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
-					'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
-					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
-				) );
+				the_posts_pagination(
+					array(
+						'prev_text'          => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+						'next_text'          => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+						'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
+					)
+				);
 
 			else :
 
@@ -64,4 +67,5 @@ get_header(); ?>
 	<?php get_sidebar(); ?>
 </div><!-- .wrap -->
 
-<?php get_footer();
+<?php
+get_footer();
diff --git a/wp-content/themes/twentyseventeen/page.php b/wp-content/themes/twentyseventeen/page.php
index 96211f49dc..5d42e2ce48 100644
--- a/wp-content/themes/twentyseventeen/page.php
+++ b/wp-content/themes/twentyseventeen/page.php
@@ -22,7 +22,8 @@ get_header(); ?>
 		<main id="main" class="site-main" role="main">
 
 			<?php
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				get_template_part( 'template-parts/page/content', 'page' );
 
@@ -38,4 +39,5 @@ get_header(); ?>
 	</div><!-- #primary -->
 </div><!-- .wrap -->
 
-<?php get_footer();
+<?php
+get_footer();
diff --git a/wp-content/themes/twentyseventeen/search.php b/wp-content/themes/twentyseventeen/search.php
index c6967f2031..c2a6527467 100644
--- a/wp-content/themes/twentyseventeen/search.php
+++ b/wp-content/themes/twentyseventeen/search.php
@@ -28,7 +28,8 @@ get_header(); ?>
 		<?php
 		if ( have_posts() ) :
 			/* Start the Loop */
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				/**
 				 * Run the loop for the search to output the results.
@@ -39,13 +40,16 @@ get_header(); ?>
 
 			endwhile; // End of the loop.
 
-			the_posts_pagination( array(
-				'prev_text' => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
-				'next_text' => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '<span class="screen-reader-text">' . __( 'Previous page', 'twentyseventeen' ) . '</span>',
+					'next_text'          => '<span class="screen-reader-text">' . __( 'Next page', 'twentyseventeen' ) . '</span>' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentyseventeen' ) . ' </span>',
+				)
+			);
 
-		else : ?>
+		else :
+		?>
 
 			<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyseventeen' ); ?></p>
 			<?php
@@ -59,4 +63,5 @@ get_header(); ?>
 	<?php get_sidebar(); ?>
 </div><!-- .wrap -->
 
-<?php get_footer();
+<?php
+get_footer();
diff --git a/wp-content/themes/twentyseventeen/single.php b/wp-content/themes/twentyseventeen/single.php
index f44f486951..b5136a2133 100644
--- a/wp-content/themes/twentyseventeen/single.php
+++ b/wp-content/themes/twentyseventeen/single.php
@@ -18,7 +18,8 @@ get_header(); ?>
 
 			<?php
 			/* Start the Loop */
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				get_template_part( 'template-parts/post/content', get_post_format() );
 
@@ -27,10 +28,12 @@ get_header(); ?>
 					comments_template();
 				endif;
 
-				the_post_navigation( array(
-					'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span>%title</span>',
-					'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title">%title<span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
-				) );
+				the_post_navigation(
+					array(
+						'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span>%title</span>',
+						'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title">%title<span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
+					)
+				);
 
 			endwhile; // End of the loop.
 			?>
@@ -40,4 +43,5 @@ get_header(); ?>
 	<?php get_sidebar(); ?>
 </div><!-- .wrap -->
 
-<?php get_footer();
+<?php
+get_footer();
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 28f9232d2b..e27e7c6417 100644
--- a/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php
+++ b/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php
@@ -17,12 +17,15 @@ if ( is_active_sidebar( 'sidebar-2' ) ||
 
 	<aside class="widget-area" role="complementary" aria-label="<?php esc_attr_e( 'Footer', 'twentyseventeen' ); ?>">
 		<?php
-		if ( is_active_sidebar( 'sidebar-2' ) ) { ?>
+		if ( is_active_sidebar( 'sidebar-2' ) ) {
+		?>
 			<div class="widget-column footer-widget-1">
 				<?php dynamic_sidebar( 'sidebar-2' ); ?>
 			</div>
-		<?php }
-		if ( is_active_sidebar( 'sidebar-3' ) ) { ?>
+		<?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/navigation/navigation-top.php b/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
index 2c2115e60b..5cfc99876c 100644
--- a/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
+++ b/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php
@@ -18,10 +18,14 @@
 		?>
 	</button>
 
-	<?php wp_nav_menu( array(
-		'theme_location' => 'top',
-		'menu_id'        => 'top-menu',
-	) ); ?>
+	<?php
+	wp_nav_menu(
+		array(
+			'theme_location' => 'top',
+			'menu_id'        => 'top-menu',
+		)
+	);
+	?>
 
 	<?php if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && has_custom_header() ) : ?>
 		<a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text"><?php _e( 'Scroll down to content', 'twentyseventeen' ); ?></span></a>
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 79e11949b9..93433fb50f 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
@@ -14,7 +14,8 @@ global $twentyseventeencounter;
 
 <article id="panel<?php echo $twentyseventeencounter; ?>" <?php post_class( 'twentyseventeen-panel ' ); ?> >
 
-	<?php if ( has_post_thumbnail() ) :
+	<?php
+	if ( has_post_thumbnail() ) :
 		$thumbnail = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'twentyseventeen-featured-image' );
 
 		// Calculate aspect ratio: h / w * 100%.
@@ -39,32 +40,39 @@ global $twentyseventeencounter;
 			<div class="entry-content">
 				<?php
 					/* translators: %s: Name of current post */
-					the_content( sprintf(
-						__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-						get_the_title()
-					) );
+					the_content(
+						sprintf(
+							__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+							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' )  ) : ?>
+			if ( get_the_ID() === (int) get_option( 'page_for_posts' ) ) :
+			?>
 
-				<?php // Show four most recent posts.
-				$recent_posts = new WP_Query( array(
-					'posts_per_page'      => 3,
-					'post_status'         => 'publish',
-					'ignore_sticky_posts' => true,
-					'no_found_rows'       => true,
-				) );
+				<?php
+				// Show four most recent posts.
+				$recent_posts = new WP_Query(
+					array(
+						'posts_per_page'      => 3,
+						'post_status'         => 'publish',
+						'ignore_sticky_posts' => true,
+						'no_found_rows'       => true,
+					)
+				);
 				?>
 
-		 		<?php if ( $recent_posts->have_posts() ) : ?>
+				<?php if ( $recent_posts->have_posts() ) : ?>
 
 					<div class="recent-posts">
 
 						<?php
-						while ( $recent_posts->have_posts() ) : $recent_posts->the_post();
+						while ( $recent_posts->have_posts() ) :
+							$recent_posts->the_post();
 							get_template_part( 'template-parts/post/content', 'excerpt' );
 						endwhile;
 						wp_reset_postdata();
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 84a0d7e448..a745c950d3 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
@@ -11,7 +11,8 @@
 ?>
 <article id="post-<?php the_ID(); ?>" <?php post_class( 'twentyseventeen-panel ' ); ?> >
 
-	<?php if ( has_post_thumbnail() ) :
+	<?php
+	if ( has_post_thumbnail() ) :
 		$thumbnail = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'twentyseventeen-featured-image' );
 
 		// Calculate aspect ratio: h / w * 100%.
@@ -36,10 +37,12 @@
 			<div class="entry-content">
 				<?php
 					/* translators: %s: Name of current post */
-					the_content( sprintf(
-						__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-						get_the_title()
-					) );
+					the_content(
+						sprintf(
+							__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+							get_the_title()
+						)
+					);
 				?>
 			</div><!-- .entry-content -->
 
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 4c470acfbe..cc054a0885 100644
--- a/wp-content/themes/twentyseventeen/template-parts/page/content-page.php
+++ b/wp-content/themes/twentyseventeen/template-parts/page/content-page.php
@@ -21,10 +21,12 @@
 		<?php
 			the_content();
 
-			wp_link_pages( array(
-				'before' => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
-				'after'  => '</div>',
-			) );
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
+					'after'  => '</div>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 </article><!-- #post-## -->
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php b/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
index 63cf2e54cb..627c0ff2d7 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php
@@ -14,41 +14,41 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<?php
-		if ( is_sticky() && is_home() ) {
-			echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
-		}
+	if ( is_sticky() && is_home() ) {
+		echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+	}
 	?>
 	<header class="entry-header">
 		<?php
-			if ( 'post' === get_post_type() ) {
-				echo '<div class="entry-meta">';
-					if ( is_single() ) {
-						twentyseventeen_posted_on();
-					} else {
-						echo twentyseventeen_time_link();
-						twentyseventeen_edit_link();
-					};
-				echo '</div><!-- .entry-meta -->';
-			};
-
+		if ( 'post' === get_post_type() ) {
+			echo '<div class="entry-meta">';
 			if ( is_single() ) {
-				the_title( '<h1 class="entry-title">', '</h1>' );
-			} elseif ( is_front_page() && is_home() ) {
-				the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+				twentyseventeen_posted_on();
 			} else {
-				the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
-			}
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
+				echo '</div><!-- .entry-meta -->';
+		};
+
+		if ( is_single() ) {
+			the_title( '<h1 class="entry-title">', '</h1>' );
+		} elseif ( is_front_page() && is_home() ) {
+			the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+		} else {
+			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+		}
 		?>
 	</header><!-- .entry-header -->
 
 	<?php
 		$content = apply_filters( 'the_content', get_the_content() );
-		$audio = false;
+		$audio   = false;
 
 		// Only get audio from the content if a playlist isn't present.
-		if ( false === strpos( $content, 'wp-playlist-script' ) ) {
-			$audio = get_media_embedded_in_content( $content, array( 'audio' ) );
-		}
+	if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+		$audio = get_media_embedded_in_content( $content, array( 'audio' ) );
+	}
 
 	?>
 
@@ -79,17 +79,21 @@
 		if ( is_single() || empty( $audio ) ) {
 
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-				get_the_title()
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+					get_the_title()
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
-				'after'       => '</div>',
-				'link_before' => '<span class="page-number">',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
+					'after'       => '</div>',
+					'link_before' => '<span class="page-number">',
+					'link_after'  => '</span>',
+				)
+			);
 
 		};
 		?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php b/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php
index a552fba0cd..0c640b6ead 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-excerpt.php
@@ -30,13 +30,15 @@
 			</div><!-- .entry-meta -->
 		<?php endif; ?>
 
-		<?php if ( is_front_page() && ! is_home() ) {
+		<?php
+		if ( is_front_page() && ! is_home() ) {
 
 			// The excerpt is being displayed within a front page section, so it's a lower hierarchy than h2.
 			the_title( sprintf( '<h3 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h3>' );
 		} else {
 			the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' );
-		} ?>
+		}
+		?>
 	</header><!-- .entry-header -->
 
 	<div class="entry-summary">
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php b/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php
index f5934e136d..0ede45c4c3 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-gallery.php
@@ -22,12 +22,12 @@
 		<?php
 		if ( 'post' === get_post_type() ) {
 			echo '<div class="entry-meta">';
-				if ( is_single() ) {
-					twentyseventeen_posted_on();
-				} else {
-					echo twentyseventeen_time_link();
-					twentyseventeen_edit_link();
-				};
+			if ( is_single() ) {
+				twentyseventeen_posted_on();
+			} else {
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
 			echo '</div><!-- .entry-meta -->';
 		};
 
@@ -66,17 +66,21 @@
 		if ( is_single() || ! get_post_gallery() ) {
 
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-				get_the_title()
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+					get_the_title()
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
-				'after'       => '</div>',
-				'link_before' => '<span class="page-number">',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
+					'after'       => '</div>',
+					'link_before' => '<span class="page-number">',
+					'link_after'  => '</span>',
+				)
+			);
 
 		};
 		?>
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-image.php b/wp-content/themes/twentyseventeen/template-parts/post/content-image.php
index 91c6545065..e577b4b9a6 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-image.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-image.php
@@ -14,30 +14,30 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<?php
-		if ( is_sticky() && is_home() ) {
-			echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
-		}
+	if ( is_sticky() && is_home() ) {
+		echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+	}
 	?>
 	<header class="entry-header">
 		<?php
-			if ( 'post' === get_post_type() ) {
-				echo '<div class="entry-meta">';
-					if ( is_single() ) {
-						twentyseventeen_posted_on();
-					} else {
-						echo twentyseventeen_time_link();
-						twentyseventeen_edit_link();
-					};
-				echo '</div><!-- .entry-meta -->';
-			};
-
+		if ( 'post' === get_post_type() ) {
+			echo '<div class="entry-meta">';
 			if ( is_single() ) {
-				the_title( '<h1 class="entry-title">', '</h1>' );
-			} elseif ( is_front_page() && is_home() ) {
-				the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+				twentyseventeen_posted_on();
 			} else {
-				the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
-			}
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
+				echo '</div><!-- .entry-meta -->';
+		};
+
+		if ( is_single() ) {
+			the_title( '<h1 class="entry-title">', '</h1>' );
+		} elseif ( is_front_page() && is_home() ) {
+			the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+		} else {
+			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+		}
 		?>
 	</header><!-- .entry-header -->
 
@@ -51,21 +51,26 @@
 
 	<div class="entry-content">
 
-		<?php if ( is_single() || '' === get_the_post_thumbnail() ) {
+		<?php
+		if ( is_single() || '' === get_the_post_thumbnail() ) {
 
 			// Only show content if is a single post, or if there's no featured image.
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-				get_the_title()
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+					get_the_title()
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
-				'after'       => '</div>',
-				'link_before' => '<span class="page-number">',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
+					'after'       => '</div>',
+					'link_before' => '<span class="page-number">',
+					'link_after'  => '</span>',
+				)
+			);
 
 		};
 		?>
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 c42941bb8d..9654c1e974 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-none.php
@@ -18,7 +18,8 @@
 	</header>
 	<div class="page-content">
 		<?php
-		if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
+		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>
 
@@ -28,6 +29,7 @@
 			<?php
 				get_search_form();
 
-		endif; ?>
+		endif;
+		?>
 	</div><!-- .page-content -->
 </section><!-- .no-results -->
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content-video.php b/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
index dad681fb8e..67300ada36 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content-video.php
@@ -14,41 +14,41 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<?php
-		if ( is_sticky() && is_home() ) {
-			echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
-		}
+	if ( is_sticky() && is_home() ) {
+		echo twentyseventeen_get_svg( array( 'icon' => 'thumb-tack' ) );
+	}
 	?>
 	<header class="entry-header">
 		<?php
-			if ( 'post' === get_post_type() ) {
-				echo '<div class="entry-meta">';
-					if ( is_single() ) {
-						twentyseventeen_posted_on();
-					} else {
-						echo twentyseventeen_time_link();
-						twentyseventeen_edit_link();
-					}
-				echo '</div><!-- .entry-meta -->';
-			};
-
+		if ( 'post' === get_post_type() ) {
+			echo '<div class="entry-meta">';
 			if ( is_single() ) {
-				the_title( '<h1 class="entry-title">', '</h1>' );
-			} elseif ( is_front_page() && is_home() ) {
-				the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+				twentyseventeen_posted_on();
 			} else {
-				the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
 			}
+				echo '</div><!-- .entry-meta -->';
+		};
+
+		if ( is_single() ) {
+			the_title( '<h1 class="entry-title">', '</h1>' );
+		} elseif ( is_front_page() && is_home() ) {
+			the_title( '<h3 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h3>' );
+		} else {
+			the_title( '<h2 class="entry-title"><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h2>' );
+		}
 		?>
 	</header><!-- .entry-header -->
 
 	<?php
 		$content = apply_filters( 'the_content', get_the_content() );
-		$video = false;
+		$video   = false;
 
 		// Only get video from the content if a playlist isn't present.
-		if ( false === strpos( $content, 'wp-playlist-script' ) ) {
-			$video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
-		}
+	if ( false === strpos( $content, 'wp-playlist-script' ) ) {
+		$video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
+	}
 	?>
 
 	<?php if ( '' !== get_the_post_thumbnail() && ! is_single() && empty( $video ) ) : ?>
@@ -78,17 +78,21 @@
 		if ( is_single() || empty( $video ) ) {
 
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-				get_the_title()
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+					get_the_title()
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
-				'after'       => '</div>',
-				'link_before' => '<span class="page-number">',
-				'link_after'  => '</span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
+					'after'       => '</div>',
+					'link_before' => '<span class="page-number">',
+					'link_after'  => '</span>',
+				)
+			);
 		};
 		?>
 
diff --git a/wp-content/themes/twentyseventeen/template-parts/post/content.php b/wp-content/themes/twentyseventeen/template-parts/post/content.php
index 90c3a4d4c4..6881be7675 100644
--- a/wp-content/themes/twentyseventeen/template-parts/post/content.php
+++ b/wp-content/themes/twentyseventeen/template-parts/post/content.php
@@ -22,12 +22,12 @@
 		<?php
 		if ( 'post' === get_post_type() ) {
 			echo '<div class="entry-meta">';
-				if ( is_single() ) {
-					twentyseventeen_posted_on();
-				} else {
-					echo twentyseventeen_time_link();
-					twentyseventeen_edit_link();
-				};
+			if ( is_single() ) {
+				twentyseventeen_posted_on();
+			} else {
+				echo twentyseventeen_time_link();
+				twentyseventeen_edit_link();
+			};
 			echo '</div><!-- .entry-meta -->';
 		};
 
@@ -52,17 +52,21 @@
 	<div class="entry-content">
 		<?php
 		/* translators: %s: Name of current post */
-		the_content( sprintf(
-			__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
-			get_the_title()
-		) );
+		the_content(
+			sprintf(
+				__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentyseventeen' ),
+				get_the_title()
+			)
+		);
 
-		wp_link_pages( array(
-			'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
-			'after'       => '</div>',
-			'link_before' => '<span class="page-number">',
-			'link_after'  => '</span>',
-		) );
+		wp_link_pages(
+			array(
+				'before'      => '<div class="page-links">' . __( 'Pages:', 'twentyseventeen' ),
+				'after'       => '</div>',
+				'link_before' => '<span class="page-number">',
+				'link_after'  => '</span>',
+			)
+		);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentysixteen/archive.php b/wp-content/themes/twentysixteen/archive.php
index bdd2967e52..7f302359ab 100644
--- a/wp-content/themes/twentysixteen/archive.php
+++ b/wp-content/themes/twentysixteen/archive.php
@@ -32,7 +32,8 @@ get_header(); ?>
 
 			<?php
 			// Start the Loop.
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				/*
 				 * Include the Post-Format-specific template for the content.
@@ -41,17 +42,19 @@ get_header(); ?>
 				 */
 				get_template_part( 'template-parts/content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination( array(
-				'prev_text'          => __( 'Previous page', 'twentysixteen' ),
-				'next_text'          => __( 'Next page', 'twentysixteen' ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
+					'next_text'          => __( 'Next page', 'twentysixteen' ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
+				)
+			);
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'template-parts/content', 'none' );
 
diff --git a/wp-content/themes/twentysixteen/comments.php b/wp-content/themes/twentysixteen/comments.php
index 7ff5b32d0c..95dd5651e3 100644
--- a/wp-content/themes/twentysixteen/comments.php
+++ b/wp-content/themes/twentysixteen/comments.php
@@ -26,23 +26,23 @@ if ( post_password_required() ) {
 		<h2 class="comments-title">
 			<?php
 				$comments_number = get_comments_number();
-				if ( '1' === $comments_number ) {
-					/* translators: %s: post title */
-					printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentysixteen' ), get_the_title() );
-				} else {
-					printf(
-						/* translators: 1: number of comments, 2: post title */
-						_nx(
-							'%1$s thought on &ldquo;%2$s&rdquo;',
-							'%1$s thoughts on &ldquo;%2$s&rdquo;',
-							$comments_number,
-							'comments title',
-							'twentysixteen'
-						),
-						number_format_i18n( $comments_number ),
-						get_the_title()
-					);
-				}
+			if ( '1' === $comments_number ) {
+				/* translators: %s: post title */
+				printf( _x( 'One thought on &ldquo;%s&rdquo;', 'comments title', 'twentysixteen' ), get_the_title() );
+			} else {
+				printf(
+					/* translators: 1: number of comments, 2: post title */
+					_nx(
+						'%1$s thought on &ldquo;%2$s&rdquo;',
+						'%1$s thoughts on &ldquo;%2$s&rdquo;',
+						$comments_number,
+						'comments title',
+						'twentysixteen'
+					),
+					number_format_i18n( $comments_number ),
+					get_the_title()
+				);
+			}
 			?>
 		</h2>
 
@@ -50,11 +50,13 @@ if ( post_password_required() ) {
 
 		<ol class="comment-list">
 			<?php
-				wp_list_comments( array(
-					'style'       => 'ol',
-					'short_ping'  => true,
-					'avatar_size' => 42,
-				) );
+				wp_list_comments(
+					array(
+						'style'       => 'ol',
+						'short_ping'  => true,
+						'avatar_size' => 42,
+					)
+				);
 			?>
 		</ol><!-- .comment-list -->
 
@@ -64,16 +66,18 @@ 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' ) ) :
+	if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
 	?>
-		<p class="no-comments"><?php _e( 'Comments are closed.', 'twentysixteen' ); ?></p>
+	<p class="no-comments"><?php _e( 'Comments are closed.', 'twentysixteen' ); ?></p>
 	<?php endif; ?>
 
 	<?php
-		comment_form( array(
-			'title_reply_before' => '<h2 id="reply-title" class="comment-reply-title">',
-			'title_reply_after'  => '</h2>',
-		) );
+		comment_form(
+			array(
+				'title_reply_before' => '<h2 id="reply-title" class="comment-reply-title">',
+				'title_reply_after'  => '</h2>',
+			)
+		);
 	?>
 
 </div><!-- .comments-area -->
diff --git a/wp-content/themes/twentysixteen/footer.php b/wp-content/themes/twentysixteen/footer.php
index 5cf4622770..037633a98d 100644
--- a/wp-content/themes/twentysixteen/footer.php
+++ b/wp-content/themes/twentysixteen/footer.php
@@ -16,10 +16,12 @@
 			<?php if ( has_nav_menu( 'primary' ) ) : ?>
 				<nav class="main-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Footer Primary Menu', 'twentysixteen' ); ?>">
 					<?php
-						wp_nav_menu( array(
-							'theme_location' => 'primary',
-							'menu_class'     => 'primary-menu',
-						) );
+						wp_nav_menu(
+							array(
+								'theme_location' => 'primary',
+								'menu_class'     => 'primary-menu',
+							)
+						);
 					?>
 				</nav><!-- .main-navigation -->
 			<?php endif; ?>
@@ -27,13 +29,15 @@
 			<?php if ( has_nav_menu( 'social' ) ) : ?>
 				<nav class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Footer Social Links Menu', 'twentysixteen' ); ?>">
 					<?php
-						wp_nav_menu( array(
-							'theme_location' => 'social',
-							'menu_class'     => 'social-links-menu',
-							'depth'          => 1,
-							'link_before'    => '<span class="screen-reader-text">',
-							'link_after'     => '</span>',
-						) );
+						wp_nav_menu(
+							array(
+								'theme_location' => 'social',
+								'menu_class'     => 'social-links-menu',
+								'depth'          => 1,
+								'link_before'    => '<span class="screen-reader-text">',
+								'link_after'     => '</span>',
+							)
+						);
 					?>
 				</nav><!-- .social-navigation -->
 			<?php endif; ?>
diff --git a/wp-content/themes/twentysixteen/functions.php b/wp-content/themes/twentysixteen/functions.php
index d6e58e1a92..3e675eafb8 100644
--- a/wp-content/themes/twentysixteen/functions.php
+++ b/wp-content/themes/twentysixteen/functions.php
@@ -33,100 +33,108 @@ if ( version_compare( $GLOBALS['wp_version'], '4.4-alpha', '<' ) ) {
 }
 
 if ( ! function_exists( 'twentysixteen_setup' ) ) :
-/**
- * Sets up theme defaults and registers support for various WordPress features.
- *
- * Note that this function is hooked into the after_setup_theme hook, which
- * runs before the init hook. The init hook is too late for some features, such
- * as indicating support for post thumbnails.
- *
- * Create your own twentysixteen_setup() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- */
-function twentysixteen_setup() {
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentysixteen
-	 * If you're building a theme based on Twenty Sixteen, use a find and replace
-	 * to change 'twentysixteen' to the name of your theme in all the template files
-	 */
-	load_theme_textdomain( 'twentysixteen' );
-
-	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
-
-	/*
-	 * Let WordPress manage the document title.
-	 * By adding theme support, we declare that this theme does not use a
-	 * hard-coded <title> tag in the document head, and expect WordPress to
-	 * provide it for us.
-	 */
-	add_theme_support( 'title-tag' );
-
-	/*
-	 * Enable support for custom logo.
+	/**
+	 * Sets up theme defaults and registers support for various WordPress features.
 	 *
-	 *  @since Twenty Sixteen 1.2
-	 */
-	add_theme_support( 'custom-logo', array(
-		'height'      => 240,
-		'width'       => 240,
-		'flex-height' => true,
-	) );
-
-	/*
-	 * Enable support for Post Thumbnails on posts and pages.
+	 * Note that this function is hooked into the after_setup_theme hook, which
+	 * runs before the init hook. The init hook is too late for some features, such
+	 * as indicating support for post thumbnails.
 	 *
-	 * @link https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
-	 */
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 1200, 9999 );
-
-	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu', 'twentysixteen' ),
-		'social'  => __( 'Social Links Menu', 'twentysixteen' ),
-	) );
-
-	/*
-	 * Switch default core markup for search form, comment form, and comments
-	 * to output valid HTML5.
-	 */
-	add_theme_support( 'html5', array(
-		'search-form',
-		'comment-form',
-		'comment-list',
-		'gallery',
-		'caption',
-	) );
-
-	/*
-	 * Enable support for Post Formats.
+	 * Create your own twentysixteen_setup() function to override in a child theme.
 	 *
-	 * See: https://codex.wordpress.org/Post_Formats
+	 * @since Twenty Sixteen 1.0
 	 */
-	add_theme_support( 'post-formats', array(
-		'aside',
-		'image',
-		'video',
-		'quote',
-		'link',
-		'gallery',
-		'status',
-		'audio',
-		'chat',
-	) );
+	function twentysixteen_setup() {
+		/*
+		 * Make theme available for translation.
+		 * Translations can be filed at WordPress.org. See: https://translate.wordpress.org/projects/wp-themes/twentysixteen
+		 * If you're building a theme based on Twenty Sixteen, use a find and replace
+		 * to change 'twentysixteen' to the name of your theme in all the template files
+		 */
+		load_theme_textdomain( 'twentysixteen' );
 
-	/*
-	 * This theme styles the visual editor to resemble the theme style,
-	 * specifically font, colors, icons, and column width.
-	 */
-	add_editor_style( array( 'css/editor-style.css', twentysixteen_fonts_url() ) );
+		// Add default posts and comments RSS feed links to head.
+		add_theme_support( 'automatic-feed-links' );
 
-	// Indicate widget sidebars can use selective refresh in the Customizer.
-	add_theme_support( 'customize-selective-refresh-widgets' );
-}
+		/*
+		 * Let WordPress manage the document title.
+		 * By adding theme support, we declare that this theme does not use a
+		 * hard-coded <title> tag in the document head, and expect WordPress to
+		 * provide it for us.
+		 */
+		add_theme_support( 'title-tag' );
+
+		/*
+		 * Enable support for custom logo.
+		 *
+		 *  @since Twenty Sixteen 1.2
+		 */
+		add_theme_support(
+			'custom-logo', array(
+				'height'      => 240,
+				'width'       => 240,
+				'flex-height' => true,
+			)
+		);
+
+		/*
+		 * Enable support for Post Thumbnails on posts and pages.
+		 *
+		 * @link https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
+		 */
+		add_theme_support( 'post-thumbnails' );
+		set_post_thumbnail_size( 1200, 9999 );
+
+		// This theme uses wp_nav_menu() in two locations.
+		register_nav_menus(
+			array(
+				'primary' => __( 'Primary Menu', 'twentysixteen' ),
+				'social'  => __( 'Social Links Menu', 'twentysixteen' ),
+			)
+		);
+
+		/*
+		 * Switch default core markup for search form, comment form, and comments
+		 * to output valid HTML5.
+		 */
+		add_theme_support(
+			'html5', array(
+				'search-form',
+				'comment-form',
+				'comment-list',
+				'gallery',
+				'caption',
+			)
+		);
+
+		/*
+		 * Enable support for Post Formats.
+		 *
+		 * See: https://codex.wordpress.org/Post_Formats
+		 */
+		add_theme_support(
+			'post-formats', array(
+				'aside',
+				'image',
+				'video',
+				'quote',
+				'link',
+				'gallery',
+				'status',
+				'audio',
+				'chat',
+			)
+		);
+
+		/*
+		 * This theme styles the visual editor to resemble the theme style,
+		 * specifically font, colors, icons, and column width.
+		 */
+		add_editor_style( array( 'css/editor-style.css', twentysixteen_fonts_url() ) );
+
+		// Indicate widget sidebars can use selective refresh in the Customizer.
+		add_theme_support( 'customize-selective-refresh-widgets' );
+	}
 endif; // twentysixteen_setup
 add_action( 'after_setup_theme', 'twentysixteen_setup' );
 
@@ -152,77 +160,85 @@ add_action( 'after_setup_theme', 'twentysixteen_content_width', 0 );
  * @since Twenty Sixteen 1.0
  */
 function twentysixteen_widgets_init() {
-	register_sidebar( array(
-		'name'          => __( 'Sidebar', 'twentysixteen' ),
-		'id'            => 'sidebar-1',
-		'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentysixteen' ),
-		'before_widget' => '<section id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</section>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Sidebar', 'twentysixteen' ),
+			'id'            => 'sidebar-1',
+			'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentysixteen' ),
+			'before_widget' => '<section id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</section>',
+			'before_title'  => '<h2 class="widget-title">',
+			'after_title'   => '</h2>',
+		)
+	);
 
-	register_sidebar( array(
-		'name'          => __( 'Content Bottom 1', 'twentysixteen' ),
-		'id'            => 'sidebar-2',
-		'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
-		'before_widget' => '<section id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</section>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Content Bottom 1', 'twentysixteen' ),
+			'id'            => 'sidebar-2',
+			'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
+			'before_widget' => '<section id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</section>',
+			'before_title'  => '<h2 class="widget-title">',
+			'after_title'   => '</h2>',
+		)
+	);
 
-	register_sidebar( array(
-		'name'          => __( 'Content Bottom 2', 'twentysixteen' ),
-		'id'            => 'sidebar-3',
-		'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
-		'before_widget' => '<section id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</section>',
-		'before_title'  => '<h2 class="widget-title">',
-		'after_title'   => '</h2>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Content Bottom 2', 'twentysixteen' ),
+			'id'            => 'sidebar-3',
+			'description'   => __( 'Appears at the bottom of the content on posts and pages.', 'twentysixteen' ),
+			'before_widget' => '<section id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</section>',
+			'before_title'  => '<h2 class="widget-title">',
+			'after_title'   => '</h2>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentysixteen_widgets_init' );
 
 if ( ! function_exists( 'twentysixteen_fonts_url' ) ) :
-/**
- * Register Google fonts for Twenty Sixteen.
- *
- * Create your own twentysixteen_fonts_url() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- *
- * @return string Google fonts URL for the theme.
- */
-function twentysixteen_fonts_url() {
-	$fonts_url = '';
-	$fonts     = array();
-	$subsets   = 'latin,latin-ext';
+	/**
+	 * Register Google fonts for Twenty Sixteen.
+	 *
+	 * Create your own twentysixteen_fonts_url() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @return string Google fonts URL for the theme.
+	 */
+	function twentysixteen_fonts_url() {
+		$fonts_url = '';
+		$fonts     = array();
+		$subsets   = 'latin,latin-ext';
 
-	/* translators: If there are characters in your language that are not supported by Merriweather, translate this to 'off'. Do not translate into your own language. */
-	if ( 'off' !== _x( 'on', 'Merriweather font: on or off', 'twentysixteen' ) ) {
-		$fonts[] = 'Merriweather:400,700,900,400italic,700italic,900italic';
+		/* translators: If there are characters in your language that are not supported by Merriweather, translate this to 'off'. Do not translate into your own language. */
+		if ( 'off' !== _x( 'on', 'Merriweather font: on or off', 'twentysixteen' ) ) {
+			$fonts[] = 'Merriweather:400,700,900,400italic,700italic,900italic';
+		}
+
+		/* translators: If there are characters in your language that are not supported by Montserrat, translate this to 'off'. Do not translate into your own language. */
+		if ( 'off' !== _x( 'on', 'Montserrat font: on or off', 'twentysixteen' ) ) {
+			$fonts[] = 'Montserrat:400,700';
+		}
+
+		/* translators: If there are characters in your language that are not supported by Inconsolata, translate this to 'off'. Do not translate into your own language. */
+		if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentysixteen' ) ) {
+			$fonts[] = 'Inconsolata:400';
+		}
+
+		if ( $fonts ) {
+			$fonts_url = add_query_arg(
+				array(
+					'family' => urlencode( implode( '|', $fonts ) ),
+					'subset' => urlencode( $subsets ),
+				), 'https://fonts.googleapis.com/css'
+			);
+		}
+
+		return $fonts_url;
 	}
-
-	/* translators: If there are characters in your language that are not supported by Montserrat, translate this to 'off'. Do not translate into your own language. */
-	if ( 'off' !== _x( 'on', 'Montserrat font: on or off', 'twentysixteen' ) ) {
-		$fonts[] = 'Montserrat:400,700';
-	}
-
-	/* translators: If there are characters in your language that are not supported by Inconsolata, translate this to 'off'. Do not translate into your own language. */
-	if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentysixteen' ) ) {
-		$fonts[] = 'Inconsolata:400';
-	}
-
-	if ( $fonts ) {
-		$fonts_url = add_query_arg( array(
-			'family' => urlencode( implode( '|', $fonts ) ),
-			'subset' => urlencode( $subsets ),
-		), 'https://fonts.googleapis.com/css' );
-	}
-
-	return $fonts_url;
-}
 endif;
 
 /**
@@ -280,10 +296,12 @@ 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(
-		'expand'   => __( 'expand child menu', 'twentysixteen' ),
-		'collapse' => __( 'collapse child menu', 'twentysixteen' ),
-	) );
+	wp_localize_script(
+		'twentysixteen-script', 'screenReaderText', array(
+			'expand'   => __( 'expand child menu', 'twentysixteen' ),
+			'collapse' => __( 'collapse child menu', 'twentysixteen' ),
+		)
+	);
 }
 add_action( 'wp_enqueue_scripts', 'twentysixteen_scripts' );
 
@@ -333,10 +351,10 @@ function twentysixteen_hex2rgb( $color ) {
 	$color = trim( $color, '#' );
 
 	if ( strlen( $color ) === 3 ) {
-		$r = hexdec( substr( $color, 0, 1 ).substr( $color, 0, 1 ) );
-		$g = hexdec( substr( $color, 1, 1 ).substr( $color, 1, 1 ) );
-		$b = hexdec( substr( $color, 2, 1 ).substr( $color, 2, 1 ) );
-	} else if ( strlen( $color ) === 6 ) {
+		$r = hexdec( substr( $color, 0, 1 ) . substr( $color, 0, 1 ) );
+		$g = hexdec( substr( $color, 1, 1 ) . substr( $color, 1, 1 ) );
+		$b = hexdec( substr( $color, 2, 1 ) . substr( $color, 2, 1 ) );
+	} elseif ( strlen( $color ) === 6 ) {
 		$r = hexdec( substr( $color, 0, 2 ) );
 		$g = hexdec( substr( $color, 2, 2 ) );
 		$b = hexdec( substr( $color, 4, 2 ) );
@@ -344,7 +362,11 @@ function twentysixteen_hex2rgb( $color ) {
 		return array();
 	}
 
-	return array( 'red' => $r, 'green' => $g, 'blue' => $b );
+	return array(
+		'red'   => $r,
+		'green' => $g,
+		'blue'  => $b,
+	);
 }
 
 /**
@@ -389,7 +411,7 @@ function twentysixteen_content_image_sizes_attr( $sizes, $size ) {
 
 	return $sizes;
 }
-add_filter( 'wp_calculate_image_sizes', 'twentysixteen_content_image_sizes_attr', 10 , 2 );
+add_filter( 'wp_calculate_image_sizes', 'twentysixteen_content_image_sizes_attr', 10, 2 );
 
 /**
  * Add custom image sizes attribute to enhance responsive image functionality
@@ -412,7 +434,7 @@ function twentysixteen_post_thumbnail_sizes_attr( $attr, $attachment, $size ) {
 	}
 	return $attr;
 }
-add_filter( 'wp_get_attachment_image_attributes', 'twentysixteen_post_thumbnail_sizes_attr', 10 , 3 );
+add_filter( 'wp_get_attachment_image_attributes', 'twentysixteen_post_thumbnail_sizes_attr', 10, 3 );
 
 /**
  * Modifies tag cloud widget arguments to display all tags in the same font size
@@ -427,7 +449,7 @@ function twentysixteen_widget_tag_cloud_args( $args ) {
 	$args['largest']  = 1;
 	$args['smallest'] = 1;
 	$args['unit']     = 'em';
-	$args['format']   = 'list'; 
+	$args['format']   = 'list';
 
 	return $args;
 }
diff --git a/wp-content/themes/twentysixteen/header.php b/wp-content/themes/twentysixteen/header.php
index 497f441866..9bc0d3e643 100644
--- a/wp-content/themes/twentysixteen/header.php
+++ b/wp-content/themes/twentysixteen/header.php
@@ -35,10 +35,12 @@
 						<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 					<?php else : ?>
 						<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
-					<?php endif;
+					<?php
+					endif;
 
 					$description = get_bloginfo( 'description', 'display' );
-					if ( $description || is_customize_preview() ) : ?>
+if ( $description || is_customize_preview() ) :
+					?>
 						<p class="site-description"><?php echo $description; ?></p>
 					<?php endif; ?>
 				</div><!-- .site-branding -->
@@ -50,10 +52,12 @@
 						<?php if ( has_nav_menu( 'primary' ) ) : ?>
 							<nav id="site-navigation" class="main-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Primary Menu', 'twentysixteen' ); ?>">
 								<?php
-									wp_nav_menu( array(
-										'theme_location' => 'primary',
-										'menu_class'     => 'primary-menu',
-									) );
+									wp_nav_menu(
+										array(
+											'theme_location' => 'primary',
+											'menu_class' => 'primary-menu',
+										)
+									);
 								?>
 							</nav><!-- .main-navigation -->
 						<?php endif; ?>
@@ -61,13 +65,15 @@
 						<?php if ( has_nav_menu( 'social' ) ) : ?>
 							<nav id="social-navigation" class="social-navigation" role="navigation" aria-label="<?php esc_attr_e( 'Social Links Menu', 'twentysixteen' ); ?>">
 								<?php
-									wp_nav_menu( array(
-										'theme_location' => 'social',
-										'menu_class'     => 'social-links-menu',
-										'depth'          => 1,
-										'link_before'    => '<span class="screen-reader-text">',
-										'link_after'     => '</span>',
-									) );
+									wp_nav_menu(
+										array(
+											'theme_location' => 'social',
+											'menu_class'  => 'social-links-menu',
+											'depth'       => 1,
+											'link_before' => '<span class="screen-reader-text">',
+											'link_after'  => '</span>',
+										)
+									);
 								?>
 							</nav><!-- .social-navigation -->
 						<?php endif; ?>
diff --git a/wp-content/themes/twentysixteen/image.php b/wp-content/themes/twentysixteen/image.php
index 434b0b0220..f67048b3b4 100644
--- a/wp-content/themes/twentysixteen/image.php
+++ b/wp-content/themes/twentysixteen/image.php
@@ -14,93 +14,99 @@ get_header(); ?>
 
 			<?php
 				// Start the loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 			?>
 
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+			<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-					<nav id="image-navigation" class="navigation image-navigation">
-						<div class="nav-links">
-							<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentysixteen' ) ); ?></div>
-							<div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentysixteen' ) ); ?></div>
-						</div><!-- .nav-links -->
-					</nav><!-- .image-navigation -->
+				<nav id="image-navigation" class="navigation image-navigation">
+					<div class="nav-links">
+						<div class="nav-previous"><?php previous_image_link( false, __( 'Previous Image', 'twentysixteen' ) ); ?></div>
+						<div class="nav-next"><?php next_image_link( false, __( 'Next Image', 'twentysixteen' ) ); ?></div>
+					</div><!-- .nav-links -->
+				</nav><!-- .image-navigation -->
 
-					<header class="entry-header">
-						<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
-					</header><!-- .entry-header -->
+				<header class="entry-header">
+					<?php the_title( '<h1 class="entry-title">', '</h1>' ); ?>
+				</header><!-- .entry-header -->
 
-					<div class="entry-content">
+				<div class="entry-content">
 
-						<div class="entry-attachment">
-							<?php
-								/**
-								 * Filter the default twentysixteen image attachment size.
-								 *
-								 * @since Twenty Sixteen 1.0
-								 *
-								 * @param string $image_size Image size. Default 'large'.
-								 */
-								$image_size = apply_filters( 'twentysixteen_attachment_size', 'large' );
+					<div class="entry-attachment">
+						<?php
+							/**
+							 * Filter the default twentysixteen image attachment size.
+							 *
+							 * @since Twenty Sixteen 1.0
+							 *
+							 * @param string $image_size Image size. Default 'large'.
+							 */
+							$image_size = apply_filters( 'twentysixteen_attachment_size', 'large' );
 
-								echo wp_get_attachment_image( get_the_ID(), $image_size );
-							?>
+							echo wp_get_attachment_image( get_the_ID(), $image_size );
+						?>
 
-							<?php twentysixteen_excerpt( 'entry-caption' ); ?>
+						<?php twentysixteen_excerpt( 'entry-caption' ); ?>
 
 						</div><!-- .entry-attachment -->
 
 						<?php
-							the_content();
-							wp_link_pages( array(
+						the_content();
+						wp_link_pages(
+							array(
 								'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
 								'after'       => '</div>',
 								'link_before' => '<span>',
 								'link_after'  => '</span>',
 								'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
 								'separator'   => '<span class="screen-reader-text">, </span>',
-							) );
-						?>
+							)
+						);
+					?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-footer">
-						<?php twentysixteen_entry_meta(); ?>
+					<?php twentysixteen_entry_meta(); ?>
 						<?php
-							// Retrieve attachment metadata.
-							$metadata = wp_get_attachment_metadata();
-							if ( $metadata ) {
-								printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
-									esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentysixteen' ),
-									esc_url( wp_get_attachment_url() ),
-									absint( $metadata['width'] ),
-									absint( $metadata['height'] )
-								);
-							}
-						?>
-						<?php
-							edit_post_link(
-								sprintf(
-									/* translators: %s: Name of current post */
-									__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
-									get_the_title()
-								),
-								'<span class="edit-link">',
-								'</span>'
+						// Retrieve attachment metadata.
+						$metadata = wp_get_attachment_metadata();
+						if ( $metadata ) {
+							printf(
+								'<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
+								esc_html_x( 'Full size', 'Used before full size attachment link.', 'twentysixteen' ),
+								esc_url( wp_get_attachment_url() ),
+								absint( $metadata['width'] ),
+								absint( $metadata['height'] )
 							);
+						}
 						?>
+						<?php
+						edit_post_link(
+							sprintf(
+								/* translators: %s: Name of current post */
+								__( 'Edit<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
+								get_the_title()
+							),
+							'<span class="edit-link">',
+							'</span>'
+						);
+					?>
 					</footer><!-- .entry-footer -->
 				</article><!-- #post-## -->
 
 				<?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 are open or we have at least one comment, load up the comment template.
+				if ( comments_open() || get_comments_number() ) {
+					comments_template();
+				}
 
-					// Parent post navigation.
-					the_post_navigation( array(
+				// Parent post navigation.
+				the_post_navigation(
+					array(
 						'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentysixteen' ),
-					) );
+					)
+				);
 				// End the loop.
 				endwhile;
 			?>
diff --git a/wp-content/themes/twentysixteen/inc/back-compat.php b/wp-content/themes/twentysixteen/inc/back-compat.php
index 7ed4240c8b..ed0f86df03 100644
--- a/wp-content/themes/twentysixteen/inc/back-compat.php
+++ b/wp-content/themes/twentysixteen/inc/back-compat.php
@@ -50,9 +50,11 @@ function twentysixteen_upgrade_notice() {
  * @global string $wp_version WordPress version.
  */
 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(
-		'back_link' => true,
-	) );
+	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(
+			'back_link' => true,
+		)
+	);
 }
 add_action( 'load-customize.php', 'twentysixteen_customize' );
 
diff --git a/wp-content/themes/twentysixteen/inc/customizer.php b/wp-content/themes/twentysixteen/inc/customizer.php
index 62eb1b0b39..0cc2fb5296 100644
--- a/wp-content/themes/twentysixteen/inc/customizer.php
+++ b/wp-content/themes/twentysixteen/inc/customizer.php
@@ -30,9 +30,13 @@ function twentysixteen_custom_header_and_background() {
 	 *     @type string $default-color Default color of the background.
 	 * }
 	 */
-	add_theme_support( 'custom-background', apply_filters( 'twentysixteen_custom_background_args', array(
-		'default-color' => $default_background_color,
-	) ) );
+	add_theme_support(
+		'custom-background', apply_filters(
+			'twentysixteen_custom_background_args', array(
+				'default-color' => $default_background_color,
+			)
+		)
+	);
 
 	/**
 	 * Filter the arguments used when adding 'custom-header' support in Twenty Sixteen.
@@ -50,35 +54,39 @@ function twentysixteen_custom_header_and_background() {
 	 *                                      displayed on the blog.
 	 * }
 	 */
-	add_theme_support( 'custom-header', apply_filters( 'twentysixteen_custom_header_args', array(
-		'default-text-color'     => $default_text_color,
-		'width'                  => 1200,
-		'height'                 => 280,
-		'flex-height'            => true,
-		'wp-head-callback'       => 'twentysixteen_header_style',
-	) ) );
+	add_theme_support(
+		'custom-header', apply_filters(
+			'twentysixteen_custom_header_args', array(
+				'default-text-color' => $default_text_color,
+				'width'              => 1200,
+				'height'             => 280,
+				'flex-height'        => true,
+				'wp-head-callback'   => 'twentysixteen_header_style',
+			)
+		)
+	);
 }
 add_action( 'after_setup_theme', 'twentysixteen_custom_header_and_background' );
 
 if ( ! function_exists( 'twentysixteen_header_style' ) ) :
-/**
- * Styles the header text displayed on the site.
- *
- * Create your own twentysixteen_header_style() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- *
- * @see twentysixteen_custom_header_and_background().
- */
-function twentysixteen_header_style() {
-	// If the header text option is untouched, let's bail.
-	if ( display_header_text() ) {
-		return;
-	}
+	/**
+	 * Styles the header text displayed on the site.
+	 *
+	 * Create your own twentysixteen_header_style() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @see twentysixteen_custom_header_and_background().
+	 */
+	function twentysixteen_header_style() {
+		// If the header text option is untouched, let's bail.
+		if ( display_header_text() ) {
+			return;
+		}
 
-	// If the header text has been hidden.
-	?>
-	<style type="text/css" id="twentysixteen-header-css">
+		// If the header text has been hidden.
+		?>
+		<style type="text/css" id="twentysixteen-header-css">
 		.site-branding {
 			margin: 0 auto 0 0;
 		}
@@ -88,9 +96,9 @@ function twentysixteen_header_style() {
 			clip: rect(1px, 1px, 1px, 1px);
 			position: absolute;
 		}
-	</style>
-	<?php
-}
+		</style>
+		<?php
+	}
 endif; // twentysixteen_header_style
 
 /**
@@ -103,87 +111,119 @@ endif; // twentysixteen_header_style
 function twentysixteen_customize_register( $wp_customize ) {
 	$color_scheme = twentysixteen_get_color_scheme();
 
-	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
-	$wp_customize->get_setting( 'blogdescription' )->transport  = 'postMessage';
+	$wp_customize->get_setting( 'blogname' )->transport        = 'postMessage';
+	$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
-			'selector' => '.site-title a',
-			'container_inclusive' => false,
-			'render_callback' => 'twentysixteen_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-			'selector' => '.site-description',
-			'container_inclusive' => false,
-			'render_callback' => 'twentysixteen_customize_partial_blogdescription',
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'blogname', array(
+				'selector'            => '.site-title a',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentysixteen_customize_partial_blogname',
+			)
+		);
+		$wp_customize->selective_refresh->add_partial(
+			'blogdescription', array(
+				'selector'            => '.site-description',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentysixteen_customize_partial_blogdescription',
+			)
+		);
 	}
 
 	// Add color scheme setting and control.
-	$wp_customize->add_setting( 'color_scheme', array(
-		'default'           => 'default',
-		'sanitize_callback' => 'twentysixteen_sanitize_color_scheme',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'color_scheme', array(
+			'default'           => 'default',
+			'sanitize_callback' => 'twentysixteen_sanitize_color_scheme',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( 'color_scheme', array(
-		'label'    => __( 'Base Color Scheme', 'twentysixteen' ),
-		'section'  => 'colors',
-		'type'     => 'select',
-		'choices'  => twentysixteen_get_color_scheme_choices(),
-		'priority' => 1,
-	) );
+	$wp_customize->add_control(
+		'color_scheme', array(
+			'label'    => __( 'Base Color Scheme', 'twentysixteen' ),
+			'section'  => 'colors',
+			'type'     => 'select',
+			'choices'  => twentysixteen_get_color_scheme_choices(),
+			'priority' => 1,
+		)
+	);
 
 	// Add page background color setting and control.
-	$wp_customize->add_setting( 'page_background_color', array(
-		'default'           => $color_scheme[1],
-		'sanitize_callback' => 'sanitize_hex_color',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'page_background_color', array(
+			'default'           => $color_scheme[1],
+			'sanitize_callback' => 'sanitize_hex_color',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'page_background_color', array(
-		'label'       => __( 'Page Background Color', 'twentysixteen' ),
-		'section'     => 'colors',
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'page_background_color', array(
+				'label'   => __( 'Page Background Color', 'twentysixteen' ),
+				'section' => 'colors',
+			)
+		)
+	);
 
 	// Remove the core header textcolor control, as it shares the main text color.
 	$wp_customize->remove_control( 'header_textcolor' );
 
 	// Add link color setting and control.
-	$wp_customize->add_setting( 'link_color', array(
-		'default'           => $color_scheme[2],
-		'sanitize_callback' => 'sanitize_hex_color',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'link_color', array(
+			'default'           => $color_scheme[2],
+			'sanitize_callback' => 'sanitize_hex_color',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'link_color', array(
-		'label'       => __( 'Link Color', 'twentysixteen' ),
-		'section'     => 'colors',
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'link_color', array(
+				'label'   => __( 'Link Color', 'twentysixteen' ),
+				'section' => 'colors',
+			)
+		)
+	);
 
 	// Add main text color setting and control.
-	$wp_customize->add_setting( 'main_text_color', array(
-		'default'           => $color_scheme[3],
-		'sanitize_callback' => 'sanitize_hex_color',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'main_text_color', array(
+			'default'           => $color_scheme[3],
+			'sanitize_callback' => 'sanitize_hex_color',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'main_text_color', array(
-		'label'       => __( 'Main Text Color', 'twentysixteen' ),
-		'section'     => 'colors',
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'main_text_color', array(
+				'label'   => __( 'Main Text Color', 'twentysixteen' ),
+				'section' => 'colors',
+			)
+		)
+	);
 
 	// Add secondary text color setting and control.
-	$wp_customize->add_setting( 'secondary_text_color', array(
-		'default'           => $color_scheme[4],
-		'sanitize_callback' => 'sanitize_hex_color',
-		'transport'         => 'postMessage',
-	) );
+	$wp_customize->add_setting(
+		'secondary_text_color', array(
+			'default'           => $color_scheme[4],
+			'sanitize_callback' => 'sanitize_hex_color',
+			'transport'         => 'postMessage',
+		)
+	);
 
-	$wp_customize->add_control( new WP_Customize_Color_Control( $wp_customize, 'secondary_text_color', array(
-		'label'       => __( 'Secondary Text Color', 'twentysixteen' ),
-		'section'     => 'colors',
-	) ) );
+	$wp_customize->add_control(
+		new WP_Customize_Color_Control(
+			$wp_customize, 'secondary_text_color', array(
+				'label'   => __( 'Secondary Text Color', 'twentysixteen' ),
+				'section' => 'colors',
+			)
+		)
+	);
 }
 add_action( 'customize_register', 'twentysixteen_customize_register', 11 );
 
@@ -248,127 +288,129 @@ function twentysixteen_get_color_schemes() {
 	 *     }
 	 * }
 	 */
-	return apply_filters( 'twentysixteen_color_schemes', array(
-		'default' => array(
-			'label'  => __( 'Default', 'twentysixteen' ),
-			'colors' => array(
-				'#1a1a1a',
-				'#ffffff',
-				'#007acc',
-				'#1a1a1a',
-				'#686868',
+	return apply_filters(
+		'twentysixteen_color_schemes', array(
+			'default' => array(
+				'label'  => __( 'Default', 'twentysixteen' ),
+				'colors' => array(
+					'#1a1a1a',
+					'#ffffff',
+					'#007acc',
+					'#1a1a1a',
+					'#686868',
+				),
 			),
-		),
-		'dark' => array(
-			'label'  => __( 'Dark', 'twentysixteen' ),
-			'colors' => array(
-				'#262626',
-				'#1a1a1a',
-				'#9adffd',
-				'#e5e5e5',
-				'#c1c1c1',
+			'dark'    => array(
+				'label'  => __( 'Dark', 'twentysixteen' ),
+				'colors' => array(
+					'#262626',
+					'#1a1a1a',
+					'#9adffd',
+					'#e5e5e5',
+					'#c1c1c1',
+				),
 			),
-		),
-		'gray' => array(
-			'label'  => __( 'Gray', 'twentysixteen' ),
-			'colors' => array(
-				'#616a73',
-				'#4d545c',
-				'#c7c7c7',
-				'#f2f2f2',
-				'#f2f2f2',
+			'gray'    => array(
+				'label'  => __( 'Gray', 'twentysixteen' ),
+				'colors' => array(
+					'#616a73',
+					'#4d545c',
+					'#c7c7c7',
+					'#f2f2f2',
+					'#f2f2f2',
+				),
 			),
-		),
-		'red' => array(
-			'label'  => __( 'Red', 'twentysixteen' ),
-			'colors' => array(
-				'#ffffff',
-				'#ff675f',
-				'#640c1f',
-				'#402b30',
-				'#402b30',
+			'red'     => array(
+				'label'  => __( 'Red', 'twentysixteen' ),
+				'colors' => array(
+					'#ffffff',
+					'#ff675f',
+					'#640c1f',
+					'#402b30',
+					'#402b30',
+				),
 			),
-		),
-		'yellow' => array(
-			'label'  => __( 'Yellow', 'twentysixteen' ),
-			'colors' => array(
-				'#3b3721',
-				'#ffef8e',
-				'#774e24',
-				'#3b3721',
-				'#5b4d3e',
+			'yellow'  => array(
+				'label'  => __( 'Yellow', 'twentysixteen' ),
+				'colors' => array(
+					'#3b3721',
+					'#ffef8e',
+					'#774e24',
+					'#3b3721',
+					'#5b4d3e',
+				),
 			),
-		),
-	) );
+		)
+	);
 }
 
 if ( ! function_exists( 'twentysixteen_get_color_scheme' ) ) :
-/**
- * Retrieves the current Twenty Sixteen color scheme.
- *
- * Create your own twentysixteen_get_color_scheme() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- *
- * @return array An associative array of either the current or default color scheme HEX values.
- */
-function twentysixteen_get_color_scheme() {
-	$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
-	$color_schemes       = twentysixteen_get_color_schemes();
+	/**
+	 * Retrieves the current Twenty Sixteen color scheme.
+	 *
+	 * Create your own twentysixteen_get_color_scheme() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @return array An associative array of either the current or default color scheme HEX values.
+	 */
+	function twentysixteen_get_color_scheme() {
+		$color_scheme_option = get_theme_mod( 'color_scheme', 'default' );
+		$color_schemes       = twentysixteen_get_color_schemes();
 
-	if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
-		return $color_schemes[ $color_scheme_option ]['colors'];
+		if ( array_key_exists( $color_scheme_option, $color_schemes ) ) {
+			return $color_schemes[ $color_scheme_option ]['colors'];
+		}
+
+		return $color_schemes['default']['colors'];
 	}
-
-	return $color_schemes['default']['colors'];
-}
 endif; // twentysixteen_get_color_scheme
 
 if ( ! function_exists( 'twentysixteen_get_color_scheme_choices' ) ) :
-/**
- * Retrieves an array of color scheme choices registered for Twenty Sixteen.
- *
- * Create your own twentysixteen_get_color_scheme_choices() function to override
- * in a child theme.
- *
- * @since Twenty Sixteen 1.0
- *
- * @return array Array of color schemes.
- */
-function twentysixteen_get_color_scheme_choices() {
-	$color_schemes                = twentysixteen_get_color_schemes();
-	$color_scheme_control_options = array();
+	/**
+	 * Retrieves an array of color scheme choices registered for Twenty Sixteen.
+	 *
+	 * Create your own twentysixteen_get_color_scheme_choices() function to override
+	 * in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @return array Array of color schemes.
+	 */
+	function twentysixteen_get_color_scheme_choices() {
+		$color_schemes                = twentysixteen_get_color_schemes();
+		$color_scheme_control_options = array();
 
-	foreach ( $color_schemes as $color_scheme => $value ) {
-		$color_scheme_control_options[ $color_scheme ] = $value['label'];
+		foreach ( $color_schemes as $color_scheme => $value ) {
+			$color_scheme_control_options[ $color_scheme ] = $value['label'];
+		}
+
+		return $color_scheme_control_options;
 	}
-
-	return $color_scheme_control_options;
-}
 endif; // twentysixteen_get_color_scheme_choices
 
 
 if ( ! function_exists( 'twentysixteen_sanitize_color_scheme' ) ) :
-/**
- * Handles sanitization for Twenty Sixteen color schemes.
- *
- * Create your own twentysixteen_sanitize_color_scheme() function to override
- * in a child theme.
- *
- * @since Twenty Sixteen 1.0
- *
- * @param string $value Color scheme name value.
- * @return string Color scheme name.
- */
-function twentysixteen_sanitize_color_scheme( $value ) {
-	$color_schemes = twentysixteen_get_color_scheme_choices();
+	/**
+	 * Handles sanitization for Twenty Sixteen color schemes.
+	 *
+	 * Create your own twentysixteen_sanitize_color_scheme() function to override
+	 * in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @param string $value Color scheme name value.
+	 * @return string Color scheme name.
+	 */
+	function twentysixteen_sanitize_color_scheme( $value ) {
+		$color_schemes = twentysixteen_get_color_scheme_choices();
 
-	if ( ! array_key_exists( $value, $color_schemes ) ) {
-		return 'default';
+		if ( ! array_key_exists( $value, $color_schemes ) ) {
+			return 'default';
+		}
+
+		return $value;
 	}
-
-	return $value;
-}
 endif; // twentysixteen_sanitize_color_scheme
 
 /**
@@ -445,14 +487,16 @@ add_action( 'customize_preview_init', 'twentysixteen_customize_preview_js' );
  * @return string Color scheme CSS.
  */
 function twentysixteen_get_color_scheme_css( $colors ) {
-	$colors = wp_parse_args( $colors, array(
-		'background_color'      => '',
-		'page_background_color' => '',
-		'link_color'            => '',
-		'main_text_color'       => '',
-		'secondary_text_color'  => '',
-		'border_color'          => '',
-	) );
+	$colors = wp_parse_args(
+		$colors, array(
+			'background_color'      => '',
+			'page_background_color' => '',
+			'link_color'            => '',
+			'main_text_color'       => '',
+			'secondary_text_color'  => '',
+			'border_color'          => '',
+		)
+	);
 
 	return <<<CSS
 	/* Color Scheme */
@@ -869,9 +913,9 @@ add_action( 'wp_enqueue_scripts', 'twentysixteen_page_background_color_css', 11
  * @see wp_add_inline_style()
  */
 function twentysixteen_link_color_css() {
-	$color_scheme    = twentysixteen_get_color_scheme();
-	$default_color   = $color_scheme[2];
-	$link_color = get_theme_mod( 'link_color', $default_color );
+	$color_scheme  = twentysixteen_get_color_scheme();
+	$default_color = $color_scheme[2];
+	$link_color    = get_theme_mod( 'link_color', $default_color );
 
 	// Don't do anything if the current color is the default.
 	if ( $link_color === $default_color ) {
@@ -1126,8 +1170,8 @@ add_action( 'wp_enqueue_scripts', 'twentysixteen_main_text_color_css', 11 );
  * @see wp_add_inline_style()
  */
 function twentysixteen_secondary_text_color_css() {
-	$color_scheme    = twentysixteen_get_color_scheme();
-	$default_color   = $color_scheme[4];
+	$color_scheme         = twentysixteen_get_color_scheme();
+	$default_color        = $color_scheme[4];
 	$secondary_text_color = get_theme_mod( 'secondary_text_color', $default_color );
 
 	// Don't do anything if the current color is the default.
diff --git a/wp-content/themes/twentysixteen/inc/template-tags.php b/wp-content/themes/twentysixteen/inc/template-tags.php
index 9b8f1f3901..ce5190a001 100644
--- a/wp-content/themes/twentysixteen/inc/template-tags.php
+++ b/wp-content/themes/twentysixteen/inc/template-tags.php
@@ -10,126 +10,132 @@
  */
 
 if ( ! function_exists( 'twentysixteen_entry_meta' ) ) :
-/**
- * Prints HTML with meta information for the categories, tags.
- *
- * Create your own twentysixteen_entry_meta() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- */
-function twentysixteen_entry_meta() {
-	if ( 'post' === get_post_type() ) {
-		$author_avatar_size = apply_filters( 'twentysixteen_author_avatar_size', 49 );
-		printf( '<span class="byline"><span class="author vcard">%1$s<span class="screen-reader-text">%2$s </span> <a class="url fn n" href="%3$s">%4$s</a></span></span>',
-			get_avatar( get_the_author_meta( 'user_email' ), $author_avatar_size ),
-			_x( 'Author', 'Used before post author name.', 'twentysixteen' ),
-			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-			get_the_author()
-		);
-	}
+	/**
+	 * Prints HTML with meta information for the categories, tags.
+	 *
+	 * Create your own twentysixteen_entry_meta() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 */
+	function twentysixteen_entry_meta() {
+		if ( 'post' === get_post_type() ) {
+			$author_avatar_size = apply_filters( 'twentysixteen_author_avatar_size', 49 );
+			printf(
+				'<span class="byline"><span class="author vcard">%1$s<span class="screen-reader-text">%2$s </span> <a class="url fn n" href="%3$s">%4$s</a></span></span>',
+				get_avatar( get_the_author_meta( 'user_email' ), $author_avatar_size ),
+				_x( 'Author', 'Used before post author name.', 'twentysixteen' ),
+				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+				get_the_author()
+			);
+		}
 
-	if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
-		twentysixteen_entry_date();
-	}
+		if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
+			twentysixteen_entry_date();
+		}
 
-	$format = get_post_format();
-	if ( current_theme_supports( 'post-formats', $format ) ) {
-		printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
-			sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentysixteen' ) ),
-			esc_url( get_post_format_link( $format ) ),
-			get_post_format_string( $format )
-		);
-	}
+		$format = get_post_format();
+		if ( current_theme_supports( 'post-formats', $format ) ) {
+			printf(
+				'<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
+				sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentysixteen' ) ),
+				esc_url( get_post_format_link( $format ) ),
+				get_post_format_string( $format )
+			);
+		}
 
-	if ( 'post' === get_post_type() ) {
-		twentysixteen_entry_taxonomies();
-	}
+		if ( 'post' === get_post_type() ) {
+			twentysixteen_entry_taxonomies();
+		}
 
-	if ( ! is_singular() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
-		echo '<span class="comments-link">';
-		comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentysixteen' ), get_the_title() ) );
-		echo '</span>';
+		if ( ! is_singular() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
+			echo '<span class="comments-link">';
+			comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentysixteen' ), get_the_title() ) );
+			echo '</span>';
+		}
 	}
-}
 endif;
 
 if ( ! function_exists( 'twentysixteen_entry_date' ) ) :
-/**
- * Prints HTML with date information for current post.
- *
- * Create your own twentysixteen_entry_date() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- */
-function twentysixteen_entry_date() {
-	$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
+	/**
+	 * Prints HTML with date information for current post.
+	 *
+	 * Create your own twentysixteen_entry_date() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 */
+	function twentysixteen_entry_date() {
+		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
 
-	if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
-		$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
+		}
+
+		$time_string = sprintf(
+			$time_string,
+			esc_attr( get_the_date( 'c' ) ),
+			get_the_date(),
+			esc_attr( get_the_modified_date( 'c' ) ),
+			get_the_modified_date()
+		);
+
+		printf(
+			'<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
+			_x( 'Posted on', 'Used before publish date.', 'twentysixteen' ),
+			esc_url( get_permalink() ),
+			$time_string
+		);
 	}
-
-	$time_string = sprintf( $time_string,
-		esc_attr( get_the_date( 'c' ) ),
-		get_the_date(),
-		esc_attr( get_the_modified_date( 'c' ) ),
-		get_the_modified_date()
-	);
-
-	printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
-		_x( 'Posted on', 'Used before publish date.', 'twentysixteen' ),
-		esc_url( get_permalink() ),
-		$time_string
-	);
-}
 endif;
 
 if ( ! function_exists( 'twentysixteen_entry_taxonomies' ) ) :
-/**
- * Prints HTML with category and tags for current post.
- *
- * Create your own twentysixteen_entry_taxonomies() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- */
-function twentysixteen_entry_taxonomies() {
-	$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
-	if ( $categories_list && twentysixteen_categorized_blog() ) {
-		printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-			_x( 'Categories', 'Used before category names.', 'twentysixteen' ),
-			$categories_list
-		);
-	}
+	/**
+	 * Prints HTML with category and tags for current post.
+	 *
+	 * Create your own twentysixteen_entry_taxonomies() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 */
+	function twentysixteen_entry_taxonomies() {
+		$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
+		if ( $categories_list && twentysixteen_categorized_blog() ) {
+			printf(
+				'<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				_x( 'Categories', 'Used before category names.', 'twentysixteen' ),
+				$categories_list
+			);
+		}
 
-	$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
-	if ( $tags_list && ! is_wp_error( $tags_list ) ) {
-		printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-			_x( 'Tags', 'Used before tag names.', 'twentysixteen' ),
-			$tags_list
-		);
+		$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
+		if ( $tags_list && ! is_wp_error( $tags_list ) ) {
+			printf(
+				'<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				_x( 'Tags', 'Used before tag names.', 'twentysixteen' ),
+				$tags_list
+			);
+		}
 	}
-}
 endif;
 
 if ( ! function_exists( 'twentysixteen_post_thumbnail' ) ) :
-/**
- * Displays an optional post thumbnail.
- *
- * Wraps the post thumbnail in an anchor element on index views, or a div
- * element when on single views.
- *
- * Create your own twentysixteen_post_thumbnail() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- */
-function twentysixteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
-		return;
-	}
+	/**
+	 * Displays an optional post thumbnail.
+	 *
+	 * Wraps the post thumbnail in an anchor element on index views, or a div
+	 * element when on single views.
+	 *
+	 * Create your own twentysixteen_post_thumbnail() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 */
+	function twentysixteen_post_thumbnail() {
+		if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+			return;
+		}
 
-	if ( is_singular() ) :
-	?>
+		if ( is_singular() ) :
+		?>
 
-	<div class="post-thumbnail">
+		<div class="post-thumbnail">
 		<?php the_post_thumbnail(); ?>
 	</div><!-- .post-thumbnail -->
 
@@ -139,8 +145,9 @@ function twentysixteen_post_thumbnail() {
 		<?php the_post_thumbnail( 'post-thumbnail', array( 'alt' => the_title_attribute( 'echo=0' ) ) ); ?>
 	</a>
 
-	<?php endif; // End is_singular()
-}
+	<?php
+	endif; // End is_singular()
+	}
 endif;
 
 if ( ! function_exists( 'twentysixteen_excerpt' ) ) :
@@ -158,69 +165,74 @@ if ( ! function_exists( 'twentysixteen_excerpt' ) ) :
 	function twentysixteen_excerpt( $class = 'entry-summary' ) {
 		$class = esc_attr( $class );
 
-		if ( has_excerpt() || is_search() ) : ?>
+		if ( has_excerpt() || is_search() ) :
+		?>
 			<div class="<?php echo $class; ?>">
 				<?php the_excerpt(); ?>
 			</div><!-- .<?php echo $class; ?> -->
-		<?php endif;
+		<?php
+		endif;
 	}
 endif;
 
 if ( ! function_exists( 'twentysixteen_excerpt_more' ) && ! is_admin() ) :
-/**
- * Replaces "[...]" (appended to automatically generated excerpts) with ... and
- * a 'Continue reading' link.
- *
- * Create your own twentysixteen_excerpt_more() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- *
- * @return string 'Continue reading' link prepended with an ellipsis.
- */
-function twentysixteen_excerpt_more() {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
-		/* translators: %s: Name of current post */
-		sprintf( __( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ), get_the_title( get_the_ID() ) )
-	);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentysixteen_excerpt_more' );
+	/**
+	 * Replaces "[...]" (appended to automatically generated excerpts) with ... and
+	 * a 'Continue reading' link.
+	 *
+	 * Create your own twentysixteen_excerpt_more() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @return string 'Continue reading' link prepended with an ellipsis.
+	 */
+	function twentysixteen_excerpt_more() {
+		$link = sprintf(
+			'<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
+			/* translators: %s: Name of current post */
+			sprintf( __( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ), get_the_title( get_the_ID() ) )
+		);
+		return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentysixteen_excerpt_more' );
 endif;
 
 if ( ! function_exists( 'twentysixteen_categorized_blog' ) ) :
-/**
- * Determines whether blog/site has more than one category.
- *
- * Create your own twentysixteen_categorized_blog() function to override in a child theme.
- *
- * @since Twenty Sixteen 1.0
- *
- * @return bool True if there is more than one category, false otherwise.
- */
-function twentysixteen_categorized_blog() {
-	if ( false === ( $all_the_cool_cats = get_transient( 'twentysixteen_categories' ) ) ) {
-		// Create an array of all the categories that are attached to posts.
-		$all_the_cool_cats = get_categories( array(
-			'fields'     => 'ids',
-			// We only need to know if there is more than one category.
-			'number'     => 2,
-		) );
+	/**
+	 * Determines whether blog/site has more than one category.
+	 *
+	 * Create your own twentysixteen_categorized_blog() function to override in a child theme.
+	 *
+	 * @since Twenty Sixteen 1.0
+	 *
+	 * @return bool True if there is more than one category, false otherwise.
+	 */
+	function twentysixteen_categorized_blog() {
+		if ( false === ( $all_the_cool_cats = get_transient( 'twentysixteen_categories' ) ) ) {
+			// Create an array of all the categories that are attached to posts.
+			$all_the_cool_cats = get_categories(
+				array(
+					'fields' => 'ids',
+					// We only need to know if there is more than one category.
+					'number' => 2,
+				)
+			);
 
-		// Count the number of categories that are attached to the posts.
-		$all_the_cool_cats = count( $all_the_cool_cats );
+			// Count the number of categories that are attached to the posts.
+			$all_the_cool_cats = count( $all_the_cool_cats );
 
-		set_transient( 'twentysixteen_categories', $all_the_cool_cats );
+			set_transient( 'twentysixteen_categories', $all_the_cool_cats );
+		}
+
+		if ( $all_the_cool_cats > 1 || is_preview() ) {
+			// This blog has more than 1 category so twentysixteen_categorized_blog should return true.
+			return true;
+		} else {
+			// This blog has only 1 category so twentysixteen_categorized_blog should return false.
+			return false;
+		}
 	}
-
-	if ( $all_the_cool_cats > 1 || is_preview() ) {
-		// This blog has more than 1 category so twentysixteen_categorized_blog should return true.
-		return true;
-	} else {
-		// This blog has only 1 category so twentysixteen_categorized_blog should return false.
-		return false;
-	}
-}
 endif;
 
 /**
@@ -236,19 +248,19 @@ function twentysixteen_category_transient_flusher() {
 	delete_transient( 'twentysixteen_categories' );
 }
 add_action( 'edit_category', 'twentysixteen_category_transient_flusher' );
-add_action( 'save_post',     'twentysixteen_category_transient_flusher' );
+add_action( 'save_post', 'twentysixteen_category_transient_flusher' );
 
 if ( ! function_exists( 'twentysixteen_the_custom_logo' ) ) :
-/**
- * Displays the optional custom logo.
- *
- * Does nothing if the custom logo is not available.
- *
- * @since Twenty Sixteen 1.2
- */
-function twentysixteen_the_custom_logo() {
-	if ( function_exists( 'the_custom_logo' ) ) {
-		the_custom_logo();
+	/**
+	 * Displays the optional custom logo.
+	 *
+	 * Does nothing if the custom logo is not available.
+	 *
+	 * @since Twenty Sixteen 1.2
+	 */
+	function twentysixteen_the_custom_logo() {
+		if ( function_exists( 'the_custom_logo' ) ) {
+			the_custom_logo();
+		}
 	}
-}
 endif;
diff --git a/wp-content/themes/twentysixteen/index.php b/wp-content/themes/twentysixteen/index.php
index 3f621abef0..d31ef2f804 100644
--- a/wp-content/themes/twentysixteen/index.php
+++ b/wp-content/themes/twentysixteen/index.php
@@ -29,7 +29,8 @@ get_header(); ?>
 
 			<?php
 			// Start the loop.
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				/*
 				 * Include the Post-Format-specific template for the content.
@@ -38,17 +39,19 @@ get_header(); ?>
 				 */
 				get_template_part( 'template-parts/content', get_post_format() );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination( array(
-				'prev_text'          => __( 'Previous page', 'twentysixteen' ),
-				'next_text'          => __( 'Next page', 'twentysixteen' ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
+					'next_text'          => __( 'Next page', 'twentysixteen' ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
+				)
+			);
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'template-parts/content', 'none' );
 
diff --git a/wp-content/themes/twentysixteen/page.php b/wp-content/themes/twentysixteen/page.php
index 315a3da70a..a232c9fce1 100644
--- a/wp-content/themes/twentysixteen/page.php
+++ b/wp-content/themes/twentysixteen/page.php
@@ -17,7 +17,8 @@ get_header(); ?>
 	<main id="main" class="site-main" role="main">
 		<?php
 		// Start the loop.
-		while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 
 			// Include the page content template.
 			get_template_part( 'template-parts/content', 'page' );
diff --git a/wp-content/themes/twentysixteen/search.php b/wp-content/themes/twentysixteen/search.php
index 4180b5f9e1..0f893636fc 100644
--- a/wp-content/themes/twentysixteen/search.php
+++ b/wp-content/themes/twentysixteen/search.php
@@ -20,7 +20,8 @@ get_header(); ?>
 
 			<?php
 			// Start the loop.
-			while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 
 				/**
 				 * Run the loop for the search to output the results.
@@ -29,17 +30,19 @@ get_header(); ?>
 				 */
 				get_template_part( 'template-parts/content', 'search' );
 
-			// End the loop.
+				// End the loop.
 			endwhile;
 
 			// Previous/next page navigation.
-			the_posts_pagination( array(
-				'prev_text'          => __( 'Previous page', 'twentysixteen' ),
-				'next_text'          => __( 'Next page', 'twentysixteen' ),
-				'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
-			) );
+			the_posts_pagination(
+				array(
+					'prev_text'          => __( 'Previous page', 'twentysixteen' ),
+					'next_text'          => __( 'Next page', 'twentysixteen' ),
+					'before_page_number' => '<span class="meta-nav screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>',
+				)
+			);
 
-		// If no content, include the "No posts found" template.
+			// If no content, include the "No posts found" template.
 		else :
 			get_template_part( 'template-parts/content', 'none' );
 
diff --git a/wp-content/themes/twentysixteen/sidebar.php b/wp-content/themes/twentysixteen/sidebar.php
index d4d893ebb2..45aff971ab 100644
--- a/wp-content/themes/twentysixteen/sidebar.php
+++ b/wp-content/themes/twentysixteen/sidebar.php
@@ -8,7 +8,7 @@
  */
 ?>
 
-<?php if ( is_active_sidebar( 'sidebar-1' )  ) : ?>
+<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
 	<aside id="secondary" class="sidebar widget-area" role="complementary">
 		<?php dynamic_sidebar( 'sidebar-1' ); ?>
 	</aside><!-- .sidebar .widget-area -->
diff --git a/wp-content/themes/twentysixteen/single.php b/wp-content/themes/twentysixteen/single.php
index 07e0df290d..3454170335 100644
--- a/wp-content/themes/twentysixteen/single.php
+++ b/wp-content/themes/twentysixteen/single.php
@@ -13,7 +13,8 @@ get_header(); ?>
 	<main id="main" class="site-main" role="main">
 		<?php
 		// Start the loop.
-		while ( have_posts() ) : the_post();
+		while ( have_posts() ) :
+			the_post();
 
 			// Include the single post content template.
 			get_template_part( 'template-parts/content', 'single' );
@@ -25,19 +26,23 @@ get_header(); ?>
 
 			if ( is_singular( 'attachment' ) ) {
 				// Parent post navigation.
-				the_post_navigation( array(
-					'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentysixteen' ),
-				) );
+				the_post_navigation(
+					array(
+						'prev_text' => _x( '<span class="meta-nav">Published in</span><span class="post-title">%title</span>', 'Parent post link', 'twentysixteen' ),
+					)
+				);
 			} elseif ( is_singular( 'post' ) ) {
 				// Previous/next post navigation.
-				the_post_navigation( array(
-					'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentysixteen' ) . '</span> ' .
-						'<span class="screen-reader-text">' . __( 'Next post:', 'twentysixteen' ) . '</span> ' .
-						'<span class="post-title">%title</span>',
-					'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentysixteen' ) . '</span> ' .
-						'<span class="screen-reader-text">' . __( 'Previous post:', 'twentysixteen' ) . '</span> ' .
-						'<span class="post-title">%title</span>',
-				) );
+				the_post_navigation(
+					array(
+						'next_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Next', 'twentysixteen' ) . '</span> ' .
+							'<span class="screen-reader-text">' . __( 'Next post:', 'twentysixteen' ) . '</span> ' .
+							'<span class="post-title">%title</span>',
+						'prev_text' => '<span class="meta-nav" aria-hidden="true">' . __( 'Previous', 'twentysixteen' ) . '</span> ' .
+							'<span class="screen-reader-text">' . __( 'Previous post:', 'twentysixteen' ) . '</span> ' .
+							'<span class="post-title">%title</span>',
+					)
+				);
 			}
 
 			// End of the loop.
diff --git a/wp-content/themes/twentysixteen/template-parts/content-page.php b/wp-content/themes/twentysixteen/template-parts/content-page.php
index 2b57d2b5c1..470776b405 100644
--- a/wp-content/themes/twentysixteen/template-parts/content-page.php
+++ b/wp-content/themes/twentysixteen/template-parts/content-page.php
@@ -19,14 +19,16 @@
 		<?php
 		the_content();
 
-		wp_link_pages( array(
-			'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
-			'after'       => '</div>',
-			'link_before' => '<span>',
-			'link_after'  => '</span>',
-			'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
-			'separator'   => '<span class="screen-reader-text">, </span>',
-		) );
+		wp_link_pages(
+			array(
+				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
+				'after'       => '</div>',
+				'link_before' => '<span>',
+				'link_after'  => '</span>',
+				'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
+				'separator'   => '<span class="screen-reader-text">, </span>',
+			)
+		);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentysixteen/template-parts/content-single.php b/wp-content/themes/twentysixteen/template-parts/content-single.php
index 241f52855e..58f829b45e 100644
--- a/wp-content/themes/twentysixteen/template-parts/content-single.php
+++ b/wp-content/themes/twentysixteen/template-parts/content-single.php
@@ -21,14 +21,16 @@
 		<?php
 			the_content();
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-				'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
-				'separator'   => '<span class="screen-reader-text">, </span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
+					'separator'   => '<span class="screen-reader-text">, </span>',
+				)
+			);
 
 			if ( '' !== get_the_author_meta( 'description' ) ) {
 				get_template_part( 'template-parts/biography' );
diff --git a/wp-content/themes/twentysixteen/template-parts/content.php b/wp-content/themes/twentysixteen/template-parts/content.php
index 22b0ea418d..703487dca4 100644
--- a/wp-content/themes/twentysixteen/template-parts/content.php
+++ b/wp-content/themes/twentysixteen/template-parts/content.php
@@ -24,19 +24,23 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
-				get_the_title()
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading<span class="screen-reader-text"> "%s"</span>', 'twentysixteen' ),
+					get_the_title()
+				)
+			);
 
-			wp_link_pages( array(
-				'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
-				'after'       => '</div>',
-				'link_before' => '<span>',
-				'link_after'  => '</span>',
-				'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
-				'separator'   => '<span class="screen-reader-text">, </span>',
-			) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentysixteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+					'pagelink'    => '<span class="screen-reader-text">' . __( 'Page', 'twentysixteen' ) . ' </span>%',
+					'separator'   => '<span class="screen-reader-text">, </span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentyten/404.php b/wp-content/themes/twentyten/404.php
index 6cc489cdb9..914ef01089 100644
--- a/wp-content/themes/twentyten/404.php
+++ b/wp-content/themes/twentyten/404.php
@@ -27,4 +27,4 @@ get_header(); ?>
 		document.getElementById('s') && document.getElementById('s').focus();
 	</script>
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentyten/archive.php b/wp-content/themes/twentyten/archive.php
index 138b088ee8..5b8e6e1e94 100644
--- a/wp-content/themes/twentyten/archive.php
+++ b/wp-content/themes/twentyten/archive.php
@@ -25,8 +25,9 @@ get_header(); ?>
 	 * We reset this later so we can run the loop
 	 * properly with a call to rewind_posts().
 	 */
-	if ( have_posts() )
-		the_post();
+if ( have_posts() ) {
+	the_post();
+}
 ?>
 
 			<h1 class="page-title">
diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php
index 2b221b57f2..b851764f11 100644
--- a/wp-content/themes/twentyten/author.php
+++ b/wp-content/themes/twentyten/author.php
@@ -21,15 +21,17 @@ get_header(); ?>
 	 * We reset this later so we can run the loop
 	 * properly with a call to rewind_posts().
 	 */
-	if ( have_posts() )
-		the_post();
+if ( have_posts() ) {
+	the_post();
+}
 ?>
 
 				<h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'twentyten' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
 
 <?php
 // If a user has filled out their description, show a bio on their entries.
-if ( get_the_author_meta( 'description' ) ) : ?>
+if ( get_the_author_meta( 'description' ) ) :
+?>
 					<div id="entry-author-info">
 						<div id="author-avatar">
 							<?php
diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php
index 50ffbf3ec6..00714e85df 100644
--- a/wp-content/themes/twentyten/category.php
+++ b/wp-content/themes/twentyten/category.php
@@ -12,13 +12,16 @@ get_header(); ?>
 		<div id="container">
 			<div id="content" role="main">
 
-				<h1 class="page-title"><?php
+				<h1 class="page-title">
+				<?php
 					printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-				?></h1>
+				?>
+				</h1>
 				<?php
 					$category_description = category_description();
-					if ( ! empty( $category_description ) )
-						echo '<div class="archive-meta">' . $category_description . '</div>';
+				if ( ! empty( $category_description ) ) {
+					echo '<div class="archive-meta">' . $category_description . '</div>';
+				}
 
 				/*
 				 * Run the loop for the category page to output the posts.
diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index 6825a510ba..4b0943fb95 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -32,10 +32,14 @@
 ?>
 
 <?php if ( have_comments() ) : ?>
-			<h3 id="comments-title"><?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>' );
-			?></h3>
+			<h3 id="comments-title">
+			<?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>'
+			);
+			?>
+			</h3>
 
 <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
 			<div class="navigation">
@@ -69,9 +73,10 @@
 	 * If there are no comments and comments are closed, let's leave a little note, shall we?
 	 * 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;  ?>
+	if ( ! comments_open() && get_comments_number() ) :
+	?>
+		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
+	<?php endif; ?>
 
 <?php endif; // end have_comments() ?>
 
diff --git a/wp-content/themes/twentyten/footer.php b/wp-content/themes/twentyten/footer.php
index 4bc8c548f7..bb32687930 100644
--- a/wp-content/themes/twentyten/footer.php
+++ b/wp-content/themes/twentyten/footer.php
@@ -36,7 +36,8 @@
 				 *
 				 * @since Twenty Ten 1.0
 				 */
-				do_action( 'twentyten_credits' ); ?>
+				do_action( 'twentyten_credits' );
+				?>
 				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyten' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>"><?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?></a>
 			</div><!-- #site-generator -->
 
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 3db0ab0ed7..0686cbee2b 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -44,195 +44,202 @@
  * Used to set the width of images and content. Should be equal to the width the theme
  * is designed for, generally via the style.css stylesheet.
  */
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 640;
+}
 
 /* Tell WordPress to run twentyten_setup() when the 'after_setup_theme' hook is run. */
 add_action( 'after_setup_theme', 'twentyten_setup' );
 
-if ( ! function_exists( 'twentyten_setup' ) ):
-/**
- * Set up theme defaults and registers support for various WordPress features.
- *
- * Note that this function is hooked into the after_setup_theme hook, which runs
- * before the init hook. The init hook is too late for some features, such as indicating
- * support post thumbnails.
- *
- * To override twentyten_setup() in a child theme, add your own twentyten_setup to your child theme's
- * functions.php file.
- *
- * @uses add_theme_support()        To add support for post thumbnails, custom headers and backgrounds, and automatic feed links.
- * @uses register_nav_menus()       To add support for navigation menus.
- * @uses add_editor_style()         To style the visual editor.
- * @uses load_theme_textdomain()    For translation/localization support.
- * @uses register_default_headers() To register the default custom header images provided with the theme.
- * @uses set_post_thumbnail_size()  To set a custom post thumbnail size.
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_setup() {
-
-	// This theme styles the visual editor with editor-style.css to match the theme style.
-	add_editor_style();
-
-	// Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
-	add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );
-
-	// This theme uses post thumbnails
-	add_theme_support( 'post-thumbnails' );
-
-	// Add default posts and comments RSS feed links to head
-	add_theme_support( 'automatic-feed-links' );
-
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed in the /languages/ directory
+if ( ! function_exists( 'twentyten_setup' ) ) :
+	/**
+	 * Set up theme defaults and registers support for various WordPress features.
+	 *
+	 * Note that this function is hooked into the after_setup_theme hook, which runs
+	 * before the init hook. The init hook is too late for some features, such as indicating
+	 * support post thumbnails.
+	 *
+	 * To override twentyten_setup() in a child theme, add your own twentyten_setup to your child theme's
+	 * functions.php file.
+	 *
+	 * @uses add_theme_support()        To add support for post thumbnails, custom headers and backgrounds, and automatic feed links.
+	 * @uses register_nav_menus()       To add support for navigation menus.
+	 * @uses add_editor_style()         To style the visual editor.
+	 * @uses load_theme_textdomain()    For translation/localization support.
+	 * @uses register_default_headers() To register the default custom header images provided with the theme.
+	 * @uses set_post_thumbnail_size()  To set a custom post thumbnail size.
+	 *
+	 * @since Twenty Ten 1.0
 	 */
-	load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
+	function twentyten_setup() {
 
-	// This theme uses wp_nav_menu() in one location.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Navigation', 'twentyten' ),
-	) );
+		// This theme styles the visual editor with editor-style.css to match the theme style.
+		add_editor_style();
 
-	// This theme allows users to set a custom background.
-	add_theme_support( 'custom-background', array(
-		// Let WordPress know what our default background color is.
-		'default-color' => 'f1f1f1',
-	) );
+		// Post Format support. You can also use the legacy "gallery" or "asides" (note the plural) categories.
+		add_theme_support( 'post-formats', array( 'aside', 'gallery' ) );
 
-	// The custom header business starts here.
+		// This theme uses post thumbnails
+		add_theme_support( 'post-thumbnails' );
+
+		// Add default posts and comments RSS feed links to head
+		add_theme_support( 'automatic-feed-links' );
 
-	$custom_header_support = array(
 		/*
-		 * The default image to use.
-		 * The %s is a placeholder for the theme template directory URI.
+		 * Make theme available for translation.
+		 * Translations can be filed in the /languages/ directory
 		 */
-		'default-image' => '%s/images/headers/path.jpg',
-		// The height and width of our custom header.
-		/**
-		 * Filter the Twenty Ten default header image width.
-		 *
-		 * @since Twenty Ten 1.0
-		 *
-		 * @param int The default header image width in pixels. Default 940.
-		 */
-		'width' => apply_filters( 'twentyten_header_image_width', 940 ),
-		/**
-		 * Filter the Twenty Ten defaul header image height.
-		 *
-		 * @since Twenty Ten 1.0
-		 *
-		 * @param int The default header image height in pixels. Default 198.
-		 */
-		'height' => apply_filters( 'twentyten_header_image_height', 198 ),
-		// Support flexible heights.
-		'flex-height' => true,
-		// Don't support text inside the header image.
-		'header-text' => false,
-		// Callback for styling the header preview in the admin.
-		'admin-head-callback' => 'twentyten_admin_header_style',
-	);
+		load_theme_textdomain( 'twentyten', get_template_directory() . '/languages' );
 
-	add_theme_support( 'custom-header', $custom_header_support );
+		// This theme uses wp_nav_menu() in one location.
+		register_nav_menus(
+			array(
+				'primary' => __( 'Primary Navigation', 'twentyten' ),
+			)
+		);
 
-	if ( ! function_exists( 'get_custom_header' ) ) {
-		// This is all for compatibility with versions of WordPress prior to 3.4.
-		define( 'HEADER_TEXTCOLOR', '' );
-		define( 'NO_HEADER_TEXT', true );
-		define( 'HEADER_IMAGE', $custom_header_support['default-image'] );
-		define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
-		define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
-		add_custom_image_header( '', $custom_header_support['admin-head-callback'] );
-		add_custom_background();
+		// This theme allows users to set a custom background.
+		add_theme_support(
+			'custom-background', array(
+				// Let WordPress know what our default background color is.
+				'default-color' => 'f1f1f1',
+			)
+		);
+
+		// The custom header business starts here.
+
+		$custom_header_support = array(
+			/*
+			 * The default image to use.
+			 * The %s is a placeholder for the theme template directory URI.
+			 */
+			'default-image'       => '%s/images/headers/path.jpg',
+			// The height and width of our custom header.
+			/**
+			 * Filter the Twenty Ten default header image width.
+			 *
+			 * @since Twenty Ten 1.0
+			 *
+			 * @param int The default header image width in pixels. Default 940.
+			 */
+			'width'               => apply_filters( 'twentyten_header_image_width', 940 ),
+			/**
+			 * Filter the Twenty Ten defaul header image height.
+			 *
+			 * @since Twenty Ten 1.0
+			 *
+			 * @param int The default header image height in pixels. Default 198.
+			 */
+			   'height'           => apply_filters( 'twentyten_header_image_height', 198 ),
+			// Support flexible heights.
+			'flex-height'         => true,
+			// Don't support text inside the header image.
+			'header-text'         => false,
+			// Callback for styling the header preview in the admin.
+			'admin-head-callback' => 'twentyten_admin_header_style',
+		);
+
+		add_theme_support( 'custom-header', $custom_header_support );
+
+		if ( ! function_exists( 'get_custom_header' ) ) {
+			// This is all for compatibility with versions of WordPress prior to 3.4.
+			define( 'HEADER_TEXTCOLOR', '' );
+			define( 'NO_HEADER_TEXT', true );
+			define( 'HEADER_IMAGE', $custom_header_support['default-image'] );
+			define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
+			define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
+			add_custom_image_header( '', $custom_header_support['admin-head-callback'] );
+			add_custom_background();
+		}
+
+		/*
+		 * We'll be using post thumbnails for custom header images on posts and pages.
+		 * We want them to be 940 pixels wide by 198 pixels tall.
+		 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
+		 */
+		set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
+
+		// ... and thus ends the custom header business.
+
+		// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
+		register_default_headers(
+			array(
+				'berries'       => array(
+					'url'           => '%s/images/headers/berries.jpg',
+					'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Berries', 'twentyten' ),
+				),
+				'cherryblossom' => array(
+					'url'           => '%s/images/headers/cherryblossoms.jpg',
+					'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Cherry Blossoms', 'twentyten' ),
+				),
+				'concave'       => array(
+					'url'           => '%s/images/headers/concave.jpg',
+					'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Concave', 'twentyten' ),
+				),
+				'fern'          => array(
+					'url'           => '%s/images/headers/fern.jpg',
+					'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Fern', 'twentyten' ),
+				),
+				'forestfloor'   => array(
+					'url'           => '%s/images/headers/forestfloor.jpg',
+					'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Forest Floor', 'twentyten' ),
+				),
+				'inkwell'       => array(
+					'url'           => '%s/images/headers/inkwell.jpg',
+					'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Inkwell', 'twentyten' ),
+				),
+				'path'          => array(
+					'url'           => '%s/images/headers/path.jpg',
+					'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Path', 'twentyten' ),
+				),
+				'sunset'        => array(
+					'url'           => '%s/images/headers/sunset.jpg',
+					'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
+					/* translators: header image description */
+					'description'   => __( 'Sunset', 'twentyten' ),
+				),
+			)
+		);
 	}
-
-	/*
-	 * We'll be using post thumbnails for custom header images on posts and pages.
-	 * We want them to be 940 pixels wide by 198 pixels tall.
-	 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
-	 */
-	set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
-
-	// ... and thus ends the custom header business.
-
-	// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
-	register_default_headers( array(
-		'berries' => array(
-			'url' => '%s/images/headers/berries.jpg',
-			'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Berries', 'twentyten' )
-		),
-		'cherryblossom' => array(
-			'url' => '%s/images/headers/cherryblossoms.jpg',
-			'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Cherry Blossoms', 'twentyten' )
-		),
-		'concave' => array(
-			'url' => '%s/images/headers/concave.jpg',
-			'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Concave', 'twentyten' )
-		),
-		'fern' => array(
-			'url' => '%s/images/headers/fern.jpg',
-			'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Fern', 'twentyten' )
-		),
-		'forestfloor' => array(
-			'url' => '%s/images/headers/forestfloor.jpg',
-			'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Forest Floor', 'twentyten' )
-		),
-		'inkwell' => array(
-			'url' => '%s/images/headers/inkwell.jpg',
-			'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Inkwell', 'twentyten' )
-		),
-		'path' => array(
-			'url' => '%s/images/headers/path.jpg',
-			'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Path', 'twentyten' )
-		),
-		'sunset' => array(
-			'url' => '%s/images/headers/sunset.jpg',
-			'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
-			/* translators: header image description */
-			'description' => __( 'Sunset', 'twentyten' )
-		)
-	) );
-}
 endif;
 
 if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
-/**
- * Style the header image displayed on the Appearance > Header admin panel.
- *
- * Referenced via add_custom_image_header() in twentyten_setup().
- *
- * @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 {
+	/**
+	 * Style the header image displayed on the Appearance > Header admin panel.
+	 *
+	 * Referenced via add_custom_image_header() in twentyten_setup().
+	 *
+	 * @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 {
 	border-bottom: 1px solid #000;
 	border-top: 4px solid #000;
-}
-/* If header-text was supported, you would style the text with these selectors:
+	}
+	/* If header-text was supported, you would style the text with these selectors:
 	#headimg #name { }
 	#headimg #desc { }
-*/
-</style>
-<?php
-}
+	*/
+	</style>
+	<?php
+	}
 endif;
 
 /**
@@ -246,8 +253,9 @@ endif;
  * @param array $args An optional array of arguments. @see wp_page_menu()
  */
 function twentyten_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+	if ( ! isset( $args['show_home'] ) ) {
 		$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentyten_page_menu_args' );
@@ -269,16 +277,16 @@ function twentyten_excerpt_length( $length ) {
 add_filter( 'excerpt_length', 'twentyten_excerpt_length' );
 
 if ( ! function_exists( 'twentyten_continue_reading_link' ) ) :
-/**
- * Return a "Continue Reading" link for excerpts.
- *
- * @since Twenty Ten 1.0
- *
- * @return string "Continue Reading" link.
- */
-function twentyten_continue_reading_link() {
-	return ' <a href="'. get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';
-}
+	/**
+	 * Return a "Continue Reading" link for excerpts.
+	 *
+	 * @since Twenty Ten 1.0
+	 *
+	 * @return string "Continue Reading" link.
+	 */
+	function twentyten_continue_reading_link() {
+		return ' <a href="' . get_permalink() . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) . '</a>';
+	}
 endif;
 
 /**
@@ -346,30 +354,31 @@ function twentyten_remove_gallery_css( $css ) {
 	return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );
 }
 // Backwards compatibility with WordPress 3.0.
-if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) )
+if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) ) {
 	add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
+}
 
 if ( ! function_exists( 'twentyten_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments template
- * simply create your own twentyten_comment(), and that function will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Ten 1.0
- *
- * @param object $comment The comment object.
- * @param array  $args    An array of arguments. @see get_comment_reply_link()
- * @param int    $depth   The depth of the comment.
- */
-function twentyten_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
-		case '' :
-	?>
-	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+	/**
+	 * Template for comments and pingbacks.
+	 *
+	 * To override this walker in a child theme without modifying the comments template
+	 * simply create your own twentyten_comment(), and that function will be used instead.
+	 *
+	 * Used as a callback by wp_list_comments() for displaying the comments.
+	 *
+	 * @since Twenty Ten 1.0
+	 *
+	 * @param object $comment The comment object.
+	 * @param array  $args    An array of arguments. @see get_comment_reply_link()
+	 * @param int    $depth   The depth of the comment.
+	 */
+	function twentyten_comment( $comment, $args, $depth ) {
+		$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 ); ?>
@@ -383,28 +392,41 @@ function twentyten_comment( $comment, $args, $depth ) {
 			<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
 				<?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' ), ' ' );
+					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><!-- .comment-meta .commentmetadata -->
 
-			<div class="comment-body"><?php comment_text(); ?></div>
+				<div class="comment-body"><?php comment_text(); ?></div>
 
-			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div><!-- .reply -->
-		</div><!-- #comment-##  -->
+				<div class="reply">
+				<?php
+				comment_reply_link(
+					array_merge(
+						$args, array(
+							'depth'     => $depth,
+							'max_depth' => $args['max_depth'],
+						)
+					)
+				);
+?>
+				</div><!-- .reply -->
+			</div><!-- #comment-##  -->
 
-	<?php
-			break;
-		case 'pingback'  :
-		case 'trackback' :
-	?>
-	<li class="post pingback">
+		<?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
-			break;
-	endswitch;
-}
+				break;
+		endswitch;
+	}
 endif;
 
 /**
@@ -419,70 +441,82 @@ endif;
  */
 function twentyten_widgets_init() {
 	// Area 1, located at the top of the sidebar.
-	register_sidebar( array(
-		'name' => __( 'Primary Widget Area', 'twentyten' ),
-		'id' => 'primary-widget-area',
-		'description' => __( 'Add widgets here to appear in your sidebar.', 'twentyten' ),
-		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
-		'after_widget' => '</li>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Primary Widget Area', 'twentyten' ),
+			'id'            => 'primary-widget-area',
+			'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentyten' ),
+			'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+			'after_widget'  => '</li>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
 	// Area 2, located below the Primary Widget Area in the sidebar. Empty by default.
-	register_sidebar( array(
-		'name' => __( 'Secondary Widget Area', 'twentyten' ),
-		'id' => 'secondary-widget-area',
-		'description' => __( 'An optional secondary widget area, displays below the primary widget area in your sidebar.', 'twentyten' ),
-		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
-		'after_widget' => '</li>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Secondary Widget Area', 'twentyten' ),
+			'id'            => 'secondary-widget-area',
+			'description'   => __( 'An optional secondary widget area, displays below the primary widget area in your sidebar.', 'twentyten' ),
+			'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+			'after_widget'  => '</li>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
 	// Area 3, located in the footer. Empty by default.
-	register_sidebar( array(
-		'name' => __( 'First Footer Widget Area', 'twentyten' ),
-		'id' => 'first-footer-widget-area',
-		'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
-		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
-		'after_widget' => '</li>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'First Footer Widget Area', 'twentyten' ),
+			'id'            => 'first-footer-widget-area',
+			'description'   => __( 'An optional widget area for your site footer.', 'twentyten' ),
+			'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+			'after_widget'  => '</li>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
 	// Area 4, located in the footer. Empty by default.
-	register_sidebar( array(
-		'name' => __( 'Second Footer Widget Area', 'twentyten' ),
-		'id' => 'second-footer-widget-area',
-		'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
-		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
-		'after_widget' => '</li>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Second Footer Widget Area', 'twentyten' ),
+			'id'            => 'second-footer-widget-area',
+			'description'   => __( 'An optional widget area for your site footer.', 'twentyten' ),
+			'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+			'after_widget'  => '</li>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
 	// Area 5, located in the footer. Empty by default.
-	register_sidebar( array(
-		'name' => __( 'Third Footer Widget Area', 'twentyten' ),
-		'id' => 'third-footer-widget-area',
-		'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
-		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
-		'after_widget' => '</li>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Third Footer Widget Area', 'twentyten' ),
+			'id'            => 'third-footer-widget-area',
+			'description'   => __( 'An optional widget area for your site footer.', 'twentyten' ),
+			'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+			'after_widget'  => '</li>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
 	// Area 6, located in the footer. Empty by default.
-	register_sidebar( array(
-		'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
-		'id' => 'fourth-footer-widget-area',
-		'description' => __( 'An optional widget area for your site footer.', 'twentyten' ),
-		'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
-		'after_widget' => '</li>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Fourth Footer Widget Area', 'twentyten' ),
+			'id'            => 'fourth-footer-widget-area',
+			'description'   => __( 'An optional widget area for your site footer.', 'twentyten' ),
+			'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
+			'after_widget'  => '</li>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 }
 /** Register sidebars by running twentyten_widgets_init() on the widgets_init hook. */
 add_action( 'widgets_init', 'twentyten_widgets_init' );
@@ -505,53 +539,56 @@ function twentyten_remove_recent_comments_style() {
 add_action( 'widgets_init', 'twentyten_remove_recent_comments_style' );
 
 if ( ! function_exists( 'twentyten_posted_on' ) ) :
-/**
- * Print HTML with meta information for the current post-date/time and author.
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_posted_on() {
-	printf( __( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'twentyten' ),
-		'meta-prep meta-prep-author',
-		sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
-			get_permalink(),
-			esc_attr( get_the_time() ),
-			get_the_date()
-		),
-		sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
-			get_author_posts_url( get_the_author_meta( 'ID' ) ),
-			esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
-			get_the_author()
-		)
-	);
-}
+	/**
+	 * Print HTML with meta information for the current post-date/time and author.
+	 *
+	 * @since Twenty Ten 1.0
+	 */
+	function twentyten_posted_on() {
+		printf(
+			__( '<span class="%1$s">Posted on</span> %2$s <span class="meta-sep">by</span> %3$s', 'twentyten' ),
+			'meta-prep meta-prep-author',
+			sprintf(
+				'<a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a>',
+				get_permalink(),
+				esc_attr( get_the_time() ),
+				get_the_date()
+			),
+			sprintf(
+				'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+				get_author_posts_url( get_the_author_meta( 'ID' ) ),
+				esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
+				get_the_author()
+			)
+		);
+	}
 endif;
 
 if ( ! function_exists( 'twentyten_posted_in' ) ) :
-/**
- * Print HTML with meta information for the current post (category, tags and permalink).
- *
- * @since Twenty Ten 1.0
- */
-function twentyten_posted_in() {
-	// Retrieves tag list of current post, separated by commas.
-	$tag_list = get_the_tag_list( '', ', ' );
-	if ( $tag_list && ! is_wp_error( $tag_list ) ) {
-		$posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
-	} elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
-		$posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
-	} else {
-		$posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+	/**
+	 * Print HTML with meta information for the current post (category, tags and permalink).
+	 *
+	 * @since Twenty Ten 1.0
+	 */
+	function twentyten_posted_in() {
+		// Retrieves tag list of current post, separated by commas.
+		$tag_list = get_the_tag_list( '', ', ' );
+		if ( $tag_list && ! is_wp_error( $tag_list ) ) {
+			$posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+		} elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
+			$posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+		} else {
+			$posted_in = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
+		}
+		// Prints the string, replacing the placeholders.
+		printf(
+			$posted_in,
+			get_the_category_list( ', ' ),
+			$tag_list,
+			get_permalink(),
+			the_title_attribute( 'echo=0' )
+		);
 	}
-	// Prints the string, replacing the placeholders.
-	printf(
-		$posted_in,
-		get_the_category_list( ', ' ),
-		$tag_list,
-		get_permalink(),
-		the_title_attribute( 'echo=0' )
-	);
-}
 endif;
 
 /**
@@ -569,26 +606,30 @@ function twentyten_get_gallery_images() {
 
 	if ( function_exists( 'get_post_galleries' ) ) {
 		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
+		if ( isset( $galleries[0]['ids'] ) ) {
 			$images = explode( ',', $galleries[0]['ids'] );
+		}
 	} else {
 		$pattern = get_shortcode_regex();
 		preg_match( "/$pattern/s", get_the_content(), $match );
 		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
+		if ( isset( $atts['ids'] ) ) {
 			$images = explode( ',', $atts['ids'] );
+		}
 	}
 
 	if ( ! $images ) {
-		$images = get_posts( array(
-			'fields'         => 'ids',
-			'numberposts'    => 999,
-			'order'          => 'ASC',
-			'orderby'        => 'menu_order',
-			'post_mime_type' => 'image',
-			'post_parent'    => get_the_ID(),
-			'post_type'      => 'attachment',
-		) );
+		$images = get_posts(
+			array(
+				'fields'         => 'ids',
+				'numberposts'    => 999,
+				'order'          => 'ASC',
+				'orderby'        => 'menu_order',
+				'post_mime_type' => 'image',
+				'post_parent'    => get_the_ID(),
+				'post_type'      => 'attachment',
+			)
+		);
 	}
 
 	return $images;
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index f1a70982e6..6c2ee4c46b 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -12,7 +12,8 @@
 <html <?php language_attributes(); ?>>
 <head>
 <meta charset="<?php bloginfo( 'charset' ); ?>" />
-<title><?php
+<title>
+<?php
 	/*
 	 * Print the <title> tag based on what is being viewed.
 	 */
@@ -25,14 +26,17 @@
 
 	// Add the blog description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
-		echo " | $site_description";
+if ( $site_description && ( is_home() || is_front_page() ) ) {
+	echo " | $site_description";
+}
 
 	// Add a page number if necessary:
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
-		echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) ) );
+if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
+	echo esc_html( ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) ) );
+}
 
-	?></title>
+	?>
+	</title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
@@ -41,8 +45,9 @@
 	 * We add some JavaScript to pages with the comment form
 	 * to support sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && get_option( 'thread_comments' ) )
-		wp_enqueue_script( 'comment-reply' );
+if ( is_singular() && get_option( 'thread_comments' ) ) {
+	wp_enqueue_script( 'comment-reply' );
+}
 
 	/*
 	 * Always have wp_head() just before the closing </head>
@@ -69,23 +74,23 @@
 
 				<?php
 					// Compatibility with versions of WordPress prior to 3.4.
-					if ( function_exists( 'get_custom_header' ) ) {
-						/*
-						 * We need to figure out what the minimum width should be for our featured image.
-						 * This result would be the suggested width if the theme were to implement flexible widths.
-						 */
-						$header_image_width = get_theme_support( 'custom-header', 'width' );
-					} else {
-						$header_image_width = HEADER_IMAGE_WIDTH;
-					}
+				if ( function_exists( 'get_custom_header' ) ) {
+					/*
+					 * We need to figure out what the minimum width should be for our featured image.
+					 * This result would be the suggested width if the theme were to implement flexible widths.
+					 */
+					$header_image_width = get_theme_support( 'custom-header', 'width' );
+				} else {
+					$header_image_width = HEADER_IMAGE_WIDTH;
+				}
 
 					// Check if this is a post or page, if it has a thumbnail, and if it's a big one
-					if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
+				if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
 							has_post_thumbnail( $post->ID ) &&
 							( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
 							$image[1] >= $header_image_width ) :
-						// Houston, we have a new header image!
-						echo get_the_post_thumbnail( $post->ID );
+					// Houston, we have a new header image!
+					echo get_the_post_thumbnail( $post->ID );
 					elseif ( get_header_image() ) :
 						// Compatibility with versions of WordPress prior to 3.4.
 						if ( function_exists( 'get_custom_header' ) ) {
@@ -104,7 +109,14 @@
 				<?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
 				<div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
 				<?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
-				<?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
+				<?php
+				wp_nav_menu(
+					array(
+						'container_class' => 'menu-header',
+						'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 a2dfae6e24..04da9f48d4 100644
--- a/wp-content/themes/twentyten/loop-attachment.php
+++ b/wp-content/themes/twentyten/loop-attachment.php
@@ -15,34 +15,44 @@
  */
 ?>
 
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php
+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>
+					<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; ?>
 
-				<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+					<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<h2 class="entry-title"><?php the_title(); ?></h2>
 
 					<div class="entry-meta">
 						<?php
-							printf( __( '<span class="%1$s">By</span> %2$s', 'twentyten' ),
+							printf(
+								__( '<span class="%1$s">By</span> %2$s', 'twentyten' ),
 								'meta-prep meta-prep-author',
-								sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+								sprintf(
+									'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
 									get_author_posts_url( get_the_author_meta( 'ID' ) ),
 									esc_attr( sprintf( __( 'View all posts by %s', 'twentyten' ), get_the_author() ) ),
 									get_the_author()
 								)
 							);
-						?>
-						<span class="meta-sep">|</span>
-						<?php
-							printf( __( '<span class="%1$s">Published</span> %2$s', 'twentyten' ),
+							?>
+							<span class="meta-sep">|</span>
+							<?php
+							printf(
+								__( '<span class="%1$s">Published</span> %2$s', 'twentyten' ),
 								'meta-prep meta-prep-entry-date',
-								sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
+								sprintf(
+									'<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
 									esc_attr( get_the_time() ),
 									get_the_date()
 								)
@@ -50,8 +60,10 @@
 							if ( wp_attachment_is_image() ) {
 								echo ' <span class="meta-sep">|</span> ';
 								$metadata = wp_get_attachment_metadata();
-								printf( __( 'Full size is %s pixels', 'twentyten' ),
-									sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+								printf(
+									__( 'Full size is %s pixels', 'twentyten' ),
+									sprintf(
+										'<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
 										esc_url( wp_get_attachment_url() ),
 										esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
 										$metadata['width'],
@@ -59,65 +71,92 @@
 									)
 								);
 							}
-						?>
-						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
-					</div><!-- .entry-meta -->
+							?>
+							<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+						</div><!-- .entry-meta -->
 
-					<div class="entry-content">
+						<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' ) ) );
-	foreach ( $attachments as $k => $attachment ) {
-		if ( $attachment->ID == $post->ID )
-			break;
-	}
+	<?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;
+			}
+		}
 
-	// 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();
-	}
-?>
-						<p class="attachment"><a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
-							/**
-							 * Filter the Twenty Ten default attachment width.
-							 *
-							 * @since Twenty Ten 1.0
-							 *
-							 * @param int The default attachment width in pixels. Default 900.
-							 */
-							$attachment_width  = apply_filters( 'twentyten_attachment_size', 900 );
-							/**
-							 * Filter the Twenty Ten default attachment height.
-							 *
-							 * @since Twenty Ten 1.0
-							 *
-							 * @param int The default attachment height in pixels. Default 900.
-							 */
-							$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>
+		// 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();
+		}
+	?>
+						<p class="attachment"><a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
+																	<?php
+																	/**
+																	 * Filter the Twenty Ten default attachment width.
+																	 *
+																	 * @since Twenty Ten 1.0
+																	 *
+																	 * @param int The default attachment width in pixels. Default 900.
+																	 */
+																	$attachment_width = apply_filters( 'twentyten_attachment_size', 900 );
+																	/**
+																	 * Filter the Twenty Ten default attachment height.
+																	 *
+																	 * @since Twenty Ten 1.0
+																	 *
+																	 * @param int The default attachment height in pixels. Default 900.
+																	 */
+																	$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 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; ?>
+	<?php endif; ?>
 						</div><!-- .entry-attachment -->
-						<div class="entry-caption"><?php if ( ! empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
+						<div class="entry-caption">
+						<?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 -->
 
@@ -129,4 +168,5 @@
 
 <?php comments_template(); ?>
 
-<?php endwhile; // end of the loop. ?>
+<?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 989881f74a..f522cff95f 100644
--- a/wp-content/themes/twentyten/loop-page.php
+++ b/wp-content/themes/twentyten/loop-page.php
@@ -15,7 +15,11 @@
  */
 ?>
 
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php
+if ( have_posts() ) {
+	while ( have_posts() ) :
+		the_post();
+	?>
 
 				<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<?php if ( is_front_page() ) { ?>
@@ -26,11 +30,19 @@
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+						<?php
+						wp_link_pages(
+							array(
+								'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+								'after'  => '</div>',
+							)
+						);
+	?>
 						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
 					</div><!-- .entry-content -->
 				</div><!-- #post-## -->
 
 				<?php comments_template( '', true ); ?>
 
-<?php endwhile; // end of the loop. ?>
+<?php endwhile;
+}; // end of the loop. ?>
diff --git a/wp-content/themes/twentyten/loop-single.php b/wp-content/themes/twentyten/loop-single.php
index 68dd08f6f8..b9a791a628 100644
--- a/wp-content/themes/twentyten/loop-single.php
+++ b/wp-content/themes/twentyten/loop-single.php
@@ -15,7 +15,11 @@
  */
 ?>
 
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php
+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>
@@ -31,18 +35,25 @@
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+						<?php
+						wp_link_pages(
+							array(
+								'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+								'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
 							/** This filter is documented in author.php */
 							echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) );
 							?>
-						</div><!-- #author-avatar -->
-						<div id="author-description">
+							</div><!-- #author-avatar -->
+							<div id="author-description">
 							<h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
 							<?php the_author_meta( 'description' ); ?>
 							<div id="author-link">
@@ -50,21 +61,22 @@
 									<?php printf( __( 'View all posts by %s <span class="meta-nav">&rarr;</span>', 'twentyten' ), get_the_author() ); ?>
 								</a>
 							</div><!-- #author-link	-->
-						</div><!-- #author-description -->
-					</div><!-- #entry-author-info -->
-<?php endif; ?>
+							</div><!-- #author-description -->
+						</div><!-- #entry-author-info -->
+	<?php endif; ?>
 
-					<div class="entry-utility">
-						<?php twentyten_posted_in(); ?>
-						<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
-					</div><!-- .entry-utility -->
-				</div><!-- #post-## -->
+						<div class="entry-utility">
+							<?php twentyten_posted_in(); ?>
+							<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+						</div><!-- .entry-utility -->
+					</div><!-- #post-## -->
 
-				<div id="nav-below" class="navigation">
-					<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
-					<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
-				</div><!-- #nav-below -->
+					<div id="nav-below" class="navigation">
+						<div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">' . _x( '&larr;', 'Previous post link', 'twentyten' ) . '</span> %title' ); ?></div>
+						<div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">' . _x( '&rarr;', 'Next post link', 'twentyten' ) . '</span>' ); ?></div>
+					</div><!-- #nav-below -->
 
-				<?php comments_template( '', true ); ?>
+					<?php comments_template( '', true ); ?>
 
-<?php endwhile; // end of the loop. ?>
+	<?php endwhile;
+}; // end of the loop. ?>
diff --git a/wp-content/themes/twentyten/loop.php b/wp-content/themes/twentyten/loop.php
index 9f3088544f..220ba7b0ec 100644
--- a/wp-content/themes/twentyten/loop.php
+++ b/wp-content/themes/twentyten/loop.php
@@ -55,7 +55,10 @@
 	 * Without further ado, the loop:
 	 */
 ?>
-<?php while ( have_posts() ) : the_post(); ?>
+<?php
+while ( have_posts() ) :
+	the_post();
+?>
 
 <?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
 
@@ -73,17 +76,22 @@
 <?php else : ?>
 				<?php
 					$images = twentyten_get_gallery_images();
-					if ( $images ) :
-						$total_images = count( $images );
-						$image = reset( $images );
+				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 -->
-						<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, 'twentyten' ),
-								'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>
+					<div class="gallery-thumb">
+						<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo wp_get_attachment_image( $image, 'thumbnail' ); ?></a>
+					</div><!-- .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, 'twentyten' ),
+							'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(); ?>
 <?php endif; ?>
@@ -104,7 +112,7 @@
 
 <?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' ) )  ) : ?>
+	<?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(); ?>>
 
 		<?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
@@ -142,7 +150,14 @@
 	<?php else : ?>
 			<div class="entry-content">
 				<?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
+				wp_link_pages(
+					array(
+						'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ),
+						'after'  => '</div>',
+					)
+				);
+?>
 			</div><!-- .entry-content -->
 	<?php endif; ?>
 
@@ -155,12 +170,12 @@
 				<?php endif; ?>
 				<?php
 					$tags_list = get_the_tag_list( '', ', ' );
-					if ( $tags_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>
-					<span class="meta-sep">|</span>
+				<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>
+				<span class="meta-sep">|</span>
 				<?php endif; ?>
 				<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
 				<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
@@ -174,7 +189,7 @@
 <?php endwhile; // End the loop. Whew. ?>
 
 <?php /* Display navigation to next/previous pages when applicable */ ?>
-<?php if (  $wp_query->max_num_pages > 1 ) : ?>
+<?php if ( $wp_query->max_num_pages > 1 ) : ?>
 				<div id="nav-below" class="navigation">
 					<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
 					<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
diff --git a/wp-content/themes/twentyten/sidebar-footer.php b/wp-content/themes/twentyten/sidebar-footer.php
index c055ad1cd8..b4480ee51a 100644
--- a/wp-content/themes/twentyten/sidebar-footer.php
+++ b/wp-content/themes/twentyten/sidebar-footer.php
@@ -15,12 +15,13 @@
 	 *
 	 * If none of the sidebars have widgets, then let's bail early.
 	 */
-	if (   ! is_active_sidebar( 'first-footer-widget-area'  )
+if ( ! is_active_sidebar( 'first-footer-widget-area' )
 		&& ! is_active_sidebar( 'second-footer-widget-area' )
-		&& ! is_active_sidebar( 'third-footer-widget-area'  )
+		&& ! is_active_sidebar( 'third-footer-widget-area' )
 		&& ! is_active_sidebar( 'fourth-footer-widget-area' )
-	)
-		return;
+	) {
+	return;
+}
 	// If we get this far, we have widgets. Let do this.
 ?>
 
diff --git a/wp-content/themes/twentyten/sidebar.php b/wp-content/themes/twentyten/sidebar.php
index 75ec6a12b3..40018d2f47 100644
--- a/wp-content/themes/twentyten/sidebar.php
+++ b/wp-content/themes/twentyten/sidebar.php
@@ -18,7 +18,8 @@
 	 * then the sidebar simply doesn't exist, so we'll hard-code in
 	 * some default sidebar stuff just in case.
 	 */
-	if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : ?>
+if ( ! dynamic_sidebar( 'primary-widget-area' ) ) :
+	?>
 
 			<li id="search" class="widget-container widget_search">
 				<?php get_search_form(); ?>
@@ -46,7 +47,8 @@
 
 <?php
 	// A second sidebar for widgets, just because.
-	if ( is_active_sidebar( 'secondary-widget-area' ) ) : ?>
+if ( is_active_sidebar( 'secondary-widget-area' ) ) :
+	?>
 
 		<div id="secondary" class="widget-area" role="complementary">
 			<ul class="xoxo">
diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php
index 01ae6cd36c..e6fed3014f 100644
--- a/wp-content/themes/twentyten/tag.php
+++ b/wp-content/themes/twentyten/tag.php
@@ -12,9 +12,11 @@ get_header(); ?>
 		<div id="container">
 			<div id="content" role="main">
 
-				<h1 class="page-title"><?php
+				<h1 class="page-title">
+				<?php
 					printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-				?></h1>
+				?>
+				</h1>
 
 <?php
 /*
diff --git a/wp-content/themes/twentythirteen/404.php b/wp-content/themes/twentythirteen/404.php
index eebc34b706..528f82d372 100644
--- a/wp-content/themes/twentythirteen/404.php
+++ b/wp-content/themes/twentythirteen/404.php
@@ -28,4 +28,4 @@ get_header(); ?>
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentythirteen/archive.php b/wp-content/themes/twentythirteen/archive.php
index 445db7e641..f318aa1fe0 100644
--- a/wp-content/themes/twentythirteen/archive.php
+++ b/wp-content/themes/twentythirteen/archive.php
@@ -24,9 +24,10 @@ get_header(); ?>
 
 		<?php if ( have_posts() ) : ?>
 			<header class="archive-header">
-				<h1 class="archive-title"><?php
-					if ( is_day() ) :
-						printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() );
+				<h1 class="archive-title">
+				<?php
+				if ( is_day() ) :
+					printf( __( 'Daily Archives: %s', 'twentythirteen' ), get_the_date() );
 					elseif ( is_month() ) :
 						printf( __( 'Monthly Archives: %s', 'twentythirteen' ), get_the_date( _x( 'F Y', 'monthly archives date format', 'twentythirteen' ) ) );
 					elseif ( is_year() ) :
@@ -34,11 +35,15 @@ get_header(); ?>
 					else :
 						_e( 'Archives', 'twentythirteen' );
 					endif;
-				?></h1>
+				?>
+				</h1>
 			</header><!-- .archive-header -->
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentythirteen/author-bio.php b/wp-content/themes/twentythirteen/author-bio.php
index ae2f522b3b..690cfc0cb5 100644
--- a/wp-content/themes/twentythirteen/author-bio.php
+++ b/wp-content/themes/twentythirteen/author-bio.php
@@ -31,4 +31,4 @@
 			</a>
 		</p>
 	</div><!-- .author-description -->
-</div><!-- .author-info -->
\ No newline at end of file
+</div><!-- .author-info -->
diff --git a/wp-content/themes/twentythirteen/author.php b/wp-content/themes/twentythirteen/author.php
index c7b5d87ada..efdd005db7 100644
--- a/wp-content/themes/twentythirteen/author.php
+++ b/wp-content/themes/twentythirteen/author.php
@@ -45,7 +45,10 @@ get_header(); ?>
 			<?php endif; ?>
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?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 f82e0abccb..a219d544aa 100644
--- a/wp-content/themes/twentythirteen/category.php
+++ b/wp-content/themes/twentythirteen/category.php
@@ -24,7 +24,10 @@ get_header(); ?>
 			</header><!-- .archive-header -->
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?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 3d1aff46bd..9b92c68f8b 100644
--- a/wp-content/themes/twentythirteen/comments.php
+++ b/wp-content/themes/twentythirteen/comments.php
@@ -13,8 +13,9 @@
  * If the current post is protected by a password and the visitor has not yet
  * entered the password we will return early without loading the comments.
  */
-if ( post_password_required() )
+if ( post_password_required() ) {
 	return;
+}
 ?>
 
 <div id="comments" class="comments-area">
@@ -22,38 +23,42 @@ if ( post_password_required() )
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?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>' );
+				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>'
+				);
 			?>
 		</h2>
 
 		<ol class="comment-list">
 			<?php
-				wp_list_comments( array(
-					'style'       => 'ol',
-					'short_ping'  => true,
-					'avatar_size' => 74,
-				) );
+				wp_list_comments(
+					array(
+						'style'       => 'ol',
+						'short_ping'  => true,
+						'avatar_size' => 74,
+					)
+				);
 			?>
 		</ol><!-- .comment-list -->
 
 		<?php
 			// Are there comments to navigate through?
-			if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
+		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>
-			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>
+		<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>
+		<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>
 		</nav><!-- .comment-navigation -->
 		<?php endif; // Check for comment navigation ?>
 
 		<?php if ( ! comments_open() && get_comments_number() ) : ?>
-		<p class="no-comments"><?php _e( 'Comments are closed.' , 'twentythirteen' ); ?></p>
+		<p class="no-comments"><?php _e( 'Comments are closed.', 'twentythirteen' ); ?></p>
 		<?php endif; ?>
 
 	<?php endif; // have_comments() ?>
 
 	<?php comment_form(); ?>
 
-</div><!-- #comments -->
\ No newline at end of file
+</div><!-- #comments -->
diff --git a/wp-content/themes/twentythirteen/content-aside.php b/wp-content/themes/twentythirteen/content-aside.php
index fbc01e618d..bbec8c9b94 100644
--- a/wp-content/themes/twentythirteen/content-aside.php
+++ b/wp-content/themes/twentythirteen/content-aside.php
@@ -12,12 +12,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-audio.php b/wp-content/themes/twentythirteen/content-audio.php
index 73a0d692b5..728a68a8f7 100644
--- a/wp-content/themes/twentythirteen/content-audio.php
+++ b/wp-content/themes/twentythirteen/content-audio.php
@@ -23,12 +23,21 @@
 		<div class="audio-content">
 			<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'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 6a40b89326..92c703c8cd 100644
--- a/wp-content/themes/twentythirteen/content-chat.php
+++ b/wp-content/themes/twentythirteen/content-chat.php
@@ -22,12 +22,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-gallery.php b/wp-content/themes/twentythirteen/content-gallery.php
index a43647f73e..705cb2da96 100644
--- a/wp-content/themes/twentythirteen/content-gallery.php
+++ b/wp-content/themes/twentythirteen/content-gallery.php
@@ -23,12 +23,21 @@
 		<?php if ( is_single() || ! get_post_gallery() ) : ?>
 			<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 		<?php else : ?>
 			<?php echo get_post_gallery(); ?>
diff --git a/wp-content/themes/twentythirteen/content-image.php b/wp-content/themes/twentythirteen/content-image.php
index 01e2f34793..866e63f89b 100644
--- a/wp-content/themes/twentythirteen/content-image.php
+++ b/wp-content/themes/twentythirteen/content-image.php
@@ -22,12 +22,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-link.php b/wp-content/themes/twentythirteen/content-link.php
index cc02d8240b..5fdbb8f9de 100644
--- a/wp-content/themes/twentythirteen/content-link.php
+++ b/wp-content/themes/twentythirteen/content-link.php
@@ -23,12 +23,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-quote.php b/wp-content/themes/twentythirteen/content-quote.php
index ac4de67293..83562bc5ad 100644
--- a/wp-content/themes/twentythirteen/content-quote.php
+++ b/wp-content/themes/twentythirteen/content-quote.php
@@ -12,12 +12,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-status.php b/wp-content/themes/twentythirteen/content-status.php
index e0e51f30ea..f37539660c 100644
--- a/wp-content/themes/twentythirteen/content-status.php
+++ b/wp-content/themes/twentythirteen/content-status.php
@@ -12,12 +12,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content-video.php b/wp-content/themes/twentythirteen/content-video.php
index 8118a080fc..aa81176329 100644
--- a/wp-content/themes/twentythirteen/content-video.php
+++ b/wp-content/themes/twentythirteen/content-video.php
@@ -22,12 +22,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 
diff --git a/wp-content/themes/twentythirteen/content.php b/wp-content/themes/twentythirteen/content.php
index 98b6c31955..aace9cdaba 100644
--- a/wp-content/themes/twentythirteen/content.php
+++ b/wp-content/themes/twentythirteen/content.php
@@ -40,12 +40,21 @@
 	<div class="entry-content">
 		<?php
 			/* translators: %s: Name of current post */
-			the_content( sprintf(
-				__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
-				the_title( '<span class="screen-reader-text">', '</span>', false )
-			) );
+			the_content(
+				sprintf(
+					__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ),
+					the_title( '<span class="screen-reader-text">', '</span>', false )
+				)
+			);
 
-			wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) );
+			wp_link_pages(
+				array(
+					'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+					'after'       => '</div>',
+					'link_before' => '<span>',
+					'link_after'  => '</span>',
+				)
+			);
 		?>
 	</div><!-- .entry-content -->
 	<?php endif; ?>
diff --git a/wp-content/themes/twentythirteen/footer.php b/wp-content/themes/twentythirteen/footer.php
index 40fbc34bc1..37eef9b332 100644
--- a/wp-content/themes/twentythirteen/footer.php
+++ b/wp-content/themes/twentythirteen/footer.php
@@ -23,4 +23,4 @@
 
 	<?php wp_footer(); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
index 312dc63d75..68a3871317 100644
--- a/wp-content/themes/twentythirteen/functions.php
+++ b/wp-content/themes/twentythirteen/functions.php
@@ -28,8 +28,9 @@
  *
  * @see twentythirteen_content_width() for template-specific adjustments.
  */
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 604;
+}
 
 /**
  * Add support for a custom header image.
@@ -39,8 +40,9 @@ require get_template_directory() . '/inc/custom-header.php';
 /**
  * Twenty Thirteen only works in WordPress 3.6 or later.
  */
-if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) )
+if ( version_compare( $GLOBALS['wp_version'], '3.6-alpha', '<' ) ) {
 	require get_template_directory() . '/inc/back-compat.php';
+}
 
 /**
  * Twenty Thirteen setup.
@@ -81,17 +83,33 @@ function twentythirteen_setup() {
 	 * Switches default core markup for search form, comment form,
 	 * and comments to output valid HTML5.
 	 */
-	add_theme_support( 'html5', array(
-		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+	add_theme_support(
+		'html5', array(
+			'search-form',
+			'comment-form',
+			'comment-list',
+			'gallery',
+			'caption',
+		)
+	);
 
 	/*
 	 * This theme supports all available post formats by default.
 	 * See https://codex.wordpress.org/Post_Formats
 	 */
-	add_theme_support( 'post-formats', array(
-		'aside', 'audio', 'chat', 'gallery', 'image', 'link', 'quote', 'status', 'video'
-	) );
+	add_theme_support(
+		'post-formats', array(
+			'aside',
+			'audio',
+			'chat',
+			'gallery',
+			'image',
+			'link',
+			'quote',
+			'status',
+			'video',
+		)
+	);
 
 	// This theme uses wp_nav_menu() in one location.
 	register_nav_menu( 'primary', __( 'Navigation Menu', 'twentythirteen' ) );
@@ -139,17 +157,19 @@ function twentythirteen_fonts_url() {
 	if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) {
 		$font_families = array();
 
-		if ( 'off' !== $source_sans_pro )
+		if ( 'off' !== $source_sans_pro ) {
 			$font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic';
+		}
 
-		if ( 'off' !== $bitter )
+		if ( 'off' !== $bitter ) {
 			$font_families[] = 'Bitter:400,700';
+		}
 
 		$query_args = array(
 			'family' => urlencode( implode( '|', $font_families ) ),
 			'subset' => urlencode( 'latin,latin-ext' ),
 		);
-		$fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		$fonts_url  = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
 	}
 
 	return $fonts_url;
@@ -165,12 +185,14 @@ function twentythirteen_scripts_styles() {
 	 * Adds JavaScript to pages with the comment form to support
 	 * sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
+	}
 
 	// Adds Masonry to handle vertical alignment of footer widgets.
-	if ( is_active_sidebar( 'sidebar-1' ) )
+	if ( is_active_sidebar( 'sidebar-1' ) ) {
 		wp_enqueue_script( 'jquery-masonry' );
+	}
 
 	// Loads JavaScript file with functionality specific to Twenty Thirteen.
 	wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20160717', true );
@@ -230,20 +252,23 @@ add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 );
 function twentythirteen_wp_title( $title, $sep ) {
 	global $paged, $page;
 
-	if ( is_feed() )
+	if ( is_feed() ) {
 		return $title;
+	}
 
 	// Add the site name.
 	$title .= get_bloginfo( 'name', 'display' );
 
 	// Add the site description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
+	if ( $site_description && ( is_home() || is_front_page() ) ) {
 		$title = "$title $sep $site_description";
+	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
+	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
 		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentythirteen' ), max( $paged, $page ) );
+	}
 
 	return $title;
 }
@@ -255,42 +280,47 @@ add_filter( 'wp_title', 'twentythirteen_wp_title', 10, 2 );
  * @since Twenty Thirteen 1.0
  */
 function twentythirteen_widgets_init() {
-	register_sidebar( array(
-		'name'          => __( 'Main Widget Area', 'twentythirteen' ),
-		'id'            => 'sidebar-1',
-		'description'   => __( 'Appears in the footer section of the site.', 'twentythirteen' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</aside>',
-		'before_title'  => '<h3 class="widget-title">',
-		'after_title'   => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Main Widget Area', 'twentythirteen' ),
+			'id'            => 'sidebar-1',
+			'description'   => __( 'Appears in the footer section of the site.', 'twentythirteen' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name'          => __( 'Secondary Widget Area', 'twentythirteen' ),
-		'id'            => 'sidebar-2',
-		'description'   => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  => '</aside>',
-		'before_title'  => '<h3 class="widget-title">',
-		'after_title'   => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Secondary Widget Area', 'twentythirteen' ),
+			'id'            => 'sidebar-2',
+			'description'   => __( 'Appears on posts and pages in the sidebar.', 'twentythirteen' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentythirteen_widgets_init' );
 
 if ( ! function_exists( 'twentythirteen_paging_nav' ) ) :
-/**
- * Display navigation to next/previous set of posts when applicable.
- *
- * @since Twenty Thirteen 1.0
- */
-function twentythirteen_paging_nav() {
-	global $wp_query;
+	/**
+	 * Display navigation to next/previous set of posts when applicable.
+	 *
+	 * @since Twenty Thirteen 1.0
+	 */
+	function twentythirteen_paging_nav() {
+		global $wp_query;
 
-	// Don't print empty markup if there's only one page.
-	if ( $wp_query->max_num_pages < 2 )
-		return;
-	?>
-	<nav class="navigation paging-navigation" role="navigation">
+		// Don't print empty markup if there's only one page.
+		if ( $wp_query->max_num_pages < 2 ) {
+			return;
+		}
+		?>
+		<nav class="navigation paging-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
 		<div class="nav-links">
 
@@ -305,26 +335,27 @@ function twentythirteen_paging_nav() {
 		</div><!-- .nav-links -->
 	</nav><!-- .navigation -->
 	<?php
-}
+	}
 endif;
 
 if ( ! function_exists( 'twentythirteen_post_nav' ) ) :
-/**
- * Display navigation to next/previous post when applicable.
- *
- * @since Twenty Thirteen 1.0
- */
-function twentythirteen_post_nav() {
-	global $post;
+	/**
+	 * Display navigation to next/previous post when applicable.
+	 *
+	 * @since Twenty Thirteen 1.0
+	 */
+	function twentythirteen_post_nav() {
+		global $post;
 
-	// Don't print empty markup if there's nowhere to navigate.
-	$previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
+		// Don't print empty markup if there's nowhere to navigate.
+		$previous = ( is_attachment() ) ? get_post( $post->post_parent ) : get_adjacent_post( false, '', true );
+		$next     = get_adjacent_post( false, '', false );
 
-	if ( ! $next && ! $previous )
-		return;
-	?>
-	<nav class="navigation post-navigation" role="navigation">
+		if ( ! $next && ! $previous ) {
+			return;
+		}
+		?>
+		<nav class="navigation post-navigation" role="navigation">
 		<h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
 		<div class="nav-links">
 
@@ -334,140 +365,149 @@ function twentythirteen_post_nav() {
 		</div><!-- .nav-links -->
 	</nav><!-- .navigation -->
 	<?php
-}
+	}
 endif;
 
 if ( ! function_exists( 'twentythirteen_entry_meta' ) ) :
-/**
- * Print HTML with meta information for current post: categories, tags, permalink, author, and date.
- *
- * Create your own twentythirteen_entry_meta() to override in a child theme.
- *
- * @since Twenty Thirteen 1.0
- */
-function twentythirteen_entry_meta() {
-	if ( is_sticky() && is_home() && ! is_paged() )
-		echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>';
+	/**
+	 * Print HTML with meta information for current post: categories, tags, permalink, author, and date.
+	 *
+	 * Create your own twentythirteen_entry_meta() to override in a child theme.
+	 *
+	 * @since Twenty Thirteen 1.0
+	 */
+	function twentythirteen_entry_meta() {
+		if ( is_sticky() && is_home() && ! is_paged() ) {
+			echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>';
+		}
 
-	if ( ! has_post_format( 'link' ) && 'post' == get_post_type() )
-		twentythirteen_entry_date();
+		if ( ! has_post_format( 'link' ) && 'post' == get_post_type() ) {
+			twentythirteen_entry_date();
+		}
 
-	// Translators: used between list items, there is a space after the comma.
-	$categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) );
-	if ( $categories_list ) {
-		echo '<span class="categories-links">' . $categories_list . '</span>';
+		// Translators: used between list items, there is a space after the comma.
+		$categories_list = get_the_category_list( __( ', ', 'twentythirteen' ) );
+		if ( $categories_list ) {
+			echo '<span class="categories-links">' . $categories_list . '</span>';
+		}
+
+		// Translators: used between list items, there is a space after the comma.
+		$tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) );
+		if ( $tag_list ) {
+			echo '<span class="tags-links">' . $tag_list . '</span>';
+		}
+
+		// Post author
+		if ( 'post' == get_post_type() ) {
+			printf(
+				'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+				esc_attr( sprintf( __( 'View all posts by %s', 'twentythirteen' ), get_the_author() ) ),
+				get_the_author()
+			);
+		}
 	}
-
-	// Translators: used between list items, there is a space after the comma.
-	$tag_list = get_the_tag_list( '', __( ', ', 'twentythirteen' ) );
-	if ( $tag_list ) {
-		echo '<span class="tags-links">' . $tag_list . '</span>';
-	}
-
-	// Post author
-	if ( 'post' == get_post_type() ) {
-		printf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-			esc_attr( sprintf( __( 'View all posts by %s', 'twentythirteen' ), get_the_author() ) ),
-			get_the_author()
-		);
-	}
-}
 endif;
 
 if ( ! function_exists( 'twentythirteen_entry_date' ) ) :
-/**
- * Print HTML with date information for current post.
- *
- * Create your own twentythirteen_entry_date() to override in a child theme.
- *
- * @since Twenty Thirteen 1.0
- *
- * @param boolean $echo (optional) Whether to echo the date. Default true.
- * @return string The HTML-formatted post date.
- */
-function twentythirteen_entry_date( $echo = true ) {
-	if ( has_post_format( array( 'chat', 'status' ) ) )
-		$format_prefix = _x( '%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen' );
-	else
-		$format_prefix = '%2$s';
+	/**
+	 * Print HTML with date information for current post.
+	 *
+	 * Create your own twentythirteen_entry_date() to override in a child theme.
+	 *
+	 * @since Twenty Thirteen 1.0
+	 *
+	 * @param boolean $echo (optional) Whether to echo the date. Default true.
+	 * @return string The HTML-formatted post date.
+	 */
+	function twentythirteen_entry_date( $echo = true ) {
+		if ( has_post_format( array( 'chat', 'status' ) ) ) {
+			$format_prefix = _x( '%1$s on %2$s', '1: post format name. 2: date', 'twentythirteen' );
+		} else {
+			$format_prefix = '%2$s';
+		}
 
-	$date = sprintf( '<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>',
-		esc_url( get_permalink() ),
-		esc_attr( sprintf( __( 'Permalink to %s', 'twentythirteen' ), the_title_attribute( 'echo=0' ) ) ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( sprintf( $format_prefix, get_post_format_string( get_post_format() ), get_the_date() ) )
-	);
+		$date = sprintf(
+			'<span class="date"><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a></span>',
+			esc_url( get_permalink() ),
+			esc_attr( sprintf( __( 'Permalink to %s', 'twentythirteen' ), the_title_attribute( 'echo=0' ) ) ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( sprintf( $format_prefix, get_post_format_string( get_post_format() ), get_the_date() ) )
+		);
 
-	if ( $echo )
-		echo $date;
+		if ( $echo ) {
+			echo $date;
+		}
 
-	return $date;
-}
+		return $date;
+	}
 endif;
 
 if ( ! function_exists( 'twentythirteen_the_attached_image' ) ) :
-/**
- * Print the attached image with a link to the next attached image.
- *
- * @since Twenty Thirteen 1.0
- */
-function twentythirteen_the_attached_image() {
 	/**
-	 * Filter the image attachment size to use.
+	 * Print the attached image with a link to the next attached image.
 	 *
-	 * @since Twenty thirteen 1.0
-	 *
-	 * @param array $size {
-	 *     @type int The attachment height in pixels.
-	 *     @type int The attachment width in pixels.
-	 * }
+	 * @since Twenty Thirteen 1.0
 	 */
-	$attachment_size     = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
-	$next_attachment_url = wp_get_attachment_url();
-	$post                = get_post();
+	function twentythirteen_the_attached_image() {
+		/**
+		 * Filter the image attachment size to use.
+		 *
+		 * @since Twenty thirteen 1.0
+		 *
+		 * @param array $size {
+		 *     @type int The attachment height in pixels.
+		 *     @type int The attachment width in pixels.
+		 * }
+		 */
+		$attachment_size     = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
+		$next_attachment_url = wp_get_attachment_url();
+		$post                = get_post();
 
-	/*
-	 * 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.
-	 */
-	$attachment_ids = get_posts( array(
-		'post_parent'    => $post->post_parent,
-		'fields'         => 'ids',
-		'numberposts'    => -1,
-		'post_status'    => 'inherit',
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image',
-		'order'          => 'ASC',
-		'orderby'        => 'menu_order ID',
-	) );
+		/*
+		 * 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.
+		 */
+		$attachment_ids = get_posts(
+			array(
+				'post_parent'    => $post->post_parent,
+				'fields'         => 'ids',
+				'numberposts'    => -1,
+				'post_status'    => 'inherit',
+				'post_type'      => 'attachment',
+				'post_mime_type' => 'image',
+				'order'          => 'ASC',
+				'orderby'        => 'menu_order ID',
+			)
+		);
 
-	// If there is more than 1 attachment in a gallery...
-	if ( count( $attachment_ids ) > 1 ) {
-		foreach ( $attachment_ids as $idx => $attachment_id ) {
-			if ( $attachment_id == $post->ID ) {
-				$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
-				break;
+		// If there is more than 1 attachment in a gallery...
+		if ( count( $attachment_ids ) > 1 ) {
+			foreach ( $attachment_ids as $idx => $attachment_id ) {
+				if ( $attachment_id == $post->ID ) {
+					$next_id = $attachment_ids[ ( $idx + 1 ) % count( $attachment_ids ) ];
+					break;
+				}
+			}
+
+			// get the URL of the next image attachment...
+			if ( $next_id ) {
+				$next_attachment_url = get_attachment_link( $next_id );
+			} // or get the URL of the first image attachment.
+			else {
+				$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
 			}
 		}
 
-		// get the URL of the next image attachment...
-		if ( $next_id )
-			$next_attachment_url = get_attachment_link( $next_id );
-
-		// or get the URL of the first image attachment.
-		else
-			$next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
+		printf(
+			'<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
+			esc_url( $next_attachment_url ),
+			the_title_attribute( array( 'echo' => false ) ),
+			wp_get_attachment_image( $post->ID, $attachment_size )
+		);
 	}
-
-	printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
-		esc_url( $next_attachment_url ),
-		the_title_attribute( array( 'echo' => false ) ),
-		wp_get_attachment_image( $post->ID, $attachment_size )
-	);
-}
 endif;
 
 /**
@@ -490,24 +530,25 @@ function twentythirteen_get_link_url() {
 }
 
 if ( ! function_exists( 'twentythirteen_excerpt_more' ) && ! is_admin() ) :
-/**
- * Replaces "[...]" (appended to automatically generated excerpts) with ...
- * and a Continue reading link.
- *
- * @since Twenty Thirteen 1.4
- *
- * @param string $more Default Read More excerpt link.
- * @return string Filtered Read More excerpt link.
- */
-function twentythirteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
+	/**
+	 * Replaces "[...]" (appended to automatically generated excerpts) with ...
+	 * and a Continue reading link.
+	 *
+	 * @since Twenty Thirteen 1.4
+	 *
+	 * @param string $more Default Read More excerpt link.
+	 * @return string Filtered Read More excerpt link.
+	 */
+	function twentythirteen_excerpt_more( $more ) {
+		$link = sprintf(
+			'<a href="%1$s" class="more-link">%2$s</a>',
+			esc_url( get_permalink( get_the_ID() ) ),
 			/* translators: %s: Name of current post */
 			sprintf( __( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'twentythirteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
 		);
-	return ' &hellip; ' . $link;
-}
-add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' );
+		return ' &hellip; ' . $link;
+	}
+	add_filter( 'excerpt_more', 'twentythirteen_excerpt_more' );
 endif;
 
 /**
@@ -524,14 +565,17 @@ endif;
  * @return array The filtered body class list.
  */
 function twentythirteen_body_class( $classes ) {
-	if ( ! is_multi_author() )
+	if ( ! is_multi_author() ) {
 		$classes[] = 'single-author';
+	}
 
-	if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() )
+	if ( is_active_sidebar( 'sidebar-2' ) && ! is_attachment() && ! is_404() ) {
 		$classes[] = 'sidebar';
+	}
 
-	if ( ! get_option( 'show_avatars' ) )
+	if ( ! get_option( 'show_avatars' ) ) {
 		$classes[] = 'no-avatars';
+	}
 
 	return $classes;
 }
@@ -545,10 +589,11 @@ add_filter( 'body_class', 'twentythirteen_body_class' );
 function twentythirteen_content_width() {
 	global $content_width;
 
-	if ( is_attachment() )
+	if ( is_attachment() ) {
 		$content_width = 724;
-	elseif ( has_post_format( 'audio' ) )
+	} elseif ( has_post_format( 'audio' ) ) {
 		$content_width = 484;
+	}
 }
 add_action( 'template_redirect', 'twentythirteen_content_width' );
 
@@ -565,16 +610,20 @@ function twentythirteen_customize_register( $wp_customize ) {
 	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
-			'selector' => '.site-title',
-			'container_inclusive' => false,
-			'render_callback' => 'twentythirteen_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-			'selector' => '.site-description',
-			'container_inclusive' => false,
-			'render_callback' => 'twentythirteen_customize_partial_blogdescription',
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'blogname', array(
+				'selector'            => '.site-title',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentythirteen_customize_partial_blogname',
+			)
+		);
+		$wp_customize->selective_refresh->add_partial(
+			'blogdescription', array(
+				'selector'            => '.site-description',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentythirteen_customize_partial_blogdescription',
+			)
+		);
 	}
 }
 add_action( 'customize_register', 'twentythirteen_customize_register' );
diff --git a/wp-content/themes/twentythirteen/header.php b/wp-content/themes/twentythirteen/header.php
index 094f74cc9f..6253472829 100644
--- a/wp-content/themes/twentythirteen/header.php
+++ b/wp-content/themes/twentythirteen/header.php
@@ -42,7 +42,15 @@
 				<nav id="site-navigation" class="navigation main-navigation" role="navigation">
 					<button class="menu-toggle"><?php _e( 'Menu', 'twentythirteen' ); ?></button>
 					<a class="screen-reader-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
-					<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu' ) ); ?>
+					<?php
+					wp_nav_menu(
+						array(
+							'theme_location' => 'primary',
+							'menu_class'     => 'nav-menu',
+							'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 c29caedf60..f6de824caa 100644
--- a/wp-content/themes/twentythirteen/image.php
+++ b/wp-content/themes/twentythirteen/image.php
@@ -16,53 +16,57 @@ get_header(); ?>
 
 			<?php
 				// Start the Loop.
-				while ( have_posts() ) : the_post();
+			while ( have_posts() ) :
+				the_post();
 			?>
 
 			<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
-				<header class="entry-header">
-					<h1 class="entry-title"><?php the_title(); ?></h1>
+			<header class="entry-header">
+				<h1 class="entry-title"><?php the_title(); ?></h1>
 
-					<div class="entry-meta">
-						<?php
-							$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
-							$post_title = get_the_title( $post->post_parent );
-							if ( empty( $post_title ) || 0 == $post->post_parent )
-								$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
+				<div class="entry-meta">
+					<?php
+						$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
+						$post_title     = get_the_title( $post->post_parent );
+					if ( empty( $post_title ) || 0 == $post->post_parent ) {
+						$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
+					}
 
-							printf( $published_text,
-								esc_attr( get_the_date( 'c' ) ),
-								esc_html( get_the_date() ),
-								esc_url( get_permalink( $post->post_parent ) ),
-								esc_attr( strip_tags( $post_title ) ),
-								$post_title
-							);
+						printf(
+							$published_text,
+							esc_attr( get_the_date( 'c' ) ),
+							esc_html( get_the_date() ),
+							esc_url( get_permalink( $post->post_parent ) ),
+							esc_attr( strip_tags( $post_title ) ),
+							$post_title
+						);
 
-							$metadata = wp_get_attachment_metadata();
-							printf( '<span class="attachment-meta full-size-link"><a href="%1$s" title="%2$s">%3$s (%4$s &times; %5$s)</a></span>',
-								esc_url( wp_get_attachment_url() ),
-								esc_attr__( 'Link to full-size image', 'twentythirteen' ),
-								__( 'Full resolution', 'twentythirteen' ),
-								$metadata['width'],
-								$metadata['height']
-							);
+						$metadata = wp_get_attachment_metadata();
+						printf(
+							'<span class="attachment-meta full-size-link"><a href="%1$s" title="%2$s">%3$s (%4$s &times; %5$s)</a></span>',
+							esc_url( wp_get_attachment_url() ),
+							esc_attr__( 'Link to full-size image', 'twentythirteen' ),
+							__( 'Full resolution', 'twentythirteen' ),
+							$metadata['width'],
+							$metadata['height']
+						);
 
-							edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
-						?>
+						edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
+					?>
 					</div><!-- .entry-meta -->
 				</header><!-- .entry-header -->
 
 				<div class="entry-content">
 					<nav id="image-navigation" class="navigation image-navigation" role="navigation">
-						<span class="nav-previous"><?php previous_image_link( false, __( '<span class="meta-nav">&larr;</span> Previous', 'twentythirteen' ) ); ?></span>
+					<span class="nav-previous"><?php previous_image_link( false, __( '<span class="meta-nav">&larr;</span> Previous', 'twentythirteen' ) ); ?></span>
 						<span class="nav-next"><?php next_image_link( false, __( 'Next <span class="meta-nav">&rarr;</span>', 'twentythirteen' ) ); ?></span>
 					</nav><!-- #image-navigation -->
 
 					<div class="entry-attachment">
 						<div class="attachment">
-							<?php twentythirteen_the_attached_image(); ?>
+						<?php twentythirteen_the_attached_image(); ?>
 
-							<?php if ( has_excerpt() ) : ?>
+						<?php if ( has_excerpt() ) : ?>
 							<div class="entry-caption">
 								<?php the_excerpt(); ?>
 							</div>
@@ -73,7 +77,14 @@ get_header(); ?>
 					<?php if ( ! empty( $post->post_content ) ) : ?>
 					<div class="entry-description">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentythirteen' ), 'after' => '</div>' ) ); ?>
+						<?php
+						wp_link_pages(
+							array(
+								'before' => '<div class="page-links">' . __( 'Pages:', 'twentythirteen' ),
+								'after'  => '</div>',
+							)
+						);
+						?>
 					</div><!-- .entry-description -->
 					<?php endif; ?>
 
diff --git a/wp-content/themes/twentythirteen/inc/back-compat.php b/wp-content/themes/twentythirteen/inc/back-compat.php
index 993ef1c6a7..9f72aa189d 100644
--- a/wp-content/themes/twentythirteen/inc/back-compat.php
+++ b/wp-content/themes/twentythirteen/inc/back-compat.php
@@ -44,9 +44,11 @@ function twentythirteen_upgrade_notice() {
  * @since Twenty Thirteen 1.0
  */
 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(
-		'back_link' => true,
-	) );
+	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(
+			'back_link' => true,
+		)
+	);
 }
 add_action( 'load-customize.php', 'twentythirteen_customize' );
 
diff --git a/wp-content/themes/twentythirteen/inc/custom-header.php b/wp-content/themes/twentythirteen/inc/custom-header.php
index 9e40bfe062..c572c3bb5a 100644
--- a/wp-content/themes/twentythirteen/inc/custom-header.php
+++ b/wp-content/themes/twentythirteen/inc/custom-header.php
@@ -42,23 +42,25 @@ function twentythirteen_custom_header_setup() {
 	 * Default custom headers packaged with the theme.
 	 * %s is a placeholder for the theme template directory URI.
 	 */
-	register_default_headers( array(
-		'circle' => array(
-			'url'           => '%s/images/headers/circle.png',
-			'thumbnail_url' => '%s/images/headers/circle-thumbnail.png',
-			'description'   => _x( 'Circle', 'header image description', 'twentythirteen' )
-		),
-		'diamond' => array(
-			'url'           => '%s/images/headers/diamond.png',
-			'thumbnail_url' => '%s/images/headers/diamond-thumbnail.png',
-			'description'   => _x( 'Diamond', 'header image description', 'twentythirteen' )
-		),
-		'star' => array(
-			'url'           => '%s/images/headers/star.png',
-			'thumbnail_url' => '%s/images/headers/star-thumbnail.png',
-			'description'   => _x( 'Star', 'header image description', 'twentythirteen' )
-		),
-	) );
+	register_default_headers(
+		array(
+			'circle'  => array(
+				'url'           => '%s/images/headers/circle.png',
+				'thumbnail_url' => '%s/images/headers/circle-thumbnail.png',
+				'description'   => _x( 'Circle', 'header image description', 'twentythirteen' ),
+			),
+			'diamond' => array(
+				'url'           => '%s/images/headers/diamond.png',
+				'thumbnail_url' => '%s/images/headers/diamond-thumbnail.png',
+				'description'   => _x( 'Diamond', 'header image description', 'twentythirteen' ),
+			),
+			'star'    => array(
+				'url'           => '%s/images/headers/star.png',
+				'thumbnail_url' => '%s/images/headers/star-thumbnail.png',
+				'description'   => _x( 'Star', 'header image description', 'twentythirteen' ),
+			),
+		)
+	);
 }
 add_action( 'after_setup_theme', 'twentythirteen_custom_header_setup', 11 );
 
@@ -88,49 +90,50 @@ function twentythirteen_header_style() {
 	$text_color   = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
+	if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
 		return;
+	}
 
 	// If we get this far, we have custom styles.
 	?>
 	<style type="text/css" id="twentythirteen-header-css">
 	<?php
-		if ( ! empty( $header_image ) ) :
+	if ( ! empty( $header_image ) ) :
 	?>
+	.site-header {
+		background: url(<?php header_image(); ?>) no-repeat scroll top;
+		background-size: 1600px auto;
+	}
+	@media (max-width: 767px) {
 		.site-header {
-			background: url(<?php header_image(); ?>) no-repeat scroll top;
-			background-size: 1600px auto;
+			background-size: 768px auto;
 		}
-		@media (max-width: 767px) {
-			.site-header {
-				background-size: 768px auto;
-			}
-		}
-		@media (max-width: 359px) {
-			.site-header {
-				background-size: 360px auto;
-			}
+	}
+	@media (max-width: 359px) {
+		.site-header {
+			background-size: 360px auto;
 		}
+	}
 	<?php
 		endif;
 
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+	if ( ! display_header_text() ) :
 	?>
-		.site-title,
-		.site-description {
-			position: absolute;
-			clip: rect(1px 1px 1px 1px); /* IE7 */
-			clip: rect(1px, 1px, 1px, 1px);
-		}
+	.site-title,
+	.site-description {
+		position: absolute;
+		clip: rect(1px 1px 1px 1px); /* IE7 */
+		clip: rect(1px, 1px, 1px, 1px);
+	}
 	<?php
-			if ( empty( $header_image ) ) :
+	if ( empty( $header_image ) ) :
 	?>
-		.site-header .home-link {
-			min-height: 0;
-		}
+	.site-header .home-link {
+	min-height: 0;
+	}
 	<?php
-			endif;
+		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' ) ) :
@@ -161,7 +164,8 @@ function twentythirteen_admin_header_style() {
 		<?php
 		if ( ! empty( $header_image ) ) {
 			echo 'background: url(' . esc_url( $header_image ) . ') no-repeat scroll top; background-size: 1600px auto;';
-		} ?>
+		}
+		?>
 		padding: 0 20px;
 	}
 	#headimg .home-link {
@@ -173,7 +177,8 @@ function twentythirteen_admin_header_style() {
 		<?php
 		if ( ! empty( $header_image ) || display_header_text() ) {
 			echo 'min-height: 230px;';
-		} ?>
+		}
+		?>
 		width: 100%;
 	}
 	<?php if ( ! display_header_text() ) : ?>
@@ -227,4 +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 1fe9b550db..aa78669d8c 100644
--- a/wp-content/themes/twentythirteen/index.php
+++ b/wp-content/themes/twentythirteen/index.php
@@ -21,7 +21,10 @@ get_header(); ?>
 		<?php if ( have_posts() ) : ?>
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?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 5545367722..907a73586c 100644
--- a/wp-content/themes/twentythirteen/page.php
+++ b/wp-content/themes/twentythirteen/page.php
@@ -17,7 +17,10 @@ get_header(); ?>
 		<div id="content" class="site-content" role="main">
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<header class="entry-header">
@@ -32,7 +35,16 @@ get_header(); ?>
 
 					<div class="entry-content">
 						<?php the_content(); ?>
-						<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
+						<?php
+						wp_link_pages(
+							array(
+								'before'      => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>',
+								'after'       => '</div>',
+								'link_before' => '<span>',
+								'link_after'  => '</span>',
+							)
+						);
+?>
 					</div><!-- .entry-content -->
 
 					<footer class="entry-meta">
@@ -47,4 +59,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentythirteen/search.php b/wp-content/themes/twentythirteen/search.php
index 1519c13765..a9e073e987 100644
--- a/wp-content/themes/twentythirteen/search.php
+++ b/wp-content/themes/twentythirteen/search.php
@@ -19,7 +19,10 @@ get_header(); ?>
 			</header>
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
@@ -33,4 +36,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentythirteen/sidebar-main.php b/wp-content/themes/twentythirteen/sidebar-main.php
index 3c700addda..c404b0650c 100644
--- a/wp-content/themes/twentythirteen/sidebar-main.php
+++ b/wp-content/themes/twentythirteen/sidebar-main.php
@@ -15,4 +15,4 @@ if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
 			<?php dynamic_sidebar( 'sidebar-1' ); ?>
 		</div><!-- .widget-area -->
 	</div><!-- #secondary -->
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/wp-content/themes/twentythirteen/sidebar.php b/wp-content/themes/twentythirteen/sidebar.php
index cb5cf98e9b..874554d746 100644
--- a/wp-content/themes/twentythirteen/sidebar.php
+++ b/wp-content/themes/twentythirteen/sidebar.php
@@ -19,4 +19,4 @@ if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
 			</div><!-- .widget-area -->
 		</div><!-- .sidebar-inner -->
 	</div><!-- #tertiary -->
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/wp-content/themes/twentythirteen/single.php b/wp-content/themes/twentythirteen/single.php
index 1694a0dcf2..98dec5b2bb 100644
--- a/wp-content/themes/twentythirteen/single.php
+++ b/wp-content/themes/twentythirteen/single.php
@@ -13,7 +13,10 @@ get_header(); ?>
 		<div id="content" class="site-content" role="main">
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 
 				<?php get_template_part( 'content', get_post_format() ); ?>
 				<?php twentythirteen_post_nav(); ?>
@@ -25,4 +28,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentythirteen/tag.php b/wp-content/themes/twentythirteen/tag.php
index f00180d3bb..18a5a71c4f 100644
--- a/wp-content/themes/twentythirteen/tag.php
+++ b/wp-content/themes/twentythirteen/tag.php
@@ -26,7 +26,10 @@ get_header(); ?>
 			</header><!-- .archive-header -->
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?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 3cf2970ee1..6538d0d6d0 100644
--- a/wp-content/themes/twentythirteen/taxonomy-post_format.php
+++ b/wp-content/themes/twentythirteen/taxonomy-post_format.php
@@ -24,7 +24,10 @@ get_header(); ?>
 			</header><!-- .archive-header -->
 
 			<?php /* The loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentytwelve/404.php b/wp-content/themes/twentytwelve/404.php
index db3ef811b2..8b039ecee4 100644
--- a/wp-content/themes/twentytwelve/404.php
+++ b/wp-content/themes/twentytwelve/404.php
@@ -26,4 +26,4 @@ get_header(); ?>
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentytwelve/archive.php b/wp-content/themes/twentytwelve/archive.php
index 78314cfb8f..cf0611c458 100644
--- a/wp-content/themes/twentytwelve/archive.php
+++ b/wp-content/themes/twentytwelve/archive.php
@@ -24,9 +24,10 @@ get_header(); ?>
 
 		<?php if ( have_posts() ) : ?>
 			<header class="archive-header">
-				<h1 class="archive-title"><?php
-					if ( is_day() ) :
-						printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
+				<h1 class="archive-title">
+				<?php
+				if ( is_day() ) :
+					printf( __( 'Daily Archives: %s', 'twentytwelve' ), '<span>' . get_the_date() . '</span>' );
 					elseif ( is_month() ) :
 						printf( __( 'Monthly Archives: %s', 'twentytwelve' ), '<span>' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentytwelve' ) ) . '</span>' );
 					elseif ( is_year() ) :
@@ -34,12 +35,14 @@ get_header(); ?>
 					else :
 						_e( 'Archives', 'twentytwelve' );
 					endif;
-				?></h1>
+				?>
+				</h1>
 			</header><!-- .archive-header -->
 
 			<?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
 				 * this in a child theme then include a file called content-___.php
diff --git a/wp-content/themes/twentytwelve/author.php b/wp-content/themes/twentytwelve/author.php
index 9a55c34199..ace43e7bd8 100644
--- a/wp-content/themes/twentytwelve/author.php
+++ b/wp-content/themes/twentytwelve/author.php
@@ -44,7 +44,8 @@ get_header(); ?>
 
 			<?php
 			// If a user has filled out their description, show a bio on their entries.
-			if ( get_the_author_meta( 'description' ) ) : ?>
+			if ( get_the_author_meta( 'description' ) ) :
+			?>
 			<div class="author-info">
 				<div class="author-avatar">
 					<?php
@@ -67,7 +68,10 @@ get_header(); ?>
 			<?php endif; ?>
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
diff --git a/wp-content/themes/twentytwelve/category.php b/wp-content/themes/twentytwelve/category.php
index 458063066d..0625a7d6c2 100644
--- a/wp-content/themes/twentytwelve/category.php
+++ b/wp-content/themes/twentytwelve/category.php
@@ -27,7 +27,8 @@ get_header(); ?>
 
 			<?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
 				 * this in a child theme then include a file called content-___.php
diff --git a/wp-content/themes/twentytwelve/comments.php b/wp-content/themes/twentytwelve/comments.php
index d6a733efe4..19f5941dad 100644
--- a/wp-content/themes/twentytwelve/comments.php
+++ b/wp-content/themes/twentytwelve/comments.php
@@ -17,8 +17,9 @@
  * the visitor has not yet entered the password we will
  * return early without loading the comments.
  */
-if ( post_password_required() )
+if ( post_password_required() ) {
 	return;
+}
 ?>
 
 <div id="comments" class="comments-area">
@@ -28,13 +29,22 @@ if ( post_password_required() )
 	<?php if ( have_comments() ) : ?>
 		<h2 class="comments-title">
 			<?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>' );
+				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>'
+				);
 			?>
 		</h2>
 
 		<ol class="commentlist">
-			<?php wp_list_comments( array( 'callback' => 'twentytwelve_comment', 'style' => 'ol' ) ); ?>
+			<?php
+			wp_list_comments(
+				array(
+					'callback' => 'twentytwelve_comment',
+					'style'    => 'ol',
+				)
+			);
+?>
 		</ol><!-- .commentlist -->
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
@@ -49,12 +59,13 @@ if ( post_password_required() )
 		/* If there are no comments and comments are closed, let's leave a note.
 		 * 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>
+		if ( ! comments_open() && get_comments_number() ) :
+		?>
+		<p class="nocomments"><?php _e( 'Comments are closed.', 'twentytwelve' ); ?></p>
 		<?php endif; ?>
 
 	<?php endif; // have_comments() ?>
 
 	<?php comment_form(); ?>
 
-</div><!-- #comments .comments-area -->
\ No newline at end of file
+</div><!-- #comments .comments-area -->
diff --git a/wp-content/themes/twentytwelve/content-page.php b/wp-content/themes/twentytwelve/content-page.php
index 0abcbf7911..d1553444bb 100644
--- a/wp-content/themes/twentytwelve/content-page.php
+++ b/wp-content/themes/twentytwelve/content-page.php
@@ -18,7 +18,14 @@
 
 		<div class="entry-content">
 			<?php the_content(); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
+					'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 56493ed0bd..901b9bd873 100644
--- a/wp-content/themes/twentytwelve/content.php
+++ b/wp-content/themes/twentytwelve/content.php
@@ -17,9 +17,11 @@
 		</div>
 		<?php endif; ?>
 		<header class="entry-header">
-			<?php if ( ! post_password_required() && ! is_attachment() ) :
+			<?php
+			if ( ! post_password_required() && ! is_attachment() ) :
 				the_post_thumbnail();
-			endif; ?>
+			endif;
+			?>
 
 			<?php if ( is_single() ) : ?>
 			<h1 class="entry-title"><?php the_title(); ?></h1>
@@ -42,7 +44,14 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentytwelve' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+			<?php
+			wp_link_pages(
+				array(
+					'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
+					'after'  => '</div>',
+				)
+			);
+?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
diff --git a/wp-content/themes/twentytwelve/footer.php b/wp-content/themes/twentytwelve/footer.php
index fe31e596d9..b65e115d34 100644
--- a/wp-content/themes/twentytwelve/footer.php
+++ b/wp-content/themes/twentytwelve/footer.php
@@ -20,4 +20,4 @@
 
 <?php wp_footer(); ?>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
index 68d44aaed0..31fc282043 100644
--- a/wp-content/themes/twentytwelve/functions.php
+++ b/wp-content/themes/twentytwelve/functions.php
@@ -23,8 +23,9 @@
  */
 
 // Set up the content width value based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 625;
+}
 
 /**
  * Twenty Twelve setup.
@@ -35,7 +36,7 @@ if ( ! isset( $content_width ) )
  * @uses load_theme_textdomain() For translation/localization support.
  * @uses add_editor_style() To add a Visual Editor stylesheet.
  * @uses add_theme_support() To add support for post thumbnails, automatic feed links,
- * 	custom background, and post formats.
+ *  custom background, and post formats.
  * @uses register_nav_menu() To add support for navigation menus.
  * @uses set_post_thumbnail_size() To set a custom post thumbnail size.
  *
@@ -67,9 +68,11 @@ function twentytwelve_setup() {
 	 * This theme supports custom background color and image,
 	 * and here we also set up the default background color.
 	 */
-	add_theme_support( 'custom-background', array(
-		'default-color' => 'e6e6e6',
-	) );
+	add_theme_support(
+		'custom-background', array(
+			'default-color' => 'e6e6e6',
+		)
+	);
 
 	// This theme uses a custom image size for featured images, displayed on "standard" posts.
 	add_theme_support( 'post-thumbnails' );
@@ -109,18 +112,19 @@ function twentytwelve_get_font_url() {
 		 */
 		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
 
-		if ( 'cyrillic' == $subset )
+		if ( 'cyrillic' == $subset ) {
 			$subsets .= ',cyrillic,cyrillic-ext';
-		elseif ( 'greek' == $subset )
+		} elseif ( 'greek' == $subset ) {
 			$subsets .= ',greek,greek-ext';
-		elseif ( 'vietnamese' == $subset )
+		} elseif ( 'vietnamese' == $subset ) {
 			$subsets .= ',vietnamese';
+		}
 
 		$query_args = array(
 			'family' => 'Open+Sans:400italic,700italic,400,700',
 			'subset' => $subsets,
 		);
-		$font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+		$font_url   = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
 	}
 
 	return $font_url;
@@ -138,15 +142,17 @@ function twentytwelve_scripts_styles() {
 	 * Adds JavaScript to pages with the comment form to support
 	 * sites with threaded comments (when in use).
 	 */
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) )
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
+	}
 
 	// Adds JavaScript for handling the navigation menu hide-and-show behavior.
 	wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140711', true );
 
 	$font_url = twentytwelve_get_font_url();
-	if ( ! empty( $font_url ) )
+	if ( ! empty( $font_url ) ) {
 		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+	}
 
 	// Loads our main stylesheet.
 	wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
@@ -197,11 +203,13 @@ add_filter( 'wp_resource_hints', 'twentytwelve_resource_hints', 10, 2 );
 function twentytwelve_mce_css( $mce_css ) {
 	$font_url = twentytwelve_get_font_url();
 
-	if ( empty( $font_url ) )
+	if ( empty( $font_url ) ) {
 		return $mce_css;
+	}
 
-	if ( ! empty( $mce_css ) )
+	if ( ! empty( $mce_css ) ) {
 		$mce_css .= ',';
+	}
 
 	$mce_css .= esc_url_raw( str_replace( ',', '%2C', $font_url ) );
 
@@ -224,20 +232,23 @@ add_filter( 'mce_css', 'twentytwelve_mce_css' );
 function twentytwelve_wp_title( $title, $sep ) {
 	global $paged, $page;
 
-	if ( is_feed() )
+	if ( is_feed() ) {
 		return $title;
+	}
 
 	// Add the site name.
 	$title .= get_bloginfo( 'name', 'display' );
 
 	// Add the site description for the home/front page.
 	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
+	if ( $site_description && ( is_home() || is_front_page() ) ) {
 		$title = "$title $sep $site_description";
+	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() )
+	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
 		$title = "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
+	}
 
 	return $title;
 }
@@ -251,8 +262,9 @@ add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+	if ( ! isset( $args['show_home'] ) ) {
 		$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
@@ -265,168 +277,190 @@ add_filter( 'wp_page_menu_args', 'twentytwelve_page_menu_args' );
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_widgets_init() {
-	register_sidebar( array(
-		'name' => __( 'Main Sidebar', 'twentytwelve' ),
-		'id' => 'sidebar-1',
-		'description' => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Main Sidebar', 'twentytwelve' ),
+			'id'            => 'sidebar-1',
+			'description'   => __( 'Appears on posts and pages except the optional Front Page template, which has its own widgets', 'twentytwelve' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'First Front Page Widget Area', 'twentytwelve' ),
-		'id' => 'sidebar-2',
-		'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'First Front Page Widget Area', 'twentytwelve' ),
+			'id'            => 'sidebar-2',
+			'description'   => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 
-	register_sidebar( array(
-		'name' => __( 'Second Front Page Widget Area', 'twentytwelve' ),
-		'id' => 'sidebar-3',
-		'description' => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
-		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
-		'after_widget' => '</aside>',
-		'before_title' => '<h3 class="widget-title">',
-		'after_title' => '</h3>',
-	) );
+	register_sidebar(
+		array(
+			'name'          => __( 'Second Front Page Widget Area', 'twentytwelve' ),
+			'id'            => 'sidebar-3',
+			'description'   => __( 'Appears when using the optional Front Page template with a page set as Static Front Page', 'twentytwelve' ),
+			'before_widget' => '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  => '</aside>',
+			'before_title'  => '<h3 class="widget-title">',
+			'after_title'   => '</h3>',
+		)
+	);
 }
 add_action( 'widgets_init', 'twentytwelve_widgets_init' );
 
 if ( ! function_exists( 'twentytwelve_content_nav' ) ) :
-/**
- * Displays navigation to next/previous pages when applicable.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_content_nav( $html_id ) {
-	global $wp_query;
+	/**
+	 * Displays navigation to next/previous pages when applicable.
+	 *
+	 * @since Twenty Twelve 1.0
+	 */
+	function twentytwelve_content_nav( $html_id ) {
+		global $wp_query;
 
-	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
-			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
-			<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 endif;
-}
+		if ( $wp_query->max_num_pages > 1 ) : ?>
+			<nav id="<?php echo esc_attr( $html_id ); ?>" class="navigation" role="navigation">
+				<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentytwelve' ); ?></h3>
+				<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
+	endif;
+	}
 endif;
 
 if ( ! function_exists( 'twentytwelve_comment' ) ) :
-/**
- * Template for comments and pingbacks.
- *
- * To override this walker in a child theme without modifying the comments template
- * simply create your own twentytwelve_comment(), and that function will be used instead.
- *
- * Used as a callback by wp_list_comments() for displaying the comments.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_comment( $comment, $args, $depth ) {
-	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
-		case 'pingback' :
-		case 'trackback' :
-		// Display trackbacks differently than normal comments.
-	?>
-	<li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
+	/**
+	 * Template for comments and pingbacks.
+	 *
+	 * To override this walker in a child theme without modifying the comments template
+	 * simply create your own twentytwelve_comment(), and that function will be used instead.
+	 *
+	 * Used as a callback by wp_list_comments() for displaying the comments.
+	 *
+	 * @since Twenty Twelve 1.0
+	 */
+	function twentytwelve_comment( $comment, $args, $depth ) {
+		$GLOBALS['comment'] = $comment;
+		switch ( $comment->comment_type ) :
+			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
-			break;
-		default :
-		// Proceed with normal comments.
-		global $post;
-	?>
-	<li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
+				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">
 				<?php
 					echo get_avatar( $comment, 44 );
-					printf( '<cite><b class="fn">%1$s</b> %2$s</cite>',
+					printf(
+						'<cite><b class="fn">%1$s</b> %2$s</cite>',
 						get_comment_author_link(),
 						// If current post author is also comment author, make it known visually.
 						( $comment->user_id === $post->post_author ) ? '<span>' . __( 'Post author', 'twentytwelve' ) . '</span>' : ''
 					);
-					printf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+					printf(
+						'<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
 						esc_url( get_comment_link( $comment->comment_ID ) ),
 						get_comment_time( 'c' ),
 						/* translators: 1: date, 2: time */
 						sprintf( __( '%1$s at %2$s', 'twentytwelve' ), get_comment_date(), get_comment_time() )
 					);
-				?>
-			</header><!-- .comment-meta -->
+					?>
+				</header><!-- .comment-meta -->
 
-			<?php if ( '0' == $comment->comment_approved ) : ?>
+				<?php if ( '0' == $comment->comment_approved ) : ?>
 				<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentytwelve' ); ?></p>
 			<?php endif; ?>
 
-			<section class="comment-content comment">
+				<section class="comment-content comment">
 				<?php comment_text(); ?>
 				<?php edit_comment_link( __( 'Edit', 'twentytwelve' ), '<p class="edit-link">', '</p>' ); ?>
-			</section><!-- .comment-content -->
+				</section><!-- .comment-content -->
 
-			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply', 'twentytwelve' ), 'after' => ' <span>&darr;</span>', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-			</div><!-- .reply -->
-		</article><!-- #comment-## -->
-	<?php
-		break;
-	endswitch; // end comment_type check
-}
+				<div class="reply">
+				<?php
+				comment_reply_link(
+					array_merge(
+						$args, array(
+							'reply_text' => __( 'Reply', 'twentytwelve' ),
+							'after'      => ' <span>&darr;</span>',
+							'depth'      => $depth,
+							'max_depth'  => $args['max_depth'],
+						)
+					)
+				);
+?>
+				</div><!-- .reply -->
+			</article><!-- #comment-## -->
+		<?php
+				break;
+		endswitch; // end comment_type check
+	}
 endif;
 
 if ( ! function_exists( 'twentytwelve_entry_meta' ) ) :
-/**
- * Set up post entry meta.
- *
- * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
- *
- * Create your own twentytwelve_entry_meta() to override in a child theme.
- *
- * @since Twenty Twelve 1.0
- */
-function twentytwelve_entry_meta() {
-	// Translators: used between list items, there is a space after the comma.
-	$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
+	/**
+	 * Set up post entry meta.
+	 *
+	 * Prints HTML with meta information for current post: categories, tags, permalink, author, and date.
+	 *
+	 * Create your own twentytwelve_entry_meta() to override in a child theme.
+	 *
+	 * @since Twenty Twelve 1.0
+	 */
+	function twentytwelve_entry_meta() {
+		// Translators: used between list items, there is a space after the comma.
+		$categories_list = get_the_category_list( __( ', ', 'twentytwelve' ) );
 
-	// Translators: used between list items, there is a space after the comma.
-	$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
+		// Translators: used between list items, there is a space after the comma.
+		$tag_list = get_the_tag_list( '', __( ', ', 'twentytwelve' ) );
 
-	$date = sprintf( '<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() )
-	);
+		$date = sprintf(
+			'<a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a>',
+			esc_url( get_permalink() ),
+			esc_attr( get_the_time() ),
+			esc_attr( get_the_date( 'c' ) ),
+			esc_html( get_the_date() )
+		);
 
-	$author = sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
-		get_the_author()
-	);
+		$author = sprintf(
+			'<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
+			esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+			esc_attr( sprintf( __( 'View all posts by %s', 'twentytwelve' ), get_the_author() ) ),
+			get_the_author()
+		);
 
-	// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
-	if ( $tag_list ) {
-		$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	} elseif ( $categories_list ) {
-		$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
-	} else {
-		$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		// Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's name.
+		if ( $tag_list ) {
+			$utility_text = __( 'This entry was posted in %1$s and tagged %2$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		} elseif ( $categories_list ) {
+			$utility_text = __( 'This entry was posted in %1$s on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		} else {
+			$utility_text = __( 'This entry was posted on %3$s<span class="by-author"> by %4$s</span>.', 'twentytwelve' );
+		}
+
+		printf(
+			$utility_text,
+			$categories_list,
+			$tag_list,
+			$date,
+			$author
+		);
 	}
-
-	printf(
-		$utility_text,
-		$categories_list,
-		$tag_list,
-		$date,
-		$author
-	);
-}
 endif;
 
 /**
@@ -450,30 +484,36 @@ function twentytwelve_body_class( $classes ) {
 	$background_color = get_background_color();
 	$background_image = get_background_image();
 
-	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
+	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) ) {
 		$classes[] = 'full-width';
+	}
 
 	if ( is_page_template( 'page-templates/front-page.php' ) ) {
 		$classes[] = 'template-front-page';
-		if ( has_post_thumbnail() )
+		if ( has_post_thumbnail() ) {
 			$classes[] = 'has-post-thumbnail';
-		if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
+		}
+		if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) ) {
 			$classes[] = 'two-sidebars';
+		}
 	}
 
 	if ( empty( $background_image ) ) {
-		if ( empty( $background_color ) )
+		if ( empty( $background_color ) ) {
 			$classes[] = 'custom-background-empty';
-		elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) )
+		} elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) {
 			$classes[] = 'custom-background-white';
+		}
 	}
 
 	// Enable custom font class only if the font CSS is queued to load.
-	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) )
+	if ( wp_style_is( 'twentytwelve-fonts', 'queue' ) ) {
 		$classes[] = 'custom-font-enabled';
+	}
 
-	if ( ! is_multi_author() )
+	if ( ! is_multi_author() ) {
 		$classes[] = 'single-author';
+	}
 
 	return $classes;
 }
@@ -510,16 +550,20 @@ function twentytwelve_customize_register( $wp_customize ) {
 	$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
 
 	if ( isset( $wp_customize->selective_refresh ) ) {
-		$wp_customize->selective_refresh->add_partial( 'blogname', array(
-			'selector' => '.site-title > a',
-			'container_inclusive' => false,
-			'render_callback' => 'twentytwelve_customize_partial_blogname',
-		) );
-		$wp_customize->selective_refresh->add_partial( 'blogdescription', array(
-			'selector' => '.site-description',
-			'container_inclusive' => false,
-			'render_callback' => 'twentytwelve_customize_partial_blogdescription',
-		) );
+		$wp_customize->selective_refresh->add_partial(
+			'blogname', array(
+				'selector'            => '.site-title > a',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentytwelve_customize_partial_blogname',
+			)
+		);
+		$wp_customize->selective_refresh->add_partial(
+			'blogdescription', array(
+				'selector'            => '.site-description',
+				'container_inclusive' => false,
+				'render_callback'     => 'twentytwelve_customize_partial_blogdescription',
+			)
+		);
 	}
 }
 add_action( 'customize_register', 'twentytwelve_customize_register' );
diff --git a/wp-content/themes/twentytwelve/header.php b/wp-content/themes/twentytwelve/header.php
index c3b99d6f3d..2b95b498e5 100644
--- a/wp-content/themes/twentytwelve/header.php
+++ b/wp-content/themes/twentytwelve/header.php
@@ -42,7 +42,14 @@
 		<nav id="site-navigation" class="main-navigation" role="navigation">
 			<button class="menu-toggle"><?php _e( 'Menu', 'twentytwelve' ); ?></button>
 			<a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentytwelve' ); ?>"><?php _e( 'Skip to content', 'twentytwelve' ); ?></a>
-			<?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
+			<?php
+			wp_nav_menu(
+				array(
+					'theme_location' => 'primary',
+					'menu_class'     => 'nav-menu',
+				)
+			);
+?>
 		</nav><!-- #site-navigation -->
 
 		<?php if ( get_header_image() ) : ?>
@@ -50,4 +57,4 @@
 		<?php endif; ?>
 	</header><!-- #masthead -->
 
-	<div id="main" class="wrapper">
\ No newline at end of file
+	<div id="main" class="wrapper">
diff --git a/wp-content/themes/twentytwelve/image.php b/wp-content/themes/twentytwelve/image.php
index 976e017d50..d2d228ba65 100644
--- a/wp-content/themes/twentytwelve/image.php
+++ b/wp-content/themes/twentytwelve/image.php
@@ -14,7 +14,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-		<?php while ( have_posts() ) : the_post(); ?>
+		<?php
+		while ( have_posts() ) :
+			the_post();
+?>
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class( 'image-attachment' ); ?>>
 					<header class="entry-header">
@@ -23,7 +26,8 @@ get_header(); ?>
 						<footer class="entry-meta">
 							<?php
 								$metadata = wp_get_attachment_metadata();
-								printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
+								printf(
+									__( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>.', 'twentytwelve' ),
 									esc_attr( get_the_date( 'c' ) ),
 									esc_html( get_the_date() ),
 									esc_url( wp_get_attachment_url() ),
@@ -52,10 +56,22 @@ get_header(); ?>
  * 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' ) ) );
+$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 )
+	if ( $attachment->ID == $post->ID ) {
 		break;
+	}
 endforeach;
 
 // If there is more than 1 attachment in a gallery
@@ -73,20 +89,22 @@ else :
 	$next_attachment_url = wp_get_attachment_url();
 endif;
 ?>
-								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
-								/**
- 								 * Filter the image attachment size to use.
-								 *
-								 * @since Twenty Twelve 1.0
-								 *
-								 * @param array $size {
-								 *     @type int The attachment height in pixels.
-								 *     @type int The attachment width in pixels.
-								 * }
-								 */
-								$attachment_size = apply_filters( 'twentytwelve_attachment_size', array( 960, 960 ) );
-								echo wp_get_attachment_image( $post->ID, $attachment_size );
-								?></a>
+								<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment">
+													<?php
+													/**
+													 * Filter the image attachment size to use.
+													 *
+													 * @since Twenty Twelve 1.0
+													 *
+													 * @param array $size {
+													 *     @type int The attachment height in pixels.
+													 *     @type int The attachment width in pixels.
+													 * }
+													 */
+													$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 ) ) : ?>
 								<div class="entry-caption">
@@ -99,7 +117,14 @@ endif;
 
 						<div class="entry-description">
 							<?php the_content(); ?>
-							<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ), 'after' => '</div>' ) ); ?>
+							<?php
+							wp_link_pages(
+								array(
+									'before' => '<div class="page-links">' . __( 'Pages:', 'twentytwelve' ),
+									'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 baedf18b5e..c243dc65a9 100644
--- a/wp-content/themes/twentytwelve/inc/custom-header.php
+++ b/wp-content/themes/twentytwelve/inc/custom-header.php
@@ -54,8 +54,9 @@ add_action( 'after_setup_theme', 'twentytwelve_custom_header_setup' );
  */
 function twentytwelve_custom_header_fonts() {
 	$font_url = twentytwelve_get_font_url();
-	if ( ! empty( $font_url ) )
+	if ( ! empty( $font_url ) ) {
 		wp_enqueue_style( 'twentytwelve-fonts', esc_url_raw( $font_url ), array(), null );
+	}
 }
 add_action( 'admin_print_styles-appearance_page_custom-header', 'twentytwelve_custom_header_fonts' );
 
@@ -70,24 +71,25 @@ function twentytwelve_header_style() {
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail
-	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) )
+	if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
 		return;
+	}
 
 	// If we get this far, we have custom styles.
 	?>
 	<style type="text/css" id="twentytwelve-header-css">
 	<?php
 		// Has the text been hidden?
-		if ( ! display_header_text() ) :
+	if ( ! display_header_text() ) :
 	?>
-		.site-title,
-		.site-description {
-			position: absolute;
-			clip: rect(1px 1px 1px 1px); /* IE7 */
-			clip: rect(1px, 1px, 1px, 1px);
-		}
+	.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.
+	// If the user has set a custom color for the text, use that.
 		else :
 	?>
 		.site-header h1 a,
@@ -155,9 +157,12 @@ function twentytwelve_admin_header_image() {
 	<div id="headimg">
 		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
 		<h2 id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></h2>
-		<?php $header_image = get_header_image();
-		if ( ! empty( $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 7420be53e4..47e5c6424a 100644
--- a/wp-content/themes/twentytwelve/index.php
+++ b/wp-content/themes/twentytwelve/index.php
@@ -21,7 +21,10 @@ get_header(); ?>
 		<?php if ( have_posts() ) : ?>
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
@@ -31,7 +34,8 @@ get_header(); ?>
 
 			<article id="post-0" class="post no-results not-found">
 
-			<?php if ( current_user_can( 'edit_posts' ) ) :
+			<?php
+			if ( current_user_can( 'edit_posts' ) ) :
 				// Show a different message to a logged-in user who can add posts.
 			?>
 				<header class="entry-header">
@@ -42,7 +46,8 @@ 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 else :
+			<?php
+			else :
 				// Show the default message to everyone else.
 			?>
 				<header class="entry-header">
diff --git a/wp-content/themes/twentytwelve/page-templates/front-page.php b/wp-content/themes/twentytwelve/page-templates/front-page.php
index 9ae4f27dde..9561179a29 100644
--- a/wp-content/themes/twentytwelve/page-templates/front-page.php
+++ b/wp-content/themes/twentytwelve/page-templates/front-page.php
@@ -17,7 +17,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php if ( has_post_thumbnail() ) : ?>
 					<div class="entry-page-image">
 						<?php the_post_thumbnail(); ?>
@@ -32,4 +35,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar( 'front' ); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentytwelve/page-templates/full-width.php b/wp-content/themes/twentytwelve/page-templates/full-width.php
index b0ce333c2d..463d923d31 100644
--- a/wp-content/themes/twentytwelve/page-templates/full-width.php
+++ b/wp-content/themes/twentytwelve/page-templates/full-width.php
@@ -19,7 +19,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
@@ -27,4 +30,4 @@ get_header(); ?>
 		</div><!-- #content -->
 	</div><!-- #primary -->
 
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentytwelve/page.php b/wp-content/themes/twentytwelve/page.php
index b06cd1f206..32934195d0 100644
--- a/wp-content/themes/twentytwelve/page.php
+++ b/wp-content/themes/twentytwelve/page.php
@@ -17,7 +17,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', 'page' ); ?>
 				<?php comments_template( '', true ); ?>
 			<?php endwhile; // end of the loop. ?>
@@ -26,4 +29,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentytwelve/search.php b/wp-content/themes/twentytwelve/search.php
index 97a309b12c..9f40217061 100644
--- a/wp-content/themes/twentytwelve/search.php
+++ b/wp-content/themes/twentytwelve/search.php
@@ -21,7 +21,10 @@ get_header(); ?>
 			<?php twentytwelve_content_nav( 'nav-above' ); ?>
 
 			<?php /* Start the Loop */ ?>
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 				<?php get_template_part( 'content', get_post_format() ); ?>
 			<?php endwhile; ?>
 
@@ -46,4 +49,4 @@ get_header(); ?>
 	</section><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentytwelve/sidebar-front.php b/wp-content/themes/twentytwelve/sidebar-front.php
index 990a09fec3..5f1193537d 100644
--- a/wp-content/themes/twentytwelve/sidebar-front.php
+++ b/wp-content/themes/twentytwelve/sidebar-front.php
@@ -15,8 +15,9 @@
  *
  * If none of the sidebars have widgets, then let's bail early.
  */
-if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
+if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) ) {
 	return;
+}
 
 // If we get this far, we have widgets. Let do this.
 ?>
@@ -32,4 +33,4 @@ if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
 		<?php dynamic_sidebar( 'sidebar-3' ); ?>
 	</div><!-- .second -->
 	<?php endif; ?>
-</div><!-- #secondary -->
\ No newline at end of file
+</div><!-- #secondary -->
diff --git a/wp-content/themes/twentytwelve/sidebar.php b/wp-content/themes/twentytwelve/sidebar.php
index a59dcc49b0..ca9dbddb7a 100644
--- a/wp-content/themes/twentytwelve/sidebar.php
+++ b/wp-content/themes/twentytwelve/sidebar.php
@@ -14,4 +14,4 @@
 		<div id="secondary" class="widget-area" role="complementary">
 			<?php dynamic_sidebar( 'sidebar-1' ); ?>
 		</div><!-- #secondary -->
-	<?php endif; ?>
\ No newline at end of file
+	<?php endif; ?>
diff --git a/wp-content/themes/twentytwelve/single.php b/wp-content/themes/twentytwelve/single.php
index 38175246f1..17a900c38b 100644
--- a/wp-content/themes/twentytwelve/single.php
+++ b/wp-content/themes/twentytwelve/single.php
@@ -12,7 +12,10 @@ get_header(); ?>
 	<div id="primary" class="site-content">
 		<div id="content" role="main">
 
-			<?php while ( have_posts() ) : the_post(); ?>
+			<?php
+			while ( have_posts() ) :
+				the_post();
+?>
 
 				<?php get_template_part( 'content', get_post_format() ); ?>
 
@@ -30,4 +33,4 @@ get_header(); ?>
 	</div><!-- #primary -->
 
 <?php get_sidebar(); ?>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>
diff --git a/wp-content/themes/twentytwelve/tag.php b/wp-content/themes/twentytwelve/tag.php
index 7715302ca1..515521c789 100644
--- a/wp-content/themes/twentytwelve/tag.php
+++ b/wp-content/themes/twentytwelve/tag.php
@@ -27,7 +27,8 @@ get_header(); ?>
 
 			<?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
diff --git a/wp-cron.php b/wp-cron.php
index da526d2fea..acf5ded2d4 100644
--- a/wp-cron.php
+++ b/wp-cron.php
@@ -16,19 +16,20 @@
  * @package WordPress
  */
 
-ignore_user_abort(true);
+ignore_user_abort( true );
 
-if ( !empty($_POST) || defined('DOING_AJAX') || defined('DOING_CRON') )
+if ( ! empty( $_POST ) || defined( 'DOING_AJAX' ) || defined( 'DOING_CRON' ) ) {
 	die();
+}
 
 /**
  * Tell WordPress we are doing the CRON task.
  *
  * @var bool
  */
-define('DOING_CRON', true);
+define( 'DOING_CRON', true );
 
-if ( !defined('ABSPATH') ) {
+if ( ! defined( 'ABSPATH' ) ) {
 	/** Set up WordPress environment */
 	require_once( dirname( __FILE__ ) . '/wp-load.php' );
 }
@@ -57,21 +58,24 @@ function _get_cron_lock() {
 		$value = wp_cache_get( 'doing_cron', 'transient', true );
 	} else {
 		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", '_transient_doing_cron' ) );
-		if ( is_object( $row ) )
+		if ( is_object( $row ) ) {
 			$value = $row->option_value;
+		}
 	}
 
 	return $value;
 }
 
-if ( false === $crons = _get_cron_array() )
+if ( false === $crons = _get_cron_array() ) {
 	die();
+}
 
-$keys = array_keys( $crons );
+$keys     = array_keys( $crons );
 $gmt_time = microtime( true );
 
-if ( isset($keys[0]) && $keys[0] > $gmt_time )
+if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {
 	die();
+}
 
 
 // The cron lock: a unix timestamp from when the cron was spawned.
@@ -79,14 +83,15 @@ $doing_cron_transient = get_transient( 'doing_cron' );
 
 // Use global $doing_wp_cron lock otherwise use the GET lock. If no lock, trying grabbing a new lock.
 if ( empty( $doing_wp_cron ) ) {
-	if ( empty( $_GET[ 'doing_wp_cron' ] ) ) {
+	if ( empty( $_GET['doing_wp_cron'] ) ) {
 		// Called from external script/job. Try setting a lock.
-		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) )
+		if ( $doing_cron_transient && ( $doing_cron_transient + WP_CRON_LOCK_TIMEOUT > $gmt_time ) ) {
 			return;
+		}
 		$doing_cron_transient = $doing_wp_cron = sprintf( '%.22F', microtime( true ) );
 		set_transient( 'doing_cron', $doing_wp_cron );
 	} else {
-		$doing_wp_cron = $_GET[ 'doing_wp_cron' ];
+		$doing_wp_cron = $_GET['doing_wp_cron'];
 	}
 }
 
@@ -94,12 +99,14 @@ if ( empty( $doing_wp_cron ) ) {
  * The cron lock (a unix timestamp set when the cron was spawned),
  * must match $doing_wp_cron (the "key").
  */
-if ( $doing_cron_transient != $doing_wp_cron )
+if ( $doing_cron_transient != $doing_wp_cron ) {
 	return;
+}
 
 foreach ( $crons as $timestamp => $cronhooks ) {
-	if ( $timestamp > $gmt_time )
+	if ( $timestamp > $gmt_time ) {
 		break;
+	}
 
 	foreach ( $cronhooks as $hook => $keys ) {
 
@@ -108,8 +115,8 @@ foreach ( $crons as $timestamp => $cronhooks ) {
 			$schedule = $v['schedule'];
 
 			if ( $schedule != false ) {
-				$new_args = array($timestamp, $schedule, $hook, $v['args']);
-				call_user_func_array('wp_reschedule_event', $new_args);
+				$new_args = array( $timestamp, $schedule, $hook, $v['args'] );
+				call_user_func_array( 'wp_reschedule_event', $new_args );
 			}
 
 			wp_unschedule_event( $timestamp, $hook, $v['args'] );
@@ -123,16 +130,18 @@ foreach ( $crons as $timestamp => $cronhooks ) {
 			 * @param string $hook Name of the hook that was scheduled to be fired.
 			 * @param array  $args The arguments to be passed to the hook.
 			 */
- 			do_action_ref_array( $hook, $v['args'] );
+			do_action_ref_array( $hook, $v['args'] );
 
 			// If the hook ran too long and another cron process stole the lock, quit.
-			if ( _get_cron_lock() != $doing_wp_cron )
+			if ( _get_cron_lock() != $doing_wp_cron ) {
 				return;
+			}
 		}
 	}
 }
 
-if ( _get_cron_lock() == $doing_wp_cron )
+if ( _get_cron_lock() == $doing_wp_cron ) {
 	delete_transient( 'doing_cron' );
+}
 
 die();
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 1be7034a40..19f51a825b 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -23,8 +23,9 @@
 function _wp_admin_bar_init() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() )
+	if ( ! is_admin_bar_showing() ) {
 		return false;
+	}
 
 	/* Load the admin bar class code ready for instantiation */
 	require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
@@ -39,10 +40,11 @@ function _wp_admin_bar_init() {
 	 * @param string $wp_admin_bar_class Admin bar class to use. Default 'WP_Admin_Bar'.
 	 */
 	$admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-	if ( class_exists( $admin_bar_class ) )
+	if ( class_exists( $admin_bar_class ) ) {
 		$wp_admin_bar = new $admin_bar_class;
-	else
+	} else {
 		return false;
+	}
 
 	$wp_admin_bar->initialize();
 	$wp_admin_bar->add_menus();
@@ -68,8 +70,9 @@ function _wp_admin_bar_init() {
 function wp_admin_bar_render() {
 	global $wp_admin_bar;
 
-	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) )
+	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) ) {
 		return;
+	}
 
 	/**
 	 * Load all necessary admin bar items.
@@ -132,45 +135,55 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 
 	if ( $about_url ) {
 		// Add "About WordPress" link
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'wp-logo',
-			'id'     => 'about',
-			'title'  => __('About WordPress'),
-			'href'   => $about_url,
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'wp-logo',
+				'id'     => 'about',
+				'title'  => __( 'About WordPress' ),
+				'href'   => $about_url,
+			)
+		);
 	}
 
 	// Add WordPress.org link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'wporg',
-		'title'     => __('WordPress.org'),
-		'href'      => __('https://wordpress.org/'),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'parent' => 'wp-logo-external',
+			'id'     => 'wporg',
+			'title'  => __( 'WordPress.org' ),
+			'href'   => __( 'https://wordpress.org/' ),
+		)
+	);
 
 	// Add codex link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'documentation',
-		'title'     => __('Documentation'),
-		'href'      => __('https://codex.wordpress.org/'),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'parent' => 'wp-logo-external',
+			'id'     => 'documentation',
+			'title'  => __( 'Documentation' ),
+			'href'   => __( 'https://codex.wordpress.org/' ),
+		)
+	);
 
 	// Add forums link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'support-forums',
-		'title'     => __('Support Forums'),
-		'href'      => __('https://wordpress.org/support/'),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'parent' => 'wp-logo-external',
+			'id'     => 'support-forums',
+			'title'  => __( 'Support Forums' ),
+			'href'   => __( 'https://wordpress.org/support/' ),
+		)
+	);
 
 	// Add feedback link
-	$wp_admin_bar->add_menu( array(
-		'parent'    => 'wp-logo-external',
-		'id'        => 'feedback',
-		'title'     => __('Feedback'),
-		'href'      => __('https://wordpress.org/support/forum/requests-and-feedback'),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'parent' => 'wp-logo-external',
+			'id'     => 'feedback',
+			'title'  => __( 'Feedback' ),
+			'href'   => __( 'https://wordpress.org/support/forum/requests-and-feedback' ),
+		)
+	);
 }
 
 /**
@@ -182,11 +195,13 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
  */
 function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
 	if ( is_admin() ) {
-		$wp_admin_bar->add_menu( array(
-			'id'    => 'menu-toggle',
-			'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
-			'href'  => '#',
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'id'    => 'menu-toggle',
+				'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
+				'href'  => '#',
+			)
+		);
 	}
 }
 
@@ -201,8 +216,9 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 
-	if ( ! $user_id )
+	if ( ! $user_id ) {
 		return;
+	}
 
 	if ( current_user_can( 'read' ) ) {
 		$profile_url = get_edit_profile_url( $user_id );
@@ -214,18 +230,20 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
 
 	$avatar = get_avatar( $user_id, 26 );
 	/* translators: %s: current user's display name */
-	$howdy  = sprintf( __( 'Howdy, %s' ), '<span class="display-name">' . $current_user->display_name . '</span>' );
-	$class  = empty( $avatar ) ? '' : 'with-avatar';
+	$howdy = sprintf( __( 'Howdy, %s' ), '<span class="display-name">' . $current_user->display_name . '</span>' );
+	$class = empty( $avatar ) ? '' : 'with-avatar';
 
-	$wp_admin_bar->add_menu( array(
-		'id'        => 'my-account',
-		'parent'    => 'top-secondary',
-		'title'     => $howdy . $avatar,
-		'href'      => $profile_url,
-		'meta'      => array(
-			'class'     => $class,
-		),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'     => 'my-account',
+			'parent' => 'top-secondary',
+			'title'  => $howdy . $avatar,
+			'href'   => $profile_url,
+			'meta'   => array(
+				'class' => $class,
+			),
+		)
+	);
 }
 
 /**
@@ -239,8 +257,9 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 
-	if ( ! $user_id )
+	if ( ! $user_id ) {
 		return;
+	}
 
 	if ( current_user_can( 'read' ) ) {
 		$profile_url = get_edit_profile_url( $user_id );
@@ -250,42 +269,51 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
 		$profile_url = false;
 	}
 
-	$wp_admin_bar->add_group( array(
-		'parent' => 'my-account',
-		'id'     => 'user-actions',
-	) );
+	$wp_admin_bar->add_group(
+		array(
+			'parent' => 'my-account',
+			'id'     => 'user-actions',
+		)
+	);
 
 	$user_info  = get_avatar( $user_id, 64 );
 	$user_info .= "<span class='display-name'>{$current_user->display_name}</span>";
 
-	if ( $current_user->display_name !== $current_user->user_login )
+	if ( $current_user->display_name !== $current_user->user_login ) {
 		$user_info .= "<span class='username'>{$current_user->user_login}</span>";
-
-	$wp_admin_bar->add_menu( array(
-		'parent' => 'user-actions',
-		'id'     => 'user-info',
-		'title'  => $user_info,
-		'href'   => $profile_url,
-		'meta'   => array(
-			'tabindex' => -1,
-		),
-	) );
-
-	if ( false !== $profile_url ) {
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'user-actions',
-			'id'     => 'edit-profile',
-			'title'  => __( 'Edit My Profile' ),
-			'href'   => $profile_url,
-		) );
 	}
 
-	$wp_admin_bar->add_menu( array(
-		'parent' => 'user-actions',
-		'id'     => 'logout',
-		'title'  => __( 'Log Out' ),
-		'href'   => wp_logout_url(),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'parent' => 'user-actions',
+			'id'     => 'user-info',
+			'title'  => $user_info,
+			'href'   => $profile_url,
+			'meta'   => array(
+				'tabindex' => -1,
+			),
+		)
+	);
+
+	if ( false !== $profile_url ) {
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'user-actions',
+				'id'     => 'edit-profile',
+				'title'  => __( 'Edit My Profile' ),
+				'href'   => $profile_url,
+			)
+		);
+	}
+
+	$wp_admin_bar->add_menu(
+		array(
+			'parent' => 'user-actions',
+			'id'     => 'logout',
+			'title'  => __( 'Log Out' ),
+			'href'   => wp_logout_url(),
+		)
+	);
 }
 
 /**
@@ -297,15 +325,16 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
  */
 function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	// Don't show for logged out users.
-	if ( ! is_user_logged_in() )
+	if ( ! is_user_logged_in() ) {
 		return;
+	}
 
 	// Show only when the user is a member of this site, or they're a super admin.
 	if ( ! is_user_member_of_blog() && ! current_user_can( 'manage_network' ) ) {
 		return;
 	}
 
-	$blogname = get_bloginfo('name');
+	$blogname = get_bloginfo( 'name' );
 
 	if ( ! $blogname ) {
 		$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
@@ -321,40 +350,47 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
 
 	$title = wp_html_excerpt( $blogname, 40, '&hellip;' );
 
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'site-name',
-		'title' => $title,
-		'href'  => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'    => 'site-name',
+			'title' => $title,
+			'href'  => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
+		)
+	);
 
 	// Create submenu items.
 
 	if ( is_admin() ) {
 		// Add an option to visit the site.
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'site-name',
-			'id'     => 'view-site',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'site-name',
+				'id'     => 'view-site',
+				'title'  => __( 'Visit Site' ),
+				'href'   => home_url( '/' ),
+			)
+		);
 
 		if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => 'site-name',
-				'id'     => 'edit-site',
-				'title'  => __( 'Edit Site' ),
-				'href'   => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'site-name',
+					'id'     => 'edit-site',
+					'title'  => __( 'Edit Site' ),
+					'href'   => network_admin_url( 'site-info.php?id=' . get_current_blog_id() ),
+				)
+			);
 		}
-
-	} else if ( current_user_can( 'read' ) ) {
+	} elseif ( current_user_can( 'read' ) ) {
 		// We're on the front end, link to the Dashboard.
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'site-name',
-			'id'     => 'dashboard',
-			'title'  => __( 'Dashboard' ),
-			'href'   => admin_url(),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'site-name',
+				'id'     => 'dashboard',
+				'title'  => __( 'Dashboard' ),
+				'href'   => admin_url(),
+			)
+		);
 
 		// Add the appearance submenu items.
 		wp_admin_bar_appearance_menu( $wp_admin_bar );
@@ -392,14 +428,16 @@ function wp_admin_bar_customize_menu( $wp_admin_bar ) {
 		$customize_url = add_query_arg( array( 'changeset_uuid' => $wp_customize->changeset_uuid() ), $customize_url );
 	}
 
-	$wp_admin_bar->add_menu( array(
-		'id'     => 'customize',
-		'title'  => __( 'Customize' ),
-		'href'   => $customize_url,
-		'meta'   => array(
-			'class' => 'hide-if-no-customize',
-		),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'    => 'customize',
+			'title' => __( 'Customize' ),
+			'href'  => $customize_url,
+			'meta'  => array(
+				'class' => 'hide-if-no-customize',
+			),
+		)
+	);
 	add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
 }
 
@@ -412,8 +450,9 @@ function wp_admin_bar_customize_menu( $wp_admin_bar ) {
  */
 function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 	// Don't show for logged out users or single site mode.
-	if ( ! is_user_logged_in() || ! is_multisite() )
+	if ( ! is_user_logged_in() || ! is_multisite() ) {
 		return;
+	}
 
 	// Show only when the user has at least one site, or they're a super admin.
 	if ( count( $wp_admin_bar->user->blogs ) < 1 && ! current_user_can( 'manage_network' ) ) {
@@ -426,86 +465,106 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 		$my_sites_url = admin_url( 'my-sites.php' );
 	}
 
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'my-sites',
-		'title' => __( 'My Sites' ),
-		'href'  => $my_sites_url,
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'    => 'my-sites',
+			'title' => __( 'My Sites' ),
+			'href'  => $my_sites_url,
+		)
+	);
 
 	if ( current_user_can( 'manage_network' ) ) {
-		$wp_admin_bar->add_group( array(
-			'parent' => 'my-sites',
-			'id'     => 'my-sites-super-admin',
-		) );
+		$wp_admin_bar->add_group(
+			array(
+				'parent' => 'my-sites',
+				'id'     => 'my-sites-super-admin',
+			)
+		);
 
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'my-sites-super-admin',
-			'id'     => 'network-admin',
-			'title'  => __('Network Admin'),
-			'href'   => network_admin_url(),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'my-sites-super-admin',
+				'id'     => 'network-admin',
+				'title'  => __( 'Network Admin' ),
+				'href'   => network_admin_url(),
+			)
+		);
 
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'network-admin',
-			'id'     => 'network-admin-d',
-			'title'  => __( 'Dashboard' ),
-			'href'   => network_admin_url(),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'network-admin',
+				'id'     => 'network-admin-d',
+				'title'  => __( 'Dashboard' ),
+				'href'   => network_admin_url(),
+			)
+		);
 
 		if ( current_user_can( 'manage_sites' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => 'network-admin',
-				'id'     => 'network-admin-s',
-				'title'  => __( 'Sites' ),
-				'href'   => network_admin_url( 'sites.php' ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'network-admin',
+					'id'     => 'network-admin-s',
+					'title'  => __( 'Sites' ),
+					'href'   => network_admin_url( 'sites.php' ),
+				)
+			);
 		}
 
 		if ( current_user_can( 'manage_network_users' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => 'network-admin',
-				'id'     => 'network-admin-u',
-				'title'  => __( 'Users' ),
-				'href'   => network_admin_url( 'users.php' ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'network-admin',
+					'id'     => 'network-admin-u',
+					'title'  => __( 'Users' ),
+					'href'   => network_admin_url( 'users.php' ),
+				)
+			);
 		}
 
 		if ( current_user_can( 'manage_network_themes' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => 'network-admin',
-				'id'     => 'network-admin-t',
-				'title'  => __( 'Themes' ),
-				'href'   => network_admin_url( 'themes.php' ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'network-admin',
+					'id'     => 'network-admin-t',
+					'title'  => __( 'Themes' ),
+					'href'   => network_admin_url( 'themes.php' ),
+				)
+			);
 		}
 
 		if ( current_user_can( 'manage_network_plugins' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => 'network-admin',
-				'id'     => 'network-admin-p',
-				'title'  => __( 'Plugins' ),
-				'href'   => network_admin_url( 'plugins.php' ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'network-admin',
+					'id'     => 'network-admin-p',
+					'title'  => __( 'Plugins' ),
+					'href'   => network_admin_url( 'plugins.php' ),
+				)
+			);
 		}
 
 		if ( current_user_can( 'manage_network_options' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => 'network-admin',
-				'id'     => 'network-admin-o',
-				'title'  => __( 'Settings' ),
-				'href'   => network_admin_url( 'settings.php' ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'network-admin',
+					'id'     => 'network-admin-o',
+					'title'  => __( 'Settings' ),
+					'href'   => network_admin_url( 'settings.php' ),
+				)
+			);
 		}
 	}
 
 	// Add site links
-	$wp_admin_bar->add_group( array(
-		'parent' => 'my-sites',
-		'id'     => 'my-sites-list',
-		'meta'   => array(
-			'class' => current_user_can( 'manage_network' ) ? 'ab-sub-secondary' : '',
-		),
-	) );
+	$wp_admin_bar->add_group(
+		array(
+			'parent' => 'my-sites',
+			'id'     => 'my-sites-list',
+			'meta'   => array(
+				'class' => current_user_can( 'manage_network' ) ? 'ab-sub-secondary' : '',
+			),
+		)
+	);
 
 	foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
 		switch_to_blog( $blog->userblog_id );
@@ -518,55 +577,67 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 			$blogname = preg_replace( '#^(https?://)?(www.)?#', '', get_home_url() );
 		}
 
-		$menu_id  = 'blog-' . $blog->userblog_id;
+		$menu_id = 'blog-' . $blog->userblog_id;
 
 		if ( current_user_can( 'read' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent'    => 'my-sites-list',
-				'id'        => $menu_id,
-				'title'     => $blavatar . $blogname,
-				'href'      => admin_url(),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'my-sites-list',
+					'id'     => $menu_id,
+					'title'  => $blavatar . $blogname,
+					'href'   => admin_url(),
+				)
+			);
 
-			$wp_admin_bar->add_menu( array(
-				'parent' => $menu_id,
-				'id'     => $menu_id . '-d',
-				'title'  => __( 'Dashboard' ),
-				'href'   => admin_url(),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => $menu_id,
+					'id'     => $menu_id . '-d',
+					'title'  => __( 'Dashboard' ),
+					'href'   => admin_url(),
+				)
+			);
 		} else {
-			$wp_admin_bar->add_menu( array(
-				'parent'    => 'my-sites-list',
-				'id'        => $menu_id,
-				'title'     => $blavatar . $blogname,
-				'href'      => home_url(),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => 'my-sites-list',
+					'id'     => $menu_id,
+					'title'  => $blavatar . $blogname,
+					'href'   => home_url(),
+				)
+			);
 		}
 
 		if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => $menu_id,
-				'id'     => $menu_id . '-n',
-				'title'  => __( 'New Post' ),
-				'href'   => admin_url( 'post-new.php' ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => $menu_id,
+					'id'     => $menu_id . '-n',
+					'title'  => __( 'New Post' ),
+					'href'   => admin_url( 'post-new.php' ),
+				)
+			);
 		}
 
 		if ( current_user_can( 'edit_posts' ) ) {
-			$wp_admin_bar->add_menu( array(
-				'parent' => $menu_id,
-				'id'     => $menu_id . '-c',
-				'title'  => __( 'Manage Comments' ),
-				'href'   => admin_url( 'edit-comments.php' ),
-			) );
+			$wp_admin_bar->add_menu(
+				array(
+					'parent' => $menu_id,
+					'id'     => $menu_id . '-c',
+					'title'  => __( 'Manage Comments' ),
+					'href'   => admin_url( 'edit-comments.php' ),
+				)
+			);
 		}
 
-		$wp_admin_bar->add_menu( array(
-			'parent' => $menu_id,
-			'id'     => $menu_id . '-v',
-			'title'  => __( 'Visit Site' ),
-			'href'   => home_url( '/' ),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => $menu_id,
+				'id'     => $menu_id . '-v',
+				'title'  => __( 'Visit Site' ),
+				'href'   => home_url( '/' ),
+			)
+		);
 
 		restore_current_blog();
 	}
@@ -581,19 +652,22 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
  */
 function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
 	$short = wp_get_shortlink( 0, 'query' );
-	$id = 'get-shortlink';
+	$id    = 'get-shortlink';
 
-	if ( empty( $short ) )
+	if ( empty( $short ) ) {
 		return;
+	}
 
 	$html = '<input class="shortlink-input" type="text" readonly="readonly" value="' . esc_attr( $short ) . '" />';
 
-	$wp_admin_bar->add_menu( array(
-		'id' => $id,
-		'title' => __( 'Shortlink' ),
-		'href' => $short,
-		'meta' => array( 'html' => $html ),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'    => $id,
+			'title' => __( 'Shortlink' ),
+			'href'  => $short,
+			'meta'  => array( 'html' => $html ),
+		)
+	);
 }
 
 /**
@@ -611,100 +685,110 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 
 	if ( is_admin() ) {
 		$current_screen = get_current_screen();
-		$post = get_post();
+		$post           = get_post();
 
 		if ( 'post' == $current_screen->base
 			&& 'add' != $current_screen->action
 			&& ( $post_type_object = get_post_type_object( $post->post_type ) )
 			&& current_user_can( 'read_post', $post->ID )
 			&& ( $post_type_object->public )
-			&& ( $post_type_object->show_in_admin_bar ) )
-		{
+			&& ( $post_type_object->show_in_admin_bar ) ) {
 			if ( 'draft' == $post->post_status ) {
 				$preview_link = get_preview_post_link( $post );
-				$wp_admin_bar->add_menu( array(
-					'id' => 'preview',
-					'title' => $post_type_object->labels->view_item,
-					'href' => esc_url( $preview_link ),
-					'meta' => array( 'target' => 'wp-preview-' . $post->ID ),
-				) );
+				$wp_admin_bar->add_menu(
+					array(
+						'id'    => 'preview',
+						'title' => $post_type_object->labels->view_item,
+						'href'  => esc_url( $preview_link ),
+						'meta'  => array( 'target' => 'wp-preview-' . $post->ID ),
+					)
+				);
 			} else {
-				$wp_admin_bar->add_menu( array(
-					'id' => 'view',
-					'title' => $post_type_object->labels->view_item,
-					'href' => get_permalink( $post->ID )
-				) );
+				$wp_admin_bar->add_menu(
+					array(
+						'id'    => 'view',
+						'title' => $post_type_object->labels->view_item,
+						'href'  => get_permalink( $post->ID ),
+					)
+				);
 			}
 		} elseif ( 'edit' == $current_screen->base
- 			&& ( $post_type_object = get_post_type_object( $current_screen->post_type ) )
- 			&& ( $post_type_object->public )
- 			&& ( $post_type_object->show_in_admin_bar )
- 			&& ( get_post_type_archive_link( $post_type_object->name ) )
-			&& ! ( 'post' === $post_type_object->name && 'posts' === get_option( 'show_on_front' ) ) )
- 		{
- 			$wp_admin_bar->add_node( array(
- 				'id' => 'archive',
- 				'title' => $post_type_object->labels->view_items,
- 				'href' => get_post_type_archive_link( $current_screen->post_type )
- 			) );
+			&& ( $post_type_object = get_post_type_object( $current_screen->post_type ) )
+			&& ( $post_type_object->public )
+			&& ( $post_type_object->show_in_admin_bar )
+			&& ( get_post_type_archive_link( $post_type_object->name ) )
+			&& ! ( 'post' === $post_type_object->name && 'posts' === get_option( 'show_on_front' ) ) ) {
+			$wp_admin_bar->add_node(
+				array(
+					'id'    => 'archive',
+					'title' => $post_type_object->labels->view_items,
+					'href'  => get_post_type_archive_link( $current_screen->post_type ),
+				)
+			);
 		} elseif ( 'term' == $current_screen->base
 			&& isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag )
 			&& ( $tax = get_taxonomy( $tag->taxonomy ) )
-			&& $tax->public )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id' => 'view',
-				'title' => $tax->labels->view_item,
-				'href' => get_term_link( $tag )
-			) );
+			&& $tax->public ) {
+			$wp_admin_bar->add_menu(
+				array(
+					'id'    => 'view',
+					'title' => $tax->labels->view_item,
+					'href'  => get_term_link( $tag ),
+				)
+			);
 		} elseif ( 'user-edit' == $current_screen->base
 			&& isset( $user_id )
 			&& ( $user_object = get_userdata( $user_id ) )
 			&& $user_object->exists()
-			&& $view_link = get_author_posts_url( $user_object->ID ) )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id'    => 'view',
-				'title' => __( 'View User' ),
-				'href'  => $view_link,
-			) );
+			&& $view_link = get_author_posts_url( $user_object->ID ) ) {
+			$wp_admin_bar->add_menu(
+				array(
+					'id'    => 'view',
+					'title' => __( 'View User' ),
+					'href'  => $view_link,
+				)
+			);
 		}
 	} else {
 		$current_object = $wp_the_query->get_queried_object();
 
-		if ( empty( $current_object ) )
+		if ( empty( $current_object ) ) {
 			return;
+		}
 
 		if ( ! empty( $current_object->post_type )
 			&& ( $post_type_object = get_post_type_object( $current_object->post_type ) )
 			&& current_user_can( 'edit_post', $current_object->ID )
 			&& $post_type_object->show_in_admin_bar
-			&& $edit_post_link = get_edit_post_link( $current_object->ID ) )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id' => 'edit',
-				'title' => $post_type_object->labels->edit_item,
-				'href' => $edit_post_link
-			) );
+			&& $edit_post_link = get_edit_post_link( $current_object->ID ) ) {
+			$wp_admin_bar->add_menu(
+				array(
+					'id'    => 'edit',
+					'title' => $post_type_object->labels->edit_item,
+					'href'  => $edit_post_link,
+				)
+			);
 		} elseif ( ! empty( $current_object->taxonomy )
 			&& ( $tax = get_taxonomy( $current_object->taxonomy ) )
 			&& current_user_can( 'edit_term', $current_object->term_id )
-			&& $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id' => 'edit',
-				'title' => $tax->labels->edit_item,
-				'href' => $edit_term_link
-			) );
+			&& $edit_term_link = get_edit_term_link( $current_object->term_id, $current_object->taxonomy ) ) {
+			$wp_admin_bar->add_menu(
+				array(
+					'id'    => 'edit',
+					'title' => $tax->labels->edit_item,
+					'href'  => $edit_term_link,
+				)
+			);
 		} elseif ( is_a( $current_object, 'WP_User' )
 			&& current_user_can( 'edit_user', $current_object->ID )
-			&& $edit_user_link = get_edit_user_link( $current_object->ID ) )
-		{
-			$wp_admin_bar->add_menu( array(
-				'id'    => 'edit',
-				'title' => __( 'Edit User' ),
-				'href'  => $edit_user_link,
-			) );
+			&& $edit_user_link = get_edit_user_link( $current_object->ID ) ) {
+			$wp_admin_bar->add_menu(
+				array(
+					'id'    => 'edit',
+					'title' => __( 'Edit User' ),
+					'href'  => $edit_user_link,
+				)
+			);
 		}
 	}
 }
@@ -721,56 +805,67 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
 
 	$cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
 
-	if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) )
-		$actions[ 'post-new.php' ] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+	if ( isset( $cpts['post'] ) && current_user_can( $cpts['post']->cap->create_posts ) ) {
+		$actions['post-new.php'] = array( $cpts['post']->labels->name_admin_bar, 'new-post' );
+	}
 
-	if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) )
-		$actions[ 'media-new.php' ] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
+	if ( isset( $cpts['attachment'] ) && current_user_can( 'upload_files' ) ) {
+		$actions['media-new.php'] = array( $cpts['attachment']->labels->name_admin_bar, 'new-media' );
+	}
 
-	if ( current_user_can( 'manage_links' ) )
-		$actions[ 'link-add.php' ] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
+	if ( current_user_can( 'manage_links' ) ) {
+		$actions['link-add.php'] = array( _x( 'Link', 'add new from admin bar' ), 'new-link' );
+	}
 
-	if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) )
-		$actions[ 'post-new.php?post_type=page' ] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+	if ( isset( $cpts['page'] ) && current_user_can( $cpts['page']->cap->create_posts ) ) {
+		$actions['post-new.php?post_type=page'] = array( $cpts['page']->labels->name_admin_bar, 'new-page' );
+	}
 
 	unset( $cpts['post'], $cpts['page'], $cpts['attachment'] );
 
 	// Add any additional custom post types.
 	foreach ( $cpts as $cpt ) {
-		if ( ! current_user_can( $cpt->cap->create_posts ) )
+		if ( ! current_user_can( $cpt->cap->create_posts ) ) {
 			continue;
+		}
 
-		$key = 'post-new.php?post_type=' . $cpt->name;
+		$key             = 'post-new.php?post_type=' . $cpt->name;
 		$actions[ $key ] = array( $cpt->labels->name_admin_bar, 'new-' . $cpt->name );
 	}
 	// Avoid clash with parent node and a 'content' post type.
-	if ( isset( $actions['post-new.php?post_type=content'] ) )
+	if ( isset( $actions['post-new.php?post_type=content'] ) ) {
 		$actions['post-new.php?post_type=content'][1] = 'add-new-content';
-
-	if ( current_user_can( 'create_users' ) || ( is_multisite() && current_user_can( 'promote_users' ) ) ) {
-		$actions[ 'user-new.php' ] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
 	}
 
-	if ( ! $actions )
+	if ( current_user_can( 'create_users' ) || ( is_multisite() && current_user_can( 'promote_users' ) ) ) {
+		$actions['user-new.php'] = array( _x( 'User', 'add new from admin bar' ), 'new-user' );
+	}
+
+	if ( ! $actions ) {
 		return;
+	}
 
 	$title = '<span class="ab-icon"></span><span class="ab-label">' . _x( 'New', 'admin bar menu group label' ) . '</span>';
 
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'new-content',
-		'title' => $title,
-		'href'  => admin_url( current( array_keys( $actions ) ) ),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'    => 'new-content',
+			'title' => $title,
+			'href'  => admin_url( current( array_keys( $actions ) ) ),
+		)
+	);
 
 	foreach ( $actions as $link => $action ) {
 		list( $title, $id ) = $action;
 
-		$wp_admin_bar->add_menu( array(
-			'parent'    => 'new-content',
-			'id'        => $id,
-			'title'     => $title,
-			'href'      => admin_url( $link )
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'new-content',
+				'id'     => $id,
+				'title'  => $title,
+				'href'   => admin_url( $link ),
+			)
+		);
 	}
 }
 
@@ -782,22 +877,25 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
  * @param WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_comments_menu( $wp_admin_bar ) {
-	if ( !current_user_can('edit_posts') )
+	if ( ! current_user_can( 'edit_posts' ) ) {
 		return;
+	}
 
-	$awaiting_mod = wp_count_comments();
-	$awaiting_mod = $awaiting_mod->moderated;
+	$awaiting_mod  = wp_count_comments();
+	$awaiting_mod  = $awaiting_mod->moderated;
 	$awaiting_text = sprintf( _n( '%s comment awaiting moderation', '%s comments awaiting moderation', $awaiting_mod ), number_format_i18n( $awaiting_mod ) );
 
-	$icon  = '<span class="ab-icon"></span>';
-	$title = '<span class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '" aria-hidden="true">' . number_format_i18n( $awaiting_mod ) . '</span>';
+	$icon   = '<span class="ab-icon"></span>';
+	$title  = '<span class="ab-label awaiting-mod pending-count count-' . $awaiting_mod . '" aria-hidden="true">' . number_format_i18n( $awaiting_mod ) . '</span>';
 	$title .= '<span class="screen-reader-text">' . $awaiting_text . '</span>';
 
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'comments',
-		'title' => $icon . $title,
-		'href'  => admin_url('edit-comments.php'),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'    => 'comments',
+			'title' => $icon . $title,
+			'href'  => admin_url( 'edit-comments.php' ),
+		)
+	);
 }
 
 /**
@@ -808,55 +906,76 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) {
  * @param WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
+	$wp_admin_bar->add_group(
+		array(
+			'parent' => 'site-name',
+			'id'     => 'appearance',
+		)
+	);
 
 	if ( current_user_can( 'switch_themes' ) ) {
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'appearance',
-			'id'     => 'themes',
-			'title'  => __( 'Themes' ),
-			'href'   => admin_url( 'themes.php' ),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'appearance',
+				'id'     => 'themes',
+				'title'  => __( 'Themes' ),
+				'href'   => admin_url( 'themes.php' ),
+			)
+		);
 	}
 
 	if ( ! current_user_can( 'edit_theme_options' ) ) {
 		return;
 	}
 
-	if ( current_theme_supports( 'widgets' )  ) {
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'appearance',
-			'id'     => 'widgets',
-			'title'  => __( 'Widgets' ),
-			'href'   => admin_url( 'widgets.php' ),
-		) );
+	if ( current_theme_supports( 'widgets' ) ) {
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'appearance',
+				'id'     => 'widgets',
+				'title'  => __( 'Widgets' ),
+				'href'   => admin_url( 'widgets.php' ),
+			)
+		);
 	}
 
-	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) )
-		$wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) );
+	if ( current_theme_supports( 'menus' ) || current_theme_supports( 'widgets' ) ) {
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'appearance',
+				'id'     => 'menus',
+				'title'  => __( 'Menus' ),
+				'href'   => admin_url( 'nav-menus.php' ),
+			)
+		);
+	}
 
 	if ( current_theme_supports( 'custom-background' ) ) {
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'appearance',
-			'id'     => 'background',
-			'title'  => __( 'Background' ),
-			'href'   => admin_url( 'themes.php?page=custom-background' ),
-			'meta'   => array(
-				'class' => 'hide-if-customize',
-			),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'appearance',
+				'id'     => 'background',
+				'title'  => __( 'Background' ),
+				'href'   => admin_url( 'themes.php?page=custom-background' ),
+				'meta'   => array(
+					'class' => 'hide-if-customize',
+				),
+			)
+		);
 	}
 
 	if ( current_theme_supports( 'custom-header' ) ) {
-		$wp_admin_bar->add_menu( array(
-			'parent' => 'appearance',
-			'id'     => 'header',
-			'title'  => __( 'Header' ),
-			'href'   => admin_url( 'themes.php?page=custom-header' ),
-			'meta'   => array(
-				'class' => 'hide-if-customize',
-			),
-		) );
+		$wp_admin_bar->add_menu(
+			array(
+				'parent' => 'appearance',
+				'id'     => 'header',
+				'title'  => __( 'Header' ),
+				'href'   => admin_url( 'themes.php?page=custom-header' ),
+				'meta'   => array(
+					'class' => 'hide-if-customize',
+				),
+			)
+		);
 	}
 
 }
@@ -872,20 +991,23 @@ function wp_admin_bar_updates_menu( $wp_admin_bar ) {
 
 	$update_data = wp_get_update_data();
 
-	if ( !$update_data['counts']['total'] )
+	if ( ! $update_data['counts']['total'] ) {
 		return;
+	}
 
-	$title = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
+	$title  = '<span class="ab-icon"></span><span class="ab-label">' . number_format_i18n( $update_data['counts']['total'] ) . '</span>';
 	$title .= '<span class="screen-reader-text">' . $update_data['title'] . '</span>';
 
-	$wp_admin_bar->add_menu( array(
-		'id'    => 'updates',
-		'title' => $title,
-		'href'  => network_admin_url( 'update-core.php' ),
-		'meta'  => array(
-			'title' => $update_data['title'],
-		),
-	) );
+	$wp_admin_bar->add_menu(
+		array(
+			'id'    => 'updates',
+			'title' => $title,
+			'href'  => network_admin_url( 'update-core.php' ),
+			'meta'  => array(
+				'title' => $update_data['title'],
+			),
+		)
+	);
 }
 
 /**
@@ -896,24 +1018,27 @@ function wp_admin_bar_updates_menu( $wp_admin_bar ) {
  * @param WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_search_menu( $wp_admin_bar ) {
-	if ( is_admin() )
+	if ( is_admin() ) {
 		return;
+	}
 
 	$form  = '<form action="' . esc_url( home_url( '/' ) ) . '" method="get" id="adminbarsearch">';
 	$form .= '<input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" />';
 	$form .= '<label for="adminbar-search" class="screen-reader-text">' . __( 'Search' ) . '</label>';
-	$form .= '<input type="submit" class="adminbar-button" value="' . __('Search') . '"/>';
+	$form .= '<input type="submit" class="adminbar-button" value="' . __( 'Search' ) . '"/>';
 	$form .= '</form>';
 
-	$wp_admin_bar->add_menu( array(
-		'parent' => 'top-secondary',
-		'id'     => 'search',
-		'title'  => $form,
-		'meta'   => array(
-			'class'    => 'admin-bar-search',
-			'tabindex' => -1,
+	$wp_admin_bar->add_menu(
+		array(
+			'parent' => 'top-secondary',
+			'id'     => 'search',
+			'title'  => $form,
+			'meta'   => array(
+				'class'    => 'admin-bar-search',
+				'tabindex' => -1,
+			),
 		)
-	) );
+	);
 }
 
 /**
@@ -924,20 +1049,24 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) {
  * @param WP_Admin_Bar $wp_admin_bar
  */
 function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
-	$wp_admin_bar->add_group( array(
-		'id'     => 'top-secondary',
-		'meta'   => array(
-			'class' => 'ab-top-secondary',
-		),
-	) );
+	$wp_admin_bar->add_group(
+		array(
+			'id'   => 'top-secondary',
+			'meta' => array(
+				'class' => 'ab-top-secondary',
+			),
+		)
+	);
 
-	$wp_admin_bar->add_group( array(
-		'parent' => 'wp-logo',
-		'id'     => 'wp-logo-external',
-		'meta'   => array(
-			'class' => 'ab-sub-secondary',
-		),
-	) );
+	$wp_admin_bar->add_group(
+		array(
+			'parent' => 'wp-logo',
+			'id'     => 'wp-logo-external',
+			'meta'   => array(
+				'class' => 'ab-sub-secondary',
+			),
+		)
+	);
 }
 
 /**
@@ -945,7 +1074,8 @@ function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
  *
  * @since 3.1.0
  */
-function wp_admin_bar_header() { ?>
+function wp_admin_bar_header() {
+	?>
 <style type="text/css" media="print">#wpadminbar { display:none; }</style>
 <?php
 }
@@ -955,7 +1085,9 @@ function wp_admin_bar_header() { ?>
  *
  * @since 3.1.0
  */
-function _admin_bar_bump_cb() { ?>
+function _admin_bar_bump_cb() {
+
+?>
 <style type="text/css" media="screen">
 	html { margin-top: 32px !important; }
 	* html body { margin-top: 32px !important; }
@@ -998,16 +1130,18 @@ function is_admin_bar_showing() {
 	global $show_admin_bar, $pagenow;
 
 	// For all these types of requests, we never want an admin bar.
-	if ( defined('XMLRPC_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
+	if ( defined( 'XMLRPC_REQUEST' ) || defined( 'DOING_AJAX' ) || defined( 'IFRAME_REQUEST' ) ) {
 		return false;
+	}
 
 	if ( is_embed() ) {
 		return false;
 	}
 
 	// Integrated into the admin.
-	if ( is_admin() )
+	if ( is_admin() ) {
 		return true;
+	}
 
 	if ( ! isset( $show_admin_bar ) ) {
 		if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
@@ -1039,14 +1173,15 @@ function is_admin_bar_showing() {
  * @access private
  *
  * @param string $context Context of this preference check. Defaults to 'front'. The 'admin'
- * 	preference is no longer used.
+ *  preference is no longer used.
  * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
  * @return bool Whether the admin bar should be showing for this user.
  */
 function _get_admin_bar_pref( $context = 'front', $user = 0 ) {
 	$pref = get_user_option( "show_admin_bar_{$context}", $user );
-	if ( false === $pref )
+	if ( false === $pref ) {
 		return true;
+	}
 
 	return 'true' === $pref;
 }
diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index 4baf681479..305636b671 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -20,11 +20,12 @@
  * @param string $deprecated Deprecated.
  * @return string|null The author's display name.
  */
-function get_the_author($deprecated = '') {
+function get_the_author( $deprecated = '' ) {
 	global $authordata;
 
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.1.0' );
+	}
 
 	/**
 	 * Filters the display name of the current post's author.
@@ -33,7 +34,7 @@ function get_the_author($deprecated = '') {
 	 *
 	 * @param string $authordata->display_name The author's display name.
 	 */
-	return apply_filters('the_author', is_object($authordata) ? $authordata->display_name : null);
+	return apply_filters( 'the_author', is_object( $authordata ) ? $authordata->display_name : null );
 }
 
 /**
@@ -61,9 +62,11 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
 	}
 
 	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '1.5.0',
+		_deprecated_argument(
+			__FUNCTION__, '1.5.0',
 			/* translators: %s: get_the_author() */
-			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+			sprintf(
+				__( 'Use %s instead if you do not want the value echoed.' ),
 				'<code>get_the_author()</code>'
 			)
 		);
@@ -84,8 +87,8 @@ function the_author( $deprecated = '', $deprecated_echo = true ) {
  * @return string|void The author's display name.
  */
 function get_the_modified_author() {
-	if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true) ) {
-		$last_user = get_userdata($last_id);
+	if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true ) ) {
+		$last_user = get_userdata( $last_id );
 
 		/**
 		 * Filters the display name of the author who last edited the current post.
@@ -94,7 +97,7 @@ function get_the_modified_author() {
 		 *
 		 * @param string $last_user->display_name The author's display name.
 		 */
-		return apply_filters('the_modified_author', $last_user->display_name);
+		return apply_filters( 'the_modified_author', $last_user->display_name );
 	}
 }
 
@@ -161,8 +164,9 @@ function get_the_author_meta( $field = '', $user_id = false ) {
 		$authordata = get_userdata( $user_id );
 	}
 
-	if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) )
+	if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) ) {
 		$field = 'user_' . $field;
+	}
 
 	$value = isset( $authordata->$field ) ? $authordata->$field : '';
 
@@ -220,9 +224,10 @@ function the_author_meta( $field = '', $user_id = false ) {
  *                     else the result of get_the_author().
  */
 function get_the_author_link() {
-	if ( get_the_author_meta('url') ) {
-		return sprintf( '<a href="%1$s" title="%2$s" rel="author external">%3$s</a>',
-			esc_url( get_the_author_meta('url') ),
+	if ( get_the_author_meta( 'url' ) ) {
+		return sprintf(
+			'<a href="%1$s" title="%2$s" rel="author external">%3$s</a>',
+			esc_url( get_the_author_meta( 'url' ) ),
 			/* translators: %s: author's display name */
 			esc_attr( sprintf( __( 'Visit %s&#8217;s website' ), get_the_author() ) ),
 			get_the_author()
@@ -288,7 +293,8 @@ function get_the_author_posts_link() {
 		return;
 	}
 
-	$link = sprintf( '<a href="%1$s" title="%2$s" rel="author">%3$s</a>',
+	$link = sprintf(
+		'<a href="%1$s" title="%2$s" rel="author">%3$s</a>',
 		esc_url( get_author_posts_url( $authordata->ID, $authordata->user_nicename ) ),
 		/* translators: %s: author's display name */
 		esc_attr( sprintf( __( 'Posts by %s' ), get_the_author() ) ),
@@ -334,18 +340,19 @@ function the_author_posts_link( $deprecated = '' ) {
 function get_author_posts_url( $author_id, $author_nicename = '' ) {
 	global $wp_rewrite;
 	$auth_ID = (int) $author_id;
-	$link = $wp_rewrite->get_author_permastruct();
+	$link    = $wp_rewrite->get_author_permastruct();
 
-	if ( empty($link) ) {
+	if ( empty( $link ) ) {
 		$file = home_url( '/' );
 		$link = $file . '?author=' . $auth_ID;
 	} else {
 		if ( '' == $author_nicename ) {
-			$user = get_userdata($author_id);
-			if ( !empty($user->user_nicename) )
+			$user = get_userdata( $author_id );
+			if ( ! empty( $user->user_nicename ) ) {
 				$author_nicename = $user->user_nicename;
+			}
 		}
-		$link = str_replace('%author%', $author_nicename, $link);
+		$link = str_replace( '%author%', $author_nicename, $link );
 		$link = home_url( user_trailingslashit( $link ) );
 	}
 
@@ -402,24 +409,34 @@ function wp_list_authors( $args = '' ) {
 	global $wpdb;
 
 	$defaults = array(
-		'orderby' => 'name', 'order' => 'ASC', 'number' => '',
-		'optioncount' => false, 'exclude_admin' => true,
-		'show_fullname' => false, 'hide_empty' => true,
-		'feed' => '', 'feed_image' => '', 'feed_type' => '', 'echo' => true,
-		'style' => 'list', 'html' => true, 'exclude' => '', 'include' => ''
+		'orderby'       => 'name',
+		'order'         => 'ASC',
+		'number'        => '',
+		'optioncount'   => false,
+		'exclude_admin' => true,
+		'show_fullname' => false,
+		'hide_empty'    => true,
+		'feed'          => '',
+		'feed_image'    => '',
+		'feed_type'     => '',
+		'echo'          => true,
+		'style'         => 'list',
+		'html'          => true,
+		'exclude'       => '',
+		'include'       => '',
 	);
 
 	$args = wp_parse_args( $args, $defaults );
 
 	$return = '';
 
-	$query_args = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number', 'exclude', 'include' ) );
+	$query_args           = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number', 'exclude', 'include' ) );
 	$query_args['fields'] = 'ids';
-	$authors = get_users( $query_args );
+	$authors              = get_users( $query_args );
 
 	$author_count = array();
-	foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author" ) as $row ) {
-		$author_count[$row->post_author] = $row->count;
+	foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . ' GROUP BY post_author' ) as $row ) {
+		$author_count[ $row->post_author ] = $row->count;
 	}
 	foreach ( $authors as $author_id ) {
 		$author = get_userdata( $author_id );
@@ -428,7 +445,7 @@ function wp_list_authors( $args = '' ) {
 			continue;
 		}
 
-		$posts = isset( $author_count[$author->ID] ) ? $author_count[$author->ID] : 0;
+		$posts = isset( $author_count[ $author->ID ] ) ? $author_count[ $author->ID ] : 0;
 
 		if ( ! $posts && $args['hide_empty'] ) {
 			continue;
@@ -450,7 +467,8 @@ function wp_list_authors( $args = '' ) {
 			$return .= '<li>';
 		}
 
-		$link = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>',
+		$link = sprintf(
+			'<a href="%1$s" title="%2$s">%3$s</a>',
 			get_author_posts_url( $author->ID, $author->user_nicename ),
 			/* translators: %s: author's display name */
 			esc_attr( sprintf( __( 'Posts by %s' ), $author->display_name ) ),
@@ -467,7 +485,7 @@ function wp_list_authors( $args = '' ) {
 
 			$alt = '';
 			if ( ! empty( $args['feed'] ) ) {
-				$alt = ' alt="' . esc_attr( $args['feed'] ) . '"';
+				$alt  = ' alt="' . esc_attr( $args['feed'] ) . '"';
 				$name = $args['feed'];
 			}
 
@@ -487,7 +505,7 @@ function wp_list_authors( $args = '' ) {
 		}
 
 		if ( $args['optioncount'] ) {
-			$link .= ' ('. $posts . ')';
+			$link .= ' (' . $posts . ')';
 		}
 
 		$return .= $link;
@@ -517,7 +535,7 @@ function is_multi_author() {
 	global $wpdb;
 
 	if ( false === ( $is_multi_author = get_transient( 'is_multi_author' ) ) ) {
-		$rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2");
+		$rows            = (array) $wpdb->get_col( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2" );
 		$is_multi_author = 1 < count( $rows ) ? 1 : 0;
 		set_transient( 'is_multi_author', $is_multi_author );
 	}
diff --git a/wp-includes/bookmark-template.php b/wp-includes/bookmark-template.php
index c6b7fd2b55..73b60660e1 100644
--- a/wp-includes/bookmark-template.php
+++ b/wp-includes/bookmark-template.php
@@ -50,10 +50,16 @@
  */
 function _walk_bookmarks( $bookmarks, $args = '' ) {
 	$defaults = array(
-		'show_updated' => 0, 'show_description' => 0,
-		'show_images' => 1, 'show_name' => 0,
-		'before' => '<li>', 'after' => '</li>', 'between' => "\n",
-		'show_rating' => 0, 'link_before' => '', 'link_after' => ''
+		'show_updated'     => 0,
+		'show_description' => 0,
+		'show_images'      => 1,
+		'show_name'        => 0,
+		'before'           => '<li>',
+		'after'            => '</li>',
+		'between'          => "\n",
+		'show_rating'      => 0,
+		'link_before'      => '',
+		'link_after'       => '',
 	);
 
 	$r = wp_parse_args( $args, $defaults );
@@ -72,15 +78,15 @@ function _walk_bookmarks( $bookmarks, $args = '' ) {
 		if ( ! empty( $bookmark->link_url ) ) {
 			$the_link = esc_url( $bookmark->link_url );
 		}
-		$desc = esc_attr( sanitize_bookmark_field( 'link_description', $bookmark->link_description, $bookmark->link_id, 'display' ) );
-		$name = esc_attr( sanitize_bookmark_field( 'link_name', $bookmark->link_name, $bookmark->link_id, 'display' ) );
- 		$title = $desc;
+		$desc  = esc_attr( sanitize_bookmark_field( 'link_description', $bookmark->link_description, $bookmark->link_id, 'display' ) );
+		$name  = esc_attr( sanitize_bookmark_field( 'link_name', $bookmark->link_name, $bookmark->link_id, 'display' ) );
+		$title = $desc;
 
 		if ( $r['show_updated'] ) {
 			if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
 				$title .= ' (';
 				$title .= sprintf(
-					__('Last updated: %s'),
+					__( 'Last updated: %s' ),
 					date(
 						get_option( 'links_updated_date_format' ),
 						$bookmark->link_updated_f + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS )
@@ -96,7 +102,7 @@ function _walk_bookmarks( $bookmarks, $args = '' ) {
 		}
 		$rel = $bookmark->link_rel;
 		if ( '' != $rel ) {
-			$rel = ' rel="' . esc_attr($rel) . '"';
+			$rel = ' rel="' . esc_attr( $rel ) . '"';
 		}
 		$target = $bookmark->link_target;
 		if ( '' != $target ) {
@@ -110,7 +116,7 @@ function _walk_bookmarks( $bookmarks, $args = '' ) {
 			if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
 				$output .= "<img src=\"$bookmark->link_image\" $alt $title />";
 			} else { // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
+				$output .= '<img src="' . get_option( 'siteurl' ) . "$bookmark->link_image\" $alt $title />";
 			}
 			if ( $r['show_name'] ) {
 				$output .= " $name";
@@ -199,15 +205,24 @@ function _walk_bookmarks( $bookmarks, $args = '' ) {
  */
 function wp_list_bookmarks( $args = '' ) {
 	$defaults = array(
-		'orderby' => 'name', 'order' => 'ASC',
-		'limit' => -1, 'category' => '', 'exclude_category' => '',
-		'category_name' => '', 'hide_invisible' => 1,
-		'show_updated' => 0, 'echo' => 1,
-		'categorize' => 1, 'title_li' => __('Bookmarks'),
-		'title_before' => '<h2>', 'title_after' => '</h2>',
-		'category_orderby' => 'name', 'category_order' => 'ASC',
-		'class' => 'linkcat', 'category_before' => '<li id="%id" class="%class">',
-		'category_after' => '</li>'
+		'orderby'          => 'name',
+		'order'            => 'ASC',
+		'limit'            => -1,
+		'category'         => '',
+		'exclude_category' => '',
+		'category_name'    => '',
+		'hide_invisible'   => 1,
+		'show_updated'     => 0,
+		'echo'             => 1,
+		'categorize'       => 1,
+		'title_li'         => __( 'Bookmarks' ),
+		'title_before'     => '<h2>',
+		'title_after'      => '</h2>',
+		'category_orderby' => 'name',
+		'category_order'   => 'ASC',
+		'class'            => 'linkcat',
+		'category_before'  => '<li id="%id" class="%class">',
+		'category_after'   => '</li>',
 	);
 
 	$r = wp_parse_args( $args, $defaults );
@@ -217,18 +232,20 @@ function wp_list_bookmarks( $args = '' ) {
 	if ( ! is_array( $r['class'] ) ) {
 		$r['class'] = explode( ' ', $r['class'] );
 	}
- 	$r['class'] = array_map( 'sanitize_html_class', $r['class'] );
- 	$r['class'] = trim( join( ' ', $r['class'] ) );
+	$r['class'] = array_map( 'sanitize_html_class', $r['class'] );
+	$r['class'] = trim( join( ' ', $r['class'] ) );
 
 	if ( $r['categorize'] ) {
-		$cats = get_terms( 'link_category', array(
-			'name__like' => $r['category_name'],
-			'include' => $r['category'],
-			'exclude' => $r['exclude_category'],
-			'orderby' => $r['category_orderby'],
-			'order' => $r['category_order'],
-			'hierarchical' => 0
-		) );
+		$cats = get_terms(
+			'link_category', array(
+				'name__like'   => $r['category_name'],
+				'include'      => $r['category'],
+				'exclude'      => $r['exclude_category'],
+				'orderby'      => $r['category_orderby'],
+				'order'        => $r['category_order'],
+				'hierarchical' => 0,
+			)
+		);
 		if ( empty( $cats ) ) {
 			$r['categorize'] = false;
 		}
@@ -237,7 +254,7 @@ function wp_list_bookmarks( $args = '' ) {
 	if ( $r['categorize'] ) {
 		// Split the bookmarks into ul's for each category
 		foreach ( (array) $cats as $cat ) {
-			$params = array_merge( $r, array( 'category' => $cat->term_id ) );
+			$params    = array_merge( $r, array( 'category' => $cat->term_id ) );
 			$bookmarks = get_bookmarks( $params );
 			if ( empty( $bookmarks ) ) {
 				continue;
@@ -272,7 +289,7 @@ function wp_list_bookmarks( $args = '' ) {
 			if ( ! empty( $r['title_li'] ) ) {
 				$output .= str_replace(
 					array( '%id', '%class' ),
-					array( "linkcat-" . $r['category'], $r['class'] ),
+					array( 'linkcat-' . $r['category'], $r['class'] ),
 					$r['category_before']
 				);
 				$output .= $r['title_before'];
diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index cb1bee7ca3..b0de276df4 100644
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -19,22 +19,23 @@
  * @param string $filter Optional, default is 'raw'.
  * @return array|object|null Type returned depends on $output value.
  */
-function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
+function get_bookmark( $bookmark, $output = OBJECT, $filter = 'raw' ) {
 	global $wpdb;
 
-	if ( empty($bookmark) ) {
-		if ( isset($GLOBALS['link']) )
+	if ( empty( $bookmark ) ) {
+		if ( isset( $GLOBALS['link'] ) ) {
 			$_bookmark = & $GLOBALS['link'];
-		else
+		} else {
 			$_bookmark = null;
-	} elseif ( is_object($bookmark) ) {
-		wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
+		}
+	} elseif ( is_object( $bookmark ) ) {
+		wp_cache_add( $bookmark->link_id, $bookmark, 'bookmark' );
 		$_bookmark = $bookmark;
 	} else {
-		if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) {
+		if ( isset( $GLOBALS['link'] ) && ( $GLOBALS['link']->link_id == $bookmark ) ) {
 			$_bookmark = & $GLOBALS['link'];
-		} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
-			$_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
+		} elseif ( ! $_bookmark = wp_cache_get( $bookmark, 'bookmark' ) ) {
+			$_bookmark = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark ) );
 			if ( $_bookmark ) {
 				$_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
 				wp_cache_add( $_bookmark->link_id, $_bookmark, 'bookmark' );
@@ -42,17 +43,18 @@ function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
 		}
 	}
 
-	if ( ! $_bookmark )
+	if ( ! $_bookmark ) {
 		return $_bookmark;
+	}
 
-	$_bookmark = sanitize_bookmark($_bookmark, $filter);
+	$_bookmark = sanitize_bookmark( $_bookmark, $filter );
 
 	if ( $output == OBJECT ) {
 		return $_bookmark;
 	} elseif ( $output == ARRAY_A ) {
-		return get_object_vars($_bookmark);
+		return get_object_vars( $_bookmark );
 	} elseif ( $output == ARRAY_N ) {
-		return array_values(get_object_vars($_bookmark));
+		return array_values( get_object_vars( $_bookmark ) );
 	} else {
 		return $_bookmark;
 	}
@@ -72,16 +74,19 @@ function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
 	$bookmark = (int) $bookmark;
 	$bookmark = get_bookmark( $bookmark );
 
-	if ( is_wp_error($bookmark) )
+	if ( is_wp_error( $bookmark ) ) {
 		return $bookmark;
+	}
 
-	if ( !is_object($bookmark) )
+	if ( ! is_object( $bookmark ) ) {
 		return '';
+	}
 
-	if ( !isset($bookmark->$field) )
+	if ( ! isset( $bookmark->$field ) ) {
 		return '';
+	}
 
-	return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
+	return sanitize_bookmark_field( $field, $bookmark->$field, $bookmark->link_id, $context );
 }
 
 /**
@@ -119,16 +124,21 @@ function get_bookmarks( $args = '' ) {
 	global $wpdb;
 
 	$defaults = array(
-		'orderby' => 'name', 'order' => 'ASC',
-		'limit' => -1, 'category' => '',
-		'category_name' => '', 'hide_invisible' => 1,
-		'show_updated' => 0, 'include' => '',
-		'exclude' => '', 'search' => ''
+		'orderby'        => 'name',
+		'order'          => 'ASC',
+		'limit'          => -1,
+		'category'       => '',
+		'category_name'  => '',
+		'hide_invisible' => 1,
+		'show_updated'   => 0,
+		'include'        => '',
+		'exclude'        => '',
+		'search'         => '',
 	);
 
 	$r = wp_parse_args( $args, $defaults );
 
-	$key = md5( serialize( $r ) );
+	$key   = md5( serialize( $r ) );
 	$cache = false;
 	if ( 'rand' !== $r['orderby'] && $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
 		if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
@@ -158,10 +168,10 @@ function get_bookmarks( $args = '' ) {
 
 	$inclusions = '';
 	if ( ! empty( $r['include'] ) ) {
-		$r['exclude'] = '';  //ignore exclude, category, and category_name params if using include
-		$r['category'] = '';
+		$r['exclude']       = '';  //ignore exclude, category, and category_name params if using include
+		$r['category']      = '';
 		$r['category_name'] = '';
-		$inclinks = preg_split( '/[\s,]+/', $r['include'] );
+		$inclinks           = preg_split( '/[\s,]+/', $r['include'] );
 		if ( count( $inclinks ) ) {
 			foreach ( $inclinks as $inclink ) {
 				if ( empty( $inclusions ) ) {
@@ -172,7 +182,7 @@ function get_bookmarks( $args = '' ) {
 			}
 		}
 	}
-	if (! empty( $inclusions ) ) {
+	if ( ! empty( $inclusions ) ) {
 		$inclusions .= ')';
 	}
 
@@ -194,7 +204,7 @@ function get_bookmarks( $args = '' ) {
 	}
 
 	if ( ! empty( $r['category_name'] ) ) {
-		if ( $r['category'] = get_term_by('name', $r['category_name'], 'link_category') ) {
+		if ( $r['category'] = get_term_by( 'name', $r['category_name'], 'link_category' ) ) {
 			$r['category'] = $r['category']->term_id;
 		} else {
 			$cache[ $key ] = array();
@@ -206,15 +216,15 @@ function get_bookmarks( $args = '' ) {
 
 	$search = '';
 	if ( ! empty( $r['search'] ) ) {
-		$like = '%' . $wpdb->esc_like( $r['search'] ) . '%';
-		$search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like );
+		$like   = '%' . $wpdb->esc_like( $r['search'] ) . '%';
+		$search = $wpdb->prepare( ' AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ', $like, $like, $like );
 	}
 
 	$category_query = '';
-	$join = '';
+	$join           = '';
 	if ( ! empty( $r['category'] ) ) {
 		$incategories = preg_split( '/[\s,]+/', $r['category'] );
-		if ( count($incategories) ) {
+		if ( count( $incategories ) ) {
 			foreach ( $incategories as $incat ) {
 				if ( empty( $category_query ) ) {
 					$category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' ';
@@ -226,11 +236,11 @@ function get_bookmarks( $args = '' ) {
 	}
 	if ( ! empty( $category_query ) ) {
 		$category_query .= ") AND taxonomy = 'link_category'";
-		$join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
+		$join            = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
 	}
 
 	if ( $r['show_updated'] ) {
-		$recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ";
+		$recently_updated_test = ', IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ';
 	} else {
 		$recently_updated_test = '';
 	}
@@ -238,10 +248,10 @@ function get_bookmarks( $args = '' ) {
 	$get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
 
 	$orderby = strtolower( $r['orderby'] );
-	$length = '';
+	$length  = '';
 	switch ( $orderby ) {
 		case 'length':
-			$length = ", CHAR_LENGTH(link_name) AS length";
+			$length = ', CHAR_LENGTH(link_name) AS length';
 			break;
 		case 'rand':
 			$orderby = 'rand()';
@@ -251,7 +261,7 @@ function get_bookmarks( $args = '' ) {
 			break;
 		default:
 			$orderparams = array();
-			$keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description' );
+			$keys        = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description' );
 			foreach ( explode( ',', $orderby ) as $ordparam ) {
 				$ordparam = trim( $ordparam );
 
@@ -278,7 +288,7 @@ function get_bookmarks( $args = '' ) {
 		$visible = "AND link_visible = 'Y'";
 	}
 
-	$query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
+	$query  = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
 	$query .= " $exclusions $inclusions $search";
 	$query .= " ORDER BY $orderby $order";
 	if ( $r['limit'] != -1 ) {
@@ -303,29 +313,44 @@ function get_bookmarks( $args = '' ) {
  *
  * @param stdClass|array $bookmark Bookmark row
  * @param string $context Optional, default is 'display'. How to filter the
- *		fields
+ *      fields
  * @return stdClass|array Same type as $bookmark but with fields sanitized.
  */
-function sanitize_bookmark($bookmark, $context = 'display') {
-	$fields = array('link_id', 'link_url', 'link_name', 'link_image', 'link_target', 'link_category',
-		'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_updated',
-		'link_rel', 'link_notes', 'link_rss', );
+function sanitize_bookmark( $bookmark, $context = 'display' ) {
+	$fields = array(
+		'link_id',
+		'link_url',
+		'link_name',
+		'link_image',
+		'link_target',
+		'link_category',
+		'link_description',
+		'link_visible',
+		'link_owner',
+		'link_rating',
+		'link_updated',
+		'link_rel',
+		'link_notes',
+		'link_rss',
+	);
 
-	if ( is_object($bookmark) ) {
+	if ( is_object( $bookmark ) ) {
 		$do_object = true;
-		$link_id = $bookmark->link_id;
+		$link_id   = $bookmark->link_id;
 	} else {
 		$do_object = false;
-		$link_id = $bookmark['link_id'];
+		$link_id   = $bookmark['link_id'];
 	}
 
 	foreach ( $fields as $field ) {
 		if ( $do_object ) {
-			if ( isset($bookmark->$field) )
-				$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
+			if ( isset( $bookmark->$field ) ) {
+				$bookmark->$field = sanitize_bookmark_field( $field, $bookmark->$field, $link_id, $context );
+			}
 		} else {
-			if ( isset($bookmark[$field]) )
-				$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+			if ( isset( $bookmark[ $field ] ) ) {
+				$bookmark[ $field ] = sanitize_bookmark_field( $field, $bookmark[ $field ], $link_id, $context );
+			}
 		}
 	}
 
@@ -358,28 +383,30 @@ function sanitize_bookmark($bookmark, $context = 'display') {
  */
 function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
 	switch ( $field ) {
-	case 'link_id' : // ints
-	case 'link_rating' :
-		$value = (int) $value;
-		break;
-	case 'link_category' : // array( ints )
-		$value = array_map('absint', (array) $value);
-		// We return here so that the categories aren't filtered.
-		// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
-		return $value;
+		case 'link_id': // ints
+		case 'link_rating':
+			$value = (int) $value;
+			break;
+		case 'link_category': // array( ints )
+			$value = array_map( 'absint', (array) $value );
+			// We return here so that the categories aren't filtered.
+			// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
+			return $value;
 
-	case 'link_visible' : // bool stored as Y|N
-		$value = preg_replace('/[^YNyn]/', '', $value);
-		break;
-	case 'link_target' : // "enum"
-		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
-			$value = '';
-		break;
+		case 'link_visible': // bool stored as Y|N
+			$value = preg_replace( '/[^YNyn]/', '', $value );
+			break;
+		case 'link_target': // "enum"
+			$targets = array( '_top', '_blank' );
+			if ( ! in_array( $value, $targets ) ) {
+				$value = '';
+			}
+			break;
 	}
 
-	if ( 'raw' == $context )
+	if ( 'raw' == $context ) {
 		return $value;
+	}
 
 	if ( 'edit' == $context ) {
 		/** This filter is documented in wp-includes/post.php */
@@ -388,7 +415,7 @@ function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
 		if ( 'link_notes' == $field ) {
 			$value = esc_html( $value ); // textarea_escaped
 		} else {
-			$value = esc_attr($value);
+			$value = esc_attr( $value );
 		}
 	} elseif ( 'db' == $context ) {
 		/** This filter is documented in wp-includes/post.php */
@@ -417,5 +444,5 @@ function sanitize_bookmark_field( $field, $value, $bookmark_id, $context ) {
 function clean_bookmark_cache( $bookmark_id ) {
 	wp_cache_delete( $bookmark_id, 'bookmark' );
 	wp_cache_delete( 'get_bookmarks', 'bookmark' );
-	clean_object_term_cache( $bookmark_id, 'link');
+	clean_object_term_cache( $bookmark_id, 'link' );
 }
diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index ddfd6e2acd..5a4f2fbc39 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -81,7 +81,7 @@ function wp_cache_decr( $key, $offset = 1, $group = '' ) {
 function wp_cache_delete( $key, $group = '' ) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->delete($key, $group);
+	return $wp_object_cache->delete( $key, $group );
 }
 
 /**
@@ -115,7 +115,7 @@ function wp_cache_flush() {
  * @param bool        $found  Optional. Whether the key was found in the cache (passed by reference).
  *                            Disambiguates a return of false, a storable value. Default null.
  * @return bool|mixed False on failure to retrieve contents or the cache
- *		              contents on success
+ *                    contents on success
  */
 function wp_cache_get( $key, $group = '', $force = false, &$found = null ) {
 	global $wp_object_cache;
@@ -390,7 +390,7 @@ class WP_Object_Cache {
 	 *
 	 * @uses WP_Object_Cache::_exists() Checks to see if the cache already has data.
 	 * @uses WP_Object_Cache::set()     Sets the data after the checking the cache
-	 *		                            contents existence.
+	 *                                  contents existence.
 	 *
 	 * @param int|string $key    What to call the contents in the cache.
 	 * @param mixed      $data   The contents to store in the cache.
@@ -399,18 +399,22 @@ class WP_Object_Cache {
 	 * @return bool False if cache key and group already exist, true on success
 	 */
 	public function add( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( wp_suspend_cache_addition() )
+		if ( wp_suspend_cache_addition() ) {
 			return false;
+		}
 
-		if ( empty( $group ) )
+		if ( empty( $group ) ) {
 			$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 			$id = $this->blog_prefix . $key;
+		}
 
-		if ( $this->_exists( $id, $group ) )
+		if ( $this->_exists( $id, $group ) ) {
 			return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -425,7 +429,7 @@ class WP_Object_Cache {
 	public function add_global_groups( $groups ) {
 		$groups = (array) $groups;
 
-		$groups = array_fill_keys( $groups, true );
+		$groups              = array_fill_keys( $groups, true );
 		$this->global_groups = array_merge( $this->global_groups, $groups );
 	}
 
@@ -440,24 +444,29 @@ class WP_Object_Cache {
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function decr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+		if ( empty( $group ) ) {
 			$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 			$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists( $key, $group ) ) {
 			return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
 			$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] -= $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
 			$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -475,16 +484,19 @@ class WP_Object_Cache {
 	 * @return bool False if the contents weren't deleted and true on success.
 	 */
 	public function delete( $key, $group = 'default', $deprecated = false ) {
-		if ( empty( $group ) )
+		if ( empty( $group ) ) {
 			$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 			$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists( $key, $group ) ) {
 			return false;
+		}
 
-		unset( $this->cache[$group][$key] );
+		unset( $this->cache[ $group ][ $key ] );
 		return true;
 	}
 
@@ -521,22 +533,25 @@ class WP_Object_Cache {
 	 * @return false|mixed False on failure to retrieve contents or the cache contents on success.
 	 */
 	public function get( $key, $group = 'default', $force = false, &$found = null ) {
-		if ( empty( $group ) )
+		if ( empty( $group ) ) {
 			$group = 'default';
-
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
-
-		if ( $this->_exists( $key, $group ) ) {
-			$found = true;
-			$this->cache_hits += 1;
-			if ( is_object($this->cache[$group][$key]) )
-				return clone $this->cache[$group][$key];
-			else
-				return $this->cache[$group][$key];
 		}
 
-		$found = false;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+			$key = $this->blog_prefix . $key;
+		}
+
+		if ( $this->_exists( $key, $group ) ) {
+			$found             = true;
+			$this->cache_hits += 1;
+			if ( is_object( $this->cache[ $group ][ $key ] ) ) {
+				return clone $this->cache[ $group ][ $key ];
+			} else {
+				return $this->cache[ $group ][ $key ];
+			}
+		}
+
+		$found               = false;
 		$this->cache_misses += 1;
 		return false;
 	}
@@ -552,24 +567,29 @@ class WP_Object_Cache {
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function incr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+		if ( empty( $group ) ) {
 			$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 			$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists( $key, $group ) ) {
 			return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
 			$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] += $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
 			$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -588,15 +608,18 @@ class WP_Object_Cache {
 	 * @return bool False if not exists, true if contents were replaced.
 	 */
 	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+		if ( empty( $group ) ) {
 			$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 			$id = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $id, $group ) )
+		if ( ! $this->_exists( $id, $group ) ) {
 			return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -614,8 +637,9 @@ class WP_Object_Cache {
 
 		// Clear out non-global caches since the blog ID has changed.
 		foreach ( array_keys( $this->cache ) as $group ) {
-			if ( ! isset( $this->global_groups[ $group ] ) )
+			if ( ! isset( $this->global_groups[ $group ] ) ) {
 				unset( $this->cache[ $group ] );
+			}
 		}
 	}
 
@@ -640,16 +664,19 @@ class WP_Object_Cache {
 	 * @return true Always returns true.
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+		if ( empty( $group ) ) {
 			$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
 			$key = $this->blog_prefix . $key;
+		}
 
-		if ( is_object( $data ) )
+		if ( is_object( $data ) ) {
 			$data = clone $data;
+		}
 
-		$this->cache[$group][$key] = $data;
+		$this->cache[ $group ][ $key ] = $data;
 		return true;
 	}
 
@@ -662,12 +689,12 @@ class WP_Object_Cache {
 	 * @since 2.0.0
 	 */
 	public function stats() {
-		echo "<p>";
+		echo '<p>';
 		echo "<strong>Cache Hits:</strong> {$this->cache_hits}<br />";
 		echo "<strong>Cache Misses:</strong> {$this->cache_misses}<br />";
-		echo "</p>";
+		echo '</p>';
 		echo '<ul>';
-		foreach ($this->cache as $group => $cache) {
+		foreach ( $this->cache as $group => $cache ) {
 			echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';
 		}
 		echo '</ul>';
@@ -683,7 +710,7 @@ class WP_Object_Cache {
 	 * @param int $blog_id Blog ID.
 	 */
 	public function switch_to_blog( $blog_id ) {
-		$blog_id = (int) $blog_id;
+		$blog_id           = (int) $blog_id;
 		$this->blog_prefix = $this->multisite ? $blog_id . ':' : '';
 	}
 
@@ -706,9 +733,8 @@ class WP_Object_Cache {
 	 * @since 2.0.8
 	 */
 	public function __construct() {
-		$this->multisite = is_multisite();
-		$this->blog_prefix =  $this->multisite ? get_current_blog_id() . ':' : '';
-
+		$this->multisite   = is_multisite();
+		$this->blog_prefix = $this->multisite ? get_current_blog_id() . ':' : '';
 
 		/**
 		 * @todo This should be moved to the PHP4 style constructor, PHP5
diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 03c51f1702..ad219c2711 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -32,10 +32,10 @@
  * @global bool $is_IIS
  * @global WP_Query $wp_query
  * @global wpdb $wpdb WordPress database abstraction object.
- * @global WP $wp Current WordPress environment instance. 
+ * @global WP $wp Current WordPress environment instance.
  *
  * @param string $requested_url Optional. The URL that was requested, used to
- *		figure if redirect is needed.
+ *      figure if redirect is needed.
  * @param bool $do_redirect Optional. Redirect to the new URL.
  * @return string|void The string of the URL, if redirect needed.
  */
@@ -56,7 +56,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		}
 	}
 
-	if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ( $is_IIS && !iis7_supports_permalinks() ) ) {
+	if ( is_trackback() || is_search() || is_admin() || is_preview() || is_robots() || ( $is_IIS && ! iis7_supports_permalinks() ) ) {
 		return;
 	}
 
@@ -67,19 +67,21 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		$requested_url .= $_SERVER['REQUEST_URI'];
 	}
 
-	$original = @parse_url($requested_url);
+	$original = @parse_url( $requested_url );
 	if ( false === $original ) {
 		return;
 	}
 
-	$redirect = $original;
+	$redirect     = $original;
 	$redirect_url = false;
 
 	// Notice fixing
-	if ( !isset($redirect['path']) )
+	if ( ! isset( $redirect['path'] ) ) {
 		$redirect['path'] = '';
-	if ( !isset($redirect['query']) )
+	}
+	if ( ! isset( $redirect['query'] ) ) {
 		$redirect['query'] = '';
+	}
 
 	// If the original URL ended with non-breaking spaces, they were almost
 	// certainly inserted by accident. Let's remove them, so the reader doesn't
@@ -93,21 +95,23 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 
 	if ( is_feed() && ( $id = get_query_var( 'p' ) ) ) {
 		if ( $redirect_url = get_post_comments_feed_link( $id, get_query_var( 'feed' ) ) ) {
-			$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url );
-			$redirect['path'] = parse_url( $redirect_url, PHP_URL_PATH );
+			$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed' ), $redirect_url );
+			$redirect['path']  = parse_url( $redirect_url, PHP_URL_PATH );
 		}
 	}
 
-	if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {
+	if ( is_singular() && 1 > $wp_query->post_count && ( $id = get_query_var( 'p' ) ) ) {
 
-		$vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
+		$vars = $wpdb->get_results( $wpdb->prepare( "SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id ) );
 
-		if ( isset($vars[0]) && $vars = $vars[0] ) {
-			if ( 'revision' == $vars->post_type && $vars->post_parent > 0 )
+		if ( isset( $vars[0] ) && $vars = $vars[0] ) {
+			if ( 'revision' == $vars->post_type && $vars->post_parent > 0 ) {
 				$id = $vars->post_parent;
+			}
 
-			if ( $redirect_url = get_permalink($id) )
+			if ( $redirect_url = get_permalink( $id ) ) {
 				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+			}
 		}
 	}
 
@@ -115,11 +119,11 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	if ( is_404() ) {
 
 		// Redirect ?page_id, ?p=, ?attachment_id= to their respective url's
-		$id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id') );
-		if ( $id && $redirect_post = get_post($id) ) {
-			$post_type_obj = get_post_type_object($redirect_post->post_type);
+		$id = max( get_query_var( 'p' ), get_query_var( 'page_id' ), get_query_var( 'attachment_id' ) );
+		if ( $id && $redirect_post = get_post( $id ) ) {
+			$post_type_obj = get_post_type_object( $redirect_post->post_type );
 			if ( $post_type_obj->public && 'auto-draft' != $redirect_post->post_status ) {
-				$redirect_url = get_permalink($redirect_post);
+				$redirect_url      = get_permalink( $redirect_post );
 				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
 			}
 		}
@@ -130,11 +134,11 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			$day   = get_query_var( 'day' );
 			$date  = sprintf( '%04d-%02d-%02d', $year, $month, $day );
 			if ( ! wp_checkdate( $month, $day, $year, $date ) ) {
-				$redirect_url = get_month_link( $year, $month );
+				$redirect_url      = get_month_link( $year, $month );
 				$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum', 'day' ), $redirect_url );
 			}
 		} elseif ( get_query_var( 'monthnum' ) && get_query_var( 'year' ) && 12 < get_query_var( 'monthnum' ) ) {
-			$redirect_url = get_year_link( get_query_var( 'year' ) );
+			$redirect_url      = get_year_link( get_query_var( 'year' ) );
 			$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum' ), $redirect_url );
 		}
 
@@ -146,12 +150,11 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 
 		if ( get_query_var( 'page' ) && $wp_query->post &&
 			false !== strpos( $wp_query->post->post_content, '<!--nextpage-->' ) ) {
-			$redirect['path'] = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
+			$redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
 			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
-			$redirect_url = get_permalink( $wp_query->post->ID );
+			$redirect_url      = get_permalink( $wp_query->post->ID );
 		}
-
-	} elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
+	} elseif ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) {
 		// rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
 		if ( is_attachment() &&
 			! array_diff( array_keys( $wp->query_vars ), array( 'attachment', 'attachment_id' ) ) &&
@@ -164,62 +167,72 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			} else {
 				$redirect_url = get_attachment_link();
 			}
-		} elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('p')) )
-				$redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
-		} elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
-				$redirect['query'] = remove_query_arg('name', $redirect['query']);
-		} elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_query_var('page_id')) )
-				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-		} elseif ( is_page() && !is_feed() && 'page' == get_option('show_on_front') && get_queried_object_id() == get_option('page_on_front')  && ! $redirect_url ) {
-			$redirect_url = home_url('/');
-		} elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {
-			if ( $redirect_url = get_permalink(get_option('page_for_posts')) )
-				$redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-		} elseif ( !empty($_GET['m']) && ( is_year() || is_month() || is_day() ) ) {
-			$m = get_query_var('m');
-			switch ( strlen($m) ) {
+		} elseif ( is_single() && ! empty( $_GET['p'] ) && ! $redirect_url ) {
+			if ( $redirect_url = get_permalink( get_query_var( 'p' ) ) ) {
+				$redirect['query'] = remove_query_arg( array( 'p', 'post_type' ), $redirect['query'] );
+			}
+		} elseif ( is_single() && ! empty( $_GET['name'] ) && ! $redirect_url ) {
+			if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) ) {
+				$redirect['query'] = remove_query_arg( 'name', $redirect['query'] );
+			}
+		} elseif ( is_page() && ! empty( $_GET['page_id'] ) && ! $redirect_url ) {
+			if ( $redirect_url = get_permalink( get_query_var( 'page_id' ) ) ) {
+				$redirect['query'] = remove_query_arg( 'page_id', $redirect['query'] );
+			}
+		} elseif ( is_page() && ! is_feed() && 'page' == get_option( 'show_on_front' ) && get_queried_object_id() == get_option( 'page_on_front' ) && ! $redirect_url ) {
+			$redirect_url = home_url( '/' );
+		} elseif ( is_home() && ! empty( $_GET['page_id'] ) && 'page' == get_option( 'show_on_front' ) && get_query_var( 'page_id' ) == get_option( 'page_for_posts' ) && ! $redirect_url ) {
+			if ( $redirect_url = get_permalink( get_option( 'page_for_posts' ) ) ) {
+				$redirect['query'] = remove_query_arg( 'page_id', $redirect['query'] );
+			}
+		} elseif ( ! empty( $_GET['m'] ) && ( is_year() || is_month() || is_day() ) ) {
+			$m = get_query_var( 'm' );
+			switch ( strlen( $m ) ) {
 				case 4: // Yearly
-					$redirect_url = get_year_link($m);
+					$redirect_url = get_year_link( $m );
 					break;
 				case 6: // Monthly
-					$redirect_url = get_month_link( substr($m, 0, 4), substr($m, 4, 2) );
+					$redirect_url = get_month_link( substr( $m, 0, 4 ), substr( $m, 4, 2 ) );
 					break;
 				case 8: // Daily
-					$redirect_url = get_day_link(substr($m, 0, 4), substr($m, 4, 2), substr($m, 6, 2));
+					$redirect_url = get_day_link( substr( $m, 0, 4 ), substr( $m, 4, 2 ), substr( $m, 6, 2 ) );
 					break;
 			}
-			if ( $redirect_url )
-				$redirect['query'] = remove_query_arg('m', $redirect['query']);
-		// now moving on to non ?m=X year/month/day links
-		} elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && !empty($_GET['day']) ) {
-			if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) )
-				$redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']);
-		} elseif ( is_month() && get_query_var('year') && !empty($_GET['monthnum']) ) {
-			if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) )
-				$redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
-		} elseif ( is_year() && !empty($_GET['year']) ) {
-			if ( $redirect_url = get_year_link(get_query_var('year')) )
-				$redirect['query'] = remove_query_arg('year', $redirect['query']);
-		} elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
-			$author = get_userdata(get_query_var('author'));
+			if ( $redirect_url ) {
+				$redirect['query'] = remove_query_arg( 'm', $redirect['query'] );
+			}
+			// now moving on to non ?m=X year/month/day links
+		} elseif ( is_day() && get_query_var( 'year' ) && get_query_var( 'monthnum' ) && ! empty( $_GET['day'] ) ) {
+			if ( $redirect_url = get_day_link( get_query_var( 'year' ), get_query_var( 'monthnum' ), get_query_var( 'day' ) ) ) {
+				$redirect['query'] = remove_query_arg( array( 'year', 'monthnum', 'day' ), $redirect['query'] );
+			}
+		} elseif ( is_month() && get_query_var( 'year' ) && ! empty( $_GET['monthnum'] ) ) {
+			if ( $redirect_url = get_month_link( get_query_var( 'year' ), get_query_var( 'monthnum' ) ) ) {
+				$redirect['query'] = remove_query_arg( array( 'year', 'monthnum' ), $redirect['query'] );
+			}
+		} elseif ( is_year() && ! empty( $_GET['year'] ) ) {
+			if ( $redirect_url = get_year_link( get_query_var( 'year' ) ) ) {
+				$redirect['query'] = remove_query_arg( 'year', $redirect['query'] );
+			}
+		} elseif ( is_author() && ! empty( $_GET['author'] ) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
+			$author = get_userdata( get_query_var( 'author' ) );
 			if ( ( false !== $author ) && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) ) ) {
-				if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
-					$redirect['query'] = remove_query_arg('author', $redirect['query']);
+				if ( $redirect_url = get_author_posts_url( $author->ID, $author->user_nicename ) ) {
+					$redirect['query'] = remove_query_arg( 'author', $redirect['query'] );
+				}
 			}
 		} elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
 
 			$term_count = 0;
-			foreach ( $wp_query->tax_query->queried_terms as $tax_query )
+			foreach ( $wp_query->tax_query->queried_terms as $tax_query ) {
 				$term_count += count( $tax_query['terms'] );
+			}
 
 			$obj = $wp_query->get_queried_object();
-			if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
-				if ( !empty($redirect['query']) ) {
+			if ( $term_count <= 1 && ! empty( $obj->term_id ) && ( $tax_url = get_term_link( (int) $obj->term_id, $obj->taxonomy ) ) && ! is_wp_error( $tax_url ) ) {
+				if ( ! empty( $redirect['query'] ) ) {
 					// Strip taxonomy query vars off the url.
-					$qv_remove = array( 'term', 'taxonomy');
+					$qv_remove = array( 'term', 'taxonomy' );
 					if ( is_category() ) {
 						$qv_remove[] = 'category_name';
 						$qv_remove[] = 'cat';
@@ -228,44 +241,45 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 						$qv_remove[] = 'tag_id';
 					} else { // Custom taxonomies will have a custom query var, remove those too:
 						$tax_obj = get_taxonomy( $obj->taxonomy );
-						if ( false !== $tax_obj->query_var )
+						if ( false !== $tax_obj->query_var ) {
 							$qv_remove[] = $tax_obj->query_var;
+						}
 					}
 
-					$rewrite_vars = array_diff( array_keys($wp_query->query), array_keys($_GET) );
+					$rewrite_vars = array_diff( array_keys( $wp_query->query ), array_keys( $_GET ) );
 
-					if ( !array_diff($rewrite_vars, array_keys($_GET))  ) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET
-						$redirect['query'] = remove_query_arg($qv_remove, $redirect['query']); //Remove all of the per-tax qv's
+					if ( ! array_diff( $rewrite_vars, array_keys( $_GET ) ) ) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET
+						$redirect['query'] = remove_query_arg( $qv_remove, $redirect['query'] ); //Remove all of the per-tax qv's
 
 						// Create the destination url for this taxonomy
-						$tax_url = parse_url($tax_url);
-						if ( ! empty($tax_url['query']) ) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..
-							parse_str($tax_url['query'], $query_vars);
-							$redirect['query'] = add_query_arg($query_vars, $redirect['query']);
+						$tax_url = parse_url( $tax_url );
+						if ( ! empty( $tax_url['query'] ) ) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..
+							parse_str( $tax_url['query'], $query_vars );
+							$redirect['query'] = add_query_arg( $query_vars, $redirect['query'] );
 						} else { // Taxonomy is accessible via a "pretty-URL"
 							$redirect['path'] = $tax_url['path'];
 						}
-
 					} else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite
 						foreach ( $qv_remove as $_qv ) {
-							if ( isset($rewrite_vars[$_qv]) )
-								$redirect['query'] = remove_query_arg($_qv, $redirect['query']);
+							if ( isset( $rewrite_vars[ $_qv ] ) ) {
+								$redirect['query'] = remove_query_arg( $_qv, $redirect['query'] );
+							}
 						}
 					}
 				}
-
 			}
-		} elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
+		} elseif ( is_single() && strpos( $wp_rewrite->permalink_structure, '%category%' ) !== false && $cat = get_query_var( 'category_name' ) ) {
 			$category = get_category_by_path( $cat );
 			if ( ( ! $category || is_wp_error( $category ) ) || ! has_term( $category->term_id, 'category', $wp_query->get_queried_object_id() ) ) {
-				$redirect_url = get_permalink($wp_query->get_queried_object_id());
+				$redirect_url = get_permalink( $wp_query->get_queried_object_id() );
 			}
 		}
 
-		// Post Paging
-		if ( is_singular() && get_query_var('page') ) {
-			if ( !$redirect_url )
+			// Post Paging
+		if ( is_singular() && get_query_var( 'page' ) ) {
+			if ( ! $redirect_url ) {
 				$redirect_url = get_permalink( get_queried_object_id() );
+			}
 
 			$page = get_query_var( 'page' );
 			if ( $page > 1 ) {
@@ -275,29 +289,31 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 					$redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( $page, 'single_paged' );
 				}
 			}
-			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+				$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
 		}
 
-		// paging and feeds
-		if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
+			// paging and feeds
+		if ( get_query_var( 'paged' ) || is_feed() || get_query_var( 'cpage' ) ) {
 			while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) {
 				// Strip off paging and feed
-				$redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging
-				$redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
-				$redirect['path'] = preg_replace("#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing comment paging
+				$redirect['path'] = preg_replace( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path'] ); // strip off any existing paging
+				$redirect['path'] = preg_replace( '#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path'] ); // strip off feed endings
+				$redirect['path'] = preg_replace( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path'] ); // strip off any existing comment paging
 			}
 
 			$addl_path = '';
-			if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
-				$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
-				if ( !is_singular() && get_query_var( 'withcomments' ) )
+			if ( is_feed() && in_array( get_query_var( 'feed' ), $wp_rewrite->feeds ) ) {
+				$addl_path = ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '';
+				if ( ! is_singular() && get_query_var( 'withcomments' ) ) {
 					$addl_path .= 'comments/';
-				if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )
+				}
+				if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var( 'feed' ) ) || 'rss' == get_query_var( 'feed' ) ) {
 					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
-				else
-					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+				} else {
+					$addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == get_query_var( 'feed' ) || 'feed' == get_query_var( 'feed' ) ) ? '' : get_query_var( 'feed' ) ), 'feed' );
+				}
 				$redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
-			} elseif ( is_feed() && 'old' == get_query_var('feed') ) {
+			} elseif ( is_feed() && 'old' == get_query_var( 'feed' ) ) {
 				$old_feed_files = array(
 					'wp-atom.php'         => 'atom',
 					'wp-commentsrss2.php' => 'comments_rss2',
@@ -313,14 +329,14 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 				}
 			}
 
-			if ( get_query_var('paged') > 0 ) {
-				$paged = get_query_var('paged');
+			if ( get_query_var( 'paged' ) > 0 ) {
+				$paged             = get_query_var( 'paged' );
 				$redirect['query'] = remove_query_arg( 'paged', $redirect['query'] );
-				if ( !is_feed() ) {
-					if ( $paged > 1 && !is_single() ) {
-						$addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit("$wp_rewrite->pagination_base/$paged", 'paged');
-					} elseif ( !is_single() ) {
-						$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
+				if ( ! is_feed() ) {
+					if ( $paged > 1 && ! is_single() ) {
+						$addl_path = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' ) . user_trailingslashit( "$wp_rewrite->pagination_base/$paged", 'paged' );
+					} elseif ( ! is_single() ) {
+						$addl_path = ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '';
 					}
 				} elseif ( $paged > 1 ) {
 					$redirect['query'] = add_query_arg( 'paged', $paged, $redirect['query'] );
@@ -328,18 +344,20 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			}
 
 			if ( get_option( 'page_comments' ) && (
-				( 'newest' == get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 0 ) ||
-				( 'newest' != get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 1 )
+			( 'newest' == get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 0 ) ||
+			( 'newest' != get_option( 'default_comments_page' ) && get_query_var( 'cpage' ) > 1 )
 			) ) {
-				$addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . get_query_var('cpage'), 'commentpaged' );
+				$addl_path         = ( ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '' ) . user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . get_query_var( 'cpage' ), 'commentpaged' );
 				$redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
 			}
 
-			$redirect['path'] = user_trailingslashit( preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
-			if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/' . $wp_rewrite->index . '/') === false )
-				$redirect['path'] = trailingslashit($redirect['path']) . $wp_rewrite->index . '/';
-			if ( !empty( $addl_path ) )
-				$redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
+			$redirect['path'] = user_trailingslashit( preg_replace( '|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path'] ) ); // strip off trailing /index.php/
+			if ( ! empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos( $redirect['path'], '/' . $wp_rewrite->index . '/' ) === false ) {
+				$redirect['path'] = trailingslashit( $redirect['path'] ) . $wp_rewrite->index . '/';
+			}
+			if ( ! empty( $addl_path ) ) {
+				$redirect['path'] = trailingslashit( $redirect['path'] ) . $addl_path;
+			}
 			$redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
 		}
 
@@ -358,65 +376,85 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 
 	// tack on any additional query vars
 	$redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
-	if ( $redirect_url && !empty($redirect['query']) ) {
+	if ( $redirect_url && ! empty( $redirect['query'] ) ) {
 		parse_str( $redirect['query'], $_parsed_query );
-		$redirect = @parse_url($redirect_url);
+		$redirect = @parse_url( $redirect_url );
 
 		if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {
 			parse_str( $redirect['query'], $_parsed_redirect_query );
 
-			if ( empty( $_parsed_redirect_query['name'] ) )
+			if ( empty( $_parsed_redirect_query['name'] ) ) {
 				unset( $_parsed_query['name'] );
+			}
 		}
 
 		$_parsed_query = rawurlencode_deep( $_parsed_query );
-		$redirect_url = add_query_arg( $_parsed_query, $redirect_url );
+		$redirect_url  = add_query_arg( $_parsed_query, $redirect_url );
 	}
 
-	if ( $redirect_url )
-		$redirect = @parse_url($redirect_url);
+	if ( $redirect_url ) {
+		$redirect = @parse_url( $redirect_url );
+	}
 
 	// www.example.com vs example.com
-	$user_home = @parse_url(home_url());
-	if ( !empty($user_home['host']) )
+	$user_home = @parse_url( home_url() );
+	if ( ! empty( $user_home['host'] ) ) {
 		$redirect['host'] = $user_home['host'];
-	if ( empty($user_home['path']) )
+	}
+	if ( empty( $user_home['path'] ) ) {
 		$user_home['path'] = '/';
+	}
 
 	// Handle ports
-	if ( !empty($user_home['port']) )
+	if ( ! empty( $user_home['port'] ) ) {
 		$redirect['port'] = $user_home['port'];
-	else
-		unset($redirect['port']);
+	} else {
+		unset( $redirect['port'] );
+	}
 
 	// trailing /index.php
-	$redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
+	$redirect['path'] = preg_replace( '|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path'] );
 
-	$punctuation_pattern = implode( '|', array_map( 'preg_quote', array(
-		' ', '%20',  // space
-		'!', '%21',  // exclamation mark
-		'"', '%22',  // double quote
-		"'", '%27',  // single quote
-		'(', '%28',  // opening bracket
-		')', '%29',  // closing bracket
-		',', '%2C',  // comma
-		'.', '%2E',  // period
-		';', '%3B',  // semicolon
-		'{', '%7B',  // opening curly bracket
-		'}', '%7D',  // closing curly bracket
-		'%E2%80%9C', // opening curly quote
-		'%E2%80%9D', // closing curly quote
-	) ) );
+	$punctuation_pattern = implode(
+		'|', array_map(
+			'preg_quote', array(
+				' ',
+				'%20',  // space
+				'!',
+				'%21',  // exclamation mark
+				'"',
+				'%22',  // double quote
+				"'",
+				'%27',  // single quote
+				'(',
+				'%28',  // opening bracket
+				')',
+				'%29',  // closing bracket
+				',',
+				'%2C',  // comma
+				'.',
+				'%2E',  // period
+				';',
+				'%3B',  // semicolon
+				'{',
+				'%7B',  // opening curly bracket
+				'}',
+				'%7D',  // closing curly bracket
+				'%E2%80%9C', // opening curly quote
+				'%E2%80%9D', // closing curly quote
+			)
+		)
+	);
 
 	// Remove trailing spaces and end punctuation from the path.
 	$redirect['path'] = preg_replace( "#($punctuation_pattern)+$#", '', $redirect['path'] );
 
-	if ( !empty( $redirect['query'] ) ) {
+	if ( ! empty( $redirect['query'] ) ) {
 		// Remove trailing spaces and end punctuation from certain terminating query string args.
 		$redirect['query'] = preg_replace( "#((p|page_id|cat|tag)=[^&]*?)($punctuation_pattern)+$#", '$1', $redirect['query'] );
 
 		// Clean up empty query strings
-		$redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
+		$redirect['query'] = trim( preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query'] ), '&' );
 
 		// Redirect obsolete feeds
 		$redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$2', $redirect['query'] );
@@ -426,65 +464,75 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	}
 
 	// strip /index.php/ when we're not using PATHINFO permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
+	if ( ! $wp_rewrite->using_index_permalinks() ) {
 		$redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
+	}
 
 	// trailing slashes
-	if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_front_page() || ( is_front_page() && (get_query_var('paged') > 1) ) ) ) {
+	if ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() && ! is_404() && ( ! is_front_page() || ( is_front_page() && ( get_query_var( 'paged' ) > 1 ) ) ) ) {
 		$user_ts_type = '';
-		if ( get_query_var('paged') > 0 ) {
+		if ( get_query_var( 'paged' ) > 0 ) {
 			$user_ts_type = 'paged';
 		} else {
-			foreach ( array('single', 'category', 'page', 'day', 'month', 'year', 'home') as $type ) {
+			foreach ( array( 'single', 'category', 'page', 'day', 'month', 'year', 'home' ) as $type ) {
 				$func = 'is_' . $type;
-				if ( call_user_func($func) ) {
+				if ( call_user_func( $func ) ) {
 					$user_ts_type = $type;
 					break;
 				}
 			}
 		}
-		$redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
+		$redirect['path'] = user_trailingslashit( $redirect['path'], $user_ts_type );
 	} elseif ( is_front_page() ) {
-		$redirect['path'] = trailingslashit($redirect['path']);
+		$redirect['path'] = trailingslashit( $redirect['path'] );
 	}
 
 	// Strip multiple slashes out of the URL
-	if ( strpos($redirect['path'], '//') > -1 )
-		$redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
+	if ( strpos( $redirect['path'], '//' ) > -1 ) {
+		$redirect['path'] = preg_replace( '|/+|', '/', $redirect['path'] );
+	}
 
 	// Always trailing slash the Front Page URL
-	if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) )
-		$redirect['path'] = trailingslashit($redirect['path']);
+	if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) ) {
+		$redirect['path'] = trailingslashit( $redirect['path'] );
+	}
 
 	// Ignore differences in host capitalization, as this can lead to infinite redirects
 	// Only redirect no-www <=> yes-www
-	if ( strtolower($original['host']) == strtolower($redirect['host']) ||
-		( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) )
+	if ( strtolower( $original['host'] ) == strtolower( $redirect['host'] ) ||
+		( strtolower( $original['host'] ) != 'www.' . strtolower( $redirect['host'] ) && 'www.' . strtolower( $original['host'] ) != strtolower( $redirect['host'] ) ) ) {
 		$redirect['host'] = $original['host'];
+	}
 
 	$compare_original = array( $original['host'], $original['path'] );
 
-	if ( !empty( $original['port'] ) )
+	if ( ! empty( $original['port'] ) ) {
 		$compare_original[] = $original['port'];
+	}
 
-	if ( !empty( $original['query'] ) )
+	if ( ! empty( $original['query'] ) ) {
 		$compare_original[] = $original['query'];
+	}
 
 	$compare_redirect = array( $redirect['host'], $redirect['path'] );
 
-	if ( !empty( $redirect['port'] ) )
+	if ( ! empty( $redirect['port'] ) ) {
 		$compare_redirect[] = $redirect['port'];
+	}
 
-	if ( !empty( $redirect['query'] ) )
+	if ( ! empty( $redirect['query'] ) ) {
 		$compare_redirect[] = $redirect['query'];
+	}
 
 	if ( $compare_original !== $compare_redirect ) {
 		$redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
-		if ( !empty($redirect['port']) )
+		if ( ! empty( $redirect['port'] ) ) {
 			$redirect_url .= ':' . $redirect['port'];
+		}
 		$redirect_url .= $redirect['path'];
-		if ( !empty($redirect['query']) )
+		if ( ! empty( $redirect['query'] ) ) {
 			$redirect_url .= '?' . $redirect['query'];
+		}
 	}
 
 	if ( ! $redirect_url || $redirect_url == $requested_url ) {
@@ -492,8 +540,8 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 	}
 
 	// Hex encoded octets are case-insensitive.
-	if ( false !== strpos($requested_url, '%') ) {
-		if ( !function_exists('lowercase_octets') ) {
+	if ( false !== strpos( $requested_url, '%' ) ) {
+		if ( ! function_exists( 'lowercase_octets' ) ) {
 			/**
 			 * Converts the first hex-encoded octet match to lowercase.
 			 *
@@ -503,11 +551,11 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			 * @param array $matches Hex-encoded octet matches for the requested URL.
 			 * @return string Lowercased version of the first match.
 			 */
-			function lowercase_octets($matches) {
+			function lowercase_octets( $matches ) {
 				return strtolower( $matches[0] );
 			}
 		}
-		$requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
+		$requested_url = preg_replace_callback( '|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url );
 	}
 
 	/**
@@ -529,8 +577,8 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 
 	if ( $do_redirect ) {
 		// protect against chained redirects
-		if ( !redirect_canonical($redirect_url, false) ) {
-			wp_redirect($redirect_url, 301);
+		if ( ! redirect_canonical( $redirect_url, false ) ) {
+			wp_redirect( $redirect_url, 301 );
 			exit();
 		} else {
 			// Debug
@@ -554,13 +602,14 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
  * @param string $url
  * @return string The altered query string
  */
-function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $url ) {
+function _remove_qs_args_if_not_in_url( $query_string, array $args_to_check, $url ) {
 	$parsed_url = @parse_url( $url );
 	if ( ! empty( $parsed_url['query'] ) ) {
 		parse_str( $parsed_url['query'], $parsed_query );
 		foreach ( $args_to_check as $qv ) {
-			if ( !isset( $parsed_query[$qv] ) )
+			if ( ! isset( $parsed_query[ $qv ] ) ) {
 				$query_string = remove_query_arg( $qv, $query_string );
+			}
 		}
 	} else {
 		$query_string = remove_query_arg( $args_to_check, $query_string );
@@ -609,31 +658,37 @@ function strip_fragment_from_url( $url ) {
 function redirect_guess_404_permalink() {
 	global $wpdb;
 
-	if ( get_query_var('name') ) {
-		$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
+	if ( get_query_var( 'name' ) ) {
+		$where = $wpdb->prepare( 'post_name LIKE %s', $wpdb->esc_like( get_query_var( 'name' ) ) . '%' );
 
 		// if any of post_type, year, monthnum, or day are set, use them to refine the query
-		if ( get_query_var('post_type') )
-			$where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
-		else
+		if ( get_query_var( 'post_type' ) ) {
+			$where .= $wpdb->prepare( ' AND post_type = %s', get_query_var( 'post_type' ) );
+		} else {
 			$where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";
+		}
 
-		if ( get_query_var('year') )
-			$where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
-		if ( get_query_var('monthnum') )
-			$where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
-		if ( get_query_var('day') )
-			$where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
+		if ( get_query_var( 'year' ) ) {
+			$where .= $wpdb->prepare( ' AND YEAR(post_date) = %d', get_query_var( 'year' ) );
+		}
+		if ( get_query_var( 'monthnum' ) ) {
+			$where .= $wpdb->prepare( ' AND MONTH(post_date) = %d', get_query_var( 'monthnum' ) );
+		}
+		if ( get_query_var( 'day' ) ) {
+			$where .= $wpdb->prepare( ' AND DAYOFMONTH(post_date) = %d', get_query_var( 'day' ) );
+		}
 
-		$post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
-		if ( ! $post_id )
+		$post_id = $wpdb->get_var( "SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'" );
+		if ( ! $post_id ) {
 			return false;
-		if ( get_query_var( 'feed' ) )
+		}
+		if ( get_query_var( 'feed' ) ) {
 			return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
-		elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) )
+		} elseif ( get_query_var( 'page' ) && 1 < get_query_var( 'page' ) ) {
 			return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
-		else
+		} else {
 			return get_permalink( $post_id );
+		}
 	}
 
 	return false;
@@ -651,8 +706,9 @@ function redirect_guess_404_permalink() {
  */
 function wp_redirect_admin_locations() {
 	global $wp_rewrite;
-	if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
+	if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) ) {
 		return;
+	}
 
 	$admins = array(
 		home_url( 'wp-admin', 'relative' ),
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index e744175c9c..39d76226f7 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -31,532 +31,543 @@ function map_meta_cap( $cap, $user_id ) {
 	$caps = array();
 
 	switch ( $cap ) {
-	case 'remove_user':
-		// In multisite the user must be a super admin to remove themselves.
-		if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'remove_users';
-		}
-		break;
-	case 'promote_user':
-	case 'add_users':
-		$caps[] = 'promote_users';
-		break;
-	case 'edit_user':
-	case 'edit_users':
-		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		case 'remove_user':
+			// In multisite the user must be a super admin to remove themselves.
+			if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'remove_users';
+			}
 			break;
-
-		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'edit_users'; // edit_user maps to edit_users.
-		}
-		break;
-	case 'delete_post':
-	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
+		case 'promote_user':
+		case 'add_users':
+			$caps[] = 'promote_users';
 			break;
-		}
+		case 'edit_user':
+		case 'edit_users':
+			// Allow user to edit itself
+			if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) {
+				break;
+			}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
+			if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'edit_users'; // edit_user maps to edit_users.
+			}
+			break;
+		case 'delete_post':
+		case 'delete_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
-			$caps[] = 'manage_options';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
+				$caps[] = 'manage_options';
+				break;
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'delete_post' == $cap ) {
+					$cap = $post_type->cap->$cap;
+				}
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->delete_published_posts;
+					} else {
+						$caps[] = $post_type->cap->delete_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->delete_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->delete_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->delete_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->delete_private_posts;
+				}
 			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->delete_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_private_posts;
-			}
-		}
-		break;
+			break;
 		// edit_post breaks down to edit_posts, edit_published_posts, or
 		// edit_others_posts
-	case 'edit_post':
-	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		case 'edit_post':
+		case 'edit_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'edit_post' == $cap ) {
+					$cap = $post_type->cap->$cap;
+				}
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->edit_published_posts;
+					} else {
+						$caps[] = $post_type->cap->edit_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->edit_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->edit_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->edit_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->edit_private_posts;
+				}
 			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->edit_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_private_posts;
-			}
-		}
-		break;
-	case 'read_post':
-	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		case 'read_post':
+		case 'read_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
-
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
-
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
-			$caps[] = $post_type->cap->read;
-			break;
-		}
-
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
-			$caps[] = $post_type->cap->read_private_posts;
-		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		}
-		break;
-	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
-
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
-
-		$caps[] = $post_type->cap->publish_posts;
-		break;
-	case 'edit_post_meta':
-	case 'delete_post_meta':
-	case 'add_post_meta':
-	case 'edit_comment_meta':
-	case 'delete_comment_meta':
-	case 'add_comment_meta':
-	case 'edit_term_meta':
-	case 'delete_term_meta':
-	case 'add_term_meta':
-	case 'edit_user_meta':
-	case 'delete_user_meta':
-	case 'add_user_meta':
-		list( $_, $object_type, $_ ) = explode( '_', $cap );
-		$object_id = (int) $args[0];
-
-		switch ( $object_type ) {
-			case 'post':
-				$post = get_post( $object_id );
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
 				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
 					break;
 				}
+			}
 
-				$sub_type = get_post_type( $post );
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
 				break;
+			}
 
-			case 'comment':
-				$comment = get_comment( $object_id );
-				if ( ! $comment ) {
-					break;
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'read_post' == $cap ) {
+					$cap = $post_type->cap->$cap;
 				}
-
-				$sub_type = empty( $comment->comment_type ) ? 'comment' : $comment->comment_type;
 				break;
+			}
 
-			case 'term':
-				$term = get_term( $object_id );
-				if ( ! $term instanceof WP_Term ) {
-					break;
-				}
-
-				$sub_type = $term->taxonomy;
+			$status_obj = get_post_status_object( $post->post_status );
+			if ( $status_obj->public ) {
+				$caps[] = $post_type->cap->read;
 				break;
+			}
 
-			case 'user':
-				$user = get_user_by( 'id', $object_id );
-				if ( ! $user ) {
-					break;
-				}
-
-				$sub_type = 'user';
-				break;
-		}
-
-		if ( empty( $sub_type ) ) {
-			$caps[] = 'do_not_allow';
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				$caps[] = $post_type->cap->read;
+			} elseif ( $status_obj->private ) {
+				$caps[] = $post_type->cap->read_private_posts;
+			} else {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			}
 			break;
-		}
+		case 'publish_post':
+			$post = get_post( $args[0] );
+			if ( ! $post ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$caps = map_meta_cap( "edit_{$object_type}", $user_id, $object_id );
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		$meta_key = isset( $args[1] ) ? $args[1] : false;
+			$caps[] = $post_type->cap->publish_posts;
+			break;
+		case 'edit_post_meta':
+		case 'delete_post_meta':
+		case 'add_post_meta':
+		case 'edit_comment_meta':
+		case 'delete_comment_meta':
+		case 'add_comment_meta':
+		case 'edit_term_meta':
+		case 'delete_term_meta':
+		case 'add_term_meta':
+		case 'edit_user_meta':
+		case 'delete_user_meta':
+		case 'add_user_meta':
+			list( $_, $object_type, $_ ) = explode( '_', $cap );
+			$object_id                   = (int) $args[0];
 
-		$has_filter = has_filter( "auth_{$object_type}_meta_{$meta_key}" ) || has_filter( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}" );
-		if ( $meta_key && $has_filter ) {
+			switch ( $object_type ) {
+				case 'post':
+					$post = get_post( $object_id );
+					if ( ! $post ) {
+						break;
+					}
 
-			/**
-			 * Filters whether the user is allowed to edit meta.
-			 *
-			 * Use the {@see auth_post_$object_type_meta_$meta_key} filter to modify capabilities for
-			 * specific object types. Return true to have the mapped meta caps from edit_{$object_type} apply.
-			 *
-			 * The dynamic portion of the hook name, `$object_type` refers to the object type being filtered.
-			 * The dynamic portion of the hook name, `$meta_key`, refers to the meta key passed to map_meta_cap().
-			 *
-			 * @since 3.3.0 As 'auth_post_meta_{$meta_key}'.
-			 * @since 4.6.0
-			 *
-			 * @param bool   $allowed  Whether the user can add the post meta. Default false.
-			 * @param string $meta_key The meta key.
-			 * @param int    $post_id  Post ID.
-			 * @param int    $user_id  User ID.
-			 * @param string $cap      Capability name.
-			 * @param array  $caps     User capabilities.
-			 */
-			$allowed = apply_filters( "auth_{$object_type}_meta_{$meta_key}", false, $meta_key, $object_id, $user_id, $cap, $caps );
+					$sub_type = get_post_type( $post );
+					break;
 
-			/**
-			 * Filters whether the user is allowed to add post meta to a post of a given type.
-			 *
-			 * Use the {@see auth_$object_type_$sub_type_meta_$meta_key} filter to modify capabilities for
-			 * specific object types/subtypes. Return true to have the mapped meta caps from edit_{$object_type} apply.
-			 *
-			 * The dynamic portion of the hook name, `$object_type` refers to the object type being filtered.
-			 * The dynamic portion of the hook name, `$sub_type` refers to the object subtype being filtered.
-			 * The dynamic portion of the hook name, `$meta_key`, refers to the meta key passed to map_meta_cap().
-			 *
-			 * @since 4.6.0 As 'auth_post_{$post_type}_meta_{$meta_key}'.
-			 * @since 4.7.0
-			 *
-			 * @param bool   $allowed  Whether the user can add the post meta. Default false.
-			 * @param string $meta_key The meta key.
-			 * @param int    $post_id  Post ID.
-			 * @param int    $user_id  User ID.
-			 * @param string $cap      Capability name.
-			 * @param array  $caps     User capabilities.
-			 */
-			$allowed = apply_filters( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}", $allowed, $meta_key, $object_id, $user_id, $cap, $caps );
+				case 'comment':
+					$comment = get_comment( $object_id );
+					if ( ! $comment ) {
+						break;
+					}
 
-			if ( ! $allowed ) {
+					$sub_type = empty( $comment->comment_type ) ? 'comment' : $comment->comment_type;
+					break;
+
+				case 'term':
+					$term = get_term( $object_id );
+					if ( ! $term instanceof WP_Term ) {
+						break;
+					}
+
+					$sub_type = $term->taxonomy;
+					break;
+
+				case 'user':
+					$user = get_user_by( 'id', $object_id );
+					if ( ! $user ) {
+						break;
+					}
+
+					$sub_type = 'user';
+					break;
+			}
+
+			if ( empty( $sub_type ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
+
+			$caps = map_meta_cap( "edit_{$object_type}", $user_id, $object_id );
+
+			$meta_key = isset( $args[1] ) ? $args[1] : false;
+
+			$has_filter = has_filter( "auth_{$object_type}_meta_{$meta_key}" ) || has_filter( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}" );
+			if ( $meta_key && $has_filter ) {
+
+				/**
+				 * Filters whether the user is allowed to edit meta.
+				 *
+				 * Use the {@see auth_post_$object_type_meta_$meta_key} filter to modify capabilities for
+				 * specific object types. Return true to have the mapped meta caps from edit_{$object_type} apply.
+				 *
+				 * The dynamic portion of the hook name, `$object_type` refers to the object type being filtered.
+				 * The dynamic portion of the hook name, `$meta_key`, refers to the meta key passed to map_meta_cap().
+				 *
+				 * @since 3.3.0 As 'auth_post_meta_{$meta_key}'.
+				 * @since 4.6.0
+				 *
+				 * @param bool   $allowed  Whether the user can add the post meta. Default false.
+				 * @param string $meta_key The meta key.
+				 * @param int    $post_id  Post ID.
+				 * @param int    $user_id  User ID.
+				 * @param string $cap      Capability name.
+				 * @param array  $caps     User capabilities.
+				 */
+				$allowed = apply_filters( "auth_{$object_type}_meta_{$meta_key}", false, $meta_key, $object_id, $user_id, $cap, $caps );
+
+				/**
+				 * Filters whether the user is allowed to add post meta to a post of a given type.
+				 *
+				 * Use the {@see auth_$object_type_$sub_type_meta_$meta_key} filter to modify capabilities for
+				 * specific object types/subtypes. Return true to have the mapped meta caps from edit_{$object_type} apply.
+				 *
+				 * The dynamic portion of the hook name, `$object_type` refers to the object type being filtered.
+				 * The dynamic portion of the hook name, `$sub_type` refers to the object subtype being filtered.
+				 * The dynamic portion of the hook name, `$meta_key`, refers to the meta key passed to map_meta_cap().
+				 *
+				 * @since 4.6.0 As 'auth_post_{$post_type}_meta_{$meta_key}'.
+				 * @since 4.7.0
+				 *
+				 * @param bool   $allowed  Whether the user can add the post meta. Default false.
+				 * @param string $meta_key The meta key.
+				 * @param int    $post_id  Post ID.
+				 * @param int    $user_id  User ID.
+				 * @param string $cap      Capability name.
+				 * @param array  $caps     User capabilities.
+				 */
+				$allowed = apply_filters( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}", $allowed, $meta_key, $object_id, $user_id, $cap, $caps );
+
+				if ( ! $allowed ) {
+					$caps[] = $cap;
+				}
+			} elseif ( $meta_key && is_protected_meta( $meta_key, $object_type ) ) {
 				$caps[] = $cap;
 			}
-		} elseif ( $meta_key && is_protected_meta( $meta_key, $object_type ) ) {
-			$caps[] = $cap;
-		}
-		break;
-	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
+		case 'edit_comment':
+			$comment = get_comment( $args[0] );
+			if ( ! $comment ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$post = get_post( $comment->comment_post_ID );
+			$post = get_post( $comment->comment_post_ID );
 
-		/*
-		 * If the post doesn't exist, we have an orphaned comment.
-		 * Fall back to the edit_posts capability, instead.
-		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
-		}
-		break;
-	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'edit_css' :
-	case 'unfiltered_html' :
-		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'unfiltered_html';
-		break;
-	case 'edit_files':
-	case 'edit_plugins':
-	case 'edit_themes':
-		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'update_plugins':
-	case 'delete_plugins':
-	case 'install_plugins':
-	case 'upload_plugins':
-	case 'update_themes':
-	case 'delete_themes':
-	case 'install_themes':
-	case 'upload_themes':
-	case 'update_core':
-		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
-		// Files in uploads are excepted.
-		if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
-			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
-			$caps[] = 'install_plugins';
-		} else {
-			$caps[] = $cap;
-		}
-		break;
-	case 'install_languages':
-	case 'update_languages':
-		if ( ! function_exists( 'request_filesystem_credentials' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/file.php' );
-		}
-
-		if ( ! function_exists( 'wp_can_install_language_pack' ) ) {
-			require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
-		}
-
-		if ( ! wp_can_install_language_pack() ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'install_languages';
-		}
-		break;
-	case 'activate_plugins':
-	case 'deactivate_plugins':
-	case 'activate_plugin':
-	case 'deactivate_plugin':
-		$caps[] = 'activate_plugins';
-		if ( is_multisite() ) {
-			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
-		}
-		break;
-	case 'delete_user':
-	case 'delete_users':
-		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
-		break;
-	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'customize' :
-		$caps[] = 'edit_theme_options';
-		break;
-	case 'delete_site':
-		if ( is_multisite() ) {
-			$caps[] = 'manage_options';
-		} else {
-			$caps[] = 'do_not_allow';
-		}
-		break;
-	case 'edit_term':
-	case 'delete_term':
-	case 'assign_term':
-		$term_id = (int) $args[0];
-		$term = get_term( $term_id );
-		if ( ! $term || is_wp_error( $term ) ) {
-			$caps[] = 'do_not_allow';
+			/*
+			 * If the post doesn't exist, we have an orphaned comment.
+			 * Fall back to the edit_posts capability, instead.
+			 */
+			if ( $post ) {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			} else {
+				$caps = map_meta_cap( 'edit_posts', $user_id );
+			}
 			break;
-		}
-
-		$tax = get_taxonomy( $term->taxonomy );
-		if ( ! $tax ) {
-			$caps[] = 'do_not_allow';
+		case 'unfiltered_upload':
+			if ( defined( 'ALLOW_UNFILTERED_UPLOADS' ) && ALLOW_UNFILTERED_UPLOADS && ( ! is_multisite() || is_super_admin( $user_id ) ) ) {
+				$caps[] = $cap;
+			} else {
+				$caps[] = 'do_not_allow';
+			}
 			break;
-		}
-
-		if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
-			$caps[] = 'do_not_allow';
+		case 'edit_css':
+		case 'unfiltered_html':
+			// Disallow unfiltered_html for all users, even admins and super admins.
+			if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'unfiltered_html';
+			}
 			break;
-		}
+		case 'edit_files':
+		case 'edit_plugins':
+		case 'edit_themes':
+			// Disallow the file editors.
+			if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = $cap;
+			}
+			break;
+		case 'update_plugins':
+		case 'delete_plugins':
+		case 'install_plugins':
+		case 'upload_plugins':
+		case 'update_themes':
+		case 'delete_themes':
+		case 'install_themes':
+		case 'upload_themes':
+		case 'update_core':
+			// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+			// Files in uploads are excepted.
+			if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( 'upload_themes' === $cap ) {
+				$caps[] = 'install_themes';
+			} elseif ( 'upload_plugins' === $cap ) {
+				$caps[] = 'install_plugins';
+			} else {
+				$caps[] = $cap;
+			}
+			break;
+		case 'install_languages':
+		case 'update_languages':
+			if ( ! function_exists( 'request_filesystem_credentials' ) ) {
+				require_once( ABSPATH . 'wp-admin/includes/file.php' );
+			}
 
-		$taxo_cap = $cap . 's';
+			if ( ! function_exists( 'wp_can_install_language_pack' ) ) {
+				require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+			}
 
-		$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+			if ( ! wp_can_install_language_pack() ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'install_languages';
+			}
+			break;
+		case 'activate_plugins':
+		case 'deactivate_plugins':
+		case 'activate_plugin':
+		case 'deactivate_plugin':
+			$caps[] = 'activate_plugins';
+			if ( is_multisite() ) {
+				// update_, install_, and delete_ are handled above with is_super_admin().
+				$menu_perms = get_site_option( 'menu_items', array() );
+				if ( empty( $menu_perms['plugins'] ) ) {
+					$caps[] = 'manage_network_plugins';
+				}
+			}
+			break;
+		case 'delete_user':
+		case 'delete_users':
+			// If multisite only super admins can delete users.
+			if ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'delete_users'; // delete_user maps to delete_users.
+			}
+			break;
+		case 'create_users':
+			if ( ! is_multisite() ) {
+				$caps[] = $cap;
+			} elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) ) {
+				$caps[] = $cap;
+			} else {
+				$caps[] = 'do_not_allow';
+			}
+			break;
+		case 'manage_links':
+			if ( get_option( 'link_manager_enabled' ) ) {
+				$caps[] = $cap;
+			} else {
+				$caps[] = 'do_not_allow';
+			}
+			break;
+		case 'customize':
+			$caps[] = 'edit_theme_options';
+			break;
+		case 'delete_site':
+			if ( is_multisite() ) {
+				$caps[] = 'manage_options';
+			} else {
+				$caps[] = 'do_not_allow';
+			}
+			break;
+		case 'edit_term':
+		case 'delete_term':
+		case 'assign_term':
+			$term_id = (int) $args[0];
+			$term    = get_term( $term_id );
+			if ( ! $term || is_wp_error( $term ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		break;
-	case 'manage_post_tags':
-	case 'edit_categories':
-	case 'edit_post_tags':
-	case 'delete_categories':
-	case 'delete_post_tags':
-		$caps[] = 'manage_categories';
-		break;
-	case 'assign_categories':
-	case 'assign_post_tags':
-		$caps[] = 'edit_posts';
-		break;
-	case 'create_sites':
-	case 'delete_sites':
-	case 'manage_network':
-	case 'manage_sites':
-	case 'manage_network_users':
-	case 'manage_network_plugins':
-	case 'manage_network_themes':
-	case 'manage_network_options':
-	case 'upgrade_network':
-		$caps[] = $cap;
-		break;
-	case 'setup_network':
-		if ( is_multisite() ) {
-			$caps[] = 'manage_network_options';
-		} else {
-			$caps[] = 'manage_options';
-		}
-		break;
-	default:
-		// Handle meta capabilities for custom post types.
-		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
-		}
+			$tax = get_taxonomy( $term->taxonomy );
+			if ( ! $tax ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		// If no meta caps match, return the original cap.
-		$caps[] = $cap;
+			if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
+
+			$taxo_cap = $cap . 's';
+
+			$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+
+			break;
+		case 'manage_post_tags':
+		case 'edit_categories':
+		case 'edit_post_tags':
+		case 'delete_categories':
+		case 'delete_post_tags':
+			$caps[] = 'manage_categories';
+			break;
+		case 'assign_categories':
+		case 'assign_post_tags':
+			$caps[] = 'edit_posts';
+			break;
+		case 'create_sites':
+		case 'delete_sites':
+		case 'manage_network':
+		case 'manage_sites':
+		case 'manage_network_users':
+		case 'manage_network_plugins':
+		case 'manage_network_themes':
+		case 'manage_network_options':
+		case 'upgrade_network':
+			$caps[] = $cap;
+			break;
+		case 'setup_network':
+			if ( is_multisite() ) {
+				$caps[] = 'manage_network_options';
+			} else {
+				$caps[] = 'manage_options';
+			}
+			break;
+		default:
+			// Handle meta capabilities for custom post types.
+			global $post_type_meta_caps;
+			if ( isset( $post_type_meta_caps[ $cap ] ) ) {
+				$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
+				return call_user_func_array( 'map_meta_cap', $args );
+			}
+
+			// If no meta caps match, return the original cap.
+			$caps[] = $cap;
 	}
 
 	/**
@@ -597,8 +608,9 @@ function map_meta_cap( $cap, $user_id ) {
 function current_user_can( $capability ) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
+	if ( empty( $current_user ) ) {
 		return false;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	$args = array_merge( array( $capability ), $args );
@@ -649,13 +661,15 @@ function current_user_can_for_blog( $blog_id, $capability ) {
  * @return bool Whether the post author has the given capability.
  */
 function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
+	if ( ! $post = get_post( $post ) ) {
 		return false;
+	}
 
 	$author = get_userdata( $post->post_author );
 
-	if ( ! $author )
+	if ( ! $author ) {
 		return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -673,11 +687,13 @@ function author_can( $post, $capability ) {
  * @return bool Whether the user has the given capability.
  */
 function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
+	if ( ! is_object( $user ) ) {
 		$user = get_userdata( $user );
+	}
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists() ) {
 		return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -755,10 +771,11 @@ function remove_role( $role ) {
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
+	if ( isset( $super_admins ) ) {
 		return $super_admins;
-	else
-		return get_site_option( 'site_admins', array('admin') );
+	} else {
+		return get_site_option( 'site_admins', array( 'admin' ) );
+	}
 }
 
 /**
@@ -770,21 +787,25 @@ function get_super_admins() {
  * @return bool True if the user is a site admin.
  */
 function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
+	if ( ! $user_id || $user_id == get_current_user_id() ) {
 		$user = wp_get_current_user();
-	else
+	} else {
 		$user = get_userdata( $user_id );
+	}
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists() ) {
 		return false;
+	}
 
 	if ( is_multisite() ) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
+		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) ) {
 			return true;
+		}
 	} else {
-		if ( $user->has_cap('delete_users') )
+		if ( $user->has_cap( 'delete_users' ) ) {
 			return true;
+		}
 	}
 
 	return false;
@@ -822,7 +843,7 @@ function grant_super_admin( $user_id ) {
 	$user = get_userdata( $user_id );
 	if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
 		$super_admins[] = $user->user_login;
-		update_site_option( 'site_admins' , $super_admins );
+		update_site_option( 'site_admins', $super_admins );
 
 		/**
 		 * Fires after the user is granted Super Admin privileges.
@@ -869,7 +890,7 @@ function revoke_super_admin( $user_id ) {
 	$user = get_userdata( $user_id );
 	if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
 		if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
-			unset( $super_admins[$key] );
+			unset( $super_admins[ $key ] );
 			update_site_option( 'site_admins', $super_admins );
 
 			/**
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 302aa032c2..c3782441e6 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -17,13 +17,15 @@
  * @return string Link on success, empty string if category does not exist.
  */
 function get_category_link( $category ) {
-	if ( ! is_object( $category ) )
+	if ( ! is_object( $category ) ) {
 		$category = (int) $category;
+	}
 
 	$category = get_term_link( $category, 'category' );
 
-	if ( is_wp_error( $category ) )
+	if ( is_wp_error( $category ) ) {
 		return '';
+	}
 
 	return $category;
 }
@@ -73,13 +75,14 @@ function get_category_parents( $id, $link = false, $separator = '/', $nicename =
  */
 function get_the_category( $id = false ) {
 	$categories = get_the_terms( $id, 'category' );
-	if ( ! $categories || is_wp_error( $categories ) )
+	if ( ! $categories || is_wp_error( $categories ) ) {
 		$categories = array();
+	}
 
 	$categories = array_values( $categories );
 
 	foreach ( array_keys( $categories ) as $key ) {
-		_make_cat_compat( $categories[$key] );
+		_make_cat_compat( $categories[ $key ] );
 	}
 
 	/**
@@ -103,11 +106,12 @@ function get_the_category( $id = false ) {
  * @return string|WP_Error Category name on success, WP_Error on failure.
  */
 function get_the_category_by_ID( $cat_ID ) {
-	$cat_ID = (int) $cat_ID;
+	$cat_ID   = (int) $cat_ID;
 	$category = get_term( $cat_ID, 'category' );
 
-	if ( is_wp_error( $category ) )
+	if ( is_wp_error( $category ) ) {
 		return $category;
+	}
 
 	return ( $category ) ? $category->name : '';
 }
@@ -157,42 +161,47 @@ function get_the_category_list( $separator = '', $parents = '', $post_id = false
 			$thelist .= "\n\t<li>";
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
-					if ( $category->parent )
+					if ( $category->parent ) {
 						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
+					}
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name . '</a></li>';
 					break;
 				case 'single':
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '"  ' . $rel . '>';
-					if ( $category->parent )
+					if ( $category->parent ) {
 						$thelist .= get_category_parents( $category->parent, false, $separator );
-					$thelist .= $category->name.'</a></li>';
+					}
+					$thelist .= $category->name . '</a></li>';
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name . '</a></li>';
 			}
 		}
 		$thelist .= '</ul>';
 	} else {
 		$i = 0;
 		foreach ( $categories as $category ) {
-			if ( 0 < $i )
+			if ( 0 < $i ) {
 				$thelist .= $separator;
+			}
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
-					if ( $category->parent )
+					if ( $category->parent ) {
 						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
+					}
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name . '</a>';
 					break;
 				case 'single':
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>';
-					if ( $category->parent )
+					if ( $category->parent ) {
 						$thelist .= get_category_parents( $category->parent, false, $separator );
+					}
 					$thelist .= "$category->name</a>";
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
+					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name . '</a>';
 			}
 			++$i;
 		}
@@ -230,8 +239,9 @@ function get_the_category_list( $separator = '', $parents = '', $post_id = false
  * @return bool True if the current post is in any of the given categories.
  */
 function in_category( $category, $post = null ) {
-	if ( empty( $category ) )
+	if ( empty( $category ) ) {
 		return false;
+	}
 
 	return has_category( $category, $post );
 }
@@ -338,9 +348,11 @@ function wp_dropdown_categories( $args = '' ) {
 
 	// Back compat.
 	if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.0.0',
 			/* translators: 1: "type => link", 2: "taxonomy => link_category" */
-			sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+			sprintf(
+				__( '%1$s is deprecated. Use %2$s instead.' ),
 				'<code>type => link</code>',
 				'<code>taxonomy => link_category</code>'
 			)
@@ -348,7 +360,7 @@ function wp_dropdown_categories( $args = '' ) {
 		$args['taxonomy'] = 'link_category';
 	}
 
-	$r = wp_parse_args( $args, $defaults );
+	$r                 = wp_parse_args( $args, $defaults );
 	$option_none_value = $r['option_none_value'];
 
 	if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
@@ -367,9 +379,9 @@ function wp_dropdown_categories( $args = '' ) {
 	unset( $get_terms_args['name'] );
 	$categories = get_terms( $r['taxonomy'], $get_terms_args );
 
-	$name = esc_attr( $r['name'] );
-	$class = esc_attr( $r['class'] );
-	$id = $r['id'] ? esc_attr( $r['id'] ) : $name;
+	$name     = esc_attr( $r['name'] );
+	$class    = esc_attr( $r['class'] );
+	$id       = $r['id'] ? esc_attr( $r['id'] ) : $name;
 	$required = $r['required'] ? 'required' : '';
 
 	if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
@@ -395,7 +407,7 @@ function wp_dropdown_categories( $args = '' ) {
 		 * @param WP_Term|null $category The category object, or null if there's no corresponding category.
 		 */
 		$show_option_none = apply_filters( 'list_cats', $r['show_option_none'], null );
-		$output .= "\t<option value='" . esc_attr( $option_none_value ) . "' selected='selected'>$show_option_none</option>\n";
+		$output          .= "\t<option value='" . esc_attr( $option_none_value ) . "' selected='selected'>$show_option_none</option>\n";
 	}
 
 	if ( ! empty( $categories ) ) {
@@ -404,16 +416,16 @@ function wp_dropdown_categories( $args = '' ) {
 
 			/** This filter is documented in wp-includes/category-template.php */
 			$show_option_all = apply_filters( 'list_cats', $r['show_option_all'], null );
-			$selected = ( '0' === strval($r['selected']) ) ? " selected='selected'" : '';
-			$output .= "\t<option value='0'$selected>$show_option_all</option>\n";
+			$selected        = ( '0' === strval( $r['selected'] ) ) ? " selected='selected'" : '';
+			$output         .= "\t<option value='0'$selected>$show_option_all</option>\n";
 		}
 
 		if ( $r['show_option_none'] ) {
 
 			/** This filter is documented in wp-includes/category-template.php */
 			$show_option_none = apply_filters( 'list_cats', $r['show_option_none'], null );
-			$selected = selected( $option_none_value, $r['selected'], false );
-			$output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$selected>$show_option_none</option>\n";
+			$selected         = selected( $option_none_value, $r['selected'], false );
+			$output          .= "\t<option value='" . esc_attr( $option_none_value ) . "'$selected>$show_option_none</option>\n";
 		}
 
 		if ( $r['hierarchical'] ) {
@@ -522,8 +534,9 @@ function wp_list_categories( $args = '' ) {
 
 	$r = wp_parse_args( $args, $defaults );
 
-	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] )
+	if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
 		$r['pad_counts'] = true;
+	}
 
 	// Descendants of exclusions should be excluded too.
 	if ( true == $r['hierarchical'] ) {
@@ -538,17 +551,18 @@ function wp_list_categories( $args = '' ) {
 		}
 
 		$r['exclude_tree'] = $exclude_tree;
-		$r['exclude'] = '';
+		$r['exclude']      = '';
 	}
 
-	if ( ! isset( $r['class'] ) )
+	if ( ! isset( $r['class'] ) ) {
 		$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
+	}
 
 	if ( ! taxonomy_exists( $r['taxonomy'] ) ) {
 		return false;
 	}
 
-	$show_option_all = $r['show_option_all'];
+	$show_option_all  = $r['show_option_all'];
 	$show_option_none = $r['show_option_none'];
 
 	$categories = get_categories( $r );
@@ -674,28 +688,49 @@ function wp_list_categories( $args = '' ) {
  */
 function wp_tag_cloud( $args = '' ) {
 	$defaults = array(
-		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45,
-		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
-		'exclude' => '', 'include' => '', 'link' => 'view', 'taxonomy' => 'post_tag', 'post_type' => '', 'echo' => true,
+		'smallest'   => 8,
+		'largest'    => 22,
+		'unit'       => 'pt',
+		'number'     => 45,
+		'format'     => 'flat',
+		'separator'  => "\n",
+		'orderby'    => 'name',
+		'order'      => 'ASC',
+		'exclude'    => '',
+		'include'    => '',
+		'link'       => 'view',
+		'taxonomy'   => 'post_tag',
+		'post_type'  => '',
+		'echo'       => true,
 		'show_count' => 0,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 
-	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
+	$tags = get_terms(
+		$args['taxonomy'], array_merge(
+			$args, array(
+				'orderby' => 'count',
+				'order'   => 'DESC',
+			)
+		)
+	); // Always query top tags
 
-	if ( empty( $tags ) || is_wp_error( $tags ) )
+	if ( empty( $tags ) || is_wp_error( $tags ) ) {
 		return;
+	}
 
 	foreach ( $tags as $key => $tag ) {
-		if ( 'edit' == $args['link'] )
+		if ( 'edit' == $args['link'] ) {
 			$link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
-		else
-			$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
-		if ( is_wp_error( $link ) )
+		} else {
+			$link = get_term_link( intval( $tag->term_id ), $tag->taxonomy );
+		}
+		if ( is_wp_error( $link ) ) {
 			return;
+		}
 
 		$tags[ $key ]->link = $link;
-		$tags[ $key ]->id = $tag->term_id;
+		$tags[ $key ]->id   = $tag->term_id;
 	}
 
 	$return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args
@@ -710,8 +745,9 @@ function wp_tag_cloud( $args = '' ) {
 	 */
 	$return = apply_filters( 'wp_tag_cloud', $return, $args );
 
-	if ( 'array' == $args['format'] || empty($args['echo']) )
+	if ( 'array' == $args['format'] || empty( $args['echo'] ) ) {
 		return $return;
+	}
 
 	echo $return;
 }
@@ -725,7 +761,7 @@ function wp_tag_cloud( $args = '' ) {
  * @return int Scaled count.
  */
 function default_topic_count_scale( $count ) {
-	return round(log10($count + 1) * 100);
+	return round( log10( $count + 1 ) * 100 );
 }
 
 /**
@@ -776,11 +812,19 @@ function default_topic_count_scale( $count ) {
  */
 function wp_generate_tag_cloud( $tags, $args = '' ) {
 	$defaults = array(
-		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
-		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
-		'topic_count_text' => null, 'topic_count_text_callback' => null,
-		'topic_count_scale_callback' => 'default_topic_count_scale', 'filter' => 1,
-		'show_count' => 0,
+		'smallest'                   => 8,
+		'largest'                    => 22,
+		'unit'                       => 'pt',
+		'number'                     => 0,
+		'format'                     => 'flat',
+		'separator'                  => "\n",
+		'orderby'                    => 'name',
+		'order'                      => 'ASC',
+		'topic_count_text'           => null,
+		'topic_count_text_callback'  => null,
+		'topic_count_scale_callback' => 'default_topic_count_scale',
+		'filter'                     => 1,
+		'show_count'                 => 0,
 	);
 
 	$args = wp_parse_args( $args, $defaults );
@@ -843,23 +887,26 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
 		}
 	}
 
-	if ( $args['number'] > 0 )
+	if ( $args['number'] > 0 ) {
 		$tags = array_slice( $tags, 0, $args['number'] );
+	}
 
-	$counts = array();
+	$counts      = array();
 	$real_counts = array(); // For the alt tag
 	foreach ( (array) $tags as $key => $tag ) {
 		$real_counts[ $key ] = $tag->count;
-		$counts[ $key ] = call_user_func( $args['topic_count_scale_callback'], $tag->count );
+		$counts[ $key ]      = call_user_func( $args['topic_count_scale_callback'], $tag->count );
 	}
 
 	$min_count = min( $counts );
-	$spread = max( $counts ) - $min_count;
-	if ( $spread <= 0 )
+	$spread    = max( $counts ) - $min_count;
+	if ( $spread <= 0 ) {
 		$spread = 1;
+	}
 	$font_spread = $args['largest'] - $args['smallest'];
-	if ( $font_spread < 0 )
+	if ( $font_spread < 0 ) {
 		$font_spread = 1;
+	}
 	$font_step = $font_spread / $spread;
 
 	$aria_label = false;
@@ -883,7 +930,7 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
 	foreach ( $tags as $key => $tag ) {
 		$tag_id = isset( $tag->id ) ? $tag->id : $key;
 
-		$count = $counts[ $key ];
+		$count      = $counts[ $key ];
 		$real_count = $real_counts[ $key ];
 
 		if ( $translate_nooped_plural ) {
@@ -921,7 +968,7 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
 	// Generate the output links array.
 	foreach ( $tags_data as $key => $tag_data ) {
 		$class = $tag_data['class'] . ' tag-link-position-' . ( $key + 1 );
-		$a[] = sprintf(
+		$a[]   = sprintf(
 			'<a href="%1$s"%2$s class="%3$s" style="font-size: %4$s;"%5$s>%6$s%7$s</a>',
 			esc_url( $tag_data['url'] ),
 			$tag_data['role'],
@@ -934,20 +981,20 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
 	}
 
 	switch ( $args['format'] ) {
-		case 'array' :
+		case 'array':
 			$return =& $a;
 			break;
-		case 'list' :
+		case 'list':
 			/*
 			 * Force role="list", as some browsers (sic: Safari 10) don't expose to assistive
 			 * technologies the default role when the list is styled with `list-style: none`.
 			 * Note: this is redundant but doesn't harm.
 			 */
-			$return = "<ul class='wp-tag-cloud' role='list'>\n\t<li>";
+			$return  = "<ul class='wp-tag-cloud' role='list'>\n\t<li>";
 			$return .= join( "</li>\n\t<li>", $a );
 			$return .= "</li>\n</ul>\n";
 			break;
-		default :
+		default:
 			$return = join( $args['separator'], $a );
 			break;
 	}
@@ -970,10 +1017,9 @@ function wp_generate_tag_cloud( $tags, $args = '' ) {
 		 * @param array        $args   An array of wp_generate_tag_cloud() arguments.
 		 */
 		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
-	}
-
-	else
+	} else {
 		return $return;
+	}
 }
 
 /**
@@ -1065,13 +1111,15 @@ function walk_category_dropdown_tree() {
  * @return string Link on success, empty string if tag does not exist.
  */
 function get_tag_link( $tag ) {
-	if ( ! is_object( $tag ) )
+	if ( ! is_object( $tag ) ) {
 		$tag = (int) $tag;
+	}
 
 	$tag = get_term_link( $tag, 'post_tag' );
 
-	if ( is_wp_error( $tag ) )
+	if ( is_wp_error( $tag ) ) {
 		return '';
+	}
 
 	return $tag;
 }
@@ -1135,8 +1183,9 @@ function get_the_tag_list( $before = '', $sep = '', $after = '', $id = 0 ) {
  * @param string $after Optional. After list.
  */
 function the_tags( $before = null, $sep = ', ', $after = '' ) {
-	if ( null === $before )
-		$before = __('Tags: ');
+	if ( null === $before ) {
+		$before = __( 'Tags: ' );
+	}
 
 	$the_tags = get_the_tag_list( $before, $sep, $after );
 
@@ -1171,7 +1220,7 @@ function term_description( $term = 0, $taxonomy = 'post_tag' ) {
 		$term = get_queried_object();
 		if ( $term ) {
 			$taxonomy = $term->taxonomy;
-			$term = $term->term_id;
+			$term     = $term->term_id;
 		}
 	}
 	$description = get_term_field( 'description', $term, $taxonomy );
@@ -1189,8 +1238,9 @@ function term_description( $term = 0, $taxonomy = 'post_tag' ) {
  *                              or the post does not exist, WP_Error on failure.
  */
 function get_the_terms( $post, $taxonomy ) {
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post( $post ) ) {
 		return false;
+	}
 
 	$terms = get_object_term_cache( $post->ID, $taxonomy );
 	if ( false === $terms ) {
@@ -1212,8 +1262,9 @@ function get_the_terms( $post, $taxonomy ) {
 	 */
 	$terms = apply_filters( 'get_the_terms', $terms, $post->ID, $taxonomy );
 
-	if ( empty( $terms ) )
+	if ( empty( $terms ) ) {
 		return false;
+	}
 
 	return $terms;
 }
@@ -1233,11 +1284,13 @@ function get_the_terms( $post, $taxonomy ) {
 function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
 	$terms = get_the_terms( $id, $taxonomy );
 
-	if ( is_wp_error( $terms ) )
+	if ( is_wp_error( $terms ) ) {
 		return $terms;
+	}
 
-	if ( empty( $terms ) )
+	if ( empty( $terms ) ) {
 		return false;
+	}
 
 	$links = array();
 
@@ -1344,8 +1397,9 @@ function get_term_parents_list( $term_id, $taxonomy, $args = array() ) {
 function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
 	$term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
 
-	if ( is_wp_error( $term_list ) )
+	if ( is_wp_error( $term_list ) ) {
 		return false;
+	}
 
 	/**
 	 * Filters the list of terms to display.
@@ -1410,14 +1464,16 @@ function has_tag( $tag = '', $post = null ) {
  * @return bool True if the current post has any of the given tags (or any tag, if no tag specified).
  */
 function has_term( $term = '', $taxonomy = '', $post = null ) {
-	$post = get_post($post);
+	$post = get_post( $post );
 
-	if ( !$post )
+	if ( ! $post ) {
 		return false;
+	}
 
 	$r = is_object_in_term( $post->ID, $taxonomy, $term );
-	if ( is_wp_error( $r ) )
+	if ( is_wp_error( $r ) ) {
 		return false;
+	}
 
 	return $r;
 }
diff --git a/wp-includes/category.php b/wp-includes/category.php
index 5b990d34b5..119aac84d8 100644
--- a/wp-includes/category.php
+++ b/wp-includes/category.php
@@ -25,7 +25,7 @@
  */
 function get_categories( $args = '' ) {
 	$defaults = array( 'taxonomy' => 'category' );
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 
 	$taxonomy = $args['taxonomy'];
 
@@ -40,10 +40,12 @@ function get_categories( $args = '' ) {
 	$taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args );
 
 	// Back compat
-	if ( isset($args['type']) && 'link' == $args['type'] ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+	if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+		_deprecated_argument(
+			__FUNCTION__, '3.0.0',
 			/* translators: 1: "type => link", 2: "taxonomy => link_category" */
-			sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+			sprintf(
+				__( '%1$s is deprecated. Use %2$s instead.' ),
 				'<code>type => link</code>',
 				'<code>taxonomy => link_category</code>'
 			)
@@ -91,8 +93,9 @@ function get_categories( $args = '' ) {
 function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
 	$category = get_term( $category, 'category', $output, $filter );
 
-	if ( is_wp_error( $category ) )
+	if ( is_wp_error( $category ) ) {
 		return $category;
+	}
 
 	_make_cat_compat( $category );
 
@@ -120,24 +123,29 @@ function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
  * @return WP_Term|array|WP_Error|null Type is based on $output value.
  */
 function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) {
-	$category_path = rawurlencode( urldecode( $category_path ) );
-	$category_path = str_replace( '%2F', '/', $category_path );
-	$category_path = str_replace( '%20', ' ', $category_path );
+	$category_path  = rawurlencode( urldecode( $category_path ) );
+	$category_path  = str_replace( '%2F', '/', $category_path );
+	$category_path  = str_replace( '%20', ' ', $category_path );
 	$category_paths = '/' . trim( $category_path, '/' );
-	$leaf_path  = sanitize_title( basename( $category_paths ) );
+	$leaf_path      = sanitize_title( basename( $category_paths ) );
 	$category_paths = explode( '/', $category_paths );
-	$full_path = '';
+	$full_path      = '';
 	foreach ( (array) $category_paths as $pathdir ) {
 		$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
 	}
-	$categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) );
+	$categories = get_terms(
+		'category', array(
+			'get'  => 'all',
+			'slug' => $leaf_path,
+		)
+	);
 
 	if ( empty( $categories ) ) {
 		return;
 	}
 
 	foreach ( $categories as $category ) {
-		$path = '/' . $leaf_path;
+		$path        = '/' . $leaf_path;
 		$curcategory = $category;
 		while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) {
 			$curcategory = get_term( $curcategory->parent, 'category' );
@@ -170,10 +178,11 @@ function get_category_by_path( $category_path, $full_match = true, $output = OBJ
  * @param string $slug The category slug.
  * @return object Category data object
  */
-function get_category_by_slug( $slug  ) {
+function get_category_by_slug( $slug ) {
 	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
+	if ( $category ) {
 		_make_cat_compat( $category );
+	}
 
 	return $category;
 }
@@ -188,8 +197,9 @@ function get_category_by_slug( $slug  ) {
  */
 function get_cat_ID( $cat_name ) {
 	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
+	if ( $cat ) {
 		return $cat->term_id;
+	}
 	return 0;
 }
 
@@ -202,10 +212,11 @@ function get_cat_ID( $cat_name ) {
  * @return string Category name, or an empty string if category doesn't exist.
  */
 function get_cat_name( $cat_id ) {
-	$cat_id = (int) $cat_id;
+	$cat_id   = (int) $cat_id;
 	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
+	if ( ! $category || is_wp_error( $category ) ) {
 		return '';
+	}
 	return $category->name;
 }
 
@@ -343,18 +354,18 @@ function clean_category_cache( $id ) {
  */
 function _make_cat_compat( &$category ) {
 	if ( is_object( $category ) && ! is_wp_error( $category ) ) {
-		$category->cat_ID = $category->term_id;
-		$category->category_count = $category->count;
+		$category->cat_ID               = $category->term_id;
+		$category->category_count       = $category->count;
 		$category->category_description = $category->description;
-		$category->cat_name = $category->name;
-		$category->category_nicename = $category->slug;
-		$category->category_parent = $category->parent;
+		$category->cat_name             = $category->name;
+		$category->category_nicename    = $category->slug;
+		$category->category_parent      = $category->parent;
 	} elseif ( is_array( $category ) && isset( $category['term_id'] ) ) {
-		$category['cat_ID'] = &$category['term_id'];
-		$category['category_count'] = &$category['count'];
+		$category['cat_ID']               = &$category['term_id'];
+		$category['category_count']       = &$category['count'];
 		$category['category_description'] = &$category['description'];
-		$category['cat_name'] = &$category['name'];
-		$category['category_nicename'] = &$category['slug'];
-		$category['category_parent'] = &$category['parent'];
+		$category['cat_name']             = &$category['name'];
+		$category['category_nicename']    = &$category['slug'];
+		$category['category_parent']      = &$category['parent'];
 	}
 }
diff --git a/wp-includes/class-feed.php b/wp-includes/class-feed.php
index 62dd1195df..8d174c66b4 100644
--- a/wp-includes/class-feed.php
+++ b/wp-includes/class-feed.php
@@ -15,4 +15,4 @@ if ( ! class_exists( 'SimplePie', false ) ) {
 require_once( ABSPATH . WPINC . '/class-wp-feed-cache.php' );
 require_once( ABSPATH . WPINC . '/class-wp-feed-cache-transient.php' );
 require_once( ABSPATH . WPINC . '/class-wp-simplepie-file.php' );
-require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' );
\ No newline at end of file
+require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' );
diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php
index abf14aa45c..bead194a4a 100644
--- a/wp-includes/class-http.php
+++ b/wp-includes/class-http.php
@@ -28,30 +28,30 @@ if ( ! class_exists( 'Requests' ) ) {
 class WP_Http {
 
 	// Aliases for HTTP response codes.
-	const HTTP_CONTINUE                   = 100;
-	const SWITCHING_PROTOCOLS             = 101;
-	const PROCESSING                      = 102;
-	const EARLY_HINTS                     = 103;
+	const HTTP_CONTINUE       = 100;
+	const SWITCHING_PROTOCOLS = 101;
+	const PROCESSING          = 102;
+	const EARLY_HINTS         = 103;
 
-	const OK                              = 200;
-	const CREATED                         = 201;
-	const ACCEPTED                        = 202;
-	const NON_AUTHORITATIVE_INFORMATION   = 203;
-	const NO_CONTENT                      = 204;
-	const RESET_CONTENT                   = 205;
-	const PARTIAL_CONTENT                 = 206;
-	const MULTI_STATUS                    = 207;
-	const IM_USED                         = 226;
+	const OK                            = 200;
+	const CREATED                       = 201;
+	const ACCEPTED                      = 202;
+	const NON_AUTHORITATIVE_INFORMATION = 203;
+	const NO_CONTENT                    = 204;
+	const RESET_CONTENT                 = 205;
+	const PARTIAL_CONTENT               = 206;
+	const MULTI_STATUS                  = 207;
+	const IM_USED                       = 226;
 
-	const MULTIPLE_CHOICES                = 300;
-	const MOVED_PERMANENTLY               = 301;
-	const FOUND                           = 302;
-	const SEE_OTHER                       = 303;
-	const NOT_MODIFIED                    = 304;
-	const USE_PROXY                       = 305;
-	const RESERVED                        = 306;
-	const TEMPORARY_REDIRECT              = 307;
-	const PERMANENT_REDIRECT              = 308;
+	const MULTIPLE_CHOICES   = 300;
+	const MOVED_PERMANENTLY  = 301;
+	const FOUND              = 302;
+	const SEE_OTHER          = 303;
+	const NOT_MODIFIED       = 304;
+	const USE_PROXY          = 305;
+	const RESERVED           = 306;
+	const TEMPORARY_REDIRECT = 307;
+	const PERMANENT_REDIRECT = 308;
 
 	const BAD_REQUEST                     = 400;
 	const UNAUTHORIZED                    = 401;
@@ -147,7 +147,7 @@ class WP_Http {
 	 */
 	public function request( $url, $args = array() ) {
 		$defaults = array(
-			'method' => 'GET',
+			'method'              => 'GET',
 			/**
 			 * Filters the timeout value for an HTTP request.
 			 *
@@ -156,7 +156,7 @@ class WP_Http {
 			 * @param int $timeout_value Time in seconds until a request times out.
 			 *                           Default 5.
 			 */
-			'timeout' => apply_filters( 'http_request_timeout', 5 ),
+			'timeout'             => apply_filters( 'http_request_timeout', 5 ),
 			/**
 			 * Filters the number of redirects allowed during an HTTP request.
 			 *
@@ -164,7 +164,7 @@ class WP_Http {
 			 *
 			 * @param int $redirect_count Number of redirects allowed. Default 5.
 			 */
-			'redirection' => apply_filters( 'http_request_redirection_count', 5 ),
+			'redirection'         => apply_filters( 'http_request_redirection_count', 5 ),
 			/**
 			 * Filters the version of the HTTP protocol used in a request.
 			 *
@@ -173,7 +173,7 @@ class WP_Http {
 			 * @param string $version Version of HTTP used. Accepts '1.0' and '1.1'.
 			 *                        Default '1.0'.
 			 */
-			'httpversion' => apply_filters( 'http_request_version', '1.0' ),
+			'httpversion'         => apply_filters( 'http_request_version', '1.0' ),
 			/**
 			 * Filters the user agent value sent with an HTTP request.
 			 *
@@ -181,7 +181,7 @@ class WP_Http {
 			 *
 			 * @param string $user_agent WordPress user agent string.
 			 */
-			'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) ),
+			'user-agent'          => apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) ),
 			/**
 			 * Filters whether to pass URLs through wp_http_validate_url() in an HTTP request.
 			 *
@@ -190,17 +190,17 @@ class WP_Http {
 			 * @param bool $pass_url Whether to pass URLs through wp_http_validate_url().
 			 *                       Default false.
 			 */
-			'reject_unsafe_urls' => apply_filters( 'http_request_reject_unsafe_urls', false ),
-			'blocking' => true,
-			'headers' => array(),
-			'cookies' => array(),
-			'body' => null,
-			'compress' => false,
-			'decompress' => true,
-			'sslverify' => true,
-			'sslcertificates' => ABSPATH . WPINC . '/certificates/ca-bundle.crt',
-			'stream' => false,
-			'filename' => null,
+			'reject_unsafe_urls'  => apply_filters( 'http_request_reject_unsafe_urls', false ),
+			'blocking'            => true,
+			'headers'             => array(),
+			'cookies'             => array(),
+			'body'                => null,
+			'compress'            => false,
+			'decompress'          => true,
+			'sslverify'           => true,
+			'sslcertificates'     => ABSPATH . WPINC . '/certificates/ca-bundle.crt',
+			'stream'              => false,
+			'filename'            => null,
 			'limit_response_size' => null,
 		);
 
@@ -208,8 +208,9 @@ class WP_Http {
 		$args = wp_parse_args( $args );
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
+		if ( isset( $args['method'] ) && 'HEAD' == $args['method'] ) {
 			$defaults['redirection'] = 0;
+		}
 
 		$r = wp_parse_args( $args, $defaults );
 		/**
@@ -223,8 +224,9 @@ class WP_Http {
 		$r = apply_filters( 'http_request_args', $r, $url );
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
+		if ( ! isset( $r['_redirection'] ) ) {
 			$r['_redirection'] = $r['redirection'];
+		}
 
 		/**
 		 * Filters whether to preempt an HTTP request's return value.
@@ -246,8 +248,9 @@ class WP_Http {
 		 */
 		$pre = apply_filters( 'pre_http_request', false, $r, $url );
 
-		if ( false !== $pre )
+		if ( false !== $pre ) {
 			return $pre;
+		}
 
 		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
 			if ( $r['reject_unsafe_urls'] ) {
@@ -261,7 +264,7 @@ class WP_Http {
 		$arrURL = @parse_url( $url );
 
 		if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
-			return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
+			return new WP_Error( 'http_request_failed', __( 'A valid URL was not provided.' ) );
 		}
 
 		if ( $this->block_request( $url ) ) {
@@ -289,18 +292,18 @@ class WP_Http {
 		// WP allows passing in headers as a string, weirdly.
 		if ( ! is_array( $r['headers'] ) ) {
 			$processedHeaders = WP_Http::processHeaders( $r['headers'] );
-			$r['headers'] = $processedHeaders['headers'];
+			$r['headers']     = $processedHeaders['headers'];
 		}
 
 		// Setup arguments
 		$headers = $r['headers'];
-		$data = $r['body'];
-		$type = $r['method'];
+		$data    = $r['body'];
+		$type    = $r['method'];
 		$options = array(
-			'timeout' => $r['timeout'],
+			'timeout'   => $r['timeout'],
 			'useragent' => $r['user-agent'],
-			'blocking' => $r['blocking'],
-			'hooks' => new WP_HTTP_Requests_Hooks( $url, $r ),
+			'blocking'  => $r['blocking'],
+			'hooks'     => new WP_HTTP_Requests_Hooks( $url, $r ),
 		);
 
 		// Ensure redirects follow browser behaviour.
@@ -332,7 +335,7 @@ class WP_Http {
 
 		// SSL certificate handling
 		if ( ! $r['sslverify'] ) {
-			$options['verify'] = false;
+			$options['verify']     = false;
 			$options['verifyname'] = false;
 		} else {
 			$options['verify'] = $r['sslcertificates'];
@@ -359,8 +362,8 @@ class WP_Http {
 
 			if ( $proxy->use_authentication() ) {
 				$options['proxy']->use_authentication = true;
-				$options['proxy']->user = $proxy->username();
-				$options['proxy']->pass = $proxy->password();
+				$options['proxy']->user               = $proxy->username();
+				$options['proxy']->pass               = $proxy->password();
 			}
 		}
 
@@ -372,12 +375,11 @@ class WP_Http {
 
 			// Convert the response into an array
 			$http_response = new WP_HTTP_Requests_Response( $requests_response, $r['filename'] );
-			$response = $http_response->to_array();
+			$response      = $http_response->to_array();
 
 			// Add the original object to the array.
 			$response['http_response'] = $http_response;
-		}
-		catch ( Requests_Exception $e ) {
+		} catch ( Requests_Exception $e ) {
 			$response = new WP_Error( 'http_request_failed', $e->getMessage() );
 		}
 
@@ -401,13 +403,13 @@ class WP_Http {
 
 		if ( ! $r['blocking'] ) {
 			return array(
-				'headers' => array(),
-				'body' => '',
-				'response' => array(
-					'code' => false,
+				'headers'       => array(),
+				'body'          => '',
+				'response'      => array(
+					'code'    => false,
 					'message' => false,
 				),
-				'cookies' => array(),
+				'cookies'       => array(),
 				'http_response' => null,
 			);
 		}
@@ -480,7 +482,7 @@ class WP_Http {
 	 */
 	public static function validate_redirects( $location ) {
 		if ( ! wp_http_validate_url( $location ) ) {
-			throw new Requests_Exception( __('A valid URL was not provided.'), 'wp_http.redirect_failed_validation' );
+			throw new Requests_Exception( __( 'A valid URL was not provided.' ), 'wp_http.redirect_failed_validation' );
 		}
 	}
 
@@ -517,8 +519,9 @@ class WP_Http {
 			$class = 'WP_Http_' . $transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
+			if ( ! call_user_func( array( $class, 'test' ), $args, $url ) ) {
 				continue;
+			}
 
 			return $class;
 		}
@@ -546,20 +549,23 @@ class WP_Http {
 		static $transports = array();
 
 		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
+		if ( ! $class ) {
 			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		}
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
-			$transports[$class] = new $class;
+		if ( empty( $transports[ $class ] ) ) {
+			$transports[ $class ] = new $class;
+		}
 
-		$response = $transports[$class]->request( $url, $args );
+		$response = $transports[ $class ]->request( $url, $args );
 
 		/** This action is documented in wp-includes/class-http.php */
 		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
 
-		if ( is_wp_error( $response ) )
+		if ( is_wp_error( $response ) ) {
 			return $response;
+		}
 
 		/**
 		 * Filters the HTTP API response immediately before the response is returned.
@@ -584,10 +590,10 @@ class WP_Http {
 	 * @param string|array $args Optional. Override the defaults.
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	public function post($url, $args = array()) {
-		$defaults = array('method' => 'POST');
-		$r = wp_parse_args( $args, $defaults );
-		return $this->request($url, $r);
+	public function post( $url, $args = array() ) {
+		$defaults = array( 'method' => 'POST' );
+		$r        = wp_parse_args( $args, $defaults );
+		return $this->request( $url, $r );
 	}
 
 	/**
@@ -601,10 +607,10 @@ class WP_Http {
 	 * @param string|array $args Optional. Override the defaults.
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	public function get($url, $args = array()) {
-		$defaults = array('method' => 'GET');
-		$r = wp_parse_args( $args, $defaults );
-		return $this->request($url, $r);
+	public function get( $url, $args = array() ) {
+		$defaults = array( 'method' => 'GET' );
+		$r        = wp_parse_args( $args, $defaults );
+		return $this->request( $url, $r );
 	}
 
 	/**
@@ -618,10 +624,10 @@ class WP_Http {
 	 * @param string|array $args Optional. Override the defaults.
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	public function head($url, $args = array()) {
-		$defaults = array('method' => 'HEAD');
-		$r = wp_parse_args( $args, $defaults );
-		return $this->request($url, $r);
+	public function head( $url, $args = array() ) {
+		$defaults = array( 'method' => 'HEAD' );
+		$r        = wp_parse_args( $args, $defaults );
+		return $this->request( $url, $r );
 	}
 
 	/**
@@ -633,10 +639,13 @@ class WP_Http {
 	 * @param string $strResponse The full response string
 	 * @return array Array with 'headers' and 'body' keys.
 	 */
-	public static function processResponse($strResponse) {
-		$res = explode("\r\n\r\n", $strResponse, 2);
+	public static function processResponse( $strResponse ) {
+		$res = explode( "\r\n\r\n", $strResponse, 2 );
 
-		return array('headers' => $res[0], 'body' => isset($res[1]) ? $res[1] : '');
+		return array(
+			'headers' => $res[0],
+			'body'    => isset( $res[1] ) ? $res[1] : '',
+		);
 	}
 
 	/**
@@ -651,68 +660,78 @@ class WP_Http {
 	 * @param string|array $headers
 	 * @param string $url The URL that was requested
 	 * @return array Processed string headers. If duplicate headers are encountered,
-	 * 					Then a numbered array is returned as the value of that header-key.
+	 *                  Then a numbered array is returned as the value of that header-key.
 	 */
 	public static function processHeaders( $headers, $url = '' ) {
 		// Split headers, one per array element.
-		if ( is_string($headers) ) {
+		if ( is_string( $headers ) ) {
 			// Tolerate line terminator: CRLF = LF (RFC 2616 19.3).
-			$headers = str_replace("\r\n", "\n", $headers);
+			$headers = str_replace( "\r\n", "\n", $headers );
 			/*
 			 * Unfold folded header fields. LWS = [CRLF] 1*( SP | HT ) <US-ASCII SP, space (32)>,
 			 * <US-ASCII HT, horizontal-tab (9)> (RFC 2616 2.2).
 			 */
-			$headers = preg_replace('/\n[ \t]/', ' ', $headers);
+			$headers = preg_replace( '/\n[ \t]/', ' ', $headers );
 			// Create the headers array.
-			$headers = explode("\n", $headers);
+			$headers = explode( "\n", $headers );
 		}
 
-		$response = array('code' => 0, 'message' => '');
+		$response = array(
+			'code'    => 0,
+			'message' => '',
+		);
 
 		/*
 		 * If a redirection has taken place, The headers for each page request may have been passed.
 		 * In this case, determine the final HTTP header and parse from there.
 		 */
-		for ( $i = count($headers)-1; $i >= 0; $i-- ) {
-			if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
-				$headers = array_splice($headers, $i);
+		for ( $i = count( $headers ) - 1; $i >= 0; $i-- ) {
+			if ( ! empty( $headers[ $i ] ) && false === strpos( $headers[ $i ], ':' ) ) {
+				$headers = array_splice( $headers, $i );
 				break;
 			}
 		}
 
-		$cookies = array();
+		$cookies    = array();
 		$newheaders = array();
 		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
+			if ( empty( $tempheader ) ) {
 				continue;
+			}
 
-			if ( false === strpos($tempheader, ':') ) {
-				$stack = explode(' ', $tempheader, 3);
+			if ( false === strpos( $tempheader, ':' ) ) {
+				$stack   = explode( ' ', $tempheader, 3 );
 				$stack[] = '';
 				list( , $response['code'], $response['message']) = $stack;
 				continue;
 			}
 
-			list($key, $value) = explode(':', $tempheader, 2);
+			list($key, $value) = explode( ':', $tempheader, 2 );
 
-			$key = strtolower( $key );
+			$key   = strtolower( $key );
 			$value = trim( $value );
 
 			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
+				if ( ! is_array( $newheaders[ $key ] ) ) {
+					$newheaders[ $key ] = array( $newheaders[ $key ] );
+				}
 				$newheaders[ $key ][] = $value;
 			} else {
 				$newheaders[ $key ] = $value;
 			}
-			if ( 'set-cookie' == $key )
+			if ( 'set-cookie' == $key ) {
 				$cookies[] = new WP_Http_Cookie( $value, $url );
+			}
 		}
 
 		// Cast the Response Code to an int
 		$response['code'] = intval( $response['code'] );
 
-		return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);
+		return array(
+			'response' => $response,
+			'headers'  => $newheaders,
+			'cookies'  => $cookies,
+		);
 	}
 
 	/**
@@ -728,11 +747,17 @@ class WP_Http {
 	 * @param array $r Full array of args passed into ::request()
 	 */
 	public static function buildCookieHeader( &$r ) {
-		if ( ! empty($r['cookies']) ) {
+		if ( ! empty( $r['cookies'] ) ) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
 			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+				if ( ! is_object( $value ) ) {
+					$r['cookies'][ $name ] = new WP_Http_Cookie(
+						array(
+							'name'  => $name,
+							'value' => $value,
+						)
+					);
+				}
 			}
 
 			$cookies_header = '';
@@ -740,7 +765,7 @@ class WP_Http {
 				$cookies_header .= $cookie->getHeaderValue() . '; ';
 			}
 
-			$cookies_header = substr( $cookies_header, 0, -2 );
+			$cookies_header         = substr( $cookies_header, 0, -2 );
 			$r['headers']['cookie'] = $cookies_header;
 		}
 	}
@@ -760,8 +785,9 @@ class WP_Http {
 	 */
 	public static function chunkTransferDecode( $body ) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
+		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) ) {
 			return $body;
+		}
 
 		$parsed_body = '';
 
@@ -770,10 +796,11 @@ class WP_Http {
 
 		while ( true ) {
 			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
+			if ( ! $has_chunk || empty( $match[1] ) ) {
 				return $body_original;
+			}
 
-			$length = hexdec( $match[1] );
+			$length       = hexdec( $match[1] );
 			$chunk_length = strlen( $match[0] );
 
 			// Parse out the chunk of data.
@@ -783,8 +810,9 @@ class WP_Http {
 			$body = substr( $body, $length + $chunk_length );
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
+			if ( '0' === trim( $body ) ) {
 				return $parsed_body;
+			}
 		}
 	}
 
@@ -810,16 +838,18 @@ class WP_Http {
 	 * @param string $uri URI of url.
 	 * @return bool True to block, false to allow.
 	 */
-	public function block_request($uri) {
+	public function block_request( $uri ) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
+		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) {
 			return false;
+		}
 
-		$check = parse_url($uri);
-		if ( ! $check )
+		$check = parse_url( $uri );
+		if ( ! $check ) {
 			return true;
+		}
 
-		$home = parse_url( get_option('siteurl') );
+		$home = parse_url( get_option( 'siteurl' ) );
 
 		// Don't block requests back to ourselves by default.
 		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
@@ -834,26 +864,29 @@ class WP_Http {
 			return apply_filters( 'block_local_requests', false );
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
+		if ( ! defined( 'WP_ACCESSIBLE_HOSTS' ) ) {
 			return true;
+		}
 
 		static $accessible_hosts = null;
-		static $wildcard_regex = array();
+		static $wildcard_regex   = array();
 		if ( null === $accessible_hosts ) {
-			$accessible_hosts = preg_split('|,\s*|', WP_ACCESSIBLE_HOSTS);
+			$accessible_hosts = preg_split( '|,\s*|', WP_ACCESSIBLE_HOSTS );
 
-			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
+			if ( false !== strpos( WP_ACCESSIBLE_HOSTS, '*' ) ) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
+				foreach ( $accessible_hosts as $host ) {
 					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
+				}
+				$wildcard_regex = '/^(' . implode( '|', $wildcard_regex ) . ')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
-		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+		if ( ! empty( $wildcard_regex ) ) {
+			return ! preg_match( $wildcard_regex, $check['host'] );
+		} else {
+			return ! in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+		}
 
 	}
 
@@ -886,8 +919,9 @@ class WP_Http {
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
 	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
+		if ( empty( $url ) ) {
 			return $maybe_relative_path;
+		}
 
 		if ( ! $url_parts = wp_parse_url( $url ) ) {
 			return $maybe_relative_path;
@@ -907,12 +941,14 @@ class WP_Http {
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
 		if ( isset( $relative_url_parts['host'] ) ) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
+			if ( isset( $relative_url_parts['port'] ) ) {
 				$absolute_path .= ':' . $relative_url_parts['port'];
+			}
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
+			if ( isset( $url_parts['port'] ) ) {
 				$absolute_path .= ':' . $url_parts['port'];
+			}
 		}
 
 		// Start off with the Absolute URL path.
@@ -922,7 +958,7 @@ class WP_Http {
 		if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) {
 			$path = $relative_url_parts['path'];
 
-		// Else it's a relative path.
+			// Else it's a relative path.
 		} elseif ( ! empty( $relative_url_parts['path'] ) ) {
 			// Strip off any file components from the absolute path.
 			$path = substr( $path, 0, strrpos( $path, '/' ) + 1 );
@@ -940,8 +976,9 @@ class WP_Http {
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
+		if ( ! empty( $relative_url_parts['query'] ) ) {
 			$path .= '?' . $relative_url_parts['query'];
+		}
 
 		return $absolute_path . '/' . ltrim( $path, '/' );
 	}
@@ -959,36 +996,42 @@ class WP_Http {
 	 */
 	public static function handle_redirects( $url, $args, $response ) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] ) {
 			return false;
+		}
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 ) {
 			return false;
+		}
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ( $args['redirection']-- <= 0 ) {
+			return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+		}
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
+		if ( is_array( $redirect_location ) ) {
 			$redirect_location = array_pop( $redirect_location );
+		}
 
 		$redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
 
 		// POST requests should not POST to a redirected location.
 		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+			if ( in_array( $response['response']['code'], array( 302, 303 ) ) ) {
 				$args['method'] = 'GET';
+			}
 		}
 
 		// Include valid cookies in the redirect process.
 		if ( ! empty( $response['cookies'] ) ) {
 			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
+				if ( $cookie->test( $redirect_location ) ) {
 					$args['cookies'][] = $cookie;
+				}
 			}
 		}
 
@@ -1012,11 +1055,13 @@ class WP_Http {
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
 	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
+		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) {
 			return 4;
+		}
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
+		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
 			return 6;
+		}
 
 		return false;
 	}
diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php
index dc61ec8960..e9e885de71 100644
--- a/wp-includes/class-oembed.php
+++ b/wp-includes/class-oembed.php
@@ -49,74 +49,74 @@ class WP_oEmbed {
 	 * @since 2.9.0
 	 */
 	public function __construct() {
-		$host = urlencode( home_url() );
+		$host      = urlencode( home_url() );
 		$providers = array(
-			'#https?://((m|www)\.)?youtube\.com/watch.*#i'                        => array( 'https://www.youtube.com/oembed',                        true  ),
-			'#https?://((m|www)\.)?youtube\.com/playlist.*#i'                     => array( 'https://www.youtube.com/oembed',                        true  ),
-			'#https?://youtu\.be/.*#i'                                            => array( 'https://www.youtube.com/oembed',                        true  ),
-			'#https?://(.+\.)?vimeo\.com/.*#i'                                    => array( 'https://vimeo.com/api/oembed.{format}',                 true  ),
-			'#https?://(www\.)?dailymotion\.com/.*#i'                             => array( 'https://www.dailymotion.com/services/oembed',           true  ),
-			'#https?://dai\.ly/.*#i'                                              => array( 'https://www.dailymotion.com/services/oembed',           true  ),
-			'#https?://(www\.)?flickr\.com/.*#i'                                  => array( 'https://www.flickr.com/services/oembed/',               true  ),
-			'#https?://flic\.kr/.*#i'                                             => array( 'https://www.flickr.com/services/oembed/',               true  ),
-			'#https?://(.+\.)?smugmug\.com/.*#i'                                  => array( 'https://api.smugmug.com/services/oembed/',              true  ),
-			'#https?://(www\.)?hulu\.com/watch/.*#i'                              => array( 'http://www.hulu.com/api/oembed.{format}',               true  ),
-			'http://i*.photobucket.com/albums/*'                                  => array( 'http://api.photobucket.com/oembed',                     false ),
-			'http://gi*.photobucket.com/groups/*'                                 => array( 'http://api.photobucket.com/oembed',                     false ),
-			'#https?://(www\.)?scribd\.com/doc/.*#i'                              => array( 'https://www.scribd.com/services/oembed',                true  ),
-			'#https?://wordpress\.tv/.*#i'                                        => array( 'https://wordpress.tv/oembed/',                          true  ),
-			'#https?://(.+\.)?polldaddy\.com/.*#i'                                => array( 'https://polldaddy.com/oembed/',                         true  ),
-			'#https?://poll\.fm/.*#i'                                             => array( 'https://polldaddy.com/oembed/',                         true  ),
-			'#https?://(www\.)?funnyordie\.com/videos/.*#i'                       => array( 'http://www.funnyordie.com/oembed',                      true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/status(es)?/.*#i'            => array( 'https://publish.twitter.com/oembed',                    true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}$#i'                          => array( 'https://publish.twitter.com/oembed',                    true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/likes$#i'                    => array( 'https://publish.twitter.com/oembed',                    true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/lists/.*#i'                  => array( 'https://publish.twitter.com/oembed',                    true  ),
-			'#https?://(www\.)?twitter\.com/\w{1,15}/timelines/.*#i'              => array( 'https://publish.twitter.com/oembed',                    true  ),
-			'#https?://(www\.)?twitter\.com/i/moments/.*#i'                       => array( 'https://publish.twitter.com/oembed',                    true  ),
-			'#https?://(www\.)?soundcloud\.com/.*#i'                              => array( 'https://soundcloud.com/oembed',                         true  ),
-			'#https?://(.+?\.)?slideshare\.net/.*#i'                              => array( 'https://www.slideshare.net/api/oembed/2',               true  ),
-			'#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i'                      => array( 'https://api.instagram.com/oembed',                      true  ),
-			'#https?://(open|play)\.spotify\.com/.*#i'                            => array( 'https://embed.spotify.com/oembed/',                     true  ),
-			'#https?://(.+\.)?imgur\.com/.*#i'                                    => array( 'https://api.imgur.com/oembed',                          true  ),
-			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'                           => array( 'https://api.meetup.com/oembed',                         true  ),
-			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'                           => array( 'https://issuu.com/oembed_wp',                           true  ),
-			'#https?://(www\.)?collegehumor\.com/video/.*#i'                      => array( 'https://www.collegehumor.com/oembed.{format}',          true  ),
-			'#https?://(www\.)?mixcloud\.com/.*#i'                                => array( 'https://www.mixcloud.com/oembed',                       true  ),
-			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'                       => array( 'https://www.ted.com/services/v1/oembed.{format}',       true  ),
-			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i'                 => array( 'https://animoto.com/oembeds/create',                    true  ),
-			'#https?://(.+)\.tumblr\.com/post/.*#i'                               => array( 'https://www.tumblr.com/oembed/1.0',                     true  ),
-			'#https?://(www\.)?kickstarter\.com/projects/.*#i'                    => array( 'https://www.kickstarter.com/services/oembed',           true  ),
-			'#https?://kck\.st/.*#i'                                              => array( 'https://www.kickstarter.com/services/oembed',           true  ),
-			'#https?://cloudup\.com/.*#i'                                         => array( 'https://cloudup.com/oembed',                            true  ),
-			'#https?://(www\.)?reverbnation\.com/.*#i'                            => array( 'https://www.reverbnation.com/oembed',                   true  ),
-			'#https?://videopress\.com/v/.*#'                                     => array( 'https://public-api.wordpress.com/oembed/?for=' . $host, true  ),
-			'#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i'                 => array( 'https://www.reddit.com/oembed',                         true  ),
-			'#https?://(www\.)?speakerdeck\.com/.*#i'                             => array( 'https://speakerdeck.com/oembed.{format}',               true  ),
-			'#https?://www\.facebook\.com/.*/posts/.*#i'                          => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/.*/activity/.*#i'                       => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/.*/photos/.*#i'                         => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/photo(s/|\.php).*#i'                    => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/permalink\.php.*#i'                     => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/media/.*#i'                             => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/questions/.*#i'                         => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/notes/.*#i'                             => array( 'https://www.facebook.com/plugins/post/oembed.json/',    true  ),
-			'#https?://www\.facebook\.com/.*/videos/.*#i'                         => array( 'https://www.facebook.com/plugins/video/oembed.json/',   true  ),
-			'#https?://www\.facebook\.com/video\.php.*#i'                         => array( 'https://www.facebook.com/plugins/video/oembed.json/',   true  ),
-			'#https?://(www\.)?screencast\.com/.*#i'                              => array( 'https://api.screencast.com/external/oembed',            true  ),
-			'#https?://([a-z0-9-]+\.)?amazon\.(com|com\.mx|com\.br|ca)/.*#i'      => array( 'https://read.amazon.com/kp/api/oembed',                 true  ),
-			'#https?://([a-z0-9-]+\.)?amazon\.(co\.uk|de|fr|it|es|in|nl|ru)/.*#i' => array( 'https://read.amazon.co.uk/kp/api/oembed',               true  ),
-			'#https?://([a-z0-9-]+\.)?amazon\.(co\.jp|com\.au)/.*#i'              => array( 'https://read.amazon.com.au/kp/api/oembed',              true  ),
-			'#https?://([a-z0-9-]+\.)?amazon\.cn/.*#i'                            => array( 'https://read.amazon.cn/kp/api/oembed',                  true  ),
-			'#https?://(www\.)?a\.co/.*#i'                                        => array( 'https://read.amazon.com/kp/api/oembed',                 true  ),
-			'#https?://(www\.)?amzn\.to/.*#i'                                     => array( 'https://read.amazon.com/kp/api/oembed',                 true  ),
-			'#https?://(www\.)?amzn\.eu/.*#i'                                     => array( 'https://read.amazon.co.uk/kp/api/oembed',               true  ),
-			'#https?://(www\.)?amzn\.in/.*#i'                                     => array( 'https://read.amazon.in/kp/api/oembed',                  true  ),
-			'#https?://(www\.)?amzn\.asia/.*#i'                                   => array( 'https://read.amazon.com.au/kp/api/oembed',              true  ),
-			'#https?://(www\.)?z\.cn/.*#i'                                        => array( 'https://read.amazon.cn/kp/api/oembed',                  true  ),
-			'#https?://www\.someecards\.com/.+-cards/.+#i'                        => array( 'https://www.someecards.com/v2/oembed/',                 true  ),
-			'#https?://www\.someecards\.com/usercards/viewcard/.+#i'              => array( 'https://www.someecards.com/v2/oembed/',                 true  ),
-			'#https?://some\.ly\/.+#i'                                            => array( 'https://www.someecards.com/v2/oembed/',                 true  ),
+			'#https?://((m|www)\.)?youtube\.com/watch.*#i' => array( 'https://www.youtube.com/oembed', true ),
+			'#https?://((m|www)\.)?youtube\.com/playlist.*#i' => array( 'https://www.youtube.com/oembed', true ),
+			'#https?://youtu\.be/.*#i'                     => array( 'https://www.youtube.com/oembed', true ),
+			'#https?://(.+\.)?vimeo\.com/.*#i'             => array( 'https://vimeo.com/api/oembed.{format}', true ),
+			'#https?://(www\.)?dailymotion\.com/.*#i'      => array( 'https://www.dailymotion.com/services/oembed', true ),
+			'#https?://dai\.ly/.*#i'                       => array( 'https://www.dailymotion.com/services/oembed', true ),
+			'#https?://(www\.)?flickr\.com/.*#i'           => array( 'https://www.flickr.com/services/oembed/', true ),
+			'#https?://flic\.kr/.*#i'                      => array( 'https://www.flickr.com/services/oembed/', true ),
+			'#https?://(.+\.)?smugmug\.com/.*#i'           => array( 'https://api.smugmug.com/services/oembed/', true ),
+			'#https?://(www\.)?hulu\.com/watch/.*#i'       => array( 'http://www.hulu.com/api/oembed.{format}', true ),
+			'http://i*.photobucket.com/albums/*'           => array( 'http://api.photobucket.com/oembed', false ),
+			'http://gi*.photobucket.com/groups/*'          => array( 'http://api.photobucket.com/oembed', false ),
+			'#https?://(www\.)?scribd\.com/doc/.*#i'       => array( 'https://www.scribd.com/services/oembed', true ),
+			'#https?://wordpress\.tv/.*#i'                 => array( 'https://wordpress.tv/oembed/', true ),
+			'#https?://(.+\.)?polldaddy\.com/.*#i'         => array( 'https://polldaddy.com/oembed/', true ),
+			'#https?://poll\.fm/.*#i'                      => array( 'https://polldaddy.com/oembed/', true ),
+			'#https?://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed', true ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}$#i'   => array( 'https://publish.twitter.com/oembed', true ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/likes$#i' => array( 'https://publish.twitter.com/oembed', true ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/lists/.*#i' => array( 'https://publish.twitter.com/oembed', true ),
+			'#https?://(www\.)?twitter\.com/\w{1,15}/timelines/.*#i' => array( 'https://publish.twitter.com/oembed', true ),
+			'#https?://(www\.)?twitter\.com/i/moments/.*#i' => array( 'https://publish.twitter.com/oembed', true ),
+			'#https?://(www\.)?soundcloud\.com/.*#i'       => array( 'https://soundcloud.com/oembed', true ),
+			'#https?://(.+?\.)?slideshare\.net/.*#i'       => array( 'https://www.slideshare.net/api/oembed/2', true ),
+			'#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i' => array( 'https://api.instagram.com/oembed', true ),
+			'#https?://(open|play)\.spotify\.com/.*#i'     => array( 'https://embed.spotify.com/oembed/', true ),
+			'#https?://(.+\.)?imgur\.com/.*#i'             => array( 'https://api.imgur.com/oembed', true ),
+			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'    => array( 'https://api.meetup.com/oembed', true ),
+			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'    => array( 'https://issuu.com/oembed_wp', true ),
+			'#https?://(www\.)?collegehumor\.com/video/.*#i' => array( 'https://www.collegehumor.com/oembed.{format}', true ),
+			'#https?://(www\.)?mixcloud\.com/.*#i'         => array( 'https://www.mixcloud.com/oembed', true ),
+			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i' => array( 'https://www.ted.com/services/v1/oembed.{format}', true ),
+			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'https://animoto.com/oembeds/create', true ),
+			'#https?://(.+)\.tumblr\.com/post/.*#i'        => array( 'https://www.tumblr.com/oembed/1.0', true ),
+			'#https?://(www\.)?kickstarter\.com/projects/.*#i' => array( 'https://www.kickstarter.com/services/oembed', true ),
+			'#https?://kck\.st/.*#i'                       => array( 'https://www.kickstarter.com/services/oembed', true ),
+			'#https?://cloudup\.com/.*#i'                  => array( 'https://cloudup.com/oembed', true ),
+			'#https?://(www\.)?reverbnation\.com/.*#i'     => array( 'https://www.reverbnation.com/oembed', true ),
+			'#https?://videopress\.com/v/.*#'              => array( 'https://public-api.wordpress.com/oembed/?for=' . $host, true ),
+			'#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i' => array( 'https://www.reddit.com/oembed', true ),
+			'#https?://(www\.)?speakerdeck\.com/.*#i'      => array( 'https://speakerdeck.com/oembed.{format}', true ),
+			'#https?://www\.facebook\.com/.*/posts/.*#i'   => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/.*/activity/.*#i' => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/.*/photos/.*#i'  => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/photo(s/|\.php).*#i' => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/permalink\.php.*#i' => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/media/.*#i'      => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/questions/.*#i'  => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/notes/.*#i'      => array( 'https://www.facebook.com/plugins/post/oembed.json/', true ),
+			'#https?://www\.facebook\.com/.*/videos/.*#i'  => array( 'https://www.facebook.com/plugins/video/oembed.json/', true ),
+			'#https?://www\.facebook\.com/video\.php.*#i'  => array( 'https://www.facebook.com/plugins/video/oembed.json/', true ),
+			'#https?://(www\.)?screencast\.com/.*#i'       => array( 'https://api.screencast.com/external/oembed', true ),
+			'#https?://([a-z0-9-]+\.)?amazon\.(com|com\.mx|com\.br|ca)/.*#i' => array( 'https://read.amazon.com/kp/api/oembed', true ),
+			'#https?://([a-z0-9-]+\.)?amazon\.(co\.uk|de|fr|it|es|in|nl|ru)/.*#i' => array( 'https://read.amazon.co.uk/kp/api/oembed', true ),
+			'#https?://([a-z0-9-]+\.)?amazon\.(co\.jp|com\.au)/.*#i' => array( 'https://read.amazon.com.au/kp/api/oembed', true ),
+			'#https?://([a-z0-9-]+\.)?amazon\.cn/.*#i'     => array( 'https://read.amazon.cn/kp/api/oembed', true ),
+			'#https?://(www\.)?a\.co/.*#i'                 => array( 'https://read.amazon.com/kp/api/oembed', true ),
+			'#https?://(www\.)?amzn\.to/.*#i'              => array( 'https://read.amazon.com/kp/api/oembed', true ),
+			'#https?://(www\.)?amzn\.eu/.*#i'              => array( 'https://read.amazon.co.uk/kp/api/oembed', true ),
+			'#https?://(www\.)?amzn\.in/.*#i'              => array( 'https://read.amazon.in/kp/api/oembed', true ),
+			'#https?://(www\.)?amzn\.asia/.*#i'            => array( 'https://read.amazon.com.au/kp/api/oembed', true ),
+			'#https?://(www\.)?z\.cn/.*#i'                 => array( 'https://read.amazon.cn/kp/api/oembed', true ),
+			'#https?://www\.someecards\.com/.+-cards/.+#i' => array( 'https://www.someecards.com/v2/oembed/', true ),
+			'#https?://www\.someecards\.com/usercards/viewcard/.+#i' => array( 'https://www.someecards.com/v2/oembed/', true ),
+			'#https?://some\.ly\/.+#i'                     => array( 'https://www.someecards.com/v2/oembed/', true ),
 		);
 
 		if ( ! empty( self::$early_providers['add'] ) ) {
@@ -221,7 +221,7 @@ class WP_oEmbed {
 		$this->providers = apply_filters( 'oembed_providers', $providers );
 
 		// Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
-		add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
+		add_filter( 'oembed_dataparse', array( $this, '_strip_newlines' ), 10, 3 );
 	}
 
 	/**
@@ -256,14 +256,15 @@ class WP_oEmbed {
 
 		$provider = false;
 
-		if ( !isset($args['discover']) )
+		if ( ! isset( $args['discover'] ) ) {
 			$args['discover'] = true;
+		}
 
 		foreach ( $this->providers as $matchmask => $data ) {
 			list( $providerurl, $regex ) = $data;
 
 			// Turn the asterisk-type provider URLs into regex
-			if ( !$regex ) {
+			if ( ! $regex ) {
 				$matchmask = '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $matchmask ), '#' ) ) . '#i';
 				$matchmask = preg_replace( '|^#http\\\://|', '#https?\://', $matchmask );
 			}
@@ -274,8 +275,9 @@ class WP_oEmbed {
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
+		if ( ! $provider && $args['discover'] ) {
 			$provider = $this->discover( $url );
+		}
 
 		return $provider;
 	}
@@ -422,7 +424,7 @@ class WP_oEmbed {
 	 */
 	public function discover( $url ) {
 		$providers = array();
-		$args = array(
+		$args      = array(
 			'limit_response_size' => 153600, // 150 KB
 		);
 
@@ -451,11 +453,13 @@ class WP_oEmbed {
 			 *                      'text/xml+oembed', and 'application/xml+oembed' (incorrect,
 			 *                      used by at least Vimeo).
 			 */
-			$linktypes = apply_filters( 'oembed_linktypes', array(
-				'application/json+oembed' => 'json',
-				'text/xml+oembed' => 'xml',
-				'application/xml+oembed' => 'xml',
-			) );
+			$linktypes = apply_filters(
+				'oembed_linktypes', array(
+					'application/json+oembed' => 'json',
+					'text/xml+oembed'         => 'xml',
+					'application/xml+oembed'  => 'xml',
+				)
+			);
 
 			// Strip <body>
 			if ( $html_head_end = stripos( $html, '</head>' ) ) {
@@ -465,7 +469,7 @@ class WP_oEmbed {
 			// Do a quick check
 			$tagfound = false;
 			foreach ( $linktypes as $linktype => $format ) {
-				if ( stripos($html, $linktype) ) {
+				if ( stripos( $html, $linktype ) ) {
 					$tagfound = true;
 					break;
 				}
@@ -475,24 +479,26 @@ class WP_oEmbed {
 				foreach ( $links[1] as $link ) {
 					$atts = shortcode_parse_atts( $link );
 
-					if ( !empty($atts['type']) && !empty($linktypes[$atts['type']]) && !empty($atts['href']) ) {
-						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
+					if ( ! empty( $atts['type'] ) && ! empty( $linktypes[ $atts['type'] ] ) && ! empty( $atts['href'] ) ) {
+						$providers[ $linktypes[ $atts['type'] ] ] = htmlspecialchars_decode( $atts['href'] );
 
 						// Stop here if it's JSON (that's all we need)
-						if ( 'json' == $linktypes[$atts['type']] )
+						if ( 'json' == $linktypes[ $atts['type'] ] ) {
 							break;
+						}
 					}
 				}
 			}
 		}
 
 		// JSON is preferred to XML
-		if ( !empty($providers['json']) )
+		if ( ! empty( $providers['json'] ) ) {
 			return $providers['json'];
-		elseif ( !empty($providers['xml']) )
+		} elseif ( ! empty( $providers['xml'] ) ) {
 			return $providers['xml'];
-		else
+		} else {
 			return false;
+		}
 	}
 
 	/**
@@ -510,7 +516,7 @@ class WP_oEmbed {
 
 		$provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
 		$provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );
-		$provider = add_query_arg( 'url', urlencode($url), $provider );
+		$provider = add_query_arg( 'url', urlencode( $url ), $provider );
 		$provider = add_query_arg( 'dnt', 1, $provider );
 
 		/**
@@ -527,8 +533,9 @@ class WP_oEmbed {
 
 		foreach ( array( 'json', 'xml' ) as $format ) {
 			$result = $this->_fetch_with_format( $provider, $format );
-			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
+			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() ) {
 				continue;
+			}
 			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
 		}
 		return false;
@@ -550,10 +557,12 @@ class WP_oEmbed {
 		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
 
 		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) )
+		if ( 501 == wp_remote_retrieve_response_code( $response ) ) {
 			return new WP_Error( 'not-implemented' );
-		if ( ! $body = wp_remote_retrieve_body( $response ) )
+		}
+		if ( ! $body = wp_remote_retrieve_body( $response ) ) {
 			return false;
+		}
 		$parse_method = "_parse_$format";
 		return $this->$parse_method( $body );
 	}
@@ -580,8 +589,9 @@ class WP_oEmbed {
 	 * @return object|false
 	 */
 	private function _parse_xml( $response_body ) {
-		if ( ! function_exists( 'libxml_disable_entity_loader' ) )
+		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
 			return false;
+		}
 
 		$loader = libxml_disable_entity_loader( true );
 		$errors = libxml_use_internal_errors( true );
@@ -603,25 +613,30 @@ class WP_oEmbed {
 	 * @return stdClass|false
 	 */
 	private function _parse_xml_body( $response_body ) {
-		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) )
+		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) ) {
 			return false;
+		}
 
-		$dom = new DOMDocument;
+		$dom     = new DOMDocument;
 		$success = $dom->loadXML( $response_body );
-		if ( ! $success )
+		if ( ! $success ) {
 			return false;
+		}
 
-		if ( isset( $dom->doctype ) )
+		if ( isset( $dom->doctype ) ) {
 			return false;
+		}
 
 		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
+			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType ) {
 				return false;
+			}
 		}
 
 		$xml = simplexml_import_dom( $dom );
-		if ( ! $xml )
+		if ( ! $xml ) {
 			return false;
+		}
 
 		$return = new stdClass;
 		foreach ( $xml as $key => $value ) {
@@ -641,31 +656,36 @@ class WP_oEmbed {
 	 * @return false|string False on error, otherwise the HTML needed to embed.
 	 */
 	public function data2html( $data, $url ) {
-		if ( ! is_object( $data ) || empty( $data->type ) )
+		if ( ! is_object( $data ) || empty( $data->type ) ) {
 			return false;
+		}
 
 		$return = false;
 
 		switch ( $data->type ) {
 			case 'photo':
-				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) )
+				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) ) {
 					break;
-				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) )
+				}
+				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) ) {
 					break;
+				}
 
-				$title = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
-				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
+				$title  = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
+				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr( $title ) . '" width="' . esc_attr( $data->width ) . '" height="' . esc_attr( $data->height ) . '" /></a>';
 				break;
 
 			case 'video':
 			case 'rich':
-				if ( ! empty( $data->html ) && is_string( $data->html ) )
+				if ( ! empty( $data->html ) && is_string( $data->html ) ) {
 					$return = $data->html;
+				}
 				break;
 
 			case 'link':
-				if ( ! empty( $data->title ) && is_string( $data->title ) )
+				if ( ! empty( $data->title ) && is_string( $data->title ) ) {
 					$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				}
 				break;
 
 			default:
@@ -702,26 +722,26 @@ class WP_oEmbed {
 			return $html;
 		}
 
-		$count = 1;
-		$found = array();
-		$token = '__PRE__';
-		$search = array( "\t", "\n", "\r", ' ' );
-		$replace = array( '__TAB__', '__NL__', '__CR__', '__SPACE__' );
+		$count     = 1;
+		$found     = array();
+		$token     = '__PRE__';
+		$search    = array( "\t", "\n", "\r", ' ' );
+		$replace   = array( '__TAB__', '__NL__', '__CR__', '__SPACE__' );
 		$tokenized = str_replace( $search, $replace, $html );
 
 		preg_match_all( '#(<pre[^>]*>.+?</pre>)#i', $tokenized, $matches, PREG_SET_ORDER );
 		foreach ( $matches as $i => $match ) {
-			$tag_html = str_replace( $replace, $search, $match[0] );
+			$tag_html  = str_replace( $replace, $search, $match[0] );
 			$tag_token = $token . $i;
 
 			$found[ $tag_token ] = $tag_html;
-			$html = str_replace( $tag_html, $tag_token, $html, $count );
+			$html                = str_replace( $tag_html, $tag_token, $html, $count );
 		}
 
 		$replaced = str_replace( $replace, $search, $html );
 		$stripped = str_replace( array( "\r\n", "\n" ), '', $replaced );
-		$pre = array_values( $found );
-		$tokens = array_keys( $found );
+		$pre      = array_values( $found );
+		$tokens   = array_keys( $found );
 
 		return str_replace( $tokens, $pre, $stripped );
 	}
diff --git a/wp-includes/class-walker-category-dropdown.php b/wp-includes/class-walker-category-dropdown.php
index 6ff7265222..c0fbbd681a 100644
--- a/wp-includes/class-walker-category-dropdown.php
+++ b/wp-includes/class-walker-category-dropdown.php
@@ -35,7 +35,10 @@ class Walker_CategoryDropdown extends Walker {
 	 *
 	 * @see Walker::$db_fields
 	 */
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	public $db_fields = array(
+		'parent' => 'parent',
+		'id'     => 'term_id',
+	);
 
 	/**
 	 * Starts the element output.
@@ -52,7 +55,7 @@ class Walker_CategoryDropdown extends Walker {
 	 * @param int    $id       Optional. ID of the current category. Default 0 (unused).
 	 */
 	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		$pad = str_repeat('&nbsp;', $depth * 3);
+		$pad = str_repeat( '&nbsp;', $depth * 3 );
 
 		/** This filter is documented in wp-includes/category-template.php */
 		$cat_name = apply_filters( 'list_cats', $category->name, $category );
@@ -63,15 +66,17 @@ class Walker_CategoryDropdown extends Walker {
 			$value_field = 'term_id';
 		}
 
-		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . "\"";
+		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $category->{$value_field} ) . '"';
 
 		// Type-juggling causes false matches, so we force everything to a string.
-		if ( (string) $category->{$value_field} === (string) $args['selected'] )
+		if ( (string) $category->{$value_field} === (string) $args['selected'] ) {
 			$output .= ' selected="selected"';
+		}
 		$output .= '>';
-		$output .= $pad.$cat_name;
-		if ( $args['show_count'] )
-			$output .= '&nbsp;&nbsp;('. number_format_i18n( $category->count ) .')';
+		$output .= $pad . $cat_name;
+		if ( $args['show_count'] ) {
+			$output .= '&nbsp;&nbsp;(' . number_format_i18n( $category->count ) . ')';
+		}
 		$output .= "</option>\n";
 	}
 }
diff --git a/wp-includes/class-walker-category.php b/wp-includes/class-walker-category.php
index 341c98c142..5373b7d6dc 100644
--- a/wp-includes/class-walker-category.php
+++ b/wp-includes/class-walker-category.php
@@ -35,7 +35,10 @@ class Walker_Category extends Walker {
 	 * @see Walker::$db_fields
 	 * @todo Decouple this
 	 */
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id');
+	public $db_fields = array(
+		'parent' => 'parent',
+		'id'     => 'term_id',
+	);
 
 	/**
 	 * Starts the list before the elements are added.
@@ -50,10 +53,11 @@ class Walker_Category extends Walker {
 	 *                       value is 'list'. See wp_list_categories(). Default empty array.
 	 */
 	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+		if ( 'list' != $args['style'] ) {
 			return;
+		}
 
-		$indent = str_repeat("\t", $depth);
+		$indent  = str_repeat( "\t", $depth );
 		$output .= "$indent<ul class='children'>\n";
 	}
 
@@ -70,10 +74,11 @@ class Walker_Category extends Walker {
 	 *                       value is 'list'. See wp_list_categories(). Default empty array.
 	 */
 	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+		if ( 'list' != $args['style'] ) {
 			return;
+		}
 
-		$indent = str_repeat("\t", $depth);
+		$indent  = str_repeat( "\t", $depth );
 		$output .= "$indent</ul>\n";
 	}
 
@@ -129,10 +134,10 @@ class Walker_Category extends Walker {
 			$link .= '<a href="' . esc_url( get_term_feed_link( $category->term_id, $category->taxonomy, $args['feed_type'] ) ) . '"';
 
 			if ( empty( $args['feed'] ) ) {
-				$alt = ' alt="' . sprintf(__( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
+				$alt = ' alt="' . sprintf( __( 'Feed for all posts filed under %s' ), $cat_name ) . '"';
 			} else {
-				$alt = ' alt="' . $args['feed'] . '"';
-				$name = $args['feed'];
+				$alt   = ' alt="' . $args['feed'] . '"';
+				$name  = $args['feed'];
 				$link .= empty( $args['title'] ) ? '' : $args['title'];
 			}
 
@@ -154,7 +159,7 @@ class Walker_Category extends Walker {
 			$link .= ' (' . number_format_i18n( $category->count ) . ')';
 		}
 		if ( 'list' == $args['style'] ) {
-			$output .= "\t<li";
+			$output     .= "\t<li";
 			$css_classes = array(
 				'cat-item',
 				'cat-item-' . $category->term_id,
@@ -162,10 +167,12 @@ 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(
-					'include' => $args['current_category'],
-					'hide_empty' => false,
-				) );
+				$_current_terms = get_terms(
+					$category->taxonomy, array(
+						'include'    => $args['current_category'],
+						'hide_empty' => false,
+					)
+				);
 
 				foreach ( $_current_terms as $_current_term ) {
 					if ( $category->term_id == $_current_term->term_id ) {
@@ -175,7 +182,7 @@ class Walker_Category extends Walker {
 					}
 					while ( $_current_term->parent ) {
 						if ( $category->term_id == $_current_term->parent ) {
-							$css_classes[] =  'current-cat-ancestor';
+							$css_classes[] = 'current-cat-ancestor';
 							break;
 						}
 						$_current_term = get_term( $_current_term->parent, $category->taxonomy );
@@ -197,7 +204,7 @@ class Walker_Category extends Walker {
 			 */
 			$css_classes = implode( ' ', apply_filters( 'category_css_class', $css_classes, $category, $depth, $args ) );
 
-			$output .=  ' class="' . $css_classes . '"';
+			$output .= ' class="' . $css_classes . '"';
 			$output .= ">$link\n";
 		} elseif ( isset( $args['separator'] ) ) {
 			$output .= "\t$link" . $args['separator'] . "\n";
@@ -220,8 +227,9 @@ class Walker_Category extends Walker {
 	 *                       to output. See wp_list_categories(). Default empty array.
 	 */
 	public function end_el( &$output, $page, $depth = 0, $args = array() ) {
-		if ( 'list' != $args['style'] )
+		if ( 'list' != $args['style'] ) {
 			return;
+		}
 
 		$output .= "</li>\n";
 	}
diff --git a/wp-includes/class-walker-comment.php b/wp-includes/class-walker-comment.php
index 2ff35bd72d..e5cb37285c 100644
--- a/wp-includes/class-walker-comment.php
+++ b/wp-includes/class-walker-comment.php
@@ -35,7 +35,10 @@ class Walker_Comment extends Walker {
 	 * @see Walker::$db_fields
 	 * @todo Decouple this
 	 */
-	public $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID');
+	public $db_fields = array(
+		'parent' => 'comment_parent',
+		'id'     => 'comment_ID',
+	);
 
 	/**
 	 * Starts the list before the elements are added.
@@ -126,11 +129,12 @@ class Walker_Comment extends Walker {
 	 * @param string     $output            Used to append additional content. Passed by reference.
 	 */
 	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-		if ( !$element )
+		if ( ! $element ) {
 			return;
+		}
 
 		$id_field = $this->db_fields['id'];
-		$id = $element->$id_field;
+		$id       = $element->$id_field;
 
 		parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
 
@@ -139,9 +143,10 @@ class Walker_Comment extends Walker {
 		 * and display them at this level. This is to prevent them being orphaned to the end
 		 * of the list.
 		 */
-		if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) {
-			foreach ( $children_elements[ $id ] as $child )
+		if ( $max_depth <= $depth + 1 && isset( $children_elements[ $id ] ) ) {
+			foreach ( $children_elements[ $id ] as $child ) {
 				$this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
+			}
 
 			unset( $children_elements[ $id ] );
 		}
@@ -167,9 +172,9 @@ class Walker_Comment extends Walker {
 	public function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
 		$depth++;
 		$GLOBALS['comment_depth'] = $depth;
-		$GLOBALS['comment'] = $comment;
+		$GLOBALS['comment']       = $comment;
 
-		if ( !empty( $args['callback'] ) ) {
+		if ( ! empty( $args['callback'] ) ) {
 			ob_start();
 			call_user_func( $args['callback'], $comment, $args, $depth );
 			$output .= ob_get_clean();
@@ -205,16 +210,17 @@ class Walker_Comment extends Walker {
 	 * @param array      $args    Optional. An array of arguments. Default empty array.
 	 */
 	public function end_el( &$output, $comment, $depth = 0, $args = array() ) {
-		if ( !empty( $args['end-callback'] ) ) {
+		if ( ! empty( $args['end-callback'] ) ) {
 			ob_start();
 			call_user_func( $args['end-callback'], $comment, $args, $depth );
 			$output .= ob_get_clean();
 			return;
 		}
-		if ( 'div' == $args['style'] )
+		if ( 'div' == $args['style'] ) {
 			$output .= "</div><!-- #comment-## -->\n";
-		else
+		} else {
 			$output .= "</li><!-- #comment-## -->\n";
+		}
 	}
 
 	/**
@@ -251,10 +257,10 @@ class Walker_Comment extends Walker {
 	 */
 	protected function comment( $comment, $depth, $args ) {
 		if ( 'div' == $args['style'] ) {
-			$tag = 'div';
+			$tag       = 'div';
 			$add_below = 'comment';
 		} else {
-			$tag = 'li';
+			$tag       = 'li';
 			$add_below = 'div-comment';
 		}
 ?>
@@ -263,36 +269,58 @@ class Walker_Comment extends Walker {
 		<div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 		<?php endif; ?>
 		<div class="comment-author vcard">
-			<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
+			<?php
+			if ( 0 != $args['avatar_size'] ) {
+				echo get_avatar( $comment, $args['avatar_size'] );}
+?>
 			<?php
 				/* translators: %s: comment author link */
-				printf( __( '%s <span class="says">says:</span>' ),
+				printf(
+					__( '%s <span class="says">says:</span>' ),
 					sprintf( '<cite class="fn">%s</cite>', get_comment_author_link( $comment ) )
 				);
 			?>
 		</div>
 		<?php if ( '0' == $comment->comment_approved ) : ?>
-		<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ) ?></em>
+		<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></em>
 		<br />
 		<?php endif; ?>
 
 		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment, $args ) ); ?>">
 			<?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;', '' );
+				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( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+		<?php
+		comment_text(
+			$comment, array_merge(
+				$args, array(
+					'add_below' => $add_below,
+					'depth'     => $depth,
+					'max_depth' => $args['max_depth'],
+				)
+			)
+		);
+?>
 
 		<?php
-		comment_reply_link( array_merge( $args, array(
-			'add_below' => $add_below,
-			'depth'     => $depth,
-			'max_depth' => $args['max_depth'],
-			'before'    => '<div class="reply">',
-			'after'     => '</div>'
-		) ) );
+		comment_reply_link(
+			array_merge(
+				$args, array(
+					'add_below' => $add_below,
+					'depth'     => $depth,
+					'max_depth' => $args['max_depth'],
+					'before'    => '<div class="reply">',
+					'after'     => '</div>',
+				)
+			)
+		);
 		?>
 
 		<?php if ( 'div' != $args['style'] ) : ?>
@@ -319,10 +347,14 @@ class Walker_Comment extends Walker {
 			<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 				<footer class="comment-meta">
 					<div class="comment-author vcard">
-						<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
+						<?php
+						if ( 0 != $args['avatar_size'] ) {
+							echo get_avatar( $comment, $args['avatar_size'] );}
+?>
 						<?php
 							/* translators: %s: comment author link */
-							printf( __( '%s <span class="says">says:</span>' ),
+							printf(
+								__( '%s <span class="says">says:</span>' ),
 								sprintf( '<b class="fn">%s</b>', get_comment_author_link( $comment ) )
 							);
 						?>
@@ -350,13 +382,17 @@ class Walker_Comment extends Walker {
 				</div><!-- .comment-content -->
 
 				<?php
-				comment_reply_link( array_merge( $args, array(
-					'add_below' => 'div-comment',
-					'depth'     => $depth,
-					'max_depth' => $args['max_depth'],
-					'before'    => '<div class="reply">',
-					'after'     => '</div>'
-				) ) );
+				comment_reply_link(
+					array_merge(
+						$args, array(
+							'add_below' => 'div-comment',
+							'depth'     => $depth,
+							'max_depth' => $args['max_depth'],
+							'before'    => '<div class="reply">',
+							'after'     => '</div>',
+						)
+					)
+				);
 				?>
 			</article><!-- .comment-body -->
 <?php
diff --git a/wp-includes/class-walker-nav-menu.php b/wp-includes/class-walker-nav-menu.php
index 871836f374..5e2335a512 100644
--- a/wp-includes/class-walker-nav-menu.php
+++ b/wp-includes/class-walker-nav-menu.php
@@ -34,7 +34,10 @@ class Walker_Nav_Menu extends Walker {
 	 *
 	 * @see Walker::$db_fields
 	 */
-	public $db_fields = array( 'parent' => 'menu_item_parent', 'id' => 'db_id' );
+	public $db_fields = array(
+		'parent' => 'menu_item_parent',
+		'id'     => 'db_id',
+	);
 
 	/**
 	 * Starts the list before the elements are added.
@@ -94,7 +97,7 @@ class Walker_Nav_Menu extends Walker {
 			$t = "\t";
 			$n = "\n";
 		}
-		$indent = str_repeat( $t, $depth );
+		$indent  = str_repeat( $t, $depth );
 		$output .= "$indent</ul>{$n}";
 	}
 
@@ -122,7 +125,7 @@ class Walker_Nav_Menu extends Walker {
 		}
 		$indent = ( $depth ) ? str_repeat( $t, $depth ) : '';
 
-		$classes = empty( $item->classes ) ? array() : (array) $item->classes;
+		$classes   = empty( $item->classes ) ? array() : (array) $item->classes;
 		$classes[] = 'menu-item-' . $item->ID;
 
 		/**
@@ -161,16 +164,16 @@ class Walker_Nav_Menu extends Walker {
 		 * @param stdClass $args    An object of wp_nav_menu() arguments.
 		 * @param int      $depth   Depth of menu item. Used for padding.
 		 */
-		$id = apply_filters( 'nav_menu_item_id', 'menu-item-'. $item->ID, $item, $args, $depth );
+		$id = apply_filters( 'nav_menu_item_id', 'menu-item-' . $item->ID, $item, $args, $depth );
 		$id = $id ? ' id="' . esc_attr( $id ) . '"' : '';
 
-		$output .= $indent . '<li' . $id . $class_names .'>';
+		$output .= $indent . '<li' . $id . $class_names . '>';
 
-		$atts = array();
+		$atts           = array();
 		$atts['title']  = ! empty( $item->attr_title ) ? $item->attr_title : '';
-		$atts['target'] = ! empty( $item->target )     ? $item->target     : '';
-		$atts['rel']    = ! empty( $item->xfn )        ? $item->xfn        : '';
-		$atts['href']   = ! empty( $item->url )        ? $item->url        : '';
+		$atts['target'] = ! empty( $item->target ) ? $item->target : '';
+		$atts['rel']    = ! empty( $item->xfn ) ? $item->xfn : '';
+		$atts['href']   = ! empty( $item->url ) ? $item->url : '';
 
 		/**
 		 * Filters the HTML attributes applied to a menu item's anchor element.
@@ -195,7 +198,7 @@ class Walker_Nav_Menu extends Walker {
 		$attributes = '';
 		foreach ( $atts as $attr => $value ) {
 			if ( ! empty( $value ) ) {
-				$value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
+				$value       = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
 				$attributes .= ' ' . $attr . '="' . $value . '"';
 			}
 		}
@@ -215,8 +218,8 @@ class Walker_Nav_Menu extends Walker {
 		 */
 		$title = apply_filters( 'nav_menu_item_title', $title, $item, $args, $depth );
 
-		$item_output = $args->before;
-		$item_output .= '<a'. $attributes .'>';
+		$item_output  = $args->before;
+		$item_output .= '<a' . $attributes . '>';
 		$item_output .= $args->link_before . $title . $args->link_after;
 		$item_output .= '</a>';
 		$item_output .= $args->after;
diff --git a/wp-includes/class-walker-page-dropdown.php b/wp-includes/class-walker-page-dropdown.php
index 7d2b8523fb..23975af2f9 100644
--- a/wp-includes/class-walker-page-dropdown.php
+++ b/wp-includes/class-walker-page-dropdown.php
@@ -35,7 +35,10 @@ class Walker_PageDropdown extends Walker {
 	 * @see Walker::$db_fields
 	 * @todo Decouple this
 	 */
-	public $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+	public $db_fields = array(
+		'parent' => 'post_parent',
+		'id'     => 'ID',
+	);
 
 	/**
 	 * Starts the element output.
@@ -54,15 +57,16 @@ class Walker_PageDropdown extends Walker {
 	 * @param int     $id     Optional. ID of the current page. Default 0 (unused).
 	 */
 	public function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
-		$pad = str_repeat('&nbsp;', $depth * 3);
+		$pad = str_repeat( '&nbsp;', $depth * 3 );
 
 		if ( ! isset( $args['value_field'] ) || ! isset( $page->{$args['value_field']} ) ) {
 			$args['value_field'] = 'ID';
 		}
 
-		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $page->{$args['value_field']} ) . "\"";
-		if ( $page->ID == $args['selected'] )
+		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $page->{$args['value_field']} ) . '"';
+		if ( $page->ID == $args['selected'] ) {
 			$output .= ' selected="selected"';
+		}
 		$output .= '>';
 
 		$title = $page->post_title;
diff --git a/wp-includes/class-walker-page.php b/wp-includes/class-walker-page.php
index c573841204..2c5967cd7a 100644
--- a/wp-includes/class-walker-page.php
+++ b/wp-includes/class-walker-page.php
@@ -35,7 +35,10 @@ class Walker_Page extends Walker {
 	 * @see Walker::$db_fields
 	 * @todo Decouple this.
 	 */
-	public $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+	public $db_fields = array(
+		'parent' => 'post_parent',
+		'id'     => 'ID',
+	);
 
 	/**
 	 * Outputs the beginning of the current level in the tree before elements are output.
@@ -57,7 +60,7 @@ class Walker_Page extends Walker {
 			$t = '';
 			$n = '';
 		}
-		$indent = str_repeat( $t, $depth );
+		$indent  = str_repeat( $t, $depth );
 		$output .= "{$n}{$indent}<ul class='children'>{$n}";
 	}
 
@@ -81,7 +84,7 @@ class Walker_Page extends Walker {
 			$t = '';
 			$n = '';
 		}
-		$indent = str_repeat( $t, $depth );
+		$indent  = str_repeat( $t, $depth );
 		$output .= "{$indent}</ul>{$n}";
 	}
 
@@ -127,7 +130,7 @@ class Walker_Page extends Walker {
 			} elseif ( $_current_page && $page->ID == $_current_page->post_parent ) {
 				$css_class[] = 'current_page_parent';
 			}
-		} elseif ( $page->ID == get_option('page_for_posts') ) {
+		} elseif ( $page->ID == get_option( 'page_for_posts' ) ) {
 			$css_class[] = 'current_page_parent';
 		}
 
@@ -153,9 +156,9 @@ class Walker_Page extends Walker {
 		}
 
 		$args['link_before'] = empty( $args['link_before'] ) ? '' : $args['link_before'];
-		$args['link_after'] = empty( $args['link_after'] ) ? '' : $args['link_after'];
+		$args['link_after']  = empty( $args['link_after'] ) ? '' : $args['link_after'];
 
-		$atts = array();
+		$atts         = array();
 		$atts['href'] = get_permalink( $page->ID );
 
 		/**
@@ -178,7 +181,7 @@ class Walker_Page extends Walker {
 		$attributes = '';
 		foreach ( $atts as $attr => $value ) {
 			if ( ! empty( $value ) ) {
-				$value = esc_attr( $value );
+				$value       = esc_attr( $value );
 				$attributes .= ' ' . $attr . '="' . $value . '"';
 			}
 		}
@@ -201,7 +204,7 @@ class Walker_Page extends Walker {
 			}
 
 			$date_format = empty( $args['date_format'] ) ? '' : $args['date_format'];
-			$output .= " " . mysql2date( $date_format, $time );
+			$output     .= ' ' . mysql2date( $date_format, $time );
 		}
 	}
 
diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index 3603b5be44..72b7ce4111 100644
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -23,10 +23,10 @@ class WP_Admin_Bar {
 	 */
 	public function __get( $name ) {
 		switch ( $name ) {
-			case 'proto' :
+			case 'proto':
 				return is_ssl() ? 'https://' : 'http://';
 
-			case 'menu' :
+			case 'menu':
 				_deprecated_argument( 'WP_Admin_Bar', '3.3.0', 'Modify admin bar nodes with WP_Admin_Bar::get_node(), WP_Admin_Bar::add_node(), and WP_Admin_Bar::remove_node(), not the <code>menu</code> property.' );
 				return array(); // Sorry, folks.
 		}
@@ -41,12 +41,12 @@ class WP_Admin_Bar {
 			/* Populate settings we need for the menu based on the current user. */
 			$this->user->blogs = get_blogs_of_user( get_current_user_id() );
 			if ( is_multisite() ) {
-				$this->user->active_blog = get_active_blog_for_user( get_current_user_id() );
-				$this->user->domain = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+				$this->user->active_blog    = get_active_blog_for_user( get_current_user_id() );
+				$this->user->domain         = empty( $this->user->active_blog ) ? user_admin_url() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
 				$this->user->account_domain = $this->user->domain;
 			} else {
-				$this->user->active_blog = $this->user->blogs[get_current_blog_id()];
-				$this->user->domain = trailingslashit( home_url() );
+				$this->user->active_blog    = $this->user->blogs[ get_current_blog_id() ];
+				$this->user->domain         = trailingslashit( home_url() );
 				$this->user->account_domain = $this->user->domain;
 			}
 		}
@@ -60,14 +60,15 @@ class WP_Admin_Bar {
 			 * To remove the default padding styles from WordPress for the Toolbar, use the following code:
 			 * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
 			 */
-			$admin_bar_args = get_theme_support( 'admin-bar' );
+			$admin_bar_args  = get_theme_support( 'admin-bar' );
 			$header_callback = $admin_bar_args[0]['callback'];
 		}
 
-		if ( empty($header_callback) )
+		if ( empty( $header_callback ) ) {
 			$header_callback = '_admin_bar_bump_cb';
+		}
 
-		add_action('wp_head', $header_callback);
+		add_action( 'wp_head', $header_callback );
 
 		wp_enqueue_script( 'admin-bar' );
 		wp_enqueue_style( 'admin-bar' );
@@ -114,16 +115,19 @@ class WP_Admin_Bar {
 	 */
 	public function add_node( $args ) {
 		// Shim for old method signature: add_node( $parent_id, $menu_obj, $args )
-		if ( func_num_args() >= 3 && is_string( func_get_arg(0) ) )
-			$args = array_merge( array( 'parent' => func_get_arg(0) ), func_get_arg(2) );
+		if ( func_num_args() >= 3 && is_string( func_get_arg( 0 ) ) ) {
+			$args = array_merge( array( 'parent' => func_get_arg( 0 ) ), func_get_arg( 2 ) );
+		}
 
-		if ( is_object( $args ) )
+		if ( is_object( $args ) ) {
 			$args = get_object_vars( $args );
+		}
 
 		// Ensure we have a valid title.
 		if ( empty( $args['id'] ) ) {
-			if ( empty( $args['title'] ) )
+			if ( empty( $args['title'] ) ) {
 				return;
+			}
 
 			_doing_it_wrong( __METHOD__, __( 'The menu ID should not be empty.' ), '3.3.0' );
 			// Deprecated: Generate an ID from the title.
@@ -140,18 +144,20 @@ class WP_Admin_Bar {
 		);
 
 		// If the node already exists, keep any data that isn't provided.
-		if ( $maybe_defaults = $this->get_node( $args['id'] ) )
+		if ( $maybe_defaults = $this->get_node( $args['id'] ) ) {
 			$defaults = get_object_vars( $maybe_defaults );
+		}
 
 		// Do the same for 'meta' items.
-		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) )
+		if ( ! empty( $defaults['meta'] ) && ! empty( $args['meta'] ) ) {
 			$args['meta'] = wp_parse_args( $args['meta'], $defaults['meta'] );
+		}
 
 		$args = wp_parse_args( $args, $defaults );
 
 		$back_compat_parents = array(
 			'my-account-with-avatar' => array( 'my-account', '3.3' ),
-			'my-blogs'               => array( 'my-sites',   '3.3' ),
+			'my-blogs'               => array( 'my-sites', '3.3' ),
 		);
 
 		if ( isset( $back_compat_parents[ $args['parent'] ] ) ) {
@@ -177,8 +183,9 @@ class WP_Admin_Bar {
 	 * @return object Node.
 	 */
 	final public function get_node( $id ) {
-		if ( $node = $this->_get_node( $id ) )
+		if ( $node = $this->_get_node( $id ) ) {
 			return clone $node;
+		}
 	}
 
 	/**
@@ -186,22 +193,26 @@ class WP_Admin_Bar {
 	 * @return object|void
 	 */
 	final protected function _get_node( $id ) {
-		if ( $this->bound )
+		if ( $this->bound ) {
 			return;
+		}
 
-		if ( empty( $id ) )
+		if ( empty( $id ) ) {
 			$id = 'root';
+		}
 
-		if ( isset( $this->nodes[ $id ] ) )
+		if ( isset( $this->nodes[ $id ] ) ) {
 			return $this->nodes[ $id ];
+		}
 	}
 
 	/**
 	 * @return array|void
 	 */
 	final public function get_nodes() {
-		if ( ! $nodes = $this->_get_nodes() )
+		if ( ! $nodes = $this->_get_nodes() ) {
 			return;
+		}
 
 		foreach ( $nodes as &$node ) {
 			$node = clone $node;
@@ -213,8 +224,9 @@ class WP_Admin_Bar {
 	 * @return array|void
 	 */
 	final protected function _get_nodes() {
-		if ( $this->bound )
+		if ( $this->bound ) {
 			return;
+		}
 
 		return $this->nodes;
 	}
@@ -259,39 +271,45 @@ class WP_Admin_Bar {
 	 */
 	public function render() {
 		$root = $this->_bind();
-		if ( $root )
+		if ( $root ) {
 			$this->_render( $root );
+		}
 	}
 
 	/**
 	 * @return object|void
 	 */
 	final protected function _bind() {
-		if ( $this->bound )
+		if ( $this->bound ) {
 			return;
+		}
 
 		// Add the root node.
 		// Clear it first, just in case. Don't mess with The Root.
 		$this->remove_node( 'root' );
-		$this->add_node( array(
-			'id'    => 'root',
-			'group' => false,
-		) );
+		$this->add_node(
+			array(
+				'id'    => 'root',
+				'group' => false,
+			)
+		);
 
 		// Normalize nodes: define internal 'children' and 'type' properties.
 		foreach ( $this->_get_nodes() as $node ) {
 			$node->children = array();
-			$node->type = ( $node->group ) ? 'group' : 'item';
+			$node->type     = ( $node->group ) ? 'group' : 'item';
 			unset( $node->group );
 
 			// The Root wants your orphans. No lonely items allowed.
-			if ( ! $node->parent )
+			if ( ! $node->parent ) {
 				$node->parent = 'root';
+			}
 		}
 
 		foreach ( $this->_get_nodes() as $node ) {
-			if ( 'root' == $node->id )
+			if ( 'root' == $node->id ) {
 				continue;
+			}
 
 			// Fetch the parent node. If it isn't registered, ignore the node.
 			if ( ! $parent = $this->_get_node( $node->parent ) ) {
@@ -302,10 +320,11 @@ class WP_Admin_Bar {
 			$group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
 
 			if ( $node->type == 'group' ) {
-				if ( empty( $node->meta['class'] ) )
+				if ( empty( $node->meta['class'] ) ) {
 					$node->meta['class'] = $group_class;
-				else
+				} else {
 					$node->meta['class'] .= ' ' . $group_class;
+				}
 			}
 
 			// Items in items aren't allowed. Wrap nested items in 'default' groups.
@@ -318,24 +337,26 @@ class WP_Admin_Bar {
 				if ( ! $default ) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
-						'id'        => $default_id,
-						'parent'    => $parent->id,
-						'type'      => 'group',
-						'children'  => array(),
-						'meta'      => array(
-							'class'     => $group_class,
-						),
-						'title'     => false,
-						'href'      => false,
-					) );
-					$default = $this->_get_node( $default_id );
+					$this->_set_node(
+						array(
+							'id'       => $default_id,
+							'parent'   => $parent->id,
+							'type'     => 'group',
+							'children' => array(),
+							'meta'     => array(
+								'class' => $group_class,
+							),
+							'title'    => false,
+							'href'     => false,
+						)
+					);
+					$default            = $this->_get_node( $default_id );
 					$parent->children[] = $default;
 				}
 				$parent = $default;
 
-			// Groups in groups aren't allowed. Add a special 'container' node.
-			// The container will invisibly wrap both groups.
+				// Groups in groups aren't allowed. Add a special 'container' node.
+				// The container will invisibly wrap both groups.
 			} elseif ( $parent->type == 'group' && $node->type == 'group' ) {
 				$container_id = $parent->id . '-container';
 				$container    = $this->_get_node( $container_id );
@@ -344,15 +365,17 @@ class WP_Admin_Bar {
 				if ( ! $container ) {
 					// Use _set_node because add_node can be overloaded.
 					// Make sure to specify default settings for all properties.
-					$this->_set_node( array(
-						'id'       => $container_id,
-						'type'     => 'container',
-						'children' => array( $parent ),
-						'parent'   => false,
-						'title'    => false,
-						'href'     => false,
-						'meta'     => array(),
-					) );
+					$this->_set_node(
+						array(
+							'id'       => $container_id,
+							'type'     => 'container',
+							'children' => array( $parent ),
+							'parent'   => false,
+							'title'    => false,
+							'href'     => false,
+							'meta'     => array(),
+						)
+					);
 
 					$container = $this->_get_node( $container_id );
 
@@ -363,10 +386,11 @@ class WP_Admin_Bar {
 						$container->parent = $grandparent->id;
 
 						$index = array_search( $parent, $grandparent->children, true );
-						if ( $index === false )
+						if ( $index === false ) {
 							$grandparent->children[] = $container;
-						else
+						} else {
 							array_splice( $grandparent->children, $index, 1, array( $container ) );
+						}
 					}
 
 					$parent->parent = $container->id;
@@ -382,13 +406,12 @@ class WP_Admin_Bar {
 			$parent->children[] = $node;
 		}
 
-		$root = $this->_get_node( 'root' );
+		$root        = $this->_get_node( 'root' );
 		$this->bound = true;
 		return $root;
 	}
 
 	/**
-	 *
 	 * @global bool $is_IE
 	 * @param object $root
 	 */
@@ -399,12 +422,13 @@ class WP_Admin_Bar {
 		// We have to do this here since admin bar shows on the front end.
 		$class = 'nojq nojs';
 		if ( $is_IE ) {
-			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) )
+			if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) ) {
 				$class .= ' ie7';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) )
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 8' ) ) {
 				$class .= ' ie8';
-			elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) )
+			} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 9' ) ) {
 				$class .= ' ie9';
+			}
 		} elseif ( wp_is_mobile() ) {
 			$class .= ' mobile';
 		}
@@ -415,12 +439,14 @@ class WP_Admin_Bar {
 				<a class="screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e( 'Skip to toolbar' ); ?></a>
 			<?php } ?>
 			<div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e( 'Toolbar' ); ?>" tabindex="0">
-				<?php foreach ( $root->children as $group ) {
+				<?php
+				foreach ( $root->children as $group ) {
 					$this->_render_group( $group );
-				} ?>
+				}
+				?>
 			</div>
 			<?php if ( is_user_logged_in() ) : ?>
-			<a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e('Log Out'); ?></a>
+			<a class="screen-reader-shortcut" href="<?php echo esc_url( wp_logout_url() ); ?>"><?php _e( 'Log Out' ); ?></a>
 			<?php endif; ?>
 		</div>
 
@@ -431,8 +457,9 @@ class WP_Admin_Bar {
 	 * @param object $node
 	 */
 	final protected function _render_container( $node ) {
-		if ( $node->type != 'container' || empty( $node->children ) )
+		if ( $node->type != 'container' || empty( $node->children ) ) {
 			return;
+		}
 
 		echo '<div id="' . esc_attr( 'wp-admin-bar-' . $node->id ) . '" class="ab-group-container">';
 		foreach ( $node->children as $group ) {
@@ -449,13 +476,15 @@ class WP_Admin_Bar {
 			$this->_render_container( $node );
 			return;
 		}
-		if ( $node->type != 'group' || empty( $node->children ) )
+		if ( $node->type != 'group' || empty( $node->children ) ) {
 			return;
+		}
 
-		if ( ! empty( $node->meta['class'] ) )
+		if ( ! empty( $node->meta['class'] ) ) {
 			$class = ' class="' . esc_attr( trim( $node->meta['class'] ) ) . '"';
-		else
+		} else {
 			$class = '';
+		}
 
 		echo "<ul id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$class>";
 		foreach ( $node->children as $item ) {
@@ -468,28 +497,31 @@ class WP_Admin_Bar {
 	 * @param object $node
 	 */
 	final protected function _render_item( $node ) {
-		if ( $node->type != 'item' )
+		if ( $node->type != 'item' ) {
 			return;
+		}
 
 		$is_parent = ! empty( $node->children );
 		$has_link  = ! empty( $node->href );
 
 		// Allow only numeric values, then casted to integers, and allow a tabindex value of `0` for a11y.
-		$tabindex = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : '';
+		$tabindex        = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : '';
 		$aria_attributes = ( '' !== $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
 
 		$menuclass = '';
 
 		if ( $is_parent ) {
-			$menuclass = 'menupop ';
+			$menuclass        = 'menupop ';
 			$aria_attributes .= ' aria-haspopup="true"';
 		}
 
-		if ( ! empty( $node->meta['class'] ) )
+		if ( ! empty( $node->meta['class'] ) ) {
 			$menuclass .= $node->meta['class'];
+		}
 
-		if ( $menuclass )
+		if ( $menuclass ) {
 			$menuclass = ' class="' . esc_attr( trim( $menuclass ) ) . '"';
+		}
 
 		echo "<li id='" . esc_attr( 'wp-admin-bar-' . $node->id ) . "'$menuclass>";
 
diff --git a/wp-includes/class-wp-ajax-response.php b/wp-includes/class-wp-ajax-response.php
index 7123d1076f..be578ae977 100644
--- a/wp-includes/class-wp-ajax-response.php
+++ b/wp-includes/class-wp-ajax-response.php
@@ -23,8 +23,9 @@ class WP_Ajax_Response {
 	 * @param string|array $args Optional. Will be passed to add() method.
 	 */
 	public function __construct( $args = '' ) {
-		if ( !empty($args) )
-			$this->add($args);
+		if ( ! empty( $args ) ) {
+			$this->add( $args );
+		}
 	}
 
 	/**
@@ -63,36 +64,39 @@ class WP_Ajax_Response {
 	 */
 	public function add( $args = '' ) {
 		$defaults = array(
-			'what' => 'object', 'action' => false,
-			'id' => '0', 'old_id' => false,
-			'position' => 1,
-			'data' => '', 'supplemental' => array()
+			'what'         => 'object',
+			'action'       => false,
+			'id'           => '0',
+			'old_id'       => false,
+			'position'     => 1,
+			'data'         => '',
+			'supplemental' => array(),
 		);
 
 		$r = wp_parse_args( $args, $defaults );
 
 		$position = preg_replace( '/[^a-z0-9:_-]/i', '', $r['position'] );
-		$id = $r['id'];
-		$what = $r['what'];
-		$action = $r['action'];
-		$old_id = $r['old_id'];
-		$data = $r['data'];
+		$id       = $r['id'];
+		$what     = $r['what'];
+		$action   = $r['action'];
+		$old_id   = $r['old_id'];
+		$data     = $r['data'];
 
 		if ( is_wp_error( $id ) ) {
 			$data = $id;
-			$id = 0;
+			$id   = 0;
 		}
 
 		$response = '';
 		if ( is_wp_error( $data ) ) {
 			foreach ( (array) $data->get_error_codes() as $code ) {
-				$response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . "]]></wp_error>";
+				$response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . ']]></wp_error>';
 				if ( ! $error_data = $data->get_error_data( $code ) ) {
 					continue;
 				}
 				$class = '';
 				if ( is_object( $error_data ) ) {
-					$class = ' class="' . get_class( $error_data ) . '"';
+					$class      = ' class="' . get_class( $error_data ) . '"';
 					$error_data = get_object_vars( $error_data );
 				}
 
@@ -106,7 +110,7 @@ class WP_Ajax_Response {
 					}
 				}
 
-				$response .= "</wp_error_data>";
+				$response .= '</wp_error_data>';
 			}
 		} else {
 			$response = "<response_data><![CDATA[$data]]></response_data>";
@@ -123,13 +127,13 @@ class WP_Ajax_Response {
 		if ( false === $action ) {
 			$action = $_POST['action'];
 		}
-		$x = '';
+		$x  = '';
 		$x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
-		$x .=	"<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
-		$x .=		$response;
-		$x .=		$s;
-		$x .=	"</$what>";
-		$x .= "</response>";
+		$x .= "<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
+		$x .= $response;
+		$x .= $s;
+		$x .= "</$what>";
+		$x .= '</response>';
 
 		$this->responses[] = $x;
 		return $x;
@@ -145,12 +149,14 @@ class WP_Ajax_Response {
 	public function send() {
 		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
 		echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
+		foreach ( (array) $this->responses as $response ) {
 			echo $response;
+		}
 		echo '</wp_ajax>';
-		if ( wp_doing_ajax() )
+		if ( wp_doing_ajax() ) {
 			wp_die();
-		else
+		} else {
 			die();
+		}
 	}
 }
diff --git a/wp-includes/class-wp-comment-query.php b/wp-includes/class-wp-comment-query.php
index 690298d1d8..cdbe0d7792 100644
--- a/wp-includes/class-wp-comment-query.php
+++ b/wp-includes/class-wp-comment-query.php
@@ -242,7 +242,7 @@ class WP_Comment_Query {
 	 *                                                   The parameter is ignored (forced to `false`) when
 	 *                                                   `$fields` is 'ids' or 'counts'. Accepts 'threaded',
 	 *                                                   'flat', or false. Default: false.
- 	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
+	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
 	 *                                                   an object cache. Default is 'core'.
 	 *     @type bool         $update_comment_meta_cache Whether to prime the metadata cache for found comments.
 	 *                                                   Default true.
@@ -252,49 +252,49 @@ class WP_Comment_Query {
 	 */
 	public function __construct( $query = '' ) {
 		$this->query_var_defaults = array(
-			'author_email' => '',
-			'author_url' => '',
-			'author__in' => '',
-			'author__not_in' => '',
-			'include_unapproved' => '',
-			'fields' => '',
-			'ID' => '',
-			'comment__in' => '',
-			'comment__not_in' => '',
-			'karma' => '',
-			'number' => '',
-			'offset' => '',
-			'no_found_rows' => true,
-			'orderby' => '',
-			'order' => 'DESC',
-			'paged' => 1,
-			'parent' => '',
-			'parent__in' => '',
-			'parent__not_in' => '',
-			'post_author__in' => '',
-			'post_author__not_in' => '',
-			'post_ID' => '',
-			'post_id' => 0,
-			'post__in' => '',
-			'post__not_in' => '',
-			'post_author' => '',
-			'post_name' => '',
-			'post_parent' => '',
-			'post_status' => '',
-			'post_type' => '',
-			'status' => 'all',
-			'type' => '',
-			'type__in' => '',
-			'type__not_in' => '',
-			'user_id' => '',
-			'search' => '',
-			'count' => false,
-			'meta_key' => '',
-			'meta_value' => '',
-			'meta_query' => '',
-			'date_query' => null, // See WP_Date_Query
-			'hierarchical' => false,
-			'cache_domain' => 'core',
+			'author_email'              => '',
+			'author_url'                => '',
+			'author__in'                => '',
+			'author__not_in'            => '',
+			'include_unapproved'        => '',
+			'fields'                    => '',
+			'ID'                        => '',
+			'comment__in'               => '',
+			'comment__not_in'           => '',
+			'karma'                     => '',
+			'number'                    => '',
+			'offset'                    => '',
+			'no_found_rows'             => true,
+			'orderby'                   => '',
+			'order'                     => 'DESC',
+			'paged'                     => 1,
+			'parent'                    => '',
+			'parent__in'                => '',
+			'parent__not_in'            => '',
+			'post_author__in'           => '',
+			'post_author__not_in'       => '',
+			'post_ID'                   => '',
+			'post_id'                   => 0,
+			'post__in'                  => '',
+			'post__not_in'              => '',
+			'post_author'               => '',
+			'post_name'                 => '',
+			'post_parent'               => '',
+			'post_status'               => '',
+			'post_type'                 => '',
+			'status'                    => 'all',
+			'type'                      => '',
+			'type__in'                  => '',
+			'type__not_in'              => '',
+			'user_id'                   => '',
+			'search'                    => '',
+			'count'                     => false,
+			'meta_key'                  => '',
+			'meta_value'                => '',
+			'meta_query'                => '',
+			'date_query'                => null, // See WP_Date_Query
+			'hierarchical'              => false,
+			'cache_domain'              => 'core',
 			'update_comment_meta_cache' => true,
 			'update_comment_post_cache' => false,
 		);
@@ -309,7 +309,6 @@ class WP_Comment_Query {
 	 *
 	 * @since 4.2.0 Extracted from WP_Comment_Query::query().
 	 *
-	 *
 	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct()
 	 */
 	public function parse_query( $query = '' ) {
@@ -387,7 +386,7 @@ class WP_Comment_Query {
 		$_args = wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) );
 		unset( $_args['fields'] );
 
-		$key = md5( serialize( $_args ) );
+		$key          = md5( serialize( $_args ) );
 		$last_changed = wp_cache_get_last_changed( 'comment' );
 
 		$cache_key   = "get_comments:$key:$last_changed";
@@ -481,7 +480,7 @@ class WP_Comment_Query {
 
 		// 'status' accepts an array or a comma-separated string.
 		$status_clauses = array();
-		$statuses = $this->query_vars['status'];
+		$statuses       = $this->query_vars['status'];
 		if ( ! is_array( $statuses ) ) {
 			$statuses = preg_split( '/[\s,]+/', $statuses );
 		}
@@ -490,21 +489,21 @@ class WP_Comment_Query {
 		if ( ! in_array( 'any', $statuses ) ) {
 			foreach ( $statuses as $status ) {
 				switch ( $status ) {
-					case 'hold' :
+					case 'hold':
 						$status_clauses[] = "comment_approved = '0'";
 						break;
 
-					case 'approve' :
+					case 'approve':
 						$status_clauses[] = "comment_approved = '1'";
 						break;
 
-					case 'all' :
-					case '' :
+					case 'all':
+					case '':
 						$status_clauses[] = "( comment_approved = '0' OR comment_approved = '1' )";
 						break;
 
-					default :
-						$status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+					default:
+						$status_clauses[] = $wpdb->prepare( 'comment_approved = %s', $status );
 						break;
 				}
 			}
@@ -529,7 +528,7 @@ class WP_Comment_Query {
 				if ( is_numeric( $unapproved_identifier ) ) {
 					$approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
 
-				// Otherwise we match against email addresses.
+					// Otherwise we match against email addresses.
 				} else {
 					$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
 				}
@@ -555,7 +554,7 @@ class WP_Comment_Query {
 				$this->query_vars['orderby'] :
 				preg_split( '/[,\s]/', $this->query_vars['orderby'] );
 
-			$orderby_array = array();
+			$orderby_array            = array();
 			$found_orderby_comment_ID = false;
 			foreach ( $ordersby as $_key => $_value ) {
 				if ( ! $_value ) {
@@ -564,10 +563,10 @@ class WP_Comment_Query {
 
 				if ( is_int( $_key ) ) {
 					$_orderby = $_value;
-					$_order = $order;
+					$_order   = $order;
 				} else {
 					$_orderby = $_key;
-					$_order = $_value;
+					$_order   = $_value;
 				}
 
 				if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
@@ -633,7 +632,7 @@ class WP_Comment_Query {
 
 		$number = absint( $this->query_vars['number'] );
 		$offset = absint( $this->query_vars['offset'] );
-		$paged = absint( $this->query_vars['paged'] );
+		$paged  = absint( $this->query_vars['paged'] );
 
 		if ( ! empty( $number ) ) {
 			if ( $offset ) {
@@ -698,7 +697,7 @@ class WP_Comment_Query {
 
 		// Filtering by comment_type: 'type', 'type__in', 'type__not_in'.
 		$raw_types = array(
-			'IN' => array_merge( (array) $this->query_vars['type'], (array) $this->query_vars['type__in'] ),
+			'IN'     => array_merge( (array) $this->query_vars['type'], (array) $this->query_vars['type__in'] ),
 			'NOT IN' => (array) $this->query_vars['type__not_in'],
 		);
 
@@ -710,7 +709,7 @@ class WP_Comment_Query {
 				switch ( $type ) {
 					// An empty translates to 'all', for backward compatibility
 					case '':
-					case 'all' :
+					case 'all':
 						break;
 
 					case 'comment':
@@ -731,7 +730,7 @@ class WP_Comment_Query {
 
 			if ( ! empty( $comment_types[ $operator ] ) ) {
 				$types_sql = implode( ', ', $comment_types[ $operator ] );
-				$this->sql_clauses['where']['comment_type__' . strtolower( str_replace( ' ', '_', $operator ) ) ] = "comment_type $operator ($types_sql)";
+				$this->sql_clauses['where'][ 'comment_type__' . strtolower( str_replace( ' ', '_', $operator ) ) ] = "comment_type $operator ($types_sql)";
 			}
 		}
 
@@ -763,14 +762,14 @@ class WP_Comment_Query {
 
 		// If any post-related query vars are passed, join the posts table.
 		$join_posts_table = false;
-		$plucked = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent' ) );
-		$post_fields = array_filter( $plucked );
+		$plucked          = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent' ) );
+		$post_fields      = array_filter( $plucked );
 
 		if ( ! empty( $post_fields ) ) {
 			$join_posts_table = true;
 			foreach ( $post_fields as $field_name => $field_value ) {
 				// $field_value may be an array.
-				$esses = array_fill( 0, count( (array) $field_value ), '%s' );
+				$esses                                     = array_fill( 0, count( (array) $field_value ), '%s' );
 				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
 			}
 		}
@@ -791,8 +790,8 @@ class WP_Comment_Query {
 
 				$join_posts_table = true;
 
-				$esses = array_fill( 0, count( $q_values ), '%s' );
-				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
+				$esses                                     = array_fill( 0, count( $q_values ), '%s' );
+				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $q_values );
 			}
 		}
 
@@ -808,13 +807,13 @@ class WP_Comment_Query {
 
 		// Post author IDs for an IN clause.
 		if ( ! empty( $this->query_vars['post_author__in'] ) ) {
-			$join_posts_table = true;
+			$join_posts_table                              = true;
 			$this->sql_clauses['where']['post_author__in'] = 'post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
 		}
 
 		// Post author IDs for a NOT IN clause.
 		if ( ! empty( $this->query_vars['post_author__not_in'] ) ) {
-			$join_posts_table = true;
+			$join_posts_table                                  = true;
 			$this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
 		}
 
@@ -836,7 +835,7 @@ class WP_Comment_Query {
 		}
 
 		if ( ! empty( $this->query_vars['date_query'] ) && is_array( $this->query_vars['date_query'] ) ) {
-			$this->date_query = new WP_Date_Query( $this->query_vars['date_query'], 'comment_date' );
+			$this->date_query                         = new WP_Date_Query( $this->query_vars['date_query'], 'comment_date' );
 			$this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $this->date_query->get_sql() );
 		}
 
@@ -853,12 +852,12 @@ class WP_Comment_Query {
 		 */
 		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
 
-		$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-		$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-		$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-		$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-		$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
-		$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
+		$fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
+		$join    = isset( $clauses['join'] ) ? $clauses['join'] : '';
+		$where   = isset( $clauses['where'] ) ? $clauses['where'] : '';
+		$orderby = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
+		$limits  = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
+		$groupby = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
 
 		$this->filtered_where_clause = $where;
 
@@ -941,18 +940,18 @@ class WP_Comment_Query {
 			0 => wp_list_pluck( $comments, 'comment_ID' ),
 		);
 
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
+		$key          = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
 		$last_changed = wp_cache_get_last_changed( 'comment' );
 
 		// Fetch an entire level of the descendant tree at a time.
-		$level = 0;
+		$level        = 0;
 		$exclude_keys = array( 'parent', 'parent__in', 'parent__not_in' );
 		do {
 			// Parent-child relationships may be cached. Only query for those that are not.
-			$child_ids = $uncached_parent_ids = array();
+			$child_ids   = $uncached_parent_ids = array();
 			$_parent_ids = $levels[ $level ];
 			foreach ( $_parent_ids as $parent_id ) {
-				$cache_key = "get_comment_child_ids:$parent_id:$key:$last_changed";
+				$cache_key        = "get_comment_child_ids:$parent_id:$key:$last_changed";
 				$parent_child_ids = wp_cache_get( $cache_key, 'comment' );
 				if ( false !== $parent_child_ids ) {
 					$child_ids = array_merge( $child_ids, $parent_child_ids );
@@ -979,7 +978,7 @@ class WP_Comment_Query {
 				$parent_map = array_fill_keys( $uncached_parent_ids, array() );
 				foreach ( $level_comments as $level_comment ) {
 					$parent_map[ $level_comment->comment_parent ][] = $level_comment->comment_ID;
-					$child_ids[] = $level_comment->comment_ID;
+					$child_ids[]                                    = $level_comment->comment_ID;
 				}
 
 				foreach ( $parent_map as $parent_id => $children ) {
@@ -1015,9 +1014,9 @@ class WP_Comment_Query {
 				// If the comment isn't in the reference array, it goes in the top level of the thread.
 				if ( ! isset( $ref[ $c->comment_parent ] ) ) {
 					$threaded_comments[ $_c->comment_ID ] = $_c;
-					$ref[ $_c->comment_ID ] = $threaded_comments[ $_c->comment_ID ];
+					$ref[ $_c->comment_ID ]               = $threaded_comments[ $_c->comment_ID ];
 
-				// Otherwise, set it as a child of its parent.
+					// Otherwise, set it as a child of its parent.
 				} else {
 
 					$ref[ $_c->comment_parent ]->add_child( $_c );
@@ -1059,7 +1058,7 @@ class WP_Comment_Query {
 			$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND (' . implode( ' OR ', $searches ) . ')';
 	}
 
 	/**
@@ -1111,12 +1110,12 @@ class WP_Comment_Query {
 			$parsed = "$wpdb->commentmeta.meta_value+0";
 		} elseif ( $orderby == 'comment__in' ) {
 			$comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
-			$parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
+			$parsed      = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
 		} elseif ( in_array( $orderby, $allowed_keys ) ) {
 
 			if ( isset( $meta_query_clauses[ $orderby ] ) ) {
 				$meta_clause = $meta_query_clauses[ $orderby ];
-				$parsed = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+				$parsed      = sprintf( 'CAST(%s.meta_value AS %s)', esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
 			} else {
 				$parsed = "$wpdb->comments.$orderby";
 			}
diff --git a/wp-includes/class-wp-comment.php b/wp-includes/class-wp-comment.php
index d3b96a32dc..e93d4c476e 100644
--- a/wp-includes/class-wp-comment.php
+++ b/wp-includes/class-wp-comment.php
@@ -256,13 +256,13 @@ final class WP_Comment {
 	 */
 	public function get_children( $args = array() ) {
 		$defaults = array(
-			'format' => 'tree',
-			'status' => 'all',
+			'format'       => 'tree',
+			'status'       => 'all',
 			'hierarchical' => 'threaded',
-			'orderby' => '',
+			'orderby'      => '',
 		);
 
-		$_args = wp_parse_args( $args, $defaults );
+		$_args           = wp_parse_args( $args, $defaults );
 		$_args['parent'] = $this->comment_ID;
 
 		if ( is_null( $this->children ) ) {
@@ -276,7 +276,7 @@ final class WP_Comment {
 		if ( 'flat' === $_args['format'] ) {
 			$children = array();
 			foreach ( $this->children as $child ) {
-				$child_args = $_args;
+				$child_args           = $_args;
 				$child_args['format'] = 'flat';
 				// get_children() resets this value automatically.
 				unset( $child_args['parent'] );
diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 4f289cd6e6..398d08979b 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -213,7 +213,7 @@ class WP_Customize_Control {
 		}
 
 		$this->manager = $manager;
-		$this->id = $id;
+		$this->id      = $id;
 		if ( empty( $this->active_callback ) ) {
 			$this->active_callback = array( $this, 'active_callback' );
 		}
@@ -230,8 +230,8 @@ class WP_Customize_Control {
 			foreach ( $this->settings as $key => $setting ) {
 				$settings[ $key ] = $this->manager->get_setting( $setting );
 			}
-		} else if ( is_string( $this->settings ) ) {
-			$this->setting = $this->manager->get_setting( $this->settings );
+		} elseif ( is_string( $this->settings ) ) {
+			$this->setting       = $this->manager->get_setting( $this->settings );
 			$settings['default'] = $this->setting;
 		}
 		$this->settings = $settings;
@@ -253,7 +253,7 @@ class WP_Customize_Control {
 	 */
 	final public function active() {
 		$control = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active  = call_user_func( $this->active_callback, $this );
 
 		/**
 		 * Filters response of WP_Customize_Control::active().
@@ -308,13 +308,13 @@ class WP_Customize_Control {
 			$this->json['settings'][ $key ] = $setting->id;
 		}
 
-		$this->json['type'] = $this->type;
-		$this->json['priority'] = $this->priority;
-		$this->json['active'] = $this->active();
-		$this->json['section'] = $this->section;
-		$this->json['content'] = $this->get_content();
-		$this->json['label'] = $this->label;
-		$this->json['description'] = $this->description;
+		$this->json['type']           = $this->type;
+		$this->json['priority']       = $this->priority;
+		$this->json['active']         = $this->active();
+		$this->json['section']        = $this->section;
+		$this->json['content']        = $this->get_content();
+		$this->json['label']          = $this->label;
+		$this->json['description']    = $this->description;
 		$this->json['instanceNumber'] = $this->instance_number;
 
 		if ( 'dropdown-pages' === $this->type ) {
@@ -385,8 +385,9 @@ class WP_Customize_Control {
 	 * @uses WP_Customize_Control::render()
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() )
+		if ( ! $this->check_capabilities() ) {
 			return;
+		}
 
 		/**
 		 * Fires just before the current Customizer control is rendered.
@@ -480,8 +481,8 @@ class WP_Customize_Control {
 	 * @since 3.4.0
 	 */
 	protected function render_content() {
-		$input_id = '_customize-input-' . $this->id;
-		$description_id = '_customize-description-' . $this->id;
+		$input_id         = '_customize-input-' . $this->id;
+		$description_id   = '_customize-description-' . $this->id;
 		$describedby_attr = ( ! empty( $this->description ) ) ? ' aria-describedby="' . esc_attr( $description_id ) . '" ' : '';
 		switch ( $this->type ) {
 			case 'checkbox':
@@ -513,7 +514,7 @@ class WP_Customize_Control {
 					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
 				<?php endif; ?>
 				<?php if ( ! empty( $this->description ) ) : ?>
-					<span id="<?php echo esc_attr( $description_id ); ?>" class="description customize-control-description"><?php echo $this->description ; ?></span>
+					<span id="<?php echo esc_attr( $description_id ); ?>" class="description customize-control-description"><?php echo $this->description; ?></span>
 				<?php endif; ?>
 
 				<?php foreach ( $this->choices as $value => $label ) : ?>
@@ -582,10 +583,10 @@ class WP_Customize_Control {
 				<?php endif; ?>
 
 				<?php
-				$dropdown_name = '_customize-dropdown-pages-' . $this->id;
-				$show_option_none = __( '&mdash; Select &mdash;' );
+				$dropdown_name     = '_customize-dropdown-pages-' . $this->id;
+				$show_option_none  = __( '&mdash; Select &mdash;' );
 				$option_none_value = '0';
-				$dropdown = wp_dropdown_pages(
+				$dropdown          = wp_dropdown_pages(
 					array(
 						'name'              => $dropdown_name,
 						'echo'              => 0,
@@ -595,7 +596,7 @@ class WP_Customize_Control {
 					)
 				);
 				if ( empty( $dropdown ) ) {
-					$dropdown = sprintf( '<select id="%1$s" name="%1$s">', esc_attr( $dropdown_name ) );
+					$dropdown  = sprintf( '<select id="%1$s" name="%1$s">', esc_attr( $dropdown_name ) );
 					$dropdown .= sprintf( '<option value="%1$s">%2$s</option>', esc_attr( $option_none_value ), esc_html( $show_option_none ) );
 					$dropdown .= '</select>';
 				}
diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php
index 803a509bf0..fe22d87a06 100644
--- a/wp-includes/class-wp-customize-manager.php
+++ b/wp-includes/class-wp-customize-manager.php
@@ -283,9 +283,9 @@ final class WP_Customize_Manager {
 		}
 
 		$this->original_stylesheet = get_stylesheet();
-		$this->theme = wp_get_theme( 0 === validate_file( $args['theme'] ) ? $args['theme'] : null );
-		$this->messenger_channel = $args['messenger_channel'];
-		$this->_changeset_uuid = $args['changeset_uuid'];
+		$this->theme               = wp_get_theme( 0 === validate_file( $args['theme'] ) ? $args['theme'] : null );
+		$this->messenger_channel   = $args['messenger_channel'];
+		$this->_changeset_uuid     = $args['changeset_uuid'];
 
 		foreach ( array( 'settings_previewed', 'autosaved', 'branching' ) as $key ) {
 			if ( isset( $args[ $key ] ) ) {
@@ -365,7 +365,7 @@ final class WP_Customize_Manager {
 		}
 
 		add_action( 'setup_theme', array( $this, 'setup_theme' ) );
-		add_action( 'wp_loaded',   array( $this, 'wp_loaded' ) );
+		add_action( 'wp_loaded', array( $this, 'wp_loaded' ) );
 
 		// Do not spawn cron (especially the alternate cron) while running the Customizer.
 		remove_action( 'init', 'wp_cron' );
@@ -375,18 +375,18 @@ final class WP_Customize_Manager {
 		remove_action( 'admin_init', '_maybe_update_plugins' );
 		remove_action( 'admin_init', '_maybe_update_themes' );
 
-		add_action( 'wp_ajax_customize_save',                     array( $this, 'save' ) );
-		add_action( 'wp_ajax_customize_trash',                    array( $this, 'handle_changeset_trash_request' ) );
-		add_action( 'wp_ajax_customize_refresh_nonces',           array( $this, 'refresh_nonces' ) );
-		add_action( 'wp_ajax_customize_load_themes',              array( $this, 'handle_load_themes_request' ) );
-		add_filter( 'heartbeat_settings',                         array( $this, 'add_customize_screen_to_heartbeat_settings' ) );
-		add_filter( 'heartbeat_received',                         array( $this, 'check_changeset_lock_with_heartbeat' ), 10, 3 );
-		add_action( 'wp_ajax_customize_override_changeset_lock',  array( $this, 'handle_override_changeset_lock_request' ) );
+		add_action( 'wp_ajax_customize_save', array( $this, 'save' ) );
+		add_action( 'wp_ajax_customize_trash', array( $this, 'handle_changeset_trash_request' ) );
+		add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
+		add_action( 'wp_ajax_customize_load_themes', array( $this, 'handle_load_themes_request' ) );
+		add_filter( 'heartbeat_settings', array( $this, 'add_customize_screen_to_heartbeat_settings' ) );
+		add_filter( 'heartbeat_received', array( $this, 'check_changeset_lock_with_heartbeat' ), 10, 3 );
+		add_action( 'wp_ajax_customize_override_changeset_lock', array( $this, 'handle_override_changeset_lock_request' ) );
 		add_action( 'wp_ajax_customize_dismiss_autosave_or_lock', array( $this, 'handle_dismiss_autosave_or_lock_request' ) );
 
-		add_action( 'customize_register',                 array( $this, 'register_controls' ) );
-		add_action( 'customize_register',                 array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
-		add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
+		add_action( 'customize_register', array( $this, 'register_controls' ) );
+		add_action( 'customize_register', array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
+		add_action( 'customize_controls_init', array( $this, 'prepare_controls' ) );
 		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
 
 		// Render Common, Panel, Section, and Control templates.
@@ -458,16 +458,16 @@ final class WP_Customize_Manager {
 			$settings = array(
 				'messengerArgs' => array(
 					'channel' => $this->messenger_channel,
-					'url' => wp_customize_url(),
+					'url'     => wp_customize_url(),
 				),
-				'error' => $ajax_message,
+				'error'         => $ajax_message,
 			);
 			?>
 			<script>
 			( function( api, settings ) {
 				var preview = new api.Messenger( settings.messengerArgs );
 				preview.send( 'iframe-loading-error', settings.error );
-			} )( wp.customize, <?php echo wp_json_encode( $settings ) ?> );
+			} )( wp.customize, <?php echo wp_json_encode( $settings ); ?> );
 			</script>
 			<?php
 			$message .= ob_get_clean();
@@ -613,15 +613,17 @@ final class WP_Customize_Manager {
 			$changeset_uuid = null;
 
 			if ( ! $this->branching() && $this->is_theme_active() ) {
-				$unpublished_changeset_posts = $this->get_changeset_posts( array(
-					'post_status' => array_diff( get_post_stati(), array( 'auto-draft', 'publish', 'trash', 'inherit', 'private' ) ),
-					'exclude_restore_dismissed' => false,
-					'author' => 'any',
-					'posts_per_page' => 1,
-					'order' => 'DESC',
-					'orderby' => 'date',
-				) );
-				$unpublished_changeset_post = array_shift( $unpublished_changeset_posts );
+				$unpublished_changeset_posts = $this->get_changeset_posts(
+					array(
+						'post_status'               => array_diff( get_post_stati(), array( 'auto-draft', 'publish', 'trash', 'inherit', 'private' ) ),
+						'exclude_restore_dismissed' => false,
+						'author'                    => 'any',
+						'posts_per_page'            => 1,
+						'order'                     => 'DESC',
+						'orderby'                   => 'date',
+					)
+				);
+				$unpublished_changeset_post  = array_shift( $unpublished_changeset_posts );
 				if ( ! empty( $unpublished_changeset_post ) && wp_is_uuid( $unpublished_changeset_post->post_name ) ) {
 					$changeset_uuid = $unpublished_changeset_post->post_name;
 				}
@@ -962,23 +964,25 @@ final class WP_Customize_Manager {
 	 * @return int|null Returns post ID on success and null on failure.
 	 */
 	public function find_changeset_post_id( $uuid ) {
-		$cache_group = 'customize_changeset_post';
+		$cache_group       = 'customize_changeset_post';
 		$changeset_post_id = wp_cache_get( $uuid, $cache_group );
 		if ( $changeset_post_id && 'customize_changeset' === get_post_type( $changeset_post_id ) ) {
 			return $changeset_post_id;
 		}
 
-		$changeset_post_query = new WP_Query( array(
-			'post_type' => 'customize_changeset',
-			'post_status' => get_post_stati(),
-			'name' => $uuid,
-			'posts_per_page' => 1,
-			'no_found_rows' => true,
-			'cache_results' => true,
-			'update_post_meta_cache' => false,
-			'update_post_term_cache' => false,
-			'lazy_load_term_meta' => false,
-		) );
+		$changeset_post_query = new WP_Query(
+			array(
+				'post_type'              => 'customize_changeset',
+				'post_status'            => get_post_stati(),
+				'name'                   => $uuid,
+				'posts_per_page'         => 1,
+				'no_found_rows'          => true,
+				'cache_results'          => true,
+				'update_post_meta_cache' => false,
+				'update_post_term_cache' => false,
+				'lazy_load_term_meta'    => false,
+			)
+		);
 		if ( ! empty( $changeset_post_query->posts ) ) {
 			// Note: 'fields'=>'ids' is not being used in order to cache the post object as it will be needed.
 			$changeset_post_id = $changeset_post_query->posts[0]->ID;
@@ -1007,16 +1011,16 @@ final class WP_Customize_Manager {
 	protected function get_changeset_posts( $args = array() ) {
 		$default_args = array(
 			'exclude_restore_dismissed' => true,
-			'posts_per_page' => -1,
-			'post_type' => 'customize_changeset',
-			'post_status' => 'auto-draft',
-			'order' => 'DESC',
-			'orderby' => 'date',
-			'no_found_rows' => true,
-			'cache_results' => true,
-			'update_post_meta_cache' => false,
-			'update_post_term_cache' => false,
-			'lazy_load_term_meta' => false,
+			'posts_per_page'            => -1,
+			'post_type'                 => 'customize_changeset',
+			'post_status'               => 'auto-draft',
+			'order'                     => 'DESC',
+			'orderby'                   => 'date',
+			'no_found_rows'             => true,
+			'cache_results'             => true,
+			'update_post_meta_cache'    => false,
+			'update_post_term_cache'    => false,
+			'lazy_load_term_meta'       => false,
 		);
 		if ( get_current_user_id() ) {
 			$default_args['author'] = get_current_user_id();
@@ -1027,7 +1031,7 @@ final class WP_Customize_Manager {
 			unset( $args['exclude_restore_dismissed'] );
 			$args['meta_query'] = array(
 				array(
-					'key' => '_customize_restore_dismissed',
+					'key'     => '_customize_restore_dismissed',
 					'compare' => 'NOT EXISTS',
 				),
 			);
@@ -1043,12 +1047,14 @@ final class WP_Customize_Manager {
 	 * @return int The number of auto-drafts that were dismissed.
 	 */
 	protected function dismiss_user_auto_draft_changesets() {
-		$changeset_autodraft_posts = $this->get_changeset_posts( array(
-			'post_status' => 'auto-draft',
-			'exclude_restore_dismissed' => true,
-			'posts_per_page' => -1,
-		) );
-		$dismissed = 0;
+		$changeset_autodraft_posts = $this->get_changeset_posts(
+			array(
+				'post_status'               => 'auto-draft',
+				'exclude_restore_dismissed' => true,
+				'posts_per_page'            => -1,
+			)
+		);
+		$dismissed                 = 0;
 		foreach ( $changeset_autodraft_posts as $autosave_autodraft_post ) {
 			if ( $autosave_autodraft_post->ID === $this->changeset_post_id() ) {
 				continue;
@@ -1193,11 +1199,11 @@ final class WP_Customize_Manager {
 		}
 
 		$sidebars_widgets = isset( $starter_content['widgets'] ) && ! empty( $this->widgets ) ? $starter_content['widgets'] : array();
-		$attachments = isset( $starter_content['attachments'] ) && ! empty( $this->nav_menus ) ? $starter_content['attachments'] : array();
-		$posts = isset( $starter_content['posts'] ) && ! empty( $this->nav_menus ) ? $starter_content['posts'] : array();
-		$options = isset( $starter_content['options'] ) ? $starter_content['options'] : array();
-		$nav_menus = isset( $starter_content['nav_menus'] ) && ! empty( $this->nav_menus ) ? $starter_content['nav_menus'] : array();
-		$theme_mods = isset( $starter_content['theme_mods'] ) ? $starter_content['theme_mods'] : array();
+		$attachments      = isset( $starter_content['attachments'] ) && ! empty( $this->nav_menus ) ? $starter_content['attachments'] : array();
+		$posts            = isset( $starter_content['posts'] ) && ! empty( $this->nav_menus ) ? $starter_content['posts'] : array();
+		$options          = isset( $starter_content['options'] ) ? $starter_content['options'] : array();
+		$nav_menus        = isset( $starter_content['nav_menus'] ) && ! empty( $this->nav_menus ) ? $starter_content['nav_menus'] : array();
+		$theme_mods       = isset( $starter_content['theme_mods'] ) ? $starter_content['theme_mods'] : array();
 
 		// Widgets.
 		$max_widget_numbers = array();
@@ -1217,7 +1223,7 @@ final class WP_Customize_Manager {
 					// Find the max widget number for this type.
 					$widget_numbers = array_keys( $settings );
 					if ( count( $widget_numbers ) > 0 ) {
-						$widget_numbers[] = 1;
+						$widget_numbers[]               = 1;
 						$max_widget_numbers[ $id_base ] = call_user_func_array( 'max', $widget_numbers );
 					} else {
 						$max_widget_numbers[ $id_base ] = 1;
@@ -1225,7 +1231,7 @@ final class WP_Customize_Manager {
 				}
 				$max_widget_numbers[ $id_base ] += 1;
 
-				$widget_id = sprintf( '%s-%d', $id_base, $max_widget_numbers[ $id_base ] );
+				$widget_id  = sprintf( '%s-%d', $id_base, $max_widget_numbers[ $id_base ] );
 				$setting_id = sprintf( 'widget_%s[%d]', $id_base, $max_widget_numbers[ $id_base ] );
 
 				$setting_value = $this->widgets->sanitize_widget_js_instance( $instance );
@@ -1250,9 +1256,9 @@ final class WP_Customize_Manager {
 
 		// Make an index of all the posts needed and what their slugs are.
 		$needed_posts = array();
-		$attachments = $this->prepare_starter_content_attachments( $attachments );
+		$attachments  = $this->prepare_starter_content_attachments( $attachments );
 		foreach ( $attachments as $attachment ) {
-			$key = 'attachment:' . $attachment['post_name'];
+			$key                  = 'attachment:' . $attachment['post_name'];
 			$needed_posts[ $key ] = true;
 		}
 		foreach ( array_keys( $posts ) as $post_symbol ) {
@@ -1282,12 +1288,14 @@ final class WP_Customize_Manager {
 		// Re-use auto-draft starter content posts referenced in the current customized state.
 		$existing_starter_content_posts = array();
 		if ( ! empty( $starter_content_auto_draft_post_ids ) ) {
-			$existing_posts_query = new WP_Query( array(
-				'post__in' => $starter_content_auto_draft_post_ids,
-				'post_status' => 'auto-draft',
-				'post_type' => $post_types,
-				'posts_per_page' => -1,
-			) );
+			$existing_posts_query = new WP_Query(
+				array(
+					'post__in'       => $starter_content_auto_draft_post_ids,
+					'post_status'    => 'auto-draft',
+					'post_type'      => $post_types,
+					'posts_per_page' => -1,
+				)
+			);
 			foreach ( $existing_posts_query->posts as $existing_post ) {
 				$post_name = $existing_post->post_name;
 				if ( empty( $post_name ) ) {
@@ -1299,12 +1307,14 @@ final class WP_Customize_Manager {
 
 		// Re-use non-auto-draft posts.
 		if ( ! empty( $all_post_slugs ) ) {
-			$existing_posts_query = new WP_Query( array(
-				'post_name__in' => $all_post_slugs,
-				'post_status' => array_diff( get_post_stati(), array( 'auto-draft' ) ),
-				'post_type' => 'any',
-				'posts_per_page' => -1,
-			) );
+			$existing_posts_query = new WP_Query(
+				array(
+					'post_name__in'  => $all_post_slugs,
+					'post_status'    => array_diff( get_post_stati(), array( 'auto-draft' ) ),
+					'post_type'      => 'any',
+					'posts_per_page' => -1,
+				)
+			);
 			foreach ( $existing_posts_query->posts as $existing_post ) {
 				$key = $existing_post->post_type . ':' . $existing_post->post_name;
 				if ( isset( $needed_posts[ $key ] ) && ! isset( $existing_starter_content_posts[ $key ] ) ) {
@@ -1319,16 +1329,16 @@ final class WP_Customize_Manager {
 			$attachment_ids = array();
 
 			foreach ( $attachments as $symbol => $attachment ) {
-				$file_array = array(
+				$file_array    = array(
 					'name' => $attachment['file_name'],
 				);
-				$file_path = $attachment['file_path'];
+				$file_path     = $attachment['file_path'];
 				$attachment_id = null;
 				$attached_file = null;
 				if ( isset( $existing_starter_content_posts[ 'attachment:' . $attachment['post_name'] ] ) ) {
 					$attachment_post = $existing_starter_content_posts[ 'attachment:' . $attachment['post_name'] ];
-					$attachment_id = $attachment_post->ID;
-					$attached_file = get_attached_file( $attachment_id );
+					$attachment_id   = $attachment_post->ID;
+					$attached_file   = get_attached_file( $attachment_id );
 					if ( empty( $attached_file ) || ! file_exists( $attached_file ) ) {
 						$attachment_id = null;
 						$attached_file = null;
@@ -1429,13 +1439,13 @@ final class WP_Customize_Manager {
 		}
 
 		// Nav menus.
-		$placeholder_id = -1;
+		$placeholder_id              = -1;
 		$reused_nav_menu_setting_ids = array();
 		foreach ( $nav_menus as $nav_menu_location => $nav_menu ) {
 
-			$nav_menu_term_id = null;
+			$nav_menu_term_id    = null;
 			$nav_menu_setting_id = null;
-			$matches = array();
+			$matches             = array();
 
 			// Look for an existing placeholder menu with starter content to re-use.
 			foreach ( $changeset_data as $setting_id => $setting_params ) {
@@ -1447,8 +1457,8 @@ final class WP_Customize_Manager {
 					preg_match( '#^nav_menu\[(?P<nav_menu_id>-?\d+)\]$#', $setting_id, $matches )
 				);
 				if ( $can_reuse ) {
-					$nav_menu_term_id = intval( $matches['nav_menu_id'] );
-					$nav_menu_setting_id = $setting_id;
+					$nav_menu_term_id              = intval( $matches['nav_menu_id'] );
+					$nav_menu_setting_id           = $setting_id;
 					$reused_nav_menu_setting_ids[] = $setting_id;
 					break;
 				}
@@ -1458,13 +1468,15 @@ final class WP_Customize_Manager {
 				while ( isset( $changeset_data[ sprintf( 'nav_menu[%d]', $placeholder_id ) ] ) ) {
 					$placeholder_id--;
 				}
-				$nav_menu_term_id = $placeholder_id;
+				$nav_menu_term_id    = $placeholder_id;
 				$nav_menu_setting_id = sprintf( 'nav_menu[%d]', $placeholder_id );
 			}
 
-			$this->set_post_value( $nav_menu_setting_id, array(
-				'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_location,
-			) );
+			$this->set_post_value(
+				$nav_menu_setting_id, array(
+					'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_location,
+				)
+			);
 			$this->pending_starter_content_settings_ids[] = $nav_menu_setting_id;
 
 			// @todo Add support for menu_item_parent.
@@ -1480,7 +1492,7 @@ final class WP_Customize_Manager {
 					if ( 'post_type' === $nav_menu_item['type'] && preg_match( '/^{{(?P<symbol>.+)}}$/', $nav_menu_item['object_id'], $matches ) && isset( $posts[ $matches['symbol'] ] ) ) {
 						$nav_menu_item['object_id'] = $posts[ $matches['symbol'] ]['ID'];
 						if ( empty( $nav_menu_item['title'] ) ) {
-							$original_object = get_post( $nav_menu_item['object_id'] );
+							$original_object        = get_post( $nav_menu_item['object_id'] );
 							$nav_menu_item['title'] = $original_object->post_title;
 						}
 					} else {
@@ -1535,16 +1547,16 @@ final class WP_Customize_Manager {
 
 			// Handle header image as special case since setting has a legacy format.
 			if ( 'header_image' === $name ) {
-				$name = 'header_image_data';
+				$name     = 'header_image_data';
 				$metadata = wp_get_attachment_metadata( $value );
 				if ( empty( $metadata ) ) {
 					continue;
 				}
 				$value = array(
 					'attachment_id' => $value,
-					'url' => wp_get_attachment_url( $value ),
-					'height' => $metadata['height'],
-					'width' => $metadata['width'],
+					'url'           => wp_get_attachment_url( $value ),
+					'height'        => $metadata['height'],
+					'width'         => $metadata['width'],
 				);
 			} elseif ( 'background_image' === $name ) {
 				$value = wp_get_attachment_url( $value );
@@ -1620,8 +1632,8 @@ final class WP_Customize_Manager {
 				}
 			}
 
-			$attachment['file_name'] = $file_name;
-			$attachment['file_path'] = $file_path;
+			$attachment['file_name']         = $file_name;
+			$attachment['file_path']         = $file_path;
 			$prepared_attachments[ $symbol ] = $attachment;
 		}
 		return $prepared_attachments;
@@ -1638,10 +1650,12 @@ final class WP_Customize_Manager {
 			return;
 		}
 
-		$this->save_changeset_post( array(
-			'data' => array_fill_keys( $this->pending_starter_content_settings_ids, array( 'starter_content' => true ) ),
-			'starter_content' => true,
-		) );
+		$this->save_changeset_post(
+			array(
+				'data'            => array_fill_keys( $this->pending_starter_content_settings_ids, array( 'starter_content' => true ) ),
+				'starter_content' => true,
+			)
+		);
 		$this->saved_starter_content_changeset = true;
 
 		$this->pending_starter_content_settings_ids = array();
@@ -1688,7 +1702,7 @@ final class WP_Customize_Manager {
 		// Let default values be from the stashed theme mods if doing a theme switch and if no changeset is present.
 		if ( ! $this->is_theme_active() ) {
 			$stashed_theme_mods = get_option( 'customize_stashed_theme_mods' );
-			$stylesheet = $this->get_stylesheet();
+			$stylesheet         = $this->get_stylesheet();
 			if ( isset( $stashed_theme_mods[ $stylesheet ] ) ) {
 				$values = array_merge( $values, wp_list_pluck( $stashed_theme_mods[ $stylesheet ], 'value' ) );
 			}
@@ -1876,8 +1890,8 @@ final class WP_Customize_Manager {
 	 * @return array Headers.
 	 */
 	public function filter_iframe_security_headers( $headers ) {
-		$customize_url = admin_url( 'customize.php' );
-		$headers['X-Frame-Options'] = 'ALLOW-FROM ' . $customize_url;
+		$customize_url                      = admin_url( 'customize.php' );
+		$headers['X-Frame-Options']         = 'ALLOW-FROM ' . $customize_url;
 		$headers['Content-Security-Policy'] = 'frame-ancestors ' . preg_replace( '#^(\w+://[^/]+).+?$#', '$1', $customize_url );
 		return $headers;
 	}
@@ -1894,10 +1908,10 @@ final class WP_Customize_Manager {
 	 */
 	public function add_state_query_params( $url ) {
 		$parsed_original_url = wp_parse_url( $url );
-		$is_allowed = false;
+		$is_allowed          = false;
 		foreach ( $this->get_allowed_urls() as $allowed_url ) {
 			$parsed_allowed_url = wp_parse_url( $allowed_url );
-			$is_allowed = (
+			$is_allowed         = (
 				$parsed_allowed_url['scheme'] === $parsed_original_url['scheme']
 				&&
 				$parsed_allowed_url['host'] === $parsed_original_url['host']
@@ -1962,7 +1976,8 @@ final class WP_Customize_Manager {
 	 * @since 4.2.0
 	 */
 	public function customize_preview_loading_style() {
-		?><style>
+		?>
+		<style>
 			body.wp-customizer-unloading {
 				opacity: 0.25;
 				cursor: progress !important;
@@ -1980,7 +1995,8 @@ final class WP_Customize_Manager {
 			area.customize-unpreviewable {
 				cursor: not-allowed !important;
 			}
-		</style><?php
+		</style>
+		<?php
 	}
 
 	/**
@@ -2026,20 +2042,20 @@ final class WP_Customize_Manager {
 	 * @since 3.4.0
 	 */
 	public function customize_preview_settings() {
-		$post_values = $this->unsanitized_post_values( array( 'exclude_changeset' => true ) );
-		$setting_validities = $this->validate_setting_values( $post_values );
+		$post_values                 = $this->unsanitized_post_values( array( 'exclude_changeset' => true ) );
+		$setting_validities          = $this->validate_setting_values( $post_values );
 		$exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
 
 		// Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installations.
-		$self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$self_url           = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
 		$state_query_params = array(
 			'customize_theme',
 			'customize_changeset_uuid',
 			'customize_messenger_channel',
 		);
-		$self_url = remove_query_arg( $state_query_params, $self_url );
+		$self_url           = remove_query_arg( $state_query_params, $self_url );
 
-		$allowed_urls = $this->get_allowed_urls();
+		$allowed_urls  = $this->get_allowed_urls();
 		$allowed_hosts = array();
 		foreach ( $allowed_urls as $allowed_url ) {
 			$parsed = wp_parse_url( $allowed_url );
@@ -2054,8 +2070,8 @@ final class WP_Customize_Manager {
 		}
 
 		$switched_locale = switch_to_locale( get_user_locale() );
-		$l10n = array(
-			'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+		$l10n            = array(
+			'shiftClickToEdit'  => __( 'Shift-click to edit this element.' ),
 			'linkUnpreviewable' => __( 'This link is not live-previewable.' ),
 			'formUnpreviewable' => __( 'This form is not live-previewable.' ),
 		);
@@ -2064,32 +2080,32 @@ final class WP_Customize_Manager {
 		}
 
 		$settings = array(
-			'changeset' => array(
-				'uuid' => $this->changeset_uuid(),
+			'changeset'         => array(
+				'uuid'      => $this->changeset_uuid(),
 				'autosaved' => $this->autosaved(),
 			),
-			'timeouts' => array(
+			'timeouts'          => array(
 				'selectiveRefresh' => 250,
-				'keepAliveSend' => 1000,
+				'keepAliveSend'    => 1000,
 			),
-			'theme' => array(
+			'theme'             => array(
 				'stylesheet' => $this->get_stylesheet(),
 				'active'     => $this->is_theme_active(),
 			),
-			'url' => array(
-				'self' => $self_url,
-				'allowed' => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
-				'allowedHosts' => array_unique( $allowed_hosts ),
+			'url'               => array(
+				'self'          => $self_url,
+				'allowed'       => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
+				'allowedHosts'  => array_unique( $allowed_hosts ),
 				'isCrossDomain' => $this->is_cross_domain(),
 			),
-			'channel' => $this->messenger_channel,
-			'activePanels' => array(),
-			'activeSections' => array(),
-			'activeControls' => array(),
+			'channel'           => $this->messenger_channel,
+			'activePanels'      => array(),
+			'activeSections'    => array(),
+			'activeControls'    => array(),
 			'settingValidities' => $exported_setting_validities,
-			'nonce' => current_user_can( 'customize' ) ? $this->get_nonces() : array(),
-			'l10n' => $l10n,
-			'_dirty' => array_keys( $post_values ),
+			'nonce'             => current_user_can( 'customize' ) ? $this->get_nonces() : array(),
+			'l10n'              => $l10n,
+			'_dirty'            => array_keys( $post_values ),
 		);
 
 		foreach ( $this->panels as $panel_id => $panel ) {
@@ -2228,7 +2244,7 @@ final class WP_Customize_Manager {
 	 * @return string Theme name.
 	 */
 	public function current_theme( $current_theme ) {
-		return $this->theme()->display('Name');
+		return $this->theme()->display( 'Name' );
 	}
 
 	/**
@@ -2254,10 +2270,12 @@ final class WP_Customize_Manager {
 	 * @return array Mapping of setting IDs to return value of validate method calls, either `true` or `WP_Error`.
 	 */
 	public function validate_setting_values( $setting_values, $options = array() ) {
-		$options = wp_parse_args( $options, array(
-			'validate_capability' => false,
-			'validate_existence' => false,
-		) );
+		$options = wp_parse_args(
+			$options, array(
+				'validate_capability' => false,
+				'validate_existence'  => false,
+			)
+		);
 
 		$validities = array();
 		foreach ( $setting_values as $setting_id => $unsanitized_value ) {
@@ -2318,7 +2336,7 @@ final class WP_Customize_Manager {
 			foreach ( $validity->errors as $error_code => $error_messages ) {
 				$notification[ $error_code ] = array(
 					'message' => join( ' ', $error_messages ),
-					'data' => $validity->get_error_data( $error_code ),
+					'data'    => $validity->get_error_data( $error_code ),
 				);
 			}
 			return $notification;
@@ -2348,7 +2366,7 @@ final class WP_Customize_Manager {
 		}
 
 		$changeset_post_id = $this->changeset_post_id();
-		$is_new_changeset = empty( $changeset_post_id );
+		$is_new_changeset  = empty( $changeset_post_id );
 		if ( $is_new_changeset ) {
 			if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->create_posts ) ) {
 				wp_send_json_error( 'cannot_create_changeset_post' );
@@ -2375,7 +2393,7 @@ final class WP_Customize_Manager {
 		}
 
 		// Validate changeset status param.
-		$is_publish = null;
+		$is_publish       = null;
 		$changeset_status = null;
 		if ( isset( $_POST['customize_changeset_status'] ) ) {
 			$changeset_status = wp_unslash( $_POST['customize_changeset_status'] );
@@ -2398,9 +2416,9 @@ final class WP_Customize_Manager {
 		if ( isset( $_POST['customize_changeset_date'] ) ) {
 			$changeset_date = wp_unslash( $_POST['customize_changeset_date'] );
 			if ( preg_match( '/^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$/', $changeset_date ) ) {
-				$mm = substr( $changeset_date, 5, 2 );
-				$jj = substr( $changeset_date, 8, 2 );
-				$aa = substr( $changeset_date, 0, 4 );
+				$mm         = substr( $changeset_date, 5, 2 );
+				$jj         = substr( $changeset_date, 8, 2 );
+				$aa         = substr( $changeset_date, 0, 4 );
 				$valid_date = wp_checkdate( $mm, $jj, $aa, $changeset_date );
 				if ( ! $valid_date ) {
 					wp_send_json_error( 'bad_customize_changeset_date', 400 );
@@ -2416,15 +2434,15 @@ final class WP_Customize_Manager {
 		}
 
 		$lock_user_id = null;
-		$autosave = ! empty( $_POST['customize_changeset_autosave'] );
+		$autosave     = ! empty( $_POST['customize_changeset_autosave'] );
 		if ( ! $is_new_changeset ) {
 			$lock_user_id = wp_check_post_lock( $this->changeset_post_id() );
 		}
 
 		// Force request to autosave when changeset is locked.
 		if ( $lock_user_id && ! $autosave ) {
-			$autosave = true;
-			$changeset_status = null;
+			$autosave           = true;
+			$changeset_status   = null;
 			$changeset_date_gmt = null;
 		}
 
@@ -2433,13 +2451,15 @@ final class WP_Customize_Manager {
 		}
 
 		$autosaved = false;
-		$r = $this->save_changeset_post( array(
-			'status' => $changeset_status,
-			'title' => $changeset_title,
-			'date_gmt' => $changeset_date_gmt,
-			'data' => $input_changeset_data,
-			'autosave' => $autosave,
-		) );
+		$r         = $this->save_changeset_post(
+			array(
+				'status'   => $changeset_status,
+				'title'    => $changeset_title,
+				'date_gmt' => $changeset_date_gmt,
+				'data'     => $input_changeset_data,
+				'autosave' => $autosave,
+			)
+		);
 		if ( $autosave && ! is_wp_error( $r ) ) {
 			$autosaved = true;
 		}
@@ -2458,7 +2478,7 @@ final class WP_Customize_Manager {
 		if ( is_wp_error( $r ) ) {
 			$response = array(
 				'message' => $r->get_error_message(),
-				'code' => $r->get_error_code(),
+				'code'    => $r->get_error_code(),
 			);
 			if ( is_array( $r->get_error_data() ) ) {
 				$response = array_merge( $response, $r->get_error_data() );
@@ -2466,7 +2486,7 @@ final class WP_Customize_Manager {
 				$response['data'] = $r->get_error_data();
 			}
 		} else {
-			$response = $r;
+			$response       = $r;
 			$changeset_post = get_post( $this->changeset_post_id() );
 
 			// Dismiss all other auto-draft changeset posts for this user (they serve like autosave revisions), as there should only be one.
@@ -2544,18 +2564,18 @@ final class WP_Customize_Manager {
 
 		$args = array_merge(
 			array(
-				'status' => null,
-				'title' => null,
-				'data' => array(),
-				'date_gmt' => null,
-				'user_id' => get_current_user_id(),
+				'status'          => null,
+				'title'           => null,
+				'data'            => array(),
+				'date_gmt'        => null,
+				'user_id'         => get_current_user_id(),
 				'starter_content' => false,
-				'autosave' => false,
+				'autosave'        => false,
 			),
 			$args
 		);
 
-		$changeset_post_id = $this->changeset_post_id();
+		$changeset_post_id       = $this->changeset_post_id();
 		$existing_changeset_data = array();
 		if ( $changeset_post_id ) {
 			$existing_status = get_post_status( $changeset_post_id );
@@ -2621,7 +2641,7 @@ final class WP_Customize_Manager {
 
 		// The request was made via wp.customize.previewer.save().
 		$update_transactionally = (bool) $args['status'];
-		$allow_revision = (bool) $args['status'];
+		$allow_revision         = (bool) $args['status'];
 
 		// Amend post values with any supplied data.
 		foreach ( $args['data'] as $setting_id => $setting_params ) {
@@ -2631,10 +2651,12 @@ final class WP_Customize_Manager {
 		}
 
 		// Note that in addition to post data, this will include any stashed theme mods.
-		$post_values = $this->unsanitized_post_values( array(
-			'exclude_changeset' => true,
-			'exclude_post_data' => false,
-		) );
+		$post_values = $this->unsanitized_post_values(
+			array(
+				'exclude_changeset' => true,
+				'exclude_post_data' => false,
+			)
+		);
 		$this->add_dynamic_settings( array_keys( $post_values ) ); // Ensure settings get created even if they lack an input value.
 
 		/*
@@ -2681,14 +2703,16 @@ final class WP_Customize_Manager {
 		do_action( 'customize_save_validation_before', $this );
 
 		// Validate settings.
-		$validated_values = array_merge(
+		$validated_values      = array_merge(
 			array_fill_keys( array_keys( $args['data'] ), null ), // Make sure existence/capability checks are done on value-less setting updates.
 			$post_values
 		);
-		$setting_validities = $this->validate_setting_values( $validated_values, array(
-			'validate_capability' => true,
-			'validate_existence' => true,
-		) );
+		$setting_validities    = $this->validate_setting_values(
+			$validated_values, array(
+				'validate_capability' => true,
+				'validate_existence'  => true,
+			)
+		);
 		$invalid_setting_count = count( array_filter( $setting_validities, 'is_wp_error' ) );
 
 		/*
@@ -2699,14 +2723,14 @@ final class WP_Customize_Manager {
 			$response = array(
 				'setting_validities' => $setting_validities,
 				/* translators: %s: number of invalid settings */
-				'message' => sprintf( _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', $invalid_setting_count ), number_format_i18n( $invalid_setting_count ) ),
+				'message'            => sprintf( _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', $invalid_setting_count ), number_format_i18n( $invalid_setting_count ) ),
 			);
 			return new WP_Error( 'transaction_fail', '', $response );
 		}
 
 		// Obtain/merge data for changeset.
 		$original_changeset_data = $this->get_changeset_post_data( $changeset_post_id );
-		$data = $original_changeset_data;
+		$data                    = $original_changeset_data;
 		if ( is_wp_error( $data ) ) {
 			$data = array();
 		}
@@ -2757,8 +2781,8 @@ final class WP_Customize_Manager {
 				$data[ $changeset_setting_id ] = array_merge(
 					$merged_setting_params,
 					array(
-						'type' => $setting->type,
-						'user_id' => $args['user_id'],
+						'type'              => $setting->type,
+						'user_id'           => $args['user_id'],
 						'date_modified_gmt' => current_time( 'mysql', true ),
 					)
 				);
@@ -2771,13 +2795,13 @@ final class WP_Customize_Manager {
 		}
 
 		$filter_context = array(
-			'uuid' => $this->changeset_uuid(),
-			'title' => $args['title'],
-			'status' => $args['status'],
-			'date_gmt' => $args['date_gmt'],
-			'post_id' => $changeset_post_id,
+			'uuid'          => $this->changeset_uuid(),
+			'title'         => $args['title'],
+			'status'        => $args['status'],
+			'date_gmt'      => $args['date_gmt'],
+			'post_id'       => $changeset_post_id,
 			'previous_data' => is_wp_error( $original_changeset_data ) ? array() : $original_changeset_data,
-			'manager' => $this,
+			'manager'       => $this,
 		);
 
 		/**
@@ -2817,7 +2841,7 @@ final class WP_Customize_Manager {
 			$json_options |= JSON_UNESCAPED_SLASHES; // Introduced in PHP 5.4. This is only to improve readability as slashes needn't be escaped in storage.
 		}
 		$json_options |= JSON_PRETTY_PRINT; // Also introduced in PHP 5.4, but WP defines constant for back compat. See WP Trac #30139.
-		$post_array = array(
+		$post_array    = array(
 			'post_content' => wp_json_encode( $data, $json_options ),
 		);
 		if ( $args['title'] ) {
@@ -2826,8 +2850,8 @@ final class WP_Customize_Manager {
 		if ( $changeset_post_id ) {
 			$post_array['ID'] = $changeset_post_id;
 		} else {
-			$post_array['post_type'] = 'customize_changeset';
-			$post_array['post_name'] = $this->changeset_uuid();
+			$post_array['post_type']   = 'customize_changeset';
+			$post_array['post_name']   = $this->changeset_uuid();
 			$post_array['post_status'] = 'auto-draft';
 		}
 		if ( $args['status'] ) {
@@ -2837,17 +2861,17 @@ final class WP_Customize_Manager {
 		// Reset post date to now if we are publishing, otherwise pass post_date_gmt and translate for post_date.
 		if ( 'publish' === $args['status'] ) {
 			$post_array['post_date_gmt'] = '0000-00-00 00:00:00';
-			$post_array['post_date'] = '0000-00-00 00:00:00';
+			$post_array['post_date']     = '0000-00-00 00:00:00';
 		} elseif ( $args['date_gmt'] ) {
 			$post_array['post_date_gmt'] = $args['date_gmt'];
-			$post_array['post_date'] = get_date_from_gmt( $args['date_gmt'] );
+			$post_array['post_date']     = get_date_from_gmt( $args['date_gmt'] );
 		} elseif ( $changeset_post_id && 'auto-draft' === get_post_status( $changeset_post_id ) ) {
 			/*
 			 * Keep bumping the date for the auto-draft whenever it is modified;
 			 * this extends its life, preserving it from garbage-collection via
 			 * wp_delete_auto_drafts().
 			 */
-			$post_array['post_date'] = current_time( 'mysql' );
+			$post_array['post_date']     = current_time( 'mysql' );
 			$post_array['post_date_gmt'] = '';
 		}
 
@@ -2865,13 +2889,13 @@ final class WP_Customize_Manager {
 			if ( $args['autosave'] && 'auto-draft' !== get_post_status( $changeset_post_id ) ) {
 				// See _wp_translate_postdata() for why this is required as it will use the edit_post meta capability.
 				add_filter( 'map_meta_cap', array( $this, 'grant_edit_post_capability_for_changeset' ), 10, 4 );
-				$post_array['post_ID'] = $post_array['ID'];
+				$post_array['post_ID']   = $post_array['ID'];
 				$post_array['post_type'] = 'customize_changeset';
-				$r = wp_create_post_autosave( wp_slash( $post_array ) );
+				$r                       = wp_create_post_autosave( wp_slash( $post_array ) );
 				remove_filter( 'map_meta_cap', array( $this, 'grant_edit_post_capability_for_changeset' ), 10 );
 			} else {
 				$post_array['edit_date'] = true; // Prevent date clearing.
-				$r = wp_update_post( wp_slash( $post_array ), true );
+				$r                       = wp_update_post( wp_slash( $post_array ), true );
 
 				// Delete autosave revision when the changeset is updated.
 				$autosave_draft = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
@@ -2992,48 +3016,60 @@ final class WP_Customize_Manager {
 		}
 
 		if ( ! check_ajax_referer( 'trash_customize_changeset', 'nonce', false ) ) {
-			wp_send_json_error( array(
-				'code' => 'invalid_nonce',
-				'message' => __( 'There was an authentication problem. Please reload and try again.' ),
-			) );
+			wp_send_json_error(
+				array(
+					'code'    => 'invalid_nonce',
+					'message' => __( 'There was an authentication problem. Please reload and try again.' ),
+				)
+			);
 		}
 
 		$changeset_post_id = $this->changeset_post_id();
 
 		if ( ! $changeset_post_id ) {
-			wp_send_json_error( array(
-				'message' => __( 'No changes saved yet, so there is nothing to trash.' ),
-				'code' => 'non_existent_changeset',
-			) );
+			wp_send_json_error(
+				array(
+					'message' => __( 'No changes saved yet, so there is nothing to trash.' ),
+					'code'    => 'non_existent_changeset',
+				)
+			);
 			return;
 		}
 
 		if ( $changeset_post_id && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
-			wp_send_json_error( array(
-				'code' => 'changeset_trash_unauthorized',
-				'message' => __( 'Unable to trash changes.' ),
-			) );
+			wp_send_json_error(
+				array(
+					'code'    => 'changeset_trash_unauthorized',
+					'message' => __( 'Unable to trash changes.' ),
+				)
+			);
 		}
 
 		if ( 'trash' === get_post_status( $changeset_post_id ) ) {
-			wp_send_json_error( array(
-				'message' => __( 'Changes have already been trashed.' ),
-				'code' => 'changeset_already_trashed',
-			) );
+			wp_send_json_error(
+				array(
+					'message' => __( 'Changes have already been trashed.' ),
+					'code'    => 'changeset_already_trashed',
+				)
+			);
 			return;
 		}
 
 		$r = $this->trash_changeset_post( $changeset_post_id );
 		if ( ! ( $r instanceof WP_Post ) ) {
-			wp_send_json_error( array(
-				'code' => 'changeset_trash_failure',
-				'message' => __( 'Unable to trash changes.' ),
-			) );
+			wp_send_json_error(
+				array(
+					'code'    => 'changeset_trash_failure',
+					'message' => __( 'Unable to trash changes.' ),
+				)
+			);
 		}
 
-		wp_send_json_success( array(
-			'message' => __( 'Changes trashed successfully.' ),
-		) );
+		wp_send_json_success(
+			array(
+				'message' => __( 'Changes trashed successfully.' ),
+			)
+		);
 	}
 
 	/**
@@ -3060,7 +3096,7 @@ final class WP_Customize_Manager {
 	public function grant_edit_post_capability_for_changeset( $caps, $cap, $user_id, $args ) {
 		if ( 'edit_post' === $cap && ! empty( $args[0] ) && 'customize_changeset' === get_post_type( $args[0] ) ) {
 			$post_type_obj = get_post_type_object( 'customize_changeset' );
-			$caps = map_meta_cap( $post_type_obj->cap->$cap, $user_id );
+			$caps          = map_meta_cap( $post_type_obj->cap->$cap, $user_id );
 		}
 		return $caps;
 	}
@@ -3105,7 +3141,7 @@ final class WP_Customize_Manager {
 		$lock = explode( ':', $lock );
 
 		if ( $lock && ! empty( $lock[1] ) ) {
-			$user_id = intval( $lock[1] );
+			$user_id         = intval( $lock[1] );
 			$current_user_id = get_current_user_id();
 			if ( $user_id === $current_user_id ) {
 				$lock = sprintf( '%s:%s', time(), $user_id );
@@ -3146,8 +3182,8 @@ final class WP_Customize_Manager {
 			return null;
 		}
 		return array(
-			'id' => $lock_user->ID,
-			'name' => $lock_user->display_name,
+			'id'     => $lock_user->ID,
+			'name'   => $lock_user->display_name,
 			'avatar' => get_avatar_url( $lock_user->ID, array( 'size' => 128 ) ),
 		);
 	}
@@ -3189,26 +3225,32 @@ final class WP_Customize_Manager {
 		}
 
 		if ( ! check_ajax_referer( 'customize_override_changeset_lock', 'nonce', false ) ) {
-			wp_send_json_error( array(
-				'code' => 'invalid_nonce',
-				'message' => __( 'Security check failed.' ),
-			) );
+			wp_send_json_error(
+				array(
+					'code'    => 'invalid_nonce',
+					'message' => __( 'Security check failed.' ),
+				)
+			);
 		}
 
 		$changeset_post_id = $this->changeset_post_id();
 
 		if ( empty( $changeset_post_id ) ) {
-			wp_send_json_error( array(
-				'code' => 'no_changeset_found_to_take_over',
-				'message' => __( 'No changeset found to take over' ),
-			) );
+			wp_send_json_error(
+				array(
+					'code'    => 'no_changeset_found_to_take_over',
+					'message' => __( 'No changeset found to take over' ),
+				)
+			);
 		}
 
 		if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post_id ) ) {
-			wp_send_json_error( array(
-				'code' => 'cannot_remove_changeset_lock',
-				'message' => __( 'Sorry, you are not allowed to take over.' ),
-			) );
+			wp_send_json_error(
+				array(
+					'code'    => 'cannot_remove_changeset_lock',
+					'message' => __( 'Sorry, you are not allowed to take over.' ),
+				)
+			);
 		}
 
 		$this->set_changeset_lock( $changeset_post_id, true );
@@ -3288,12 +3330,12 @@ final class WP_Customize_Manager {
 		$this->_changeset_data      = $publishing_changeset_data;
 
 		// Parse changeset data to identify theme mod settings and user IDs associated with settings to be saved.
-		$setting_user_ids = array();
+		$setting_user_ids   = array();
 		$theme_mod_settings = array();
-		$namespace_pattern = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
-		$matches = array();
+		$namespace_pattern  = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
+		$matches            = array();
 		foreach ( $this->_changeset_data as $raw_setting_id => $setting_params ) {
-			$actual_setting_id = null;
+			$actual_setting_id    = null;
 			$is_theme_mod_setting = (
 				isset( $setting_params['value'] )
 				&&
@@ -3322,11 +3364,13 @@ final class WP_Customize_Manager {
 			}
 		}
 
-		$changeset_setting_values = $this->unsanitized_post_values( array(
-			'exclude_post_data' => true,
-			'exclude_changeset' => false,
-		) );
-		$changeset_setting_ids = array_keys( $changeset_setting_values );
+		$changeset_setting_values = $this->unsanitized_post_values(
+			array(
+				'exclude_post_data' => true,
+				'exclude_changeset' => false,
+			)
+		);
+		$changeset_setting_ids    = array_keys( $changeset_setting_values );
 		$this->add_dynamic_settings( $changeset_setting_ids );
 
 		/**
@@ -3350,7 +3394,7 @@ final class WP_Customize_Manager {
 			$setting = $this->get_setting( $setting_id );
 			if ( $setting && ! isset( $setting_user_ids[ $setting_id ] ) ) {
 				$original_setting_capabilities[ $setting->id ] = $setting->capability;
-				$setting->capability = 'exist';
+				$setting->capability                           = 'exist';
 			}
 		}
 
@@ -3417,8 +3461,8 @@ final class WP_Customize_Manager {
 					$wpdb->posts,
 					array(
 						'post_status' => 'auto-draft',
-						'post_type' => 'customize_changeset',
-						'post_name' => wp_generate_uuid4(),
+						'post_type'   => 'customize_changeset',
+						'post_name'   => wp_generate_uuid4(),
 						'post_parent' => 0,
 					),
 					array(
@@ -3462,7 +3506,7 @@ final class WP_Customize_Manager {
 		}
 
 		$autoload = false;
-		$result = update_option( 'customize_stashed_theme_mods', $stashed_theme_mod_settings, $autoload );
+		$result   = update_option( 'customize_stashed_theme_mods', $stashed_theme_mod_settings, $autoload );
 		if ( ! $result ) {
 			return false;
 		}
@@ -3497,8 +3541,8 @@ final class WP_Customize_Manager {
 		}
 
 		$changeset_post_id = $this->changeset_post_id();
-		$dismiss_lock = ! empty( $_POST['dismiss_lock'] );
-		$dismiss_autosave = ! empty( $_POST['dismiss_autosave'] );
+		$dismiss_lock      = ! empty( $_POST['dismiss_lock'] );
+		$dismiss_autosave  = ! empty( $_POST['dismiss_autosave'] );
 
 		if ( $dismiss_lock ) {
 			if ( empty( $changeset_post_id ) && ! $dismiss_autosave ) {
@@ -3563,7 +3607,7 @@ final class WP_Customize_Manager {
 	 *  @type string       $transport             Options for rendering the live preview of changes in Theme Customizer.
 	 *                                            Using 'refresh' makes the change visible by reloading the whole preview.
 	 *                                            Using 'postMessage' allows a custom JavaScript to handle live changes.
-	 *                                            @link https://developer.wordpress.org/themes/customize-api
+	 * @link https://developer.wordpress.org/themes/customize-api
 	 *                                            Default is 'refresh'
 	 *  @type callable     $validate_callback     Server-side validation callback for the setting's value.
 	 *  @type callable     $sanitize_callback     Callback to filter a Customize setting value in un-slashed form.
@@ -3614,7 +3658,7 @@ final class WP_Customize_Manager {
 				continue;
 			}
 
-			$setting_args = false;
+			$setting_args  = false;
 			$setting_class = 'WP_Customize_Setting';
 
 			/**
@@ -3734,7 +3778,8 @@ final class WP_Customize_Manager {
 		// Removing core components this way is _doing_it_wrong().
 		if ( in_array( $id, $this->components, true ) ) {
 			/* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
-			$message = sprintf( __( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
+			$message = sprintf(
+				__( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
 				$id,
 				'<a href="' . esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ) . '"><code>customize_loaded_components</code></a>'
 			);
@@ -3813,8 +3858,9 @@ final class WP_Customize_Manager {
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
 	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
+		if ( isset( $this->sections[ $id ] ) ) {
 			return $this->sections[ $id ];
+		}
 	}
 
 	/**
@@ -3904,8 +3950,9 @@ final class WP_Customize_Manager {
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
 	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
+		if ( isset( $this->controls[ $id ] ) ) {
 			return $this->controls[ $id ];
+		}
 	}
 
 	/**
@@ -3940,9 +3987,11 @@ final class WP_Customize_Manager {
 	 */
 	public function render_control_templates() {
 		foreach ( $this->registered_control_types as $control_type ) {
-			$control = new $control_type( $this, 'temp', array(
-				'settings' => array(),
-			) );
+			$control = new $control_type(
+				$this, 'temp', array(
+					'settings' => array(),
+				)
+			);
 			$control->print_template();
 		}
 		?>
@@ -4216,11 +4265,13 @@ final class WP_Customize_Manager {
 	 */
 	public function prepare_controls() {
 
-		$controls = array();
-		$this->controls = wp_list_sort( $this->controls, array(
-			'priority'        => 'ASC',
-			'instance_number' => 'ASC',
-		), 'ASC', true );
+		$controls       = array();
+		$this->controls = wp_list_sort(
+			$this->controls, array(
+				'priority'        => 'ASC',
+				'instance_number' => 'ASC',
+			), 'ASC', true
+		);
 
 		foreach ( $this->controls as $id => $control ) {
 			if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
@@ -4228,27 +4279,30 @@ final class WP_Customize_Manager {
 			}
 
 			$this->sections[ $control->section ]->controls[] = $control;
-			$controls[ $id ] = $control;
+			$controls[ $id ]                                 = $control;
 		}
 		$this->controls = $controls;
 
 		// Prepare sections.
-		$this->sections = wp_list_sort( $this->sections, array(
-			'priority'        => 'ASC',
-			'instance_number' => 'ASC',
-		), 'ASC', true );
-		$sections = array();
+		$this->sections = wp_list_sort(
+			$this->sections, array(
+				'priority'        => 'ASC',
+				'instance_number' => 'ASC',
+			), 'ASC', true
+		);
+		$sections       = array();
 
 		foreach ( $this->sections as $section ) {
 			if ( ! $section->check_capabilities() ) {
 				continue;
 			}
 
-
-			$section->controls = wp_list_sort( $section->controls, array(
-				'priority'        => 'ASC',
-				'instance_number' => 'ASC',
-			) );
+			$section->controls = wp_list_sort(
+				$section->controls, array(
+					'priority'        => 'ASC',
+					'instance_number' => 'ASC',
+				)
+			);
 
 			if ( ! $section->panel ) {
 				// Top-level section.
@@ -4263,31 +4317,37 @@ final class WP_Customize_Manager {
 		$this->sections = $sections;
 
 		// Prepare panels.
-		$this->panels = wp_list_sort( $this->panels, array(
-			'priority'        => 'ASC',
-			'instance_number' => 'ASC',
-		), 'ASC', true );
-		$panels = array();
+		$this->panels = wp_list_sort(
+			$this->panels, array(
+				'priority'        => 'ASC',
+				'instance_number' => 'ASC',
+			), 'ASC', true
+		);
+		$panels       = array();
 
 		foreach ( $this->panels as $panel ) {
 			if ( ! $panel->check_capabilities() ) {
 				continue;
 			}
 
-			$panel->sections = wp_list_sort( $panel->sections, array(
-				'priority'        => 'ASC',
-				'instance_number' => 'ASC',
-			), 'ASC', true );
+			$panel->sections      = wp_list_sort(
+				$panel->sections, array(
+					'priority'        => 'ASC',
+					'instance_number' => 'ASC',
+				), 'ASC', true
+			);
 			$panels[ $panel->id ] = $panel;
 		}
 		$this->panels = $panels;
 
 		// Sort panels and top-level sections together.
 		$this->containers = array_merge( $this->panels, $this->sections );
-		$this->containers = wp_list_sort( $this->containers, array(
-			'priority'        => 'ASC',
-			'instance_number' => 'ASC',
-		), 'ASC', true );
+		$this->containers = wp_list_sort(
+			$this->containers, array(
+				'priority'        => 'ASC',
+				'instance_number' => 'ASC',
+			), 'ASC', true
+		);
 	}
 
 	/**
@@ -4302,9 +4362,11 @@ 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(
-				'totals' => wp_get_update_data(),
-			) );
+			wp_localize_script(
+				'updates', '_wpUpdatesItemCounts', array(
+					'totals' => wp_get_update_data(),
+				)
+			);
 		}
 	}
 
@@ -4348,7 +4410,7 @@ final class WP_Customize_Manager {
 	 * @param string $preview_url URL to be previewed.
 	 */
 	public function set_preview_url( $preview_url ) {
-		$preview_url = esc_url_raw( $preview_url );
+		$preview_url       = esc_url_raw( $preview_url );
 		$this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
 	}
 
@@ -4377,7 +4439,7 @@ final class WP_Customize_Manager {
 	 */
 	public function is_cross_domain() {
 		$admin_origin = wp_parse_url( admin_url() );
-		$home_origin = wp_parse_url( home_url() );
+		$home_origin  = wp_parse_url( home_url() );
 		$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
 		return $cross_domain;
 	}
@@ -4436,9 +4498,9 @@ final class WP_Customize_Manager {
 	 * @param string $return_url URL for return link.
 	 */
 	public function set_return_url( $return_url ) {
-		$return_url = esc_url_raw( $return_url );
-		$return_url = remove_query_arg( wp_removable_query_args(), $return_url );
-		$return_url = wp_validate_redirect( $return_url );
+		$return_url       = esc_url_raw( $return_url );
+		$return_url       = remove_query_arg( wp_removable_query_args(), $return_url );
+		$return_url       = wp_validate_redirect( $return_url );
 		$this->return_url = $return_url;
 	}
 
@@ -4450,14 +4512,14 @@ final class WP_Customize_Manager {
 	 * @return string URL for link to close Customizer.
 	 */
 	public function get_return_url() {
-		$referer = wp_get_referer();
+		$referer                    = wp_get_referer();
 		$excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
 
 		if ( $this->return_url ) {
 			$return_url = $this->return_url;
-		} else if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+		} elseif ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
 			$return_url = $referer;
-		} else if ( $this->preview_url ) {
+		} elseif ( $this->preview_url ) {
 			$return_url = $this->preview_url;
 		} else {
 			$return_url = home_url( '/' );
@@ -4508,12 +4570,12 @@ final class WP_Customize_Manager {
 	 */
 	public function get_nonces() {
 		$nonces = array(
-			'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
-			'switch_themes' => wp_create_nonce( 'switch_themes' ),
+			'save'                     => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
+			'preview'                  => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
+			'switch_themes'            => wp_create_nonce( 'switch_themes' ),
 			'dismiss_autosave_or_lock' => wp_create_nonce( 'customize_dismiss_autosave_or_lock' ),
-			'override_lock' => wp_create_nonce( 'customize_override_changeset_lock' ),
-			'trash' => wp_create_nonce( 'trash_customize_changeset' ),
+			'override_lock'            => wp_create_nonce( 'customize_override_changeset_lock' ),
+			'trash'                    => wp_create_nonce( 'trash_customize_changeset' ),
 		);
 
 		/**
@@ -4537,10 +4599,12 @@ final class WP_Customize_Manager {
 	 */
 	public function customize_pane_settings() {
 
-		$login_url = add_query_arg( array(
-			'interim-login' => 1,
-			'customize-login' => 1,
-		), wp_login_url() );
+		$login_url = add_query_arg(
+			array(
+				'interim-login'   => 1,
+				'customize-login' => 1,
+			), wp_login_url()
+		);
 
 		// Ensure dirty flags are set for modified settings.
 		foreach ( array_keys( $this->unsanitized_post_values() ) as $setting_id ) {
@@ -4550,18 +4614,20 @@ final class WP_Customize_Manager {
 			}
 		}
 
-		$autosave_revision_post = null;
+		$autosave_revision_post  = null;
 		$autosave_autodraft_post = null;
-		$changeset_post_id = $this->changeset_post_id();
+		$changeset_post_id       = $this->changeset_post_id();
 		if ( ! $this->saved_starter_content_changeset && ! $this->autosaved() ) {
 			if ( $changeset_post_id ) {
 				$autosave_revision_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
 			} else {
-				$autosave_autodraft_posts = $this->get_changeset_posts( array(
-					'posts_per_page' => 1,
-					'post_status' => 'auto-draft',
-					'exclude_restore_dismissed' => true,
-				) );
+				$autosave_autodraft_posts = $this->get_changeset_posts(
+					array(
+						'posts_per_page'            => 1,
+						'post_status'               => 'auto-draft',
+						'exclude_restore_dismissed' => true,
+					)
+				);
 				if ( ! empty( $autosave_autodraft_posts ) ) {
 					$autosave_autodraft_post = array_shift( $autosave_autodraft_posts );
 				}
@@ -4575,17 +4641,17 @@ final class WP_Customize_Manager {
 		if ( $current_user_can_publish ) {
 			$status_choices[] = array(
 				'status' => 'publish',
-				'label' => __( 'Publish' ),
+				'label'  => __( 'Publish' ),
 			);
 		}
 		$status_choices[] = array(
 			'status' => 'draft',
-			'label' => __( 'Save Draft' ),
+			'label'  => __( 'Save Draft' ),
 		);
 		if ( $current_user_can_publish ) {
 			$status_choices[] = array(
 				'status' => 'future',
-				'label' => _x( 'Schedule', 'customizer changeset action/button label' ),
+				'label'  => _x( 'Schedule', 'customizer changeset action/button label' ),
 			);
 		}
 
@@ -4611,35 +4677,35 @@ final class WP_Customize_Manager {
 		}
 
 		$settings = array(
-			'changeset' => array(
-				'uuid' => $this->changeset_uuid(),
-				'branching' => $this->branching(),
-				'autosaved' => $this->autosaved(),
-				'hasAutosaveRevision' => ! empty( $autosave_revision_post ),
-				'latestAutoDraftUuid' => $autosave_autodraft_post ? $autosave_autodraft_post->post_name : null,
-				'status' => $changeset_post ? $changeset_post->post_status : '',
+			'changeset'              => array(
+				'uuid'                  => $this->changeset_uuid(),
+				'branching'             => $this->branching(),
+				'autosaved'             => $this->autosaved(),
+				'hasAutosaveRevision'   => ! empty( $autosave_revision_post ),
+				'latestAutoDraftUuid'   => $autosave_autodraft_post ? $autosave_autodraft_post->post_name : null,
+				'status'                => $changeset_post ? $changeset_post->post_status : '',
 				'currentUserCanPublish' => $current_user_can_publish,
-				'publishDate' => $initial_date,
-				'statusChoices' => $status_choices,
-				'lockUser' => $lock_user_id ? $this->get_lock_user_data( $lock_user_id ) : null,
+				'publishDate'           => $initial_date,
+				'statusChoices'         => $status_choices,
+				'lockUser'              => $lock_user_id ? $this->get_lock_user_data( $lock_user_id ) : null,
 			),
-			'initialServerDate' => $current_time,
-			'dateFormat' => get_option( 'date_format' ),
-			'timeFormat' => get_option( 'time_format' ),
+			'initialServerDate'      => $current_time,
+			'dateFormat'             => get_option( 'date_format' ),
+			'timeFormat'             => get_option( 'time_format' ),
 			'initialServerTimestamp' => floor( microtime( true ) * 1000 ),
 			'initialClientTimestamp' => -1, // To be set with JS below.
-			'timeouts' => array(
-				'windowRefresh' => 250,
-				'changesetAutoSave' => AUTOSAVE_INTERVAL * 1000,
-				'keepAliveCheck' => 2500,
-				'reflowPaneContents' => 100,
+			'timeouts'               => array(
+				'windowRefresh'           => 250,
+				'changesetAutoSave'       => AUTOSAVE_INTERVAL * 1000,
+				'keepAliveCheck'          => 2500,
+				'reflowPaneContents'      => 100,
 				'previewFrameSensitivity' => 2000,
 			),
-			'theme'    => array(
+			'theme'                  => array(
 				'stylesheet' => $this->get_stylesheet(),
 				'active'     => $this->is_theme_active(),
 			),
-			'url'      => array(
+			'url'                    => array(
 				'preview'       => esc_url_raw( $this->get_preview_url() ),
 				'return'        => esc_url_raw( $this->get_return_url() ),
 				'parent'        => esc_url_raw( admin_url() ),
@@ -4650,22 +4716,22 @@ final class WP_Customize_Manager {
 				'home'          => esc_url_raw( home_url( '/' ) ),
 				'login'         => esc_url_raw( $login_url ),
 			),
-			'browser'  => array(
+			'browser'                => array(
 				'mobile' => wp_is_mobile(),
 				'ios'    => $this->is_ios(),
 			),
-			'panels'   => array(),
-			'sections' => array(),
-			'nonce'    => $this->get_nonces(),
-			'autofocus' => $this->get_autofocus(),
-			'documentTitleTmpl' => $this->get_document_title_template(),
-			'previewableDevices' => $this->get_previewable_devices(),
-			'l10n' => array(
-				'confirmDeleteTheme' => __( 'Are you sure you want to delete this theme?' ),
+			'panels'                 => array(),
+			'sections'               => array(),
+			'nonce'                  => $this->get_nonces(),
+			'autofocus'              => $this->get_autofocus(),
+			'documentTitleTmpl'      => $this->get_document_title_template(),
+			'previewableDevices'     => $this->get_previewable_devices(),
+			'l10n'                   => array(
+				'confirmDeleteTheme'   => __( 'Are you sure you want to delete this theme?' ),
 				/* translators: %d: number of theme search results, which cannot currently consider singular vs. plural forms */
-				'themeSearchResults' => __( '%d themes found' ),
+				'themeSearchResults'   => __( '%d themes found' ),
 				/* translators: %d: number of themes being displayed, which cannot currently consider singular vs. plural forms */
-				'announceThemeCount' => __( 'Displaying %d themes' ),
+				'announceThemeCount'   => __( 'Displaying %d themes' ),
 				/* translators: %s: theme name */
 				'announceThemeDetails' => __( 'Showing details for theme: %s' ),
 			),
@@ -4747,13 +4813,13 @@ final class WP_Customize_Manager {
 	public function get_previewable_devices() {
 		$devices = array(
 			'desktop' => array(
-				'label' => __( 'Enter desktop preview mode' ),
+				'label'   => __( 'Enter desktop preview mode' ),
 				'default' => true,
 			),
-			'tablet' => array(
+			'tablet'  => array(
 				'label' => __( 'Enter tablet preview mode' ),
 			),
-			'mobile' => array(
+			'mobile'  => array(
 				'label' => __( 'Enter mobile preview mode' ),
 			),
 		);
@@ -4781,189 +4847,249 @@ final class WP_Customize_Manager {
 
 		/* Themes (controls are loaded via ajax) */
 
-		$this->add_panel( new WP_Customize_Themes_Panel( $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>' .
-				'<p>' . __( 'While previewing a new theme, you can continue to tailor things like widgets and menus, and explore theme-specific options.' ) . '</p>'
-			),
-			'capability'  => 'switch_themes',
-			'priority'    => 0,
-		) ) );
+		$this->add_panel(
+			new WP_Customize_Themes_Panel(
+				$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>' .
+					'<p>' . __( 'While previewing a new theme, you can continue to tailor things like widgets and menus, and explore theme-specific options.' ) . '</p>'
+					),
+					'capability'  => 'switch_themes',
+					'priority'    => 0,
+				)
+			)
+		);
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'installed_themes', array(
-			'title'       => __( 'Installed themes' ),
-			'action'      => 'installed',
-			'capability'  => 'switch_themes',
-			'panel'       => 'themes',
-			'priority'    => 0,
-		) ) );
+		$this->add_section(
+			new WP_Customize_Themes_Section(
+				$this, 'installed_themes', array(
+					'title'      => __( 'Installed themes' ),
+					'action'     => 'installed',
+					'capability' => 'switch_themes',
+					'panel'      => 'themes',
+					'priority'   => 0,
+				)
+			)
+		);
 
 		if ( ! is_multisite() ) {
-			$this->add_section( new WP_Customize_Themes_Section( $this, 'wporg_themes', array(
-				'title'       => __( 'WordPress.org themes' ),
-				'action'      => 'wporg',
-				'filter_type' => 'remote',
-				'capability'  => 'install_themes',
-				'panel'       => 'themes',
-				'priority'    => 5,
-			) ) );
+			$this->add_section(
+				new WP_Customize_Themes_Section(
+					$this, 'wporg_themes', array(
+						'title'       => __( 'WordPress.org themes' ),
+						'action'      => 'wporg',
+						'filter_type' => 'remote',
+						'capability'  => 'install_themes',
+						'panel'       => 'themes',
+						'priority'    => 5,
+					)
+				)
+			);
 		}
 
 		// 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(
-			'capability' => 'switch_themes',
-		) ) );
+		$this->add_setting(
+			new WP_Customize_Filter_Setting(
+				$this, 'active_theme', array(
+					'capability' => 'switch_themes',
+				)
+			)
+		);
 
 		/* Site Identity */
 
-		$this->add_section( 'title_tagline', array(
-			'title'    => __( 'Site Identity' ),
-			'priority' => 20,
-		) );
+		$this->add_section(
+			'title_tagline', array(
+				'title'    => __( 'Site Identity' ),
+				'priority' => 20,
+			)
+		);
 
-		$this->add_setting( 'blogname', array(
-			'default'    => get_option( 'blogname' ),
-			'type'       => 'option',
-			'capability' => 'manage_options',
-		) );
+		$this->add_setting(
+			'blogname', array(
+				'default'    => get_option( 'blogname' ),
+				'type'       => 'option',
+				'capability' => 'manage_options',
+			)
+		);
 
-		$this->add_control( 'blogname', array(
-			'label'      => __( 'Site Title' ),
-			'section'    => 'title_tagline',
-		) );
+		$this->add_control(
+			'blogname', array(
+				'label'   => __( 'Site Title' ),
+				'section' => 'title_tagline',
+			)
+		);
 
-		$this->add_setting( 'blogdescription', array(
-			'default'    => get_option( 'blogdescription' ),
-			'type'       => 'option',
-			'capability' => 'manage_options',
-		) );
+		$this->add_setting(
+			'blogdescription', array(
+				'default'    => get_option( 'blogdescription' ),
+				'type'       => 'option',
+				'capability' => 'manage_options',
+			)
+		);
 
-		$this->add_control( 'blogdescription', array(
-			'label'      => __( 'Tagline' ),
-			'section'    => 'title_tagline',
-		) );
+		$this->add_control(
+			'blogdescription', array(
+				'label'   => __( 'Tagline' ),
+				'section' => 'title_tagline',
+			)
+		);
 
 		// 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(
-				'theme_supports'    => array( 'custom-logo', 'header-text' ),
-				'default'           => 1,
-				'sanitize_callback' => 'absint',
-			) );
+			$this->add_setting(
+				'header_text', array(
+					'theme_supports'    => array( 'custom-logo', 'header-text' ),
+					'default'           => 1,
+					'sanitize_callback' => 'absint',
+				)
+			);
 
-			$this->add_control( 'header_text', array(
-				'label'    => __( 'Display Site Title and Tagline' ),
-				'section'  => 'title_tagline',
-				'settings' => 'header_text',
-				'type'     => 'checkbox',
-			) );
+			$this->add_control(
+				'header_text', array(
+					'label'    => __( 'Display Site Title and Tagline' ),
+					'section'  => 'title_tagline',
+					'settings' => 'header_text',
+					'type'     => 'checkbox',
+				)
+			);
 		}
 
-		$this->add_setting( 'site_icon', array(
-			'type'       => 'option',
-			'capability' => 'manage_options',
-			'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
-		) );
+		$this->add_setting(
+			'site_icon', array(
+				'type'       => 'option',
+				'capability' => 'manage_options',
+				'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
+			)
+		);
 
-		$this->add_control( new WP_Customize_Site_Icon_Control( $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>' .
-				/* translators: %s: site icon size in pixels */
-				'<p>' . __( 'Site Icons should be square and at least %s pixels.' ) . '</p>',
-				'<strong>512 &times; 512</strong>'
-			),
-			'section'     => 'title_tagline',
-			'priority'    => 60,
-			'height'      => 512,
-			'width'       => 512,
-		) ) );
+		$this->add_control(
+			new WP_Customize_Site_Icon_Control(
+				$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>' .
+						/* translators: %s: site icon size in pixels */
+						'<p>' . __( 'Site Icons should be square and at least %s pixels.' ) . '</p>',
+						'<strong>512 &times; 512</strong>'
+					),
+					'section'     => 'title_tagline',
+					'priority'    => 60,
+					'height'      => 512,
+					'width'       => 512,
+				)
+			)
+		);
 
-		$this->add_setting( 'custom_logo', array(
-			'theme_supports' => array( 'custom-logo' ),
-			'transport'      => 'postMessage',
-		) );
+		$this->add_setting(
+			'custom_logo', array(
+				'theme_supports' => array( 'custom-logo' ),
+				'transport'      => 'postMessage',
+			)
+		);
 
 		$custom_logo_args = get_theme_support( 'custom-logo' );
-		$this->add_control( new WP_Customize_Cropped_Image_Control( $this, 'custom_logo', array(
-			'label'         => __( 'Logo' ),
-			'section'       => 'title_tagline',
-			'priority'      => 8,
-			'height'        => $custom_logo_args[0]['height'],
-			'width'         => $custom_logo_args[0]['width'],
-			'flex_height'   => $custom_logo_args[0]['flex-height'],
-			'flex_width'    => $custom_logo_args[0]['flex-width'],
-			'button_labels' => array(
-				'select'       => __( 'Select logo' ),
-				'change'       => __( 'Change logo' ),
-				'remove'       => __( 'Remove' ),
-				'default'      => __( 'Default' ),
-				'placeholder'  => __( 'No logo selected' ),
-				'frame_title'  => __( 'Select logo' ),
-				'frame_button' => __( 'Choose logo' ),
-			),
-		) ) );
+		$this->add_control(
+			new WP_Customize_Cropped_Image_Control(
+				$this, 'custom_logo', array(
+					'label'         => __( 'Logo' ),
+					'section'       => 'title_tagline',
+					'priority'      => 8,
+					'height'        => $custom_logo_args[0]['height'],
+					'width'         => $custom_logo_args[0]['width'],
+					'flex_height'   => $custom_logo_args[0]['flex-height'],
+					'flex_width'    => $custom_logo_args[0]['flex-width'],
+					'button_labels' => array(
+						'select'       => __( 'Select logo' ),
+						'change'       => __( 'Change logo' ),
+						'remove'       => __( 'Remove' ),
+						'default'      => __( 'Default' ),
+						'placeholder'  => __( 'No logo selected' ),
+						'frame_title'  => __( 'Select logo' ),
+						'frame_button' => __( 'Choose logo' ),
+					),
+				)
+			)
+		);
 
-		$this->selective_refresh->add_partial( 'custom_logo', array(
-			'settings'            => array( 'custom_logo' ),
-			'selector'            => '.custom-logo-link',
-			'render_callback'     => array( $this, '_render_custom_logo_partial' ),
-			'container_inclusive' => true,
-		) );
+		$this->selective_refresh->add_partial(
+			'custom_logo', array(
+				'settings'            => array( 'custom_logo' ),
+				'selector'            => '.custom-logo-link',
+				'render_callback'     => array( $this, '_render_custom_logo_partial' ),
+				'container_inclusive' => true,
+			)
+		);
 
 		/* Colors */
 
-		$this->add_section( 'colors', array(
-			'title'          => __( 'Colors' ),
-			'priority'       => 40,
-		) );
+		$this->add_section(
+			'colors', array(
+				'title'    => __( 'Colors' ),
+				'priority' => 40,
+			)
+		);
 
-		$this->add_setting( 'header_textcolor', array(
-			'theme_supports' => array( 'custom-header', 'header-text' ),
-			'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
+		$this->add_setting(
+			'header_textcolor', array(
+				'theme_supports'       => array( 'custom-header', 'header-text' ),
+				'default'              => get_theme_support( 'custom-header', 'default-text-color' ),
 
-			'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
-			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+				'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
+				'sanitize_js_callback' => 'maybe_hash_hex_color',
+			)
+		);
 
 		// Input type: checkbox
 		// With custom value
-		$this->add_control( 'display_header_text', array(
-			'settings' => 'header_textcolor',
-			'label'    => __( 'Display Site Title and Tagline' ),
-			'section'  => 'title_tagline',
-			'type'     => 'checkbox',
-			'priority' => 40,
-		) );
+		$this->add_control(
+			'display_header_text', array(
+				'settings' => 'header_textcolor',
+				'label'    => __( 'Display Site Title and Tagline' ),
+				'section'  => 'title_tagline',
+				'type'     => 'checkbox',
+				'priority' => 40,
+			)
+		);
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
-			'label'   => __( 'Header Text Color' ),
-			'section' => 'colors',
-		) ) );
+		$this->add_control(
+			new WP_Customize_Color_Control(
+				$this, 'header_textcolor', array(
+					'label'   => __( 'Header Text Color' ),
+					'section' => 'colors',
+				)
+			)
+		);
 
 		// Input type: Color
 		// With sanitize_callback
-		$this->add_setting( 'background_color', array(
-			'default'        => get_theme_support( 'custom-background', 'default-color' ),
-			'theme_supports' => 'custom-background',
+		$this->add_setting(
+			'background_color', array(
+				'default'              => get_theme_support( 'custom-background', 'default-color' ),
+				'theme_supports'       => 'custom-background',
 
-			'sanitize_callback'    => 'sanitize_hex_color_no_hash',
-			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+				'sanitize_callback'    => 'sanitize_hex_color_no_hash',
+				'sanitize_js_callback' => 'maybe_hash_hex_color',
+			)
+		);
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
-			'label'   => __( 'Background Color' ),
-			'section' => 'colors',
-		) ) );
+		$this->add_control(
+			new WP_Customize_Color_Control(
+				$this, 'background_color', array(
+					'label'   => __( 'Background Color' ),
+					'section' => 'colors',
+				)
+			)
+		);
 
 		/* Custom Header */
 
 		if ( current_theme_supports( 'custom-header', 'video' ) ) {
-			$title = __( 'Header Media' );
+			$title       = __( 'Header Media' );
 			$description = '<p>' . __( 'If you add a video, the image will be used as a fallback while the video loads.' ) . '</p>';
 
-			$width = absint( get_theme_support( 'custom-header', 'width' ) );
+			$width  = absint( get_theme_support( 'custom-header', 'width' ) );
 			$height = absint( get_theme_support( 'custom-header', 'height' ) );
 			if ( $width && $height ) {
 				$control_description = sprintf(
@@ -4988,40 +5114,54 @@ final class WP_Customize_Manager {
 				);
 			}
 		} else {
-			$title = __( 'Header Image' );
-			$description = '';
+			$title               = __( 'Header Image' );
+			$description         = '';
 			$control_description = '';
 		}
 
-		$this->add_section( 'header_image', array(
-			'title'          => $title,
-			'description'    => $description,
-			'theme_supports' => 'custom-header',
-			'priority'       => 60,
-		) );
+		$this->add_section(
+			'header_image', array(
+				'title'          => $title,
+				'description'    => $description,
+				'theme_supports' => 'custom-header',
+				'priority'       => 60,
+			)
+		);
 
-		$this->add_setting( 'header_video', array(
-			'theme_supports'    => array( 'custom-header', 'video' ),
-			'transport'         => 'postMessage',
-			'sanitize_callback' => 'absint',
-			'validate_callback' => array( $this, '_validate_header_video' ),
-		) );
+		$this->add_setting(
+			'header_video', array(
+				'theme_supports'    => array( 'custom-header', 'video' ),
+				'transport'         => 'postMessage',
+				'sanitize_callback' => 'absint',
+				'validate_callback' => array( $this, '_validate_header_video' ),
+			)
+		);
 
-		$this->add_setting( 'external_header_video', array(
-			'theme_supports'    => array( 'custom-header', 'video' ),
-			'transport'         => 'postMessage',
-			'sanitize_callback' => array( $this, '_sanitize_external_header_video' ),
-			'validate_callback' => array( $this, '_validate_external_header_video' ),
-		) );
+		$this->add_setting(
+			'external_header_video', array(
+				'theme_supports'    => array( 'custom-header', 'video' ),
+				'transport'         => 'postMessage',
+				'sanitize_callback' => array( $this, '_sanitize_external_header_video' ),
+				'validate_callback' => array( $this, '_validate_external_header_video' ),
+			)
+		);
 
-		$this->add_setting( new WP_Customize_Filter_Setting( $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',
-		) ) );
+		$this->add_setting(
+			new WP_Customize_Filter_Setting(
+				$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',
+				)
+			)
+		);
 
-		$this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
-			'theme_supports' => 'custom-header',
-		) ) );
+		$this->add_setting(
+			new WP_Customize_Header_Image_Setting(
+				$this, 'header_image_data', array(
+					'theme_supports' => 'custom-header',
+				)
+			)
+		);
 
 		/*
 		 * Switch image settings to postMessage when video support is enabled since
@@ -5029,138 +5169,177 @@ final class WP_Customize_Manager {
 		 * refresh can be utilized.
 		 */
 		if ( current_theme_supports( 'custom-header', 'video' ) ) {
-			$this->get_setting( 'header_image' )->transport = 'postMessage';
+			$this->get_setting( 'header_image' )->transport      = 'postMessage';
 			$this->get_setting( 'header_image_data' )->transport = 'postMessage';
 		}
 
-		$this->add_control( new WP_Customize_Media_Control( $this, 'header_video', array(
-			'theme_supports' => array( 'custom-header', 'video' ),
-			'label'          => __( 'Header Video' ),
-			'description'    => $control_description,
-			'section'        => 'header_image',
-			'mime_type'      => 'video',
-			'active_callback' => 'is_header_video_active',
-		) ) );
+		$this->add_control(
+			new WP_Customize_Media_Control(
+				$this, 'header_video', array(
+					'theme_supports'  => array( 'custom-header', 'video' ),
+					'label'           => __( 'Header Video' ),
+					'description'     => $control_description,
+					'section'         => 'header_image',
+					'mime_type'       => 'video',
+					'active_callback' => 'is_header_video_active',
+				)
+			)
+		);
 
-		$this->add_control( 'external_header_video', array(
-			'theme_supports' => array( 'custom-header', 'video' ),
-			'type'           => 'url',
-			'description'    => __( 'Or, enter a YouTube URL:' ),
-			'section'        => 'header_image',
-			'active_callback' => 'is_header_video_active',
-		) );
+		$this->add_control(
+			'external_header_video', array(
+				'theme_supports'  => array( 'custom-header', 'video' ),
+				'type'            => 'url',
+				'description'     => __( 'Or, enter a YouTube URL:' ),
+				'section'         => 'header_image',
+				'active_callback' => 'is_header_video_active',
+			)
+		);
 
 		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
 
-		$this->selective_refresh->add_partial( '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.
-			'container_inclusive' => true,
-		) );
+		$this->selective_refresh->add_partial(
+			'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.
+				'container_inclusive' => true,
+			)
+		);
 
 		/* Custom Background */
 
-		$this->add_section( 'background_image', array(
-			'title'          => __( 'Background Image' ),
-			'theme_supports' => 'custom-background',
-			'priority'       => 80,
-		) );
+		$this->add_section(
+			'background_image', array(
+				'title'          => __( 'Background Image' ),
+				'theme_supports' => 'custom-background',
+				'priority'       => 80,
+			)
+		);
 
-		$this->add_setting( 'background_image', array(
-			'default'        => get_theme_support( 'custom-background', 'default-image' ),
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+		$this->add_setting(
+			'background_image', array(
+				'default'           => get_theme_support( 'custom-background', 'default-image' ),
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+			)
+		);
 
-		$this->add_setting( new WP_Customize_Background_Image_Setting( $this, 'background_image_thumb', array(
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) ) );
+		$this->add_setting(
+			new WP_Customize_Background_Image_Setting(
+				$this, 'background_image_thumb', array(
+					'theme_supports'    => 'custom-background',
+					'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				)
+			)
+		);
 
 		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
 
-		$this->add_setting( 'background_preset', array(
-			'default'        => get_theme_support( 'custom-background', 'default-preset' ),
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+		$this->add_setting(
+			'background_preset', array(
+				'default'           => get_theme_support( 'custom-background', 'default-preset' ),
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+			)
+		);
 
-		$this->add_control( 'background_preset', array(
-			'label'      => _x( 'Preset', 'Background Preset' ),
-			'section'    => 'background_image',
-			'type'       => 'select',
-			'choices'    => array(
-				'default' => _x( 'Default', 'Default Preset' ),
-				'fill'    => __( 'Fill Screen' ),
-				'fit'     => __( 'Fit to Screen' ),
-				'repeat'  => _x( 'Repeat', 'Repeat Image' ),
-				'custom'  => _x( 'Custom', 'Custom Preset' ),
-			),
-		) );
+		$this->add_control(
+			'background_preset', array(
+				'label'   => _x( 'Preset', 'Background Preset' ),
+				'section' => 'background_image',
+				'type'    => 'select',
+				'choices' => array(
+					'default' => _x( 'Default', 'Default Preset' ),
+					'fill'    => __( 'Fill Screen' ),
+					'fit'     => __( 'Fit to Screen' ),
+					'repeat'  => _x( 'Repeat', 'Repeat Image' ),
+					'custom'  => _x( 'Custom', 'Custom Preset' ),
+				),
+			)
+		);
 
-		$this->add_setting( 'background_position_x', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+		$this->add_setting(
+			'background_position_x', array(
+				'default'           => get_theme_support( 'custom-background', 'default-position-x' ),
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+			)
+		);
 
-		$this->add_setting( 'background_position_y', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-y' ),
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+		$this->add_setting(
+			'background_position_y', array(
+				'default'           => get_theme_support( 'custom-background', 'default-position-y' ),
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+			)
+		);
 
-		$this->add_control( new WP_Customize_Background_Position_Control( $this, 'background_position', array(
-			'label'    => __( 'Image Position' ),
-			'section'  => 'background_image',
-			'settings' => array(
-				'x' => 'background_position_x',
-				'y' => 'background_position_y',
-			),
-		) ) );
+		$this->add_control(
+			new WP_Customize_Background_Position_Control(
+				$this, 'background_position', array(
+					'label'    => __( 'Image Position' ),
+					'section'  => 'background_image',
+					'settings' => array(
+						'x' => 'background_position_x',
+						'y' => 'background_position_y',
+					),
+				)
+			)
+		);
 
-		$this->add_setting( 'background_size', array(
-			'default'        => get_theme_support( 'custom-background', 'default-size' ),
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+		$this->add_setting(
+			'background_size', array(
+				'default'           => get_theme_support( 'custom-background', 'default-size' ),
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+			)
+		);
 
-		$this->add_control( 'background_size', array(
-			'label'      => __( 'Image Size' ),
-			'section'    => 'background_image',
-			'type'       => 'select',
-			'choices'    => array(
-				'auto'    => __( 'Original' ),
-				'contain' => __( 'Fit to Screen' ),
-				'cover'   => __( 'Fill Screen' ),
-			),
-		) );
+		$this->add_control(
+			'background_size', array(
+				'label'   => __( 'Image Size' ),
+				'section' => 'background_image',
+				'type'    => 'select',
+				'choices' => array(
+					'auto'    => __( 'Original' ),
+					'contain' => __( 'Fit to Screen' ),
+					'cover'   => __( 'Fill Screen' ),
+				),
+			)
+		);
 
-		$this->add_setting( 'background_repeat', array(
-			'default'           => get_theme_support( 'custom-background', 'default-repeat' ),
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-			'theme_supports'    => 'custom-background',
-		) );
+		$this->add_setting(
+			'background_repeat', array(
+				'default'           => get_theme_support( 'custom-background', 'default-repeat' ),
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'theme_supports'    => 'custom-background',
+			)
+		);
 
-		$this->add_control( 'background_repeat', array(
-			'label'    => __( 'Repeat Background Image' ),
-			'section'  => 'background_image',
-			'type'     => 'checkbox',
-		) );
+		$this->add_control(
+			'background_repeat', array(
+				'label'   => __( 'Repeat Background Image' ),
+				'section' => 'background_image',
+				'type'    => 'checkbox',
+			)
+		);
 
-		$this->add_setting( 'background_attachment', array(
-			'default'           => get_theme_support( 'custom-background', 'default-attachment' ),
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-			'theme_supports'    => 'custom-background',
-		) );
-
-		$this->add_control( 'background_attachment', array(
-			'label'    => __( 'Scroll with Page' ),
-			'section'  => 'background_image',
-			'type'     => 'checkbox',
-		) );
+		$this->add_setting(
+			'background_attachment', array(
+				'default'           => get_theme_support( 'custom-background', 'default-attachment' ),
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'theme_supports'    => 'custom-background',
+			)
+		);
 
+		$this->add_control(
+			'background_attachment', array(
+				'label'   => __( 'Scroll with Page' ),
+				'section' => 'background_image',
+				'type'    => 'checkbox',
+			)
+		);
 
 		// If the theme is using the default background callback, we can update
 		// the background CSS using postMessage.
@@ -5176,55 +5355,69 @@ final class WP_Customize_Manager {
 		 * The following replicates behavior from options-reading.php.
 		 */
 
-		$this->add_section( '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.' ),
-			'active_callback' => array( $this, 'has_published_pages' ),
-		) );
+		$this->add_section(
+			'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.' ),
+				'active_callback' => array( $this, 'has_published_pages' ),
+			)
+		);
 
-		$this->add_setting( 'show_on_front', array(
-			'default' => get_option( 'show_on_front' ),
-			'capability' => 'manage_options',
-			'type' => 'option',
-		) );
+		$this->add_setting(
+			'show_on_front', array(
+				'default'    => get_option( 'show_on_front' ),
+				'capability' => 'manage_options',
+				'type'       => 'option',
+			)
+		);
 
-		$this->add_control( 'show_on_front', array(
-			'label' => __( 'Your homepage displays' ),
-			'section' => 'static_front_page',
-			'type' => 'radio',
-			'choices' => array(
-				'posts' => __( 'Your latest posts' ),
-				'page'  => __( 'A static page' ),
-			),
-		) );
+		$this->add_control(
+			'show_on_front', array(
+				'label'   => __( 'Your homepage displays' ),
+				'section' => 'static_front_page',
+				'type'    => 'radio',
+				'choices' => array(
+					'posts' => __( 'Your latest posts' ),
+					'page'  => __( 'A static page' ),
+				),
+			)
+		);
 
-		$this->add_setting( 'page_on_front', array(
-			'type'       => 'option',
-			'capability' => 'manage_options',
-		) );
+		$this->add_setting(
+			'page_on_front', array(
+				'type'       => 'option',
+				'capability' => 'manage_options',
+			)
+		);
 
-		$this->add_control( 'page_on_front', array(
-			'label' => __( 'Homepage' ),
-			'section' => 'static_front_page',
-			'type' => 'dropdown-pages',
-			'allow_addition' => true,
-		) );
+		$this->add_control(
+			'page_on_front', array(
+				'label'          => __( 'Homepage' ),
+				'section'        => 'static_front_page',
+				'type'           => 'dropdown-pages',
+				'allow_addition' => true,
+			)
+		);
 
-		$this->add_setting( 'page_for_posts', array(
-			'type' => 'option',
-			'capability' => 'manage_options',
-		) );
+		$this->add_setting(
+			'page_for_posts', array(
+				'type'       => 'option',
+				'capability' => 'manage_options',
+			)
+		);
 
-		$this->add_control( 'page_for_posts', array(
-			'label' => __( 'Posts page' ),
-			'section' => 'static_front_page',
-			'type' => 'dropdown-pages',
-			'allow_addition' => true,
-		) );
+		$this->add_control(
+			'page_for_posts', array(
+				'label'          => __( 'Posts page' ),
+				'section'        => 'static_front_page',
+				'type'           => 'dropdown-pages',
+				'allow_addition' => true,
+			)
+		);
 
 		/* Custom CSS */
-		$section_description = '<p>';
+		$section_description  = '<p>';
 		$section_description .= __( 'Add your own CSS code here to customize the appearance and layout of your site.' );
 		$section_description .= sprintf(
 			' <a href="%1$s" class="external-link" target="_blank">%2$s<span class="screen-reader-text"> %3$s</span></a>',
@@ -5249,7 +5442,8 @@ final class WP_Customize_Manager {
 				__( 'The edit field automatically highlights code syntax. You can disable this in your <a href="%1$s" %2$s>user profile%3$s</a> to work in plain text mode.' ),
 				esc_url( get_edit_profile_url() ),
 				'class="external-link" target="_blank"',
-				sprintf( '<span class="screen-reader-text"> %s</span>',
+				sprintf(
+					'<span class="screen-reader-text"> %s</span>',
 					/* translators: accessibility text */
 					__( '(opens in a new window)' )
 				)
@@ -5261,28 +5455,36 @@ final class WP_Customize_Manager {
 		$section_description .= '<button type="button" class="button-link section-description-close">' . __( 'Close' ) . '</button>';
 		$section_description .= '</p>';
 
-		$this->add_section( 'custom_css', array(
-			'title'              => __( 'Additional CSS' ),
-			'priority'           => 200,
-			'description_hidden' => true,
-			'description'        => $section_description,
-		) );
+		$this->add_section(
+			'custom_css', array(
+				'title'              => __( 'Additional CSS' ),
+				'priority'           => 200,
+				'description_hidden' => true,
+				'description'        => $section_description,
+			)
+		);
 
-		$custom_css_setting = new WP_Customize_Custom_CSS_Setting( $this, sprintf( 'custom_css[%s]', get_stylesheet() ), array(
-			'capability' => 'edit_css',
-			'default' => '',
-		) );
+		$custom_css_setting = new WP_Customize_Custom_CSS_Setting(
+			$this, sprintf( 'custom_css[%s]', get_stylesheet() ), array(
+				'capability' => 'edit_css',
+				'default'    => '',
+			)
+		);
 		$this->add_setting( $custom_css_setting );
 
-		$this->add_control( new WP_Customize_Code_Editor_Control( $this, 'custom_css', array(
-			'label'       => __( 'CSS code' ),
-			'section'     => 'custom_css',
-			'settings'    => array( 'default' => $custom_css_setting->id ),
-			'code_type'   => 'text/css',
-			'input_attrs' => array(
-				'aria-describedby' => 'editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4',
-			),
-		) ) );
+		$this->add_control(
+			new WP_Customize_Code_Editor_Control(
+				$this, 'custom_css', array(
+					'label'       => __( 'CSS code' ),
+					'section'     => 'custom_css',
+					'settings'    => array( 'default' => $custom_css_setting->id ),
+					'code_type'   => 'text/css',
+					'input_attrs' => array(
+						'aria-describedby' => 'editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4',
+					),
+				)
+			)
+		);
 	}
 
 	/**
@@ -5335,8 +5537,8 @@ final class WP_Customize_Manager {
 			wp_send_json_error( 'missing_theme_action' );
 		}
 		$theme_action = sanitize_key( $_POST['theme_action'] );
-		$themes = array();
-		$args = array();
+		$themes       = array();
+		$args         = array();
 
 		// Define query filters based on user input.
 		if ( ! array_key_exists( 'search', $_POST ) ) {
@@ -5364,10 +5566,9 @@ final class WP_Customize_Manager {
 			// Load all installed themes from wp_prepare_themes_for_js().
 			$themes = array( 'themes' => wp_prepare_themes_for_js() );
 			foreach ( $themes['themes'] as &$theme ) {
-				$theme['type'] = 'installed';
+				$theme['type']   = 'installed';
 				$theme['active'] = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] );
 			}
-
 		} elseif ( 'wporg' === $theme_action ) {
 
 			// Load WordPress.org themes from the .org API and normalize data to match installed theme objects.
@@ -5378,17 +5579,17 @@ final class WP_Customize_Manager {
 			// Arguments for all queries.
 			$wporg_args = array(
 				'per_page' => 100,
-				'fields' => array(
+				'fields'   => array(
 					'screenshot_url' => true,
-					'description' => true,
-					'rating' => true,
-					'downloaded' => true,
-					'downloadlink' => true,
-					'last_updated' => true,
-					'homepage' => true,
-					'num_ratings' => true,
-					'tags' => true,
-					'parent' => true,
+					'description'    => true,
+					'rating'         => true,
+					'downloaded'     => true,
+					'downloadlink'   => true,
+					'last_updated'   => true,
+					'homepage'       => true,
+					'num_ratings'    => true,
+					'tags'           => true,
+					'parent'         => true,
 					// 'extended_author' => true, @todo: WordPress.org throws a 500 server error when this is here.
 				),
 			);
@@ -5406,18 +5607,18 @@ final class WP_Customize_Manager {
 			}
 
 			// This list matches the allowed tags in wp-admin/includes/theme-install.php.
-			$themes_allowedtags = array_fill_keys(
+			$themes_allowedtags                     = array_fill_keys(
 				array( 'a', 'abbr', 'acronym', 'code', 'pre', 'em', 'strong', 'div', 'p', 'ul', 'ol', 'li', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img' ),
 				array()
 			);
-			$themes_allowedtags['a'] = array_fill_keys( array( 'href', 'title', 'target' ), true );
+			$themes_allowedtags['a']                = array_fill_keys( array( 'href', 'title', 'target' ), true );
 			$themes_allowedtags['acronym']['title'] = true;
-			$themes_allowedtags['abbr']['title'] = true;
-			$themes_allowedtags['img'] = array_fill_keys( array( 'src', 'class', 'alt' ), true );
+			$themes_allowedtags['abbr']['title']    = true;
+			$themes_allowedtags['img']              = array_fill_keys( array( 'src', 'class', 'alt' ), true );
 
 			// Prepare a list of installed themes to check against before the loop.
 			$installed_themes = array();
-			$wp_themes = wp_get_themes();
+			$wp_themes        = wp_get_themes();
 			foreach ( $wp_themes as $theme ) {
 				$installed_themes[] = $theme->get_stylesheet();
 			}
@@ -5425,22 +5626,26 @@ final class WP_Customize_Manager {
 
 			// Set up properties for themes available on WordPress.org.
 			foreach ( $themes->themes as &$theme ) {
-				$theme->install_url = add_query_arg( array(
-					'theme'    => $theme->slug,
-					'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
-				), $update_php );
+				$theme->install_url = add_query_arg(
+					array(
+						'theme'    => $theme->slug,
+						'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
+					), $update_php
+				);
 
 				$theme->name        = wp_kses( $theme->name, $themes_allowedtags );
 				$theme->author      = wp_kses( $theme->author, $themes_allowedtags );
 				$theme->version     = wp_kses( $theme->version, $themes_allowedtags );
 				$theme->description = wp_kses( $theme->description, $themes_allowedtags );
 				$theme->tags        = implode( ', ', $theme->tags );
-				$theme->stars       = wp_star_rating( array(
-					'rating' => $theme->rating,
-					'type' => 'percent',
-					'number' => $theme->num_ratings,
-					'echo' => false,
-				) );
+				$theme->stars       = wp_star_rating(
+					array(
+						'rating' => $theme->rating,
+						'type'   => 'percent',
+						'number' => $theme->num_ratings,
+						'echo'   => false,
+					)
+				);
 				$theme->num_ratings = number_format_i18n( $theme->num_ratings );
 				$theme->preview_url = set_url_scheme( $theme->preview_url );
 
@@ -5505,12 +5710,14 @@ final class WP_Customize_Manager {
 	 * @return mixed
 	 */
 	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
+		if ( 'blank' === $color ) {
 			return 'blank';
+		}
 
 		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
+		if ( empty( $color ) ) {
 			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		}
 
 		return $color;
 	}
@@ -5591,17 +5798,20 @@ final class WP_Customize_Manager {
 		if ( $video ) {
 			$size = filesize( $video );
 			if ( 8 < $size / pow( 1024, 2 ) ) { // Check whether the size is larger than 8MB.
-				$validity->add( 'size_too_large',
+				$validity->add(
+					'size_too_large',
 					__( 'This video file is too large to use as a header video. Try a shorter video or optimize the compression settings and re-upload a file that is less than 8MB. Or, upload your video to YouTube and link it with the option below.' )
 				);
 			}
 			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(
-					/* 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>',
-					'<code>.mov</code>'
-				) );
+				$validity->add(
+					'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>',
+						'<code>.mov</code>'
+					)
+				);
 			}
 		}
 		return $validity;
diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php
index 9540f65836..9529ce78a3 100644
--- a/wp-includes/class-wp-customize-nav-menus.php
+++ b/wp-includes/class-wp-customize-nav-menus.php
@@ -42,7 +42,7 @@ final class WP_Customize_Nav_Menus {
 	 * @param object $manager An instance of the WP_Customize_Manager class.
 	 */
 	public function __construct( $manager ) {
-		$this->manager = $manager;
+		$this->manager                     = $manager;
 		$this->original_nav_menu_locations = get_nav_menu_locations();
 
 		// See https://github.com/xwp/wp-customize-snapshots/blob/962586659688a5b1fd9ae93618b7ce2d4e7a421c/php/class-customize-snapshot-manager.php#L469-L499
@@ -95,15 +95,15 @@ final class WP_Customize_Nav_Menus {
 			wp_die( -1 );
 		}
 
-		$all_items = array();
+		$all_items  = array();
 		$item_types = array();
 		if ( isset( $_POST['item_types'] ) && is_array( $_POST['item_types'] ) ) {
 			$item_types = wp_unslash( $_POST['item_types'] );
 		} elseif ( isset( $_POST['type'] ) && isset( $_POST['object'] ) ) { // Back compat.
 			$item_types[] = array(
-				'type' => wp_unslash( $_POST['type'] ),
+				'type'   => wp_unslash( $_POST['type'] ),
 				'object' => wp_unslash( $_POST['object'] ),
-				'page' => empty( $_POST['page'] ) ? 0 : absint( $_POST['page'] ),
+				'page'   => empty( $_POST['page'] ) ? 0 : absint( $_POST['page'] ),
 			);
 		} else {
 			wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
@@ -113,10 +113,10 @@ final class WP_Customize_Nav_Menus {
 			if ( empty( $item_type['type'] ) || empty( $item_type['object'] ) ) {
 				wp_send_json_error( 'nav_menus_missing_type_or_object_parameter' );
 			}
-			$type = sanitize_key( $item_type['type'] );
+			$type   = sanitize_key( $item_type['type'] );
 			$object = sanitize_key( $item_type['object'] );
-			$page = empty( $item_type['page'] ) ? 0 : absint( $item_type['page'] );
-			$items = $this->load_available_items_query( $type, $object, $page );
+			$page   = empty( $item_type['page'] ) ? 0 : absint( $item_type['page'] );
+			$items  = $this->load_available_items_query( $type, $object, $page );
 			if ( is_wp_error( $items ) ) {
 				wp_send_json_error( $items->get_error_code() );
 			}
@@ -179,13 +179,17 @@ final class WP_Customize_Nav_Menus {
 				}
 			}
 
-			$posts = array_merge( $posts, get_posts( array(
-				'numberposts' => 10,
-				'offset'      => 10 * $page,
-				'orderby'     => 'date',
-				'order'       => 'DESC',
-				'post_type'   => $object,
-			) ) );
+			$posts = array_merge(
+				$posts, get_posts(
+					array(
+						'numberposts' => 10,
+						'offset'      => 10 * $page,
+						'orderby'     => 'date',
+						'order'       => 'DESC',
+						'post_type'   => $object,
+					)
+				)
+			);
 
 			foreach ( $posts as $post ) {
 				$post_title = $post->post_title;
@@ -204,18 +208,20 @@ final class WP_Customize_Nav_Menus {
 				);
 			}
 		} elseif ( 'taxonomy' === $type ) {
-			$terms = get_terms( $object, array(
-				'child_of'     => 0,
-				'exclude'      => '',
-				'hide_empty'   => false,
-				'hierarchical' => 1,
-				'include'      => '',
-				'number'       => 10,
-				'offset'       => 10 * $page,
-				'order'        => 'DESC',
-				'orderby'      => 'count',
-				'pad_counts'   => false,
-			) );
+			$terms = get_terms(
+				$object, array(
+					'child_of'     => 0,
+					'exclude'      => '',
+					'hide_empty'   => false,
+					'hierarchical' => 1,
+					'include'      => '',
+					'number'       => 10,
+					'offset'       => 10 * $page,
+					'order'        => 'DESC',
+					'orderby'      => 'count',
+					'pad_counts'   => false,
+				)
+			);
 			if ( is_wp_error( $terms ) ) {
 				return $terms;
 			}
@@ -269,8 +275,13 @@ final class WP_Customize_Nav_Menus {
 			$p = 1;
 		}
 
-		$s = sanitize_text_field( wp_unslash( $_POST['search'] ) );
-		$items = $this->search_available_items_query( array( 'pagenum' => $p, 's' => $s ) );
+		$s     = sanitize_text_field( wp_unslash( $_POST['search'] ) );
+		$items = $this->search_available_items_query(
+			array(
+				'pagenum' => $p,
+				's'       => $s,
+			)
+		);
 
 		if ( empty( $items ) ) {
 			wp_send_json_error( array( 'message' => __( 'No results found.' ) ) );
@@ -293,7 +304,7 @@ final class WP_Customize_Nav_Menus {
 		$items = array();
 
 		$post_type_objects = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
-		$query = array(
+		$query             = array(
 			'post_type'              => array_keys( $post_type_objects ),
 			'suppress_filters'       => true,
 			'update_post_term_cache' => false,
@@ -314,20 +325,22 @@ final class WP_Customize_Nav_Menus {
 		// Prepend list of posts with nav_menus_created_posts search results on first page.
 		$nav_menus_created_posts_setting = $this->manager->get_setting( 'nav_menus_created_posts' );
 		if ( 1 === $args['pagenum'] && $nav_menus_created_posts_setting && count( $nav_menus_created_posts_setting ) > 0 ) {
-			$stub_post_query = new WP_Query( array_merge(
-				$query,
-				array(
-					'post_status' => 'auto-draft',
-					'post__in' => $nav_menus_created_posts_setting->value(),
-					'posts_per_page' => -1,
+			$stub_post_query = new WP_Query(
+				array_merge(
+					$query,
+					array(
+						'post_status'    => 'auto-draft',
+						'post__in'       => $nav_menus_created_posts_setting->value(),
+						'posts_per_page' => -1,
+					)
 				)
-			) );
-			$posts = array_merge( $posts, $stub_post_query->posts );
+			);
+			$posts           = array_merge( $posts, $stub_post_query->posts );
 		}
 
 		// Query posts.
 		$get_posts = new WP_Query( $query );
-		$posts = array_merge( $posts, $get_posts->posts );
+		$posts     = array_merge( $posts, $get_posts->posts );
 
 		// Create items for posts.
 		foreach ( $posts as $post ) {
@@ -349,11 +362,13 @@ final class WP_Customize_Nav_Menus {
 
 		// Query taxonomy terms.
 		$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'names' );
-		$terms = get_terms( $taxonomies, array(
-			'name__like' => $args['s'],
-			'number'     => 20,
-			'offset'     => 20 * ($args['pagenum'] - 1),
-		) );
+		$terms      = get_terms(
+			$taxonomies, array(
+				'name__like' => $args['s'],
+				'number'     => 20,
+				'offset'     => 20 * ( $args['pagenum'] - 1 ),
+			)
+		);
 
 		// Check if any taxonomies were found.
 		if ( ! empty( $terms ) ) {
@@ -405,9 +420,9 @@ final class WP_Customize_Nav_Menus {
 
 		// Pass data to JS.
 		$settings = array(
-			'allMenus'             => wp_get_nav_menus(),
-			'itemTypes'            => $this->available_item_types(),
-			'l10n'                 => array(
+			'allMenus'                 => wp_get_nav_menus(),
+			'itemTypes'                => $this->available_item_types(),
+			'l10n'                     => array(
 				'untitled'               => _x( '(no label)', 'missing menu item navigation label' ),
 				'unnamed'                => _x( '(unnamed)', 'Missing menu name.' ),
 				'custom_label'           => __( 'Custom Link' ),
@@ -440,9 +455,9 @@ final class WP_Customize_Nav_Menus {
 				'reorderLabelOn'         => esc_attr__( 'Reorder menu items' ),
 				'reorderLabelOff'        => esc_attr__( 'Close reorder mode' ),
 			),
-			'settingTransport'     => 'postMessage',
-			'phpIntMax'            => PHP_INT_MAX,
-			'defaultSettingValues' => array(
+			'settingTransport'         => 'postMessage',
+			'phpIntMax'                => PHP_INT_MAX,
+			'defaultSettingValues'     => array(
 				'nav_menu'      => $temp_nav_menu_setting->default,
 				'nav_menu_item' => $temp_nav_menu_item_setting->default,
 			),
@@ -455,21 +470,21 @@ final class WP_Customize_Nav_Menus {
 		// This is copied from nav-menus.php, and it has an unfortunate object name of `menus`.
 		$nav_menus_l10n = array(
 			'oneThemeLocationNoMenus' => null,
-			'moveUp'       => __( 'Move up one' ),
-			'moveDown'     => __( 'Move down one' ),
-			'moveToTop'    => __( 'Move to the top' ),
+			'moveUp'                  => __( 'Move up one' ),
+			'moveDown'                => __( 'Move down one' ),
+			'moveToTop'               => __( 'Move to the top' ),
 			/* translators: %s: previous item name */
-			'moveUnder'    => __( 'Move under %s' ),
+			'moveUnder'               => __( 'Move under %s' ),
 			/* translators: %s: previous item name */
-			'moveOutFrom'  => __( 'Move out from under %s' ),
+			'moveOutFrom'             => __( 'Move out from under %s' ),
 			/* translators: %s: previous item name */
-			'under'        => __( 'Under %s' ),
+			'under'                   => __( 'Under %s' ),
 			/* translators: %s: previous item name */
-			'outFrom'      => __( 'Out from under %s' ),
+			'outFrom'                 => __( 'Out from under %s' ),
 			/* translators: 1: item name, 2: item position, 3: total number of items */
-			'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+			'menuFocus'               => __( '%1$s. Menu item %2$d of %3$d.' ),
 			/* translators: 1: item name, 2: item position, 3: parent item name */
-			'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+			'subMenuFocus'            => __( '%1$s. Sub item number %2$d under %3$s.' ),
 		);
 		wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
 	}
@@ -561,12 +576,16 @@ final class WP_Customize_Nav_Menus {
 		} else {
 			$description .= '<p>' . __( 'Menus can be displayed in locations defined by your theme.' ) . '</p>';
 		}
-		$this->manager->add_panel( new WP_Customize_Nav_Menus_Panel( $this->manager, 'nav_menus', array(
-			'title'       => __( 'Menus' ),
-			'description' => $description,
-			'priority'    => 100,
-			// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
-		) ) );
+		$this->manager->add_panel(
+			new WP_Customize_Nav_Menus_Panel(
+				$this->manager, 'nav_menus', array(
+					'title'       => __( 'Menus' ),
+					'description' => $description,
+					'priority'    => 100,
+				// 'theme_supports' => 'menus|widgets', @todo allow multiple theme supports
+				)
+			)
+		);
 		$menus = wp_get_nav_menus();
 
 		// Menu locations.
@@ -584,12 +603,14 @@ final class WP_Customize_Nav_Menus {
 			$description .= '<p>' . sprintf( __( 'If your theme has widget areas, you can also add menus there. Visit the <a href="%s">Widgets panel</a> and add a &#8220;Navigation Menu widget&#8221; to display a menu in a sidebar or footer.' ), "javascript:wp.customize.panel( 'widgets' ).focus();" ) . '</p>';
 		}
 
-		$this->manager->add_section( 'menu_locations', array(
-			'title'       => 1 === $num_locations ? _x( 'View Location', 'menu locations' ) : _x( 'View All Locations', 'menu locations' ),
-			'panel'       => 'nav_menus',
-			'priority'    => 30,
-			'description' => $description,
-		) );
+		$this->manager->add_section(
+			'menu_locations', array(
+				'title'       => 1 === $num_locations ? _x( 'View Location', 'menu locations' ) : _x( 'View All Locations', 'menu locations' ),
+				'panel'       => 'nav_menus',
+				'priority'    => 30,
+				'description' => $description,
+			)
+		);
 
 		$choices = array( '0' => __( '&mdash; Select &mdash;' ) );
 		foreach ( $menus as $menu ) {
@@ -618,13 +639,15 @@ final class WP_Customize_Nav_Menus {
 				remove_filter( "customize_sanitize_{$setting_id}", 'absint' );
 				add_filter( "customize_sanitize_{$setting_id}", array( $this, 'intval_base10' ) );
 			} else {
-				$this->manager->add_setting( $setting_id, array(
-					'sanitize_callback' => array( $this, 'intval_base10' ),
-					'theme_supports'    => 'menus',
-					'type'              => 'theme_mod',
-					'transport'         => 'postMessage',
-					'default'           => 0,
-				) );
+				$this->manager->add_setting(
+					$setting_id, array(
+						'sanitize_callback' => array( $this, 'intval_base10' ),
+						'theme_supports'    => 'menus',
+						'type'              => 'theme_mod',
+						'transport'         => 'postMessage',
+						'default'           => 0,
+					)
+				);
 			}
 
 			// Override the assigned nav menu location if mapped during previewed theme switch.
@@ -632,12 +655,16 @@ final class WP_Customize_Nav_Menus {
 				$this->manager->set_post_value( $setting_id, $mapped_nav_menu_locations[ $location ] );
 			}
 
-			$this->manager->add_control( new WP_Customize_Nav_Menu_Location_Control( $this->manager, $setting_id, array(
-				'label'       => $description,
-				'location_id' => $location,
-				'section'     => 'menu_locations',
-				'choices'     => $choices,
-			) ) );
+			$this->manager->add_control(
+				new WP_Customize_Nav_Menu_Location_Control(
+					$this->manager, $setting_id, array(
+						'label'       => $description,
+						'location_id' => $location,
+						'section'     => 'menu_locations',
+						'choices'     => $choices,
+					)
+				)
+			);
 		}
 
 		// Register each menu as a Customizer section, and add each menu item to each menu.
@@ -646,16 +673,24 @@ final class WP_Customize_Nav_Menus {
 
 			// Create a section for each menu.
 			$section_id = 'nav_menu[' . $menu_id . ']';
-			$this->manager->add_section( new WP_Customize_Nav_Menu_Section( $this->manager, $section_id, array(
-				'title'     => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
-				'priority'  => 10,
-				'panel'     => 'nav_menus',
-			) ) );
+			$this->manager->add_section(
+				new WP_Customize_Nav_Menu_Section(
+					$this->manager, $section_id, array(
+						'title'    => html_entity_decode( $menu->name, ENT_QUOTES, get_bloginfo( 'charset' ) ),
+						'priority' => 10,
+						'panel'    => '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(
-				'transport' => 'postMessage',
-			) ) );
+			$this->manager->add_setting(
+				new WP_Customize_Nav_Menu_Setting(
+					$this->manager, $nav_menu_setting_id, array(
+						'transport' => 'postMessage',
+					)
+				)
+			);
 
 			// Add the menu contents.
 			$menu_items = (array) wp_get_nav_menu_items( $menu_id );
@@ -671,36 +706,50 @@ 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(
-					'value'     => $value,
-					'transport' => 'postMessage',
-				) ) );
+				$this->manager->add_setting(
+					new WP_Customize_Nav_Menu_Item_Setting(
+						$this->manager, $menu_item_setting_id, array(
+							'value'     => $value,
+							'transport' => 'postMessage',
+						)
+					)
+				);
 
 				// 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(
-					'label'    => $item->title,
-					'section'  => $section_id,
-					'priority' => 10 + $i,
-				) ) );
+				$this->manager->add_control(
+					new WP_Customize_Nav_Menu_Item_Control(
+						$this->manager, $menu_item_setting_id, array(
+							'label'    => $item->title,
+							'section'  => $section_id,
+							'priority' => 10 + $i,
+						)
+					)
+				);
 			}
 
 			// Note: other controls inside of this section get added dynamically in JS via the MenuSection.ready() function.
 		}
 
 		// Add the add-new-menu section and controls.
-		$this->manager->add_section( 'add_menu', array(
-			'type'     => 'new_menu',
-			'title'    => __( 'New Menu' ),
-			'panel'    => 'nav_menus',
-			'priority' => 20,
-		) );
+		$this->manager->add_section(
+			'add_menu', array(
+				'type'     => 'new_menu',
+				'title'    => __( 'New Menu' ),
+				'panel'    => 'nav_menus',
+				'priority' => 20,
+			)
+		);
 
-		$this->manager->add_setting( new WP_Customize_Filter_Setting( $this->manager, 'nav_menus_created_posts', array(
-			'transport' => 'postMessage',
-			'type' => 'option', // To prevent theme prefix in changeset.
-			'default' => array(),
-			'sanitize_callback' => array( $this, 'sanitize_nav_menus_created_posts' ),
-		) ) );
+		$this->manager->add_setting(
+			new WP_Customize_Filter_Setting(
+				$this->manager, 'nav_menus_created_posts', array(
+					'transport'         => 'postMessage',
+					'type'              => 'option', // To prevent theme prefix in changeset.
+					'default'           => array(),
+					'sanitize_callback' => array( $this, 'sanitize_nav_menus_created_posts' ),
+				)
+			)
+		);
 	}
 
 	/**
@@ -733,10 +782,10 @@ final class WP_Customize_Nav_Menus {
 		if ( $post_types ) {
 			foreach ( $post_types as $slug => $post_type ) {
 				$item_types[] = array(
-					'title'  => $post_type->labels->name,
+					'title'      => $post_type->labels->name,
 					'type_label' => $post_type->labels->singular_name,
-					'type' => 'post_type',
-					'object' => $post_type->name,
+					'type'       => 'post_type',
+					'object'     => $post_type->name,
 				);
 			}
 		}
@@ -748,10 +797,10 @@ final class WP_Customize_Nav_Menus {
 					continue;
 				}
 				$item_types[] = array(
-					'title' => $taxonomy->labels->name,
+					'title'      => $taxonomy->labels->name,
 					'type_label' => $taxonomy->labels->singular_name,
-					'type' => 'taxonomy',
-					'object' => $taxonomy->name,
+					'type'       => 'taxonomy',
+					'object'     => $taxonomy->name,
 				);
 			}
 		}
@@ -777,10 +826,10 @@ final class WP_Customize_Nav_Menus {
 	 * @param array $postarr {
 	 *     Post array. Note that post_status is overridden to be `auto-draft`.
 	 *
-	 *     @var string $post_title   Post title. Required.
-	 *     @var string $post_type    Post type. Required.
-	 *     @var string $post_name    Post name.
-	 *     @var string $post_content Post content.
+	 * @var string $post_title   Post title. Required.
+	 * @var string $post_type    Post type. Required.
+	 * @var string $post_name    Post name.
+	 * @var string $post_content Post content.
 	 * }
 	 * @return WP_Post|WP_Error Inserted auto-draft post object or error.
 	 */
@@ -809,7 +858,7 @@ final class WP_Customize_Nav_Menus {
 			$postarr['meta_input'] = array();
 		}
 		$postarr['meta_input']['_customize_draft_post_name'] = $postarr['post_name'];
-		$postarr['meta_input']['_customize_changeset_uuid'] = $this->manager->changeset_uuid();
+		$postarr['meta_input']['_customize_changeset_uuid']  = $this->manager->changeset_uuid();
 		unset( $postarr['post_name'] );
 
 		add_filter( 'wp_insert_post_empty_content', '__return_false', 1000 );
@@ -841,7 +890,7 @@ final class WP_Customize_Nav_Menus {
 			wp_send_json_error( 'missing_params', 400 );
 		}
 
-		$params = wp_unslash( $_POST['params'] );
+		$params         = wp_unslash( $_POST['params'] );
 		$illegal_params = array_diff( array_keys( $params ), array( 'post_type', 'post_title' ) );
 		if ( ! empty( $illegal_params ) ) {
 			wp_send_json_error( 'illegal_params', 400 );
@@ -849,7 +898,7 @@ final class WP_Customize_Nav_Menus {
 
 		$params = array_merge(
 			array(
-				'post_type' => '',
+				'post_type'  => '',
 				'post_title' => '',
 			),
 			$params
@@ -914,10 +963,12 @@ final class WP_Customize_Nav_Menus {
 							<span class="menu-item-title<# if ( ! data.title ) { #> no-title<# } #>">{{ data.title || wp.customize.Menus.data.l10n.untitled }}</span>
 						</span>
 						<button type="button" class="button-link item-add">
-							<span class="screen-reader-text"><?php
+							<span class="screen-reader-text">
+							<?php
 								/* translators: 1: Title of a menu item, 2: Type of a menu item */
 								printf( __( 'Add to menu: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.type_label }}' );
-							?></span>
+							?>
+							</span>
 						</button>
 					</div>
 				</div>
@@ -997,7 +1048,7 @@ final class WP_Customize_Nav_Menus {
 			<div id="available-menu-items-search" class="accordion-section cannot-expand">
 				<div class="accordion-section-title">
 					<label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
-					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ) ?>" aria-describedby="menu-items-search-desc" />
+					<input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items&hellip;' ); ?>" aria-describedby="menu-items-search-desc" />
 					<p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
 					<span class="spinner"></span>
 				</div>
@@ -1008,7 +1059,7 @@ final class WP_Customize_Nav_Menus {
 			<?php
 
 			// Ensure the page post type comes first in the list.
-			$item_types = $this->available_item_types();
+			$item_types     = $this->available_item_types();
 			$page_item_type = null;
 			foreach ( $item_types as $i => $item_type ) {
 				if ( isset( $item_type['object'] ) && 'page' === $item_type['object'] ) {
@@ -1049,9 +1100,12 @@ final class WP_Customize_Nav_Menus {
 				<span class="spinner"></span>
 				<span class="no-items"><?php _e( 'No items' ); ?></span>
 				<button type="button" class="button-link" aria-expanded="false">
-					<span class="screen-reader-text"><?php
+					<span class="screen-reader-text">
+					<?php
 						/* translators: %s: Title of a section with menu items */
-						printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) ); ?></span>
+						printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) );
+						?>
+						</span>
 					<span class="toggle-indicator" aria-hidden="true"></span>
 				</button>
 			</h4>
@@ -1231,11 +1285,11 @@ final class WP_Customize_Nav_Menus {
 				}
 
 				$target_status = 'attachment' === get_post_type( $post_id ) ? 'inherit' : 'publish';
-				$args = array(
-					'ID' => $post_id,
+				$args          = array(
+					'ID'          => $post_id,
 					'post_status' => $target_status,
 				);
-				$post_name = get_post_meta( $post_id, '_customize_draft_post_name', true );
+				$post_name     = get_post_meta( $post_id, '_customize_draft_post_name', true );
 				if ( $post_name ) {
 					$args['post_name'] = $post_name;
 				}
@@ -1294,7 +1348,7 @@ final class WP_Customize_Nav_Menus {
 		// Empty out args which may not be JSON-serializable.
 		if ( ! $can_partial_refresh ) {
 			$exported_args['fallback_cb'] = '';
-			$exported_args['walker'] = '';
+			$exported_args['walker']      = '';
 		}
 
 		/*
@@ -1308,7 +1362,7 @@ final class WP_Customize_Nav_Menus {
 		ksort( $exported_args );
 		$exported_args['args_hmac'] = $this->hash_nav_menu_args( $exported_args );
 
-		$args['customize_preview_nav_menus_args'] = $exported_args;
+		$args['customize_preview_nav_menus_args']                            = $exported_args;
 		$this->preview_nav_menu_instance_args[ $exported_args['args_hmac'] ] = $exported_args;
 		return $args;
 	}
@@ -1328,9 +1382,9 @@ final class WP_Customize_Nav_Menus {
 	 */
 	public function filter_wp_nav_menu( $nav_menu_content, $args ) {
 		if ( isset( $args->customize_preview_nav_menus_args['can_partial_refresh'] ) && $args->customize_preview_nav_menus_args['can_partial_refresh'] ) {
-			$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
-			$attributes .= ' data-customize-partial-type="nav_menu_instance"';
-			$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $args->customize_preview_nav_menus_args ) ) );
+			$attributes       = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'nav_menu_instance[' . $args->customize_preview_nav_menus_args['args_hmac'] . ']' ) );
+			$attributes      .= ' data-customize-partial-type="nav_menu_instance"';
+			$attributes      .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $args->customize_preview_nav_menus_args ) ) );
 			$nav_menu_content = preg_replace( '#^(<\w+)#', '$1 ' . str_replace( '\\', '\\\\', $attributes ), $nav_menu_content, 1 );
 		}
 		return $nav_menu_content;
diff --git a/wp-includes/class-wp-customize-panel.php b/wp-includes/class-wp-customize-panel.php
index 731dd2080a..f234f32c8c 100644
--- a/wp-includes/class-wp-customize-panel.php
+++ b/wp-includes/class-wp-customize-panel.php
@@ -152,7 +152,7 @@ class WP_Customize_Panel {
 		}
 
 		$this->manager = $manager;
-		$this->id = $id;
+		$this->id      = $id;
 		if ( empty( $this->active_callback ) ) {
 			$this->active_callback = array( $this, 'active_callback' );
 		}
@@ -170,7 +170,7 @@ class WP_Customize_Panel {
 	 * @return bool Whether the panel is active to the current preview.
 	 */
 	final public function active() {
-		$panel = $this;
+		$panel  = $this;
 		$active = call_user_func( $this->active_callback, $this );
 
 		/**
@@ -208,11 +208,11 @@ class WP_Customize_Panel {
 	 * @return array The array to be exported to the client as JSON.
 	 */
 	public function json() {
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'type' ) );
-		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
-		$array['content'] = $this->get_content();
-		$array['active'] = $this->active();
-		$array['instanceNumber'] = $this->instance_number;
+		$array                          = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'type' ) );
+		$array['title']                 = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array['content']               = $this->get_content();
+		$array['active']                = $this->active();
+		$array['instanceNumber']        = $this->instance_number;
 		$array['autoExpandSoleSection'] = $this->auto_expand_sole_section;
 		return $array;
 	}
@@ -318,7 +318,7 @@ class WP_Customize_Panel {
 		<script type="text/html" id="tmpl-customize-panel-<?php echo esc_attr( $this->type ); ?>">
 			<?php $this->render_template(); ?>
 		</script>
-        <?php
+		<?php
 	}
 
 	/**
@@ -358,10 +358,12 @@ class WP_Customize_Panel {
 		<li class="panel-meta customize-info accordion-section <# if ( ! data.description ) { #> cannot-expand<# } #>">
 			<button class="customize-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></button>
 			<div class="accordion-section-title">
-				<span class="preview-notice"><?php
+				<span class="preview-notice">
+				<?php
 					/* translators: %s: the site/panel title in the Customizer */
 					echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title">{{ data.title }}</strong>' );
-				?></span>
+				?>
+				</span>
 				<# if ( data.description ) { #>
 					<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
 				<# } #>
diff --git a/wp-includes/class-wp-customize-section.php b/wp-includes/class-wp-customize-section.php
index a4a6074afb..fa406b1b2f 100644
--- a/wp-includes/class-wp-customize-section.php
+++ b/wp-includes/class-wp-customize-section.php
@@ -163,7 +163,7 @@ class WP_Customize_Section {
 		}
 
 		$this->manager = $manager;
-		$this->id = $id;
+		$this->id      = $id;
 		if ( empty( $this->active_callback ) ) {
 			$this->active_callback = array( $this, 'active_callback' );
 		}
@@ -182,7 +182,7 @@ class WP_Customize_Section {
 	 */
 	final public function active() {
 		$section = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active  = call_user_func( $this->active_callback, $this );
 
 		/**
 		 * Filters response of WP_Customize_Section::active().
@@ -219,10 +219,10 @@ class WP_Customize_Section {
 	 * @return array The array to be exported to the client as JSON.
 	 */
 	public function json() {
-		$array = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'panel', 'type', 'description_hidden' ) );
-		$array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
-		$array['content'] = $this->get_content();
-		$array['active'] = $this->active();
+		$array                   = wp_array_slice_assoc( (array) $this, array( 'id', 'description', 'priority', 'panel', 'type', 'description_hidden' ) );
+		$array['title']          = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$array['content']        = $this->get_content();
+		$array['active']         = $this->active();
 		$array['instanceNumber'] = $this->instance_number;
 
 		if ( $this->panel ) {
diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php
index 601990f532..ae768fece7 100644
--- a/wp-includes/class-wp-customize-setting.php
+++ b/wp-includes/class-wp-customize-setting.php
@@ -169,15 +169,15 @@ class WP_Customize_Setting {
 		}
 
 		$this->manager = $manager;
-		$this->id = $id;
+		$this->id      = $id;
 
 		// Parse the ID for array keys.
 		$this->id_data['keys'] = preg_split( '/\[/', str_replace( ']', '', $this->id ) );
 		$this->id_data['base'] = array_shift( $this->id_data['keys'] );
 
 		// Rebuild the ID.
-		$this->id = $this->id_data[ 'base' ];
-		if ( ! empty( $this->id_data[ 'keys' ] ) ) {
+		$this->id = $this->id_data['base'];
+		if ( ! empty( $this->id_data['keys'] ) ) {
 			$this->id .= '[' . implode( '][', $this->id_data['keys'] ) . ']';
 		}
 
@@ -311,8 +311,8 @@ class WP_Customize_Setting {
 			return true;
 		}
 
-		$id_base = $this->id_data['base'];
-		$is_multidimensional = ! empty( $this->id_data['keys'] );
+		$id_base                 = $this->id_data['base'];
+		$is_multidimensional     = ! empty( $this->id_data['keys'] );
 		$multidimensional_filter = array( $this, '_multidimensional_preview_filter' );
 
 		/*
@@ -321,19 +321,19 @@ class WP_Customize_Setting {
 		 * then the preview short-circuits because there is nothing that needs
 		 * to be previewed.
 		 */
-		$undefined = new stdClass();
+		$undefined     = new stdClass();
 		$needs_preview = ( $undefined !== $this->post_value( $undefined ) );
-		$value = null;
+		$value         = null;
 
 		// Since no post value was defined, check if we have an initial value set.
 		if ( ! $needs_preview ) {
 			if ( $this->is_multidimensional_aggregated ) {
-				$root = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
+				$root  = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
 				$value = $this->multidimensional_get( $root, $this->id_data['keys'], $undefined );
 			} else {
-				$default = $this->default;
+				$default       = $this->default;
 				$this->default = $undefined; // Temporarily set default to undefined so we can detect if existing value is set.
-				$value = $this->value();
+				$value         = $this->value();
 				$this->default = $default;
 			}
 			$needs_preview = ( $undefined === $value ); // Because the default needs to be supplied.
@@ -348,7 +348,7 @@ class WP_Customize_Setting {
 		}
 
 		switch ( $this->type ) {
-			case 'theme_mod' :
+			case 'theme_mod':
 				if ( ! $is_multidimensional ) {
 					add_filter( "theme_mod_{$id_base}", array( $this, '_preview_filter' ) );
 				} else {
@@ -359,7 +359,7 @@ class WP_Customize_Setting {
 					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
 				}
 				break;
-			case 'option' :
+			case 'option':
 				if ( ! $is_multidimensional ) {
 					add_filter( "pre_option_{$id_base}", array( $this, '_preview_filter' ) );
 				} else {
@@ -371,8 +371,7 @@ class WP_Customize_Setting {
 					self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['previewed_instances'][ $this->id ] = $this;
 				}
 				break;
-			default :
-
+			default:
 				/**
 				 * Fires when the WP_Customize_Setting::preview() method is called for settings
 				 * not handled as theme_mods or options.
@@ -436,7 +435,7 @@ class WP_Customize_Setting {
 			return $original;
 		}
 
-		$undefined = new stdClass(); // Symbol hack.
+		$undefined  = new stdClass(); // Symbol hack.
 		$post_value = $this->post_value( $undefined );
 		if ( $undefined !== $post_value ) {
 			$value = $post_value;
@@ -483,8 +482,8 @@ class WP_Customize_Setting {
 
 			// Do the replacements of the posted/default sub value into the root value.
 			$value = $previewed_setting->post_value( $previewed_setting->default );
-			$root = self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'];
-			$root = $previewed_setting->multidimensional_replace( $root, $previewed_setting->id_data['keys'], $value );
+			$root  = self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'];
+			$root  = $previewed_setting->multidimensional_replace( $root, $previewed_setting->id_data['keys'], $value );
 			self::$aggregated_multidimensionals[ $previewed_setting->type ][ $id_base ]['root_value'] = $root;
 
 			// Mark this setting having been applied so that it will be skipped when the filter is called again.
@@ -720,7 +719,7 @@ class WP_Customize_Setting {
 	 * @return mixed The value.
 	 */
 	public function value() {
-		$id_base = $this->id_data['base'];
+		$id_base      = $this->id_data['base'];
 		$is_core_type = ( 'option' === $this->type || 'theme_mod' === $this->type );
 
 		if ( ! $is_core_type && ! $this->is_multidimensional_aggregated ) {
@@ -753,7 +752,7 @@ class WP_Customize_Setting {
 			$value = apply_filters( "customize_value_{$id_base}", $value, $this );
 		} elseif ( $this->is_multidimensional_aggregated ) {
 			$root_value = self::$aggregated_multidimensionals[ $this->type ][ $id_base ]['root_value'];
-			$value = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
+			$value      = $this->multidimensional_get( $root_value, $this->id_data['keys'], $this->default );
 
 			// Ensure that the post value is used if the setting is previewed, since preview filters aren't applying on cached $root_value.
 			if ( $this->is_previewed ) {
@@ -786,8 +785,9 @@ class WP_Customize_Setting {
 		 */
 		$value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
 
-		if ( is_string( $value ) )
-			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8');
+		if ( is_string( $value ) ) {
+			return html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
+		}
 
 		return $value;
 	}
@@ -816,11 +816,13 @@ class WP_Customize_Setting {
 	 * @return bool False if theme doesn't support the setting or user can't change setting, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) )
+		if ( $this->capability && ! call_user_func_array( 'current_user_can', (array) $this->capability ) ) {
 			return false;
+		}
 
-		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) )
+		if ( $this->theme_supports && ! call_user_func_array( 'current_theme_supports', (array) $this->theme_supports ) ) {
 			return false;
+		}
 
 		return true;
 	}
@@ -836,21 +838,25 @@ class WP_Customize_Setting {
 	 * @return array|void Keys are 'root', 'node', and 'key'.
 	 */
 	final protected function multidimensional( &$root, $keys, $create = false ) {
-		if ( $create && empty( $root ) )
+		if ( $create && empty( $root ) ) {
 			$root = array();
+		}
 
-		if ( ! isset( $root ) || empty( $keys ) )
+		if ( ! isset( $root ) || empty( $keys ) ) {
 			return;
+		}
 
 		$last = array_pop( $keys );
 		$node = &$root;
 
 		foreach ( $keys as $key ) {
-			if ( $create && ! isset( $node[ $key ] ) )
+			if ( $create && ! isset( $node[ $key ] ) ) {
 				$node[ $key ] = array();
+			}
 
-			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) )
+			if ( ! is_array( $node ) || ! isset( $node[ $key ] ) ) {
 				return;
+			}
 
 			$node = &$node[ $key ];
 		}
@@ -865,8 +871,9 @@ class WP_Customize_Setting {
 			}
 		}
 
-		if ( ! isset( $node[ $last ] ) )
+		if ( ! isset( $node[ $last ] ) ) {
 			return;
+		}
 
 		return array(
 			'root' => &$root,
@@ -886,15 +893,17 @@ class WP_Customize_Setting {
 	 * @return mixed
 	 */
 	final protected function multidimensional_replace( $root, $keys, $value ) {
-		if ( ! isset( $value ) )
+		if ( ! isset( $value ) ) {
 			return $root;
-		elseif ( empty( $keys ) ) // If there are no keys, we're replacing the root.
+		} elseif ( empty( $keys ) ) { // If there are no keys, we're replacing the root.
 			return $value;
+		}
 
 		$result = $this->multidimensional( $root, $keys, true );
 
-		if ( isset( $result ) )
+		if ( isset( $result ) ) {
 			$result['node'][ $result['key'] ] = $value;
+		}
 
 		return $root;
 	}
@@ -910,8 +919,9 @@ class WP_Customize_Setting {
 	 * @return mixed The requested value or the default value.
 	 */
 	final protected function multidimensional_get( $root, $keys, $default = null ) {
-		if ( empty( $keys ) ) // If there are no keys, test the root.
+		if ( empty( $keys ) ) { // If there are no keys, test the root.
 			return isset( $root ) ? $root : $default;
+		}
 
 		$result = $this->multidimensional( $root, $keys );
 		return isset( $result ) ? $result['node'][ $result['key'] ] : $default;
diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php
index a54794b06d..1da2a3926a 100644
--- a/wp-includes/class-wp-customize-widgets.php
+++ b/wp-includes/class-wp-customize-widgets.php
@@ -100,32 +100,32 @@ final class WP_Customize_Widgets {
 		$this->manager = $manager;
 
 		// See https://github.com/xwp/wp-customize-snapshots/blob/962586659688a5b1fd9ae93618b7ce2d4e7a421c/php/class-customize-snapshot-manager.php#L420-L449
-		add_filter( 'customize_dynamic_setting_args',          array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
-		add_action( 'widgets_init',                            array( $this, 'register_settings' ), 95 );
-		add_action( 'customize_register',                      array( $this, 'schedule_customize_register' ), 1 );
+		add_filter( 'customize_dynamic_setting_args', array( $this, 'filter_customize_dynamic_setting_args' ), 10, 2 );
+		add_action( 'widgets_init', array( $this, 'register_settings' ), 95 );
+		add_action( 'customize_register', array( $this, 'schedule_customize_register' ), 1 );
 
 		// Skip remaining hooks when the user can't manage widgets anyway.
 		if ( ! current_user_can( 'edit_theme_options' ) ) {
 			return;
 		}
 
-		add_action( 'wp_loaded',                               array( $this, 'override_sidebars_widgets_for_theme_switch' ) );
-		add_action( 'customize_controls_init',                 array( $this, 'customize_controls_init' ) );
-		add_action( 'customize_controls_enqueue_scripts',      array( $this, 'enqueue_scripts' ) );
-		add_action( 'customize_controls_print_styles',         array( $this, 'print_styles' ) );
-		add_action( 'customize_controls_print_scripts',        array( $this, 'print_scripts' ) );
+		add_action( 'wp_loaded', array( $this, 'override_sidebars_widgets_for_theme_switch' ) );
+		add_action( 'customize_controls_init', array( $this, 'customize_controls_init' ) );
+		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+		add_action( 'customize_controls_print_styles', array( $this, 'print_styles' ) );
+		add_action( 'customize_controls_print_scripts', array( $this, 'print_scripts' ) );
 		add_action( 'customize_controls_print_footer_scripts', array( $this, 'print_footer_scripts' ) );
 		add_action( 'customize_controls_print_footer_scripts', array( $this, 'output_widget_control_templates' ) );
-		add_action( 'customize_preview_init',                  array( $this, 'customize_preview_init' ) );
-		add_filter( 'customize_refresh_nonces',                array( $this, 'refresh_nonces' ) );
+		add_action( 'customize_preview_init', array( $this, 'customize_preview_init' ) );
+		add_filter( 'customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
 
-		add_action( 'dynamic_sidebar',                         array( $this, 'tally_rendered_widgets' ) );
-		add_filter( 'is_active_sidebar',                       array( $this, 'tally_sidebars_via_is_active_sidebar_calls' ), 10, 2 );
-		add_filter( 'dynamic_sidebar_has_widgets',             array( $this, 'tally_sidebars_via_dynamic_sidebar_calls' ), 10, 2 );
+		add_action( 'dynamic_sidebar', array( $this, 'tally_rendered_widgets' ) );
+		add_filter( 'is_active_sidebar', array( $this, 'tally_sidebars_via_is_active_sidebar_calls' ), 10, 2 );
+		add_filter( 'dynamic_sidebar_has_widgets', array( $this, 'tally_sidebars_via_dynamic_sidebar_calls' ), 10, 2 );
 
 		// Selective Refresh.
-		add_filter( 'customize_dynamic_partial_args',          array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
-		add_action( 'customize_preview_init',                  array( $this, 'selective_refresh_init' ) );
+		add_filter( 'customize_dynamic_partial_args', array( $this, 'customize_dynamic_partial_args' ), 10, 2 );
+		add_action( 'customize_preview_init', array( $this, 'selective_refresh_init' ) );
 	}
 
 	/**
@@ -198,7 +198,7 @@ final class WP_Customize_Widgets {
 	 * @since 4.2.0
 	 */
 	public function register_settings() {
-		$widget_setting_ids = array();
+		$widget_setting_ids   = array();
 		$incoming_setting_ids = array_keys( $this->manager->unsanitized_post_values() );
 		foreach ( $incoming_setting_ids as $setting_id ) {
 			if ( ! is_null( $this->get_setting_type( $setting_id ) ) ) {
@@ -319,7 +319,7 @@ final class WP_Customize_Widgets {
 	 * @return array
 	 */
 	public function filter_option_sidebars_widgets_for_theme_switch( $sidebars_widgets ) {
-		$sidebars_widgets = $GLOBALS['sidebars_widgets'];
+		$sidebars_widgets                  = $GLOBALS['sidebars_widgets'];
 		$sidebars_widgets['array_version'] = 3;
 		return $sidebars_widgets;
 	}
@@ -399,22 +399,26 @@ final class WP_Customize_Widgets {
 		 * theme_mod when the theme is switched.
 		 */
 		if ( ! $this->manager->is_theme_active() ) {
-			$setting_id = 'old_sidebars_widgets_data';
-			$setting_args = $this->get_setting_args( $setting_id, array(
-				'type' => 'global_variable',
-				'dirty' => true,
-			) );
+			$setting_id   = 'old_sidebars_widgets_data';
+			$setting_args = $this->get_setting_args(
+				$setting_id, array(
+					'type'  => 'global_variable',
+					'dirty' => true,
+				)
+			);
 			$this->manager->add_setting( $setting_id, $setting_args );
 		}
 
-		$this->manager->add_panel( '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).' ),
-			'priority'        => 110,
-			'active_callback' => array( $this, 'is_panel_active' ),
-			'auto_expand_sole_section' => true,
-		) );
+		$this->manager->add_panel(
+			'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).' ),
+				'priority'                 => 110,
+				'active_callback'          => array( $this, 'is_panel_active' ),
+				'auto_expand_sole_section' => true,
+			)
+		);
 
 		foreach ( $sidebars_widgets as $sidebar_id => $sidebar_widget_ids ) {
 			if ( empty( $sidebar_widget_ids ) ) {
@@ -442,11 +446,11 @@ final class WP_Customize_Widgets {
 				if ( $is_active_sidebar ) {
 
 					$section_args = array(
-						'title' => $wp_registered_sidebars[ $sidebar_id ]['name'],
+						'title'       => $wp_registered_sidebars[ $sidebar_id ]['name'],
 						'description' => $wp_registered_sidebars[ $sidebar_id ]['description'],
-						'priority' => array_search( $sidebar_id, array_keys( $wp_registered_sidebars ) ),
-						'panel' => 'widgets',
-						'sidebar_id' => $sidebar_id,
+						'priority'    => array_search( $sidebar_id, array_keys( $wp_registered_sidebars ) ),
+						'panel'       => 'widgets',
+						'sidebar_id'  => $sidebar_id,
 					);
 
 					/**
@@ -463,11 +467,13 @@ final class WP_Customize_Widgets {
 					$section = new WP_Customize_Sidebar_Section( $this->manager, $section_id, $section_args );
 					$this->manager->add_section( $section );
 
-					$control = new WP_Widget_Area_Customize_Control( $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.
-					) );
+					$control           = new WP_Widget_Area_Customize_Control(
+						$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.
+						)
+					);
 					$new_setting_ids[] = $setting_id;
 
 					$this->manager->add_control( $control );
@@ -478,25 +484,27 @@ final class WP_Customize_Widgets {
 			foreach ( $sidebar_widget_ids as $i => $widget_id ) {
 
 				// Skip widgets that may have gone away due to a plugin being deactivated.
-				if ( ! $is_active_sidebar || ! isset( $wp_registered_widgets[$widget_id] ) ) {
+				if ( ! $is_active_sidebar || ! isset( $wp_registered_widgets[ $widget_id ] ) ) {
 					continue;
 				}
 
-				$registered_widget = $wp_registered_widgets[$widget_id];
+				$registered_widget = $wp_registered_widgets[ $widget_id ];
 				$setting_id        = $this->get_setting_id( $widget_id );
-				$id_base           = $wp_registered_widget_controls[$widget_id]['id_base'];
+				$id_base           = $wp_registered_widget_controls[ $widget_id ]['id_base'];
 
-				$control = new WP_Widget_Form_Customize_Control( $this->manager, $setting_id, array(
-					'label'          => $registered_widget['name'],
-					'section'        => $section_id,
-					'sidebar_id'     => $sidebar_id,
-					'widget_id'      => $widget_id,
-					'widget_id_base' => $id_base,
-					'priority'       => $i,
-					'width'          => $wp_registered_widget_controls[$widget_id]['width'],
-					'height'         => $wp_registered_widget_controls[$widget_id]['height'],
-					'is_wide'        => $this->is_wide_widget( $widget_id ),
-				) );
+				$control = new WP_Widget_Form_Customize_Control(
+					$this->manager, $setting_id, array(
+						'label'          => $registered_widget['name'],
+						'section'        => $section_id,
+						'sidebar_id'     => $sidebar_id,
+						'widget_id'      => $widget_id,
+						'widget_id_base' => $id_base,
+						'priority'       => $i,
+						'width'          => $wp_registered_widget_controls[ $widget_id ]['width'],
+						'height'         => $wp_registered_widget_controls[ $widget_id ]['height'],
+						'is_wide'        => $this->is_wide_widget( $widget_id ),
+					)
+				);
 				$this->manager->add_control( $control );
 			}
 		}
@@ -562,7 +570,7 @@ final class WP_Customize_Widgets {
 		global $wp_registered_widget_controls;
 
 		$parsed_widget_id = $this->parse_widget_id( $widget_id );
-		$width            = $wp_registered_widget_controls[$widget_id]['width'];
+		$width            = $wp_registered_widget_controls[ $widget_id ]['width'];
 		$is_core          = in_array( $parsed_widget_id['id_base'], $this->core_widget_id_bases );
 		$is_wide          = ( $width > 250 && ! $is_core );
 
@@ -587,7 +595,7 @@ final class WP_Customize_Widgets {
 	 */
 	public function parse_widget_id( $widget_id ) {
 		$parsed = array(
-			'number' => null,
+			'number'  => null,
 			'id_base' => null,
 		);
 
@@ -708,46 +716,52 @@ final class WP_Customize_Widgets {
 		 * Gather all strings in PHP that may be needed by JS on the client.
 		 * Once JS i18n is implemented (in #20491), this can be removed.
 		 */
-		$some_non_rendered_areas_messages = array();
+		$some_non_rendered_areas_messages    = array();
 		$some_non_rendered_areas_messages[1] = html_entity_decode(
 			__( 'Your theme has 1 other widget area, but this particular page doesn&#8217;t display it.' ),
 			ENT_QUOTES,
 			get_bloginfo( 'charset' )
 		);
-		$registered_sidebar_count = count( $wp_registered_sidebars );
+		$registered_sidebar_count            = count( $wp_registered_sidebars );
 		for ( $non_rendered_count = 2; $non_rendered_count < $registered_sidebar_count; $non_rendered_count++ ) {
-			$some_non_rendered_areas_messages[ $non_rendered_count ] = html_entity_decode( sprintf(
-				/* translators: %s: the number of other widget areas registered but not rendered */
-				_n(
-					'Your theme has %s other widget area, but this particular page doesn&#8217;t display it.',
-					'Your theme has %s other widget areas, but this particular page doesn&#8217;t display them.',
-					$non_rendered_count
-				),
-				number_format_i18n( $non_rendered_count )
-			), ENT_QUOTES, get_bloginfo( 'charset' ) );
+			$some_non_rendered_areas_messages[ $non_rendered_count ] = html_entity_decode(
+				sprintf(
+					/* translators: %s: the number of other widget areas registered but not rendered */
+					_n(
+						'Your theme has %s other widget area, but this particular page doesn&#8217;t display it.',
+						'Your theme has %s other widget areas, but this particular page doesn&#8217;t display them.',
+						$non_rendered_count
+					),
+					number_format_i18n( $non_rendered_count )
+				), ENT_QUOTES, get_bloginfo( 'charset' )
+			);
 		}
 
 		if ( 1 === $registered_sidebar_count ) {
-			$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' ) );
+			$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' )
+			);
 		} else {
-			$no_areas_shown_message = html_entity_decode( sprintf(
-				/* translators: %s: the total number of widget areas registered */
-				_n(
-					'Your theme has %s widget area, but this particular page doesn&#8217;t display it.',
-					'Your theme has %s widget areas, but this particular page doesn&#8217;t display them.',
-					$registered_sidebar_count
-				),
-				number_format_i18n( $registered_sidebar_count )
-			), ENT_QUOTES, get_bloginfo( 'charset' ) );
+			$no_areas_shown_message = html_entity_decode(
+				sprintf(
+					/* translators: %s: the total number of widget areas registered */
+					_n(
+						'Your theme has %s widget area, but this particular page doesn&#8217;t display it.',
+						'Your theme has %s widget areas, but this particular page doesn&#8217;t display them.',
+						$registered_sidebar_count
+					),
+					number_format_i18n( $registered_sidebar_count )
+				), ENT_QUOTES, get_bloginfo( 'charset' )
+			);
 		}
 
 		$settings = array(
-			'registeredSidebars'   => array_values( $wp_registered_sidebars ),
-			'registeredWidgets'    => $wp_registered_widgets,
-			'availableWidgets'     => $available_widgets, // @todo Merge this with registered_widgets
-			'l10n' => array(
+			'registeredSidebars'          => array_values( $wp_registered_sidebars ),
+			'registeredWidgets'           => $wp_registered_widgets,
+			'availableWidgets'            => $available_widgets, // @todo Merge this with registered_widgets
+			'l10n'                        => array(
 				'saveBtnLabel'     => __( 'Apply' ),
 				'saveBtnTooltip'   => __( 'Save and preview changes before publishing them.' ),
 				'removeBtnLabel'   => __( 'Remove' ),
@@ -765,7 +779,7 @@ final class WP_Customize_Widgets {
 				'widgetsFound'     => __( 'Number of widgets found: %d' ),
 				'noWidgetsFound'   => __( 'No widgets found.' ),
 			),
-			'tpl' => array(
+			'tpl'                         => array(
 				'widgetReorderNav' => $widget_reorder_nav_tpl,
 				'moveWidgetArea'   => $move_widget_area_tpl,
 			),
@@ -797,23 +811,25 @@ final class WP_Customize_Widgets {
 					<span class="screen-reader-text"><?php _e( 'Back' ); ?></span>
 				</button>
 				<h3>
-					<span class="customize-action"><?php
+					<span class="customize-action">
+					<?php
 						/* translators: &#9656; is the unicode right-pointing triangle, and %s is the section title in the Customizer */
 						echo sprintf( __( 'Customizing &#9656; %s' ), esc_html( $this->manager->get_panel( 'widgets' )->title ) );
-					?></span>
+					?>
+					</span>
 					<?php _e( 'Add a Widget' ); ?>
 				</h3>
 			</div>
 			<div id="available-widgets-filter">
 				<label class="screen-reader-text" for="widgets-search"><?php _e( 'Search Widgets' ); ?></label>
-				<input type="text" id="widgets-search" placeholder="<?php esc_attr_e( 'Search widgets&hellip;' ) ?>" aria-describedby="widgets-search-desc" />
+				<input type="text" id="widgets-search" placeholder="<?php esc_attr_e( 'Search widgets&hellip;' ); ?>" aria-describedby="widgets-search-desc" />
 				<div class="search-icon" aria-hidden="true"></div>
 				<button type="button" class="clear-results"><span class="screen-reader-text"><?php _e( 'Clear Results' ); ?></span></button>
 				<p class="screen-reader-text" id="widgets-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
 			</div>
 			<div id="available-widgets-list">
-			<?php foreach ( $this->get_available_widgets() as $available_widget ): ?>
-				<div id="widget-tpl-<?php echo esc_attr( $available_widget['id'] ) ?>" data-widget-id="<?php echo esc_attr( $available_widget['id'] ) ?>" class="widget-tpl <?php echo esc_attr( $available_widget['id'] ) ?>" tabindex="0">
+			<?php foreach ( $this->get_available_widgets() as $available_widget ) : ?>
+				<div id="widget-tpl-<?php echo esc_attr( $available_widget['id'] ); ?>" data-widget-id="<?php echo esc_attr( $available_widget['id'] ); ?>" class="widget-tpl <?php echo esc_attr( $available_widget['id'] ); ?>" tabindex="0">
 					<?php echo $available_widget['control_tpl']; ?>
 				</div>
 			<?php endforeach; ?>
@@ -858,13 +874,13 @@ final class WP_Customize_Widgets {
 		);
 
 		if ( preg_match( $this->setting_id_patterns['sidebar_widgets'], $id, $matches ) ) {
-			$args['sanitize_callback'] = array( $this, 'sanitize_sidebar_widgets' );
+			$args['sanitize_callback']    = array( $this, 'sanitize_sidebar_widgets' );
 			$args['sanitize_js_callback'] = array( $this, 'sanitize_sidebar_widgets_js_instance' );
-			$args['transport'] = current_theme_supports( 'customize-selective-refresh-widgets' ) ? 'postMessage' : 'refresh';
+			$args['transport']            = current_theme_supports( 'customize-selective-refresh-widgets' ) ? 'postMessage' : 'refresh';
 		} elseif ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
-			$args['sanitize_callback'] = array( $this, 'sanitize_widget_instance' );
+			$args['sanitize_callback']    = array( $this, 'sanitize_widget_instance' );
 			$args['sanitize_js_callback'] = array( $this, 'sanitize_widget_js_instance' );
-			$args['transport'] = $this->is_widget_selective_refreshable( $matches['id_base'] ) ? 'postMessage' : 'refresh';
+			$args['transport']            = $this->is_widget_selective_refreshable( $matches['id_base'] ) ? 'postMessage' : 'refresh';
 		}
 
 		$args = array_merge( $args, $overrides );
@@ -893,7 +909,7 @@ final class WP_Customize_Widgets {
 	 * @return array Array of sanitized widget IDs.
 	 */
 	public function sanitize_sidebar_widgets( $widget_ids ) {
-		$widget_ids = array_map( 'strval', (array) $widget_ids );
+		$widget_ids           = array_map( 'strval', (array) $widget_ids );
 		$sanitized_widget_ids = array();
 		foreach ( $widget_ids as $widget_id ) {
 			$sanitized_widget_ids[] = preg_replace( '/[^a-z0-9_\-]/', '', $widget_id );
@@ -949,9 +965,9 @@ final class WP_Customize_Widgets {
 			);
 
 			$is_disabled     = false;
-			$is_multi_widget = ( isset( $wp_registered_widget_controls[$widget['id']]['id_base'] ) && isset( $widget['params'][0]['number'] ) );
+			$is_multi_widget = ( isset( $wp_registered_widget_controls[ $widget['id'] ]['id_base'] ) && isset( $widget['params'][0]['number'] ) );
 			if ( $is_multi_widget ) {
-				$id_base            = $wp_registered_widget_controls[$widget['id']]['id_base'];
+				$id_base            = $wp_registered_widget_controls[ $widget['id'] ]['id_base'];
 				$args['_temp_id']   = "$id_base-__i__";
 				$args['_multi_num'] = next_widget_id_number( $id_base );
 				$args['_add']       = 'multi';
@@ -964,22 +980,29 @@ final class WP_Customize_Widgets {
 				$id_base = $widget['id'];
 			}
 
-			$list_widget_controls_args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
-			$control_tpl = $this->get_widget_control( $list_widget_controls_args );
+			$list_widget_controls_args = wp_list_widget_controls_dynamic_sidebar(
+				array(
+					0 => $args,
+					1 => $widget['params'][0],
+				)
+			);
+			$control_tpl               = $this->get_widget_control( $list_widget_controls_args );
 
 			// The properties here are mapped to the Backbone Widget model.
-			$available_widget = array_merge( $available_widget, array(
-				'temp_id'      => isset( $args['_temp_id'] ) ? $args['_temp_id'] : null,
-				'is_multi'     => $is_multi_widget,
-				'control_tpl'  => $control_tpl,
-				'multi_number' => ( $args['_add'] === 'multi' ) ? $args['_multi_num'] : false,
-				'is_disabled'  => $is_disabled,
-				'id_base'      => $id_base,
-				'transport'    => $this->is_widget_selective_refreshable( $id_base ) ? 'postMessage' : 'refresh',
-				'width'        => $wp_registered_widget_controls[$widget['id']]['width'],
-				'height'       => $wp_registered_widget_controls[$widget['id']]['height'],
-				'is_wide'      => $this->is_wide_widget( $widget['id'] ),
-			) );
+			$available_widget = array_merge(
+				$available_widget, array(
+					'temp_id'      => isset( $args['_temp_id'] ) ? $args['_temp_id'] : null,
+					'is_multi'     => $is_multi_widget,
+					'control_tpl'  => $control_tpl,
+					'multi_number' => ( $args['_add'] === 'multi' ) ? $args['_multi_num'] : false,
+					'is_disabled'  => $is_disabled,
+					'id_base'      => $id_base,
+					'transport'    => $this->is_widget_selective_refreshable( $id_base ) ? 'postMessage' : 'refresh',
+					'width'        => $wp_registered_widget_controls[ $widget['id'] ]['width'],
+					'height'       => $wp_registered_widget_controls[ $widget['id'] ]['height'],
+					'is_wide'      => $this->is_wide_widget( $widget['id'] ),
+				)
+			);
 
 			$available_widgets[] = $available_widget;
 		}
@@ -1009,10 +1032,10 @@ final class WP_Customize_Widgets {
 	 * @return string Widget control form HTML markup.
 	 */
 	public function get_widget_control( $args ) {
-		$args[0]['before_form'] = '<div class="form">';
-		$args[0]['after_form'] = '</div><!-- .form -->';
+		$args[0]['before_form']           = '<div class="form">';
+		$args[0]['after_form']            = '</div><!-- .form -->';
 		$args[0]['before_widget_content'] = '<div class="widget-content">';
-		$args[0]['after_widget_content'] = '</div><!-- .widget-content -->';
+		$args[0]['after_widget_content']  = '</div><!-- .widget-content -->';
 		ob_start();
 		call_user_func_array( 'wp_widget_control', $args );
 		$control_tpl = ob_get_clean();
@@ -1032,19 +1055,21 @@ final class WP_Customize_Widgets {
 	 */
 	public function get_widget_control_parts( $args ) {
 		$args[0]['before_widget_content'] = '<div class="widget-content">';
-		$args[0]['after_widget_content'] = '</div><!-- .widget-content -->';
-		$control_markup = $this->get_widget_control( $args );
+		$args[0]['after_widget_content']  = '</div><!-- .widget-content -->';
+		$control_markup                   = $this->get_widget_control( $args );
 
 		$content_start_pos = strpos( $control_markup, $args[0]['before_widget_content'] );
-		$content_end_pos = strrpos( $control_markup, $args[0]['after_widget_content'] );
+		$content_end_pos   = strrpos( $control_markup, $args[0]['after_widget_content'] );
 
-		$control = substr( $control_markup, 0, $content_start_pos + strlen( $args[0]['before_widget_content'] ) );
+		$control  = substr( $control_markup, 0, $content_start_pos + strlen( $args[0]['before_widget_content'] ) );
 		$control .= substr( $control_markup, $content_end_pos );
-		$content = trim( substr(
-			$control_markup,
-			$content_start_pos + strlen( $args[0]['before_widget_content'] ),
-			$content_end_pos - $content_start_pos - strlen( $args[0]['before_widget_content'] )
-		) );
+		$content  = trim(
+			substr(
+				$control_markup,
+				$content_start_pos + strlen( $args[0]['before_widget_content'] ),
+				$content_end_pos - $content_start_pos - strlen( $args[0]['before_widget_content'] )
+			)
+		);
 
 		return compact( 'control', 'content' );
 	}
@@ -1056,8 +1081,8 @@ final class WP_Customize_Widgets {
 	 */
 	public function customize_preview_init() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'customize_preview_enqueue' ) );
-		add_action( 'wp_print_styles',    array( $this, 'print_preview_css' ), 1 );
-		add_action( 'wp_footer',          array( $this, 'export_preview_data' ), 20 );
+		add_action( 'wp_print_styles', array( $this, 'print_preview_css' ), 1 );
+		add_action( 'wp_footer', array( $this, 'export_preview_data' ), 20 );
 	}
 
 	/**
@@ -1127,7 +1152,7 @@ final class WP_Customize_Widgets {
 	 * and at the very end of the wp_footer,
 	 *
 	 * @since 3.9.0
-     *
+	 *
 	 * @global array $wp_registered_sidebars
 	 * @global array $wp_registered_widgets
 	 */
@@ -1135,8 +1160,8 @@ final class WP_Customize_Widgets {
 		global $wp_registered_sidebars, $wp_registered_widgets;
 
 		$switched_locale = switch_to_locale( get_user_locale() );
-		$l10n = array(
-			'widgetTooltip'  => __( 'Shift-click to edit this widget.' ),
+		$l10n            = array(
+			'widgetTooltip' => __( 'Shift-click to edit this widget.' ),
 		);
 		if ( $switched_locale ) {
 			restore_previous_locale();
@@ -1144,11 +1169,11 @@ final class WP_Customize_Widgets {
 
 		// Prepare Customizer settings to pass to JavaScript.
 		$settings = array(
-			'renderedSidebars'   => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
-			'renderedWidgets'    => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
-			'registeredSidebars' => array_values( $wp_registered_sidebars ),
-			'registeredWidgets'  => $wp_registered_widgets,
-			'l10n'               => $l10n,
+			'renderedSidebars'            => array_fill_keys( array_unique( $this->rendered_sidebars ), true ),
+			'renderedWidgets'             => array_fill_keys( array_keys( $this->rendered_widgets ), true ),
+			'registeredSidebars'          => array_values( $wp_registered_sidebars ),
+			'registeredWidgets'           => $wp_registered_widgets,
+			'l10n'                        => $l10n,
 			'selectiveRefreshableWidgets' => $this->get_selective_refreshable_widgets(),
 		);
 		foreach ( $settings['registeredWidgets'] as &$registered_widget ) {
@@ -1281,8 +1306,7 @@ final class WP_Customize_Widgets {
 
 		if ( empty( $value['is_widget_customizer_js_value'] )
 			|| empty( $value['instance_hash_key'] )
-			|| empty( $value['encoded_serialized_instance'] ) )
-		{
+			|| empty( $value['encoded_serialized_instance'] ) ) {
 			return;
 		}
 
@@ -1398,14 +1422,14 @@ final class WP_Customize_Widgets {
 			}
 
 			if ( ! is_null( $parsed_id['number'] ) ) {
-				$value = array();
-				$value[$parsed_id['number']] = $instance;
-				$key = 'widget-' . $parsed_id['id_base'];
-				$_REQUEST[$key] = $_POST[$key] = wp_slash( $value );
-				$added_input_vars[] = $key;
+				$value                         = array();
+				$value[ $parsed_id['number'] ] = $instance;
+				$key                           = 'widget-' . $parsed_id['id_base'];
+				$_REQUEST[ $key ]              = $_POST[ $key ] = wp_slash( $value );
+				$added_input_vars[]            = $key;
 			} else {
 				foreach ( $instance as $key => $value ) {
-					$_REQUEST[$key] = $_POST[$key] = wp_slash( $value );
+					$_REQUEST[ $key ]   = $_POST[ $key ] = wp_slash( $value );
 					$added_input_vars[] = $key;
 				}
 			}
@@ -1509,7 +1533,7 @@ final class WP_Customize_Widgets {
 
 		$widget_id = $this->get_post_value( 'widget-id' );
 		$parsed_id = $this->parse_widget_id( $widget_id );
-		$id_base = $parsed_id['id_base'];
+		$id_base   = $parsed_id['id_base'];
 
 		$is_updating_widget_template = (
 			isset( $_POST[ 'widget-' . $id_base ] )
@@ -1527,7 +1551,7 @@ final class WP_Customize_Widgets {
 			wp_send_json_error( $updated_widget->get_error_code() );
 		}
 
-		$form = $updated_widget['form'];
+		$form     = $updated_widget['form'];
 		$instance = $this->sanitize_widget_js_instance( $updated_widget['instance'] );
 
 		wp_send_json_success( compact( 'form', 'instance' ) );
@@ -1602,13 +1626,13 @@ final class WP_Customize_Widgets {
 		$sidebar_args = array_merge(
 			array(
 				'before_widget' => '',
-				'after_widget' => '',
+				'after_widget'  => '',
 			),
 			$params[0]
 		);
 
 		// Skip widgets not in a registered sidebar or ones which lack a proper wrapper element to attach the data-* attributes to.
-		$matches = array();
+		$matches  = array();
 		$is_valid = (
 			isset( $sidebar_args['id'] )
 			&&
@@ -1628,14 +1652,14 @@ final class WP_Customize_Widgets {
 		);
 		if ( isset( $this->context_sidebar_instance_number ) ) {
 			$context['sidebar_instance_number'] = $this->context_sidebar_instance_number;
-		} else if ( isset( $sidebar_args['id'] ) && isset( $this->sidebar_instance_count[ $sidebar_args['id'] ] ) ) {
+		} elseif ( isset( $sidebar_args['id'] ) && isset( $this->sidebar_instance_count[ $sidebar_args['id'] ] ) ) {
 			$context['sidebar_instance_number'] = $this->sidebar_instance_count[ $sidebar_args['id'] ];
 		}
 
-		$attributes = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'widget[' . $sidebar_args['widget_id'] . ']' ) );
-		$attributes .= ' data-customize-partial-type="widget"';
-		$attributes .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $context ) ) );
-		$attributes .= sprintf( ' data-customize-widget-id="%s"', esc_attr( $sidebar_args['widget_id'] ) );
+		$attributes                    = sprintf( ' data-customize-partial-id="%s"', esc_attr( 'widget[' . $sidebar_args['widget_id'] . ']' ) );
+		$attributes                   .= ' data-customize-partial-type="widget"';
+		$attributes                   .= sprintf( ' data-customize-partial-placement-context="%s"', esc_attr( wp_json_encode( $context ) ) );
+		$attributes                   .= sprintf( ' data-customize-widget-id="%s"', esc_attr( $sidebar_args['widget_id'] ) );
 		$sidebar_args['before_widget'] = preg_replace( '#^(<\w+)#', '$1 ' . $attributes, $sidebar_args['before_widget'] );
 
 		$params[0] = $sidebar_args;
@@ -1670,13 +1694,15 @@ final class WP_Customize_Widgets {
 			}
 			$allowed_html[ $tag_name ] = array_merge(
 				$allowed_html[ $tag_name ],
-				array_fill_keys( array(
-					'data-customize-partial-id',
-					'data-customize-partial-type',
-					'data-customize-partial-placement-context',
-					'data-customize-partial-widget-id',
-					'data-customize-partial-options',
-				), true )
+				array_fill_keys(
+					array(
+						'data-customize-partial-id',
+						'data-customize-partial-type',
+						'data-customize-partial-placement-context',
+						'data-customize-partial-widget-id',
+						'data-customize-partial-options',
+					), true
+				)
 			);
 		}
 		return $allowed_html;
@@ -1815,14 +1841,14 @@ final class WP_Customize_Widgets {
 		// Render the widget.
 		ob_start();
 		dynamic_sidebar( $this->rendering_sidebar_id = $context['sidebar_id'] );
-		$container = ob_get_clean();
+		$container                                   = ob_get_clean();
 
 		// Reset variables for next partial render.
 		remove_filter( 'sidebars_widgets', $filter_callback, 1000 );
 
 		$this->context_sidebar_instance_number = null;
-		$this->rendering_sidebar_id = null;
-		$this->rendering_widget_id = null;
+		$this->rendering_sidebar_id            = null;
+		$this->rendering_widget_id             = null;
 
 		return $container;
 	}
@@ -1975,7 +2001,7 @@ final class WP_Customize_Widgets {
 			remove_filter( "pre_option_{$option_name}", array( $this, 'capture_filter_pre_get_option' ) );
 		}
 
-		$this->_captured_options = array();
+		$this->_captured_options            = array();
 		$this->_is_capturing_option_updates = false;
 	}
 
diff --git a/wp-includes/class-wp-dependency.php b/wp-includes/class-wp-dependency.php
index cd808e8ece..d14928f60b 100644
--- a/wp-includes/class-wp-dependency.php
+++ b/wp-includes/class-wp-dependency.php
@@ -74,8 +74,9 @@ class _WP_Dependency {
 	 */
 	public function __construct() {
 		@list( $this->handle, $this->src, $this->deps, $this->ver, $this->args ) = func_get_args();
-		if ( ! is_array($this->deps) )
+		if ( ! is_array( $this->deps ) ) {
 			$this->deps = array();
+		}
 	}
 
 	/**
@@ -88,9 +89,10 @@ class _WP_Dependency {
 	 * @return bool False if not scalar, true otherwise.
 	 */
 	public function add_data( $name, $data ) {
-		if ( !is_scalar($name) )
+		if ( ! is_scalar( $name ) ) {
 			return false;
-		$this->extra[$name] = $data;
+		}
+		$this->extra[ $name ] = $data;
 		return true;
 	}
 
diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
index 0743a840fe..1b92ac51a1 100644
--- a/wp-includes/class-wp-editor.php
+++ b/wp-includes/class-wp-editor.php
@@ -12,23 +12,23 @@ final class _WP_Editors {
 	public static $mce_locale;
 
 	private static $mce_settings = array();
-	private static $qt_settings = array();
-	private static $plugins = array();
-	private static $qt_buttons = array();
+	private static $qt_settings  = array();
+	private static $plugins      = array();
+	private static $qt_buttons   = array();
 	private static $ext_plugins;
 	private static $baseurl;
 	private static $first_init;
-	private static $this_tinymce = false;
-	private static $this_quicktags = false;
-	private static $has_tinymce = false;
-	private static $has_quicktags = false;
-	private static $has_medialib = false;
+	private static $this_tinymce       = false;
+	private static $this_quicktags     = false;
+	private static $has_tinymce        = false;
+	private static $has_quicktags      = false;
+	private static $has_medialib       = false;
 	private static $editor_buttons_css = true;
-	private static $drag_drop_upload = false;
-	private static $old_dfw_compat = false;
+	private static $drag_drop_upload   = false;
+	private static $old_dfw_compat     = false;
 	private static $translation;
 	private static $tinymce_scripts_printed = false;
-	private static $link_dialog_printed = false;
+	private static $link_dialog_printed     = false;
 
 	private function __construct() {}
 
@@ -80,23 +80,25 @@ final class _WP_Editors {
 		 */
 		$settings = apply_filters( 'wp_editor_settings', $settings, $editor_id );
 
-		$set = wp_parse_args( $settings, array(
-			'wpautop'             => true,
-			'media_buttons'       => true,
-			'default_editor'      => '',
-			'drag_drop_upload'    => false,
-			'textarea_name'       => $editor_id,
-			'textarea_rows'       => 20,
-			'tabindex'            => '',
-			'tabfocus_elements'   => ':prev,:next',
-			'editor_css'          => '',
-			'editor_class'        => '',
-			'teeny'               => false,
-			'dfw'                 => false,
-			'_content_editor_dfw' => false,
-			'tinymce'             => true,
-			'quicktags'           => true
-		) );
+		$set = wp_parse_args(
+			$settings, array(
+				'wpautop'             => true,
+				'media_buttons'       => true,
+				'default_editor'      => '',
+				'drag_drop_upload'    => false,
+				'textarea_name'       => $editor_id,
+				'textarea_rows'       => 20,
+				'tabindex'            => '',
+				'tabfocus_elements'   => ':prev,:next',
+				'editor_css'          => '',
+				'editor_class'        => '',
+				'teeny'               => false,
+				'dfw'                 => false,
+				'_content_editor_dfw' => false,
+				'tinymce'             => true,
+				'quicktags'           => true,
+			)
+		);
 
 		self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() );
 
@@ -109,31 +111,36 @@ final class _WP_Editors {
 
 		self::$this_quicktags = (bool) $set['quicktags'];
 
-		if ( self::$this_tinymce )
+		if ( self::$this_tinymce ) {
 			self::$has_tinymce = true;
+		}
 
-		if ( self::$this_quicktags )
+		if ( self::$this_quicktags ) {
 			self::$has_quicktags = true;
+		}
 
 		if ( $set['dfw'] ) {
 			self::$old_dfw_compat = true;
 		}
 
-		if ( empty( $set['editor_height'] ) )
+		if ( empty( $set['editor_height'] ) ) {
 			return $set;
+		}
 
 		if ( 'content' === $editor_id && empty( $set['tinymce']['wp_autoresize_on'] ) ) {
 			// A cookie (set when a user resizes the editor) overrides the height.
 			$cookie = (int) get_user_setting( 'ed_size' );
 
-			if ( $cookie )
+			if ( $cookie ) {
 				$set['editor_height'] = $cookie;
+			}
 		}
 
-		if ( $set['editor_height'] < 50 )
+		if ( $set['editor_height'] < 50 ) {
 			$set['editor_height'] = 50;
-		elseif ( $set['editor_height'] > 5000 )
+		} elseif ( $set['editor_height'] > 5000 ) {
 			$set['editor_height'] = 5000;
+		}
 
 		return $set;
 	}
@@ -147,11 +154,11 @@ final class _WP_Editors {
 	 * @param array $settings See _WP_Editors()::parse_settings() for description.
 	 */
 	public static function editor( $content, $editor_id, $settings = array() ) {
-		$set = self::parse_settings( $editor_id, $settings );
-		$editor_class = ' class="' . trim( esc_attr( $set['editor_class'] ) . ' wp-editor-area' ) . '"';
-		$tabindex = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
+		$set            = self::parse_settings( $editor_id, $settings );
+		$editor_class   = ' class="' . trim( esc_attr( $set['editor_class'] ) . ' wp-editor-area' ) . '"';
+		$tabindex       = $set['tabindex'] ? ' tabindex="' . (int) $set['tabindex'] . '"' : '';
 		$default_editor = 'html';
-		$buttons = $autocomplete = '';
+		$buttons        = $autocomplete = '';
 		$editor_id_attr = esc_attr( $editor_id );
 
 		if ( $set['drag_drop_upload'] ) {
@@ -188,7 +195,7 @@ final class _WP_Editors {
 		}
 
 		$switch_class = 'html' === $default_editor ? 'html-active' : 'tmce-active';
-		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
+		$wrap_class   = 'wp-core-ui wp-editor-wrap ' . $switch_class;
 
 		if ( $set['_content_editor_dfw'] ) {
 			$wrap_class .= ' has-dfw';
@@ -211,8 +218,9 @@ final class _WP_Editors {
 			if ( $set['media_buttons'] ) {
 				self::$has_medialib = true;
 
-				if ( ! function_exists( 'media_buttons' ) )
+				if ( ! function_exists( 'media_buttons' ) ) {
 					include( ABSPATH . 'wp-admin/includes/media.php' );
+				}
 
 				echo '<div id="wp-' . $editor_id_attr . '-media-buttons" class="wp-media-buttons">';
 
@@ -250,10 +258,12 @@ 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 = apply_filters(
+			'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>' );
+			'id="' . $editor_id_attr . '">%s</textarea></div>'
+		);
 
 		// Prepare the content for the Visual or Text editor, only when TinyMCE is used (back-compat).
 		if ( self::$this_tinymce ) {
@@ -304,10 +314,10 @@ final class _WP_Editors {
 	 * @param string $editor_id
 	 * @param array  $set
 	 */
-	public static function editor_settings($editor_id, $set) {
+	public static function editor_settings( $editor_id, $set ) {
 		global $tinymce_version;
 
-		if ( empty(self::$first_init) ) {
+		if ( empty( self::$first_init ) ) {
 			if ( is_admin() ) {
 				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'editor_js' ), 50 );
 				add_action( 'admin_print_footer_scripts', array( __CLASS__, 'enqueue_scripts' ), 1 );
@@ -320,15 +330,17 @@ final class _WP_Editors {
 		if ( self::$this_quicktags ) {
 
 			$qtInit = array(
-				'id' => $editor_id,
-				'buttons' => ''
+				'id'      => $editor_id,
+				'buttons' => '',
 			);
 
-			if ( is_array($set['quicktags']) )
-				$qtInit = array_merge($qtInit, $set['quicktags']);
+			if ( is_array( $set['quicktags'] ) ) {
+				$qtInit = array_merge( $qtInit, $set['quicktags'] );
+			}
 
-			if ( empty($qtInit['buttons']) )
+			if ( empty( $qtInit['buttons'] ) ) {
 				$qtInit['buttons'] = 'strong,em,link,block,del,ins,img,ul,ol,li,code,more,close';
+			}
 
 			if ( $set['_content_editor_dfw'] ) {
 				$qtInit['buttons'] .= ',dfw';
@@ -344,16 +356,16 @@ final class _WP_Editors {
 			 */
 			$qtInit = apply_filters( 'quicktags_settings', $qtInit, $editor_id );
 
-			self::$qt_settings[$editor_id] = $qtInit;
+			self::$qt_settings[ $editor_id ] = $qtInit;
 
-			self::$qt_buttons = array_merge( self::$qt_buttons, explode(',', $qtInit['buttons']) );
+			self::$qt_buttons = array_merge( self::$qt_buttons, explode( ',', $qtInit['buttons'] ) );
 		}
 
 		if ( self::$this_tinymce ) {
 
 			if ( empty( self::$first_init ) ) {
-				$baseurl = self::get_baseurl();
-				$mce_locale = self::get_mce_locale();
+				$baseurl     = self::get_baseurl();
+				$mce_locale  = self::get_mce_locale();
 				$ext_plugins = '';
 
 				if ( $set['teeny'] ) {
@@ -428,7 +440,7 @@ final class _WP_Editors {
 					if ( ( $key = array_search( 'spellchecker', $plugins ) ) !== false ) {
 						// Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
 						// It can be added with 'mce_external_plugins'.
-						unset( $plugins[$key] );
+						unset( $plugins[ $key ] );
 					}
 
 					if ( ! empty( $mce_external_plugins ) ) {
@@ -449,13 +461,13 @@ final class _WP_Editors {
 						$mce_external_languages = apply_filters( 'mce_external_languages', array() );
 
 						$loaded_langs = array();
-						$strings = '';
+						$strings      = '';
 
 						if ( ! empty( $mce_external_languages ) ) {
 							foreach ( $mce_external_languages as $name => $path ) {
 								if ( @is_file( $path ) && @is_readable( $path ) ) {
 									include_once( $path );
-									$ext_plugins .= $strings . "\n";
+									$ext_plugins   .= $strings . "\n";
 									$loaded_langs[] = $name;
 								}
 							}
@@ -467,39 +479,43 @@ final class _WP_Editors {
 								continue;
 							}
 
-							$url = set_url_scheme( $url );
+							$url                           = set_url_scheme( $url );
 							$mce_external_plugins[ $name ] = $url;
-							$plugurl = dirname( $url );
-							$strings = '';
+							$plugurl                       = dirname( $url );
+							$strings                       = '';
 
 							// Try to load langs/[locale].js and langs/[locale]_dlg.js
 							if ( ! in_array( $name, $loaded_langs, true ) ) {
 								$path = str_replace( content_url(), '', $plugurl );
 								$path = WP_CONTENT_DIR . $path . '/langs/';
 
-								if ( function_exists('realpath') )
-									$path = trailingslashit( realpath($path) );
+								if ( function_exists( 'realpath' ) ) {
+									$path = trailingslashit( realpath( $path ) );
+								}
 
-								if ( @is_file( $path . $mce_locale . '.js' ) )
+								if ( @is_file( $path . $mce_locale . '.js' ) ) {
 									$strings .= @file_get_contents( $path . $mce_locale . '.js' ) . "\n";
+								}
 
-								if ( @is_file( $path . $mce_locale . '_dlg.js' ) )
+								if ( @is_file( $path . $mce_locale . '_dlg.js' ) ) {
 									$strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
+								}
 
 								if ( 'en' != $mce_locale && empty( $strings ) ) {
 									if ( @is_file( $path . 'en.js' ) ) {
-										$str1 = @file_get_contents( $path . 'en.js' );
+										$str1     = @file_get_contents( $path . 'en.js' );
 										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
 									}
 
 									if ( @is_file( $path . 'en_dlg.js' ) ) {
-										$str2 = @file_get_contents( $path . 'en_dlg.js' );
+										$str2     = @file_get_contents( $path . 'en_dlg.js' );
 										$strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
 									}
 								}
 
-								if ( ! empty( $strings ) )
+								if ( ! empty( $strings ) ) {
 									$ext_plugins .= "\n" . $strings . "\n";
+								}
 							}
 
 							$ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n";
@@ -508,10 +524,10 @@ final class _WP_Editors {
 					}
 				}
 
-				self::$plugins = $plugins;
+				self::$plugins     = $plugins;
 				self::$ext_plugins = $ext_plugins;
 
-				$settings = self::default_settings();
+				$settings            = self::default_settings();
 				$settings['plugins'] = implode( ',', $plugins );
 
 				if ( ! empty( $mce_external_plugins ) ) {
@@ -523,7 +539,7 @@ final class _WP_Editors {
 					$settings['wpeditimage_disable_captions'] = true;
 				}
 
-				$mce_css = $settings['content_css'];
+				$mce_css       = $settings['content_css'];
 				$editor_styles = get_editor_stylesheets();
 
 				if ( ! empty( $editor_styles ) ) {
@@ -565,7 +581,7 @@ final class _WP_Editors {
 				 * @param array  $buttons   An array of teenyMCE buttons.
 				 * @param string $editor_id Unique editor identifier, e.g. 'content'.
 				 */
-				$mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'fullscreen'), $editor_id );
+				$mce_buttons   = apply_filters( 'teeny_mce_buttons', array( 'bold', 'italic', 'underline', 'blockquote', 'strikethrough', 'bullist', 'numlist', 'alignleft', 'aligncenter', 'alignright', 'undo', 'redo', 'link', 'fullscreen' ), $editor_id );
 				$mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
 			} else {
 				$mce_buttons = array( 'formatselect', 'bold', 'italic', 'bullist', 'numlist', 'blockquote', 'alignleft', 'aligncenter', 'alignright', 'link', 'wp_more', 'spellchecker' );
@@ -634,17 +650,18 @@ final class _WP_Editors {
 
 				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 					$post_format = get_post_format( $post );
-					if ( $post_format && ! is_wp_error( $post_format ) )
+					if ( $post_format && ! is_wp_error( $post_format ) ) {
 						$body_class .= ' post-format-' . sanitize_html_class( $post_format );
-					else
+					} else {
 						$body_class .= ' post-format-standard';
+					}
 				}
 
 				$page_template = get_page_template_slug( $post );
 
 				if ( $page_template !== false ) {
 					$page_template = empty( $page_template ) ? 'default' : str_replace( '.', '-', basename( $page_template, '.php' ) );
-					$body_class .= ' page-template-' . sanitize_html_class( $page_template );
+					$body_class   .= ' page-template-' . sanitize_html_class( $page_template );
 				}
 			}
 
@@ -655,23 +672,24 @@ final class _WP_Editors {
 				unset( $set['tinymce']['body_class'] );
 			}
 
-			$mceInit = array (
-				'selector' => "#$editor_id",
-				'wpautop' => (bool) $set['wpautop'],
-				'indent' => ! $set['wpautop'],
-				'toolbar1' => implode( ',', $mce_buttons ),
-				'toolbar2' => implode( ',', $mce_buttons_2 ),
-				'toolbar3' => implode( ',', $mce_buttons_3 ),
-				'toolbar4' => implode( ',', $mce_buttons_4 ),
+			$mceInit = array(
+				'selector'          => "#$editor_id",
+				'wpautop'           => (bool) $set['wpautop'],
+				'indent'            => ! $set['wpautop'],
+				'toolbar1'          => implode( ',', $mce_buttons ),
+				'toolbar2'          => implode( ',', $mce_buttons_2 ),
+				'toolbar3'          => implode( ',', $mce_buttons_3 ),
+				'toolbar4'          => implode( ',', $mce_buttons_4 ),
 				'tabfocus_elements' => $set['tabfocus_elements'],
-				'body_class' => $body_class
+				'body_class'        => $body_class,
 			);
 
 			// Merge with the first part of the init array
 			$mceInit = array_merge( self::$first_init, $mceInit );
 
-			if ( is_array( $set['tinymce'] ) )
+			if ( is_array( $set['tinymce'] ) ) {
 				$mceInit = array_merge( $mceInit, $set['tinymce'] );
+			}
 
 			/*
 			 * For people who really REALLY know what they're doing with TinyMCE
@@ -710,12 +728,11 @@ final class _WP_Editors {
 				$mceInit['toolbar4'] = '';
 			}
 
-			self::$mce_settings[$editor_id] = $mceInit;
+			self::$mce_settings[ $editor_id ] = $mceInit;
 		} // end if self::$this_tinymce
 	}
 
 	/**
-	 *
 	 * @static
 	 * @param array $init
 	 * @return string
@@ -725,7 +742,7 @@ final class _WP_Editors {
 
 		foreach ( $init as $key => $value ) {
 			if ( is_bool( $value ) ) {
-				$val = $value ? 'true' : 'false';
+				$val      = $value ? 'true' : 'false';
 				$options .= $key . ':' . $val . ',';
 				continue;
 			} elseif ( ! empty( $value ) && is_string( $value ) && (
@@ -743,9 +760,8 @@ final class _WP_Editors {
 	}
 
 	/**
-	 *
 	 * @static
-	 * 
+	 *
 	 * @param bool $default_scripts Optional. Whether default scripts should be enqueued. Default false.
 	 */
 	public static function enqueue_scripts( $default_scripts = false ) {
@@ -783,10 +799,12 @@ final class _WP_Editors {
 		 * @param array $to_load An array containing boolean values whether TinyMCE
 		 *                       and Quicktags are being loaded.
 		 */
-		do_action( 'wp_enqueue_editor', array(
-			'tinymce'   => ( $default_scripts || self::$has_tinymce ),
-			'quicktags' => ( $default_scripts || self::$has_quicktags ),
-		) );
+		do_action(
+			'wp_enqueue_editor', array(
+				'tinymce'   => ( $default_scripts || self::$has_tinymce ),
+				'quicktags' => ( $default_scripts || self::$has_quicktags ),
+			)
+		);
 	}
 
 	/**
@@ -818,7 +836,6 @@ final class _WP_Editors {
 	 * For use when the editor is going to be initialized after page load.
 	 *
 	 * @since 4.8.0
-	 *
 	 */
 	public static function print_default_editor_scripts() {
 		$user_can_richedit = user_can_richedit();
@@ -826,9 +843,9 @@ final class _WP_Editors {
 		if ( $user_can_richedit ) {
 			$settings = self::default_settings();
 
-			$settings['toolbar1'] = 'bold,italic,bullist,numlist,link';
-			$settings['wpautop'] = false;
-			$settings['indent'] = true;
+			$settings['toolbar1']    = 'bold,italic,bullist,numlist,link';
+			$settings['wpautop']     = false;
+			$settings['indent']      = true;
 			$settings['elementpath'] = false;
 
 			if ( is_rtl() ) {
@@ -838,23 +855,25 @@ final class _WP_Editors {
 			// In production all plugins are loaded (they are in wp-editor.js.gz).
 			// 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(
-				'charmap',
-				'colorpicker',
-				'hr',
-				'lists',
-				'paste',
-				'tabfocus',
-				'textcolor',
-				'fullscreen',
-				'wordpress',
-				'wpautoresize',
-				'wpeditimage',
-				'wpemoji',
-				'wpgallery',
-				'wplink',
-				'wptextpattern',
-			) );
+			$settings['plugins'] = implode(
+				',', array(
+					'charmap',
+					'colorpicker',
+					'hr',
+					'lists',
+					'paste',
+					'tabfocus',
+					'textcolor',
+					'fullscreen',
+					'wordpress',
+					'wpautoresize',
+					'wpeditimage',
+					'wpemoji',
+					'wpgallery',
+					'wplink',
+					'wptextpattern',
+				)
+			);
 
 			$settings = self::_parse_init( $settings );
 		} else {
@@ -877,7 +896,7 @@ final class _WP_Editors {
 		<?php
 
 		if ( $user_can_richedit ) {
-			$suffix = SCRIPT_DEBUG ? '' : '.min';
+			$suffix  = SCRIPT_DEBUG ? '' : '.min';
 			$baseurl = self::get_baseurl();
 
 			?>
@@ -911,7 +930,7 @@ final class _WP_Editors {
 
 	public static function get_mce_locale() {
 		if ( empty( self::$mce_locale ) ) {
-			$mce_locale = get_user_locale();
+			$mce_locale       = get_user_locale();
 			self::$mce_locale = empty( $mce_locale ) ? 'en' : strtolower( substr( $mce_locale, 0, 2 ) ); // ISO 639-1
 		}
 
@@ -941,15 +960,15 @@ final class _WP_Editors {
 
 		foreach ( self::get_translation() as $name => $value ) {
 			if ( is_array( $value ) ) {
-				$shortcut_labels[$name] = $value[1];
+				$shortcut_labels[ $name ] = $value[1];
 			}
 		}
 
 		$settings = array(
-			'theme' => 'modern',
-			'skin' => 'lightgray',
-			'language' => self::get_mce_locale(),
-			'formats' => '{' .
+			'theme'                        => 'modern',
+			'skin'                         => 'lightgray',
+			'language'                     => self::get_mce_locale(),
+			'formats'                      => '{' .
 				'alignleft: [' .
 					'{selector: "p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li", styles: {textAlign:"left"}},' .
 					'{selector: "img,table,dl.wp-caption", classes: "alignleft"}' .
@@ -964,30 +983,30 @@ final class _WP_Editors {
 				'],' .
 				'strikethrough: {inline: "del"}' .
 			'}',
-			'relative_urls' => false,
-			'remove_script_host' => false,
-			'convert_urls' => false,
-			'browser_spellcheck' => true,
-			'fix_list_elements' => true,
-			'entities' => '38,amp,60,lt,62,gt',
-			'entity_encoding' => 'raw',
-			'keep_styles' => false,
-			'cache_suffix' => 'wp-mce-' . $tinymce_version,
-			'resize' => 'vertical',
-			'menubar' => false,
-			'branding' => false,
+			'relative_urls'                => false,
+			'remove_script_host'           => false,
+			'convert_urls'                 => false,
+			'browser_spellcheck'           => true,
+			'fix_list_elements'            => true,
+			'entities'                     => '38,amp,60,lt,62,gt',
+			'entity_encoding'              => 'raw',
+			'keep_styles'                  => false,
+			'cache_suffix'                 => 'wp-mce-' . $tinymce_version,
+			'resize'                       => 'vertical',
+			'menubar'                      => false,
+			'branding'                     => false,
 
 			// Limit the preview styles in the menu/toolbar
-			'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
+			'preview_styles'               => 'font-family font-size font-weight font-style text-decoration text-transform',
 
 			'end_container_on_empty_block' => true,
-			'wpeditimage_html5_captions' => true,
-			'wp_lang_attr' => get_bloginfo( 'language' ),
-			'wp_keep_scroll_position' => false,
-			'wp_shortcut_labels' => wp_json_encode( $shortcut_labels ),
+			'wpeditimage_html5_captions'   => true,
+			'wp_lang_attr'                 => get_bloginfo( 'language' ),
+			'wp_keep_scroll_position'      => false,
+			'wp_shortcut_labels'           => wp_json_encode( $shortcut_labels ),
 		);
 
-		$suffix = SCRIPT_DEBUG ? '' : '.min';
+		$suffix  = SCRIPT_DEBUG ? '' : '.min';
 		$version = 'ver=' . get_bloginfo( 'version' );
 
 		// Default stylesheets
@@ -1000,293 +1019,293 @@ final class _WP_Editors {
 	private static function get_translation() {
 		if ( empty( self::$translation ) ) {
 			self::$translation = array(
-			// Default TinyMCE strings
-			'New document' => __( 'New document' ),
-			'Formats' => _x( 'Formats', 'TinyMCE' ),
+				// Default TinyMCE strings
+				'New document'                         => __( 'New document' ),
+				'Formats'                              => _x( 'Formats', 'TinyMCE' ),
 
-			'Headings' => _x( 'Headings', 'TinyMCE' ),
-			'Heading 1' => array( __( 'Heading 1' ), 'access1' ),
-			'Heading 2' => array( __( 'Heading 2' ), 'access2' ),
-			'Heading 3' => array( __( 'Heading 3' ), 'access3' ),
-			'Heading 4' => array( __( 'Heading 4' ), 'access4' ),
-			'Heading 5' => array( __( 'Heading 5' ), 'access5' ),
-			'Heading 6' => array( __( 'Heading 6' ), 'access6' ),
+				'Headings'                             => _x( 'Headings', 'TinyMCE' ),
+				'Heading 1'                            => array( __( 'Heading 1' ), 'access1' ),
+				'Heading 2'                            => array( __( 'Heading 2' ), 'access2' ),
+				'Heading 3'                            => array( __( 'Heading 3' ), 'access3' ),
+				'Heading 4'                            => array( __( 'Heading 4' ), 'access4' ),
+				'Heading 5'                            => array( __( 'Heading 5' ), 'access5' ),
+				'Heading 6'                            => array( __( 'Heading 6' ), 'access6' ),
 
-			/* translators: block tags */
-			'Blocks' => _x( 'Blocks', 'TinyMCE' ),
-			'Paragraph' => array( __( 'Paragraph' ), 'access7' ),
-			'Blockquote' => array( __( 'Blockquote' ), 'accessQ' ),
-			'Div' => _x( 'Div', 'HTML tag' ),
-			'Pre' => _x( 'Pre', 'HTML tag' ),
-			'Preformatted' => _x( 'Preformatted', 'HTML tag' ),
-			'Address' => _x( 'Address', 'HTML tag' ),
+				/* translators: block tags */
+				'Blocks'                               => _x( 'Blocks', 'TinyMCE' ),
+				'Paragraph'                            => array( __( 'Paragraph' ), 'access7' ),
+				'Blockquote'                           => array( __( 'Blockquote' ), 'accessQ' ),
+				'Div'                                  => _x( 'Div', 'HTML tag' ),
+				'Pre'                                  => _x( 'Pre', 'HTML tag' ),
+				'Preformatted'                         => _x( 'Preformatted', 'HTML tag' ),
+				'Address'                              => _x( 'Address', 'HTML tag' ),
 
-			'Inline' => _x( 'Inline', 'HTML elements' ),
-			'Underline' => array( __( 'Underline' ), 'metaU' ),
-			'Strikethrough' => array( __( 'Strikethrough' ), 'accessD' ),
-			'Subscript' => __( 'Subscript' ),
-			'Superscript' => __( 'Superscript' ),
-			'Clear formatting' => __( 'Clear formatting' ),
-			'Bold' => array( __( 'Bold' ), 'metaB' ),
-			'Italic' => array( __( 'Italic' ), 'metaI' ),
-			'Code' => array( __( 'Code' ), 'accessX' ),
-			'Source code' => __( 'Source code' ),
-			'Font Family' => __( 'Font Family' ),
-			'Font Sizes' => __( 'Font Sizes' ),
+				'Inline'                               => _x( 'Inline', 'HTML elements' ),
+				'Underline'                            => array( __( 'Underline' ), 'metaU' ),
+				'Strikethrough'                        => array( __( 'Strikethrough' ), 'accessD' ),
+				'Subscript'                            => __( 'Subscript' ),
+				'Superscript'                          => __( 'Superscript' ),
+				'Clear formatting'                     => __( 'Clear formatting' ),
+				'Bold'                                 => array( __( 'Bold' ), 'metaB' ),
+				'Italic'                               => array( __( 'Italic' ), 'metaI' ),
+				'Code'                                 => array( __( 'Code' ), 'accessX' ),
+				'Source code'                          => __( 'Source code' ),
+				'Font Family'                          => __( 'Font Family' ),
+				'Font Sizes'                           => __( 'Font Sizes' ),
 
-			'Align center' => array( __( 'Align center' ), 'accessC' ),
-			'Align right' => array( __( 'Align right' ), 'accessR' ),
-			'Align left' => array( __( 'Align left' ), 'accessL' ),
-			'Justify' => array( __( 'Justify' ), 'accessJ' ),
-			'Increase indent' => __( 'Increase indent' ),
-			'Decrease indent' => __( 'Decrease indent' ),
+				'Align center'                         => array( __( 'Align center' ), 'accessC' ),
+				'Align right'                          => array( __( 'Align right' ), 'accessR' ),
+				'Align left'                           => array( __( 'Align left' ), 'accessL' ),
+				'Justify'                              => array( __( 'Justify' ), 'accessJ' ),
+				'Increase indent'                      => __( 'Increase indent' ),
+				'Decrease indent'                      => __( 'Decrease indent' ),
 
-			'Cut' => array( __( 'Cut' ), 'metaX' ),
-			'Copy' => array( __( 'Copy' ), 'metaC' ),
-			'Paste' => array( __( 'Paste' ), 'metaV' ),
-			'Select all' => array( __( 'Select all' ), 'metaA' ),
-			'Undo' => array( __( 'Undo' ), 'metaZ' ),
-			'Redo' => array( __( 'Redo' ), 'metaY' ),
+				'Cut'                                  => array( __( 'Cut' ), 'metaX' ),
+				'Copy'                                 => array( __( 'Copy' ), 'metaC' ),
+				'Paste'                                => array( __( 'Paste' ), 'metaV' ),
+				'Select all'                           => array( __( 'Select all' ), 'metaA' ),
+				'Undo'                                 => array( __( 'Undo' ), 'metaZ' ),
+				'Redo'                                 => array( __( 'Redo' ), 'metaY' ),
 
-			'Ok' => __( 'OK' ),
-			'Cancel' => __( 'Cancel' ),
-			'Close' => __( 'Close' ),
-			'Visual aids' => __( 'Visual aids' ),
+				'Ok'                                   => __( 'OK' ),
+				'Cancel'                               => __( 'Cancel' ),
+				'Close'                                => __( 'Close' ),
+				'Visual aids'                          => __( 'Visual aids' ),
 
-			'Bullet list' => array( __( 'Bulleted list' ), 'accessU' ),
-			'Numbered list' => array( __( 'Numbered list' ), 'accessO' ),
-			'Square' => _x( 'Square', 'list style' ),
-			'Default' => _x( 'Default', 'list style' ),
-			'Circle' => _x( 'Circle', 'list style' ),
-			'Disc' => _x('Disc', 'list style' ),
-			'Lower Greek' => _x( 'Lower Greek', 'list style' ),
-			'Lower Alpha' => _x( 'Lower Alpha', 'list style' ),
-			'Upper Alpha' => _x( 'Upper Alpha', 'list style' ),
-			'Upper Roman' => _x( 'Upper Roman', 'list style' ),
-			'Lower Roman' => _x( 'Lower Roman', 'list style' ),
+				'Bullet list'                          => array( __( 'Bulleted list' ), 'accessU' ),
+				'Numbered list'                        => array( __( 'Numbered list' ), 'accessO' ),
+				'Square'                               => _x( 'Square', 'list style' ),
+				'Default'                              => _x( 'Default', 'list style' ),
+				'Circle'                               => _x( 'Circle', 'list style' ),
+				'Disc'                                 => _x( 'Disc', 'list style' ),
+				'Lower Greek'                          => _x( 'Lower Greek', 'list style' ),
+				'Lower Alpha'                          => _x( 'Lower Alpha', 'list style' ),
+				'Upper Alpha'                          => _x( 'Upper Alpha', 'list style' ),
+				'Upper Roman'                          => _x( 'Upper Roman', 'list style' ),
+				'Lower Roman'                          => _x( 'Lower Roman', 'list style' ),
 
-			// Anchor plugin
-			'Name' => _x( 'Name', 'Name of link anchor (TinyMCE)' ),
-			'Anchor' => _x( 'Anchor', 'Link anchor (TinyMCE)' ),
-			'Anchors' => _x( 'Anchors', 'Link anchors (TinyMCE)' ),
-			'Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.' =>
-				__( 'Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.' ),
-			'Id' => _x( 'Id', 'Id for link anchor (TinyMCE)' ),
+				// Anchor plugin
+				'Name'                                 => _x( 'Name', 'Name of link anchor (TinyMCE)' ),
+				'Anchor'                               => _x( 'Anchor', 'Link anchor (TinyMCE)' ),
+				'Anchors'                              => _x( 'Anchors', 'Link anchors (TinyMCE)' ),
+				'Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.' =>
+					__( 'Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.' ),
+				'Id'                                   => _x( 'Id', 'Id for link anchor (TinyMCE)' ),
 
-			// Fullpage plugin
-			'Document properties' => __( 'Document properties' ),
-			'Robots' => __( 'Robots' ),
-			'Title' => __( 'Title' ),
-			'Keywords' => __( 'Keywords' ),
-			'Encoding' => __( 'Encoding' ),
-			'Description' => __( 'Description' ),
-			'Author' => __( 'Author' ),
+				// Fullpage plugin
+				'Document properties'                  => __( 'Document properties' ),
+				'Robots'                               => __( 'Robots' ),
+				'Title'                                => __( 'Title' ),
+				'Keywords'                             => __( 'Keywords' ),
+				'Encoding'                             => __( 'Encoding' ),
+				'Description'                          => __( 'Description' ),
+				'Author'                               => __( 'Author' ),
 
-			// Media, image plugins
-			'Image' => __( 'Image' ),
-			'Insert/edit image' => array( __( 'Insert/edit image' ), 'accessM' ),
-			'General' => __( 'General' ),
-			'Advanced' => __( 'Advanced' ),
-			'Source' => __( 'Source' ),
-			'Border' => __( 'Border' ),
-			'Constrain proportions' => __( 'Constrain proportions' ),
-			'Vertical space' => __( 'Vertical space' ),
-			'Image description' => __( 'Image description' ),
-			'Style' => __( 'Style' ),
-			'Dimensions' => __( 'Dimensions' ),
-			'Insert image' => __( 'Insert image' ),
-			'Date/time' => __( 'Date/time' ),
-			'Insert date/time' => __( 'Insert date/time' ),
-			'Table of Contents' => __( 'Table of Contents' ),
-			'Insert/Edit code sample' => __( 'Insert/edit code sample' ),
-			'Language' => __( 'Language' ),
-			'Media' => __( 'Media' ),
-			'Insert/edit media' => __( 'Insert/edit media' ),
-			'Poster' => __( 'Poster' ),
-			'Alternative source' => __( 'Alternative source' ),
-			'Paste your embed code below:' => __( 'Paste your embed code below:' ),
-			'Insert video' => __( 'Insert video' ),
-			'Embed' => __( 'Embed' ),
+				// Media, image plugins
+				'Image'                                => __( 'Image' ),
+				'Insert/edit image'                    => array( __( 'Insert/edit image' ), 'accessM' ),
+				'General'                              => __( 'General' ),
+				'Advanced'                             => __( 'Advanced' ),
+				'Source'                               => __( 'Source' ),
+				'Border'                               => __( 'Border' ),
+				'Constrain proportions'                => __( 'Constrain proportions' ),
+				'Vertical space'                       => __( 'Vertical space' ),
+				'Image description'                    => __( 'Image description' ),
+				'Style'                                => __( 'Style' ),
+				'Dimensions'                           => __( 'Dimensions' ),
+				'Insert image'                         => __( 'Insert image' ),
+				'Date/time'                            => __( 'Date/time' ),
+				'Insert date/time'                     => __( 'Insert date/time' ),
+				'Table of Contents'                    => __( 'Table of Contents' ),
+				'Insert/Edit code sample'              => __( 'Insert/edit code sample' ),
+				'Language'                             => __( 'Language' ),
+				'Media'                                => __( 'Media' ),
+				'Insert/edit media'                    => __( 'Insert/edit media' ),
+				'Poster'                               => __( 'Poster' ),
+				'Alternative source'                   => __( 'Alternative source' ),
+				'Paste your embed code below:'         => __( 'Paste your embed code below:' ),
+				'Insert video'                         => __( 'Insert video' ),
+				'Embed'                                => __( 'Embed' ),
 
-			// Each of these have a corresponding plugin
-			'Special character' => __( 'Special character' ),
-			'Right to left' => _x( 'Right to left', 'editor button' ),
-			'Left to right' => _x( 'Left to right', 'editor button' ),
-			'Emoticons' => __( 'Emoticons' ),
-			'Nonbreaking space' => __( 'Nonbreaking space' ),
-			'Page break' => __( 'Page break' ),
-			'Paste as text' => __( 'Paste as text' ),
-			'Preview' => __( 'Preview' ),
-			'Print' => __( 'Print' ),
-			'Save' => __( 'Save' ),
-			'Fullscreen' => __( 'Fullscreen' ),
-			'Horizontal line' => __( 'Horizontal line' ),
-			'Horizontal space' => __( 'Horizontal space' ),
-			'Restore last draft' => __( 'Restore last draft' ),
-			'Insert/edit link' => array( __( 'Insert/edit link' ), 'metaK' ),
-			'Remove link' => array( __( 'Remove link' ), 'accessS' ),
+				// Each of these have a corresponding plugin
+				'Special character'                    => __( 'Special character' ),
+				'Right to left'                        => _x( 'Right to left', 'editor button' ),
+				'Left to right'                        => _x( 'Left to right', 'editor button' ),
+				'Emoticons'                            => __( 'Emoticons' ),
+				'Nonbreaking space'                    => __( 'Nonbreaking space' ),
+				'Page break'                           => __( 'Page break' ),
+				'Paste as text'                        => __( 'Paste as text' ),
+				'Preview'                              => __( 'Preview' ),
+				'Print'                                => __( 'Print' ),
+				'Save'                                 => __( 'Save' ),
+				'Fullscreen'                           => __( 'Fullscreen' ),
+				'Horizontal line'                      => __( 'Horizontal line' ),
+				'Horizontal space'                     => __( 'Horizontal space' ),
+				'Restore last draft'                   => __( 'Restore last draft' ),
+				'Insert/edit link'                     => array( __( 'Insert/edit link' ), 'metaK' ),
+				'Remove link'                          => array( __( 'Remove link' ), 'accessS' ),
 
-			// Link plugin
-			'Link' => __( 'Link' ),
-			'Insert link' => __( 'Insert link' ),
-			'Insert/edit link' => __( 'Insert/edit link' ),
-			'Target' => __( 'Target' ),
-			'New window' => __( 'New window' ),
-			'Text to display' => __( 'Text to display' ),
-			'Url' => __( 'URL' ),
-			'The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?' =>
-				__( 'The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?' ),
-			'The URL you entered seems to be an external link. Do you want to add the required http:// prefix?' =>
-				__( 'The URL you entered seems to be an external link. Do you want to add the required http:// prefix?' ),
+				// Link plugin
+				'Link'                                 => __( 'Link' ),
+				'Insert link'                          => __( 'Insert link' ),
+				'Insert/edit link'                     => __( 'Insert/edit link' ),
+				'Target'                               => __( 'Target' ),
+				'New window'                           => __( 'New window' ),
+				'Text to display'                      => __( 'Text to display' ),
+				'Url'                                  => __( 'URL' ),
+				'The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?' =>
+					__( 'The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?' ),
+				'The URL you entered seems to be an external link. Do you want to add the required http:// prefix?' =>
+					__( 'The URL you entered seems to be an external link. Do you want to add the required http:// prefix?' ),
 
-			'Color' => __( 'Color' ),
-			'Custom color' => __( 'Custom color' ),
-			'Custom...' => _x( 'Custom...', 'label for custom color' ), // no ellipsis
-			'No color' => __( 'No color' ),
-			'R' => _x( 'R', 'Short for red in RGB' ),
-			'G' => _x( 'G', 'Short for green in RGB' ),
-			'B' => _x( 'B', 'Short for blue in RGB' ),
+				'Color'                                => __( 'Color' ),
+				'Custom color'                         => __( 'Custom color' ),
+				'Custom...'                            => _x( 'Custom...', 'label for custom color' ), // no ellipsis
+				'No color'                             => __( 'No color' ),
+				'R'                                    => _x( 'R', 'Short for red in RGB' ),
+				'G'                                    => _x( 'G', 'Short for green in RGB' ),
+				'B'                                    => _x( 'B', 'Short for blue in RGB' ),
 
-			// Spelling, search/replace plugins
-			'Could not find the specified string.' => __( 'Could not find the specified string.' ),
-			'Replace' => _x( 'Replace', 'find/replace' ),
-			'Next' => _x( 'Next', 'find/replace' ),
-			/* translators: previous */
-			'Prev' => _x( 'Prev', 'find/replace' ),
-			'Whole words' => _x( 'Whole words', 'find/replace' ),
-			'Find and replace' => __( 'Find and replace' ),
-			'Replace with' => _x('Replace with', 'find/replace' ),
-			'Find' => _x( 'Find', 'find/replace' ),
-			'Replace all' => _x( 'Replace all', 'find/replace' ),
-			'Match case' => __( 'Match case' ),
-			'Spellcheck' => __( 'Check Spelling' ),
-			'Finish' => _x( 'Finish', 'spellcheck' ),
-			'Ignore all' => _x( 'Ignore all', 'spellcheck' ),
-			'Ignore' => _x( 'Ignore', 'spellcheck' ),
-			'Add to Dictionary' => __( 'Add to Dictionary' ),
+				// Spelling, search/replace plugins
+				'Could not find the specified string.' => __( 'Could not find the specified string.' ),
+				'Replace'                              => _x( 'Replace', 'find/replace' ),
+				'Next'                                 => _x( 'Next', 'find/replace' ),
+				/* translators: previous */
+				'Prev'                                 => _x( 'Prev', 'find/replace' ),
+				'Whole words'                          => _x( 'Whole words', 'find/replace' ),
+				'Find and replace'                     => __( 'Find and replace' ),
+				'Replace with'                         => _x( 'Replace with', 'find/replace' ),
+				'Find'                                 => _x( 'Find', 'find/replace' ),
+				'Replace all'                          => _x( 'Replace all', 'find/replace' ),
+				'Match case'                           => __( 'Match case' ),
+				'Spellcheck'                           => __( 'Check Spelling' ),
+				'Finish'                               => _x( 'Finish', 'spellcheck' ),
+				'Ignore all'                           => _x( 'Ignore all', 'spellcheck' ),
+				'Ignore'                               => _x( 'Ignore', 'spellcheck' ),
+				'Add to Dictionary'                    => __( 'Add to Dictionary' ),
 
-			// TinyMCE tables
-			'Insert table' => __( 'Insert table' ),
-			'Delete table' => __( 'Delete table' ),
-			'Table properties' => __( 'Table properties' ),
-			'Row properties' => __( 'Table row properties' ),
-			'Cell properties' => __( 'Table cell properties' ),
-			'Border color' => __( 'Border color' ),
+				// TinyMCE tables
+				'Insert table'                         => __( 'Insert table' ),
+				'Delete table'                         => __( 'Delete table' ),
+				'Table properties'                     => __( 'Table properties' ),
+				'Row properties'                       => __( 'Table row properties' ),
+				'Cell properties'                      => __( 'Table cell properties' ),
+				'Border color'                         => __( 'Border color' ),
 
-			'Row' => __( 'Row' ),
-			'Rows' => __( 'Rows' ),
-			'Column' => _x( 'Column', 'table column' ),
-			'Cols' => _x( 'Cols', 'table columns' ),
-			'Cell' => _x( 'Cell', 'table cell' ),
-			'Header cell' => __( 'Header cell' ),
-			'Header' => _x( 'Header', 'table header' ),
-			'Body' => _x( 'Body', 'table body' ),
-			'Footer' => _x( 'Footer', 'table footer' ),
+				'Row'                                  => __( 'Row' ),
+				'Rows'                                 => __( 'Rows' ),
+				'Column'                               => _x( 'Column', 'table column' ),
+				'Cols'                                 => _x( 'Cols', 'table columns' ),
+				'Cell'                                 => _x( 'Cell', 'table cell' ),
+				'Header cell'                          => __( 'Header cell' ),
+				'Header'                               => _x( 'Header', 'table header' ),
+				'Body'                                 => _x( 'Body', 'table body' ),
+				'Footer'                               => _x( 'Footer', 'table footer' ),
 
-			'Insert row before' => __( 'Insert row before' ),
-			'Insert row after' => __( 'Insert row after' ),
-			'Insert column before' => __( 'Insert column before' ),
-			'Insert column after' => __( 'Insert column after' ),
-			'Paste row before' => __( 'Paste table row before' ),
-			'Paste row after' => __( 'Paste table row after' ),
-			'Delete row' => __( 'Delete row' ),
-			'Delete column' => __( 'Delete column' ),
-			'Cut row' => __( 'Cut table row' ),
-			'Copy row' => __( 'Copy table row' ),
-			'Merge cells' => __( 'Merge table cells' ),
-			'Split cell' => __( 'Split table cell' ),
+				'Insert row before'                    => __( 'Insert row before' ),
+				'Insert row after'                     => __( 'Insert row after' ),
+				'Insert column before'                 => __( 'Insert column before' ),
+				'Insert column after'                  => __( 'Insert column after' ),
+				'Paste row before'                     => __( 'Paste table row before' ),
+				'Paste row after'                      => __( 'Paste table row after' ),
+				'Delete row'                           => __( 'Delete row' ),
+				'Delete column'                        => __( 'Delete column' ),
+				'Cut row'                              => __( 'Cut table row' ),
+				'Copy row'                             => __( 'Copy table row' ),
+				'Merge cells'                          => __( 'Merge table cells' ),
+				'Split cell'                           => __( 'Split table cell' ),
 
-			'Height' => __( 'Height' ),
-			'Width' => __( 'Width' ),
-			'Caption' => __( 'Caption' ),
-			'Alignment' => __( 'Alignment' ),
-			'H Align' => _x( 'H Align', 'horizontal table cell alignment' ),
-			'Left' => __( 'Left' ),
-			'Center' => __( 'Center' ),
-			'Right' => __( 'Right' ),
-			'None' => _x( 'None', 'table cell alignment attribute' ),
-			'V Align' => _x( 'V Align', 'vertical table cell alignment' ),
-			'Top' => __( 'Top' ),
-			'Middle' => __( 'Middle' ),
-			'Bottom' => __( 'Bottom' ),
+				'Height'                               => __( 'Height' ),
+				'Width'                                => __( 'Width' ),
+				'Caption'                              => __( 'Caption' ),
+				'Alignment'                            => __( 'Alignment' ),
+				'H Align'                              => _x( 'H Align', 'horizontal table cell alignment' ),
+				'Left'                                 => __( 'Left' ),
+				'Center'                               => __( 'Center' ),
+				'Right'                                => __( 'Right' ),
+				'None'                                 => _x( 'None', 'table cell alignment attribute' ),
+				'V Align'                              => _x( 'V Align', 'vertical table cell alignment' ),
+				'Top'                                  => __( 'Top' ),
+				'Middle'                               => __( 'Middle' ),
+				'Bottom'                               => __( 'Bottom' ),
 
-			'Row group' => __( 'Row group' ),
-			'Column group' => __( 'Column group' ),
-			'Row type' => __( 'Row type' ),
-			'Cell type' => __( 'Cell type' ),
-			'Cell padding' => __( 'Cell padding' ),
-			'Cell spacing' => __( 'Cell spacing' ),
-			'Scope' => _x( 'Scope', 'table cell scope attribute' ),
+				'Row group'                            => __( 'Row group' ),
+				'Column group'                         => __( 'Column group' ),
+				'Row type'                             => __( 'Row type' ),
+				'Cell type'                            => __( 'Cell type' ),
+				'Cell padding'                         => __( 'Cell padding' ),
+				'Cell spacing'                         => __( 'Cell spacing' ),
+				'Scope'                                => _x( 'Scope', 'table cell scope attribute' ),
 
-			'Insert template' => _x( 'Insert template', 'TinyMCE' ),
-			'Templates' => _x( 'Templates', 'TinyMCE' ),
+				'Insert template'                      => _x( 'Insert template', 'TinyMCE' ),
+				'Templates'                            => _x( 'Templates', 'TinyMCE' ),
 
-			'Background color' => __( 'Background color' ),
-			'Text color' => __( 'Text color' ),
-			'Show blocks' => _x( 'Show blocks', 'editor button' ),
-			'Show invisible characters' => __( 'Show invisible characters' ),
+				'Background color'                     => __( 'Background color' ),
+				'Text color'                           => __( 'Text color' ),
+				'Show blocks'                          => _x( 'Show blocks', 'editor button' ),
+				'Show invisible characters'            => __( 'Show invisible characters' ),
 
-			/* translators: word count */
-			'Words: {0}' => sprintf( __( 'Words: %s' ), '{0}' ),
-			'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' =>
-				__( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ) . "\n\n" .
-				__( 'If you&#8217;re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ),
-			'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' =>
-				__( 'Rich Text Area. Press Alt-Shift-H for help.' ),
-			'Rich Text Area. Press Control-Option-H for help.' => __( 'Rich Text Area. Press Control-Option-H for help.' ),
-			'You have unsaved changes are you sure you want to navigate away?' =>
-				__( 'The changes you made will be lost if you navigate away from this page.' ),
-			'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' =>
-				__( 'Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.' ),
+				/* translators: word count */
+				'Words: {0}'                           => sprintf( __( 'Words: %s' ), '{0}' ),
+				'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' =>
+					__( 'Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.' ) . "\n\n" .
+					__( 'If you&#8217;re looking to paste rich content from Microsoft Word, try turning this option off. The editor will clean up text pasted from Word automatically.' ),
+				'Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help' =>
+					__( 'Rich Text Area. Press Alt-Shift-H for help.' ),
+				'Rich Text Area. Press Control-Option-H for help.' => __( 'Rich Text Area. Press Control-Option-H for help.' ),
+				'You have unsaved changes are you sure you want to navigate away?' =>
+					__( 'The changes you made will be lost if you navigate away from this page.' ),
+				'Your browser doesn\'t support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.' =>
+					__( 'Your browser does not support direct access to the clipboard. Please use keyboard shortcuts or your browser&#8217;s edit menu instead.' ),
 
-			// TinyMCE menus
-			'Insert' => _x( 'Insert', 'TinyMCE menu' ),
-			'File' => _x( 'File', 'TinyMCE menu' ),
-			'Edit' => _x( 'Edit', 'TinyMCE menu' ),
-			'Tools' => _x( 'Tools', 'TinyMCE menu' ),
-			'View' => _x( 'View', 'TinyMCE menu' ),
-			'Table' => _x( 'Table', 'TinyMCE menu' ),
-			'Format' => _x( 'Format', 'TinyMCE menu' ),
+				// TinyMCE menus
+				'Insert'                               => _x( 'Insert', 'TinyMCE menu' ),
+				'File'                                 => _x( 'File', 'TinyMCE menu' ),
+				'Edit'                                 => _x( 'Edit', 'TinyMCE menu' ),
+				'Tools'                                => _x( 'Tools', 'TinyMCE menu' ),
+				'View'                                 => _x( 'View', 'TinyMCE menu' ),
+				'Table'                                => _x( 'Table', 'TinyMCE menu' ),
+				'Format'                               => _x( 'Format', 'TinyMCE menu' ),
 
-			// WordPress strings
-			'Toolbar Toggle' => array( __( 'Toolbar Toggle' ), 'accessZ' ),
-			'Insert Read More tag' => array( __( 'Insert Read More tag' ), 'accessT' ),
-			'Insert Page Break tag' => array( __( 'Insert Page Break tag' ), 'accessP' ),
-			'Read more...' => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis)
-			'Distraction-free writing mode' => array( __( 'Distraction-free writing mode' ), 'accessW' ),
-			'No alignment' => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
-			'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
-			'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
-			'Paste URL or type to search' => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog
-			'Apply'  => __( 'Apply' ), // Tooltip for the 'apply' button in the inline link dialog
-			'Link options'  => __( 'Link options' ), // Tooltip for the 'link options' button in the inline link dialog
-			'Visual' => _x( 'Visual', 'Name for the Visual editor tab' ), // Editor switch tab label
-			'Text' => _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ), // Editor switch tab label
+				// WordPress strings
+				'Toolbar Toggle'                       => array( __( 'Toolbar Toggle' ), 'accessZ' ),
+				'Insert Read More tag'                 => array( __( 'Insert Read More tag' ), 'accessT' ),
+				'Insert Page Break tag'                => array( __( 'Insert Page Break tag' ), 'accessP' ),
+				'Read more...'                         => __( 'Read more...' ), // Title on the placeholder inside the editor (no ellipsis)
+				'Distraction-free writing mode'        => array( __( 'Distraction-free writing mode' ), 'accessW' ),
+				'No alignment'                         => __( 'No alignment' ), // Tooltip for the 'alignnone' button in the image toolbar
+				'Remove'                               => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
+				'Edit '                                => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar
+				'Paste URL or type to search'          => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog
+				'Apply'                                => __( 'Apply' ), // Tooltip for the 'apply' button in the inline link dialog
+				'Link options'                         => __( 'Link options' ), // Tooltip for the 'link options' button in the inline link dialog
+				'Visual'                               => _x( 'Visual', 'Name for the Visual editor tab' ), // Editor switch tab label
+				'Text'                                 => _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ), // Editor switch tab label
 
-			// Shortcuts help modal
-			'Keyboard Shortcuts' => array( __( 'Keyboard Shortcuts' ), 'accessH' ),
-			'Default shortcuts,' => __( 'Default shortcuts,' ),
-			'Additional shortcuts,' => __( 'Additional shortcuts,' ),
-			'Focus shortcuts:' => __( 'Focus shortcuts:' ),
-			'Inline toolbar (when an image, link or preview is selected)' => __( 'Inline toolbar (when an image, link or preview is selected)' ),
-			'Editor menu (when enabled)' => __( 'Editor menu (when enabled)' ),
-			'Editor toolbar' => __( 'Editor toolbar' ),
-			'Elements path' => __( 'Elements path' ),
-			'Ctrl + Alt + letter:' => __( 'Ctrl + Alt + letter:' ),
-			'Shift + Alt + letter:' => __( 'Shift + Alt + letter:' ),
-			'Cmd + letter:' => __( 'Cmd + letter:' ),
-			'Ctrl + letter:' => __( 'Ctrl + letter:' ),
-			'Letter' => __( 'Letter' ),
-			'Action' => __( 'Action' ),
-			'Warning: the link has been inserted but may have errors. Please test it.' => __( 'Warning: the link has been inserted but may have errors. Please test it.' ),
-			'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
-				__( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
-			'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
-				__( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
-			'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
-				__( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
-			'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' =>
-				__( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ),
+				// Shortcuts help modal
+				'Keyboard Shortcuts'                   => array( __( 'Keyboard Shortcuts' ), 'accessH' ),
+				'Default shortcuts,'                   => __( 'Default shortcuts,' ),
+				'Additional shortcuts,'                => __( 'Additional shortcuts,' ),
+				'Focus shortcuts:'                     => __( 'Focus shortcuts:' ),
+				'Inline toolbar (when an image, link or preview is selected)' => __( 'Inline toolbar (when an image, link or preview is selected)' ),
+				'Editor menu (when enabled)'           => __( 'Editor menu (when enabled)' ),
+				'Editor toolbar'                       => __( 'Editor toolbar' ),
+				'Elements path'                        => __( 'Elements path' ),
+				'Ctrl + Alt + letter:'                 => __( 'Ctrl + Alt + letter:' ),
+				'Shift + Alt + letter:'                => __( 'Shift + Alt + letter:' ),
+				'Cmd + letter:'                        => __( 'Cmd + letter:' ),
+				'Ctrl + letter:'                       => __( 'Ctrl + letter:' ),
+				'Letter'                               => __( 'Letter' ),
+				'Action'                               => __( 'Action' ),
+				'Warning: the link has been inserted but may have errors. Please test it.' => __( 'Warning: the link has been inserted but may have errors. Please test it.' ),
+				'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' =>
+					__( 'To move focus to other buttons use Tab or the arrow keys. To return focus to the editor press Escape or use one of the buttons.' ),
+				'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' =>
+					__( 'When starting a new paragraph with one of these formatting shortcuts followed by a space, the formatting will be applied automatically. Press Backspace or Escape to undo.' ),
+				'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' =>
+					__( 'The following formatting shortcuts are replaced when pressing Enter. Press Escape or the Undo button to undo.' ),
+				'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' =>
+					__( 'The next group of formatting shortcuts are applied as you type or when you insert them around plain text in the same paragraph. Press Escape or the Undo button to undo.' ),
 			);
 		}
 
@@ -1333,7 +1352,7 @@ final class _WP_Editors {
 
 		foreach ( $mce_translation as $name => $value ) {
 			if ( is_array( $value ) ) {
-				$mce_translation[$name] = $value[0];
+				$mce_translation[ $name ] = $value[0];
 			}
 		}
 
@@ -1350,12 +1369,12 @@ final class _WP_Editors {
 		foreach ( $mce_translation as $key => $value ) {
 			// Remove strings that are not translated.
 			if ( $key === $value ) {
-				unset( $mce_translation[$key] );
+				unset( $mce_translation[ $key ] );
 				continue;
 			}
 
 			if ( false !== strpos( $value, '&' ) ) {
-				$mce_translation[$key] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
+				$mce_translation[ $key ] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
 			}
 		}
 
@@ -1397,12 +1416,12 @@ final class _WP_Editors {
 			script_concat_settings();
 		}
 
-		$suffix = SCRIPT_DEBUG ? '' : '.min';
+		$suffix  = SCRIPT_DEBUG ? '' : '.min';
 		$version = 'ver=' . $tinymce_version;
 		$baseurl = self::get_baseurl();
 
-		$compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-			&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
+		$compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
+			&& false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' );
 
 		// Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG)
 		$mce_suffix = false !== strpos( get_bloginfo( 'version' ), '-src' ) ? '' : '.min';
@@ -1431,7 +1450,7 @@ final class _WP_Editors {
 
 		if ( $tmce_on ) {
 			foreach ( self::$mce_settings as $editor_id => $init ) {
-				$options = self::_parse_init( $init );
+				$options  = self::_parse_init( $init );
 				$mceInit .= "'$editor_id':{$options},";
 			}
 			$mceInit = '{' . trim( $mceInit, ',' ) . '}';
@@ -1450,12 +1469,12 @@ final class _WP_Editors {
 		}
 
 		$ref = array(
-			'plugins' => implode( ',', self::$plugins ),
-			'theme' => 'modern',
-			'language' => self::$mce_locale
+			'plugins'  => implode( ',', self::$plugins ),
+			'theme'    => 'modern',
+			'language' => self::$mce_locale,
 		);
 
-		$suffix = SCRIPT_DEBUG ? '' : '.min';
+		$suffix  = SCRIPT_DEBUG ? '' : '.min';
 		$baseurl = self::get_baseurl();
 		$version = 'ver=' . $tinymce_version;
 
@@ -1511,11 +1530,13 @@ final class _WP_Editors {
 		<script type="text/javascript">
 		<?php
 
-		if ( self::$ext_plugins )
+		if ( self::$ext_plugins ) {
 			echo self::$ext_plugins . "\n";
+		}
 
-		if ( ! is_admin() )
+		if ( ! is_admin() ) {
 			echo 'var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '";';
+		}
 
 		?>
 
@@ -1591,22 +1612,23 @@ final class _WP_Editors {
 	 * @return false|array Results.
 	 */
 	public static function wp_link_query( $args = array() ) {
-		$pts = get_post_types( array( 'public' => true ), 'objects' );
+		$pts      = get_post_types( array( 'public' => true ), 'objects' );
 		$pt_names = array_keys( $pts );
 
 		$query = array(
-			'post_type' => $pt_names,
-			'suppress_filters' => true,
+			'post_type'              => $pt_names,
+			'suppress_filters'       => true,
 			'update_post_term_cache' => false,
 			'update_post_meta_cache' => false,
-			'post_status' => 'publish',
-			'posts_per_page' => 20,
+			'post_status'            => 'publish',
+			'posts_per_page'         => 20,
 		);
 
 		$args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
 
-		if ( isset( $args['s'] ) )
+		if ( isset( $args['s'] ) ) {
 			$query['s'] = $args['s'];
+		}
 
 		$query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
 
@@ -1625,21 +1647,22 @@ final class _WP_Editors {
 
 		// Do main query.
 		$get_posts = new WP_Query;
-		$posts = $get_posts->query( $query );
+		$posts     = $get_posts->query( $query );
 
 		// Build results.
 		$results = array();
 		foreach ( $posts as $post ) {
-			if ( 'post' == $post->post_type )
+			if ( 'post' == $post->post_type ) {
 				$info = mysql2date( __( 'Y/m/d' ), $post->post_date );
-			else
+			} else {
 				$info = $pts[ $post->post_type ]->labels->singular_name;
+			}
 
 			$results[] = array(
-				'ID' => $post->ID,
-				'title' => trim( esc_html( strip_tags( get_the_title( $post ) ) ) ),
+				'ID'        => $post->ID,
+				'title'     => trim( esc_html( strip_tags( get_the_title( $post ) ) ) ),
 				'permalink' => get_permalink( $post->ID ),
-				'info' => $info,
+				'info'      => $info,
 			);
 		}
 
@@ -1691,7 +1714,7 @@ final class _WP_Editors {
 		<div id="wp-link-wrap" class="wp-core-ui" style="display: none" role="dialog" aria-labelledby="link-modal-title">
 		<form id="wp-link" tabindex="-1">
 		<?php wp_nonce_field( 'internal-linking', '_ajax_linking_nonce', false ); ?>
-		<h1 id="link-modal-title"><?php _e( 'Insert/edit link' ) ?></h1>
+		<h1 id="link-modal-title"><?php _e( 'Insert/edit link' ); ?></h1>
 		<button type="button" id="wp-link-close"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
 		<div id="link-selector">
 			<div id="link-options">
@@ -1733,8 +1756,8 @@ final class _WP_Editors {
 					<div class="river-waiting">
 						<span class="spinner"></span>
 					</div>
- 				</div>
- 			</div>
+				 </div>
+			 </div>
 		</div>
 		<div class="submitbox">
 			<div id="wp-link-cancel">
diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php
index 4674caeb9f..9a3471df90 100644
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -9,10 +9,10 @@
 class WP_Embed {
 	public $handlers = array();
 	public $post_ID;
-	public $usecache = true;
+	public $usecache      = true;
 	public $linkifunknown = true;
-	public $last_attr = array();
-	public $last_url = '';
+	public $last_attr     = array();
+	public $last_url      = '';
 
 	/**
 	 * When a URL cannot be embedded, return false instead of returning a link
@@ -81,8 +81,9 @@ class WP_Embed {
 	public function maybe_run_ajax_cache() {
 		$post = get_post();
 
-		if ( ! $post || empty( $_GET['message'] ) )
+		if ( ! $post || empty( $_GET['message'] ) ) {
 			return;
+		}
 
 ?>
 <script type="text/javascript">
@@ -106,7 +107,7 @@ class WP_Embed {
 	 * @param int $priority Optional. Used to specify the order in which the registered handlers will be tested (default: 10). Lower numbers correspond with earlier testing, and handlers with the same priority are tested in the order in which they were added to the action.
 	 */
 	public function register_handler( $id, $regex, $callback, $priority = 10 ) {
-		$this->handlers[$priority][$id] = array(
+		$this->handlers[ $priority ][ $id ] = array(
 			'regex'    => $regex,
 			'callback' => $callback,
 		);
@@ -156,7 +157,7 @@ class WP_Embed {
 		}
 
 		$rawattr = $attr;
-		$attr = wp_parse_args( $attr, wp_embed_defaults( $url ) );
+		$attr    = wp_parse_args( $attr, wp_embed_defaults( $url ) );
 
 		$this->last_attr = $attr;
 
@@ -169,7 +170,7 @@ class WP_Embed {
 		foreach ( $this->handlers as $priority => $handlers ) {
 			foreach ( $handlers as $id => $handler ) {
 				if ( preg_match( $handler['regex'], $url, $matches ) && is_callable( $handler['callback'] ) ) {
-					if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) )
+					if ( false !== $return = call_user_func( $handler['callback'], $matches, $attr, $url, $rawattr ) ) {
 						/**
 						 * Filters the returned embed handler.
 						 *
@@ -182,6 +183,7 @@ class WP_Embed {
 						 * @param array  $attr   An array of shortcode attributes.
 						 */
 						return apply_filters( 'embed_handler_html', $return, $url, $attr );
+					}
 				}
 			}
 		}
@@ -216,7 +218,7 @@ class WP_Embed {
 		$cached_post_id = $this->find_oembed_post_id( $key_suffix );
 
 		if ( $post_ID ) {
-			$cache = get_post_meta( $post_ID, $cachekey, true );
+			$cache      = get_post_meta( $post_ID, $cachekey, true );
 			$cache_time = get_post_meta( $post_ID, $cachekey_time, true );
 
 			if ( ! $cache_time ) {
@@ -285,32 +287,44 @@ class WP_Embed {
 			}
 
 			$insert_post_args = array(
-				'post_name' => $key_suffix,
+				'post_name'   => $key_suffix,
 				'post_status' => 'publish',
-				'post_type' => 'oembed_cache',
+				'post_type'   => 'oembed_cache',
 			);
 
 			if ( $html ) {
 				if ( $cached_post_id ) {
-					wp_update_post( wp_slash( array(
-						'ID' => $cached_post_id,
-						'post_content' => $html,
-					) ) );
-				} else {
-					wp_insert_post( wp_slash( array_merge(
-						$insert_post_args,
-						array(
-							'post_content' => $html,
+					wp_update_post(
+						wp_slash(
+							array(
+								'ID'           => $cached_post_id,
+								'post_content' => $html,
+							)
 						)
-					) ) );
+					);
+				} else {
+					wp_insert_post(
+						wp_slash(
+							array_merge(
+								$insert_post_args,
+								array(
+									'post_content' => $html,
+								)
+							)
+						)
+					);
 				}
 			} elseif ( ! $cache ) {
-				wp_insert_post( wp_slash( array_merge(
-					$insert_post_args,
-					array(
-						'post_content' => '{{unknown}}',
+				wp_insert_post(
+					wp_slash(
+						array_merge(
+							$insert_post_args,
+							array(
+								'post_content' => '{{unknown}}',
+							)
+						)
 					)
-				) ) );
+				);
 			}
 
 			if ( $has_kses ) {
@@ -335,12 +349,14 @@ class WP_Embed {
 	 */
 	public function delete_oembed_caches( $post_ID ) {
 		$post_metas = get_post_custom_keys( $post_ID );
-		if ( empty($post_metas) )
+		if ( empty( $post_metas ) ) {
 			return;
+		}
 
 		foreach ( $post_metas as $post_meta_key ) {
-			if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
+			if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) ) {
 				delete_post_meta( $post_ID, $post_meta_key );
+			}
 		}
 	}
 
@@ -360,13 +376,13 @@ class WP_Embed {
 		 *
 		 * @param array $post_types Array of post types to cache oEmbed results for. Defaults to post types with `show_ui` set to true.
 		 */
-		if ( empty( $post->ID ) || ! in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', $post_types ) ) ){
+		if ( empty( $post->ID ) || ! in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', $post_types ) ) ) {
 			return;
 		}
 
 		// Trigger a caching
 		if ( ! empty( $post->post_content ) ) {
-			$this->post_ID = $post->ID;
+			$this->post_ID  = $post->ID;
 			$this->usecache = false;
 
 			$content = $this->run_shortcode( $post->post_content );
@@ -406,9 +422,9 @@ class WP_Embed {
 	 * @return string The embed HTML on success, otherwise the original URL.
 	 */
 	public function autoembed_callback( $match ) {
-		$oldval = $this->linkifunknown;
+		$oldval              = $this->linkifunknown;
 		$this->linkifunknown = false;
-		$return = $this->shortcode( array(), $match[2] );
+		$return              = $this->shortcode( array(), $match[2] );
 		$this->linkifunknown = $oldval;
 
 		return $match[1] . $return . $match[3];
@@ -425,7 +441,7 @@ class WP_Embed {
 			return false;
 		}
 
-		$output = ( $this->linkifunknown ) ? '<a href="' . esc_url($url) . '">' . esc_html($url) . '</a>' : $url;
+		$output = ( $this->linkifunknown ) ? '<a href="' . esc_url( $url ) . '">' . esc_html( $url ) . '</a>' : $url;
 
 		/**
 		 * Filters the returned, maybe-linked embed URL.
@@ -454,17 +470,19 @@ class WP_Embed {
 			return $oembed_post_id;
 		}
 
-		$oembed_post_query = new WP_Query( array(
-			'post_type'              => 'oembed_cache',
-			'post_status'            => 'publish',
-			'name'                   => $cache_key,
-			'posts_per_page'         => 1,
-			'no_found_rows'          => true,
-			'cache_results'          => true,
-			'update_post_meta_cache' => false,
-			'update_post_term_cache' => false,
-			'lazy_load_term_meta'    => false,
-		) );
+		$oembed_post_query = new WP_Query(
+			array(
+				'post_type'              => 'oembed_cache',
+				'post_status'            => 'publish',
+				'name'                   => $cache_key,
+				'posts_per_page'         => 1,
+				'no_found_rows'          => true,
+				'cache_results'          => true,
+				'update_post_meta_cache' => false,
+				'update_post_term_cache' => false,
+				'lazy_load_term_meta'    => false,
+			)
+		);
 
 		if ( ! empty( $oembed_post_query->posts ) ) {
 			// Note: 'fields'=>'ids' is not being used in order to cache the post object as it will be needed.
diff --git a/wp-includes/class-wp-error.php b/wp-includes/class-wp-error.php
index 2906e7661d..ae8b237801 100644
--- a/wp-includes/class-wp-error.php
+++ b/wp-includes/class-wp-error.php
@@ -52,13 +52,15 @@ class WP_Error {
 	 * @param mixed $data Optional. Error data.
 	 */
 	public function __construct( $code = '', $message = '', $data = '' ) {
-		if ( empty($code) )
+		if ( empty( $code ) ) {
 			return;
+		}
 
-		$this->errors[$code][] = $message;
+		$this->errors[ $code ][] = $message;
 
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+		if ( ! empty( $data ) ) {
+			$this->error_data[ $code ] = $data;
+		}
 	}
 
 	/**
@@ -69,10 +71,11 @@ class WP_Error {
 	 * @return array List of error codes, if available.
 	 */
 	public function get_error_codes() {
-		if ( empty($this->errors) )
+		if ( empty( $this->errors ) ) {
 			return array();
+		}
 
-		return array_keys($this->errors);
+		return array_keys( $this->errors );
 	}
 
 	/**
@@ -85,8 +88,9 @@ class WP_Error {
 	public function get_error_code() {
 		$codes = $this->get_error_codes();
 
-		if ( empty($codes) )
+		if ( empty( $codes ) ) {
 			return '';
+		}
 
 		return $codes[0];
 	}
@@ -99,20 +103,22 @@ class WP_Error {
 	 * @param string|int $code Optional. Retrieve messages matching code, if exists.
 	 * @return array Error strings on success, or empty array on failure (if using code parameter).
 	 */
-	public function get_error_messages($code = '') {
+	public function get_error_messages( $code = '' ) {
 		// Return all messages if no code specified.
-		if ( empty($code) ) {
+		if ( empty( $code ) ) {
 			$all_messages = array();
-			foreach ( (array) $this->errors as $code => $messages )
-				$all_messages = array_merge($all_messages, $messages);
+			foreach ( (array) $this->errors as $code => $messages ) {
+				$all_messages = array_merge( $all_messages, $messages );
+			}
 
 			return $all_messages;
 		}
 
-		if ( isset($this->errors[$code]) )
-			return $this->errors[$code];
-		else
+		if ( isset( $this->errors[ $code ] ) ) {
+			return $this->errors[ $code ];
+		} else {
 			return array();
+		}
 	}
 
 	/**
@@ -126,12 +132,14 @@ class WP_Error {
 	 * @param string|int $code Optional. Error code to retrieve message.
 	 * @return string
 	 */
-	public function get_error_message($code = '') {
-		if ( empty($code) )
+	public function get_error_message( $code = '' ) {
+		if ( empty( $code ) ) {
 			$code = $this->get_error_code();
-		$messages = $this->get_error_messages($code);
-		if ( empty($messages) )
+		}
+		$messages = $this->get_error_messages( $code );
+		if ( empty( $messages ) ) {
 			return '';
+		}
 		return $messages[0];
 	}
 
@@ -143,12 +151,14 @@ class WP_Error {
 	 * @param string|int $code Optional. Error code.
 	 * @return mixed Error data, if it exists.
 	 */
-	public function get_error_data($code = '') {
-		if ( empty($code) )
+	public function get_error_data( $code = '' ) {
+		if ( empty( $code ) ) {
 			$code = $this->get_error_code();
+		}
 
-		if ( isset($this->error_data[$code]) )
-			return $this->error_data[$code];
+		if ( isset( $this->error_data[ $code ] ) ) {
+			return $this->error_data[ $code ];
+		}
 	}
 
 	/**
@@ -160,10 +170,11 @@ class WP_Error {
 	 * @param string $message Error message.
 	 * @param mixed $data Optional. Error data.
 	 */
-	public function add($code, $message, $data = '') {
-		$this->errors[$code][] = $message;
-		if ( ! empty($data) )
-			$this->error_data[$code] = $data;
+	public function add( $code, $message, $data = '' ) {
+		$this->errors[ $code ][] = $message;
+		if ( ! empty( $data ) ) {
+			$this->error_data[ $code ] = $data;
+		}
 	}
 
 	/**
@@ -176,11 +187,12 @@ class WP_Error {
 	 * @param mixed $data Error data.
 	 * @param string|int $code Error code.
 	 */
-	public function add_data($data, $code = '') {
-		if ( empty($code) )
+	public function add_data( $data, $code = '' ) {
+		if ( empty( $code ) ) {
 			$code = $this->get_error_code();
+		}
 
-		$this->error_data[$code] = $data;
+		$this->error_data[ $code ] = $data;
 	}
 
 	/**
diff --git a/wp-includes/class-wp-feed-cache-transient.php b/wp-includes/class-wp-feed-cache-transient.php
index dc929c8ac4..f304ef8a6e 100644
--- a/wp-includes/class-wp-feed-cache-transient.php
+++ b/wp-includes/class-wp-feed-cache-transient.php
@@ -50,8 +50,8 @@ class WP_Feed_Cache_Transient {
 	 * @param string $filename  Unique identifier for cache object.
 	 * @param string $extension 'spi' or 'spc'.
 	 */
-	public function __construct($location, $filename, $extension) {
-		$this->name = 'feed_' . $filename;
+	public function __construct( $location, $filename, $extension ) {
+		$this->name     = 'feed_' . $filename;
 		$this->mod_name = 'feed_mod_' . $filename;
 
 		$lifetime = $this->lifetime;
@@ -63,7 +63,7 @@ class WP_Feed_Cache_Transient {
 		 * @param int    $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
 		 * @param string $filename Unique identifier for the cache object.
 		 */
-		$this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename);
+		$this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename );
 	}
 
 	/**
@@ -74,13 +74,13 @@ class WP_Feed_Cache_Transient {
 	 * @param SimplePie $data Data to save.
 	 * @return true Always true.
 	 */
-	public function save($data) {
+	public function save( $data ) {
 		if ( $data instanceof SimplePie ) {
 			$data = $data->data;
 		}
 
-		set_transient($this->name, $data, $this->lifetime);
-		set_transient($this->mod_name, time(), $this->lifetime);
+		set_transient( $this->name, $data, $this->lifetime );
+		set_transient( $this->mod_name, time(), $this->lifetime );
 		return true;
 	}
 
@@ -92,7 +92,7 @@ class WP_Feed_Cache_Transient {
 	 * @return mixed Transient value.
 	 */
 	public function load() {
-		return get_transient($this->name);
+		return get_transient( $this->name );
 	}
 
 	/**
@@ -103,7 +103,7 @@ class WP_Feed_Cache_Transient {
 	 * @return mixed Transient value.
 	 */
 	public function mtime() {
-		return get_transient($this->mod_name);
+		return get_transient( $this->mod_name );
 	}
 
 	/**
@@ -114,7 +114,7 @@ class WP_Feed_Cache_Transient {
 	 * @return bool False if value was not set and true if value was set.
 	 */
 	public function touch() {
-		return set_transient($this->mod_name, time(), $this->lifetime);
+		return set_transient( $this->mod_name, time(), $this->lifetime );
 	}
 
 	/**
@@ -125,8 +125,8 @@ class WP_Feed_Cache_Transient {
 	 * @return true Always true.
 	 */
 	public function unlink() {
-		delete_transient($this->name);
-		delete_transient($this->mod_name);
+		delete_transient( $this->name );
+		delete_transient( $this->mod_name );
 		return true;
 	}
 }
diff --git a/wp-includes/class-wp-feed-cache.php b/wp-includes/class-wp-feed-cache.php
index 1c7d2b263d..2564dffb80 100644
--- a/wp-includes/class-wp-feed-cache.php
+++ b/wp-includes/class-wp-feed-cache.php
@@ -26,7 +26,7 @@ class WP_Feed_Cache extends SimplePie_Cache {
 	 * @param string $extension 'spi' or 'spc'.
 	 * @return WP_Feed_Cache_Transient Feed cache handler object that uses transients.
 	 */
-	public function create($location, $filename, $extension) {
-		return new WP_Feed_Cache_Transient($location, $filename, $extension);
+	public function create( $location, $filename, $extension ) {
+		return new WP_Feed_Cache_Transient( $location, $filename, $extension );
 	}
 }
diff --git a/wp-includes/class-wp-hook.php b/wp-includes/class-wp-hook.php
index 3f797098b8..9472c0b3f2 100644
--- a/wp-includes/class-wp-hook.php
+++ b/wp-includes/class-wp-hook.php
@@ -71,12 +71,12 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * @param int      $accepted_args   The number of arguments the function accepts.
 	 */
 	public function add_filter( $tag, $function_to_add, $priority, $accepted_args ) {
-		$idx = _wp_filter_build_unique_id( $tag, $function_to_add, $priority );
+		$idx              = _wp_filter_build_unique_id( $tag, $function_to_add, $priority );
 		$priority_existed = isset( $this->callbacks[ $priority ] );
 
 		$this->callbacks[ $priority ][ $idx ] = array(
-			'function' => $function_to_add,
-			'accepted_args' => $accepted_args
+			'function'      => $function_to_add,
+			'accepted_args' => $accepted_args,
 		);
 
 		// if we're adding a new priority to the list, put them back in sorted order
@@ -243,7 +243,7 @@ final class WP_Hook implements Iterator, ArrayAccess {
 
 		if ( false === $priority ) {
 			$this->callbacks = array();
-		} else if ( isset( $this->callbacks[ $priority ] ) ) {
+		} elseif ( isset( $this->callbacks[ $priority ] ) ) {
 			unset( $this->callbacks[ $priority ] );
 		}
 
@@ -269,14 +269,14 @@ final class WP_Hook implements Iterator, ArrayAccess {
 		$nesting_level = $this->nesting_level++;
 
 		$this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
-		$num_args = count( $args );
+		$num_args                           = count( $args );
 
 		do {
 			$this->current_priority[ $nesting_level ] = $priority = current( $this->iterations[ $nesting_level ] );
 
 			foreach ( $this->callbacks[ $priority ] as $the_ ) {
-				if( ! $this->doing_action ) {
-					$args[ 0 ] = $value;
+				if ( ! $this->doing_action ) {
+					$args[0] = $value;
 				}
 
 				// Avoid the array_slice if possible.
@@ -285,7 +285,7 @@ final class WP_Hook implements Iterator, ArrayAccess {
 				} elseif ( $the_['accepted_args'] >= $num_args ) {
 					$value = call_user_func_array( $the_['function'], $args );
 				} else {
-					$value = call_user_func_array( $the_['function'], array_slice( $args, 0, (int)$the_['accepted_args'] ) );
+					$value = call_user_func_array( $the_['function'], array_slice( $args, 0, (int) $the_['accepted_args'] ) );
 				}
 			}
 		} while ( false !== next( $this->iterations[ $nesting_level ] ) );
@@ -323,7 +323,7 @@ final class WP_Hook implements Iterator, ArrayAccess {
 	 * @param array $args Arguments to pass to the hook callbacks. Passed by reference.
 	 */
 	public function do_all_hook( &$args ) {
-		$nesting_level = $this->nesting_level++;
+		$nesting_level                      = $this->nesting_level++;
 		$this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
 
 		do {
diff --git a/wp-includes/class-wp-http-cookie.php b/wp-includes/class-wp-http-cookie.php
index 6650e6eee2..568fe4848a 100644
--- a/wp-includes/class-wp-http-cookie.php
+++ b/wp-includes/class-wp-http-cookie.php
@@ -82,21 +82,24 @@ class WP_Http_Cookie {
 	 *                                    and $port values.
 	 */
 	public function __construct( $data, $requested_url = '' ) {
-		if ( $requested_url )
+		if ( $requested_url ) {
 			$arrURL = @parse_url( $requested_url );
-		if ( isset( $arrURL['host'] ) )
+		}
+		if ( isset( $arrURL['host'] ) ) {
 			$this->domain = $arrURL['host'];
+		}
 		$this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/';
-		if (  '/' != substr( $this->path, -1 ) )
+		if ( '/' != substr( $this->path, -1 ) ) {
 			$this->path = dirname( $this->path ) . '/';
+		}
 
 		if ( is_string( $data ) ) {
 			// Assume it's a header string direct from a previous request.
 			$pairs = explode( ';', $data );
 
 			// Special handling for first pair; name=value. Also be careful of "=" in value.
-			$name  = trim( substr( $pairs[0], 0, strpos( $pairs[0], '=' ) ) );
-			$value = substr( $pairs[0], strpos( $pairs[0], '=' ) + 1 );
+			$name        = trim( substr( $pairs[0], 0, strpos( $pairs[0], '=' ) ) );
+			$value       = substr( $pairs[0], strpos( $pairs[0], '=' ) + 1 );
 			$this->name  = $name;
 			$this->value = urldecode( $value );
 
@@ -105,32 +108,37 @@ class WP_Http_Cookie {
 
 			// Set everything else as a property.
 			foreach ( $pairs as $pair ) {
-				$pair = rtrim($pair);
+				$pair = rtrim( $pair );
 
 				// Handle the cookie ending in ; which results in a empty final pair.
-				if ( empty($pair) )
+				if ( empty( $pair ) ) {
 					continue;
+				}
 
 				list( $key, $val ) = strpos( $pair, '=' ) ? explode( '=', $pair ) : array( $pair, '' );
-				$key = strtolower( trim( $key ) );
-				if ( 'expires' == $key )
+				$key               = strtolower( trim( $key ) );
+				if ( 'expires' == $key ) {
 					$val = strtotime( $val );
+				}
 				$this->$key = $val;
 			}
 		} else {
-			if ( !isset( $data['name'] ) )
+			if ( ! isset( $data['name'] ) ) {
 				return;
+			}
 
 			// Set properties based directly on parameters.
 			foreach ( array( 'name', 'value', 'path', 'domain', 'port' ) as $field ) {
-				if ( isset( $data[ $field ] ) )
+				if ( isset( $data[ $field ] ) ) {
 					$this->$field = $data[ $field ];
+				}
 			}
 
-			if ( isset( $data['expires'] ) )
+			if ( isset( $data['expires'] ) ) {
 				$this->expires = is_int( $data['expires'] ) ? $data['expires'] : strtotime( $data['expires'] );
-			else
+			} else {
 				$this->expires = null;
+			}
 		}
 	}
 
@@ -145,37 +153,43 @@ class WP_Http_Cookie {
 	 * @return bool true if allowed, false otherwise.
 	 */
 	public function test( $url ) {
-		if ( is_null( $this->name ) )
+		if ( is_null( $this->name ) ) {
 			return false;
+		}
 
 		// Expires - if expired then nothing else matters.
-		if ( isset( $this->expires ) && time() > $this->expires )
+		if ( isset( $this->expires ) && time() > $this->expires ) {
 			return false;
+		}
 
 		// Get details on the URL we're thinking about sending to.
-		$url = parse_url( $url );
+		$url         = parse_url( $url );
 		$url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' == $url['scheme'] ? 443 : 80 );
 		$url['path'] = isset( $url['path'] ) ? $url['path'] : '/';
 
 		// Values to use for comparison against the URL.
-		$path   = isset( $this->path )   ? $this->path   : '/';
-		$port   = isset( $this->port )   ? $this->port   : null;
+		$path   = isset( $this->path ) ? $this->path : '/';
+		$port   = isset( $this->port ) ? $this->port : null;
 		$domain = isset( $this->domain ) ? strtolower( $this->domain ) : strtolower( $url['host'] );
-		if ( false === stripos( $domain, '.' ) )
+		if ( false === stripos( $domain, '.' ) ) {
 			$domain .= '.local';
+		}
 
 		// Host - very basic check that the request URL ends with the domain restriction (minus leading dot).
 		$domain = substr( $domain, 0, 1 ) == '.' ? substr( $domain, 1 ) : $domain;
-		if ( substr( $url['host'], -strlen( $domain ) ) != $domain )
+		if ( substr( $url['host'], -strlen( $domain ) ) != $domain ) {
 			return false;
+		}
 
 		// Port - supports "port-lists" in the format: "80,8000,8080".
-		if ( !empty( $port ) && !in_array( $url['port'], explode( ',', $port) ) )
+		if ( ! empty( $port ) && ! in_array( $url['port'], explode( ',', $port ) ) ) {
 			return false;
+		}
 
 		// Path - request path must start with path restriction.
-		if ( substr( $url['path'], 0, strlen( $path ) ) != $path )
+		if ( substr( $url['path'], 0, strlen( $path ) ) != $path ) {
 			return false;
+		}
 
 		return true;
 	}
@@ -188,8 +202,9 @@ class WP_Http_Cookie {
 	 * @return string Header encoded cookie name and value.
 	 */
 	public function getHeaderValue() {
-		if ( ! isset( $this->name ) || ! isset( $this->value ) )
+		if ( ! isset( $this->name ) || ! isset( $this->value ) ) {
 			return '';
+		}
 
 		/**
 		 * Filters the header-encoded cookie value.
diff --git a/wp-includes/class-wp-http-curl.php b/wp-includes/class-wp-http-curl.php
index 3e1d012c4d..2704735414 100644
--- a/wp-includes/class-wp-http-curl.php
+++ b/wp-includes/class-wp-http-curl.php
@@ -67,12 +67,16 @@ class WP_Http_Curl {
 	 * @param string|array $args Optional. Override the defaults.
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	public function request($url, $args = array()) {
+	public function request( $url, $args = array() ) {
 		$defaults = array(
-			'method' => 'GET', 'timeout' => 5,
-			'redirection' => 5, 'httpversion' => '1.0',
-			'blocking' => true,
-			'headers' => array(), 'body' => null, 'cookies' => array()
+			'method'      => 'GET',
+			'timeout'     => 5,
+			'redirection' => 5,
+			'httpversion' => '1.0',
+			'blocking'    => true,
+			'headers'     => array(),
+			'body'        => null,
+			'cookies'     => array(),
 		);
 
 		$r = wp_parse_args( $args, $defaults );
@@ -105,8 +109,8 @@ class WP_Http_Curl {
 			}
 		}
 
-		$is_local = isset($r['local']) && $r['local'];
-		$ssl_verify = isset($r['sslverify']) && $r['sslverify'];
+		$is_local   = isset( $r['local'] ) && $r['local'];
+		$ssl_verify = isset( $r['sslverify'] ) && $r['sslverify'];
 		if ( $is_local ) {
 			/** This filter is documented in wp-includes/class-wp-http-streams.php */
 			$ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
@@ -123,7 +127,7 @@ class WP_Http_Curl {
 		curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
 		curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
 
-		curl_setopt( $handle, CURLOPT_URL, $url);
+		curl_setopt( $handle, CURLOPT_URL, $url );
 		curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
 		curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false );
 		curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
@@ -139,8 +143,9 @@ class WP_Http_Curl {
 		 * a bug #17490 with redirected POST requests, so handle redirections outside Curl.
 		 */
 		curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
-		if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4
+		if ( defined( 'CURLOPT_PROTOCOLS' ) ) { // PHP 5.2.10 / cURL 7.19.4
 			curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
+		}
 
 		switch ( $r['method'] ) {
 			case 'HEAD':
@@ -156,8 +161,9 @@ class WP_Http_Curl {
 				break;
 			default:
 				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-				if ( ! is_null( $r['body'] ) )
+				if ( ! is_null( $r['body'] ) ) {
 					curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				}
 				break;
 		}
 
@@ -168,30 +174,34 @@ class WP_Http_Curl {
 
 		curl_setopt( $handle, CURLOPT_HEADER, false );
 
-		if ( isset( $r['limit_response_size'] ) )
+		if ( isset( $r['limit_response_size'] ) ) {
 			$this->max_body_length = intval( $r['limit_response_size'] );
-		else
+		} else {
 			$this->max_body_length = false;
+		}
 
 		// If streaming to a file open a file handle, and setup our curl streaming handler.
 		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
+			if ( ! WP_DEBUG ) {
 				$this->stream_handle = @fopen( $r['filename'], 'w+' );
-			else
+			} else {
 				$this->stream_handle = fopen( $r['filename'], 'w+' );
+			}
 			if ( ! $this->stream_handle ) {
-				return new WP_Error( 'http_request_failed', sprintf(
-					/* translators: 1: fopen() 2: file name */
-					__( 'Could not open handle for %1$s to %2$s.' ),
-					'fopen()',
-					$r['filename']
-				) );
+				return new WP_Error(
+					'http_request_failed', sprintf(
+						/* translators: 1: fopen() 2: file name */
+						__( 'Could not open handle for %1$s to %2$s.' ),
+						'fopen()',
+						$r['filename']
+					)
+				);
 			}
 		} else {
 			$this->stream_handle = false;
 		}
 
-		if ( !empty( $r['headers'] ) ) {
+		if ( ! empty( $r['headers'] ) ) {
 			// cURL expects full header strings in each element.
 			$headers = array();
 			foreach ( $r['headers'] as $name => $value ) {
@@ -200,10 +210,11 @@ class WP_Http_Curl {
 			curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
 		}
 
-		if ( $r['httpversion'] == '1.0' )
+		if ( $r['httpversion'] == '1.0' ) {
 			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
-		else
+		} else {
 			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+		}
 
 		/**
 		 * Fires before the cURL request is executed.
@@ -233,16 +244,24 @@ class WP_Http_Curl {
 			}
 
 			curl_close( $handle );
-			return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
+			return array(
+				'headers'  => array(),
+				'body'     => '',
+				'response' => array(
+					'code'    => false,
+					'message' => false,
+				),
+				'cookies'  => array(),
+			);
 		}
 
 		curl_exec( $handle );
-		$theHeaders = WP_Http::processHeaders( $this->headers, $url );
-		$theBody = $this->body;
+		$theHeaders          = WP_Http::processHeaders( $this->headers, $url );
+		$theBody             = $this->body;
 		$bytes_written_total = $this->bytes_written_total;
 
-		$this->headers = '';
-		$this->body = '';
+		$this->headers             = '';
+		$this->body                = '';
 		$this->bytes_written_total = 0;
 
 		$curl_error = curl_errno( $handle );
@@ -274,23 +293,26 @@ class WP_Http_Curl {
 
 		curl_close( $handle );
 
-		if ( $r['stream'] )
+		if ( $r['stream'] ) {
 			fclose( $this->stream_handle );
+		}
 
 		$response = array(
-			'headers' => $theHeaders['headers'],
-			'body' => null,
+			'headers'  => $theHeaders['headers'],
+			'body'     => null,
 			'response' => $theHeaders['response'],
-			'cookies' => $theHeaders['cookies'],
-			'filename' => $r['filename']
+			'cookies'  => $theHeaders['cookies'],
+			'filename' => $r['filename'],
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) ) {
 			return $redirect_response;
+		}
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
+		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode( $theHeaders['headers'] ) ) {
 			$theBody = WP_Http_Encoding::decompress( $theBody );
+		}
 
 		$response['body'] = $theBody;
 
@@ -332,13 +354,13 @@ class WP_Http_Curl {
 
 		if ( $this->max_body_length && ( $this->bytes_written_total + $data_length ) > $this->max_body_length ) {
 			$data_length = ( $this->max_body_length - $this->bytes_written_total );
-			$data = substr( $data, 0, $data_length );
+			$data        = substr( $data, 0, $data_length );
 		}
 
 		if ( $this->stream_handle ) {
 			$bytes_written = fwrite( $this->stream_handle, $data );
 		} else {
-			$this->body .= $data;
+			$this->body   .= $data;
 			$bytes_written = $data_length;
 		}
 
@@ -358,16 +380,18 @@ class WP_Http_Curl {
 	 * @return bool False means this class can not be used, true means it can.
 	 */
 	public static function test( $args = array() ) {
-		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
+		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) ) {
 			return false;
+		}
 
 		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
 		if ( $is_ssl ) {
 			$curl_version = curl_version();
 			// Check whether this cURL version support SSL requests.
-			if ( ! (CURL_VERSION_SSL & $curl_version['features']) )
+			if ( ! ( CURL_VERSION_SSL & $curl_version['features'] ) ) {
 				return false;
+			}
 		}
 
 		/**
diff --git a/wp-includes/class-wp-http-encoding.php b/wp-includes/class-wp-http-encoding.php
index 81cfba850c..4b16319356 100644
--- a/wp-includes/class-wp-http-encoding.php
+++ b/wp-includes/class-wp-http-encoding.php
@@ -52,23 +52,28 @@ class WP_Http_Encoding {
 	 */
 	public static function decompress( $compressed, $length = null ) {
 
-		if ( empty($compressed) )
+		if ( empty( $compressed ) ) {
 			return $compressed;
+		}
 
-		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
+		if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) {
 			return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
+		if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) ) {
 			return $decompressed;
+		}
 
-		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
+		if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) {
 			return $decompressed;
+		}
 
-		if ( function_exists('gzdecode') ) {
+		if ( function_exists( 'gzdecode' ) ) {
 			$decompressed = @gzdecode( $compressed );
 
-			if ( false !== $decompressed )
+			if ( false !== $decompressed ) {
 				return $decompressed;
+			}
 		}
 
 		return $compressed;
@@ -96,33 +101,38 @@ class WP_Http_Encoding {
 	 * @param string $gzData String to decompress.
 	 * @return string|bool False on failure.
 	 */
-	public static function compatible_gzinflate($gzData) {
+	public static function compatible_gzinflate( $gzData ) {
 
 		// Compressed data might contain a full header, if so strip it for gzinflate().
-		if ( substr($gzData, 0, 3) == "\x1f\x8b\x08" ) {
-			$i = 10;
-			$flg = ord( substr($gzData, 3, 1) );
+		if ( substr( $gzData, 0, 3 ) == "\x1f\x8b\x08" ) {
+			$i   = 10;
+			$flg = ord( substr( $gzData, 3, 1 ) );
 			if ( $flg > 0 ) {
 				if ( $flg & 4 ) {
-					list($xlen) = unpack('v', substr($gzData, $i, 2) );
-					$i = $i + 2 + $xlen;
+					list($xlen) = unpack( 'v', substr( $gzData, $i, 2 ) );
+					$i          = $i + 2 + $xlen;
 				}
-				if ( $flg & 8 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 16 )
-					$i = strpos($gzData, "\0", $i) + 1;
-				if ( $flg & 2 )
+				if ( $flg & 8 ) {
+					$i = strpos( $gzData, "\0", $i ) + 1;
+				}
+				if ( $flg & 16 ) {
+					$i = strpos( $gzData, "\0", $i ) + 1;
+				}
+				if ( $flg & 2 ) {
 					$i = $i + 2;
+				}
 			}
-			$decompressed = @gzinflate( substr($gzData, $i, -8) );
-			if ( false !== $decompressed )
+			$decompressed = @gzinflate( substr( $gzData, $i, -8 ) );
+			if ( false !== $decompressed ) {
 				return $decompressed;
+			}
 		}
 
 		// Compressed data from java.util.zip.Deflater amongst others.
-		$decompressed = @gzinflate( substr($gzData, 2) );
-		if ( false !== $decompressed )
+		$decompressed = @gzinflate( substr( $gzData, 2 ) );
+		if ( false !== $decompressed ) {
 			return $decompressed;
+		}
 
 		return false;
 	}
@@ -139,25 +149,29 @@ class WP_Http_Encoding {
 	 * @return string Types of encoding to accept.
 	 */
 	public static function accept_encoding( $url, $args ) {
-		$type = array();
+		$type                = array();
 		$compression_enabled = self::is_available();
 
-		if ( ! $args['decompress'] ) // Decompression specifically disabled.
+		if ( ! $args['decompress'] ) { // Decompression specifically disabled.
 			$compression_enabled = false;
-		elseif ( $args['stream'] ) // Disable when streaming to file.
+		} elseif ( $args['stream'] ) { // Disable when streaming to file.
 			$compression_enabled = false;
-		elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+		} elseif ( isset( $args['limit_response_size'] ) ) { // If only partial content is being requested, we won't be able to decompress it.
 			$compression_enabled = false;
+		}
 
 		if ( $compression_enabled ) {
-			if ( function_exists( 'gzinflate' ) )
+			if ( function_exists( 'gzinflate' ) ) {
 				$type[] = 'deflate;q=1.0';
+			}
 
-			if ( function_exists( 'gzuncompress' ) )
+			if ( function_exists( 'gzuncompress' ) ) {
 				$type[] = 'compress;q=0.5';
+			}
 
-			if ( function_exists( 'gzdecode' ) )
+			if ( function_exists( 'gzdecode' ) ) {
 				$type[] = 'gzip;q=0.5';
+			}
 		}
 
 		/**
@@ -172,7 +186,7 @@ class WP_Http_Encoding {
 		 */
 		$type = apply_filters( 'wp_http_accept_encoding', $type, $url, $args );
 
-		return implode(', ', $type);
+		return implode( ', ', $type );
 	}
 
 	/**
@@ -198,12 +212,13 @@ class WP_Http_Encoding {
 	 * @param array|string $headers All of the available headers.
 	 * @return bool
 	 */
-	public static function should_decode($headers) {
+	public static function should_decode( $headers ) {
 		if ( is_array( $headers ) ) {
-			if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
+			if ( array_key_exists( 'content-encoding', $headers ) && ! empty( $headers['content-encoding'] ) ) {
 				return true;
+			}
 		} elseif ( is_string( $headers ) ) {
-			return ( stripos($headers, 'content-encoding:') !== false );
+			return ( stripos( $headers, 'content-encoding:' ) !== false );
 		}
 
 		return false;
@@ -223,6 +238,6 @@ class WP_Http_Encoding {
 	 * @return bool
 	 */
 	public static function is_available() {
-		return ( function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate') );
+		return ( function_exists( 'gzuncompress' ) || function_exists( 'gzdeflate' ) || function_exists( 'gzinflate' ) );
 	}
 }
diff --git a/wp-includes/class-wp-http-ixr-client.php b/wp-includes/class-wp-http-ixr-client.php
index e4ed55020f..6b803e5f69 100644
--- a/wp-includes/class-wp-http-ixr-client.php
+++ b/wp-includes/class-wp-http-ixr-client.php
@@ -4,7 +4,6 @@
  *
  * @package WordPress
  * @since 3.1.0
- *
  */
 class WP_HTTP_IXR_Client extends IXR_Client {
 	public $scheme;
@@ -19,14 +18,14 @@ class WP_HTTP_IXR_Client extends IXR_Client {
 	 * @param int|bool $port
 	 * @param int $timeout
 	 */
-	public function __construct($server, $path = false, $port = false, $timeout = 15) {
+	public function __construct( $server, $path = false, $port = false, $timeout = 15 ) {
 		if ( ! $path ) {
 			// Assume we have been given a URL instead
-			$bits = parse_url($server);
+			$bits         = parse_url( $server );
 			$this->scheme = $bits['scheme'];
 			$this->server = $bits['host'];
-			$this->port = isset($bits['port']) ? $bits['port'] : $port;
-			$this->path = !empty($bits['path']) ? $bits['path'] : '/';
+			$this->port   = isset( $bits['port'] ) ? $bits['port'] : $port;
+			$this->path   = ! empty( $bits['path'] ) ? $bits['path'] : '/';
 
 			// Make absolutely sure we have a path
 			if ( ! $this->path ) {
@@ -39,33 +38,33 @@ class WP_HTTP_IXR_Client extends IXR_Client {
 		} else {
 			$this->scheme = 'http';
 			$this->server = $server;
-			$this->path = $path;
-			$this->port = $port;
+			$this->path   = $path;
+			$this->port   = $port;
 		}
 		$this->useragent = 'The Incutio XML-RPC PHP Library';
-		$this->timeout = $timeout;
+		$this->timeout   = $timeout;
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function query() {
-		$args = func_get_args();
-		$method = array_shift($args);
-		$request = new IXR_Request($method, $args);
-		$xml = $request->getXml();
+		$args    = func_get_args();
+		$method  = array_shift( $args );
+		$request = new IXR_Request( $method, $args );
+		$xml     = $request->getXml();
 
 		$port = $this->port ? ":$this->port" : '';
-		$url = $this->scheme . '://' . $this->server . $port . $this->path;
+		$url  = $this->scheme . '://' . $this->server . $port . $this->path;
 		$args = array(
-			'headers'    => array('Content-Type' => 'text/xml'),
+			'headers'    => array( 'Content-Type' => 'text/xml' ),
 			'user-agent' => $this->useragent,
 			'body'       => $xml,
 		);
 
 		// Merge Custom headers ala #8145
 		foreach ( $this->headers as $header => $value ) {
-			$args['headers'][$header] = $value;
+			$args['headers'][ $header ] = $value;
 		}
 
 		/**
@@ -83,20 +82,20 @@ class WP_HTTP_IXR_Client extends IXR_Client {
 
 		// Now send the request
 		if ( $this->debug ) {
-			echo '<pre class="ixr_request">' . htmlspecialchars($xml) . "\n</pre>\n\n";
+			echo '<pre class="ixr_request">' . htmlspecialchars( $xml ) . "\n</pre>\n\n";
 		}
 
-		$response = wp_remote_post($url, $args);
+		$response = wp_remote_post( $url, $args );
 
-		if ( is_wp_error($response) ) {
-			$errno    = $response->get_error_code();
-			$errorstr = $response->get_error_message();
-			$this->error = new IXR_Error(-32300, "transport error: $errno $errorstr");
+		if ( is_wp_error( $response ) ) {
+			$errno       = $response->get_error_code();
+			$errorstr    = $response->get_error_message();
+			$this->error = new IXR_Error( -32300, "transport error: $errno $errorstr" );
 			return false;
 		}
 
 		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')');
+			$this->error = new IXR_Error( -32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')' );
 			return false;
 		}
 
@@ -108,13 +107,13 @@ class WP_HTTP_IXR_Client extends IXR_Client {
 		$this->message = new IXR_Message( wp_remote_retrieve_body( $response ) );
 		if ( ! $this->message->parse() ) {
 			// XML error
-			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
+			$this->error = new IXR_Error( -32700, 'parse error. not well formed' );
 			return false;
 		}
 
 		// Is the message a fault?
 		if ( $this->message->messageType == 'fault' ) {
-			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+			$this->error = new IXR_Error( $this->message->faultCode, $this->message->faultString );
 			return false;
 		}
 
diff --git a/wp-includes/class-wp-http-proxy.php b/wp-includes/class-wp-http-proxy.php
index 7ae3d4e266..24a354e2c9 100644
--- a/wp-includes/class-wp-http-proxy.php
+++ b/wp-includes/class-wp-http-proxy.php
@@ -52,7 +52,7 @@ class WP_HTTP_Proxy {
 	 * @return bool
 	 */
 	public function is_enabled() {
-		return defined('WP_PROXY_HOST') && defined('WP_PROXY_PORT');
+		return defined( 'WP_PROXY_HOST' ) && defined( 'WP_PROXY_PORT' );
 	}
 
 	/**
@@ -66,7 +66,7 @@ class WP_HTTP_Proxy {
 	 * @return bool
 	 */
 	public function use_authentication() {
-		return defined('WP_PROXY_USERNAME') && defined('WP_PROXY_PASSWORD');
+		return defined( 'WP_PROXY_USERNAME' ) && defined( 'WP_PROXY_PASSWORD' );
 	}
 
 	/**
@@ -77,8 +77,9 @@ class WP_HTTP_Proxy {
 	 * @return string
 	 */
 	public function host() {
-		if ( defined('WP_PROXY_HOST') )
+		if ( defined( 'WP_PROXY_HOST' ) ) {
 			return WP_PROXY_HOST;
+		}
 
 		return '';
 	}
@@ -91,8 +92,9 @@ class WP_HTTP_Proxy {
 	 * @return string
 	 */
 	public function port() {
-		if ( defined('WP_PROXY_PORT') )
+		if ( defined( 'WP_PROXY_PORT' ) ) {
 			return WP_PROXY_PORT;
+		}
 
 		return '';
 	}
@@ -105,8 +107,9 @@ class WP_HTTP_Proxy {
 	 * @return string
 	 */
 	public function username() {
-		if ( defined('WP_PROXY_USERNAME') )
+		if ( defined( 'WP_PROXY_USERNAME' ) ) {
 			return WP_PROXY_USERNAME;
+		}
 
 		return '';
 	}
@@ -119,8 +122,9 @@ class WP_HTTP_Proxy {
 	 * @return string
 	 */
 	public function password() {
-		if ( defined('WP_PROXY_PASSWORD') )
+		if ( defined( 'WP_PROXY_PASSWORD' ) ) {
 			return WP_PROXY_PASSWORD;
+		}
 
 		return '';
 	}
@@ -167,13 +171,14 @@ class WP_HTTP_Proxy {
 		 * parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
 		 * This will be displayed on sites, which is not reasonable.
 		 */
-		$check = @parse_url($uri);
+		$check = @parse_url( $uri );
 
 		// Malformed URL, can not process, but this could mean ssl, so let through anyway.
-		if ( $check === false )
+		if ( $check === false ) {
 			return true;
+		}
 
-		$home = parse_url( get_option('siteurl') );
+		$home = parse_url( get_option( 'siteurl' ) );
 
 		/**
 		 * Filters whether to preempt sending the request through the proxy server.
@@ -189,31 +194,36 @@ class WP_HTTP_Proxy {
 		 * @param array  $home     Associative array result of parsing the site URL.
 		 */
 		$result = apply_filters( 'pre_http_send_through_proxy', null, $uri, $check, $home );
-		if ( ! is_null( $result ) )
+		if ( ! is_null( $result ) ) {
 			return $result;
+		}
 
-		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) )
+		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
 			return false;
+		}
 
-		if ( !defined('WP_PROXY_BYPASS_HOSTS') )
+		if ( ! defined( 'WP_PROXY_BYPASS_HOSTS' ) ) {
 			return true;
+		}
 
-		static $bypass_hosts = null;
+		static $bypass_hosts   = null;
 		static $wildcard_regex = array();
 		if ( null === $bypass_hosts ) {
-			$bypass_hosts = preg_split('|,\s*|', WP_PROXY_BYPASS_HOSTS);
+			$bypass_hosts = preg_split( '|,\s*|', WP_PROXY_BYPASS_HOSTS );
 
-			if ( false !== strpos(WP_PROXY_BYPASS_HOSTS, '*') ) {
+			if ( false !== strpos( WP_PROXY_BYPASS_HOSTS, '*' ) ) {
 				$wildcard_regex = array();
-				foreach ( $bypass_hosts as $host )
+				foreach ( $bypass_hosts as $host ) {
 					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
+				}
+				$wildcard_regex = '/^(' . implode( '|', $wildcard_regex ) . ')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
-		else
-			return !in_array( $check['host'], $bypass_hosts );
+		if ( ! empty( $wildcard_regex ) ) {
+			return ! preg_match( $wildcard_regex, $check['host'] );
+		} else {
+			return ! in_array( $check['host'], $bypass_hosts );
+		}
 	}
 }
diff --git a/wp-includes/class-wp-http-requests-hooks.php b/wp-includes/class-wp-http-requests-hooks.php
index 0e46fa378b..d918b07757 100644
--- a/wp-includes/class-wp-http-requests-hooks.php
+++ b/wp-includes/class-wp-http-requests-hooks.php
@@ -36,7 +36,7 @@ class WP_HTTP_Requests_Hooks extends Requests_Hooks {
 	 * @param array $request Request data in WP_Http format.
 	 */
 	public function __construct( $url, $request ) {
-		$this->url = $url;
+		$this->url     = $url;
 		$this->request = $request;
 	}
 
diff --git a/wp-includes/class-wp-http-requests-response.php b/wp-includes/class-wp-http-requests-response.php
index 630882ff87..df0957f6ff 100644
--- a/wp-includes/class-wp-http-requests-response.php
+++ b/wp-includes/class-wp-http-requests-response.php
@@ -162,13 +162,15 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	public function get_cookies() {
 		$cookies = array();
 		foreach ( $this->response->cookies as $cookie ) {
-			$cookies[] = new WP_Http_Cookie( array(
-				'name'    => $cookie->name,
-				'value'   => urldecode( $cookie->value ),
-				'expires' => isset( $cookie->attributes['expires'] ) ? $cookie->attributes['expires'] : null,
-				'path'    => isset( $cookie->attributes['path'] ) ? $cookie->attributes['path'] : null,
-				'domain'  => isset( $cookie->attributes['domain'] ) ? $cookie->attributes['domain'] : null,
-			));
+			$cookies[] = new WP_Http_Cookie(
+				array(
+					'name'    => $cookie->name,
+					'value'   => urldecode( $cookie->value ),
+					'expires' => isset( $cookie->attributes['expires'] ) ? $cookie->attributes['expires'] : null,
+					'path'    => isset( $cookie->attributes['path'] ) ? $cookie->attributes['path'] : null,
+					'domain'  => isset( $cookie->attributes['domain'] ) ? $cookie->attributes['domain'] : null,
+				)
+			);
 		}
 
 		return $cookies;
@@ -183,13 +185,13 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 */
 	public function to_array() {
 		return array(
-			'headers' => $this->get_headers(),
-			'body' => $this->get_data(),
+			'headers'  => $this->get_headers(),
+			'body'     => $this->get_data(),
 			'response' => array(
 				'code'    => $this->get_status(),
 				'message' => get_status_header_desc( $this->get_status() ),
 			),
-			'cookies' => $this->get_cookies(),
+			'cookies'  => $this->get_cookies(),
 			'filename' => $this->filename,
 		);
 	}
diff --git a/wp-includes/class-wp-http-streams.php b/wp-includes/class-wp-http-streams.php
index 325c509fbf..2ed6412443 100644
--- a/wp-includes/class-wp-http-streams.php
+++ b/wp-includes/class-wp-http-streams.php
@@ -26,12 +26,16 @@ class WP_Http_Streams {
 	 * @param string|array $args Optional. Override the defaults.
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	public function request($url, $args = array()) {
+	public function request( $url, $args = array() ) {
 		$defaults = array(
-			'method' => 'GET', 'timeout' => 5,
-			'redirection' => 5, 'httpversion' => '1.0',
-			'blocking' => true,
-			'headers' => array(), 'body' => null, 'cookies' => array()
+			'method'      => 'GET',
+			'timeout'     => 5,
+			'redirection' => 5,
+			'httpversion' => '1.0',
+			'blocking'    => true,
+			'headers'     => array(),
+			'body'        => null,
+			'cookies'     => array(),
 		);
 
 		$r = wp_parse_args( $args, $defaults );
@@ -47,14 +51,14 @@ class WP_Http_Streams {
 		// Construct Cookie: header if any cookies are set.
 		WP_Http::buildCookieHeader( $r );
 
-		$arrURL = parse_url($url);
+		$arrURL = parse_url( $url );
 
 		$connect_host = $arrURL['host'];
 
 		$secure_transport = ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' );
 		if ( ! isset( $arrURL['port'] ) ) {
 			if ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) {
-				$arrURL['port'] = 443;
+				$arrURL['port']   = 443;
 				$secure_transport = true;
 			} else {
 				$arrURL['port'] = 80;
@@ -67,10 +71,11 @@ class WP_Http_Streams {
 		}
 
 		if ( isset( $r['headers']['Host'] ) || isset( $r['headers']['host'] ) ) {
-			if ( isset( $r['headers']['Host'] ) )
+			if ( isset( $r['headers']['Host'] ) ) {
 				$arrURL['host'] = $r['headers']['Host'];
-			else
+			} else {
 				$arrURL['host'] = $r['headers']['host'];
+			}
 			unset( $r['headers']['Host'], $r['headers']['host'] );
 		}
 
@@ -79,12 +84,13 @@ class WP_Http_Streams {
 		 * to ::1, which fails when the server is not set up for it. For compatibility, always
 		 * connect to the IPv4 address.
 		 */
-		if ( 'localhost' == strtolower( $connect_host ) )
+		if ( 'localhost' == strtolower( $connect_host ) ) {
 			$connect_host = '127.0.0.1';
+		}
 
 		$connect_host = $secure_transport ? 'ssl://' . $connect_host : 'tcp://' . $connect_host;
 
-		$is_local = isset( $r['local'] ) && $r['local'];
+		$is_local   = isset( $r['local'] ) && $r['local'];
 		$ssl_verify = isset( $r['sslverify'] ) && $r['sslverify'];
 		if ( $is_local ) {
 			/**
@@ -108,19 +114,21 @@ class WP_Http_Streams {
 
 		$proxy = new WP_HTTP_Proxy();
 
-		$context = stream_context_create( array(
-			'ssl' => array(
-				'verify_peer' => $ssl_verify,
-				//'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate()
-				'capture_peer_cert' => $ssl_verify,
-				'SNI_enabled' => true,
-				'cafile' => $r['sslcertificates'],
-				'allow_self_signed' => ! $ssl_verify,
+		$context = stream_context_create(
+			array(
+				'ssl' => array(
+					'verify_peer'       => $ssl_verify,
+					//'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate()
+					'capture_peer_cert' => $ssl_verify,
+					'SNI_enabled'       => true,
+					'cafile'            => $r['sslcertificates'],
+					'allow_self_signed' => ! $ssl_verify,
+				),
 			)
-		) );
+		);
 
-		$timeout = (int) floor( $r['timeout'] );
-		$utimeout = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
+		$timeout         = (int) floor( $r['timeout'] );
+		$utimeout        = $timeout == $r['timeout'] ? 0 : 1000000 * $r['timeout'] % 1000000;
 		$connect_timeout = max( $timeout, 1 );
 
 		// Store error number.
@@ -129,52 +137,58 @@ class WP_Http_Streams {
 		// Store error string.
 		$connection_error_str = null;
 
-		if ( !WP_DEBUG ) {
+		if ( ! WP_DEBUG ) {
 			// In the event that the SSL connection fails, silence the many PHP Warnings.
-			if ( $secure_transport )
-				$error_reporting = error_reporting(0);
+			if ( $secure_transport ) {
+				$error_reporting = error_reporting( 0 );
+			}
 
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
+			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
 				$handle = @stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
-			else
+			} else {
 				$handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			}
 
-			if ( $secure_transport )
+			if ( $secure_transport ) {
 				error_reporting( $error_reporting );
-
+			}
 		} else {
-			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
+			if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
 				$handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
-			else
+			} else {
 				$handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+			}
 		}
 
 		if ( false === $handle ) {
 			// SSL connection failed due to expired/invalid cert, or, OpenSSL configuration is broken.
-			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str )
+			if ( $secure_transport && 0 === $connection_error && '' === $connection_error_str ) {
 				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			}
 
-			return new WP_Error('http_request_failed', $connection_error . ': ' . $connection_error_str );
+			return new WP_Error( 'http_request_failed', $connection_error . ': ' . $connection_error_str );
 		}
 
 		// Verify that the SSL certificate is valid for this request.
 		if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
-			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) )
+			if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) ) {
 				return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
+			}
 		}
 
 		stream_set_timeout( $handle, $timeout, $utimeout );
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) //Some proxies require full URL in this field.
+		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) { //Some proxies require full URL in this field.
 			$requestPath = $url;
-		else
-			$requestPath = $arrURL['path'] . ( isset($arrURL['query']) ? '?' . $arrURL['query'] : '' );
+		} else {
+			$requestPath = $arrURL['path'] . ( isset( $arrURL['query'] ) ? '?' . $arrURL['query'] : '' );
+		}
 
-		$strHeaders = strtoupper($r['method']) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
+		$strHeaders = strtoupper( $r['method'] ) . ' ' . $requestPath . ' HTTP/' . $r['httpversion'] . "\r\n";
 
 		$include_port_in_host_header = (
 			( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
-			( 'http'  == $arrURL['scheme'] && 80  != $arrURL['port'] ) ||
+			( 'http' == $arrURL['scheme'] && 80 != $arrURL['port'] ) ||
 			( 'https' == $arrURL['scheme'] && 443 != $arrURL['port'] )
 		);
 
@@ -184,63 +198,79 @@ class WP_Http_Streams {
 			$strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
 		}
 
-		if ( isset($r['user-agent']) )
+		if ( isset( $r['user-agent'] ) ) {
 			$strHeaders .= 'User-agent: ' . $r['user-agent'] . "\r\n";
+		}
 
-		if ( is_array($r['headers']) ) {
-			foreach ( (array) $r['headers'] as $header => $headerValue )
+		if ( is_array( $r['headers'] ) ) {
+			foreach ( (array) $r['headers'] as $header => $headerValue ) {
 				$strHeaders .= $header . ': ' . $headerValue . "\r\n";
+			}
 		} else {
 			$strHeaders .= $r['headers'];
 		}
 
-		if ( $proxy->use_authentication() )
+		if ( $proxy->use_authentication() ) {
 			$strHeaders .= $proxy->authentication_header() . "\r\n";
+		}
 
 		$strHeaders .= "\r\n";
 
-		if ( ! is_null($r['body']) )
+		if ( ! is_null( $r['body'] ) ) {
 			$strHeaders .= $r['body'];
+		}
 
-		fwrite($handle, $strHeaders);
+		fwrite( $handle, $strHeaders );
 
 		if ( ! $r['blocking'] ) {
 			stream_set_blocking( $handle, 0 );
 			fclose( $handle );
-			return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
+			return array(
+				'headers'  => array(),
+				'body'     => '',
+				'response' => array(
+					'code'    => false,
+					'message' => false,
+				),
+				'cookies'  => array(),
+			);
 		}
 
-		$strResponse = '';
-		$bodyStarted = false;
+		$strResponse  = '';
+		$bodyStarted  = false;
 		$keep_reading = true;
-		$block_size = 4096;
-		if ( isset( $r['limit_response_size'] ) )
+		$block_size   = 4096;
+		if ( isset( $r['limit_response_size'] ) ) {
 			$block_size = min( $block_size, $r['limit_response_size'] );
+		}
 
 		// If streaming to a file setup the file handle.
 		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
+			if ( ! WP_DEBUG ) {
 				$stream_handle = @fopen( $r['filename'], 'w+' );
-			else
+			} else {
 				$stream_handle = fopen( $r['filename'], 'w+' );
+			}
 			if ( ! $stream_handle ) {
-				return new WP_Error( 'http_request_failed', sprintf(
-					/* translators: 1: fopen() 2: file name */
-					__( 'Could not open handle for %1$s to %2$s.' ),
-					'fopen()',
-					$r['filename']
-				) );
+				return new WP_Error(
+					'http_request_failed', sprintf(
+						/* translators: 1: fopen() 2: file name */
+						__( 'Could not open handle for %1$s to %2$s.' ),
+						'fopen()',
+						$r['filename']
+					)
+				);
 			}
 
 			$bytes_written = 0;
-			while ( ! feof($handle) && $keep_reading ) {
+			while ( ! feof( $handle ) && $keep_reading ) {
 				$block = fread( $handle, $block_size );
 				if ( ! $bodyStarted ) {
 					$strResponse .= $block;
 					if ( strpos( $strResponse, "\r\n\r\n" ) ) {
-						$process = WP_Http::processResponse( $strResponse );
+						$process     = WP_Http::processResponse( $strResponse );
 						$bodyStarted = true;
-						$block = $process['body'];
+						$block       = $process['body'];
 						unset( $strResponse );
 						$process['body'] = '';
 					}
@@ -250,7 +280,7 @@ class WP_Http_Streams {
 
 				if ( isset( $r['limit_response_size'] ) && ( $bytes_written + $this_block_size ) > $r['limit_response_size'] ) {
 					$this_block_size = ( $r['limit_response_size'] - $bytes_written );
-					$block = substr( $block, 0, $this_block_size );
+					$block           = substr( $block, 0, $this_block_size );
 				}
 
 				$bytes_written_to_file = fwrite( $stream_handle, $block );
@@ -263,7 +293,7 @@ class WP_Http_Streams {
 
 				$bytes_written += $bytes_written_to_file;
 
-				$keep_reading = !isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size'];
+				$keep_reading = ! isset( $r['limit_response_size'] ) || $bytes_written < $r['limit_response_size'];
 			}
 
 			fclose( $stream_handle );
@@ -271,13 +301,13 @@ class WP_Http_Streams {
 		} else {
 			$header_length = 0;
 			while ( ! feof( $handle ) && $keep_reading ) {
-				$block = fread( $handle, $block_size );
+				$block        = fread( $handle, $block_size );
 				$strResponse .= $block;
 				if ( ! $bodyStarted && strpos( $strResponse, "\r\n\r\n" ) ) {
 					$header_length = strpos( $strResponse, "\r\n\r\n" ) + 4;
-					$bodyStarted = true;
+					$bodyStarted   = true;
 				}
-				$keep_reading = ( ! $bodyStarted || !isset( $r['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit_response_size'] ) );
+				$keep_reading = ( ! $bodyStarted || ! isset( $r['limit_response_size'] ) || strlen( $strResponse ) < ( $header_length + $r['limit_response_size'] ) );
 			}
 
 			$process = WP_Http::processResponse( $strResponse );
@@ -290,27 +320,31 @@ class WP_Http_Streams {
 		$arrHeaders = WP_Http::processHeaders( $process['headers'], $url );
 
 		$response = array(
-			'headers' => $arrHeaders['headers'],
+			'headers'  => $arrHeaders['headers'],
 			// Not yet processed.
-			'body' => null,
+			'body'     => null,
 			'response' => $arrHeaders['response'],
-			'cookies' => $arrHeaders['cookies'],
-			'filename' => $r['filename']
+			'cookies'  => $arrHeaders['cookies'],
+			'filename' => $r['filename'],
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_Http::handle_redirects( $url, $r, $response ) ) )
+		if ( false !== ( $redirect_response = WP_Http::handle_redirects( $url, $r, $response ) ) ) {
 			return $redirect_response;
+		}
 
 		// If the body was chunk encoded, then decode it.
-		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] )
-			$process['body'] = WP_Http::chunkTransferDecode($process['body']);
+		if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] ) {
+			$process['body'] = WP_Http::chunkTransferDecode( $process['body'] );
+		}
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($arrHeaders['headers']) )
+		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode( $arrHeaders['headers'] ) ) {
 			$process['body'] = WP_Http_Encoding::decompress( $process['body'] );
+		}
 
-		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] )
+		if ( isset( $r['limit_response_size'] ) && strlen( $process['body'] ) > $r['limit_response_size'] ) {
 			$process['body'] = substr( $process['body'], 0, $r['limit_response_size'] );
+		}
 
 		$response['body'] = $process['body'];
 
@@ -337,12 +371,14 @@ class WP_Http_Streams {
 	public static function verify_ssl_certificate( $stream, $host ) {
 		$context_options = stream_context_get_options( $stream );
 
-		if ( empty( $context_options['ssl']['peer_certificate'] ) )
+		if ( empty( $context_options['ssl']['peer_certificate'] ) ) {
 			return false;
+		}
 
 		$cert = openssl_x509_parse( $context_options['ssl']['peer_certificate'] );
-		if ( ! $cert )
+		if ( ! $cert ) {
 			return false;
+		}
 
 		/*
 		 * If the request is being made to an IP address, we'll validate against IP fields
@@ -355,25 +391,29 @@ class WP_Http_Streams {
 			$match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
 			foreach ( $match_against as $match ) {
 				list( $match_type, $match_host ) = explode( ':', $match );
-				if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS:
+				if ( $host_type == strtolower( trim( $match_type ) ) ) { // IP: or DNS:
 					$certificate_hostnames[] = strtolower( trim( $match_host ) );
+				}
 			}
-		} elseif ( !empty( $cert['subject']['CN'] ) ) {
+		} elseif ( ! empty( $cert['subject']['CN'] ) ) {
 			// Only use the CN when the certificate includes no subjectAltName extension.
 			$certificate_hostnames[] = strtolower( $cert['subject']['CN'] );
 		}
 
 		// Exact hostname/IP matches.
-		if ( in_array( strtolower( $host ), $certificate_hostnames ) )
+		if ( in_array( strtolower( $host ), $certificate_hostnames ) ) {
 			return true;
+		}
 
 		// IP's can't be wildcards, Stop processing.
-		if ( 'ip' == $host_type )
+		if ( 'ip' == $host_type ) {
 			return false;
+		}
 
 		// Test to see if the domain is at least 2 deep for wildcard support.
-		if ( substr_count( $host, '.' ) < 2 )
+		if ( substr_count( $host, '.' ) < 2 ) {
 			return false;
+		}
 
 		// Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com.
 		$wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host );
@@ -392,16 +432,19 @@ class WP_Http_Streams {
 	 * @return bool False means this class can not be used, true means it can.
 	 */
 	public static function test( $args = array() ) {
-		if ( ! function_exists( 'stream_socket_client' ) )
+		if ( ! function_exists( 'stream_socket_client' ) ) {
 			return false;
+		}
 
 		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
 		if ( $is_ssl ) {
-			if ( ! extension_loaded( 'openssl' ) )
+			if ( ! extension_loaded( 'openssl' ) ) {
 				return false;
-			if ( ! function_exists( 'openssl_x509_parse' ) )
+			}
+			if ( ! function_exists( 'openssl_x509_parse' ) ) {
 				return false;
+			}
 		}
 
 		/**
diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index 04a3f1abf2..c8d1ed2f8d 100644
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -39,13 +39,14 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return bool
 	 */
 	public static function test( $args = array() ) {
-		if ( ! extension_loaded('gd') || ! function_exists('gd_info') )
+		if ( ! extension_loaded( 'gd' ) || ! function_exists( 'gd_info' ) ) {
 			return false;
+		}
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
 		if ( isset( $args['methods'] ) &&
 			in_array( 'rotate', $args['methods'] ) &&
-			! function_exists('imagerotate') ){
+			! function_exists( 'imagerotate' ) ) {
 
 				return false;
 		}
@@ -65,13 +66,13 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 */
 	public static function supports_mime_type( $mime_type ) {
 		$image_types = imagetypes();
-		switch( $mime_type ) {
+		switch ( $mime_type ) {
 			case 'image/jpeg':
-				return ($image_types & IMG_JPG) != 0;
+				return ( $image_types & IMG_JPG ) != 0;
 			case 'image/png':
-				return ($image_types & IMG_PNG) != 0;
+				return ( $image_types & IMG_PNG ) != 0;
 			case 'image/gif':
-				return ($image_types & IMG_GIF) != 0;
+				return ( $image_types & IMG_GIF ) != 0;
 		}
 
 		return false;
@@ -85,23 +86,27 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return bool|WP_Error True if loaded successfully; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image )
+		if ( $this->image ) {
 			return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+			return new WP_Error( 'error_loading_image', __( 'File doesn&#8217;t exist?' ), $this->file );
+		}
 
 		// Set artificially high because GD uses uncompressed images in memory.
 		wp_raise_memory_limit( 'image' );
 
 		$this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
 
-		if ( ! is_resource( $this->image ) )
-			return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file );
+		if ( ! is_resource( $this->image ) ) {
+			return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
+		}
 
 		$size = @getimagesize( $this->file );
-		if ( ! $size )
-			return new WP_Error( 'invalid_image', __('Could not read image size.'), $this->file );
+		if ( ! $size ) {
+			return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
+		}
 
 		if ( function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
 			imagealphablending( $this->image, false );
@@ -124,11 +129,13 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return true
 	 */
 	protected function update_size( $width = false, $height = false ) {
-		if ( ! $width )
+		if ( ! $width ) {
 			$width = imagesx( $this->image );
+		}
 
-		if ( ! $height )
+		if ( ! $height ) {
 			$height = imagesy( $this->image );
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -149,8 +156,9 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return true|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
 			return true;
+		}
 
 		$resized = $this->_resize( $max_w, $max_h, $crop );
 
@@ -159,14 +167,14 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 			$this->image = $resized;
 			return true;
 
-		} elseif ( is_wp_error( $resized ) )
+		} elseif ( is_wp_error( $resized ) ) {
 			return $resized;
+		}
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error( 'image_resize_error', __( 'Image resize failed.' ), $this->file );
 	}
 
 	/**
-	 *
 	 * @param int $max_w
 	 * @param int $max_h
 	 * @param bool|array $crop
@@ -175,7 +183,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	protected function _resize( $max_w, $max_h, $crop = false ) {
 		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
 		if ( ! $dims ) {
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions'), $this->file );
+			return new WP_Error( 'error_getting_dimensions', __( 'Could not calculate resized image dimensions' ), $this->file );
 		}
 		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
 
@@ -187,7 +195,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 			return $resized;
 		}
 
-		return new WP_Error( 'image_resize_error', __('Image resize failed.'), $this->file );
+		return new WP_Error( 'image_resize_error', __( 'Image resize failed.' ), $this->file );
 	}
 
 	/**
@@ -213,7 +221,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return array An array of resized images' metadata by size.
 	 */
 	public function multi_resize( $sizes ) {
-		$metadata = array();
+		$metadata  = array();
 		$orig_size = $this->size;
 
 		foreach ( $sizes as $size => $size_data ) {
@@ -232,7 +240,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 				$size_data['crop'] = false;
 			}
 
-			$image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
+			$image     = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
 			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
 
 			if ( ! is_wp_error( $image ) && ! $duplicate ) {
@@ -242,7 +250,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 
 				if ( ! is_wp_error( $resized ) && $resized ) {
 					unset( $resized['path'] );
-					$metadata[$size] = $resized;
+					$metadata[ $size ] = $resized;
 				}
 			}
 
@@ -269,10 +277,12 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
 		// If destination width/height isn't specified, use same as
 		// width/height from source.
-		if ( ! $dst_w )
+		if ( ! $dst_w ) {
 			$dst_w = $src_w;
-		if ( ! $dst_h )
+		}
+		if ( ! $dst_h ) {
 			$dst_h = $src_h;
+		}
 
 		$dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
 
@@ -281,8 +291,9 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 			$src_h -= $src_y;
 		}
 
-		if ( function_exists( 'imageantialias' ) )
+		if ( function_exists( 'imageantialias' ) ) {
 			imageantialias( $dst, true );
+		}
 
 		imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
 
@@ -293,7 +304,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 			return true;
 		}
 
-		return new WP_Error( 'image_crop_error', __('Image crop failed.'), $this->file );
+		return new WP_Error( 'image_crop_error', __( 'Image crop failed.' ), $this->file );
 	}
 
 	/**
@@ -306,9 +317,9 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return true|WP_Error
 	 */
 	public function rotate( $angle ) {
-		if ( function_exists('imagerotate') ) {
+		if ( function_exists( 'imagerotate' ) ) {
 			$transparency = imagecolorallocatealpha( $this->image, 255, 255, 255, 127 );
-			$rotated = imagerotate( $this->image, $angle, $transparency );
+			$rotated      = imagerotate( $this->image, $angle, $transparency );
 
 			if ( is_resource( $rotated ) ) {
 				imagealphablending( $rotated, true );
@@ -319,7 +330,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 				return true;
 			}
 		}
-		return new WP_Error( 'image_rotate_error', __('Image rotate failed.'), $this->file );
+		return new WP_Error( 'image_rotate_error', __( 'Image rotate failed.' ), $this->file );
 	}
 
 	/**
@@ -332,13 +343,13 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return true|WP_Error
 	 */
 	public function flip( $horz, $vert ) {
-		$w = $this->size['width'];
-		$h = $this->size['height'];
+		$w   = $this->size['width'];
+		$h   = $this->size['height'];
 		$dst = wp_imagecreatetruecolor( $w, $h );
 
 		if ( is_resource( $dst ) ) {
-			$sx = $vert ? ($w - 1) : 0;
-			$sy = $horz ? ($h - 1) : 0;
+			$sx = $vert ? ( $w - 1 ) : 0;
+			$sy = $horz ? ( $h - 1 ) : 0;
 			$sw = $vert ? -$w : $w;
 			$sh = $horz ? -$h : $h;
 
@@ -348,7 +359,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 				return true;
 			}
 		}
-		return new WP_Error( 'image_flip_error', __('Image flip failed.'), $this->file );
+		return new WP_Error( 'image_flip_error', __( 'Image flip failed.' ), $this->file );
 	}
 
 	/**
@@ -364,7 +375,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 		$saved = $this->_save( $this->image, $filename, $mime_type );
 
 		if ( ! is_wp_error( $saved ) ) {
-			$this->file = $saved['path'];
+			$this->file      = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 		}
 
@@ -380,31 +391,33 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
+		if ( ! $filename ) {
 			$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		if ( 'image/gif' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/png' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) ) {
+				return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );
+			}
+		} elseif ( 'image/png' == $mime_type ) {
 			// convert from full colors to index colors, like original PNG.
-			if ( function_exists('imageistruecolor') && ! imageistruecolor( $image ) )
+			if ( function_exists( 'imageistruecolor' ) && ! imageistruecolor( $image ) ) {
 				imagetruecolortopalette( $image, false, imagecolorstotal( $image ) );
+			}
 
-			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		elseif ( 'image/jpeg' == $mime_type ) {
-			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
-				return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
-		}
-		else {
-			return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
+			if ( ! $this->make_image( $filename, 'imagepng', array( $image, $filename ) ) ) {
+				return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );
+			}
+		} elseif ( 'image/jpeg' == $mime_type ) {
+			if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) ) {
+				return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );
+			}
+		} else {
+			return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat  = stat( dirname( $filename ) );
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
 		@ chmod( $filename, $perms );
 
@@ -459,8 +472,9 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 	 * @return bool
 	 */
 	protected function make_image( $filename, $function, $arguments ) {
-		if ( wp_is_stream( $filename ) )
+		if ( wp_is_stream( $filename ) ) {
 			$arguments[1] = null;
+		}
 
 		return parent::make_image( $filename, $function, $arguments );
 	}
diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index 9f6a0f3b52..5db6fc4a86 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -45,11 +45,13 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	public static function test( $args = array() ) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
+		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) ) {
 			return false;
+		}
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
+		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) ) {
 			return false;
+		}
 
 		$required_methods = array(
 			'clear',
@@ -74,8 +76,9 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
+		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) ) {
 			return false;
+		}
 
 		$class_methods = array_map( 'strtolower', get_class_methods( 'Imagick' ) );
 		if ( array_diff( $required_methods, $class_methods ) ) {
@@ -103,18 +106,19 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	public static function supports_mime_type( $mime_type ) {
 		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
 
-		if ( ! $imagick_extension )
+		if ( ! $imagick_extension ) {
 			return false;
+		}
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
+		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' ) {
 				return false;
+		}
 
 		try {
 			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return false;
 		}
 	}
@@ -127,11 +131,13 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
+		if ( $this->image instanceof Imagick ) {
 			return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+			return new WP_Error( 'error_loading_image', __( 'File doesn&#8217;t exist?' ), $this->file );
+		}
 
 		/*
 		 * Even though Imagick uses less PHP memory than GD, set higher limit
@@ -140,9 +146,9 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 		wp_raise_memory_limit( 'image' );
 
 		try {
-			$this->image = new Imagick();
+			$this->image    = new Imagick();
 			$file_extension = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
-			$filename = $this->file;
+			$filename       = $this->file;
 
 			if ( 'pdf' == $file_extension ) {
 				$filename = $this->pdf_setup();
@@ -152,16 +158,17 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 			// only applies correctly before the image is read.
 			$this->image->readImage( $filename );
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid() ) {
+				return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
+			}
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
-				$this->image->setIteratorIndex(0);
+			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) ) {
+				$this->image->setIteratorIndex( 0 );
+			}
 
 			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
 		}
 
@@ -193,12 +200,10 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 			if ( 'image/jpeg' == $this->mime_type ) {
 				$this->image->setImageCompressionQuality( $quality );
 				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
-			}
-			else {
+			} else {
 				$this->image->setImageCompressionQuality( $quality );
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_quality_error', $e->getMessage() );
 		}
 
@@ -217,20 +222,21 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 */
 	protected function update_size( $width = null, $height = null ) {
 		$size = null;
-		if ( !$width || !$height ) {
+		if ( ! $width || ! $height ) {
 			try {
 				$size = $this->image->getImageGeometry();
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
 			}
 		}
 
-		if ( ! $width )
+		if ( ! $width ) {
 			$width = $size['width'];
+		}
 
-		if ( ! $height )
+		if ( ! $height ) {
 			$height = $size['height'];
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -250,12 +256,14 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @return bool|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
 			return true;
+		}
 
 		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		if ( ! $dims ) {
+			return new WP_Error( 'error_getting_dimensions', __( 'Could not calculate resized image dimensions' ) );
+		}
 		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
 
 		if ( $crop ) {
@@ -335,7 +343,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 			 * unless we would be resampling to a scale smaller than 128x128.
 			 */
 			if ( is_callable( array( $this->image, 'sampleImage' ) ) ) {
-				$resize_ratio = ( $dst_w / $this->size['width'] ) * ( $dst_h / $this->size['height'] );
+				$resize_ratio  = ( $dst_w / $this->size['width'] ) * ( $dst_h / $this->size['height'] );
 				$sample_factor = 5;
 
 				if ( $resize_ratio < .111 && ( $dst_w * $sample_factor > 128 && $dst_h * $sample_factor > 128 ) ) {
@@ -398,9 +406,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 			if ( is_callable( array( $this->image, 'setInterlaceScheme' ) ) && defined( 'Imagick::INTERLACE_NO' ) ) {
 				$this->image->setInterlaceScheme( Imagick::INTERLACE_NO );
 			}
-
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_resize_error', $e->getMessage() );
 		}
 	}
@@ -428,13 +434,14 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 * @return array An array of resized images' metadata by size.
 	 */
 	public function multi_resize( $sizes ) {
-		$metadata = array();
-		$orig_size = $this->size;
+		$metadata   = array();
+		$orig_size  = $this->size;
 		$orig_image = $this->image->getImage();
 
 		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
+			if ( ! $this->image ) {
 				$this->image = $orig_image->getImage();
+			}
 
 			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
 				continue;
@@ -452,7 +459,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 			}
 
 			$resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$duplicate     = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
 
 			if ( ! is_wp_error( $resize_result ) && ! $duplicate ) {
 				$resized = $this->_save( $this->image );
@@ -463,7 +470,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 
 				if ( ! is_wp_error( $resized ) && $resized ) {
 					unset( $resized['path'] );
-					$metadata[$size] = $resized;
+					$metadata[ $size ] = $resized;
 				}
 			}
 
@@ -497,15 +504,17 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 
 		try {
 			$this->image->cropImage( $src_w, $src_h, $src_x, $src_y );
-			$this->image->setImagePage( $src_w, $src_h, 0, 0);
+			$this->image->setImagePage( $src_w, $src_h, 0, 0 );
 
 			if ( $dst_w || $dst_h ) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
+				if ( ! $dst_w ) {
 					$dst_w = $src_w;
-				if ( ! $dst_h )
+				}
+				if ( ! $dst_h ) {
 					$dst_h = $src_h;
+				}
 
 				$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
 				if ( is_wp_error( $thumb_result ) ) {
@@ -514,8 +523,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 
 				return $this->update_size();
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_crop_error', $e->getMessage() );
 		}
 		return $this->update_size();
@@ -535,7 +543,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 		 * (GD rotates counter-clockwise)
 		 */
 		try {
-			$this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
+			$this->image->rotateImage( new ImagickPixel( 'none' ), 360 - $angle );
 
 			// Normalise Exif orientation data so that display is consistent across devices.
 			if ( is_callable( array( $this->image, 'setImageOrientation' ) ) && defined( 'Imagick::ORIENTATION_TOPLEFT' ) ) {
@@ -544,12 +552,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
+			if ( is_wp_error( $result ) ) {
 				return $result;
+			}
 
 			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_rotate_error', $e->getMessage() );
 		}
 		return true;
@@ -566,13 +574,14 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	 */
 	public function flip( $horz, $vert ) {
 		try {
-			if ( $horz )
+			if ( $horz ) {
 				$this->image->flipImage();
+			}
 
-			if ( $vert )
+			if ( $vert ) {
 				$this->image->flopImage();
-		}
-		catch ( Exception $e ) {
+			}
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_flip_error', $e->getMessage() );
 		}
 		return true;
@@ -591,13 +600,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 		$saved = $this->_save( $this->image, $destfilename, $mime_type );
 
 		if ( ! is_wp_error( $saved ) ) {
-			$this->file = $saved['path'];
+			$this->file      = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 
 			try {
 				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
 			}
 		}
@@ -606,7 +614,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	}
 
 	/**
-	 *
 	 * @param Imagick $image
 	 * @param string $filename
 	 * @param string $mime_type
@@ -615,8 +622,9 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
+		if ( ! $filename ) {
 			$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		try {
 			// Store initial Format
@@ -627,13 +635,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 
 			// Reset original Format
 			$this->image->setImageFormat( $orig_format );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat  = stat( dirname( $filename ) );
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
 		@ chmod( $filename, $perms );
 
@@ -668,8 +675,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 
 			// Reset Image to original Format
 			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_stream_error', $e->getMessage() );
 		}
 
@@ -719,7 +725,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 					$this->image->removeImageProfile( $key );
 				}
 			}
-
 		} catch ( Exception $e ) {
 			return new WP_Error( 'image_strip_meta_error', $e->getMessage() );
 		}
@@ -743,8 +748,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 
 			// Only load the first page.
 			return $this->file . '[0]';
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'pdf_setup_failed', $e->getMessage(), $this->file );
 		}
 	}
diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php
index 85a4916117..1bf80e392d 100644
--- a/wp-includes/class-wp-image-editor.php
+++ b/wp-includes/class-wp-image-editor.php
@@ -12,12 +12,12 @@
  * @since 3.5.0
  */
 abstract class WP_Image_Editor {
-	protected $file = null;
-	protected $size = null;
-	protected $mime_type = null;
+	protected $file              = null;
+	protected $size              = null;
+	protected $mime_type         = null;
 	protected $default_mime_type = 'image/jpeg';
-	protected $quality = false;
-	protected $default_quality = 82;
+	protected $quality           = false;
+	protected $default_quality   = 82;
 
 	/**
 	 * Each instance handles a single file.
@@ -191,8 +191,8 @@ abstract class WP_Image_Editor {
 	 */
 	protected function update_size( $width = null, $height = null ) {
 		$this->size = array(
-			'width' => (int) $width,
-			'height' => (int) $height
+			'width'  => (int) $width,
+			'height' => (int) $height,
 		);
 		return true;
 	}
@@ -271,7 +271,7 @@ abstract class WP_Image_Editor {
 			$this->quality = $quality;
 			return true;
 		} else {
-			return new WP_Error( 'invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].') );
+			return new WP_Error( 'invalid_image_quality', __( 'Attempted to set image quality outside of the range [1,100].' ) );
 		}
 	}
 
@@ -298,12 +298,11 @@ abstract class WP_Image_Editor {
 		}
 
 		if ( $filename ) {
-			$file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
+			$file_ext  = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
 			$file_mime = $this->get_mime_type( $file_ext );
-		}
-		else {
+		} else {
 			// If no file specified, grab editor's current extension and mime-type.
-			$file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
+			$file_ext  = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
 			$file_mime = $this->mime_type;
 		}
 
@@ -311,7 +310,7 @@ abstract class WP_Image_Editor {
 		// file extension.  If so, prefer extension from file.
 		if ( ! $mime_type || ( $file_mime == $mime_type ) ) {
 			$mime_type = $file_mime;
-			$new_ext = $file_ext;
+			$new_ext   = $file_ext;
 		}
 
 		// Double-check that the mime-type selected is supported by the editor.
@@ -327,7 +326,7 @@ abstract class WP_Image_Editor {
 			 * @param string $mime_type Mime type string.
 			 */
 			$mime_type = apply_filters( 'image_editor_default_mime_type', $this->default_mime_type );
-			$new_ext = $this->get_extension( $mime_type );
+			$new_ext   = $this->get_extension( $mime_type );
 		}
 
 		if ( $filename ) {
@@ -352,17 +351,19 @@ abstract class WP_Image_Editor {
 	 */
 	public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
 		// $suffix will be appended to the destination filename, just before the extension
-		if ( ! $suffix )
+		if ( ! $suffix ) {
 			$suffix = $this->get_suffix();
+		}
 
-		$dir  = pathinfo( $this->file, PATHINFO_DIRNAME );
-		$ext  = pathinfo( $this->file, PATHINFO_EXTENSION );
+		$dir = pathinfo( $this->file, PATHINFO_DIRNAME );
+		$ext = pathinfo( $this->file, PATHINFO_EXTENSION );
 
-		$name = wp_basename( $this->file, ".$ext" );
+		$name    = wp_basename( $this->file, ".$ext" );
 		$new_ext = strtolower( $extension ? $extension : $ext );
 
-		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
+		if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) ) {
 			$dir = $_dest_path;
+		}
 
 		return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
 	}
@@ -375,8 +376,9 @@ abstract class WP_Image_Editor {
 	 * @return false|string suffix
 	 */
 	public function get_suffix() {
-		if ( ! $this->get_size() )
+		if ( ! $this->get_size() ) {
 			return false;
+		}
 
 		return "{$this->size['width']}x{$this->size['height']}";
 	}
@@ -406,8 +408,9 @@ abstract class WP_Image_Editor {
 
 			$fp = fopen( $filename, 'w' );
 
-			if ( ! $fp )
+			if ( ! $fp ) {
 				return false;
+			}
 
 			fwrite( $fp, $contents );
 			fclose( $fp );
@@ -432,15 +435,16 @@ abstract class WP_Image_Editor {
 	 * @return string|false
 	 */
 	protected static function get_mime_type( $extension = null ) {
-		if ( ! $extension )
+		if ( ! $extension ) {
 			return false;
+		}
 
 		$mime_types = wp_get_mime_types();
 		$extensions = array_keys( $mime_types );
 
 		foreach ( $extensions as $_extension ) {
 			if ( preg_match( "/{$extension}/i", $_extension ) ) {
-				return $mime_types[$_extension];
+				return $mime_types[ $_extension ];
 			}
 		}
 
@@ -461,8 +465,9 @@ abstract class WP_Image_Editor {
 	protected static function get_extension( $mime_type = null ) {
 		$extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
 
-		if ( empty( $extensions[0] ) )
+		if ( empty( $extensions[0] ) ) {
 			return false;
+		}
 
 		return $extensions[0];
 	}
diff --git a/wp-includes/class-wp-list-util.php b/wp-includes/class-wp-list-util.php
index 4066e96364..0fbefd08e4 100644
--- a/wp-includes/class-wp-list-util.php
+++ b/wp-includes/class-wp-list-util.php
@@ -97,7 +97,7 @@ class WP_List_Util {
 			return array();
 		}
 
-		$count = count( $args );
+		$count    = count( $args );
 		$filtered = array();
 
 		foreach ( $this->output as $key => $obj ) {
@@ -115,7 +115,7 @@ class WP_List_Util {
 				( 'OR' == $operator && $matched > 0 ) ||
 				( 'NOT' == $operator && 0 == $matched )
 			) {
-				$filtered[$key] = $obj;
+				$filtered[ $key ] = $obj;
 			}
 		}
 
diff --git a/wp-includes/class-wp-locale.php b/wp-includes/class-wp-locale.php
index 748e54f0e6..2c42e3a8c7 100644
--- a/wp-includes/class-wp-locale.php
+++ b/wp-includes/class-wp-locale.php
@@ -126,13 +126,13 @@ class WP_Locale {
 	 */
 	public function init() {
 		// The Weekdays
-		$this->weekday[0] = /* translators: weekday */ __('Sunday');
-		$this->weekday[1] = /* translators: weekday */ __('Monday');
-		$this->weekday[2] = /* translators: weekday */ __('Tuesday');
-		$this->weekday[3] = /* translators: weekday */ __('Wednesday');
-		$this->weekday[4] = /* translators: weekday */ __('Thursday');
-		$this->weekday[5] = /* translators: weekday */ __('Friday');
-		$this->weekday[6] = /* translators: weekday */ __('Saturday');
+		$this->weekday[0] = /* translators: weekday */ __( 'Sunday' );
+		$this->weekday[1] = /* translators: weekday */ __( 'Monday' );
+		$this->weekday[2] = /* translators: weekday */ __( 'Tuesday' );
+		$this->weekday[3] = /* translators: weekday */ __( 'Wednesday' );
+		$this->weekday[4] = /* translators: weekday */ __( 'Thursday' );
+		$this->weekday[5] = /* translators: weekday */ __( 'Friday' );
+		$this->weekday[6] = /* translators: weekday */ __( 'Saturday' );
 
 		// The first letter of each day.
 		$this->weekday_initial[ __( 'Sunday' ) ]    = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Sunday initial' );
@@ -144,13 +144,13 @@ class WP_Locale {
 		$this->weekday_initial[ __( 'Saturday' ) ]  = /* translators: one-letter abbreviation of the weekday */ _x( 'S', 'Saturday initial' );
 
 		// Abbreviations for each day.
-		$this->weekday_abbrev[__('Sunday')]    = /* translators: three-letter abbreviation of the weekday */ __('Sun');
-		$this->weekday_abbrev[__('Monday')]    = /* translators: three-letter abbreviation of the weekday */ __('Mon');
-		$this->weekday_abbrev[__('Tuesday')]   = /* translators: three-letter abbreviation of the weekday */ __('Tue');
-		$this->weekday_abbrev[__('Wednesday')] = /* translators: three-letter abbreviation of the weekday */ __('Wed');
-		$this->weekday_abbrev[__('Thursday')]  = /* translators: three-letter abbreviation of the weekday */ __('Thu');
-		$this->weekday_abbrev[__('Friday')]    = /* translators: three-letter abbreviation of the weekday */ __('Fri');
-		$this->weekday_abbrev[__('Saturday')]  = /* translators: three-letter abbreviation of the weekday */ __('Sat');
+		$this->weekday_abbrev[ __( 'Sunday' ) ]    = /* translators: three-letter abbreviation of the weekday */ __( 'Sun' );
+		$this->weekday_abbrev[ __( 'Monday' ) ]    = /* translators: three-letter abbreviation of the weekday */ __( 'Mon' );
+		$this->weekday_abbrev[ __( 'Tuesday' ) ]   = /* translators: three-letter abbreviation of the weekday */ __( 'Tue' );
+		$this->weekday_abbrev[ __( 'Wednesday' ) ] = /* translators: three-letter abbreviation of the weekday */ __( 'Wed' );
+		$this->weekday_abbrev[ __( 'Thursday' ) ]  = /* translators: three-letter abbreviation of the weekday */ __( 'Thu' );
+		$this->weekday_abbrev[ __( 'Friday' ) ]    = /* translators: three-letter abbreviation of the weekday */ __( 'Fri' );
+		$this->weekday_abbrev[ __( 'Saturday' ) ]  = /* translators: three-letter abbreviation of the weekday */ __( 'Sat' );
 
 		// The Months
 		$this->month['01'] = /* translators: month name */ __( 'January' );
@@ -195,10 +195,10 @@ class WP_Locale {
 		$this->month_abbrev[ __( 'December' ) ]  = /* translators: three-letter abbreviation of the month */ _x( 'Dec', 'December abbreviation' );
 
 		// The Meridiems
-		$this->meridiem['am'] = __('am');
-		$this->meridiem['pm'] = __('pm');
-		$this->meridiem['AM'] = __('AM');
-		$this->meridiem['PM'] = __('PM');
+		$this->meridiem['am'] = __( 'am' );
+		$this->meridiem['pm'] = __( 'pm' );
+		$this->meridiem['AM'] = __( 'AM' );
+		$this->meridiem['PM'] = __( 'PM' );
 
 		// Numbers formatting
 		// See https://secure.php.net/number_format
@@ -222,11 +222,12 @@ class WP_Locale {
 		$this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point;
 
 		// Set text direction.
-		if ( isset( $GLOBALS['text_direction'] ) )
+		if ( isset( $GLOBALS['text_direction'] ) ) {
 			$this->text_direction = $GLOBALS['text_direction'];
-		/* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */
-		elseif ( 'rtl' == _x( 'ltr', 'text direction' ) )
+		} /* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */
+		elseif ( 'rtl' == _x( 'ltr', 'text direction' ) ) {
 			$this->text_direction = 'rtl';
+		}
 
 		if ( 'rtl' === $this->text_direction && strpos( get_bloginfo( 'version' ), '-src' ) ) {
 			$this->text_direction = 'ltr';
@@ -256,8 +257,8 @@ class WP_Locale {
 	 * @param int $weekday_number 0 for Sunday through 6 Saturday
 	 * @return string Full translated weekday
 	 */
-	public function get_weekday($weekday_number) {
-		return $this->weekday[$weekday_number];
+	public function get_weekday( $weekday_number ) {
+		return $this->weekday[ $weekday_number ];
 	}
 
 	/**
@@ -273,8 +274,8 @@ class WP_Locale {
 	 * @param string $weekday_name
 	 * @return string
 	 */
-	public function get_weekday_initial($weekday_name) {
-		return $this->weekday_initial[$weekday_name];
+	public function get_weekday_initial( $weekday_name ) {
+		return $this->weekday_initial[ $weekday_name ];
 	}
 
 	/**
@@ -288,8 +289,8 @@ class WP_Locale {
 	 * @param string $weekday_name Full translated weekday word
 	 * @return string Translated weekday abbreviation
 	 */
-	public function get_weekday_abbrev($weekday_name) {
-		return $this->weekday_abbrev[$weekday_name];
+	public function get_weekday_abbrev( $weekday_name ) {
+		return $this->weekday_abbrev[ $weekday_name ];
 	}
 
 	/**
@@ -308,8 +309,8 @@ class WP_Locale {
 	 * @param string|int $month_number '01' through '12'
 	 * @return string Translated full month name
 	 */
-	public function get_month($month_number) {
-		return $this->month[zeroise($month_number, 2)];
+	public function get_month( $month_number ) {
+		return $this->month[ zeroise( $month_number, 2 ) ];
 	}
 
 	/**
@@ -323,8 +324,8 @@ class WP_Locale {
 	 * @param string $month_name Translated month to get abbreviated version
 	 * @return string Translated abbreviated month
 	 */
-	public function get_month_abbrev($month_name) {
-		return $this->month_abbrev[$month_name];
+	public function get_month_abbrev( $month_name ) {
+		return $this->month_abbrev[ $month_name ];
 	}
 
 	/**
@@ -337,8 +338,8 @@ class WP_Locale {
 	 * @param string $meridiem Either 'am', 'pm', 'AM', or 'PM'. Not translated version.
 	 * @return string Translated version
 	 */
-	public function get_meridiem($meridiem) {
-		return $this->meridiem[$meridiem];
+	public function get_meridiem( $meridiem ) {
+		return $this->meridiem[ $meridiem ];
 	}
 
 	/**
diff --git a/wp-includes/class-wp-matchesmapregex.php b/wp-includes/class-wp-matchesmapregex.php
index 455778327b..935fb6c77d 100644
--- a/wp-includes/class-wp-matchesmapregex.php
+++ b/wp-includes/class-wp-matchesmapregex.php
@@ -46,10 +46,10 @@ class WP_MatchesMapRegex {
 	 * @param string $subject subject if regex
 	 * @param array  $matches data to use in map
 	 */
-	public function __construct($subject, $matches) {
+	public function __construct( $subject, $matches ) {
 		$this->_subject = $subject;
 		$this->_matches = $matches;
-		$this->output = $this->_map();
+		$this->output   = $this->_map();
 	}
 
 	/**
@@ -63,8 +63,8 @@ class WP_MatchesMapRegex {
 	 * @param array  $matches data used for substitution
 	 * @return string
 	 */
-	public static function apply($subject, $matches) {
-		$oSelf = new WP_MatchesMapRegex($subject, $matches);
+	public static function apply( $subject, $matches ) {
+		$oSelf = new WP_MatchesMapRegex( $subject, $matches );
 		return $oSelf->output;
 	}
 
@@ -74,8 +74,8 @@ class WP_MatchesMapRegex {
 	 * @return string
 	 */
 	private function _map() {
-		$callback = array($this, 'callback');
-		return preg_replace_callback($this->_pattern, $callback, $this->_subject);
+		$callback = array( $this, 'callback' );
+		return preg_replace_callback( $this->_pattern, $callback, $this->_subject );
 	}
 
 	/**
@@ -84,8 +84,8 @@ class WP_MatchesMapRegex {
 	 * @param  array $matches preg_replace regexp matches
 	 * @return string
 	 */
-	public function callback($matches) {
-		$index = intval(substr($matches[0], 9, -1));
-		return ( isset( $this->_matches[$index] ) ? urlencode($this->_matches[$index]) : '' );
+	public function callback( $matches ) {
+		$index = intval( substr( $matches[0], 9, -1 ) );
+		return ( isset( $this->_matches[ $index ] ) ? urlencode( $this->_matches[ $index ] ) : '' );
 	}
 }
diff --git a/wp-includes/class-wp-meta-query.php b/wp-includes/class-wp-meta-query.php
index af1fc11629..6db272c526 100644
--- a/wp-includes/class-wp-meta-query.php
+++ b/wp-includes/class-wp-meta-query.php
@@ -100,7 +100,6 @@ class WP_Meta_Query {
 	 * @since 3.2.0
 	 * @since 4.2.0 Introduced support for naming query clauses by associative array keys.
 	 *
-	 *
 	 * @param array $meta_query {
 	 *     Array of meta query clauses. When first-order clauses or sub-clauses use strings as
 	 *     their array keys, they may be referenced in the 'orderby' parameter of the parent query.
@@ -125,8 +124,9 @@ class WP_Meta_Query {
 	 * }
 	 */
 	public function __construct( $meta_query = false ) {
-		if ( !$meta_query )
+		if ( ! $meta_query ) {
 			return;
+		}
 
 		if ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
 			$this->relation = 'OR';
@@ -161,7 +161,7 @@ class WP_Meta_Query {
 			} elseif ( ! is_array( $query ) ) {
 				continue;
 
-			// First-order clause.
+				// First-order clause.
 			} elseif ( $this->is_first_order_clause( $query ) ) {
 				if ( isset( $query['value'] ) && array() === $query['value'] ) {
 					unset( $query['value'] );
@@ -169,7 +169,7 @@ class WP_Meta_Query {
 
 				$clean_queries[ $key ] = $query;
 
-			// Otherwise, it's a nested query, so we recurse.
+				// Otherwise, it's a nested query, so we recurse.
 			} else {
 				$cleaned_query = $this->sanitize_query( $query );
 
@@ -186,17 +186,17 @@ class WP_Meta_Query {
 		// Sanitize the 'relation' key provided in the query.
 		if ( isset( $relation ) && 'OR' === strtoupper( $relation ) ) {
 			$clean_queries['relation'] = 'OR';
-			$this->has_or_relation = true;
+			$this->has_or_relation     = true;
 
-		/*
-		 * If there is only a single clause, call the relation 'OR'.
-		 * This value will not actually be used to join clauses, but it
-		 * simplifies the logic around combining key-only queries.
-		 */
+			/*
+			* If there is only a single clause, call the relation 'OR'.
+			* This value will not actually be used to join clauses, but it
+			* simplifies the logic around combining key-only queries.
+			*/
 		} elseif ( 1 === count( $clean_queries ) ) {
 			$clean_queries['relation'] = 'OR';
 
-		// Default to AND.
+			// Default to AND.
 		} else {
 			$clean_queries['relation'] = 'AND';
 		}
@@ -275,16 +275,19 @@ class WP_Meta_Query {
 	 * @return string MySQL type.
 	 */
 	public function get_cast_for_type( $type = '' ) {
-		if ( empty( $type ) )
+		if ( empty( $type ) ) {
 			return 'CHAR';
+		}
 
 		$meta_type = strtoupper( $type );
 
-		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) )
+		if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) ) {
 			return 'CHAR';
+		}
 
-		if ( 'NUMERIC' == $meta_type )
+		if ( 'NUMERIC' == $meta_type ) {
 			$meta_type = 'SIGNED';
+		}
 
 		return $meta_type;
 	}
@@ -364,7 +367,7 @@ class WP_Meta_Query {
 		 * To keep $this->queries unaltered, pass a copy.
 		 */
 		$queries = $this->queries;
-		$sql = $this->get_sql_for_query( $queries );
+		$sql     = $this->get_sql_for_query( $queries );
 
 		if ( ! empty( $sql['where'] ) ) {
 			$sql['where'] = ' AND ' . $sql['where'];
@@ -404,7 +407,7 @@ class WP_Meta_Query {
 
 		$indent = '';
 		for ( $i = 0; $i < $depth; $i++ ) {
-			$indent .= "  ";
+			$indent .= '  ';
 		}
 
 		foreach ( $query as $key => &$clause ) {
@@ -426,7 +429,7 @@ class WP_Meta_Query {
 					}
 
 					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
-				// This is a subquery, so we recurse.
+					// This is a subquery, so we recurse.
 				} else {
 					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
 
@@ -482,7 +485,7 @@ class WP_Meta_Query {
 
 		$sql_chunks = array(
 			'where' => array(),
-			'join' => array(),
+			'join'  => array(),
 		);
 
 		if ( isset( $clause['compare'] ) ) {
@@ -491,14 +494,27 @@ class WP_Meta_Query {
 			$clause['compare'] = isset( $clause['value'] ) && is_array( $clause['value'] ) ? 'IN' : '=';
 		}
 
-		if ( ! in_array( $clause['compare'], array(
-			'=', '!=', '>', '>=', '<', '<=',
-			'LIKE', 'NOT LIKE',
-			'IN', 'NOT IN',
-			'BETWEEN', 'NOT BETWEEN',
-			'EXISTS', 'NOT EXISTS',
-			'REGEXP', 'NOT REGEXP', 'RLIKE'
-		) ) ) {
+		if ( ! in_array(
+			$clause['compare'], array(
+				'=',
+				'!=',
+				'>',
+				'>=',
+				'<',
+				'<=',
+				'LIKE',
+				'NOT LIKE',
+				'IN',
+				'NOT IN',
+				'BETWEEN',
+				'NOT BETWEEN',
+				'EXISTS',
+				'NOT EXISTS',
+				'REGEXP',
+				'NOT REGEXP',
+				'RLIKE',
+			)
+		) ) {
 			$clause['compare'] = '=';
 		}
 
@@ -510,7 +526,7 @@ class WP_Meta_Query {
 		// We prefer to avoid joins if possible. Look for an existing join compatible with this clause.
 		$alias = $this->find_compatible_table_alias( $clause, $parent_query );
 		if ( false === $alias ) {
-			$i = count( $this->table_aliases );
+			$i     = count( $this->table_aliases );
 			$alias = $i ? 'mt' . $i : $this->meta_table;
 
 			// JOIN clauses for NOT EXISTS have their own syntax.
@@ -519,7 +535,7 @@ class WP_Meta_Query {
 				$join .= $i ? " AS $alias" : '';
 				$join .= $wpdb->prepare( " ON ($this->primary_table.$this->primary_id_column = $alias.$this->meta_id_column AND $alias.meta_key = %s )", $clause['key'] );
 
-			// All other JOIN clauses.
+				// All other JOIN clauses.
 			} else {
 				$join .= " INNER JOIN $this->meta_table";
 				$join .= $i ? " AS $alias" : '';
@@ -527,15 +543,15 @@ class WP_Meta_Query {
 			}
 
 			$this->table_aliases[] = $alias;
-			$sql_chunks['join'][] = $join;
+			$sql_chunks['join'][]  = $join;
 		}
 
 		// Save the alias to this clause, for future siblings to find.
 		$clause['alias'] = $alias;
 
 		// Determine the data type.
-		$_meta_type = isset( $clause['type'] ) ? $clause['type'] : '';
-		$meta_type  = $this->get_cast_for_type( $_meta_type );
+		$_meta_type     = isset( $clause['type'] ) ? $clause['type'] : '';
+		$meta_type      = $this->get_cast_for_type( $_meta_type );
 		$clause['cast'] = $meta_type;
 
 		// Fallback for clause keys is the table alias. Key must be a string.
@@ -544,7 +560,7 @@ class WP_Meta_Query {
 		}
 
 		// Ensure unique clause keys, so none are overwritten.
-		$iterator = 1;
+		$iterator        = 1;
 		$clause_key_base = $clause_key;
 		while ( isset( $this->clauses[ $clause_key ] ) ) {
 			$clause_key = $clause_key_base . '-' . $iterator;
@@ -578,36 +594,36 @@ class WP_Meta_Query {
 			}
 
 			switch ( $meta_compare ) {
-				case 'IN' :
-				case 'NOT IN' :
+				case 'IN':
+				case 'NOT IN':
 					$meta_compare_string = '(' . substr( str_repeat( ',%s', count( $meta_value ) ), 1 ) . ')';
-					$where = $wpdb->prepare( $meta_compare_string, $meta_value );
+					$where               = $wpdb->prepare( $meta_compare_string, $meta_value );
 					break;
 
-				case 'BETWEEN' :
-				case 'NOT BETWEEN' :
+				case 'BETWEEN':
+				case 'NOT BETWEEN':
 					$meta_value = array_slice( $meta_value, 0, 2 );
-					$where = $wpdb->prepare( '%s AND %s', $meta_value );
+					$where      = $wpdb->prepare( '%s AND %s', $meta_value );
 					break;
 
-				case 'LIKE' :
-				case 'NOT LIKE' :
+				case 'LIKE':
+				case 'NOT LIKE':
 					$meta_value = '%' . $wpdb->esc_like( $meta_value ) . '%';
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$where      = $wpdb->prepare( '%s', $meta_value );
 					break;
 
 				// EXISTS with a value is interpreted as '='.
-				case 'EXISTS' :
+				case 'EXISTS':
 					$meta_compare = '=';
-					$where = $wpdb->prepare( '%s', $meta_value );
+					$where        = $wpdb->prepare( '%s', $meta_value );
 					break;
 
 				// 'value' is ignored for NOT EXISTS.
-				case 'NOT EXISTS' :
+				case 'NOT EXISTS':
 					$where = '';
 					break;
 
-				default :
+				default:
 					$where = $wpdb->prepare( '%s', $meta_value );
 					break;
 
@@ -687,7 +703,7 @@ class WP_Meta_Query {
 			if ( 'OR' === $parent_query['relation'] ) {
 				$compatible_compares = array( '=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=' );
 
-			// Clauses joined by AND with "negative" operators share a join only if they also share a key.
+				// Clauses joined by AND with "negative" operators share a join only if they also share a key.
 			} elseif ( isset( $sibling['key'] ) && isset( $clause['key'] ) && $sibling['key'] === $clause['key'] ) {
 				$compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
 			}
@@ -710,7 +726,7 @@ class WP_Meta_Query {
 		 * @param array       $parent_query Parent of $clause.
 		 * @param object      $this         WP_Meta_Query object.
 		 */
-		return apply_filters( 'meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this ) ;
+		return apply_filters( 'meta_query_find_compatible_table_alias', $alias, $clause, $parent_query, $this );
 	}
 
 	/**
diff --git a/wp-includes/class-wp-metadata-lazyloader.php b/wp-includes/class-wp-metadata-lazyloader.php
index 284bfb9e8a..9b04983961 100644
--- a/wp-includes/class-wp-metadata-lazyloader.php
+++ b/wp-includes/class-wp-metadata-lazyloader.php
@@ -52,7 +52,7 @@ class WP_Metadata_Lazyloader {
 	 */
 	public function __construct() {
 		$this->settings = array(
-			'term' => array(
+			'term'    => array(
 				'filter'   => 'get_term_metadata',
 				'callback' => array( $this, 'lazyload_term_meta' ),
 			),
diff --git a/wp-includes/class-wp-network-query.php b/wp-includes/class-wp-network-query.php
index f8ca48f452..a11d6a6c6a 100644
--- a/wp-includes/class-wp-network-query.php
+++ b/wp-includes/class-wp-network-query.php
@@ -91,25 +91,25 @@ class WP_Network_Query {
 	 *
 	 *     @type array        $network__in          Array of network IDs to include. Default empty.
 	 *     @type array        $network__not_in      Array of network IDs to exclude. Default empty.
- 	 *     @type bool         $count                Whether to return a network count (true) or array of network objects.
- 	 *                                              Default false.
- 	 *     @type string       $fields               Network fields to return. Accepts 'ids' (returns an array of network IDs)
- 	 *                                              or empty (returns an array of complete network objects). Default empty.
- 	 *     @type int          $number               Maximum number of networks to retrieve. Default empty (no limit).
- 	 *     @type int          $offset               Number of networks to offset the query. Used to build LIMIT clause.
- 	 *                                              Default 0.
- 	 *     @type bool         $no_found_rows        Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
- 	 *     @type string|array $orderby              Network status or array of statuses. Accepts 'id', 'domain', 'path',
- 	 *                                              'domain_length', 'path_length' and 'network__in'. Also accepts false,
- 	 *                                              an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'.
- 	 *     @type string       $order                How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'.
- 	 *     @type string       $domain               Limit results to those affiliated with a given domain. Default empty.
- 	 *     @type array        $domain__in           Array of domains to include affiliated networks for. Default empty.
- 	 *     @type array        $domain__not_in       Array of domains to exclude affiliated networks for. Default empty.
- 	 *     @type string       $path                 Limit results to those affiliated with a given path. Default empty.
- 	 *     @type array        $path__in             Array of paths to include affiliated networks for. Default empty.
- 	 *     @type array        $path__not_in         Array of paths to exclude affiliated networks for. Default empty.
- 	 *     @type string       $search               Search term(s) to retrieve matching networks for. Default empty.
+	 *     @type bool         $count                Whether to return a network count (true) or array of network objects.
+	 *                                              Default false.
+	 *     @type string       $fields               Network fields to return. Accepts 'ids' (returns an array of network IDs)
+	 *                                              or empty (returns an array of complete network objects). Default empty.
+	 *     @type int          $number               Maximum number of networks to retrieve. Default empty (no limit).
+	 *     @type int          $offset               Number of networks to offset the query. Used to build LIMIT clause.
+	 *                                              Default 0.
+	 *     @type bool         $no_found_rows        Whether to disable the `SQL_CALC_FOUND_ROWS` query. Default true.
+	 *     @type string|array $orderby              Network status or array of statuses. Accepts 'id', 'domain', 'path',
+	 *                                              'domain_length', 'path_length' and 'network__in'. Also accepts false,
+	 *                                              an empty array, or 'none' to disable `ORDER BY` clause. Default 'id'.
+	 *     @type string       $order                How to order retrieved networks. Accepts 'ASC', 'DESC'. Default 'ASC'.
+	 *     @type string       $domain               Limit results to those affiliated with a given domain. Default empty.
+	 *     @type array        $domain__in           Array of domains to include affiliated networks for. Default empty.
+	 *     @type array        $domain__not_in       Array of domains to exclude affiliated networks for. Default empty.
+	 *     @type string       $path                 Limit results to those affiliated with a given path. Default empty.
+	 *     @type array        $path__in             Array of paths to include affiliated networks for. Default empty.
+	 *     @type array        $path__not_in         Array of paths to exclude affiliated networks for. Default empty.
+	 *     @type string       $search               Search term(s) to retrieve matching networks for. Default empty.
 	 *     @type bool         $update_network_cache Whether to prime the cache for found networks. Default true.
 	 * }
 	 */
@@ -144,7 +144,6 @@ class WP_Network_Query {
 	 *
 	 * @since 4.6.0
 	 *
-	 *
 	 * @param string|array $query WP_Network_Query arguments. See WP_Network_Query::__construct()
 	 */
 	public function parse_query( $query = '' ) {
@@ -204,10 +203,10 @@ class WP_Network_Query {
 		// Ignore the $fields argument as the queried result will be the same regardless.
 		unset( $_args['fields'] );
 
-		$key = md5( serialize( $_args ) );
+		$key          = md5( serialize( $_args ) );
 		$last_changed = wp_cache_get_last_changed( 'networks' );
 
-		$cache_key = "get_network_ids:$key:$last_changed";
+		$cache_key   = "get_network_ids:$key:$last_changed";
 		$cache_value = wp_cache_get( $cache_key, 'networks' );
 
 		if ( false === $cache_value ) {
@@ -217,12 +216,12 @@ class WP_Network_Query {
 			}
 
 			$cache_value = array(
-				'network_ids' => $network_ids,
+				'network_ids'    => $network_ids,
 				'found_networks' => $this->found_networks,
 			);
 			wp_cache_add( $cache_key, $cache_value, 'networks' );
 		} else {
-			$network_ids = $cache_value['network_ids'];
+			$network_ids          = $cache_value['network_ids'];
 			$this->found_networks = $cache_value['found_networks'];
 		}
 
@@ -301,10 +300,10 @@ class WP_Network_Query {
 
 				if ( is_int( $_key ) ) {
 					$_orderby = $_value;
-					$_order = $order;
+					$_order   = $order;
 				} else {
 					$_orderby = $_key;
-					$_order = $_value;
+					$_order   = $_value;
 				}
 
 				$parsed = $this->parse_orderby( $_orderby );
@@ -405,11 +404,11 @@ class WP_Network_Query {
 		 */
 		$clauses = apply_filters_ref_array( 'networks_clauses', array( compact( $pieces ), &$this ) );
 
-		$fields = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
-		$join = isset( $clauses['join'] ) ? $clauses['join'] : '';
-		$where = isset( $clauses['where'] ) ? $clauses['where'] : '';
+		$fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
+		$join    = isset( $clauses['join'] ) ? $clauses['join'] : '';
+		$where   = isset( $clauses['where'] ) ? $clauses['where'] : '';
 		$orderby = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
-		$limits = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
+		$limits  = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
 		$groupby = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
 
 		if ( $where ) {
@@ -519,9 +518,9 @@ class WP_Network_Query {
 		$parsed = false;
 		if ( $orderby == 'network__in' ) {
 			$network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
-			$parsed = "FIELD( {$wpdb->site}.id, $network__in )";
+			$parsed      = "FIELD( {$wpdb->site}.id, $network__in )";
 		} elseif ( $orderby == 'domain_length' || $orderby == 'path_length' ) {
-			$field = substr( $orderby, 0, -7 );
+			$field  = substr( $orderby, 0, -7 );
 			$parsed = "CHAR_LENGTH($wpdb->site.$field)";
 		} elseif ( in_array( $orderby, $allowed_keys ) ) {
 			$parsed = "$wpdb->site.$orderby";
diff --git a/wp-includes/class-wp-network.php b/wp-includes/class-wp-network.php
index cc96f56ea4..621c5ceb37 100644
--- a/wp-includes/class-wp-network.php
+++ b/wp-includes/class-wp-network.php
@@ -125,7 +125,7 @@ class WP_Network {
 	 * @param WP_Network|object $network A network object.
 	 */
 	public function __construct( $network ) {
-		foreach( get_object_vars( $network ) as $key => $value ) {
+		foreach ( get_object_vars( $network ) as $key => $value ) {
 			$this->$key = $value;
 		}
 
@@ -254,13 +254,15 @@ class WP_Network {
 
 			$main_site_id = wp_cache_get( $cache_key, 'site-options' );
 			if ( false === $main_site_id ) {
-				$_sites = get_sites( array(
-					'fields'     => 'ids',
-					'number'     => 1,
-					'domain'     => $this->domain,
-					'path'       => $this->path,
-					'network_id' => $this->id,
-				) );
+				$_sites       = get_sites(
+					array(
+						'fields'     => 'ids',
+						'number'     => 1,
+						'domain'     => $this->domain,
+						'path'       => $this->path,
+						'network_id' => $this->id,
+					)
+				);
 				$main_site_id = ! empty( $_sites ) ? array_shift( $_sites ) : 0;
 
 				wp_cache_add( $cache_key, $main_site_id, 'site-options' );
@@ -282,7 +284,7 @@ class WP_Network {
 			return;
 		}
 
-		$default = ucfirst( $this->domain );
+		$default         = ucfirst( $this->domain );
 		$this->site_name = get_network_option( $this->id, 'site_name', $default );
 	}
 
@@ -350,12 +352,14 @@ class WP_Network {
 		if ( wp_using_ext_object_cache() ) {
 			$using_paths = wp_cache_get( 'networks_have_paths', 'site-options' );
 			if ( false === $using_paths ) {
-				$using_paths = get_networks( array(
-					'number'       => 1,
-					'count'        => true,
-					'path__not_in' => '/',
-				) );
-				wp_cache_add( 'networks_have_paths', $using_paths, 'site-options'  );
+				$using_paths = get_networks(
+					array(
+						'number'       => 1,
+						'count'        => true,
+						'path__not_in' => '/',
+					)
+				);
+				wp_cache_add( 'networks_have_paths', $using_paths, 'site-options' );
 			}
 		}
 
@@ -413,13 +417,15 @@ class WP_Network {
 		}
 
 		if ( ! $using_paths ) {
-			$networks = get_networks( array(
-				'number'     => 1,
-				'orderby'    => array(
-					'domain_length' => 'DESC',
-				),
-				'domain__in' => $domains,
-			) );
+			$networks = get_networks(
+				array(
+					'number'     => 1,
+					'orderby'    => array(
+						'domain_length' => 'DESC',
+					),
+					'domain__in' => $domains,
+				)
+			);
 
 			if ( ! empty( $networks ) ) {
 				return array_shift( $networks );
@@ -428,14 +434,16 @@ class WP_Network {
 			return false;
 		}
 
-		$networks = get_networks( array(
-			'orderby'    => array(
-				'domain_length' => 'DESC',
-				'path_length'   => 'DESC',
-			),
-			'domain__in' => $domains,
-			'path__in'   => $paths,
-		) );
+		$networks = get_networks(
+			array(
+				'orderby'    => array(
+					'domain_length' => 'DESC',
+					'path_length'   => 'DESC',
+				),
+				'domain__in' => $domains,
+				'path__in'   => $paths,
+			)
+		);
 
 		/*
 		 * Domains are sorted by length of domain, then by length of path.
diff --git a/wp-includes/class-wp-oembed-controller.php b/wp-includes/class-wp-oembed-controller.php
index 7ee7950b07..8ea6236020 100644
--- a/wp-includes/class-wp-oembed-controller.php
+++ b/wp-includes/class-wp-oembed-controller.php
@@ -31,67 +31,71 @@ final class WP_oEmbed_Controller {
 		 */
 		$maxwidth = apply_filters( 'oembed_default_width', 600 );
 
-		register_rest_route( 'oembed/1.0', '/embed', array(
-			array(
-				'methods'  => WP_REST_Server::READABLE,
-				'callback' => array( $this, 'get_item' ),
-				'args'     => array(
-					'url'      => array(
-						'required'          => true,
-						'sanitize_callback' => 'esc_url_raw',
-					),
-					'format'   => array(
-						'default'           => 'json',
-						'sanitize_callback' => 'wp_oembed_ensure_format',
-					),
-					'maxwidth' => array(
-						'default'           => $maxwidth,
-						'sanitize_callback' => 'absint',
-					),
-				),
-			),
-		) );
-
-		register_rest_route( 'oembed/1.0', '/proxy', array(
-			array(
-				'methods'  => WP_REST_Server::READABLE,
-				'callback' => array( $this, 'get_proxy_item' ),
-				'permission_callback' => array( $this, 'get_proxy_item_permissions_check' ),
-				'args'     => array(
-					'url'      => array(
-						'description'       => __( 'The URL of the resource for which to fetch oEmbed data.' ),
-						'type'              => 'string',
-						'required'          => true,
-						'sanitize_callback' => 'esc_url_raw',
-					),
-					'format'   => array(
-						'description'       => __( 'The oEmbed format to use.' ),
-						'type'              => 'string',
-						'default'           => 'json',
-						'enum'              => array(
-							'json',
-							'xml',
+		register_rest_route(
+			'oembed/1.0', '/embed', array(
+				array(
+					'methods'  => WP_REST_Server::READABLE,
+					'callback' => array( $this, 'get_item' ),
+					'args'     => array(
+						'url'      => array(
+							'required'          => true,
+							'sanitize_callback' => 'esc_url_raw',
+						),
+						'format'   => array(
+							'default'           => 'json',
+							'sanitize_callback' => 'wp_oembed_ensure_format',
+						),
+						'maxwidth' => array(
+							'default'           => $maxwidth,
+							'sanitize_callback' => 'absint',
 						),
 					),
-					'maxwidth' => array(
-						'description'       => __( 'The maximum width of the embed frame in pixels.' ),
-						'type'              => 'integer',
-						'default'           => $maxwidth,
-						'sanitize_callback' => 'absint',
-					),
-					'maxheight' => array(
-						'description'       => __( 'The maximum height of the embed frame in pixels.' ),
-						'type'              => 'integer',
-						'sanitize_callback' => 'absint',
-					),
-					'discover' => array(
-						'description'       => __( 'Whether to perform an oEmbed discovery request for non-whitelisted providers.' ),
-						'type'              => 'boolean',
-						'default'           => true,
+				),
+			)
+		);
+
+		register_rest_route(
+			'oembed/1.0', '/proxy', array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_proxy_item' ),
+					'permission_callback' => array( $this, 'get_proxy_item_permissions_check' ),
+					'args'                => array(
+						'url'       => array(
+							'description'       => __( 'The URL of the resource for which to fetch oEmbed data.' ),
+							'type'              => 'string',
+							'required'          => true,
+							'sanitize_callback' => 'esc_url_raw',
+						),
+						'format'    => array(
+							'description' => __( 'The oEmbed format to use.' ),
+							'type'        => 'string',
+							'default'     => 'json',
+							'enum'        => array(
+								'json',
+								'xml',
+							),
+						),
+						'maxwidth'  => array(
+							'description'       => __( 'The maximum width of the embed frame in pixels.' ),
+							'type'              => 'integer',
+							'default'           => $maxwidth,
+							'sanitize_callback' => 'absint',
+						),
+						'maxheight' => array(
+							'description'       => __( 'The maximum height of the embed frame in pixels.' ),
+							'type'              => 'integer',
+							'sanitize_callback' => 'absint',
+						),
+						'discover'  => array(
+							'description' => __( 'Whether to perform an oEmbed discovery request for non-whitelisted providers.' ),
+							'type'        => 'boolean',
+							'default'     => true,
+						),
 					),
 				),
-			),
-		) );
+			)
+		);
 	}
 
 	/**
@@ -157,7 +161,7 @@ final class WP_oEmbed_Controller {
 		// Serve oEmbed data from cache if set.
 		unset( $args['_wpnonce'] );
 		$cache_key = 'oembed_' . md5( serialize( $args ) );
-		$data = get_transient( $cache_key );
+		$data      = get_transient( $cache_key );
 		if ( ! empty( $data ) ) {
 			return $data;
 		}
diff --git a/wp-includes/class-wp-post.php b/wp-includes/class-wp-post.php
index 9c040e3ed8..2e3a32ada4 100644
--- a/wp-includes/class-wp-post.php
+++ b/wp-includes/class-wp-post.php
@@ -17,7 +17,6 @@
  * @property-read array  $ancestors
  * @property-read int    $post_category
  * @property-read string $tag_input
- *
  */
 final class WP_Post {
 
@@ -243,8 +242,9 @@ final class WP_Post {
 		if ( ! $_post ) {
 			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
-			if ( ! $_post )
+			if ( ! $_post ) {
 				return false;
+			}
 
 			$_post = sanitize_post( $_post, 'raw' );
 			wp_cache_add( $_post->ID, $_post, 'posts' );
@@ -263,8 +263,9 @@ final class WP_Post {
 	 * @param WP_Post|object $post Post object.
 	 */
 	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
+		foreach ( get_object_vars( $post ) as $key => $value ) {
 			$this->$key = $value;
+		}
 	}
 
 	/**
@@ -276,17 +277,21 @@ final class WP_Post {
 	 * @return bool
 	 */
 	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
+		if ( 'ancestors' == $key ) {
 			return true;
+		}
 
-		if ( 'page_template' == $key )
+		if ( 'page_template' == $key ) {
 			return true;
+		}
 
-		if ( 'post_category' == $key )
+		if ( 'post_category' == $key ) {
 			return true;
+		}
 
-		if ( 'tags_input' == $key )
+		if ( 'tags_input' == $key ) {
 			return true;
+		}
 
 		return metadata_exists( 'post', $this->ID, $key );
 	}
@@ -305,33 +310,39 @@ final class WP_Post {
 		}
 
 		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
+			if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) {
 				$terms = get_the_terms( $this, 'category' );
+			}
 
-			if ( empty( $terms ) )
+			if ( empty( $terms ) ) {
 				return array();
+			}
 
 			return wp_list_pluck( $terms, 'term_id' );
 		}
 
 		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
+			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) {
 				$terms = get_the_terms( $this, 'post_tag' );
+			}
 
-			if ( empty( $terms ) )
+			if ( empty( $terms ) ) {
 				return array();
+			}
 
 			return wp_list_pluck( $terms, 'name' );
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
+		if ( 'ancestors' == $key ) {
 			$value = get_post_ancestors( $this );
-		else
+		} else {
 			$value = get_post_meta( $this->ID, $key, true );
+		}
 
-		if ( $this->filter )
+		if ( $this->filter ) {
 			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		}
 
 		return $value;
 	}
@@ -345,11 +356,13 @@ final class WP_Post {
 	 * @return self|array|bool|object|WP_Post
 	 */
 	public function filter( $filter ) {
-		if ( $this->filter == $filter )
+		if ( $this->filter == $filter ) {
 			return $this;
+		}
 
-		if ( $filter == 'raw' )
+		if ( $filter == 'raw' ) {
 			return self::get_instance( $this->ID );
+		}
 
 		return sanitize_post( $this, $filter );
 	}
@@ -365,8 +378,9 @@ final class WP_Post {
 		$post = get_object_vars( $this );
 
 		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
+			if ( $this->__isset( $key ) ) {
 				$post[ $key ] = $this->__get( $key );
+			}
 		}
 
 		return $post;
diff --git a/wp-includes/class-wp-query.php b/wp-includes/class-wp-query.php
index 2017526f8b..f70c4aee1a 100644
--- a/wp-includes/class-wp-query.php
+++ b/wp-includes/class-wp-query.php
@@ -445,31 +445,31 @@ class WP_Query {
 	 * @since 2.0.0
 	 */
 	private function init_query_flags() {
-		$this->is_single = false;
-		$this->is_preview = false;
-		$this->is_page = false;
-		$this->is_archive = false;
-		$this->is_date = false;
-		$this->is_year = false;
-		$this->is_month = false;
-		$this->is_day = false;
-		$this->is_time = false;
-		$this->is_author = false;
-		$this->is_category = false;
-		$this->is_tag = false;
-		$this->is_tax = false;
-		$this->is_search = false;
-		$this->is_feed = false;
-		$this->is_comment_feed = false;
-		$this->is_trackback = false;
-		$this->is_home = false;
-		$this->is_404 = false;
-		$this->is_paged = false;
-		$this->is_admin = false;
-		$this->is_attachment = false;
-		$this->is_singular = false;
-		$this->is_robots = false;
-		$this->is_posts_page = false;
+		$this->is_single            = false;
+		$this->is_preview           = false;
+		$this->is_page              = false;
+		$this->is_archive           = false;
+		$this->is_date              = false;
+		$this->is_year              = false;
+		$this->is_month             = false;
+		$this->is_day               = false;
+		$this->is_time              = false;
+		$this->is_author            = false;
+		$this->is_category          = false;
+		$this->is_tag               = false;
+		$this->is_tax               = false;
+		$this->is_search            = false;
+		$this->is_feed              = false;
+		$this->is_comment_feed      = false;
+		$this->is_trackback         = false;
+		$this->is_home              = false;
+		$this->is_404               = false;
+		$this->is_paged             = false;
+		$this->is_admin             = false;
+		$this->is_attachment        = false;
+		$this->is_singular          = false;
+		$this->is_robots            = false;
+		$this->is_posts_page        = false;
 		$this->is_post_type_archive = false;
 	}
 
@@ -479,22 +479,22 @@ class WP_Query {
 	 * @since 1.5.0
 	 */
 	public function init() {
-		unset($this->posts);
-		unset($this->query);
+		unset( $this->posts );
+		unset( $this->query );
 		$this->query_vars = array();
-		unset($this->queried_object);
-		unset($this->queried_object_id);
-		$this->post_count = 0;
+		unset( $this->queried_object );
+		unset( $this->queried_object_id );
+		$this->post_count   = 0;
 		$this->current_post = -1;
-		$this->in_the_loop = false;
+		$this->in_the_loop  = false;
 		unset( $this->request );
 		unset( $this->post );
 		unset( $this->comments );
 		unset( $this->comment );
-		$this->comment_count = 0;
-		$this->current_comment = -1;
-		$this->found_posts = 0;
-		$this->max_num_pages = 0;
+		$this->comment_count         = 0;
+		$this->current_comment       = -1;
+		$this->found_posts           = 0;
+		$this->max_num_pages         = 0;
 		$this->max_num_comment_pages = 0;
 
 		$this->init_query_flags();
@@ -518,59 +518,75 @@ class WP_Query {
 	 * @param array $array Defined query variables.
 	 * @return array Complete query variables with undefined ones filled in empty.
 	 */
-	public function fill_query_vars($array) {
+	public function fill_query_vars( $array ) {
 		$keys = array(
-			'error'
-			, 'm'
-			, 'p'
-			, 'post_parent'
-			, 'subpost'
-			, 'subpost_id'
-			, 'attachment'
-			, 'attachment_id'
-			, 'name'
-			, 'static'
-			, 'pagename'
-			, 'page_id'
-			, 'second'
-			, 'minute'
-			, 'hour'
-			, 'day'
-			, 'monthnum'
-			, 'year'
-			, 'w'
-			, 'category_name'
-			, 'tag'
-			, 'cat'
-			, 'tag_id'
-			, 'author'
-			, 'author_name'
-			, 'feed'
-			, 'tb'
-			, 'paged'
-			, 'meta_key'
-			, 'meta_value'
-			, 'preview'
-			, 's'
-			, 'sentence'
-			, 'title'
-			, 'fields'
-			, 'menu_order'
-			, 'embed'
+			'error',
+			'm',
+			'p',
+			'post_parent',
+			'subpost',
+			'subpost_id',
+			'attachment',
+			'attachment_id',
+			'name',
+			'static',
+			'pagename',
+			'page_id',
+			'second',
+			'minute',
+			'hour',
+			'day',
+			'monthnum',
+			'year',
+			'w',
+			'category_name',
+			'tag',
+			'cat',
+			'tag_id',
+			'author',
+			'author_name',
+			'feed',
+			'tb',
+			'paged',
+			'meta_key',
+			'meta_value',
+			'preview',
+			's',
+			'sentence',
+			'title',
+			'fields',
+			'menu_order',
+			'embed',
 		);
 
 		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = '';
+			if ( ! isset( $array[ $key ] ) ) {
+				$array[ $key ] = '';
+			}
 		}
 
-		$array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
-			'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in',
-			'author__in', 'author__not_in' );
+		$array_keys = array(
+			'category__in',
+			'category__not_in',
+			'category__and',
+			'post__in',
+			'post__not_in',
+			'post_name__in',
+			'tag__in',
+			'tag__not_in',
+			'tag__and',
+			'tag_slug__in',
+			'tag_slug__and',
+			'post_parent__in',
+			'post_parent__not_in',
+			'author__in',
+			'author__not_in',
+		);
 
 		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = array();
+			if ( ! isset( $array[ $key ] ) ) {
+				$array[ $key ] = array();
+			}
 		}
 		return $array;
 	}
@@ -701,7 +717,7 @@ class WP_Query {
 	 *     @type int          $year                    The four-digit year. Default empty. Accepts any four-digit year.
 	 * }
 	 */
-	public function parse_query( $query =  '' ) {
+	public function parse_query( $query = '' ) {
 		if ( ! empty( $query ) ) {
 			$this->init();
 			$this->query = $this->query_vars = wp_parse_args( $query );
@@ -709,36 +725,45 @@ class WP_Query {
 			$this->query = $this->query_vars;
 		}
 
-		$this->query_vars = $this->fill_query_vars($this->query_vars);
-		$qv = &$this->query_vars;
+		$this->query_vars         = $this->fill_query_vars( $this->query_vars );
+		$qv                       = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
+		if ( ! empty( $qv['robots'] ) ) {
 			$this->is_robots = true;
+		}
 
 		if ( ! is_scalar( $qv['p'] ) || $qv['p'] < 0 ) {
-			$qv['p'] = 0;
+			$qv['p']     = 0;
 			$qv['error'] = '404';
 		} else {
 			$qv['p'] = intval( $qv['p'] );
 		}
 
-		$qv['page_id'] =  absint($qv['page_id']);
-		$qv['year'] = absint($qv['year']);
-		$qv['monthnum'] = absint($qv['monthnum']);
-		$qv['day'] = absint($qv['day']);
-		$qv['w'] = absint($qv['w']);
-		$qv['m'] = is_scalar( $qv['m'] ) ? preg_replace( '|[^0-9]|', '', $qv['m'] ) : '';
-		$qv['paged'] = absint($qv['paged']);
-		$qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
-		$qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
+		$qv['page_id']  = absint( $qv['page_id'] );
+		$qv['year']     = absint( $qv['year'] );
+		$qv['monthnum'] = absint( $qv['monthnum'] );
+		$qv['day']      = absint( $qv['day'] );
+		$qv['w']        = absint( $qv['w'] );
+		$qv['m']        = is_scalar( $qv['m'] ) ? preg_replace( '|[^0-9]|', '', $qv['m'] ) : '';
+		$qv['paged']    = absint( $qv['paged'] );
+		$qv['cat']      = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
+		$qv['author']   = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
 		$qv['pagename'] = trim( $qv['pagename'] );
-		$qv['name'] = trim( $qv['name'] );
-		$qv['title'] = trim( $qv['title'] );
-		if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
-		if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
-		if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
-		if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
+		$qv['name']     = trim( $qv['name'] );
+		$qv['title']    = trim( $qv['title'] );
+		if ( '' !== $qv['hour'] ) {
+			$qv['hour'] = absint( $qv['hour'] );
+		}
+		if ( '' !== $qv['minute'] ) {
+			$qv['minute'] = absint( $qv['minute'] );
+		}
+		if ( '' !== $qv['second'] ) {
+			$qv['second'] = absint( $qv['second'] );
+		}
+		if ( '' !== $qv['menu_order'] ) {
+			$qv['menu_order'] = absint( $qv['menu_order'] );
+		}
 
 		// Fairly insane upper bound for search string lengths.
 		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
@@ -746,26 +771,28 @@ class WP_Query {
 		}
 
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] )
+		if ( '' != $qv['subpost'] ) {
 			$qv['attachment'] = $qv['subpost'];
-		if ( '' != $qv['subpost_id'] )
+		}
+		if ( '' != $qv['subpost_id'] ) {
 			$qv['attachment_id'] = $qv['subpost_id'];
+		}
 
-		$qv['attachment_id'] = absint($qv['attachment_id']);
+		$qv['attachment_id'] = absint( $qv['attachment_id'] );
 
-		if ( ('' != $qv['attachment']) || !empty($qv['attachment_id']) ) {
-			$this->is_single = true;
+		if ( ( '' != $qv['attachment'] ) || ! empty( $qv['attachment_id'] ) ) {
+			$this->is_single     = true;
 			$this->is_attachment = true;
 		} elseif ( '' != $qv['name'] ) {
 			$this->is_single = true;
 		} elseif ( $qv['p'] ) {
 			$this->is_single = true;
-		} elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {
+		} elseif ( ( '' !== $qv['hour'] ) && ( '' !== $qv['minute'] ) && ( '' !== $qv['second'] ) && ( '' != $qv['year'] ) && ( '' != $qv['monthnum'] ) && ( '' != $qv['day'] ) ) {
 			// If year, month, day, hour, minute, and second are set, a single
 			// post is being queried.
 			$this->is_single = true;
-		} elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
-			$this->is_page = true;
+		} elseif ( '' != $qv['static'] || '' != $qv['pagename'] || ! empty( $qv['page_id'] ) ) {
+			$this->is_page   = true;
 			$this->is_single = false;
 		} else {
 			// Look for archive queries. Dates, categories, authors, search, post type archives.
@@ -795,7 +822,7 @@ class WP_Query {
 					if ( $qv['monthnum'] && $qv['year'] && ! wp_checkdate( $qv['monthnum'], $qv['day'], $qv['year'], $date ) ) {
 						$qv['error'] = '404';
 					} else {
-						$this->is_day = true;
+						$this->is_day  = true;
 						$this->is_date = true;
 					}
 				}
@@ -807,7 +834,7 @@ class WP_Query {
 						$qv['error'] = '404';
 					} else {
 						$this->is_month = true;
-						$this->is_date = true;
+						$this->is_date  = true;
 					}
 				}
 			}
@@ -821,7 +848,7 @@ class WP_Query {
 
 			if ( $qv['m'] ) {
 				$this->is_date = true;
-				if ( strlen($qv['m']) > 9 ) {
+				if ( strlen( $qv['m'] ) > 9 ) {
 					$this->is_time = true;
 				} elseif ( strlen( $qv['m'] ) > 7 ) {
 					$this->is_day = true;
@@ -859,75 +886,86 @@ class WP_Query {
 			}
 			unset( $tax_query );
 
-			if ( empty($qv['author']) || ($qv['author'] == '0') ) {
+			if ( empty( $qv['author'] ) || ( $qv['author'] == '0' ) ) {
 				$this->is_author = false;
 			} else {
 				$this->is_author = true;
 			}
 
-			if ( '' != $qv['author_name'] )
+			if ( '' != $qv['author_name'] ) {
 				$this->is_author = true;
-
-			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
-				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( ! empty( $post_type_obj->has_archive ) )
-					$this->is_post_type_archive = true;
 			}
 
-			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
+			if ( ! empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
+				$post_type_obj = get_post_type_object( $qv['post_type'] );
+				if ( ! empty( $post_type_obj->has_archive ) ) {
+					$this->is_post_type_archive = true;
+				}
+			}
+
+			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax ) {
 				$this->is_archive = true;
+			}
 		}
 
-		if ( '' != $qv['feed'] )
+		if ( '' != $qv['feed'] ) {
 			$this->is_feed = true;
+		}
 
 		if ( '' != $qv['embed'] ) {
 			$this->is_embed = true;
 		}
 
-		if ( '' != $qv['tb'] )
+		if ( '' != $qv['tb'] ) {
 			$this->is_trackback = true;
+		}
 
-		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
+		if ( '' != $qv['paged'] && ( intval( $qv['paged'] ) > 1 ) ) {
 			$this->is_paged = true;
+		}
 
 		// if we're previewing inside the write screen
-		if ( '' != $qv['preview'] )
+		if ( '' != $qv['preview'] ) {
 			$this->is_preview = true;
+		}
 
-		if ( is_admin() )
+		if ( is_admin() ) {
 			$this->is_admin = true;
+		}
 
-		if ( false !== strpos($qv['feed'], 'comments-') ) {
-			$qv['feed'] = str_replace('comments-', '', $qv['feed']);
+		if ( false !== strpos( $qv['feed'], 'comments-' ) ) {
+			$qv['feed']         = str_replace( 'comments-', '', $qv['feed'] );
 			$qv['withcomments'] = 1;
 		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
-		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+		if ( $this->is_feed && ( ! empty( $qv['withcomments'] ) || ( empty( $qv['withoutcomments'] ) && $this->is_singular ) ) ) {
 			$this->is_comment_feed = true;
+		}
 
-		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
+		if ( ! ( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) ) {
 			$this->is_home = true;
+		}
 
 		// Correct is_* for page_on_front and page_for_posts
-		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
-			$_query = wp_parse_args($this->query);
+		if ( $this->is_home && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) ) {
+			$_query = wp_parse_args( $this->query );
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
-				unset($_query['pagename']);
+			if ( isset( $_query['pagename'] ) && '' == $_query['pagename'] ) {
+				unset( $_query['pagename'] );
+			}
 
 			unset( $_query['embed'] );
 
-			if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
+			if ( empty( $_query ) || ! array_diff( array_keys( $_query ), array( 'preview', 'page', 'paged', 'cpage' ) ) ) {
 				$this->is_page = true;
 				$this->is_home = false;
-				$qv['page_id'] = get_option('page_on_front');
+				$qv['page_id'] = get_option( 'page_on_front' );
 				// Correct <!--nextpage--> for page_on_front
-				if ( !empty($qv['paged']) ) {
+				if ( ! empty( $qv['paged'] ) ) {
 					$qv['page'] = $qv['paged'];
-					unset($qv['paged']);
+					unset( $qv['paged'] );
 				}
 			}
 		}
@@ -936,13 +974,13 @@ class WP_Query {
 			$this->queried_object = get_page_by_path( $qv['pagename'] );
 
 			if ( $this->queried_object && 'attachment' == $this->queried_object->post_type ) {
-				if ( preg_match( "/^[^%]*%(?:postname)%/", get_option( 'permalink_structure' ) ) ) {
+				if ( preg_match( '/^[^%]*%(?:postname)%/', get_option( 'permalink_structure' ) ) ) {
 					// See if we also have a post with the same slug
 					$post = get_page_by_path( $qv['pagename'], OBJECT, 'post' );
 					if ( $post ) {
 						$this->queried_object = $post;
-						$this->is_page = false;
-						$this->is_single = true;
+						$this->is_page        = false;
+						$this->is_single      = true;
 					}
 				}
 			}
@@ -953,47 +991,51 @@ class WP_Query {
 				unset( $this->queried_object );
 			}
 
-			if  ( 'page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts') ) {
-				$this->is_page = false;
-				$this->is_home = true;
+			if ( 'page' == get_option( 'show_on_front' ) && isset( $this->queried_object_id ) && $this->queried_object_id == get_option( 'page_for_posts' ) ) {
+				$this->is_page       = false;
+				$this->is_home       = true;
 				$this->is_posts_page = true;
 			}
 		}
 
 		if ( $qv['page_id'] ) {
-			if  ( 'page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts') ) {
-				$this->is_page = false;
-				$this->is_home = true;
+			if ( 'page' == get_option( 'show_on_front' ) && $qv['page_id'] == get_option( 'page_for_posts' ) ) {
+				$this->is_page       = false;
+				$this->is_home       = true;
 				$this->is_posts_page = true;
 			}
 		}
 
-		if ( !empty($qv['post_type']) ) {
-			if ( is_array($qv['post_type']) )
-				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
-			else
-				$qv['post_type'] = sanitize_key($qv['post_type']);
+		if ( ! empty( $qv['post_type'] ) ) {
+			if ( is_array( $qv['post_type'] ) ) {
+				$qv['post_type'] = array_map( 'sanitize_key', $qv['post_type'] );
+			} else {
+				$qv['post_type'] = sanitize_key( $qv['post_type'] );
+			}
 		}
 
 		if ( ! empty( $qv['post_status'] ) ) {
-			if ( is_array( $qv['post_status'] ) )
-				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
-			else
-				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			if ( is_array( $qv['post_status'] ) ) {
+				$qv['post_status'] = array_map( 'sanitize_key', $qv['post_status'] );
+			} else {
+				$qv['post_status'] = preg_replace( '|[^a-z0-9_,-]|', '', $qv['post_status'] );
+			}
 		}
 
-		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
+		if ( $this->is_posts_page && ( ! isset( $qv['withcomments'] ) || ! $qv['withcomments'] ) ) {
 			$this->is_comment_feed = false;
+		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
 
-		if ( '404' == $qv['error'] )
+		if ( '404' == $qv['error'] ) {
 			$this->set_404();
+		}
 
 		$this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 );
 
-		$this->query_vars_hash = md5( serialize( $this->query_vars ) );
+		$this->query_vars_hash    = md5( serialize( $this->query_vars ) );
 		$this->query_vars_changed = false;
 
 		/**
@@ -1022,45 +1064,50 @@ class WP_Query {
 			$tax_query = array();
 		}
 
-		if ( !empty($q['taxonomy']) && !empty($q['term']) ) {
+		if ( ! empty( $q['taxonomy'] ) && ! empty( $q['term'] ) ) {
 			$tax_query[] = array(
 				'taxonomy' => $q['taxonomy'],
-				'terms' => array( $q['term'] ),
-				'field' => 'slug',
+				'terms'    => array( $q['term'] ),
+				'field'    => 'slug',
 			);
 		}
 
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
-			if ( 'post_tag' == $taxonomy )
-				continue;	// Handled further down in the $q['tag'] block
+		foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy => $t ) {
+			if ( 'post_tag' == $taxonomy ) {
+				continue;   // Handled further down in the $q['tag'] block
+			}
 
-			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+			if ( $t->query_var && ! empty( $q[ $t->query_var ] ) ) {
 				$tax_query_defaults = array(
 					'taxonomy' => $taxonomy,
-					'field' => 'slug',
+					'field'    => 'slug',
 				);
 
- 				if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
-					$q[$t->query_var] = wp_basename( $q[$t->query_var] );
+				if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
+					$q[ $t->query_var ] = wp_basename( $q[ $t->query_var ] );
 				}
 
-				$term = $q[$t->query_var];
+				$term = $q[ $t->query_var ];
 
 				if ( is_array( $term ) ) {
 					$term = implode( ',', $term );
 				}
 
-				if ( strpos($term, '+') !== false ) {
+				if ( strpos( $term, '+' ) !== false ) {
 					$terms = preg_split( '/[+]+/', $term );
 					foreach ( $terms as $term ) {
-						$tax_query[] = array_merge( $tax_query_defaults, array(
-							'terms' => array( $term )
-						) );
+						$tax_query[] = array_merge(
+							$tax_query_defaults, array(
+								'terms' => array( $term ),
+							)
+						);
 					}
 				} else {
-					$tax_query[] = array_merge( $tax_query_defaults, array(
-						'terms' => preg_split( '/[,]+/', $term )
-					) );
+					$tax_query[] = array_merge(
+						$tax_query_defaults, array(
+							'terms' => preg_split( '/[,]+/', $term ),
+						)
+					);
 				}
 			}
 		}
@@ -1076,31 +1123,32 @@ class WP_Query {
 
 			$cat_array = preg_split( '/[,\s]+/', urldecode( $q['cat'] ) );
 			$cat_array = array_map( 'intval', $cat_array );
-			$q['cat'] = implode( ',', $cat_array );
+			$q['cat']  = implode( ',', $cat_array );
 
 			foreach ( $cat_array as $cat ) {
-				if ( $cat > 0 )
+				if ( $cat > 0 ) {
 					$cat_in[] = $cat;
-				elseif ( $cat < 0 )
+				} elseif ( $cat < 0 ) {
 					$cat_not_in[] = abs( $cat );
+				}
 			}
 
 			if ( ! empty( $cat_in ) ) {
 				$tax_query[] = array(
-					'taxonomy' => 'category',
-					'terms' => $cat_in,
-					'field' => 'term_id',
-					'include_children' => true
+					'taxonomy'         => 'category',
+					'terms'            => $cat_in,
+					'field'            => 'term_id',
+					'include_children' => true,
 				);
 			}
 
 			if ( ! empty( $cat_not_in ) ) {
 				$tax_query[] = array(
-					'taxonomy' => 'category',
-					'terms' => $cat_not_in,
-					'field' => 'term_id',
-					'operator' => 'NOT IN',
-					'include_children' => true
+					'taxonomy'         => 'category',
+					'terms'            => $cat_not_in,
+					'field'            => 'term_id',
+					'operator'         => 'NOT IN',
+					'include_children' => true,
 				);
 			}
 			unset( $cat_array, $cat_in, $cat_not_in );
@@ -1108,40 +1156,41 @@ class WP_Query {
 
 		if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
 			$q['category__and'] = (array) $q['category__and'];
-			if ( ! isset( $q['category__in'] ) )
+			if ( ! isset( $q['category__in'] ) ) {
 				$q['category__in'] = array();
+			}
 			$q['category__in'][] = absint( reset( $q['category__and'] ) );
 			unset( $q['category__and'] );
 		}
 
 		if ( ! empty( $q['category__in'] ) ) {
 			$q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
-			$tax_query[] = array(
-				'taxonomy' => 'category',
-				'terms' => $q['category__in'],
-				'field' => 'term_id',
-				'include_children' => false
+			$tax_query[]       = array(
+				'taxonomy'         => 'category',
+				'terms'            => $q['category__in'],
+				'field'            => 'term_id',
+				'include_children' => false,
 			);
 		}
 
-		if ( ! empty($q['category__not_in']) ) {
+		if ( ! empty( $q['category__not_in'] ) ) {
 			$q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
-			$tax_query[] = array(
-				'taxonomy' => 'category',
-				'terms' => $q['category__not_in'],
-				'operator' => 'NOT IN',
-				'include_children' => false
+			$tax_query[]           = array(
+				'taxonomy'         => 'category',
+				'terms'            => $q['category__not_in'],
+				'operator'         => 'NOT IN',
+				'include_children' => false,
 			);
 		}
 
-		if ( ! empty($q['category__and']) ) {
+		if ( ! empty( $q['category__and'] ) ) {
 			$q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
-			$tax_query[] = array(
-				'taxonomy' => 'category',
-				'terms' => $q['category__and'],
-				'field' => 'term_id',
-				'operator' => 'AND',
-				'include_children' => false
+			$tax_query[]        = array(
+				'taxonomy'         => 'category',
+				'terms'            => $q['category__and'],
+				'field'            => 'term_id',
+				'operator'         => 'AND',
+				'include_children' => false,
 			);
 		}
 
@@ -1151,75 +1200,75 @@ class WP_Query {
 		}
 
 		// Tag stuff
-		if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
-			if ( strpos($q['tag'], ',') !== false ) {
-				$tags = preg_split('/[,\r\n\t ]+/', $q['tag']);
+		if ( '' != $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
+			if ( strpos( $q['tag'], ',' ) !== false ) {
+				$tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );
 				foreach ( (array) $tags as $tag ) {
-					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
+					$tag                 = sanitize_term_field( 'slug', $tag, 0, 'post_tag', 'db' );
 					$q['tag_slug__in'][] = $tag;
 				}
-			} elseif ( preg_match('/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
-				$tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
+			} elseif ( preg_match( '/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
+				$tags = preg_split( '/[+\r\n\t ]+/', $q['tag'] );
 				foreach ( (array) $tags as $tag ) {
-					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
+					$tag                  = sanitize_term_field( 'slug', $tag, 0, 'post_tag', 'db' );
 					$q['tag_slug__and'][] = $tag;
 				}
 			} else {
-				$q['tag'] = sanitize_term_field('slug', $q['tag'], 0, 'post_tag', 'db');
+				$q['tag']            = sanitize_term_field( 'slug', $q['tag'], 0, 'post_tag', 'db' );
 				$q['tag_slug__in'][] = $q['tag'];
 			}
 		}
 
-		if ( !empty($q['tag_id']) ) {
+		if ( ! empty( $q['tag_id'] ) ) {
 			$q['tag_id'] = absint( $q['tag_id'] );
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
-				'terms' => $q['tag_id']
+				'terms'    => $q['tag_id'],
 			);
 		}
 
-		if ( !empty($q['tag__in']) ) {
-			$q['tag__in'] = array_map('absint', array_unique( (array) $q['tag__in'] ) );
-			$tax_query[] = array(
+		if ( ! empty( $q['tag__in'] ) ) {
+			$q['tag__in'] = array_map( 'absint', array_unique( (array) $q['tag__in'] ) );
+			$tax_query[]  = array(
 				'taxonomy' => 'post_tag',
-				'terms' => $q['tag__in']
+				'terms'    => $q['tag__in'],
 			);
 		}
 
-		if ( !empty($q['tag__not_in']) ) {
-			$q['tag__not_in'] = array_map('absint', array_unique( (array) $q['tag__not_in'] ) );
-			$tax_query[] = array(
+		if ( ! empty( $q['tag__not_in'] ) ) {
+			$q['tag__not_in'] = array_map( 'absint', array_unique( (array) $q['tag__not_in'] ) );
+			$tax_query[]      = array(
 				'taxonomy' => 'post_tag',
-				'terms' => $q['tag__not_in'],
-				'operator' => 'NOT IN'
+				'terms'    => $q['tag__not_in'],
+				'operator' => 'NOT IN',
 			);
 		}
 
-		if ( !empty($q['tag__and']) ) {
-			$q['tag__and'] = array_map('absint', array_unique( (array) $q['tag__and'] ) );
-			$tax_query[] = array(
+		if ( ! empty( $q['tag__and'] ) ) {
+			$q['tag__and'] = array_map( 'absint', array_unique( (array) $q['tag__and'] ) );
+			$tax_query[]   = array(
 				'taxonomy' => 'post_tag',
-				'terms' => $q['tag__and'],
-				'operator' => 'AND'
+				'terms'    => $q['tag__and'],
+				'operator' => 'AND',
 			);
 		}
 
-		if ( !empty($q['tag_slug__in']) ) {
-			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
-			$tax_query[] = array(
+		if ( ! empty( $q['tag_slug__in'] ) ) {
+			$q['tag_slug__in'] = array_map( 'sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
+			$tax_query[]       = array(
 				'taxonomy' => 'post_tag',
-				'terms' => $q['tag_slug__in'],
-				'field' => 'slug'
+				'terms'    => $q['tag_slug__in'],
+				'field'    => 'slug',
 			);
 		}
 
-		if ( !empty($q['tag_slug__and']) ) {
-			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
-			$tax_query[] = array(
+		if ( ! empty( $q['tag_slug__and'] ) ) {
+			$q['tag_slug__and'] = array_map( 'sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
+			$tax_query[]        = array(
 				'taxonomy' => 'post_tag',
-				'terms' => $q['tag_slug__and'],
-				'field' => 'slug',
-				'operator' => 'AND'
+				'terms'    => $q['tag_slug__and'],
+				'field'    => 'slug',
+				'operator' => 'AND',
 			);
 		}
 
@@ -1252,27 +1301,29 @@ class WP_Query {
 
 		// added slashes screw with quote grouping when done early, so done later
 		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
+		if ( empty( $_GET['s'] ) && $this->is_main_query() ) {
 			$q['s'] = urldecode( $q['s'] );
+		}
 		// there are no line breaks in <input /> fields
-		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
+		$q['s']                  = str_replace( array( "\r", "\n" ), '', $q['s'] );
 		$q['search_terms_count'] = 1;
 		if ( ! empty( $q['sentence'] ) ) {
 			$q['search_terms'] = array( $q['s'] );
 		} else {
 			if ( preg_match_all( '/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches ) ) {
 				$q['search_terms_count'] = count( $matches[0] );
-				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
+				$q['search_terms']       = $this->parse_search_terms( $matches[0] );
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
+				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 ) {
 					$q['search_terms'] = array( $q['s'] );
+				}
 			} else {
 				$q['search_terms'] = array( $q['s'] );
 			}
 		}
 
-		$n = ! empty( $q['exact'] ) ? '' : '%';
-		$searchand = '';
+		$n                         = ! empty( $q['exact'] ) ? '' : '%';
+		$searchand                 = '';
 		$q['search_orderby_title'] = array();
 
 		/**
@@ -1298,12 +1349,12 @@ class WP_Query {
 			}
 
 			if ( $n && ! $exclude ) {
-				$like = '%' . $wpdb->esc_like( $term ) . '%';
+				$like                        = '%' . $wpdb->esc_like( $term ) . '%';
 				$q['search_orderby_title'][] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $like );
 			}
 
-			$like = $n . $wpdb->esc_like( $term ) . $n;
-			$search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+			$like      = $n . $wpdb->esc_like( $term ) . $n;
+			$search   .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
 			$searchand = ' AND ';
 		}
 
@@ -1331,23 +1382,26 @@ class WP_Query {
 	 */
 	protected function parse_search_terms( $terms ) {
 		$strtolower = function_exists( 'mb_strtolower' ) ? 'mb_strtolower' : 'strtolower';
-		$checked = array();
+		$checked    = array();
 
 		$stopwords = $this->get_search_stopwords();
 
 		foreach ( $terms as $term ) {
 			// keep before/after spaces when term is for exact match
-			if ( preg_match( '/^".+"$/', $term ) )
+			if ( preg_match( '/^".+"$/', $term ) ) {
 				$term = trim( $term, "\"'" );
-			else
+			} else {
 				$term = trim( $term, "\"' " );
+			}
 
 			// Avoid single A-Z and single dashes.
-			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) )
+			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) ) {
 				continue;
+			}
 
-			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
+			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) ) {
 				continue;
+			}
 
 			$checked[] = $term;
 		}
@@ -1363,21 +1417,27 @@ class WP_Query {
 	 * @return array Stopwords.
 	 */
 	protected function get_search_stopwords() {
-		if ( isset( $this->stopwords ) )
+		if ( isset( $this->stopwords ) ) {
 			return $this->stopwords;
+		}
 
 		/* translators: This is a comma-separated list of very common words that should be excluded from a search,
 		 * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
 		 * words into your language. Instead, look for and provide commonly accepted stopwords in your language.
 		 */
-		$words = explode( ',', _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' ) );
+		$words = explode(
+			',', _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'
+			)
+		);
 
 		$stopwords = array();
 		foreach ( $words as $word ) {
 			$word = trim( $word, "\r\n\t " );
-			if ( $word )
+			if ( $word ) {
 				$stopwords[] = $word;
+			}
 		}
 
 		/**
@@ -1426,8 +1486,9 @@ class WP_Query {
 				// all words in title
 				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
 				// any word in title, not needed when $num_terms == 1
-				if ( $num_terms > 1 )
+				if ( $num_terms > 1 ) {
 					$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				}
 			}
 
 			// Sentence match in 'post_content' and 'post_excerpt'.
@@ -1462,20 +1523,35 @@ class WP_Query {
 
 		// Used to filter values.
 		$allowed_keys = array(
-			'post_name', 'post_author', 'post_date', 'post_title', 'post_modified',
-			'post_parent', 'post_type', 'name', 'author', 'date', 'title', 'modified',
-			'parent', 'type', 'ID', 'menu_order', 'comment_count', 'rand',
+			'post_name',
+			'post_author',
+			'post_date',
+			'post_title',
+			'post_modified',
+			'post_parent',
+			'post_type',
+			'name',
+			'author',
+			'date',
+			'title',
+			'modified',
+			'parent',
+			'type',
+			'ID',
+			'menu_order',
+			'comment_count',
+			'rand',
 		);
 
-		$primary_meta_key = '';
+		$primary_meta_key   = '';
 		$primary_meta_query = false;
-		$meta_clauses = $this->meta_query->get_clauses();
+		$meta_clauses       = $this->meta_query->get_clauses();
 		if ( ! empty( $meta_clauses ) ) {
 			$primary_meta_query = reset( $meta_clauses );
 
 			if ( ! empty( $primary_meta_query['key'] ) ) {
 				$primary_meta_key = $primary_meta_query['key'];
-				$allowed_keys[] = $primary_meta_key;
+				$allowed_keys[]   = $primary_meta_key;
 			}
 
 			$allowed_keys[] = 'meta_value';
@@ -1486,7 +1562,7 @@ class WP_Query {
 		// If RAND() contains a seed value, sanitize and add to allowed keys.
 		$rand_with_seed = false;
 		if ( preg_match( '/RAND\(([0-9]+)\)/i', $orderby, $matches ) ) {
-			$orderby = sprintf( 'RAND(%s)', intval( $matches[1] ) );
+			$orderby        = sprintf( 'RAND(%s)', intval( $matches[1] ) );
 			$allowed_keys[] = $orderby;
 			$rand_with_seed = true;
 		}
@@ -1525,7 +1601,7 @@ class WP_Query {
 			default:
 				if ( array_key_exists( $orderby, $meta_clauses ) ) {
 					// $orderby corresponds to a meta_query clause.
-					$meta_clause = $meta_clauses[ $orderby ];
+					$meta_clause    = $meta_clauses[ $orderby ];
 					$orderby_clause = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
 				} elseif ( $rand_with_seed ) {
 					$orderby_clause = $orderby;
@@ -1580,7 +1656,6 @@ class WP_Query {
 	 * @since 1.5.0
 	 * @since 3.9.0 The `$default` argument was introduced.
 	 *
-	 *
 	 * @param string $query_var Query variable key.
 	 * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
 	 * @return mixed Contents of the query variable.
@@ -1601,8 +1676,8 @@ class WP_Query {
 	 * @param string $query_var Query variable key.
 	 * @param mixed  $value     Query variable value.
 	 */
-	public function set($query_var, $value) {
-		$this->query_vars[$query_var] = $value;
+	public function set( $query_var, $value ) {
+		$this->query_vars[ $query_var ] = $value;
 	}
 
 	/**
@@ -1637,7 +1712,7 @@ class WP_Query {
 		$q = &$this->query_vars;
 
 		// Fill again in case pre_get_posts unset some vars.
-		$q = $this->fill_query_vars($q);
+		$q = $this->fill_query_vars( $q );
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
@@ -1647,26 +1722,28 @@ class WP_Query {
 		$hash = md5( serialize( $this->query_vars ) );
 		if ( $hash != $this->query_vars_hash ) {
 			$this->query_vars_changed = true;
-			$this->query_vars_hash = $hash;
+			$this->query_vars_hash    = $hash;
 		}
-		unset($hash);
+		unset( $hash );
 
 		// First let's clear some variables
-		$distinct = '';
-		$whichauthor = '';
-		$whichmimetype = '';
-		$where = '';
-		$limits = '';
-		$join = '';
-		$search = '';
-		$groupby = '';
+		$distinct         = '';
+		$whichauthor      = '';
+		$whichmimetype    = '';
+		$where            = '';
+		$limits           = '';
+		$join             = '';
+		$search           = '';
+		$groupby          = '';
 		$post_status_join = false;
-		$page = 1;
+		$page             = 1;
 
 		if ( isset( $q['caller_get_posts'] ) ) {
-			_deprecated_argument( 'WP_Query', '3.1.0',
+			_deprecated_argument(
+				'WP_Query', '3.1.0',
 				/* translators: 1: caller_get_posts, 2: ignore_sticky_posts */
-				sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+				sprintf(
+					__( '%1$s is deprecated. Use %2$s instead.' ),
 					'<code>caller_get_posts</code>',
 					'<code>ignore_sticky_posts</code>'
 				)
@@ -1677,46 +1754,53 @@ class WP_Query {
 			}
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
+		if ( ! isset( $q['ignore_sticky_posts'] ) ) {
 			$q['ignore_sticky_posts'] = false;
-
-		if ( !isset($q['suppress_filters']) )
-			$q['suppress_filters'] = false;
-
-		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
-				$q['cache_results'] = false;
-			else
-				$q['cache_results'] = true;
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
+		if ( ! isset( $q['suppress_filters'] ) ) {
+			$q['suppress_filters'] = false;
+		}
+
+		if ( ! isset( $q['cache_results'] ) ) {
+			if ( wp_using_ext_object_cache() ) {
+				$q['cache_results'] = false;
+			} else {
+				$q['cache_results'] = true;
+			}
+		}
+
+		if ( ! isset( $q['update_post_term_cache'] ) ) {
 			$q['update_post_term_cache'] = true;
+		}
 
 		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
 		}
 
-		if ( !isset($q['update_post_meta_cache']) )
+		if ( ! isset( $q['update_post_meta_cache'] ) ) {
 			$q['update_post_meta_cache'] = true;
+		}
 
-		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
+		if ( ! isset( $q['post_type'] ) ) {
+			if ( $this->is_search ) {
 				$q['post_type'] = 'any';
-			else
+			} else {
 				$q['post_type'] = '';
+			}
 		}
 		$post_type = $q['post_type'];
 		if ( empty( $q['posts_per_page'] ) ) {
 			$q['posts_per_page'] = get_option( 'posts_per_page' );
 		}
-		if ( isset($q['showposts']) && $q['showposts'] ) {
-			$q['showposts'] = (int) $q['showposts'];
+		if ( isset( $q['showposts'] ) && $q['showposts'] ) {
+			$q['showposts']      = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
+		if ( ( isset( $q['posts_per_archive_page'] ) && $q['posts_per_archive_page'] != 0 ) && ( $this->is_archive || $this->is_search ) ) {
 			$q['posts_per_page'] = $q['posts_per_archive_page'];
-		if ( !isset($q['nopaging']) ) {
+		}
+		if ( ! isset( $q['nopaging'] ) ) {
 			if ( $q['posts_per_page'] == -1 ) {
 				$q['nopaging'] = true;
 			} else {
@@ -1734,30 +1818,33 @@ class WP_Query {
 			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
-		if ( $q['posts_per_page'] < -1 )
-			$q['posts_per_page'] = abs($q['posts_per_page']);
-		elseif ( $q['posts_per_page'] == 0 )
+		if ( $q['posts_per_page'] < -1 ) {
+			$q['posts_per_page'] = abs( $q['posts_per_page'] );
+		} elseif ( $q['posts_per_page'] == 0 ) {
 			$q['posts_per_page'] = 1;
-
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
-			$q['comments_per_page'] = get_option('comments_per_page');
-
-		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
-			$this->is_page = true;
-			$this->is_home = false;
-			$q['page_id'] = get_option('page_on_front');
 		}
 
-		if ( isset($q['page']) ) {
-			$q['page'] = trim($q['page'], '/');
-			$q['page'] = absint($q['page']);
+		if ( ! isset( $q['comments_per_page'] ) || $q['comments_per_page'] == 0 ) {
+			$q['comments_per_page'] = get_option( 'comments_per_page' );
+		}
+
+		if ( $this->is_home && ( empty( $this->query ) || $q['preview'] == 'true' ) && ( 'page' == get_option( 'show_on_front' ) ) && get_option( 'page_on_front' ) ) {
+			$this->is_page = true;
+			$this->is_home = false;
+			$q['page_id']  = get_option( 'page_on_front' );
+		}
+
+		if ( isset( $q['page'] ) ) {
+			$q['page'] = trim( $q['page'], '/' );
+			$q['page'] = absint( $q['page'] );
 		}
 
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
-		if ( isset($q['no_found_rows']) )
+		if ( isset( $q['no_found_rows'] ) ) {
 			$q['no_found_rows'] = (bool) $q['no_found_rows'];
-		else
+		} else {
 			$q['no_found_rows'] = false;
+		}
 
 		switch ( $q['fields'] ) {
 			case 'ids':
@@ -1775,67 +1862,74 @@ class WP_Query {
 		}
 		// The "m" parameter is meant for months but accepts datetimes of varying specificity
 		if ( $q['m'] ) {
-			$where .= " AND YEAR({$wpdb->posts}.post_date)=" . substr($q['m'], 0, 4);
-			if ( strlen($q['m']) > 5 ) {
-				$where .= " AND MONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 4, 2);
+			$where .= " AND YEAR({$wpdb->posts}.post_date)=" . substr( $q['m'], 0, 4 );
+			if ( strlen( $q['m'] ) > 5 ) {
+				$where .= " AND MONTH({$wpdb->posts}.post_date)=" . substr( $q['m'], 4, 2 );
 			}
-			if ( strlen($q['m']) > 7 ) {
-				$where .= " AND DAYOFMONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 6, 2);
+			if ( strlen( $q['m'] ) > 7 ) {
+				$where .= " AND DAYOFMONTH({$wpdb->posts}.post_date)=" . substr( $q['m'], 6, 2 );
 			}
-			if ( strlen($q['m']) > 9 ) {
-				$where .= " AND HOUR({$wpdb->posts}.post_date)=" . substr($q['m'], 8, 2);
+			if ( strlen( $q['m'] ) > 9 ) {
+				$where .= " AND HOUR({$wpdb->posts}.post_date)=" . substr( $q['m'], 8, 2 );
 			}
-			if ( strlen($q['m']) > 11 ) {
-				$where .= " AND MINUTE({$wpdb->posts}.post_date)=" . substr($q['m'], 10, 2);
+			if ( strlen( $q['m'] ) > 11 ) {
+				$where .= " AND MINUTE({$wpdb->posts}.post_date)=" . substr( $q['m'], 10, 2 );
 			}
-			if ( strlen($q['m']) > 13 ) {
-				$where .= " AND SECOND({$wpdb->posts}.post_date)=" . substr($q['m'], 12, 2);
+			if ( strlen( $q['m'] ) > 13 ) {
+				$where .= " AND SECOND({$wpdb->posts}.post_date)=" . substr( $q['m'], 12, 2 );
 			}
 		}
 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
+		if ( '' !== $q['hour'] ) {
 			$date_parameters['hour'] = $q['hour'];
+		}
 
-		if ( '' !== $q['minute'] )
+		if ( '' !== $q['minute'] ) {
 			$date_parameters['minute'] = $q['minute'];
+		}
 
-		if ( '' !== $q['second'] )
+		if ( '' !== $q['second'] ) {
 			$date_parameters['second'] = $q['second'];
+		}
 
-		if ( $q['year'] )
+		if ( $q['year'] ) {
 			$date_parameters['year'] = $q['year'];
+		}
 
-		if ( $q['monthnum'] )
+		if ( $q['monthnum'] ) {
 			$date_parameters['monthnum'] = $q['monthnum'];
+		}
 
-		if ( $q['w'] )
+		if ( $q['w'] ) {
 			$date_parameters['week'] = $q['w'];
+		}
 
-		if ( $q['day'] )
+		if ( $q['day'] ) {
 			$date_parameters['day'] = $q['day'];
+		}
 
 		if ( $date_parameters ) {
 			$date_query = new WP_Date_Query( array( $date_parameters ) );
-			$where .= $date_query->get_sql();
+			$where     .= $date_query->get_sql();
 		}
 		unset( $date_parameters, $date_query );
 
 		// Handle complex date queries
 		if ( ! empty( $q['date_query'] ) ) {
 			$this->date_query = new WP_Date_Query( $q['date_query'] );
-			$where .= $this->date_query->get_sql();
+			$where           .= $this->date_query->get_sql();
 		}
 
-
 		// If we've got a post_type AND it's not "any" post_type.
-		if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
-			foreach ( (array)$q['post_type'] as $_post_type ) {
-				$ptype_obj = get_post_type_object($_post_type);
-				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
+		if ( ! empty( $q['post_type'] ) && 'any' != $q['post_type'] ) {
+			foreach ( (array) $q['post_type'] as $_post_type ) {
+				$ptype_obj = get_post_type_object( $_post_type );
+				if ( ! $ptype_obj || ! $ptype_obj->query_var || empty( $q[ $ptype_obj->query_var ] ) ) {
 					continue;
+				}
 
 				if ( ! $ptype_obj->hierarchical ) {
 					// Non-hierarchical post types can directly use 'name'.
@@ -1843,13 +1937,13 @@ class WP_Query {
 				} else {
 					// Hierarchical post types will operate through 'pagename'.
 					$q['pagename'] = $q[ $ptype_obj->query_var ];
-					$q['name'] = '';
+					$q['name']     = '';
 				}
 
 				// Only one request for a slug is possible, this is why name & pagename are overwritten above.
 				break;
 			} //end foreach
-			unset($ptype_obj);
+			unset( $ptype_obj );
 		}
 
 		if ( '' !== $q['title'] ) {
@@ -1859,83 +1953,87 @@ class WP_Query {
 		// Parameters related to 'post_name'.
 		if ( '' != $q['name'] ) {
 			$q['name'] = sanitize_title_for_query( $q['name'] );
-			$where .= " AND {$wpdb->posts}.post_name = '" . $q['name'] . "'";
+			$where    .= " AND {$wpdb->posts}.post_name = '" . $q['name'] . "'";
 		} elseif ( '' != $q['pagename'] ) {
-			if ( isset($this->queried_object_id) ) {
+			if ( isset( $this->queried_object_id ) ) {
 				$reqpage = $this->queried_object_id;
 			} else {
 				if ( 'page' != $q['post_type'] ) {
-					foreach ( (array)$q['post_type'] as $_post_type ) {
-						$ptype_obj = get_post_type_object($_post_type);
-						if ( !$ptype_obj || !$ptype_obj->hierarchical )
+					foreach ( (array) $q['post_type'] as $_post_type ) {
+						$ptype_obj = get_post_type_object( $_post_type );
+						if ( ! $ptype_obj || ! $ptype_obj->hierarchical ) {
 							continue;
+						}
 
-						$reqpage = get_page_by_path($q['pagename'], OBJECT, $_post_type);
-						if ( $reqpage )
+						$reqpage = get_page_by_path( $q['pagename'], OBJECT, $_post_type );
+						if ( $reqpage ) {
 							break;
+						}
 					}
-					unset($ptype_obj);
+					unset( $ptype_obj );
 				} else {
-					$reqpage = get_page_by_path($q['pagename']);
+					$reqpage = get_page_by_path( $q['pagename'] );
 				}
-				if ( !empty($reqpage) )
+				if ( ! empty( $reqpage ) ) {
 					$reqpage = $reqpage->ID;
-				else
+				} else {
 					$reqpage = 0;
+				}
 			}
 
-			$page_for_posts = get_option('page_for_posts');
-			if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
+			$page_for_posts = get_option( 'page_for_posts' );
+			if ( ( 'page' != get_option( 'show_on_front' ) ) || empty( $page_for_posts ) || ( $reqpage != $page_for_posts ) ) {
 				$q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
-				$q['name'] = $q['pagename'];
-				$where .= " AND ({$wpdb->posts}.ID = '$reqpage')";
-				$reqpage_obj = get_post( $reqpage );
-				if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
+				$q['name']     = $q['pagename'];
+				$where        .= " AND ({$wpdb->posts}.ID = '$reqpage')";
+				$reqpage_obj   = get_post( $reqpage );
+				if ( is_object( $reqpage_obj ) && 'attachment' == $reqpage_obj->post_type ) {
 					$this->is_attachment = true;
-					$post_type = $q['post_type'] = 'attachment';
-					$this->is_page = true;
-					$q['attachment_id'] = $reqpage;
+					$post_type           = $q['post_type'] = 'attachment';
+					$this->is_page       = true;
+					$q['attachment_id']  = $reqpage;
 				}
 			}
 		} elseif ( '' != $q['attachment'] ) {
 			$q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
-			$q['name'] = $q['attachment'];
-			$where .= " AND {$wpdb->posts}.post_name = '" . $q['attachment'] . "'";
+			$q['name']       = $q['attachment'];
+			$where          .= " AND {$wpdb->posts}.post_name = '" . $q['attachment'] . "'";
 		} elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
 			$q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
-			$post_name__in = "'" . implode( "','", $q['post_name__in'] ) . "'";
-			$where .= " AND {$wpdb->posts}.post_name IN ($post_name__in)";
+			$post_name__in      = "'" . implode( "','", $q['post_name__in'] ) . "'";
+			$where             .= " AND {$wpdb->posts}.post_name IN ($post_name__in)";
 		}
 
 		// If an attachment is requested by number, let it supersede any post number.
-		if ( $q['attachment_id'] )
-			$q['p'] = absint($q['attachment_id']);
+		if ( $q['attachment_id'] ) {
+			$q['p'] = absint( $q['attachment_id'] );
+		}
 
 		// If a post number is specified, load that post
 		if ( $q['p'] ) {
 			$where .= " AND {$wpdb->posts}.ID = " . $q['p'];
 		} elseif ( $q['post__in'] ) {
-			$post__in = implode(',', array_map( 'absint', $q['post__in'] ));
-			$where .= " AND {$wpdb->posts}.ID IN ($post__in)";
+			$post__in = implode( ',', array_map( 'absint', $q['post__in'] ) );
+			$where   .= " AND {$wpdb->posts}.ID IN ($post__in)";
 		} elseif ( $q['post__not_in'] ) {
-			$post__not_in = implode(',',  array_map( 'absint', $q['post__not_in'] ));
-			$where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
+			$post__not_in = implode( ',', array_map( 'absint', $q['post__not_in'] ) );
+			$where       .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
 		}
 
 		if ( is_numeric( $q['post_parent'] ) ) {
 			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_parent = %d ", $q['post_parent'] );
 		} elseif ( $q['post_parent__in'] ) {
 			$post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
-			$where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
+			$where          .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
 		} elseif ( $q['post_parent__not_in'] ) {
-			$post_parent__not_in = implode( ',',  array_map( 'absint', $q['post_parent__not_in'] ) );
-			$where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
+			$post_parent__not_in = implode( ',', array_map( 'absint', $q['post_parent__not_in'] ) );
+			$where              .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
 		}
 
 		if ( $q['page_id'] ) {
-			if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
+			if ( ( 'page' != get_option( 'show_on_front' ) ) || ( $q['page_id'] != get_option( 'page_for_posts' ) ) ) {
 				$q['p'] = $q['page_id'];
-				$where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
+				$where  = " AND {$wpdb->posts}.ID = " . $q['page_id'];
 			}
 		}
 
@@ -1957,32 +2055,34 @@ class WP_Query {
 		}
 
 		// Taxonomies
-		if ( !$this->is_singular ) {
+		if ( ! $this->is_singular ) {
 			$this->parse_tax_query( $q );
 
 			$clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
 
-			$join .= $clauses['join'];
+			$join  .= $clauses['join'];
 			$where .= $clauses['where'];
 		}
 
 		if ( $this->is_tax ) {
-			if ( empty($post_type) ) {
+			if ( empty( $post_type ) ) {
 				// Do a fully inclusive search for currently registered post types of queried taxonomies
-				$post_type = array();
+				$post_type  = array();
 				$taxonomies = array_keys( $this->tax_query->queried_terms );
 				foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
 					$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
-					if ( array_intersect( $taxonomies, $object_taxonomies ) )
+					if ( array_intersect( $taxonomies, $object_taxonomies ) ) {
 						$post_type[] = $pt;
+					}
 				}
-				if ( ! $post_type )
+				if ( ! $post_type ) {
 					$post_type = 'any';
-				elseif ( count( $post_type ) == 1 )
+				} elseif ( count( $post_type ) == 1 ) {
 					$post_type = $post_type[0];
+				}
 
 				$post_status_join = true;
-			} elseif ( in_array('attachment', (array) $post_type) ) {
+			} elseif ( in_array( 'attachment', (array) $post_type ) ) {
 				$post_status_join = true;
 			}
 		}
@@ -2043,7 +2143,7 @@ class WP_Query {
 			}
 		}
 
-		if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
+		if ( ! empty( $this->tax_query->queries ) || ! empty( $this->meta_query->queries ) ) {
 			$groupby = "{$wpdb->posts}.ID";
 		}
 
@@ -2051,38 +2151,39 @@ class WP_Query {
 
 		if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {
 			$q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
-			$authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
+			$authors     = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
 			foreach ( $authors as $author ) {
-				$key = $author > 0 ? 'author__in' : 'author__not_in';
-				$q[$key][] = abs( $author );
+				$key         = $author > 0 ? 'author__in' : 'author__not_in';
+				$q[ $key ][] = abs( $author );
 			}
 			$q['author'] = implode( ',', $authors );
 		}
 
 		if ( ! empty( $q['author__not_in'] ) ) {
 			$author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
-			$where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
+			$where         .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
 		} elseif ( ! empty( $q['author__in'] ) ) {
 			$author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
-			$where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
+			$where     .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
 		}
 
 		// Author stuff for nice URLs
 
 		if ( '' != $q['author_name'] ) {
-			if ( strpos($q['author_name'], '/') !== false ) {
-				$q['author_name'] = explode('/', $q['author_name']);
-				if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
+			if ( strpos( $q['author_name'], '/' ) !== false ) {
+				$q['author_name'] = explode( '/', $q['author_name'] );
+				if ( $q['author_name'][ count( $q['author_name'] ) - 1 ] ) {
+					$q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 1 ]; // no trailing slash
 				} else {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
+					$q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 2 ]; // there was a trailing slash
 				}
 			}
 			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
-			$q['author'] = get_user_by('slug', $q['author_name']);
-			if ( $q['author'] )
+			$q['author']      = get_user_by( 'slug', $q['author_name'] );
+			if ( $q['author'] ) {
 				$q['author'] = $q['author']->ID;
-			$whichauthor .= " AND ({$wpdb->posts}.post_author = " . absint($q['author']) . ')';
+			}
+			$whichauthor .= " AND ({$wpdb->posts}.post_author = " . absint( $q['author'] ) . ')';
 		}
 
 		// Matching by comment count.
@@ -2095,9 +2196,11 @@ class WP_Query {
 			}
 
 			if ( isset( $q['comment_count']['value'] ) ) {
-				$q['comment_count'] = array_merge( array(
-					'compare' => '=',
-				), $q['comment_count'] );
+				$q['comment_count'] = array_merge(
+					array(
+						'compare' => '=',
+					), $q['comment_count']
+				);
 
 				// Fallback for invalid compare operators is '='.
 				$compare_operators = array( '=', '!=', '>', '>=', '<', '<=' );
@@ -2189,8 +2292,9 @@ class WP_Query {
 		// Order search results by relevance only when another "orderby" is not specified in the query.
 		if ( ! empty( $q['s'] ) ) {
 			$search_orderby = '';
-			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
+			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) ) {
 				$search_orderby = $this->parse_search_order( $q );
+			}
 
 			if ( ! $q['suppress_filters'] ) {
 				/**
@@ -2204,18 +2308,21 @@ class WP_Query {
 				$search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
 			}
 
-			if ( $search_orderby )
+			if ( $search_orderby ) {
 				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			}
 		}
 
 		if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
 			$post_type_cap = 'multiple_post_type';
 		} else {
-			if ( is_array( $post_type ) )
+			if ( is_array( $post_type ) ) {
 				$post_type = reset( $post_type );
+			}
 			$post_type_object = get_post_type_object( $post_type );
-			if ( empty( $post_type_object ) )
+			if ( empty( $post_type_object ) ) {
 				$post_type_cap = $post_type;
+			}
 		}
 
 		if ( isset( $q['post_password'] ) ) {
@@ -2231,41 +2338,41 @@ class WP_Query {
 			$where .= $wpdb->prepare( " AND {$wpdb->posts}.comment_status = %s ", $q['comment_status'] );
 		}
 
-		if ( ! empty( $q['ping_status'] ) )  {
+		if ( ! empty( $q['ping_status'] ) ) {
 			$where .= $wpdb->prepare( " AND {$wpdb->posts}.ping_status = %s ", $q['ping_status'] );
 		}
 
 		if ( 'any' == $post_type ) {
-			$in_search_post_types = get_post_types( array('exclude_from_search' => false) );
+			$in_search_post_types = get_post_types( array( 'exclude_from_search' => false ) );
 			if ( empty( $in_search_post_types ) ) {
 				$where .= ' AND 1=0 ';
 			} else {
 				$where .= " AND {$wpdb->posts}.post_type IN ('" . join( "', '", array_map( 'esc_sql', $in_search_post_types ) ) . "')";
 			}
-		} elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
-			$where .= " AND {$wpdb->posts}.post_type IN ('" . join("', '", esc_sql( $post_type ) ) . "')";
+		} elseif ( ! empty( $post_type ) && is_array( $post_type ) ) {
+			$where .= " AND {$wpdb->posts}.post_type IN ('" . join( "', '", esc_sql( $post_type ) ) . "')";
 		} elseif ( ! empty( $post_type ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_type = %s", $post_type );
-			$post_type_object = get_post_type_object ( $post_type );
+			$where           .= $wpdb->prepare( " AND {$wpdb->posts}.post_type = %s", $post_type );
+			$post_type_object = get_post_type_object( $post_type );
 		} elseif ( $this->is_attachment ) {
-			$where .= " AND {$wpdb->posts}.post_type = 'attachment'";
-			$post_type_object = get_post_type_object ( 'attachment' );
+			$where           .= " AND {$wpdb->posts}.post_type = 'attachment'";
+			$post_type_object = get_post_type_object( 'attachment' );
 		} elseif ( $this->is_page ) {
-			$where .= " AND {$wpdb->posts}.post_type = 'page'";
-			$post_type_object = get_post_type_object ( 'page' );
+			$where           .= " AND {$wpdb->posts}.post_type = 'page'";
+			$post_type_object = get_post_type_object( 'page' );
 		} else {
-			$where .= " AND {$wpdb->posts}.post_type = 'post'";
-			$post_type_object = get_post_type_object ( 'post' );
+			$where           .= " AND {$wpdb->posts}.post_type = 'post'";
+			$post_type_object = get_post_type_object( 'post' );
 		}
 
 		$edit_cap = 'edit_post';
 		$read_cap = 'read_post';
 
 		if ( ! empty( $post_type_object ) ) {
-			$edit_others_cap = $post_type_object->cap->edit_others_posts;
+			$edit_others_cap  = $post_type_object->cap->edit_others_posts;
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		} else {
-			$edit_others_cap = 'edit_others_' . $post_type_cap . 's';
+			$edit_others_cap  = 'edit_others_' . $post_type_cap . 's';
 			$read_private_cap = 'read_private_' . $post_type_cap . 's';
 		}
 
@@ -2274,9 +2381,10 @@ class WP_Query {
 		$q_status = array();
 		if ( ! empty( $q['post_status'] ) ) {
 			$statuswheres = array();
-			$q_status = $q['post_status'];
-			if ( ! is_array( $q_status ) )
-				$q_status = explode(',', $q_status);
+			$q_status     = $q['post_status'];
+			if ( ! is_array( $q_status ) ) {
+				$q_status = explode( ',', $q_status );
+			}
 			$r_status = array();
 			$p_status = array();
 			$e_status = array();
@@ -2298,52 +2406,58 @@ class WP_Query {
 				}
 			}
 
-			if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
-				$r_status = array_merge($r_status, $p_status);
-				unset($p_status);
+			if ( empty( $q['perm'] ) || 'readable' != $q['perm'] ) {
+				$r_status = array_merge( $r_status, $p_status );
+				unset( $p_status );
 			}
 
-			if ( !empty($e_status) ) {
-				$statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+			if ( ! empty( $e_status ) ) {
+				$statuswheres[] = '(' . join( ' AND ', $e_status ) . ')';
 			}
-			if ( !empty($r_status) ) {
-				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) ) {
-					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
+			if ( ! empty( $r_status ) ) {
+				if ( ! empty( $q['perm'] ) && 'editable' == $q['perm'] && ! current_user_can( $edit_others_cap ) ) {
+					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . join( ' OR ', $r_status ) . '))';
 				} else {
-					$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
+					$statuswheres[] = '(' . join( ' OR ', $r_status ) . ')';
 				}
 			}
-			if ( !empty($p_status) ) {
-				if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) ) {
-					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
+			if ( ! empty( $p_status ) ) {
+				if ( ! empty( $q['perm'] ) && 'readable' == $q['perm'] && ! current_user_can( $read_private_cap ) ) {
+					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . join( ' OR ', $p_status ) . '))';
 				} else {
-					$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
+					$statuswheres[] = '(' . join( ' OR ', $p_status ) . ')';
 				}
 			}
 			if ( $post_status_join ) {
 				$join .= " LEFT JOIN {$wpdb->posts} AS p2 ON ({$wpdb->posts}.post_parent = p2.ID) ";
 				foreach ( $statuswheres as $index => $statuswhere ) {
-					$statuswheres[$index] = "($statuswhere OR ({$wpdb->posts}.post_status = 'inherit' AND " . str_replace( $wpdb->posts, 'p2', $statuswhere ) . "))";
+					$statuswheres[ $index ] = "($statuswhere OR ({$wpdb->posts}.post_status = 'inherit' AND " . str_replace( $wpdb->posts, 'p2', $statuswhere ) . '))';
 				}
 			}
 			$where_status = implode( ' OR ', $statuswheres );
 			if ( ! empty( $where_status ) ) {
 				$where .= " AND ($where_status)";
 			}
-		} elseif ( !$this->is_singular ) {
+		} elseif ( ! $this->is_singular ) {
 			$where .= " AND ({$wpdb->posts}.post_status = 'publish'";
 
 			// Add public states.
-			$public_states = get_post_stati( array('public' => true) );
+			$public_states = get_post_stati( array( 'public' => true ) );
 			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+				if ( 'publish' == $state ) { // Publish is hard-coded above.
 					continue;
+				}
 				$where .= " OR {$wpdb->posts}.post_status = '$state'";
 			}
 
 			if ( $this->is_admin ) {
 				// Add protected states that should show in the admin all list.
-				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
+				$admin_all_states = get_post_stati(
+					array(
+						'protected'              => true,
+						'show_in_admin_all_list' => true,
+					)
+				);
 				foreach ( (array) $admin_all_states as $state ) {
 					$where .= " OR {$wpdb->posts}.post_status = '$state'";
 				}
@@ -2351,7 +2465,7 @@ class WP_Query {
 
 			if ( is_user_logged_in() ) {
 				// Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
-				$private_states = get_post_stati( array('private' => true) );
+				$private_states = get_post_stati( array( 'private' => true ) );
 				foreach ( (array) $private_states as $state ) {
 					$where .= current_user_can( $read_private_cap ) ? " OR {$wpdb->posts}.post_status = '$state'" : " OR {$wpdb->posts}.post_author = $user_id AND {$wpdb->posts}.post_status = '$state'";
 				}
@@ -2364,7 +2478,7 @@ class WP_Query {
 		 * Apply filters on where and join prior to paging so that any
 		 * manipulations to them are reflected in the paging by day queries.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters'] ) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2387,15 +2501,16 @@ class WP_Query {
 		}
 
 		// Paging
-		if ( empty($q['nopaging']) && !$this->is_singular ) {
-			$page = absint($q['paged']);
-			if ( !$page )
+		if ( empty( $q['nopaging'] ) && ! $this->is_singular ) {
+			$page = absint( $q['paged'] );
+			if ( ! $page ) {
 				$page = 1;
+			}
 
 			// If 'offset' is provided, it takes precedence over 'paged'.
 			if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) {
 				$q['offset'] = absint( $q['offset'] );
-				$pgstrt = $q['offset'] . ', ';
+				$pgstrt      = $q['offset'] . ', ';
 			} else {
 				$pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', ';
 			}
@@ -2405,16 +2520,16 @@ class WP_Query {
 		// Comments feeds
 		if ( $this->is_comment_feed && ! $this->is_singular ) {
 			if ( $this->is_archive || $this->is_search ) {
-				$cjoin = "JOIN {$wpdb->posts} ON ({$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID) $join ";
-				$cwhere = "WHERE comment_approved = '1' $where";
+				$cjoin    = "JOIN {$wpdb->posts} ON ({$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID) $join ";
+				$cwhere   = "WHERE comment_approved = '1' $where";
 				$cgroupby = "{$wpdb->comments}.comment_id";
 			} else { // Other non singular e.g. front
-				$cjoin = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID )";
-				$cwhere = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1'";
+				$cjoin    = "JOIN {$wpdb->posts} ON ( {$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID )";
+				$cwhere   = "WHERE ( post_status = 'publish' OR ( post_status = 'inherit' AND post_type = 'attachment' ) ) AND comment_approved = '1'";
 				$cgroupby = '';
 			}
 
-			if ( !$q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters'] ) {
 				/**
 				 * Filters the JOIN clause of the comments feed query before sending.
 				 *
@@ -2463,27 +2578,28 @@ class WP_Query {
 				 * @param string   $climits The JOIN clause of the query.
 				 * @param WP_Query $this    The WP_Query instance (passed by reference).
 				 */
-				$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+				$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option( 'posts_per_rss' ), &$this ) );
 			}
 			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
 			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
 
-			$comments = (array) $wpdb->get_results("SELECT $distinct {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits");
+			$comments = (array) $wpdb->get_results( "SELECT $distinct {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits" );
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
-			$this->comment_count = count($this->comments);
+			$this->comments      = array_map( 'get_comment', $comments );
+			$this->comment_count = count( $this->comments );
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
+			foreach ( $this->comments as $comment ) {
 				$post_ids[] = (int) $comment->comment_post_ID;
+			}
 
-			$post_ids = join(',', $post_ids);
-			$join = '';
+			$post_ids = join( ',', $post_ids );
+			$join     = '';
 			if ( $post_ids ) {
 				$where = "AND {$wpdb->posts}.ID IN ($post_ids) ";
 			} else {
-				$where = "AND 0";
+				$where = 'AND 0';
 			}
 		}
 
@@ -2493,7 +2609,7 @@ class WP_Query {
 		 * Apply post-paging filters on where and join. Only plugins that
 		 * manipulate paging queries should use these hooks.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters'] ) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2581,13 +2697,13 @@ class WP_Query {
 			 */
 			$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
 
-			$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-			$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
-			$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-			$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-			$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-			$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+			$where    = isset( $clauses['where'] ) ? $clauses['where'] : '';
+			$groupby  = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
+			$join     = isset( $clauses['join'] ) ? $clauses['join'] : '';
+			$orderby  = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
+			$distinct = isset( $clauses['distinct'] ) ? $clauses['distinct'] : '';
+			$fields   = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
+			$limits   = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
 		}
 
 		/**
@@ -2605,7 +2721,7 @@ class WP_Query {
 		 * Filters again for the benefit of caching plugins.
 		 * Regular plugins should use the hooks above.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters'] ) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2705,27 +2821,30 @@ class WP_Query {
 			 */
 			$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
 
-			$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-			$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
-			$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-			$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-			$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-			$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+			$where    = isset( $clauses['where'] ) ? $clauses['where'] : '';
+			$groupby  = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
+			$join     = isset( $clauses['join'] ) ? $clauses['join'] : '';
+			$orderby  = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
+			$distinct = isset( $clauses['distinct'] ) ? $clauses['distinct'] : '';
+			$fields   = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
+			$limits   = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
 		}
 
-		if ( ! empty($groupby) )
+		if ( ! empty( $groupby ) ) {
 			$groupby = 'GROUP BY ' . $groupby;
-		if ( !empty( $orderby ) )
+		}
+		if ( ! empty( $orderby ) ) {
 			$orderby = 'ORDER BY ' . $orderby;
+		}
 
 		$found_rows = '';
-		if ( !$q['no_found_rows'] && !empty($limits) )
+		if ( ! $q['no_found_rows'] && ! empty( $limits ) ) {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
+		}
 
 		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
 
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters'] ) {
 			/**
 			 * Filters the completed SQL query before sending.
 			 *
@@ -2760,7 +2879,7 @@ class WP_Query {
 				$this->posts = $wpdb->get_col( $this->request );
 			}
 
-			$this->posts = array_map( 'intval', $this->posts );
+			$this->posts      = array_map( 'intval', $this->posts );
 			$this->post_count = count( $this->posts );
 			$this->set_found_posts( $q, $limits );
 
@@ -2777,7 +2896,7 @@ class WP_Query {
 
 			$r = array();
 			foreach ( $this->posts as $key => $post ) {
-				$this->posts[ $key ]->ID = (int) $post->ID;
+				$this->posts[ $key ]->ID          = (int) $post->ID;
 				$this->posts[ $key ]->post_parent = (int) $post->post_parent;
 
 				$r[ (int) $post->ID ] = (int) $post->post_parent;
@@ -2787,7 +2906,7 @@ class WP_Query {
 		}
 
 		if ( null === $this->posts ) {
-			$split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
+			$split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" == $fields && ! empty( $limits ) && $q['posts_per_page'] < 500 );
 
 			/**
 			 * Filters whether to split the query.
@@ -2850,7 +2969,7 @@ class WP_Query {
 			$this->posts = apply_filters_ref_array( 'posts_results', array( $this->posts, &$this ) );
 		}
 
-		if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
+		if ( ! empty( $this->posts ) && $this->is_comment_feed && $this->is_singular ) {
 			/** This filter is documented in wp-includes/query.php */
 			$cjoin = apply_filters_ref_array( 'comment_feed_join', array( '', &$this ) );
 
@@ -2866,44 +2985,46 @@ class WP_Query {
 			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
 
 			/** This filter is documented in wp-includes/query.php */
-			$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+			$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option( 'posts_per_rss' ), &$this ) );
 
 			$comments_request = "SELECT {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits";
-			$comments = $wpdb->get_results($comments_request);
+			$comments         = $wpdb->get_results( $comments_request );
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
-			$this->comment_count = count($this->comments);
+			$this->comments      = array_map( 'get_comment', $comments );
+			$this->comment_count = count( $this->comments );
 		}
 
 		// Check post status to determine if post should be displayed.
-		if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
-			$status = get_post_status($this->posts[0]);
+		if ( ! empty( $this->posts ) && ( $this->is_single || $this->is_page ) ) {
+			$status = get_post_status( $this->posts[0] );
 			if ( 'attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent ) {
-				$this->is_page = false;
-				$this->is_single = true;
+				$this->is_page       = false;
+				$this->is_single     = true;
 				$this->is_attachment = true;
 			}
-			$post_status_obj = get_post_status_object($status);
+			$post_status_obj = get_post_status_object( $status );
 
 			// If the post_status was specifically requested, let it pass through.
-			if ( !$post_status_obj->public && ! in_array( $status, $q_status ) ) {
+			if ( ! $post_status_obj->public && ! in_array( $status, $q_status ) ) {
 
 				if ( ! is_user_logged_in() ) {
 					// User must be logged in to view unpublished posts.
 					$this->posts = array();
 				} else {
-					if  ( $post_status_obj->protected ) {
+					if ( $post_status_obj->protected ) {
 						// User must have edit permissions on the draft to preview.
-						if ( ! current_user_can($edit_cap, $this->posts[0]->ID) ) {
+						if ( ! current_user_can( $edit_cap, $this->posts[0]->ID ) ) {
 							$this->posts = array();
 						} else {
 							$this->is_preview = true;
-							if ( 'future' != $status )
-								$this->posts[0]->post_date = current_time('mysql');
+							if ( 'future' != $status ) {
+								$this->posts[0]->post_date = current_time( 'mysql' );
+							}
 						}
 					} elseif ( $post_status_obj->private ) {
-						if ( ! current_user_can($read_cap, $this->posts[0]->ID) )
+						if ( ! current_user_can( $read_cap, $this->posts[0]->ID ) ) {
 							$this->posts = array();
+						}
 					} else {
 						$this->posts = array();
 					}
@@ -2924,38 +3045,41 @@ class WP_Query {
 		}
 
 		// Put sticky posts at the top of the posts array
-		$sticky_posts = get_option('sticky_posts');
-		if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_sticky_posts'] ) {
-			$num_posts = count($this->posts);
+		$sticky_posts = get_option( 'sticky_posts' );
+		if ( $this->is_home && $page <= 1 && is_array( $sticky_posts ) && ! empty( $sticky_posts ) && ! $q['ignore_sticky_posts'] ) {
+			$num_posts     = count( $this->posts );
 			$sticky_offset = 0;
 			// Loop over posts and relocate stickies to the front.
 			for ( $i = 0; $i < $num_posts; $i++ ) {
-				if ( in_array($this->posts[$i]->ID, $sticky_posts) ) {
-					$sticky_post = $this->posts[$i];
+				if ( in_array( $this->posts[ $i ]->ID, $sticky_posts ) ) {
+					$sticky_post = $this->posts[ $i ];
 					// Remove sticky from current position
-					array_splice($this->posts, $i, 1);
+					array_splice( $this->posts, $i, 1 );
 					// Move to front, after other stickies
-					array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
+					array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
 					// Increment the sticky offset. The next sticky will be placed at this offset.
 					$sticky_offset++;
 					// Remove post from sticky posts array
-					$offset = array_search($sticky_post->ID, $sticky_posts);
-					unset( $sticky_posts[$offset] );
+					$offset = array_search( $sticky_post->ID, $sticky_posts );
+					unset( $sticky_posts[ $offset ] );
 				}
 			}
 
 			// If any posts have been excluded specifically, Ignore those that are sticky.
-			if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
-				$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
+			if ( ! empty( $sticky_posts ) && ! empty( $q['post__not_in'] ) ) {
+				$sticky_posts = array_diff( $sticky_posts, $q['post__not_in'] );
+			}
 
 			// Fetch sticky posts that weren't in the query results
-			if ( !empty($sticky_posts) ) {
-				$stickies = get_posts( array(
-					'post__in' => $sticky_posts,
-					'post_type' => $post_type,
-					'post_status' => 'publish',
-					'nopaging' => true
-				) );
+			if ( ! empty( $sticky_posts ) ) {
+				$stickies = get_posts(
+					array(
+						'post__in'    => $sticky_posts,
+						'post_type'   => $post_type,
+						'post_status' => 'publish',
+						'nopaging'    => true,
+					)
+				);
 
 				foreach ( $stickies as $sticky_post ) {
 					array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
@@ -2989,13 +3113,14 @@ class WP_Query {
 
 			$this->posts = array_map( 'get_post', $this->posts );
 
-			if ( $q['cache_results'] )
-				update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
+			if ( $q['cache_results'] ) {
+				update_post_caches( $this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+			}
 
 			$this->post = reset( $this->posts );
 		} else {
 			$this->post_count = 0;
-			$this->posts = array();
+			$this->posts      = array();
 		}
 
 		if ( $q['lazy_load_term_meta'] ) {
@@ -3018,8 +3143,9 @@ class WP_Query {
 		global $wpdb;
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
+		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) ) {
 			return;
+		}
 
 		if ( ! empty( $limits ) ) {
 			/**
@@ -3045,8 +3171,9 @@ class WP_Query {
 		 */
 		$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
 
-		if ( ! empty( $limits ) )
+		if ( ! empty( $limits ) ) {
 			$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+		}
 	}
 
 	/**
@@ -3060,7 +3187,7 @@ class WP_Query {
 
 		$this->current_post++;
 
-		$this->post = $this->posts[$this->current_post];
+		$this->post = $this->posts[ $this->current_post ];
 		return $this->post;
 	}
 
@@ -3078,7 +3205,7 @@ class WP_Query {
 		global $post;
 		$this->in_the_loop = true;
 
-		if ( $this->current_post == -1 ) // loop has just started
+		if ( $this->current_post == -1 ) { // loop has just started
 			/**
 			 * Fires once the loop is started.
 			 *
@@ -3087,6 +3214,7 @@ class WP_Query {
 			 * @param WP_Query $this The WP_Query instance (passed by reference).
 			 */
 			do_action_ref_array( 'loop_start', array( &$this ) );
+		}
 
 		$post = $this->next_post();
 		$this->setup_postdata( $post );
@@ -3152,7 +3280,7 @@ class WP_Query {
 	public function next_comment() {
 		$this->current_comment++;
 
-		$this->comment = $this->comments[$this->current_comment];
+		$this->comment = $this->comments[ $this->current_comment ];
 		return $this->comment;
 	}
 
@@ -3234,10 +3362,11 @@ class WP_Query {
 	 * @return object
 	 */
 	public function get_queried_object() {
-		if ( isset($this->queried_object) )
+		if ( isset( $this->queried_object ) ) {
 			return $this->queried_object;
+		}
 
-		$this->queried_object = null;
+		$this->queried_object    = null;
 		$this->queried_object_id = null;
 
 		if ( $this->is_category || $this->is_tag || $this->is_tax ) {
@@ -3257,8 +3386,8 @@ class WP_Query {
 				// For other tax queries, grab the first term from the first clause.
 				if ( ! empty( $this->tax_query->queried_terms ) ) {
 					$queried_taxonomies = array_keys( $this->tax_query->queried_terms );
-					$matched_taxonomy = reset( $queried_taxonomies );
-					$query = $this->tax_query->queried_terms[ $matched_taxonomy ];
+					$matched_taxonomy   = reset( $queried_taxonomies );
+					$query              = $this->tax_query->queried_terms[ $matched_taxonomy ];
 
 					if ( ! empty( $query['terms'] ) ) {
 						if ( 'term_id' == $query['field'] ) {
@@ -3270,28 +3399,30 @@ class WP_Query {
 				}
 			}
 
-			if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
-				$this->queried_object = $term;
+			if ( ! empty( $term ) && ! is_wp_error( $term ) ) {
+				$this->queried_object    = $term;
 				$this->queried_object_id = (int) $term->term_id;
 
-				if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
+				if ( $this->is_category && 'category' === $this->queried_object->taxonomy ) {
 					_make_cat_compat( $this->queried_object );
+				}
 			}
 		} elseif ( $this->is_post_type_archive ) {
 			$post_type = $this->get( 'post_type' );
-			if ( is_array( $post_type ) )
+			if ( is_array( $post_type ) ) {
 				$post_type = reset( $post_type );
+			}
 			$this->queried_object = get_post_type_object( $post_type );
 		} elseif ( $this->is_posts_page ) {
-			$page_for_posts = get_option('page_for_posts');
-			$this->queried_object = get_post( $page_for_posts );
+			$page_for_posts          = get_option( 'page_for_posts' );
+			$this->queried_object    = get_post( $page_for_posts );
 			$this->queried_object_id = (int) $this->queried_object->ID;
 		} elseif ( $this->is_singular && ! empty( $this->post ) ) {
-			$this->queried_object = $this->post;
+			$this->queried_object    = $this->post;
 			$this->queried_object_id = (int) $this->post->ID;
 		} elseif ( $this->is_author ) {
-			$this->queried_object_id = (int) $this->get('author');
-			$this->queried_object = get_userdata( $this->queried_object_id );
+			$this->queried_object_id = (int) $this->get( 'author' );
+			$this->queried_object    = get_userdata( $this->queried_object_id );
 		}
 
 		return $this->queried_object;
@@ -3307,7 +3438,7 @@ class WP_Query {
 	public function get_queried_object_id() {
 		$this->get_queried_object();
 
-		if ( isset($this->queried_object_id) ) {
+		if ( isset( $this->queried_object_id ) ) {
 			return $this->queried_object_id;
 		}
 
@@ -3374,14 +3505,14 @@ class WP_Query {
 	}
 
 	/**
- 	 * Is the query for an existing archive page?
- 	 *
- 	 * Month, Year, Category, Author, Post Type archive...
+	 * Is the query for an existing archive page?
 	 *
- 	 * @since 3.1.0
- 	 *
- 	 * @return bool
- 	 */
+	 * Month, Year, Category, Author, Post Type archive...
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
 	public function is_archive() {
 		return (bool) $this->is_archive;
 	}
@@ -3395,12 +3526,14 @@ class WP_Query {
 	 * @return bool
 	 */
 	public function is_post_type_archive( $post_types = '' ) {
-		if ( empty( $post_types ) || ! $this->is_post_type_archive )
+		if ( empty( $post_types ) || ! $this->is_post_type_archive ) {
 			return (bool) $this->is_post_type_archive;
+		}
 
 		$post_type = $this->get( 'post_type' );
-		if ( is_array( $post_type ) )
+		if ( is_array( $post_type ) ) {
 			$post_type = reset( $post_type );
+		}
 		$post_type_object = get_post_type_object( $post_type );
 
 		return in_array( $post_type_object->name, (array) $post_types );
@@ -3449,22 +3582,25 @@ class WP_Query {
 	 * @return bool
 	 */
 	public function is_author( $author = '' ) {
-		if ( !$this->is_author )
+		if ( ! $this->is_author ) {
 			return false;
+		}
 
-		if ( empty($author) )
+		if ( empty( $author ) ) {
 			return true;
+		}
 
 		$author_obj = $this->get_queried_object();
 
 		$author = array_map( 'strval', (array) $author );
 
-		if ( in_array( (string) $author_obj->ID, $author ) )
+		if ( in_array( (string) $author_obj->ID, $author ) ) {
 			return true;
-		elseif ( in_array( $author_obj->nickname, $author ) )
+		} elseif ( in_array( $author_obj->nickname, $author ) ) {
 			return true;
-		elseif ( in_array( $author_obj->user_nicename, $author ) )
+		} elseif ( in_array( $author_obj->user_nicename, $author ) ) {
 			return true;
+		}
 
 		return false;
 	}
@@ -3481,22 +3617,25 @@ class WP_Query {
 	 * @return bool
 	 */
 	public function is_category( $category = '' ) {
-		if ( !$this->is_category )
+		if ( ! $this->is_category ) {
 			return false;
+		}
 
-		if ( empty($category) )
+		if ( empty( $category ) ) {
 			return true;
+		}
 
 		$cat_obj = $this->get_queried_object();
 
 		$category = array_map( 'strval', (array) $category );
 
-		if ( in_array( (string) $cat_obj->term_id, $category ) )
+		if ( in_array( (string) $cat_obj->term_id, $category ) ) {
 			return true;
-		elseif ( in_array( $cat_obj->name, $category ) )
+		} elseif ( in_array( $cat_obj->name, $category ) ) {
 			return true;
-		elseif ( in_array( $cat_obj->slug, $category ) )
+		} elseif ( in_array( $cat_obj->slug, $category ) ) {
 			return true;
+		}
 
 		return false;
 	}
@@ -3513,22 +3652,25 @@ class WP_Query {
 	 * @return bool
 	 */
 	public function is_tag( $tag = '' ) {
-		if ( ! $this->is_tag )
+		if ( ! $this->is_tag ) {
 			return false;
+		}
 
-		if ( empty( $tag ) )
+		if ( empty( $tag ) ) {
 			return true;
+		}
 
 		$tag_obj = $this->get_queried_object();
 
 		$tag = array_map( 'strval', (array) $tag );
 
-		if ( in_array( (string) $tag_obj->term_id, $tag ) )
+		if ( in_array( (string) $tag_obj->term_id, $tag ) ) {
 			return true;
-		elseif ( in_array( $tag_obj->name, $tag ) )
+		} elseif ( in_array( $tag_obj->name, $tag ) ) {
 			return true;
-		elseif ( in_array( $tag_obj->slug, $tag ) )
+		} elseif ( in_array( $tag_obj->slug, $tag ) ) {
 			return true;
+		}
 
 		return false;
 	}
@@ -3554,29 +3696,35 @@ class WP_Query {
 	public function is_tax( $taxonomy = '', $term = '' ) {
 		global $wp_taxonomies;
 
-		if ( !$this->is_tax )
+		if ( ! $this->is_tax ) {
 			return false;
+		}
 
-		if ( empty( $taxonomy ) )
+		if ( empty( $taxonomy ) ) {
 			return true;
+		}
 
 		$queried_object = $this->get_queried_object();
-		$tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
-		$term_array = (array) $term;
+		$tax_array      = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
+		$term_array     = (array) $term;
 
 		// Check that the taxonomy matches.
-		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
+		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) ) {
 			return false;
+		}
 
 		// Only a Taxonomy provided.
-		if ( empty( $term ) )
+		if ( empty( $term ) ) {
 			return true;
+		}
 
 		return isset( $queried_object->term_id ) &&
-			count( array_intersect(
-				array( $queried_object->term_id, $queried_object->name, $queried_object->slug ),
-				$term_array
-			) );
+			count(
+				array_intersect(
+					array( $queried_object->term_id, $queried_object->name, $queried_object->slug ),
+					$term_array
+				)
+			);
 	}
 
 	/**
@@ -3624,11 +3772,13 @@ class WP_Query {
 	 * @return bool
 	 */
 	public function is_feed( $feeds = '' ) {
-		if ( empty( $feeds ) || ! $this->is_feed )
+		if ( empty( $feeds ) || ! $this->is_feed ) {
 			return (bool) $this->is_feed;
+		}
 		$qv = $this->get( 'feed' );
-		if ( 'feed' == $qv )
+		if ( 'feed' == $qv ) {
 			$qv = get_default_feed();
+		}
 		return in_array( $qv, (array) $feeds );
 	}
 
@@ -3661,12 +3811,13 @@ class WP_Query {
 	 */
 	public function is_front_page() {
 		// most likely case
-		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() )
+		if ( 'posts' == get_option( 'show_on_front' ) && $this->is_home() ) {
 			return true;
-		elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) )
+		} elseif ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) ) {
 			return true;
-		else
+		} else {
 			return false;
+		}
 	}
 
 	/**
@@ -3715,11 +3866,13 @@ class WP_Query {
 	 * @return bool Whether the query is for an existing single page.
 	 */
 	public function is_page( $page = '' ) {
-		if ( !$this->is_page )
+		if ( ! $this->is_page ) {
 			return false;
+		}
 
-		if ( empty( $page ) )
+		if ( empty( $page ) ) {
 			return true;
+		}
 
 		$page_obj = $this->get_queried_object();
 
@@ -3808,11 +3961,13 @@ class WP_Query {
 	 * @return bool Whether the query is for an existing single post.
 	 */
 	public function is_single( $post = '' ) {
-		if ( !$this->is_single )
+		if ( ! $this->is_single ) {
 			return false;
+		}
 
-		if ( empty($post) )
+		if ( empty( $post ) ) {
 			return true;
+		}
 
 		$post_obj = $this->get_queried_object();
 
@@ -3855,8 +4010,9 @@ class WP_Query {
 	 * @return bool Whether the query is for an existing single post of any of the given post types.
 	 */
 	public function is_singular( $post_types = '' ) {
-		if ( empty( $post_types ) || !$this->is_singular )
+		if ( empty( $post_types ) || ! $this->is_singular ) {
 			return (bool) $this->is_singular;
+		}
 
 		$post_obj = $this->get_queried_object();
 
@@ -3964,15 +4120,16 @@ class WP_Query {
 
 		$id = (int) $post->ID;
 
-		$authordata = get_userdata($post->post_author);
+		$authordata = get_userdata( $post->post_author );
 
-		$currentday = mysql2date('d.m.y', $post->post_date, false);
-		$currentmonth = mysql2date('m', $post->post_date, false);
-		$numpages = 1;
-		$multipage = 0;
-		$page = $this->get( 'page' );
-		if ( ! $page )
+		$currentday   = mysql2date( 'd.m.y', $post->post_date, false );
+		$currentmonth = mysql2date( 'm', $post->post_date, false );
+		$numpages     = 1;
+		$multipage    = 0;
+		$page         = $this->get( 'page' );
+		if ( ! $page ) {
 			$page = 1;
+		}
 
 		/*
 		 * Force full post content when viewing the permalink for the $post,
@@ -3993,10 +4150,11 @@ class WP_Query {
 			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
 
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) )
+			if ( 0 === strpos( $content, '<!--nextpage-->' ) ) {
 				$content = substr( $content, 15 );
+			}
 
-			$pages = explode('<!--nextpage-->', $content);
+			$pages = explode( '<!--nextpage-->', $content );
 		} else {
 			$pages = array( $post->post_content );
 		}
@@ -4023,8 +4181,8 @@ class WP_Query {
 			}
 			$multipage = 1;
 		} else {
-	 		$multipage = 0;
-	 	}
+			$multipage = 0;
+		}
 
 		/**
 		 * Fires once the post data has been setup.
diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php
index bb3161ed50..337a811c03 100644
--- a/wp-includes/class-wp-rewrite.php
+++ b/wp-includes/class-wp-rewrite.php
@@ -288,7 +288,7 @@ class WP_Rewrite {
 		'%post_id%',
 		'%author%',
 		'%pagename%',
-		'%search%'
+		'%search%',
 	);
 
 	/**
@@ -309,7 +309,7 @@ class WP_Rewrite {
 		'([0-9]+)',
 		'([^/]+)',
 		'([^/]+?)',
-		'(.+)'
+		'(.+)',
 	);
 
 	/**
@@ -329,7 +329,7 @@ class WP_Rewrite {
 		'p=',
 		'author_name=',
 		'pagename=',
-		's='
+		's=',
 	);
 
 	/**
@@ -350,7 +350,7 @@ class WP_Rewrite {
 	 * @return bool True, if permalinks are enabled.
 	 */
 	public function using_permalinks() {
-		return ! empty($this->permalink_structure);
+		return ! empty( $this->permalink_structure );
 	}
 
 	/**
@@ -399,11 +399,11 @@ class WP_Rewrite {
 	 * @param int $number Index number.
 	 * @return string
 	 */
-	public function preg_index($number) {
+	public function preg_index( $number ) {
 		$match_prefix = '$';
 		$match_suffix = '';
 
-		if ( ! empty($this->matches) ) {
+		if ( ! empty( $this->matches ) ) {
 			$match_prefix = '$' . $this->matches . '[';
 			$match_suffix = ']';
 		}
@@ -427,31 +427,32 @@ class WP_Rewrite {
 		global $wpdb;
 
 		// Get pages in order of hierarchy, i.e. children after parents.
-		$pages = $wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'");
+		$pages = $wpdb->get_results( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page' AND post_status != 'auto-draft'" );
 		$posts = get_page_hierarchy( $pages );
 
 		// If we have no pages get out quick.
-		if ( !$posts )
+		if ( ! $posts ) {
 			return array( array(), array() );
+		}
 
 		// Now reverse it, because we need parents after children for rewrite rules to work properly.
-		$posts = array_reverse($posts, true);
+		$posts = array_reverse( $posts, true );
 
-		$page_uris = array();
+		$page_uris            = array();
 		$page_attachment_uris = array();
 
 		foreach ( $posts as $id => $post ) {
 			// URL => page name
-			$uri = get_page_uri($id);
-			$attachments = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id ));
-			if ( !empty($attachments) ) {
+			$uri         = get_page_uri( $id );
+			$attachments = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'attachment' AND post_parent = %d", $id ) );
+			if ( ! empty( $attachments ) ) {
 				foreach ( $attachments as $attachment ) {
-					$attach_uri = get_page_uri($attachment->ID);
-					$page_attachment_uris[$attach_uri] = $attachment->ID;
+					$attach_uri                          = get_page_uri( $attachment->ID );
+					$page_attachment_uris[ $attach_uri ] = $attachment->ID;
 				}
 			}
 
-			$page_uris[$uri] = $id;
+			$page_uris[ $uri ] = $id;
 		}
 
 		return array( $page_uris, $page_attachment_uris );
@@ -491,39 +492,41 @@ class WP_Rewrite {
 	 * @return string|false False on no permalink structure. Date permalink structure.
 	 */
 	public function get_date_permastruct() {
-		if ( isset($this->date_structure) )
+		if ( isset( $this->date_structure ) ) {
 			return $this->date_structure;
+		}
 
-		if ( empty($this->permalink_structure) ) {
+		if ( empty( $this->permalink_structure ) ) {
 			$this->date_structure = '';
 			return false;
 		}
 
 		// The date permalink must have year, month, and day separated by slashes.
-		$endians = array('%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%');
+		$endians = array( '%year%/%monthnum%/%day%', '%day%/%monthnum%/%year%', '%monthnum%/%day%/%year%' );
 
 		$this->date_structure = '';
-		$date_endian = '';
+		$date_endian          = '';
 
 		foreach ( $endians as $endian ) {
-			if ( false !== strpos($this->permalink_structure, $endian) ) {
-				$date_endian= $endian;
+			if ( false !== strpos( $this->permalink_structure, $endian ) ) {
+				$date_endian = $endian;
 				break;
 			}
 		}
 
-		if ( empty($date_endian) )
+		if ( empty( $date_endian ) ) {
 			$date_endian = '%year%/%monthnum%/%day%';
+		}
 
 		/*
 		 * Do not allow the date tags and %post_id% to overlap in the permalink
 		 * structure. If they do, move the date tags to $front/date/.
 		 */
 		$front = $this->front;
-		preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
+		preg_match_all( '/%.+?%/', $this->permalink_structure, $tokens );
 		$tok_index = 1;
-		foreach ( (array) $tokens[0] as $token) {
-			if ( '%post_id%' == $token && ($tok_index <= 3) ) {
+		foreach ( (array) $tokens[0] as $token ) {
+			if ( '%post_id%' == $token && ( $tok_index <= 3 ) ) {
 				$front = $front . 'date/';
 				break;
 			}
@@ -548,12 +551,13 @@ class WP_Rewrite {
 	public function get_year_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if ( empty( $structure ) ) {
 			return false;
+		}
 
-		$structure = str_replace('%monthnum%', '', $structure);
-		$structure = str_replace('%day%', '', $structure);
-		$structure = preg_replace('#/+#', '/', $structure);
+		$structure = str_replace( '%monthnum%', '', $structure );
+		$structure = str_replace( '%day%', '', $structure );
+		$structure = preg_replace( '#/+#', '/', $structure );
 
 		return $structure;
 	}
@@ -571,11 +575,12 @@ class WP_Rewrite {
 	public function get_month_permastruct() {
 		$structure = $this->get_date_permastruct();
 
-		if ( empty($structure) )
+		if ( empty( $structure ) ) {
 			return false;
+		}
 
-		$structure = str_replace('%day%', '', $structure);
-		$structure = preg_replace('#/+#', '/', $structure);
+		$structure = str_replace( '%day%', '', $structure );
+		$structure = preg_replace( '#/+#', '/', $structure );
 
 		return $structure;
 	}
@@ -606,7 +611,7 @@ class WP_Rewrite {
 	 * @return string|false False on failure. Category permalink structure.
 	 */
 	public function get_category_permastruct() {
-		return $this->get_extra_permastruct('category');
+		return $this->get_extra_permastruct( 'category' );
 	}
 
 	/**
@@ -622,7 +627,7 @@ class WP_Rewrite {
 	 * @return string|false False on failure. Tag permalink structure.
 	 */
 	public function get_tag_permastruct() {
-		return $this->get_extra_permastruct('post_tag');
+		return $this->get_extra_permastruct( 'post_tag' );
 	}
 
 	/**
@@ -633,12 +638,14 @@ class WP_Rewrite {
 	 * @param string $name Permalink structure name.
 	 * @return string|false False if not found. Permalink structure string.
 	 */
-	public function get_extra_permastruct($name) {
-		if ( empty($this->permalink_structure) )
+	public function get_extra_permastruct( $name ) {
+		if ( empty( $this->permalink_structure ) ) {
 			return false;
+		}
 
-		if ( isset($this->extra_permastructs[$name]) )
-			return $this->extra_permastructs[$name]['struct'];
+		if ( isset( $this->extra_permastructs[ $name ] ) ) {
+			return $this->extra_permastructs[ $name ]['struct'];
+		}
 
 		return false;
 	}
@@ -655,10 +662,11 @@ class WP_Rewrite {
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_author_permastruct() {
-		if ( isset($this->author_structure) )
+		if ( isset( $this->author_structure ) ) {
 			return $this->author_structure;
+		}
 
-		if ( empty($this->permalink_structure) ) {
+		if ( empty( $this->permalink_structure ) ) {
 			$this->author_structure = '';
 			return false;
 		}
@@ -680,10 +688,11 @@ class WP_Rewrite {
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_search_permastruct() {
-		if ( isset($this->search_structure) )
+		if ( isset( $this->search_structure ) ) {
 			return $this->search_structure;
+		}
 
-		if ( empty($this->permalink_structure) ) {
+		if ( empty( $this->permalink_structure ) ) {
 			$this->search_structure = '';
 			return false;
 		}
@@ -705,10 +714,11 @@ class WP_Rewrite {
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_page_permastruct() {
-		if ( isset($this->page_structure) )
+		if ( isset( $this->page_structure ) ) {
 			return $this->page_structure;
+		}
 
-		if (empty($this->permalink_structure)) {
+		if ( empty( $this->permalink_structure ) ) {
 			$this->page_structure = '';
 			return false;
 		}
@@ -730,10 +740,11 @@ class WP_Rewrite {
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_feed_permastruct() {
-		if ( isset($this->feed_structure) )
+		if ( isset( $this->feed_structure ) ) {
 			return $this->feed_structure;
+		}
 
-		if ( empty($this->permalink_structure) ) {
+		if ( empty( $this->permalink_structure ) ) {
 			$this->feed_structure = '';
 			return false;
 		}
@@ -755,10 +766,11 @@ class WP_Rewrite {
 	 * @return string|false False if not found. Permalink structure string.
 	 */
 	public function get_comment_feed_permastruct() {
-		if ( isset($this->comment_feed_structure) )
+		if ( isset( $this->comment_feed_structure ) ) {
 			return $this->comment_feed_structure;
+		}
 
-		if (empty($this->permalink_structure)) {
+		if ( empty( $this->permalink_structure ) ) {
 			$this->comment_feed_structure = '';
 			return false;
 		}
@@ -788,11 +800,11 @@ class WP_Rewrite {
 		$position = array_search( $tag, $this->rewritecode );
 		if ( false !== $position && null !== $position ) {
 			$this->rewritereplace[ $position ] = $regex;
-			$this->queryreplace[ $position ] = $query;
+			$this->queryreplace[ $position ]   = $query;
 		} else {
-			$this->rewritecode[] = $tag;
+			$this->rewritecode[]    = $tag;
 			$this->rewritereplace[] = $regex;
-			$this->queryreplace[] = $query;
+			$this->queryreplace[]   = $query;
 		}
 	}
 
@@ -844,12 +856,13 @@ class WP_Rewrite {
 	 *                                    Default true.
 	 * @return array Rewrite rule list.
 	 */
-	public function generate_rewrite_rules($permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true) {
+	public function generate_rewrite_rules( $permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true ) {
 		// Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
 		$feedregex2 = '';
-		foreach ( (array) $this->feeds as $feed_name)
+		foreach ( (array) $this->feeds as $feed_name ) {
 			$feedregex2 .= $feed_name . '|';
-		$feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
+		}
+		$feedregex2 = '(' . trim( $feedregex2, '|' ) . ')/?$';
 
 		/*
 		 * $feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
@@ -859,35 +872,35 @@ class WP_Rewrite {
 
 		// Build a regex to match the trackback and page/xx parts of URLs.
 		$trackbackregex = 'trackback/?$';
-		$pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
-		$commentregex = $this->comments_pagination_base . '-([0-9]{1,})/?$';
-		$embedregex = 'embed/?$';
+		$pageregex      = $this->pagination_base . '/?([0-9]{1,})/?$';
+		$commentregex   = $this->comments_pagination_base . '-([0-9]{1,})/?$';
+		$embedregex     = 'embed/?$';
 
 		// Build up an array of endpoint regexes to append => queries to append.
 		if ( $endpoints ) {
-			$ep_query_append = array ();
-			foreach ( (array) $this->endpoints as $endpoint) {
+			$ep_query_append = array();
+			foreach ( (array) $this->endpoints as $endpoint ) {
 				// Match everything after the endpoint name, but allow for nothing to appear there.
 				$epmatch = $endpoint[1] . '(/(.*))?/?$';
 
 				// This will be appended on to the rest of the query for each dir.
-				$epquery = '&' . $endpoint[2] . '=';
-				$ep_query_append[$epmatch] = array ( $endpoint[0], $epquery );
+				$epquery                     = '&' . $endpoint[2] . '=';
+				$ep_query_append[ $epmatch ] = array( $endpoint[0], $epquery );
 			}
 		}
 
 		// Get everything up to the first rewrite tag.
-		$front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));
+		$front = substr( $permalink_structure, 0, strpos( $permalink_structure, '%' ) );
 
 		// Build an array of the tags (note that said array ends up being in $tokens[0]).
-		preg_match_all('/%.+?%/', $permalink_structure, $tokens);
+		preg_match_all( '/%.+?%/', $permalink_structure, $tokens );
 
-		$num_tokens = count($tokens[0]);
+		$num_tokens = count( $tokens[0] );
 
-		$index = $this->index; //probably 'index.php'
-		$feedindex = $index;
+		$index          = $this->index; //probably 'index.php'
+		$feedindex      = $index;
 		$trackbackindex = $index;
-		$embedindex = $index;
+		$embedindex     = $index;
 
 		/*
 		 * Build a list from the rewritecode and queryreplace arrays, that will look something
@@ -895,51 +908,53 @@ class WP_Rewrite {
 		 */
 		$queries = array();
 		for ( $i = 0; $i < $num_tokens; ++$i ) {
-			if ( 0 < $i )
-				$queries[$i] = $queries[$i - 1] . '&';
-			else
-				$queries[$i] = '';
+			if ( 0 < $i ) {
+				$queries[ $i ] = $queries[ $i - 1 ] . '&';
+			} else {
+				$queries[ $i ] = '';
+			}
 
-			$query_token = str_replace($this->rewritecode, $this->queryreplace, $tokens[0][$i]) . $this->preg_index($i+1);
-			$queries[$i] .= $query_token;
+			$query_token    = str_replace( $this->rewritecode, $this->queryreplace, $tokens[0][ $i ] ) . $this->preg_index( $i + 1 );
+			$queries[ $i ] .= $query_token;
 		}
 
 		// Get the structure, minus any cruft (stuff that isn't tags) at the front.
 		$structure = $permalink_structure;
-		if ( $front != '/' )
-			$structure = str_replace($front, '', $structure);
+		if ( $front != '/' ) {
+			$structure = str_replace( $front, '', $structure );
+		}
 
 		/*
 		 * Create a list of dirs to walk over, making rewrite rules for each level
 		 * so for example, a $structure of /%year%/%monthnum%/%postname% would create
 		 * rewrite rules for /%year%/, /%year%/%monthnum%/ and /%year%/%monthnum%/%postname%
 		 */
-		$structure = trim($structure, '/');
-		$dirs = $walk_dirs ? explode('/', $structure) : array( $structure );
-		$num_dirs = count($dirs);
+		$structure = trim( $structure, '/' );
+		$dirs      = $walk_dirs ? explode( '/', $structure ) : array( $structure );
+		$num_dirs  = count( $dirs );
 
 		// Strip slashes from the front of $front.
-		$front = preg_replace('|^/+|', '', $front);
+		$front = preg_replace( '|^/+|', '', $front );
 
 		// The main workhorse loop.
 		$post_rewrite = array();
-		$struct = $front;
+		$struct       = $front;
 		for ( $j = 0; $j < $num_dirs; ++$j ) {
 			// Get the struct for this dir, and trim slashes off the front.
-			$struct .= $dirs[$j] . '/'; // Accumulate. see comment near explode('/', $structure) above.
-			$struct = ltrim($struct, '/');
+			$struct .= $dirs[ $j ] . '/'; // Accumulate. see comment near explode('/', $structure) above.
+			$struct  = ltrim( $struct, '/' );
 
 			// Replace tags with regexes.
-			$match = str_replace($this->rewritecode, $this->rewritereplace, $struct);
+			$match = str_replace( $this->rewritecode, $this->rewritereplace, $struct );
 
 			// Make a list of tags, and store how many there are in $num_toks.
-			$num_toks = preg_match_all('/%.+?%/', $struct, $toks);
+			$num_toks = preg_match_all( '/%.+?%/', $struct, $toks );
 
 			// Get the 'tagname=$matches[i]'.
-			$query = ( ! empty( $num_toks ) && isset( $queries[$num_toks - 1] ) ) ? $queries[$num_toks - 1] : '';
+			$query = ( ! empty( $num_toks ) && isset( $queries[ $num_toks - 1 ] ) ) ? $queries[ $num_toks - 1 ] : '';
 
 			// Set up $ep_mask_specific which is used to match more specific URL types.
-			switch ( $dirs[$j] ) {
+			switch ( $dirs[ $j ] ) {
 				case '%year%':
 					$ep_mask_specific = EP_YEAR;
 					break;
@@ -955,25 +970,25 @@ class WP_Rewrite {
 
 			// Create query for /page/xx.
 			$pagematch = $match . $pageregex;
-			$pagequery = $index . '?' . $query . '&paged=' . $this->preg_index($num_toks + 1);
+			$pagequery = $index . '?' . $query . '&paged=' . $this->preg_index( $num_toks + 1 );
 
 			// Create query for /comment-page-xx.
 			$commentmatch = $match . $commentregex;
-			$commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index($num_toks + 1);
+			$commentquery = $index . '?' . $query . '&cpage=' . $this->preg_index( $num_toks + 1 );
 
-			if ( get_option('page_on_front') ) {
+			if ( get_option( 'page_on_front' ) ) {
 				// Create query for Root /comment-page-xx.
 				$rootcommentmatch = $match . $commentregex;
-				$rootcommentquery = $index . '?' . $query . '&page_id=' . get_option('page_on_front') . '&cpage=' . $this->preg_index($num_toks + 1);
+				$rootcommentquery = $index . '?' . $query . '&page_id=' . get_option( 'page_on_front' ) . '&cpage=' . $this->preg_index( $num_toks + 1 );
 			}
 
 			// Create query for /feed/(feed|atom|rss|rss2|rdf).
 			$feedmatch = $match . $feedregex;
-			$feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedquery = $feedindex . '?' . $query . '&feed=' . $this->preg_index( $num_toks + 1 );
 
 			// Create query for /(feed|atom|rss|rss2|rdf) (see comment near creation of $feedregex).
 			$feedmatch2 = $match . $feedregex2;
-			$feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index($num_toks + 1);
+			$feedquery2 = $feedindex . '?' . $query . '&feed=' . $this->preg_index( $num_toks + 1 );
 
 			// Create query and regex for embeds.
 			$embedmatch = $match . $embedregex;
@@ -981,7 +996,7 @@ class WP_Rewrite {
 
 			// If asked to, turn the feed queries into comment feed ones.
 			if ( $forcomments ) {
-				$feedquery .= '&withcomments=1';
+				$feedquery  .= '&withcomments=1';
 				$feedquery2 .= '&withcomments=1';
 			}
 
@@ -990,7 +1005,11 @@ class WP_Rewrite {
 
 			// ...adding on /feed/ regexes => queries
 			if ( $feed ) {
-				$rewrite = array( $feedmatch => $feedquery, $feedmatch2 => $feedquery2, $embedmatch => $embedquery );
+				$rewrite = array(
+					$feedmatch  => $feedquery,
+					$feedmatch2 => $feedquery2,
+					$embedmatch => $embedquery,
+				);
 			}
 
 			//...and /page/xx ones
@@ -1000,17 +1019,18 @@ class WP_Rewrite {
 
 			// Only on pages with comments add ../comment-page-xx/.
 			if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) {
-				$rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
-			} elseif ( EP_ROOT & $ep_mask && get_option('page_on_front') ) {
-				$rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery));
+				$rewrite = array_merge( $rewrite, array( $commentmatch => $commentquery ) );
+			} elseif ( EP_ROOT & $ep_mask && get_option( 'page_on_front' ) ) {
+				$rewrite = array_merge( $rewrite, array( $rootcommentmatch => $rootcommentquery ) );
 			}
 
 			// Do endpoints.
 			if ( $endpoints ) {
-				foreach ( (array) $ep_query_append as $regex => $ep) {
+				foreach ( (array) $ep_query_append as $regex => $ep ) {
 					// Add the endpoints on if the mask fits.
-					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific )
-						$rewrite[$match . $regex] = $index . '?' . $query . $ep[1] . $this->preg_index($num_toks + 2);
+					if ( $ep[0] & $ep_mask || $ep[0] & $ep_mask_specific ) {
+						$rewrite[ $match . $regex ] = $index . '?' . $query . $ep[1] . $this->preg_index( $num_toks + 2 );
+					}
 				}
 			}
 
@@ -1025,20 +1045,21 @@ class WP_Rewrite {
 				 * 2) post ID, 3) page name, 4) timestamp (year, month, day, hour, second and
 				 * minute all present). Set these flags now as we need them for the endpoints.
 				 */
-				if ( strpos($struct, '%postname%') !== false
-						|| strpos($struct, '%post_id%') !== false
-						|| strpos($struct, '%pagename%') !== false
-						|| (strpos($struct, '%year%') !== false && strpos($struct, '%monthnum%') !== false && strpos($struct, '%day%') !== false && strpos($struct, '%hour%') !== false && strpos($struct, '%minute%') !== false && strpos($struct, '%second%') !== false)
+				if ( strpos( $struct, '%postname%' ) !== false
+						|| strpos( $struct, '%post_id%' ) !== false
+						|| strpos( $struct, '%pagename%' ) !== false
+						|| ( strpos( $struct, '%year%' ) !== false && strpos( $struct, '%monthnum%' ) !== false && strpos( $struct, '%day%' ) !== false && strpos( $struct, '%hour%' ) !== false && strpos( $struct, '%minute%' ) !== false && strpos( $struct, '%second%' ) !== false )
 						) {
 					$post = true;
-					if ( strpos($struct, '%pagename%') !== false )
+					if ( strpos( $struct, '%pagename%' ) !== false ) {
 						$page = true;
+					}
 				}
 
 				if ( ! $post ) {
 					// For custom post types, we need to add on endpoints as well.
-					foreach ( get_post_types( array('_builtin' => false ) ) as $ptype ) {
-						if ( strpos($struct, "%$ptype%") !== false ) {
+					foreach ( get_post_types( array( '_builtin' => false ) ) as $ptype ) {
+						if ( strpos( $struct, "%$ptype%" ) !== false ) {
 							$post = true;
 
 							// This is for page style attachment URLs.
@@ -1059,10 +1080,10 @@ class WP_Rewrite {
 					$embedquery = $embedindex . '?' . $query . '&embed=true';
 
 					// Trim slashes from the end of the regex for this dir.
-					$match = rtrim($match, '/');
+					$match = rtrim( $match, '/' );
 
 					// Get rid of brackets.
-					$submatchbase = str_replace( array('(', ')'), '', $match);
+					$submatchbase = str_replace( array( '(', ')' ), '', $match );
 
 					// Add a rule for at attachments, which take the form of <permalink>/some-text.
 					$sub1 = $submatchbase . '/([^/]+)/';
@@ -1104,18 +1125,18 @@ class WP_Rewrite {
 					$sub2embed = $sub2 . $embedregex;
 
 					// Create queries for these extra tag-ons we've just dealt with.
-					$subquery = $index . '?attachment=' . $this->preg_index(1);
-					$subtbquery = $subquery . '&tb=1';
-					$subfeedquery = $subquery . '&feed=' . $this->preg_index(2);
-					$subcommentquery = $subquery . '&cpage=' . $this->preg_index(2);
-					$subembedquery = $subquery . '&embed=true';
+					$subquery        = $index . '?attachment=' . $this->preg_index( 1 );
+					$subtbquery      = $subquery . '&tb=1';
+					$subfeedquery    = $subquery . '&feed=' . $this->preg_index( 2 );
+					$subcommentquery = $subquery . '&cpage=' . $this->preg_index( 2 );
+					$subembedquery   = $subquery . '&embed=true';
 
 					// Do endpoints for attachments.
-					if ( !empty($endpoints) ) {
+					if ( ! empty( $endpoints ) ) {
 						foreach ( (array) $ep_query_append as $regex => $ep ) {
 							if ( $ep[0] & EP_ATTACHMENT ) {
-								$rewrite[$sub1 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
-								$rewrite[$sub2 . $regex] = $subquery . $ep[1] . $this->preg_index(3);
+								$rewrite[ $sub1 . $regex ] = $subquery . $ep[1] . $this->preg_index( 3 );
+								$rewrite[ $sub2 . $regex ] = $subquery . $ep[1] . $this->preg_index( 3 );
 							}
 						}
 					}
@@ -1134,13 +1155,13 @@ class WP_Rewrite {
 					 * When cast to int, returned 0.
 					 */
 					$match = $match . '(?:/([0-9]+))?/?$';
-					$query = $index . '?' . $query . '&page=' . $this->preg_index($num_toks + 1);
+					$query = $index . '?' . $query . '&page=' . $this->preg_index( $num_toks + 1 );
 
-				// Not matching a permalink so this is a lot simpler.
+					// Not matching a permalink so this is a lot simpler.
 				} else {
 					// Close the match and finalise the query.
 					$match .= '?$';
-					$query = $index . '?' . $query;
+					$query  = $index . '?' . $query;
 				}
 
 				/*
@@ -1148,12 +1169,12 @@ class WP_Rewrite {
 				 * only contains rules/queries for trackback, pages etc) to the main regex/query for
 				 * this dir
 				 */
-				$rewrite = array_merge($rewrite, array($match => $query));
+				$rewrite = array_merge( $rewrite, array( $match => $query ) );
 
 				// If we're matching a permalink, add those extras (attachments etc) on.
 				if ( $post ) {
 					// Add trackback.
-					$rewrite = array_merge(array($trackbackmatch => $trackbackquery), $rewrite);
+					$rewrite = array_merge( array( $trackbackmatch => $trackbackquery ), $rewrite );
 
 					// Add embed.
 					$rewrite = array_merge( array( $embedmatch => $embedquery ), $rewrite );
@@ -1161,21 +1182,32 @@ class WP_Rewrite {
 					// Add regexes/queries for attachments, attachment trackbacks and so on.
 					if ( ! $page ) {
 						// Require <permalink>/attachment/stuff form for pages because of confusion with subpages.
-						$rewrite = array_merge( $rewrite, array(
-							$sub1        => $subquery,
-							$sub1tb      => $subtbquery,
-							$sub1feed    => $subfeedquery,
-							$sub1feed2   => $subfeedquery,
-							$sub1comment => $subcommentquery,
-							$sub1embed   => $subembedquery
-						) );
+						$rewrite = array_merge(
+							$rewrite, array(
+								$sub1        => $subquery,
+								$sub1tb      => $subtbquery,
+								$sub1feed    => $subfeedquery,
+								$sub1feed2   => $subfeedquery,
+								$sub1comment => $subcommentquery,
+								$sub1embed   => $subembedquery,
+							)
+						);
 					}
 
-					$rewrite = array_merge( array( $sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery, $sub2comment => $subcommentquery, $sub2embed => $subembedquery ), $rewrite );
+					$rewrite = array_merge(
+						array(
+							$sub2        => $subquery,
+							$sub2tb      => $subtbquery,
+							$sub2feed    => $subfeedquery,
+							$sub2feed2   => $subfeedquery,
+							$sub2comment => $subcommentquery,
+							$sub2embed   => $subembedquery,
+						), $rewrite
+					);
 				}
 			}
 			// Add the rules for this dir to the accumulating $post_rewrite.
-			$post_rewrite = array_merge($rewrite, $post_rewrite);
+			$post_rewrite = array_merge( $rewrite, $post_rewrite );
 		}
 
 		// The finished rules. phew!
@@ -1197,8 +1229,8 @@ class WP_Rewrite {
 	 * @param bool   $walk_dirs           Optional, default is false. Whether to create list of directories to walk over.
 	 * @return array
 	 */
-	public function generate_rewrite_rule($permalink_structure, $walk_dirs = false) {
-		return $this->generate_rewrite_rules($permalink_structure, EP_NONE, false, false, false, $walk_dirs);
+	public function generate_rewrite_rule( $permalink_structure, $walk_dirs = false ) {
+		return $this->generate_rewrite_rules( $permalink_structure, EP_NONE, false, false, false, $walk_dirs );
 	}
 
 	/**
@@ -1221,11 +1253,12 @@ class WP_Rewrite {
 	public function rewrite_rules() {
 		$rewrite = array();
 
-		if ( empty($this->permalink_structure) )
+		if ( empty( $this->permalink_structure ) ) {
 			return $rewrite;
+		}
 
 		// robots.txt -only if installed at the root
-		$home_path = parse_url( home_url() );
+		$home_path      = parse_url( home_url() );
 		$robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
 
 		// Old feed and service files.
@@ -1237,7 +1270,7 @@ class WP_Rewrite {
 		// Registration rules.
 		$registration_pages = array();
 		if ( is_multisite() && is_main_site() ) {
-			$registration_pages['.*wp-signup.php$'] = $this->index . '?signup=true';
+			$registration_pages['.*wp-signup.php$']   = $this->index . '?signup=true';
 			$registration_pages['.*wp-activate.php$'] = $this->index . '?activate=true';
 		}
 
@@ -1257,7 +1290,7 @@ class WP_Rewrite {
 		$post_rewrite = apply_filters( 'post_rewrite_rules', $post_rewrite );
 
 		// Date rewrite rules.
-		$date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE);
+		$date_rewrite = $this->generate_rewrite_rules( $this->get_date_permastruct(), EP_DATE );
 
 		/**
 		 * Filters rewrite rules used for date archives.
@@ -1271,7 +1304,7 @@ class WP_Rewrite {
 		$date_rewrite = apply_filters( 'date_rewrite_rules', $date_rewrite );
 
 		// Root-level rewrite rules.
-		$root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT);
+		$root_rewrite = $this->generate_rewrite_rules( $this->root . '/', EP_ROOT );
 
 		/**
 		 * Filters rewrite rules used for root-level archives.
@@ -1286,7 +1319,7 @@ class WP_Rewrite {
 		$root_rewrite = apply_filters( 'root_rewrite_rules', $root_rewrite );
 
 		// Comments rewrite rules.
-		$comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, false, true, true, false);
+		$comments_rewrite = $this->generate_rewrite_rules( $this->root . $this->comments_base, EP_COMMENTS, false, true, true, false );
 
 		/**
 		 * Filters rewrite rules used for comment feed archives.
@@ -1301,7 +1334,7 @@ class WP_Rewrite {
 
 		// Search rewrite rules.
 		$search_structure = $this->get_search_permastruct();
-		$search_rewrite = $this->generate_rewrite_rules($search_structure, EP_SEARCH);
+		$search_rewrite   = $this->generate_rewrite_rules( $search_structure, EP_SEARCH );
 
 		/**
 		 * Filters rewrite rules used for search archives.
@@ -1316,7 +1349,7 @@ class WP_Rewrite {
 		$search_rewrite = apply_filters( 'search_rewrite_rules', $search_rewrite );
 
 		// Author rewrite rules.
-		$author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
+		$author_rewrite = $this->generate_rewrite_rules( $this->get_author_permastruct(), EP_AUTHORS );
 
 		/**
 		 * Filters rewrite rules used for author archives.
@@ -1345,10 +1378,11 @@ class WP_Rewrite {
 		// Extra permastructs.
 		foreach ( $this->extra_permastructs as $permastructname => $struct ) {
 			if ( is_array( $struct ) ) {
-				if ( count( $struct ) == 2 )
+				if ( count( $struct ) == 2 ) {
 					$rules = $this->generate_rewrite_rules( $struct[0], $struct[1] );
-				else
+				} else {
 					$rules = $this->generate_rewrite_rules( $struct['struct'], $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
+				}
 			} else {
 				$rules = $this->generate_rewrite_rules( $struct );
 			}
@@ -1378,14 +1412,15 @@ class WP_Rewrite {
 				$rules = apply_filters( 'tag_rewrite_rules', $rules );
 			}
 
-			$this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
+			$this->extra_rules_top = array_merge( $this->extra_rules_top, $rules );
 		}
 
 		// Put them together.
-		if ( $this->use_verbose_page_rules )
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
-		else
-			$this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+		if ( $this->use_verbose_page_rules ) {
+			$this->rules = array_merge( $this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules );
+		} else {
+			$this->rules = array_merge( $this->extra_rules_top, $robots_rewrite, $deprecated_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules );
+		}
 
 		/**
 		 * Fires after the rewrite rules are generated.
@@ -1421,15 +1456,15 @@ class WP_Rewrite {
 	 * @return array Rewrite rules.
 	 */
 	public function wp_rewrite_rules() {
-		$this->rules = get_option('rewrite_rules');
-		if ( empty($this->rules) ) {
+		$this->rules = get_option( 'rewrite_rules' );
+		if ( empty( $this->rules ) ) {
 			$this->matches = 'matches';
 			$this->rewrite_rules();
 			if ( ! did_action( 'wp_loaded' ) ) {
 				add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
 				return $this->rules;
 			}
-			update_option('rewrite_rules', $this->rules);
+			update_option( 'rewrite_rules', $this->rules );
 		}
 
 		return $this->rules;
@@ -1449,20 +1484,23 @@ class WP_Rewrite {
 	 * @return string
 	 */
 	public function mod_rewrite_rules() {
-		if ( ! $this->using_permalinks() )
+		if ( ! $this->using_permalinks() ) {
 			return '';
+		}
 
 		$site_root = parse_url( site_url() );
-		if ( isset( $site_root['path'] ) )
-			$site_root = trailingslashit($site_root['path']);
+		if ( isset( $site_root['path'] ) ) {
+			$site_root = trailingslashit( $site_root['path'] );
+		}
 
-		$home_root = parse_url(home_url());
-		if ( isset( $home_root['path'] ) )
-			$home_root = trailingslashit($home_root['path']);
-		else
+		$home_root = parse_url( home_url() );
+		if ( isset( $home_root['path'] ) ) {
+			$home_root = trailingslashit( $home_root['path'] );
+		} else {
 			$home_root = '/';
+		}
 
-		$rules = "<IfModule mod_rewrite.c>\n";
+		$rules  = "<IfModule mod_rewrite.c>\n";
 		$rules .= "RewriteEngine On\n";
 		$rules .= "RewriteBase $home_root\n";
 
@@ -1470,29 +1508,30 @@ class WP_Rewrite {
 		$rules .= "RewriteRule ^index\.php$ - [L]\n";
 
 		// Add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all).
-		foreach ( (array) $this->non_wp_rules as $match => $query) {
+		foreach ( (array) $this->non_wp_rules as $match => $query ) {
 			// Apache 1.3 does not support the reluctant (non-greedy) modifier.
-			$match = str_replace('.+?', '.+', $match);
+			$match = str_replace( '.+?', '.+', $match );
 
 			$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
 		}
 
 		if ( $this->use_verbose_rules ) {
 			$this->matches = '';
-			$rewrite = $this->rewrite_rules();
-			$num_rules = count($rewrite);
-			$rules .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
+			$rewrite       = $this->rewrite_rules();
+			$num_rules     = count( $rewrite );
+			$rules        .= "RewriteCond %{REQUEST_FILENAME} -f [OR]\n" .
 				"RewriteCond %{REQUEST_FILENAME} -d\n" .
 				"RewriteRule ^.*$ - [S=$num_rules]\n";
 
-			foreach ( (array) $rewrite as $match => $query) {
+			foreach ( (array) $rewrite as $match => $query ) {
 				// Apache 1.3 does not support the reluctant (non-greedy) modifier.
-				$match = str_replace('.+?', '.+', $match);
+				$match = str_replace( '.+?', '.+', $match );
 
-				if ( strpos($query, $this->index) !== false )
+				if ( strpos( $query, $this->index ) !== false ) {
 					$rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
-				else
+				} else {
 					$rules .= 'RewriteRule ^' . $match . ' ' . $site_root . $query . " [QSA,L]\n";
+				}
 			}
 		} else {
 			$rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" .
@@ -1535,8 +1574,9 @@ class WP_Rewrite {
 	 * @return string IIS7 URL rewrite rule sets.
 	 */
 	public function iis7_url_rewrite_rules( $add_parent_tags = false ) {
-		if ( ! $this->using_permalinks() )
+		if ( ! $this->using_permalinks() ) {
 			return '';
+		}
 		$rules = '';
 		if ( $add_parent_tags ) {
 			$rules .= '<configuration>
@@ -1590,7 +1630,7 @@ class WP_Rewrite {
 	public function add_rule( $regex, $query, $after = 'bottom' ) {
 		if ( is_array( $query ) ) {
 			$external = false;
-			$query = add_query_arg( $query, 'index.php' );
+			$query    = add_query_arg( $query, 'index.php' );
 		} else {
 			$index = false === strpos( $query, '?' ) ? strlen( $query ) : strpos( $query, '?' );
 			$front = substr( $query, 0, $index );
@@ -1692,27 +1732,30 @@ class WP_Rewrite {
 	 */
 	public function add_permastruct( $name, $struct, $args = array() ) {
 		// Back-compat for the old parameters: $with_front and $ep_mask.
-		if ( ! is_array( $args ) )
+		if ( ! is_array( $args ) ) {
 			$args = array( 'with_front' => $args );
-		if ( func_num_args() == 4 )
+		}
+		if ( func_num_args() == 4 ) {
 			$args['ep_mask'] = func_get_arg( 3 );
+		}
 
 		$defaults = array(
-			'with_front' => true,
-			'ep_mask' => EP_NONE,
-			'paged' => true,
-			'feed' => true,
+			'with_front'  => true,
+			'ep_mask'     => EP_NONE,
+			'paged'       => true,
+			'feed'        => true,
 			'forcomments' => false,
-			'walk_dirs' => true,
-			'endpoints' => true,
+			'walk_dirs'   => true,
+			'endpoints'   => true,
 		);
-		$args = array_intersect_key( $args, $defaults );
-		$args = wp_parse_args( $args, $defaults );
+		$args     = array_intersect_key( $args, $defaults );
+		$args     = wp_parse_args( $args, $defaults );
 
-		if ( $args['with_front'] )
+		if ( $args['with_front'] ) {
 			$struct = $this->front . $struct;
-		else
+		} else {
 			$struct = $this->root . $struct;
+		}
 		$args['struct'] = $struct;
 
 		$this->extra_permastructs[ $name ] = $args;
@@ -1771,10 +1814,12 @@ class WP_Rewrite {
 		if ( ! $hard || ! apply_filters( 'flush_rewrite_rules_hard', true ) ) {
 			return;
 		}
-		if ( function_exists( 'save_mod_rewrite_rules' ) )
+		if ( function_exists( 'save_mod_rewrite_rules' ) ) {
 			save_mod_rewrite_rules();
-		if ( function_exists( 'iis7_save_url_rewrite_rules' ) )
+		}
+		if ( function_exists( 'iis7_save_url_rewrite_rules' ) ) {
 			iis7_save_url_rewrite_rules();
+		}
 	}
 
 	/**
@@ -1787,27 +1832,29 @@ class WP_Rewrite {
 	 * @since 1.5.0
 	 */
 	public function init() {
-		$this->extra_rules = $this->non_wp_rules = $this->endpoints = array();
-		$this->permalink_structure = get_option('permalink_structure');
-		$this->front = substr($this->permalink_structure, 0, strpos($this->permalink_structure, '%'));
-		$this->root = '';
+		$this->extra_rules         = $this->non_wp_rules = $this->endpoints = array();
+		$this->permalink_structure = get_option( 'permalink_structure' );
+		$this->front               = substr( $this->permalink_structure, 0, strpos( $this->permalink_structure, '%' ) );
+		$this->root                = '';
 
-		if ( $this->using_index_permalinks() )
+		if ( $this->using_index_permalinks() ) {
 			$this->root = $this->index . '/';
+		}
 
-		unset($this->author_structure);
-		unset($this->date_structure);
-		unset($this->page_structure);
-		unset($this->search_structure);
-		unset($this->feed_structure);
-		unset($this->comment_feed_structure);
-		$this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) );
+		unset( $this->author_structure );
+		unset( $this->date_structure );
+		unset( $this->page_structure );
+		unset( $this->search_structure );
+		unset( $this->feed_structure );
+		unset( $this->comment_feed_structure );
+		$this->use_trailing_slashes = ( '/' == substr( $this->permalink_structure, -1, 1 ) );
 
 		// Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
-		if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
+		if ( preg_match( '/^[^%]*%(?:postname|category|tag|author)%/', $this->permalink_structure ) ) {
 			$this->use_verbose_page_rules = true;
-		else
+		} else {
 			$this->use_verbose_page_rules = false;
+		}
 	}
 
 	/**
@@ -1824,10 +1871,10 @@ class WP_Rewrite {
 	 *
 	 * @param string $permalink_structure Permalink structure.
 	 */
-	public function set_permalink_structure($permalink_structure) {
+	public function set_permalink_structure( $permalink_structure ) {
 		if ( $permalink_structure != $this->permalink_structure ) {
 			$old_permalink_structure = $this->permalink_structure;
-			update_option('permalink_structure', $permalink_structure);
+			update_option( 'permalink_structure', $permalink_structure );
 
 			$this->init();
 
@@ -1854,9 +1901,9 @@ class WP_Rewrite {
 	 *
 	 * @param string $category_base Category permalink structure base.
 	 */
-	public function set_category_base($category_base) {
-		if ( $category_base != get_option('category_base') ) {
-			update_option('category_base', $category_base);
+	public function set_category_base( $category_base ) {
+		if ( $category_base != get_option( 'category_base' ) ) {
+			update_option( 'category_base', $category_base );
 			$this->init();
 		}
 	}
@@ -1873,7 +1920,7 @@ class WP_Rewrite {
 	 * @param string $tag_base Tag permalink structure base.
 	 */
 	public function set_tag_base( $tag_base ) {
-		if ( $tag_base != get_option( 'tag_base') ) {
+		if ( $tag_base != get_option( 'tag_base' ) ) {
 			update_option( 'tag_base', $tag_base );
 			$this->init();
 		}
@@ -1883,7 +1930,6 @@ class WP_Rewrite {
 	 * Constructor - Calls init(), which runs setup.
 	 *
 	 * @since 1.5.0
-	 *
 	 */
 	public function __construct() {
 		$this->init();
diff --git a/wp-includes/class-wp-role.php b/wp-includes/class-wp-role.php
index 33d8dfe369..576eb23a7a 100644
--- a/wp-includes/class-wp-role.php
+++ b/wp-includes/class-wp-role.php
@@ -41,7 +41,7 @@ class WP_Role {
 	 * @param array $capabilities List of capabilities.
 	 */
 	public function __construct( $role, $capabilities ) {
-		$this->name = $role;
+		$this->name         = $role;
 		$this->capabilities = $capabilities;
 	}
 
@@ -54,7 +54,7 @@ class WP_Role {
 	 * @param bool $grant Whether role has capability privilege.
 	 */
 	public function add_cap( $cap, $grant = true ) {
-		$this->capabilities[$cap] = $grant;
+		$this->capabilities[ $cap ] = $grant;
 		wp_roles()->add_cap( $this->name, $cap, $grant );
 	}
 
@@ -71,7 +71,7 @@ class WP_Role {
 	 * @param string $cap Capability name.
 	 */
 	public function remove_cap( $cap ) {
-		unset( $this->capabilities[$cap] );
+		unset( $this->capabilities[ $cap ] );
 		wp_roles()->remove_cap( $this->name, $cap );
 	}
 
@@ -100,10 +100,11 @@ class WP_Role {
 		 */
 		$capabilities = apply_filters( 'role_has_cap', $this->capabilities, $cap, $this->name );
 
-		if ( !empty( $capabilities[$cap] ) )
-			return $capabilities[$cap];
-		else
+		if ( ! empty( $capabilities[ $cap ] ) ) {
+			return $capabilities[ $cap ];
+		} else {
 			return false;
+		}
 	}
 
 }
diff --git a/wp-includes/class-wp-roles.php b/wp-includes/class-wp-roles.php
index 656e169c9f..fc8f1b1590 100644
--- a/wp-includes/class-wp-roles.php
+++ b/wp-includes/class-wp-roles.php
@@ -15,10 +15,10 @@
  * in the value of the 'capability' key.
  *
  *     array (
- *    		'rolename' => array (
- *    			'name' => 'rolename',
- *    			'capabilities' => array()
- *    		)
+ *          'rolename' => array (
+ *              'name' => 'rolename',
+ *              'capabilities' => array()
+ *          )
  *     )
  *
  * @since 2.0.0
@@ -157,15 +157,16 @@ class WP_Roles {
 			return;
 		}
 
-		$this->roles[$role] = array(
-			'name' => $display_name,
-			'capabilities' => $capabilities
-			);
-		if ( $this->use_db )
+		$this->roles[ $role ] = array(
+			'name'         => $display_name,
+			'capabilities' => $capabilities,
+		);
+		if ( $this->use_db ) {
 			update_option( $this->role_key, $this->roles );
-		$this->role_objects[$role] = new WP_Role( $role, $capabilities );
-		$this->role_names[$role] = $display_name;
-		return $this->role_objects[$role];
+		}
+		$this->role_objects[ $role ] = new WP_Role( $role, $capabilities );
+		$this->role_names[ $role ]   = $display_name;
+		return $this->role_objects[ $role ];
 	}
 
 	/**
@@ -176,18 +177,21 @@ class WP_Roles {
 	 * @param string $role Role name.
 	 */
 	public function remove_role( $role ) {
-		if ( ! isset( $this->role_objects[$role] ) )
+		if ( ! isset( $this->role_objects[ $role ] ) ) {
 			return;
+		}
 
-		unset( $this->role_objects[$role] );
-		unset( $this->role_names[$role] );
-		unset( $this->roles[$role] );
+		unset( $this->role_objects[ $role ] );
+		unset( $this->role_names[ $role ] );
+		unset( $this->roles[ $role ] );
 
-		if ( $this->use_db )
+		if ( $this->use_db ) {
 			update_option( $this->role_key, $this->roles );
+		}
 
-		if ( get_option( 'default_role' ) == $role )
+		if ( get_option( 'default_role' ) == $role ) {
 			update_option( 'default_role', 'subscriber' );
+		}
 	}
 
 	/**
@@ -200,12 +204,14 @@ class WP_Roles {
 	 * @param bool $grant Optional, default is true. Whether role is capable of performing capability.
 	 */
 	public function add_cap( $role, $cap, $grant = true ) {
-		if ( ! isset( $this->roles[$role] ) )
+		if ( ! isset( $this->roles[ $role ] ) ) {
 			return;
+		}
 
-		$this->roles[$role]['capabilities'][$cap] = $grant;
-		if ( $this->use_db )
+		$this->roles[ $role ]['capabilities'][ $cap ] = $grant;
+		if ( $this->use_db ) {
 			update_option( $this->role_key, $this->roles );
+		}
 	}
 
 	/**
@@ -217,12 +223,14 @@ class WP_Roles {
 	 * @param string $cap Capability name.
 	 */
 	public function remove_cap( $role, $cap ) {
-		if ( ! isset( $this->roles[$role] ) )
+		if ( ! isset( $this->roles[ $role ] ) ) {
 			return;
+		}
 
-		unset( $this->roles[$role]['capabilities'][$cap] );
-		if ( $this->use_db )
+		unset( $this->roles[ $role ]['capabilities'][ $cap ] );
+		if ( $this->use_db ) {
 			update_option( $this->role_key, $this->roles );
+		}
 	}
 
 	/**
@@ -234,10 +242,11 @@ class WP_Roles {
 	 * @return WP_Role|null WP_Role object if found, null if the role does not exist.
 	 */
 	public function get_role( $role ) {
-		if ( isset( $this->role_objects[$role] ) )
-			return $this->role_objects[$role];
-		else
+		if ( isset( $this->role_objects[ $role ] ) ) {
+			return $this->role_objects[ $role ];
+		} else {
 			return null;
+		}
 	}
 
 	/**
@@ -260,7 +269,7 @@ class WP_Roles {
 	 * @return bool
 	 */
 	public function is_role( $role ) {
-		return isset( $this->role_names[$role] );
+		return isset( $this->role_names[ $role ] );
 	}
 
 	/**
@@ -274,10 +283,10 @@ class WP_Roles {
 		}
 
 		$this->role_objects = array();
-		$this->role_names =  array();
+		$this->role_names   = array();
 		foreach ( array_keys( $this->roles ) as $role ) {
 			$this->role_objects[ $role ] = new WP_Role( $role, $this->roles[ $role ]['capabilities'] );
-			$this->role_names[ $role ] = $this->roles[ $role ]['name'];
+			$this->role_names[ $role ]   = $this->roles[ $role ]['name'];
 		}
 
 		/**
diff --git a/wp-includes/class-wp-session-tokens.php b/wp-includes/class-wp-session-tokens.php
index 993b81ef5c..2878ccae5c 100644
--- a/wp-includes/class-wp-session-tokens.php
+++ b/wp-includes/class-wp-session-tokens.php
@@ -131,11 +131,11 @@ abstract class WP_Session_Tokens {
 		 * @param array $session Array of extra data.
 		 * @param int   $user_id User ID.
 		 */
-		$session = apply_filters( 'attach_session_information', array(), $this->user_id );
+		$session               = apply_filters( 'attach_session_information', array(), $this->user_id );
 		$session['expiration'] = $expiration;
 
 		// IP address.
-		if ( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
+		if ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
 			$session['ip'] = $_SERVER['REMOTE_ADDR'];
 		}
 
@@ -189,7 +189,7 @@ abstract class WP_Session_Tokens {
 	 */
 	final public function destroy_others( $token_to_keep ) {
 		$verifier = $this->hash_token( $token_to_keep );
-		$session = $this->get_session( $verifier );
+		$session  = $this->get_session( $verifier );
 		if ( $session ) {
 			$this->destroy_other_sessions( $verifier );
 		} else {
diff --git a/wp-includes/class-wp-simplepie-file.php b/wp-includes/class-wp-simplepie-file.php
index 49e8003036..15f879c953 100644
--- a/wp-includes/class-wp-simplepie-file.php
+++ b/wp-includes/class-wp-simplepie-file.php
@@ -32,39 +32,41 @@ class WP_SimplePie_File extends SimplePie_File {
 	 * @param boolean      $force_fsockopen Optional. Whether to force opening internet or unix domain socket
 	 *                                      connection or not. Default false.
 	 */
-	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) {
-		$this->url = $url;
-		$this->timeout = $timeout;
+	public function __construct( $url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false ) {
+		$this->url       = $url;
+		$this->timeout   = $timeout;
 		$this->redirects = $redirects;
-		$this->headers = $headers;
+		$this->headers   = $headers;
 		$this->useragent = $useragent;
 
 		$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE;
 
-		if ( preg_match('/^http(s)?:\/\//i', $url) ) {
+		if ( preg_match( '/^http(s)?:\/\//i', $url ) ) {
 			$args = array(
-				'timeout' => $this->timeout,
+				'timeout'     => $this->timeout,
 				'redirection' => $this->redirects,
 			);
 
-			if ( !empty($this->headers) )
+			if ( ! empty( $this->headers ) ) {
 				$args['headers'] = $this->headers;
+			}
 
-			if ( SIMPLEPIE_USERAGENT != $this->useragent ) //Use default WP user agent unless custom has been specified
+			if ( SIMPLEPIE_USERAGENT != $this->useragent ) { //Use default WP user agent unless custom has been specified
 				$args['user-agent'] = $this->useragent;
+			}
 
-			$res = wp_safe_remote_request($url, $args);
+			$res = wp_safe_remote_request( $url, $args );
 
-			if ( is_wp_error($res) ) {
-				$this->error = 'WP HTTP Error: ' . $res->get_error_message();
+			if ( is_wp_error( $res ) ) {
+				$this->error   = 'WP HTTP Error: ' . $res->get_error_message();
 				$this->success = false;
 			} else {
-				$this->headers = wp_remote_retrieve_headers( $res );
-				$this->body = wp_remote_retrieve_body( $res );
+				$this->headers     = wp_remote_retrieve_headers( $res );
+				$this->body        = wp_remote_retrieve_body( $res );
 				$this->status_code = wp_remote_retrieve_response_code( $res );
 			}
 		} else {
-			$this->error = '';
+			$this->error   = '';
 			$this->success = false;
 		}
 	}
diff --git a/wp-includes/class-wp-simplepie-sanitize-kses.php b/wp-includes/class-wp-simplepie-sanitize-kses.php
index ff7d7e5932..2aba304259 100644
--- a/wp-includes/class-wp-simplepie-sanitize-kses.php
+++ b/wp-includes/class-wp-simplepie-sanitize-kses.php
@@ -35,10 +35,9 @@ class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
 	public function sanitize( $data, $type, $base = '' ) {
 		$data = trim( $data );
 		if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
-			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
+			if ( preg_match( '/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data ) ) {
 				$type |= SIMPLEPIE_CONSTRUCT_HTML;
-			}
-			else {
+			} else {
 				$type |= SIMPLEPIE_CONSTRUCT_TEXT;
 			}
 		}
diff --git a/wp-includes/class-wp-site-query.php b/wp-includes/class-wp-site-query.php
index cf2134d8a4..7f347a0b61 100644
--- a/wp-includes/class-wp-site-query.php
+++ b/wp-includes/class-wp-site-query.php
@@ -246,10 +246,10 @@ class WP_Site_Query {
 		// Ignore the $fields argument as the queried result will be the same regardless.
 		unset( $_args['fields'] );
 
-		$key = md5( serialize( $_args ) );
+		$key          = md5( serialize( $_args ) );
 		$last_changed = wp_cache_get_last_changed( 'sites' );
 
-		$cache_key = "get_sites:$key:$last_changed";
+		$cache_key   = "get_sites:$key:$last_changed";
 		$cache_value = wp_cache_get( $cache_key, 'sites' );
 
 		if ( false === $cache_value ) {
@@ -259,12 +259,12 @@ class WP_Site_Query {
 			}
 
 			$cache_value = array(
-				'site_ids' => $site_ids,
+				'site_ids'    => $site_ids,
 				'found_sites' => $this->found_sites,
 			);
 			wp_cache_add( $cache_key, $cache_value, 'sites' );
 		} else {
-			$site_ids = $cache_value['site_ids'];
+			$site_ids          = $cache_value['site_ids'];
 			$this->found_sites = $cache_value['found_sites'];
 		}
 
@@ -345,10 +345,10 @@ class WP_Site_Query {
 
 				if ( is_int( $_key ) ) {
 					$_orderby = $_value;
-					$_order = $order;
+					$_order   = $order;
 				} else {
 					$_orderby = $_key;
-					$_order = $_value;
+					$_order   = $_value;
 				}
 
 				$parsed = $this->parse_orderby( $_orderby );
@@ -395,12 +395,12 @@ class WP_Site_Query {
 
 		// Parse site IDs for an IN clause.
 		if ( ! empty( $this->query_vars['site__in'] ) ) {
-			$this->sql_clauses['where']['site__in'] = "blog_id IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['site__in'] ) ) . ' )';
+			$this->sql_clauses['where']['site__in'] = 'blog_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['site__in'] ) ) . ' )';
 		}
 
 		// Parse site IDs for a NOT IN clause.
 		if ( ! empty( $this->query_vars['site__not_in'] ) ) {
-			$this->sql_clauses['where']['site__not_in'] = "blog_id NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['site__not_in'] ) ) . ' )';
+			$this->sql_clauses['where']['site__not_in'] = 'blog_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['site__not_in'] ) ) . ' )';
 		}
 
 		$network_id = absint( $this->query_vars['network_id'] );
@@ -448,33 +448,33 @@ class WP_Site_Query {
 		}
 
 		if ( is_numeric( $this->query_vars['archived'] ) ) {
-			$archived = absint( $this->query_vars['archived'] );
-			$this->sql_clauses['where']['archived'] = $wpdb->prepare( "archived = %s ", absint( $archived ) );
+			$archived                               = absint( $this->query_vars['archived'] );
+			$this->sql_clauses['where']['archived'] = $wpdb->prepare( 'archived = %s ', absint( $archived ) );
 		}
 
 		if ( is_numeric( $this->query_vars['mature'] ) ) {
-			$mature = absint( $this->query_vars['mature'] );
-			$this->sql_clauses['where']['mature'] = $wpdb->prepare( "mature = %d ", $mature );
+			$mature                               = absint( $this->query_vars['mature'] );
+			$this->sql_clauses['where']['mature'] = $wpdb->prepare( 'mature = %d ', $mature );
 		}
 
 		if ( is_numeric( $this->query_vars['spam'] ) ) {
-			$spam = absint( $this->query_vars['spam'] );
-			$this->sql_clauses['where']['spam'] = $wpdb->prepare( "spam = %d ", $spam );
+			$spam                               = absint( $this->query_vars['spam'] );
+			$this->sql_clauses['where']['spam'] = $wpdb->prepare( 'spam = %d ', $spam );
 		}
 
 		if ( is_numeric( $this->query_vars['deleted'] ) ) {
-			$deleted = absint( $this->query_vars['deleted'] );
-			$this->sql_clauses['where']['deleted'] = $wpdb->prepare( "deleted = %d ", $deleted );
+			$deleted                               = absint( $this->query_vars['deleted'] );
+			$this->sql_clauses['where']['deleted'] = $wpdb->prepare( 'deleted = %d ', $deleted );
 		}
 
 		if ( is_numeric( $this->query_vars['public'] ) ) {
-			$public = absint( $this->query_vars['public'] );
-			$this->sql_clauses['where']['public'] = $wpdb->prepare( "public = %d ", $public );
+			$public                               = absint( $this->query_vars['public'] );
+			$this->sql_clauses['where']['public'] = $wpdb->prepare( 'public = %d ', $public );
 		}
 
 		if ( is_numeric( $this->query_vars['lang_id'] ) ) {
-			$lang_id = absint( $this->query_vars['lang_id'] );
-			$this->sql_clauses['where']['lang_id'] = $wpdb->prepare( "lang_id = %d ", $lang_id );
+			$lang_id                               = absint( $this->query_vars['lang_id'] );
+			$this->sql_clauses['where']['lang_id'] = $wpdb->prepare( 'lang_id = %d ', $lang_id );
 		}
 
 		// Parse site language IDs for an IN clause.
@@ -517,7 +517,7 @@ class WP_Site_Query {
 
 		$date_query = $this->query_vars['date_query'];
 		if ( ! empty( $date_query ) && is_array( $date_query ) ) {
-			$this->date_query = new WP_Date_Query( $date_query, 'registered' );
+			$this->date_query                         = new WP_Date_Query( $date_query, 'registered' );
 			$this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $this->date_query->get_sql() );
 		}
 
@@ -537,11 +537,11 @@ class WP_Site_Query {
 		 */
 		$clauses = apply_filters_ref_array( 'sites_clauses', array( compact( $pieces ), &$this ) );
 
-		$fields = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
-		$join = isset( $clauses['join'] ) ? $clauses['join'] : '';
-		$where = isset( $clauses['where'] ) ? $clauses['where'] : '';
+		$fields  = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
+		$join    = isset( $clauses['join'] ) ? $clauses['join'] : '';
+		$where   = isset( $clauses['where'] ) ? $clauses['where'] : '';
 		$orderby = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
-		$limits = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
+		$limits  = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
 		$groupby = isset( $clauses['groupby'] ) ? $clauses['groupby'] : '';
 
 		if ( $where ) {
@@ -650,11 +650,11 @@ class WP_Site_Query {
 		switch ( $orderby ) {
 			case 'site__in':
 				$site__in = implode( ',', array_map( 'absint', $this->query_vars['site__in'] ) );
-				$parsed = "FIELD( {$wpdb->blogs}.blog_id, $site__in )";
+				$parsed   = "FIELD( {$wpdb->blogs}.blog_id, $site__in )";
 				break;
 			case 'network__in':
 				$network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
-				$parsed = "FIELD( {$wpdb->blogs}.site_id, $network__in )";
+				$parsed      = "FIELD( {$wpdb->blogs}.site_id, $network__in )";
 				break;
 			case 'domain':
 			case 'last_updated':
diff --git a/wp-includes/class-wp-site.php b/wp-includes/class-wp-site.php
index f438264370..8a72c33d8b 100644
--- a/wp-includes/class-wp-site.php
+++ b/wp-includes/class-wp-site.php
@@ -187,7 +187,7 @@ final class WP_Site {
 	 * @param WP_Site|object $site A site object.
 	 */
 	public function __construct( $site ) {
-		foreach( get_object_vars( $site ) as $key => $value ) {
+		foreach ( get_object_vars( $site ) as $key => $value ) {
 			$this->$key = $value;
 		}
 	}
diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php
index ad34c5f6ca..b818b8fab5 100644
--- a/wp-includes/class-wp-tax-query.php
+++ b/wp-includes/class-wp-tax-query.php
@@ -47,7 +47,10 @@ class WP_Tax_Query {
 	 * @static
 	 * @var string
 	 */
-	private static $no_results = array( 'join' => array( '' ), 'where' => array( '0 = 1' ) );
+	private static $no_results = array(
+		'join'  => array( '' ),
+		'where' => array( '0 = 1' ),
+	);
 
 	/**
 	 * A flat list of table aliases used in the JOIN clauses.
@@ -135,10 +138,10 @@ class WP_Tax_Query {
 		$cleaned_query = array();
 
 		$defaults = array(
-			'taxonomy' => '',
-			'terms' => array(),
-			'field' => 'term_id',
-			'operator' => 'IN',
+			'taxonomy'         => '',
+			'terms'            => array(),
+			'field'            => 'term_id',
+			'operator'         => 'IN',
 			'include_children' => true,
 		);
 
@@ -146,12 +149,12 @@ class WP_Tax_Query {
 			if ( 'relation' === $key ) {
 				$cleaned_query['relation'] = $this->sanitize_relation( $query );
 
-			// First-order clause.
+				// First-order clause.
 			} elseif ( self::is_first_order_clause( $query ) ) {
 
-				$cleaned_clause = array_merge( $defaults, $query );
+				$cleaned_clause          = array_merge( $defaults, $query );
 				$cleaned_clause['terms'] = (array) $cleaned_clause['terms'];
-				$cleaned_query[] = $cleaned_clause;
+				$cleaned_query[]         = $cleaned_clause;
 
 				/*
 				 * Keep a copy of the clause in the flate
@@ -176,7 +179,7 @@ class WP_Tax_Query {
 					}
 				}
 
-			// Otherwise, it's a nested query, so we recurse.
+				// Otherwise, it's a nested query, so we recurse.
 			} elseif ( is_array( $query ) ) {
 				$cleaned_subquery = $this->sanitize_query( $query );
 
@@ -247,7 +250,7 @@ class WP_Tax_Query {
 	 * }
 	 */
 	public function get_sql( $primary_table, $primary_id_column ) {
-		$this->primary_table = $primary_table;
+		$this->primary_table     = $primary_table;
 		$this->primary_id_column = $primary_id_column;
 
 		return $this->get_sql_clauses();
@@ -274,7 +277,7 @@ class WP_Tax_Query {
 		 * To keep $this->queries unaltered, pass a copy.
 		 */
 		$queries = $this->queries;
-		$sql = $this->get_sql_for_query( $queries );
+		$sql     = $this->get_sql_for_query( $queries );
 
 		if ( ! empty( $sql['where'] ) ) {
 			$sql['where'] = ' AND ' . $sql['where'];
@@ -314,7 +317,7 @@ class WP_Tax_Query {
 
 		$indent = '';
 		for ( $i = 0; $i < $depth; $i++ ) {
-			$indent .= "  ";
+			$indent .= '  ';
 		}
 
 		foreach ( $query as $key => &$clause ) {
@@ -336,7 +339,7 @@ class WP_Tax_Query {
 					}
 
 					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
-				// This is a subquery, so we recurse.
+					// This is a subquery, so we recurse.
 				} else {
 					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
 
@@ -399,7 +402,7 @@ class WP_Tax_Query {
 			return self::$no_results;
 		}
 
-		$terms = $clause['terms'];
+		$terms    = $clause['terms'];
 		$operator = strtoupper( $clause['operator'] );
 
 		if ( 'IN' == $operator ) {
@@ -416,7 +419,7 @@ class WP_Tax_Query {
 			 */
 			$alias = $this->find_compatible_table_alias( $clause, $parent_query );
 			if ( false === $alias ) {
-				$i = count( $this->table_aliases );
+				$i     = count( $this->table_aliases );
 				$alias = $i ? 'tt' . $i : $wpdb->term_relationships;
 
 				// Store the alias as part of a flat array to build future iterators.
@@ -430,7 +433,6 @@ class WP_Tax_Query {
 				$join .= " ON ($this->primary_table.$this->primary_id_column = $alias.object_id)";
 			}
 
-
 			$where = "$alias.term_taxonomy_id $operator ($terms)";
 
 		} elseif ( 'NOT IN' == $operator ) {
@@ -466,14 +468,16 @@ class WP_Tax_Query {
 
 		} elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
 
-			$where = $wpdb->prepare( "$operator (
+			$where = $wpdb->prepare(
+				"$operator (
 				SELECT 1
 				FROM $wpdb->term_relationships
 				INNER JOIN $wpdb->term_taxonomy
 				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']
+			);
 
 		}
 
@@ -561,12 +565,13 @@ class WP_Tax_Query {
 		if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
 			$this->transform_query( $query, 'term_id' );
 
-			if ( is_wp_error( $query ) )
+			if ( is_wp_error( $query ) ) {
 				return;
+			}
 
 			$children = array();
 			foreach ( $query['terms'] as $term ) {
-				$children = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
+				$children   = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
 				$children[] = $term;
 			}
 			$query['terms'] = $children;
@@ -590,11 +595,13 @@ class WP_Tax_Query {
 	 *                                or 'term_id'. Default 'term_id'.
 	 */
 	public function transform_query( &$query, $resulting_field ) {
-		if ( empty( $query['terms'] ) )
+		if ( empty( $query['terms'] ) ) {
 			return;
+		}
 
-		if ( $query['field'] == $resulting_field )
+		if ( $query['field'] == $resulting_field ) {
 			return;
+		}
 
 		$resulting_field = sanitize_key( $resulting_field );
 
diff --git a/wp-includes/class-wp-taxonomy.php b/wp-includes/class-wp-taxonomy.php
index 3a92ba859e..123b739b20 100644
--- a/wp-includes/class-wp-taxonomy.php
+++ b/wp-includes/class-wp-taxonomy.php
@@ -296,11 +296,13 @@ final class WP_Taxonomy {
 		}
 
 		if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-			$args['rewrite'] = wp_parse_args( $args['rewrite'], array(
-				'with_front'   => true,
-				'hierarchical' => false,
-				'ep_mask'      => EP_NONE,
-			) );
+			$args['rewrite'] = wp_parse_args(
+				$args['rewrite'], array(
+					'with_front'   => true,
+					'hierarchical' => false,
+					'ep_mask'      => EP_NONE,
+				)
+			);
 
 			if ( empty( $args['rewrite']['slug'] ) ) {
 				$args['rewrite']['slug'] = sanitize_title_with_dashes( $this->name );
@@ -358,14 +360,14 @@ final class WP_Taxonomy {
 		// Default meta box sanitization callback depends on the value of 'meta_box_cb'.
 		if ( null === $args['meta_box_sanitize_cb'] ) {
 			switch ( $args['meta_box_cb'] ) {
-				case 'post_categories_meta_box' :
+				case 'post_categories_meta_box':
 					$args['meta_box_sanitize_cb'] = 'taxonomy_meta_box_sanitize_cb_checkboxes';
-				break;
+					break;
 
-				case 'post_tags_meta_box' :
-				default :
+				case 'post_tags_meta_box':
+				default:
 					$args['meta_box_sanitize_cb'] = 'taxonomy_meta_box_sanitize_cb_input';
-				break;
+					break;
 			}
 		}
 
@@ -374,7 +376,7 @@ final class WP_Taxonomy {
 		}
 
 		$this->labels = get_taxonomy_labels( $this );
-		$this->label = $this->labels->name;
+		$this->label  = $this->labels->name;
 	}
 
 	/**
diff --git a/wp-includes/class-wp-term-query.php b/wp-includes/class-wp-term-query.php
index e27b68676b..7bd537cef4 100644
--- a/wp-includes/class-wp-term-query.php
+++ b/wp-includes/class-wp-term-query.php
@@ -254,11 +254,11 @@ class WP_Term_Query {
 		}
 
 		if ( 'all' == $query['get'] ) {
-			$query['childless'] = false;
-			$query['child_of'] = 0;
-			$query['hide_empty'] = 0;
+			$query['childless']    = false;
+			$query['child_of']     = 0;
+			$query['hide_empty']   = 0;
 			$query['hierarchical'] = false;
-			$query['pad_counts'] = false;
+			$query['pad_counts']   = false;
 		}
 
 		$query['taxonomy'] = $taxonomies;
@@ -330,7 +330,7 @@ class WP_Term_Query {
 
 		if ( ! $has_hierarchical_tax ) {
 			$args['hierarchical'] = false;
-			$args['pad_counts'] = false;
+			$args['pad_counts']   = false;
 		}
 
 		// 'parent' overrides 'child_of'.
@@ -339,11 +339,11 @@ class WP_Term_Query {
 		}
 
 		if ( 'all' == $args['get'] ) {
-			$args['childless'] = false;
-			$args['child_of'] = 0;
-			$args['hide_empty'] = 0;
+			$args['childless']    = false;
+			$args['child_of']     = 0;
+			$args['hide_empty']   = 0;
 			$args['hierarchical'] = false;
-			$args['pad_counts'] = false;
+			$args['pad_counts']   = false;
 		}
 
 		/**
@@ -411,9 +411,9 @@ class WP_Term_Query {
 
 		$inclusions = '';
 		if ( ! empty( $include ) ) {
-			$exclude = '';
+			$exclude      = '';
 			$exclude_tree = '';
-			$inclusions = implode( ',', wp_parse_id_list( $include ) );
+			$inclusions   = implode( ',', wp_parse_id_list( $include ) );
 		}
 
 		if ( ! empty( $inclusions ) ) {
@@ -422,16 +422,18 @@ class WP_Term_Query {
 
 		$exclusions = array();
 		if ( ! empty( $exclude_tree ) ) {
-			$exclude_tree = wp_parse_id_list( $exclude_tree );
+			$exclude_tree      = wp_parse_id_list( $exclude_tree );
 			$excluded_children = $exclude_tree;
 			foreach ( $exclude_tree as $extrunk ) {
 				$excluded_children = array_merge(
 					$excluded_children,
-					(array) get_terms( reset( $taxonomies ), array(
-						'child_of' => intval( $extrunk ),
-						'fields' => 'ids',
-						'hide_empty' => 0
-					) )
+					(array) get_terms(
+						reset( $taxonomies ), array(
+							'child_of'   => intval( $extrunk ),
+							'fields'     => 'ids',
+							'hide_empty' => 0,
+						)
+					)
 				);
 			}
 			$exclusions = array_merge( $excluded_children, $exclusions );
@@ -446,7 +448,7 @@ class WP_Term_Query {
 		if ( $childless ) {
 			foreach ( $taxonomies as $_tax ) {
 				$term_hierarchy = _get_term_hierarchy( $_tax );
-				$exclusions = array_merge( array_keys( $term_hierarchy ), $exclusions );
+				$exclusions     = array_merge( array_keys( $term_hierarchy ), $exclusions );
 			}
 		}
 
@@ -490,10 +492,10 @@ class WP_Term_Query {
 			( is_string( $args['slug'] ) && 0 !== strlen( $args['slug'] ) )
 		) {
 			if ( is_array( $args['slug'] ) ) {
-				$slug = array_map( 'sanitize_title', $args['slug'] );
+				$slug                               = array_map( 'sanitize_title', $args['slug'] );
 				$this->sql_clauses['where']['slug'] = "t.slug IN ('" . implode( "', '", $slug ) . "')";
 			} else {
-				$slug = sanitize_title( $args['slug'] );
+				$slug                               = sanitize_title( $args['slug'] );
 				$this->sql_clauses['where']['slug'] = "t.slug = '$slug'";
 			}
 		}
@@ -503,16 +505,16 @@ class WP_Term_Query {
 				$tt_ids = implode( ',', array_map( 'intval', $args['term_taxonomy_id'] ) );
 				$this->sql_clauses['where']['term_taxonomy_id'] = "tt.term_taxonomy_id IN ({$tt_ids})";
 			} else {
-				$this->sql_clauses['where']['term_taxonomy_id'] = $wpdb->prepare( "tt.term_taxonomy_id = %d", $args['term_taxonomy_id'] );
+				$this->sql_clauses['where']['term_taxonomy_id'] = $wpdb->prepare( 'tt.term_taxonomy_id = %d', $args['term_taxonomy_id'] );
 			}
 		}
 
 		if ( ! empty( $args['name__like'] ) ) {
-			$this->sql_clauses['where']['name__like'] = $wpdb->prepare( "t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
+			$this->sql_clauses['where']['name__like'] = $wpdb->prepare( 't.name LIKE %s', '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
 		}
 
 		if ( ! empty( $args['description__like'] ) ) {
-			$this->sql_clauses['where']['description__like'] = $wpdb->prepare( "tt.description LIKE %s", '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
+			$this->sql_clauses['where']['description__like'] = $wpdb->prepare( 'tt.description LIKE %s', '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
 		}
 
 		if ( ! empty( $args['object_ids'] ) ) {
@@ -521,7 +523,7 @@ class WP_Term_Query {
 				$object_ids = array( $object_ids );
 			}
 
-			$object_ids = implode( ', ', array_map( 'intval', $object_ids ) );
+			$object_ids                               = implode( ', ', array_map( 'intval', $object_ids ) );
 			$this->sql_clauses['where']['object_ids'] = "tr.object_id IN ($object_ids)";
 		}
 
@@ -534,7 +536,7 @@ class WP_Term_Query {
 		}
 
 		if ( '' !== $parent ) {
-			$parent = (int) $parent;
+			$parent                               = (int) $parent;
 			$this->sql_clauses['where']['parent'] = "tt.parent = '$parent'";
 		}
 
@@ -542,7 +544,7 @@ class WP_Term_Query {
 		if ( 'count' == $args['fields'] ) {
 			$hierarchical = false;
 		}
-		if ( $args['hide_empty'] && !$hierarchical ) {
+		if ( $args['hide_empty'] && ! $hierarchical ) {
 			$this->sql_clauses['where']['count'] = 'tt.count > 0';
 		}
 
@@ -560,33 +562,32 @@ class WP_Term_Query {
 			$limits = '';
 		}
 
-
 		if ( ! empty( $args['search'] ) ) {
 			$this->sql_clauses['where']['search'] = $this->get_search_sql( $args['search'] );
 		}
 
 		// Meta query support.
-		$join = '';
+		$join     = '';
 		$distinct = '';
 
 		// Reparse meta_query query_vars, in case they were modified in a 'pre_get_terms' callback.
 		$this->meta_query->parse_query_vars( $this->query_vars );
-		$mq_sql = $this->meta_query->get_sql( 'term', 't', 'term_id' );
+		$mq_sql       = $this->meta_query->get_sql( 'term', 't', 'term_id' );
 		$meta_clauses = $this->meta_query->get_clauses();
 
 		if ( ! empty( $meta_clauses ) ) {
-			$join .= $mq_sql['join'];
+			$join                                    .= $mq_sql['join'];
 			$this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] );
-			$distinct .= "DISTINCT";
+			$distinct                                .= 'DISTINCT';
 
 		}
 
 		$selects = array();
 		switch ( $args['fields'] ) {
 			case 'all':
-			case 'all_with_object_id' :
-			case 'tt_ids' :
-			case 'slugs' :
+			case 'all_with_object_id':
+			case 'tt_ids':
+			case 'slugs':
 				$selects = array( 't.*', 'tt.*' );
 				if ( 'all_with_object_id' === $args['fields'] && ! empty( $args['object_ids'] ) ) {
 					$selects[] = 'tr.object_id';
@@ -601,7 +602,7 @@ class WP_Term_Query {
 				break;
 			case 'count':
 				$orderby = '';
-				$order = '';
+				$order   = '';
 				$selects = array( 'COUNT(*)' );
 				break;
 			case 'id=>name':
@@ -651,13 +652,13 @@ class WP_Term_Query {
 		 */
 		$clauses = apply_filters( 'terms_clauses', compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' ), $taxonomies, $args );
 
-		$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-		$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-		$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-		$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-		$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-		$order = isset( $clauses[ 'order' ] ) ? $clauses[ 'order' ] : '';
-		$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+		$fields   = isset( $clauses['fields'] ) ? $clauses['fields'] : '';
+		$join     = isset( $clauses['join'] ) ? $clauses['join'] : '';
+		$where    = isset( $clauses['where'] ) ? $clauses['where'] : '';
+		$distinct = isset( $clauses['distinct'] ) ? $clauses['distinct'] : '';
+		$orderby  = isset( $clauses['orderby'] ) ? $clauses['orderby'] : '';
+		$order    = isset( $clauses['order'] ) ? $clauses['order'] : '';
+		$limits   = isset( $clauses['limits'] ) ? $clauses['limits'] : '';
 
 		if ( $where ) {
 			$where = "WHERE $where";
@@ -671,10 +672,10 @@ class WP_Term_Query {
 		$this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
 		// $args can be anything. Only use the args defined in defaults to compute the key.
-		$key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) ) ) . serialize( $taxonomies ) . $this->request );
+		$key          = md5( serialize( wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) ) ) . serialize( $taxonomies ) . $this->request );
 		$last_changed = wp_cache_get_last_changed( 'terms' );
-		$cache_key = "get_terms:$key:$last_changed";
-		$cache = wp_cache_get( $cache_key, 'terms' );
+		$cache_key    = "get_terms:$key:$last_changed";
+		$cache        = wp_cache_get( $cache_key, 'terms' );
 		if ( false !== $cache ) {
 			if ( 'all' === $_fields ) {
 				$cache = array_map( 'get_term', $cache );
@@ -756,7 +757,7 @@ class WP_Term_Query {
 				}
 
 				$_tt_ids[ $term->term_id ] = 1;
-				$_terms[] = $term;
+				$_terms[]                  = $term;
 			}
 
 			$terms = $_terms;
@@ -827,7 +828,7 @@ class WP_Term_Query {
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
 	protected function parse_orderby( $orderby_raw ) {
-		$_orderby = strtolower( $orderby_raw );
+		$_orderby           = strtolower( $orderby_raw );
 		$maybe_orderby_meta = false;
 
 		if ( in_array( $_orderby, array( 'term_id', 'name', 'slug', 'term_group' ), true ) ) {
@@ -840,7 +841,7 @@ class WP_Term_Query {
 			$include = implode( ',', wp_parse_id_list( $this->query_vars['include'] ) );
 			$orderby = "FIELD( t.term_id, $include )";
 		} elseif ( 'slug__in' == $_orderby && ! empty( $this->query_vars['slug'] ) && is_array( $this->query_vars['slug'] ) ) {
-			$slugs = implode( "', '", array_map( 'sanitize_title_for_query', $this->query_vars['slug'] ) );
+			$slugs   = implode( "', '", array_map( 'sanitize_title_for_query', $this->query_vars['slug'] ) );
 			$orderby = "FIELD( t.slug, '" . $slugs . "')";
 		} elseif ( 'none' == $_orderby ) {
 			$orderby = '';
@@ -893,12 +894,12 @@ class WP_Term_Query {
 			return $orderby;
 		}
 
-		$allowed_keys = array();
-		$primary_meta_key = null;
+		$allowed_keys       = array();
+		$primary_meta_key   = null;
 		$primary_meta_query = reset( $meta_clauses );
 		if ( ! empty( $primary_meta_query['key'] ) ) {
 			$primary_meta_key = $primary_meta_query['key'];
-			$allowed_keys[] = $primary_meta_key;
+			$allowed_keys[]   = $primary_meta_key;
 		}
 		$allowed_keys[] = 'meta_value';
 		$allowed_keys[] = 'meta_value_num';
@@ -908,7 +909,7 @@ class WP_Term_Query {
 			return $orderby;
 		}
 
-		switch( $orderby_raw ) {
+		switch ( $orderby_raw ) {
 			case $primary_meta_key:
 			case 'meta_value':
 				if ( ! empty( $primary_meta_query['type'] ) ) {
@@ -926,7 +927,7 @@ class WP_Term_Query {
 				if ( array_key_exists( $orderby_raw, $meta_clauses ) ) {
 					// $orderby corresponds to a meta_query clause.
 					$meta_clause = $meta_clauses[ $orderby_raw ];
-					$orderby = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
+					$orderby     = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
 				}
 				break;
 		}
diff --git a/wp-includes/class-wp-term.php b/wp-includes/class-wp-term.php
index a036871c26..02dfacc39b 100644
--- a/wp-includes/class-wp-term.php
+++ b/wp-includes/class-wp-term.php
@@ -143,11 +143,11 @@ final class WP_Term {
 					}
 				}
 
-			// If only one match was found, it's the one we want.
+				// If only one match was found, it's the one we want.
 			} elseif ( 1 === count( $terms ) ) {
 				$_term = reset( $terms );
 
-			// Otherwise, the term must be shared between taxonomies.
+				// Otherwise, the term must be shared between taxonomies.
 			} else {
 				// If the term is shared only with invalid taxonomies, return the one valid term.
 				foreach ( $terms as $t ) {
@@ -232,8 +232,8 @@ final class WP_Term {
 	 */
 	public function __get( $key ) {
 		switch ( $key ) {
-			case 'data' :
-				$data = new stdClass();
+			case 'data':
+				$data    = new stdClass();
 				$columns = array( 'term_id', 'name', 'slug', 'term_group', 'term_taxonomy_id', 'taxonomy', 'description', 'parent', 'count' );
 				foreach ( $columns as $column ) {
 					$data->{$column} = isset( $this->{$column} ) ? $this->{$column} : null;
diff --git a/wp-includes/class-wp-text-diff-renderer-inline.php b/wp-includes/class-wp-text-diff-renderer-inline.php
index 236e388be0..62a33033e3 100644
--- a/wp-includes/class-wp-text-diff-renderer-inline.php
+++ b/wp-includes/class-wp-text-diff-renderer-inline.php
@@ -23,8 +23,8 @@ class WP_Text_Diff_Renderer_inline extends Text_Diff_Renderer_inline {
 	 * @param string $newlineEscape
 	 * @return string
 	 */
-	public function _splitOnWords($string, $newlineEscape = "\n") {
-		$string = str_replace("\0", '', $string);
+	public function _splitOnWords( $string, $newlineEscape = "\n" ) {
+		$string = str_replace( "\0", '', $string );
 		$words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
 		$words  = str_replace( "\n", $newlineEscape, $words );
 		return $words;
diff --git a/wp-includes/class-wp-text-diff-renderer-table.php b/wp-includes/class-wp-text-diff-renderer-table.php
index 25ce839faf..a158ea22c2 100644
--- a/wp-includes/class-wp-text-diff-renderer-table.php
+++ b/wp-includes/class-wp-text-diff-renderer-table.php
@@ -20,7 +20,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * @var int
 	 * @since 2.6.0
 	 */
-	public $_leading_context_lines  = 10000;
+	public $_leading_context_lines = 10000;
 
 	/**
 	 * @see Text_Diff_Renderer::_trailing_context_lines
@@ -66,8 +66,9 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 */
 	public function __construct( $params = array() ) {
 		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+		if ( isset( $params['show_split_view'] ) ) {
+			$this->_show_split_view = $params['show_split_view'];
+		}
 	}
 
 	/**
@@ -86,7 +87,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 * @param array $lines
 	 * @param string $prefix
 	 */
-	public function _lines( $lines, $prefix=' ' ) {
+	public function _lines( $lines, $prefix = ' ' ) {
 	}
 
 	/**
@@ -138,7 +139,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 */
 	public function _added( $lines, $encode = true ) {
 		$r = '';
-		foreach ($lines as $line) {
+		foreach ( $lines as $line ) {
 			if ( $encode ) {
 				$processed_line = htmlspecialchars( $line );
 
@@ -153,7 +154,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 				 *
 				 * @param String $processed_line The processed diffed line.
 				 * @param String $line           The unprocessed diffed line.
-		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
+				 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
 			}
@@ -176,7 +177,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 */
 	public function _deleted( $lines, $encode = true ) {
 		$r = '';
-		foreach ($lines as $line) {
+		foreach ( $lines as $line ) {
 			if ( $encode ) {
 				$processed_line = htmlspecialchars( $line );
 
@@ -188,7 +189,6 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 			} else {
 				$r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
 			}
-
 		}
 		return $r;
 	}
@@ -202,15 +202,15 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 */
 	public function _context( $lines, $encode = true ) {
 		$r = '';
-		foreach ($lines as $line) {
+		foreach ( $lines as $line ) {
 			if ( $encode ) {
 				$processed_line = htmlspecialchars( $line );
 
 				/** This filter is documented in wp-includes/wp-diff.php */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
 			}
-			if (  $this->_show_split_view ) {
-				$r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
+			if ( $this->_show_split_view ) {
+				$r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line ) . "</tr>\n";
 			} else {
 				$r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
 			}
@@ -248,58 +248,62 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 
 		// Compute word diffs for each matched pair using the inline diff
 		foreach ( $orig_matches as $o => $f ) {
-			if ( is_numeric($o) && is_numeric($f) ) {
-				$text_diff = new Text_Diff( 'auto', array( array($orig[$o]), array($final[$f]) ) );
-				$renderer = new $this->inline_diff_renderer;
-				$diff = $renderer->render( $text_diff );
+			if ( is_numeric( $o ) && is_numeric( $f ) ) {
+				$text_diff = new Text_Diff( 'auto', array( array( $orig[ $o ] ), array( $final[ $f ] ) ) );
+				$renderer  = new $this->inline_diff_renderer;
+				$diff      = $renderer->render( $text_diff );
 
 				// If they're too different, don't include any <ins> or <dels>
 				if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
 					// length of all text between <ins> or <del>
-					$stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) ));
+					$stripped_matches = strlen( strip_tags( join( ' ', $diff_matches[0] ) ) );
 					// since we count lengith of text between <ins> or <del> (instead of picking just one),
 					//	we double the length of chars not in those tags.
-					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
-					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
+					$stripped_diff = strlen( strip_tags( $diff ) ) * 2 - $stripped_matches;
+					$diff_ratio    = $stripped_matches / $stripped_diff;
+					if ( $diff_ratio > $this->_diff_threshold ) {
 						continue; // Too different. Don't save diffs.
+					}
 				}
 
 				// Un-inline the diffs by removing del or ins
-				$orig_diffs[$o]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
-				$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff );
+				$orig_diffs[ $o ]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
+				$final_diffs[ $f ] = preg_replace( '|<del>.*?</del>|', '', $diff );
 			}
 		}
 
-		foreach ( array_keys($orig_rows) as $row ) {
+		foreach ( array_keys( $orig_rows ) as $row ) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
+			if ( $orig_rows[ $row ] < 0 && $final_rows[ $row ] < 0 ) {
 				continue;
+			}
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
-				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
-				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
-			else
+			if ( isset( $orig_diffs[ $orig_rows[ $row ] ] ) ) {
+				$orig_line = $orig_diffs[ $orig_rows[ $row ] ];
+			} elseif ( isset( $orig[ $orig_rows[ $row ] ] ) ) {
+				$orig_line = htmlspecialchars( $orig[ $orig_rows[ $row ] ] );
+			} else {
 				$orig_line = '';
+			}
 
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
-				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
-				$final_line = htmlspecialchars($final[$final_rows[$row]]);
-			else
+			if ( isset( $final_diffs[ $final_rows[ $row ] ] ) ) {
+				$final_line = $final_diffs[ $final_rows[ $row ] ];
+			} elseif ( isset( $final[ $final_rows[ $row ] ] ) ) {
+				$final_line = htmlspecialchars( $final[ $final_rows[ $row ] ] );
+			} else {
 				$final_line = '';
+			}
 
-			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
-				$r .= $this->_added( array($final_line), false );
-			} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
-				$r .= $this->_deleted( array($orig_line), false );
+			if ( $orig_rows[ $row ] < 0 ) { // Orig is blank. This is really an added row.
+				$r .= $this->_added( array( $final_line ), false );
+			} elseif ( $final_rows[ $row ] < 0 ) { // Final is blank. This is really a deleted row.
+				$r .= $this->_deleted( array( $orig_line ), false );
 			} else { // A true changed row.
 				if ( $this->_show_split_view ) {
 					$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
 				} else {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . "</tr><tr>" . $this->addedLine( $final_line ) . "</tr>\n";
+					$r .= '<tr>' . $this->deletedLine( $orig_line ) . '</tr><tr>' . $this->addedLine( $final_line ) . "</tr>\n";
 				}
 			}
 		}
@@ -339,80 +343,85 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 
 		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
 		$matches = array();
-		foreach ( array_keys($orig) as $o ) {
-			foreach ( array_keys($final) as $f ) {
-				$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] );
+		foreach ( array_keys( $orig ) as $o ) {
+			foreach ( array_keys( $final ) as $f ) {
+				$matches[ "$o,$f" ] = $this->compute_string_distance( $orig[ $o ], $final[ $f ] );
 			}
 		}
-		asort($matches); // Order by string distance.
+		asort( $matches ); // Order by string distance.
 
 		$orig_matches  = array();
 		$final_matches = array();
 
 		foreach ( $matches as $keys => $difference ) {
-			list($o, $f) = explode(',', $keys);
-			$o = (int) $o;
-			$f = (int) $f;
+			list($o, $f) = explode( ',', $keys );
+			$o           = (int) $o;
+			$f           = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
+			if ( isset( $orig_matches[ $o ] ) && isset( $final_matches[ $f ] ) ) {
 				continue;
+			}
 
 			// First match for these guys. Must be best match
-			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
-				$orig_matches[$o] = $f;
-				$final_matches[$f] = $o;
+			if ( ! isset( $orig_matches[ $o ] ) && ! isset( $final_matches[ $f ] ) ) {
+				$orig_matches[ $o ]  = $f;
+				$final_matches[ $f ] = $o;
 				continue;
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
-				$final_matches[$f] = 'x';
-
-			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
-				$orig_matches[$o] = 'x';
+			if ( isset( $orig_matches[ $o ] ) ) {
+				$final_matches[ $f ] = 'x';
+			} // Best match of this orig is already taken?  Must mean this orig is a deleted row.
+			elseif ( isset( $final_matches[ $f ] ) ) {
+				$orig_matches[ $o ] = 'x';
+			}
 		}
 
 		// We read the text in this order
-		ksort($orig_matches);
-		ksort($final_matches);
+		ksort( $orig_matches );
+		ksort( $final_matches );
 
 		// Stores rows and blanks for each column.
-		$orig_rows = $orig_rows_copy = array_keys($orig_matches);
-		$final_rows = array_keys($final_matches);
+		$orig_rows  = $orig_rows_copy = array_keys( $orig_matches );
+		$final_rows = array_keys( $final_matches );
 
 		// Interleaves rows with blanks to keep matches aligned.
 		// We may end up with some extraneous blank rows, but we'll just ignore them later.
 		foreach ( $orig_rows_copy as $orig_row ) {
-			$final_pos = array_search($orig_matches[$orig_row], $final_rows, true);
-			$orig_pos = (int) array_search($orig_row, $orig_rows, true);
+			$final_pos = array_search( $orig_matches[ $orig_row ], $final_rows, true );
+			$orig_pos  = (int) array_search( $orig_row, $orig_rows, true );
 
 			if ( false === $final_pos ) { // This orig is paired with a blank final.
 				array_splice( $final_rows, $orig_pos, 0, -1 );
 			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
+				while ( $diff_pos < 0 ) {
 					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
+				while ( $diff_pos < 0 ) {
 					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
-		$diff_count = count($orig_rows) - count($final_rows);
+		$diff_count = count( $orig_rows ) - count( $final_rows );
 		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
-				array_push($orig_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+				array_push( $orig_rows, $diff_count++ );
+			}
 		} elseif ( $diff_count > 0 ) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
-				array_push($final_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+				array_push( $final_rows, $diff_count++ );
+			}
 		}
 
-		return array($orig_matches, $final_matches, $orig_rows, $final_rows);
+		return array( $orig_matches, $final_matches, $orig_rows, $final_rows );
 	}
 
 	/**
@@ -426,18 +435,19 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer {
 	 */
 	public function compute_string_distance( $string1, $string2 ) {
 		// Vectors containing character frequency for all chars in each string
-		$chars1 = count_chars($string1);
-		$chars2 = count_chars($string2);
+		$chars1 = count_chars( $string1 );
+		$chars2 = count_chars( $string2 );
 
 		// L1-norm of difference vector.
-		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
+		$difference = array_sum( array_map( array( $this, 'difference' ), $chars1, $chars2 ) );
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
+		if ( ! $string1 ) {
 			return $difference;
+		}
 
 		// Return distance per character (of string1).
-		return $difference / strlen($string1);
+		return $difference / strlen( $string1 );
 	}
 
 	/**
diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php
index d98085a3df..683065cd2f 100644
--- a/wp-includes/class-wp-theme.php
+++ b/wp-includes/class-wp-theme.php
@@ -193,8 +193,9 @@ final class WP_Theme implements ArrayAccess {
 			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
 			if ( self::$persistently_cache ) {
 				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
+				if ( is_int( self::$persistently_cache ) ) {
 					self::$cache_expiration = self::$persistently_cache;
+				}
 			} else {
 				wp_cache_add_non_persistent_groups( 'themes' );
 			}
@@ -210,50 +211,76 @@ final class WP_Theme implements ArrayAccess {
 		}
 
 		$this->cache_hash = md5( $this->theme_root . '/' . $this->stylesheet );
-		$theme_file = $this->stylesheet . '/style.css';
+		$theme_file       = $this->stylesheet . '/style.css';
 
 		$cache = $this->cache_get( 'theme' );
 
 		if ( is_array( $cache ) ) {
 			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
+				if ( isset( $cache[ $key ] ) ) {
 					$this->$key = $cache[ $key ];
+				}
 			}
-			if ( $this->errors )
+			if ( $this->errors ) {
 				return;
-			if ( isset( $cache['theme_root_template'] ) )
+			}
+			if ( isset( $cache['theme_root_template'] ) ) {
 				$theme_root_template = $cache['theme_root_template'];
+			}
 		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
+			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) ) {
 				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
-			else
+			} else {
 				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			}
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
+			$this->cache_add(
+				'theme', array(
+					'headers'    => $this->headers,
+					'errors'     => $this->errors,
+					'stylesheet' => $this->stylesheet,
+					'template'   => $this->template,
+				)
+			);
+			if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one.
 				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn&#8217;t exist. Please check your installation.' ) );
+			}
 			return;
 		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
-			$this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
-			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+			$this->errors          = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
+			$this->template        = $this->stylesheet;
+			$this->cache_add(
+				'theme', array(
+					'headers'    => $this->headers,
+					'errors'     => $this->errors,
+					'stylesheet' => $this->stylesheet,
+					'template'   => $this->template,
+				)
+			);
 			return;
 		} else {
 			$this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
 			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
+				if ( basename( $this->stylesheet ) != $default_theme_slug ) {
 					$this->headers['Name'] .= '/' . $this->stylesheet;
+				}
 			}
 		}
 
 		if ( ! $this->template && $this->stylesheet === $this->headers['Template'] ) {
 			/* 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( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet ) );
+			$this->cache_add(
+				'theme', array(
+					'headers'    => $this->headers,
+					'errors'     => $this->errors,
+					'stylesheet' => $this->stylesheet,
+				)
+			);
 
 			return;
 		}
@@ -270,7 +297,14 @@ final class WP_Theme implements ArrayAccess {
 					'<code>style.css</code>'
 				);
 				$this->errors = new WP_Error( 'theme_no_index', $error_message );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				$this->cache_add(
+					'theme', array(
+						'headers'    => $this->headers,
+						'errors'     => $this->errors,
+						'stylesheet' => $this->stylesheet,
+						'template'   => $this->template,
+					)
+				);
 				return;
 			}
 		}
@@ -289,7 +323,14 @@ final class WP_Theme implements ArrayAccess {
 			} else {
 				// 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( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				$this->cache_add(
+					'theme', array(
+						'headers'    => $this->headers,
+						'errors'     => $this->errors,
+						'stylesheet' => $this->stylesheet,
+						'template'   => $this->template,
+					)
+				);
 				$this->parent = new WP_Theme( $this->template, $this->theme_root, $this );
 				return;
 			}
@@ -301,11 +342,25 @@ final class WP_Theme implements ArrayAccess {
 			if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
 				$_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( 'headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template ) );
+				$_child->cache_add(
+					'theme', array(
+						'headers'    => $_child->headers,
+						'errors'     => $_child->errors,
+						'stylesheet' => $_child->stylesheet,
+						'template'   => $_child->template,
+					)
+				);
 				// The two themes actually reference each other with the Template header.
 				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( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+					$this->cache_add(
+						'theme', array(
+							'headers'    => $this->headers,
+							'errors'     => $this->errors,
+							'stylesheet' => $this->stylesheet,
+							'template'   => $this->template,
+						)
+					);
 				}
 				return;
 			}
@@ -315,10 +370,16 @@ final class WP_Theme implements ArrayAccess {
 
 		// We're good. If we didn't retrieve from cache, set it.
 		if ( ! is_array( $cache ) ) {
-			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
+			$cache = array(
+				'headers'    => $this->headers,
+				'errors'     => $this->errors,
+				'stylesheet' => $this->stylesheet,
+				'template'   => $this->template,
+			);
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
+			if ( isset( $theme_root_template ) ) {
 				$cache['theme_root_template'] = $theme_root_template;
+			}
 			$this->cache_add( 'theme', $cache );
 		}
 	}
@@ -331,7 +392,7 @@ final class WP_Theme implements ArrayAccess {
 	 * @return string Theme name, ready for display (translated)
 	 */
 	public function __toString() {
-		return (string) $this->display('Name');
+		return (string) $this->display( 'Name' );
 	}
 
 	/**
@@ -346,8 +407,20 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	public function __isset( $offset ) {
 		static $properties = array(
-			'name', 'title', 'version', 'parent_theme', 'template_dir', 'stylesheet_dir', 'template', 'stylesheet',
-			'screenshot', 'description', 'author', 'tags', 'theme_root', 'theme_root_uri',
+			'name',
+			'title',
+			'version',
+			'parent_theme',
+			'template_dir',
+			'stylesheet_dir',
+			'template',
+			'stylesheet',
+			'screenshot',
+			'description',
+			'author',
+			'tags',
+			'theme_root',
+			'theme_root_uri',
 		);
 
 		return in_array( $offset, $properties );
@@ -363,36 +436,36 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	public function __get( $offset ) {
 		switch ( $offset ) {
-			case 'name' :
-			case 'title' :
-				return $this->get('Name');
-			case 'version' :
-				return $this->get('Version');
-			case 'parent_theme' :
-				return $this->parent() ? $this->parent()->get('Name') : '';
-			case 'template_dir' :
+			case 'name':
+			case 'title':
+				return $this->get( 'Name' );
+			case 'version':
+				return $this->get( 'Version' );
+			case 'parent_theme':
+				return $this->parent() ? $this->parent()->get( 'Name' ) : '';
+			case 'template_dir':
 				return $this->get_template_directory();
-			case 'stylesheet_dir' :
+			case 'stylesheet_dir':
 				return $this->get_stylesheet_directory();
-			case 'template' :
+			case 'template':
 				return $this->get_template();
-			case 'stylesheet' :
+			case 'stylesheet':
 				return $this->get_stylesheet();
-			case 'screenshot' :
+			case 'screenshot':
 				return $this->get_screenshot( 'relative' );
 			// 'author' and 'description' did not previously return translated data.
-			case 'description' :
-				return $this->display('Description');
-			case 'author' :
-				return $this->display('Author');
-			case 'tags' :
+			case 'description':
+				return $this->display( 'Description' );
+			case 'author':
+				return $this->display( 'Author' );
+			case 'tags':
 				return $this->get( 'Tags' );
-			case 'theme_root' :
+			case 'theme_root':
 				return $this->get_theme_root();
-			case 'theme_root_uri' :
+			case 'theme_root_uri':
 				return $this->get_theme_root_uri();
 			// For cases where the array was converted to an object.
-			default :
+			default:
 				return $this->offsetGet( $offset );
 		}
 	}
@@ -428,9 +501,25 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	public function offsetExists( $offset ) {
 		static $keys = array(
-			'Name', 'Version', 'Status', 'Title', 'Author', 'Author Name', 'Author URI', 'Description',
-			'Template', 'Stylesheet', 'Template Files', 'Stylesheet Files', 'Template Dir', 'Stylesheet Dir',
-			'Screenshot', 'Tags', 'Theme Root', 'Theme Root URI', 'Parent Theme',
+			'Name',
+			'Version',
+			'Status',
+			'Title',
+			'Author',
+			'Author Name',
+			'Author URI',
+			'Description',
+			'Template',
+			'Stylesheet',
+			'Template Files',
+			'Stylesheet Files',
+			'Template Dir',
+			'Stylesheet Dir',
+			'Screenshot',
+			'Tags',
+			'Theme Root',
+			'Theme Root URI',
+			'Parent Theme',
 		);
 
 		return in_array( $offset, $keys );
@@ -453,47 +542,47 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	public function offsetGet( $offset ) {
 		switch ( $offset ) {
-			case 'Name' :
-			case 'Title' :
+			case 'Name':
+			case 'Title':
 				/*
 				 * See note above about using translated data. get() is not ideal.
 				 * It is only for backward compatibility. Use display().
 				 */
-				return $this->get('Name');
-			case 'Author' :
-				return $this->display( 'Author');
-			case 'Author Name' :
-				return $this->display( 'Author', false);
-			case 'Author URI' :
-				return $this->display('AuthorURI');
-			case 'Description' :
-				return $this->display( 'Description');
-			case 'Version' :
-			case 'Status' :
+				return $this->get( 'Name' );
+			case 'Author':
+				return $this->display( 'Author' );
+			case 'Author Name':
+				return $this->display( 'Author', false );
+			case 'Author URI':
+				return $this->display( 'AuthorURI' );
+			case 'Description':
+				return $this->display( 'Description' );
+			case 'Version':
+			case 'Status':
 				return $this->get( $offset );
-			case 'Template' :
+			case 'Template':
 				return $this->get_template();
-			case 'Stylesheet' :
+			case 'Stylesheet':
 				return $this->get_stylesheet();
-			case 'Template Files' :
+			case 'Template Files':
 				return $this->get_files( 'php', 1, true );
-			case 'Stylesheet Files' :
+			case 'Stylesheet Files':
 				return $this->get_files( 'css', 0, false );
-			case 'Template Dir' :
+			case 'Template Dir':
 				return $this->get_template_directory();
-			case 'Stylesheet Dir' :
+			case 'Stylesheet Dir':
 				return $this->get_stylesheet_directory();
-			case 'Screenshot' :
+			case 'Screenshot':
 				return $this->get_screenshot( 'relative' );
-			case 'Tags' :
-				return $this->get('Tags');
-			case 'Theme Root' :
+			case 'Tags':
+				return $this->get( 'Tags' );
+			case 'Theme Root':
 				return $this->get_theme_root();
-			case 'Theme Root URI' :
+			case 'Theme Root URI':
 				return $this->get_theme_root_uri();
-			case 'Parent Theme' :
-				return $this->parent() ? $this->parent()->get('Name') : '';
-			default :
+			case 'Parent Theme':
+				return $this->parent() ? $this->parent()->get( 'Name' ) : '';
+			default:
 				return null;
 		}
 	}
@@ -569,10 +658,11 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'post_templates' ) as $key )
+		foreach ( array( 'theme', 'screenshot', 'headers', 'post_templates' ) as $key ) {
 			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		}
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
-		$this->headers = array();
+		$this->headers  = array();
 		$this->__construct( $this->stylesheet, $this->theme_root );
 	}
 
@@ -593,22 +683,26 @@ final class WP_Theme implements ArrayAccess {
 	 * @return string|false String on success, false on failure.
 	 */
 	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
+		if ( ! isset( $this->headers[ $header ] ) ) {
 			return false;
+		}
 
 		if ( ! isset( $this->headers_sanitized ) ) {
 			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
+			if ( ! is_array( $this->headers_sanitized ) ) {
 				$this->headers_sanitized = array();
+			}
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
+		if ( isset( $this->headers_sanitized[ $header ] ) ) {
 			return $this->headers_sanitized[ $header ];
+		}
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
 		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
+			foreach ( array_keys( $this->headers ) as $_header ) {
 				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			}
 			$this->cache_add( 'headers', $this->headers_sanitized );
 		} else {
 			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
@@ -633,14 +727,17 @@ final class WP_Theme implements ArrayAccess {
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
+		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) ) {
 			$translate = false;
+		}
 
-		if ( $translate )
+		if ( $translate ) {
 			$value = $this->translate_header( $header, $value );
+		}
 
-		if ( $markup )
+		if ( $markup ) {
 			$value = $this->markup_header( $header, $value, $translate );
+		}
 
 		return $value;
 	}
@@ -659,13 +756,13 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	private function sanitize_header( $header, $value ) {
 		switch ( $header ) {
-			case 'Status' :
+			case 'Status':
 				if ( ! $value ) {
 					$value = 'publish';
 					break;
 				}
 				// Fall through otherwise.
-			case 'Name' :
+			case 'Name':
 				static $header_tags = array(
 					'abbr'    => array( 'title' => true ),
 					'acronym' => array( 'title' => true ),
@@ -673,29 +770,32 @@ final class WP_Theme implements ArrayAccess {
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags );
+				$value              = wp_kses( $value, $header_tags );
 				break;
-			case 'Author' :
+			case 'Author':
 				// There shouldn't be anchor tags in Author, but some themes like to be challenging.
-			case 'Description' :
+			case 'Description':
 				static $header_tags_with_a = array(
-					'a'       => array( 'href' => true, 'title' => true ),
+					'a'       => array(
+						'href'  => true,
+						'title' => true,
+					),
 					'abbr'    => array( 'title' => true ),
 					'acronym' => array( 'title' => true ),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags_with_a );
+				$value                     = wp_kses( $value, $header_tags_with_a );
 				break;
-			case 'ThemeURI' :
-			case 'AuthorURI' :
+			case 'ThemeURI':
+			case 'AuthorURI':
 				$value = esc_url_raw( $value );
 				break;
-			case 'Tags' :
+			case 'Tags':
 				$value = array_filter( array_map( 'trim', explode( ',', strip_tags( $value ) ) ) );
 				break;
-			case 'Version' :
+			case 'Version':
 				$value = strip_tags( $value );
 				break;
 		}
@@ -706,7 +806,7 @@ final class WP_Theme implements ArrayAccess {
 	/**
 	 * Mark up a theme header.
 	 *
-     * @since 3.4.0
+	 * @since 3.4.0
 	 *
 	 * @staticvar string $comma
 	 *
@@ -717,22 +817,22 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	private function markup_header( $header, $value, $translate ) {
 		switch ( $header ) {
-			case 'Name' :
+			case 'Name':
 				if ( empty( $value ) ) {
 					$value = esc_html( $this->get_stylesheet() );
 				}
 				break;
-			case 'Description' :
+			case 'Description':
 				$value = wptexturize( $value );
 				break;
-			case 'Author' :
-				if ( $this->get('AuthorURI') ) {
+			case 'Author':
+				if ( $this->get( 'AuthorURI' ) ) {
 					$value = sprintf( '<a href="%1$s">%2$s</a>', $this->display( 'AuthorURI', true, $translate ), $value );
 				} elseif ( ! $value ) {
 					$value = __( 'Anonymous' );
 				}
 				break;
-			case 'Tags' :
+			case 'Tags':
 				static $comma = null;
 				if ( ! isset( $comma ) ) {
 					/* translators: used between list items, there is a space after the comma */
@@ -740,8 +840,8 @@ final class WP_Theme implements ArrayAccess {
 				}
 				$value = implode( $comma, $value );
 				break;
-			case 'ThemeURI' :
-			case 'AuthorURI' :
+			case 'ThemeURI':
+			case 'AuthorURI':
 				$value = esc_url( $value );
 				break;
 		}
@@ -762,13 +862,14 @@ final class WP_Theme implements ArrayAccess {
 	 */
 	private function translate_header( $header, $value ) {
 		switch ( $header ) {
-			case 'Name' :
+			case 'Name':
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
+				if ( isset( $this->name_translated ) ) {
 					return $this->name_translated;
-				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
+				}
+				$this->name_translated = translate( $value, $this->get( 'TextDomain' ) );
 				return $this->name_translated;
-			case 'Tags' :
+			case 'Tags':
 				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) ) {
 					return $value;
 				}
@@ -777,14 +878,27 @@ final class WP_Theme implements ArrayAccess {
 				if ( ! isset( $tags_list ) ) {
 					$tags_list = array(
 						// As of 4.6, deprecated tags which are only used to provide translation for older themes.
-						'black' => __( 'Black' ), 'blue' => __( 'Blue' ), 'brown'  => __( 'Brown' ),
-						'gray' => __( 'Gray' ), 'green'  => __( 'Green' ), 'orange' => __( 'Orange' ),
-						'pink' => __( 'Pink' ), 'purple' => __( 'Purple' ), 'red' => __( 'Red' ),
-						'silver' => __( 'Silver' ), 'tan' => __( 'Tan' ), 'white' => __( 'White' ),
-						'yellow' => __( 'Yellow' ), 'dark' => __( 'Dark' ), 'light' => __( 'Light' ),
-						'fixed-layout' => __( 'Fixed Layout' ), 'fluid-layout' => __( 'Fluid Layout' ),
-						'responsive-layout' => __( 'Responsive Layout' ), 'blavatar' => __( 'Blavatar' ),
-						'photoblogging' => __( 'Photoblogging' ), 'seasonal' => __( 'Seasonal' ),
+						'black'             => __( 'Black' ),
+						'blue'              => __( 'Blue' ),
+						'brown'             => __( 'Brown' ),
+						'gray'              => __( 'Gray' ),
+						'green'             => __( 'Green' ),
+						'orange'            => __( 'Orange' ),
+						'pink'              => __( 'Pink' ),
+						'purple'            => __( 'Purple' ),
+						'red'               => __( 'Red' ),
+						'silver'            => __( 'Silver' ),
+						'tan'               => __( 'Tan' ),
+						'white'             => __( 'White' ),
+						'yellow'            => __( 'Yellow' ),
+						'dark'              => __( 'Dark' ),
+						'light'             => __( 'Light' ),
+						'fixed-layout'      => __( 'Fixed Layout' ),
+						'fluid-layout'      => __( 'Fluid Layout' ),
+						'responsive-layout' => __( 'Responsive Layout' ),
+						'blavatar'          => __( 'Blavatar' ),
+						'photoblogging'     => __( 'Photoblogging' ),
+						'seasonal'          => __( 'Seasonal' ),
 					);
 
 					$feature_list = get_theme_feature_list( false ); // No API
@@ -803,8 +917,8 @@ final class WP_Theme implements ArrayAccess {
 
 				return $value;
 
-			default :
-				$value = translate( $value, $this->get('TextDomain') );
+			default:
+				$value = translate( $value, $this->get( 'TextDomain' ) );
 		}
 		return $value;
 	}
@@ -848,8 +962,9 @@ final class WP_Theme implements ArrayAccess {
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
+		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) ) {
 			return '';
+		}
 
 		return $this->theme_root . '/' . $this->stylesheet;
 	}
@@ -865,10 +980,11 @@ final class WP_Theme implements ArrayAccess {
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
+		if ( $this->parent() ) {
 			$theme_root = $this->parent()->theme_root;
-		else
+		} else {
 			$theme_root = $this->theme_root;
+		}
 
 		return $theme_root . '/' . $this->template;
 	}
@@ -898,10 +1014,11 @@ final class WP_Theme implements ArrayAccess {
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
+		if ( $this->parent() ) {
 			$theme_root_uri = $this->parent()->get_theme_root_uri();
-		else
+		} else {
 			$theme_root_uri = $this->get_theme_root_uri();
+		}
 
 		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
 	}
@@ -931,8 +1048,9 @@ final class WP_Theme implements ArrayAccess {
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
+		if ( ! isset( $this->theme_root_uri ) ) {
 			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		}
 		return $this->theme_root_uri;
 	}
 
@@ -952,8 +1070,9 @@ final class WP_Theme implements ArrayAccess {
 	public function get_screenshot( $uri = 'uri' ) {
 		$screenshot = $this->cache_get( 'screenshot' );
 		if ( $screenshot ) {
-			if ( 'relative' == $uri )
+			if ( 'relative' == $uri ) {
 				return $screenshot;
+			}
 			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
 		} elseif ( 0 === $screenshot ) {
 			return false;
@@ -962,8 +1081,9 @@ final class WP_Theme implements ArrayAccess {
 		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
 			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
 				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
+				if ( 'relative' == $uri ) {
 					return 'screenshot.' . $ext;
+				}
 				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
 			}
 		}
@@ -1012,7 +1132,7 @@ final class WP_Theme implements ArrayAccess {
 		if ( ! is_array( $post_templates ) ) {
 			$post_templates = array();
 
-			$files = (array) $this->get_files( 'php', 1, true);
+			$files = (array) $this->get_files( 'php', 1, true );
 
 			foreach ( $files as $file => $full_path ) {
 				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) ) {
@@ -1109,7 +1229,7 @@ final class WP_Theme implements ArrayAccess {
 		}
 
 		if ( $extensions ) {
-			$extensions = (array) $extensions;
+			$extensions  = (array) $extensions;
 			$_extensions = implode( '|', $extensions );
 		}
 
@@ -1119,7 +1239,7 @@ final class WP_Theme implements ArrayAccess {
 		}
 
 		$results = scandir( $path );
-		$files = array();
+		$files   = array();
 
 		/**
 		 * Filters the array of excluded directories and files while scanning theme folder.
@@ -1138,7 +1258,7 @@ final class WP_Theme implements ArrayAccess {
 				if ( ! $depth ) {
 					continue;
 				}
-				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
+				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1, $relative_path . $result );
 				$files = array_merge_recursive( $files, $found );
 			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
 				$files[ $relative_path . $result ] = $path . '/' . $result;
@@ -1157,13 +1277,14 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @return bool True if the textdomain was successfully loaded or has already been loaded.
-	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
+	 *  False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
+		if ( isset( $this->textdomain_loaded ) ) {
 			return $this->textdomain_loaded;
+		}
 
-		$textdomain = $this->get('TextDomain');
+		$textdomain = $this->get( 'TextDomain' );
 		if ( ! $textdomain ) {
 			$this->textdomain_loaded = false;
 			return false;
@@ -1175,10 +1296,11 @@ final class WP_Theme implements ArrayAccess {
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
+		if ( $domainpath = $this->get( 'DomainPath' ) ) {
 			$path .= $domainpath;
-		else
+		} else {
 			$path .= '/languages';
+		}
 
 		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
 		return $this->textdomain_loaded;
@@ -1190,24 +1312,27 @@ final class WP_Theme implements ArrayAccess {
 	 * @since 3.4.0
 	 *
 	 * @param string $check Optional. Whether to check only the 'network'-wide settings, the 'site'
-	 * 	settings, or 'both'. Defaults to 'both'.
+	 *  settings, or 'both'. Defaults to 'both'.
 	 * @param int $blog_id Optional. Ignored if only network-wide settings are checked. Defaults to current site.
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
 	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
+		if ( ! is_multisite() ) {
 			return true;
+		}
 
 		if ( 'both' == $check || 'network' == $check ) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
 				return true;
+			}
 		}
 
 		if ( 'both' == $check || 'site' == $check ) {
 			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
 				return true;
+			}
 		}
 
 		return false;
@@ -1302,8 +1427,9 @@ final class WP_Theme implements ArrayAccess {
 	public static function get_allowed_on_site( $blog_id = null ) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
+		if ( ! $blog_id || ! is_multisite() ) {
 			$blog_id = get_current_blog_id();
+		}
 
 		if ( isset( $allowed_themes[ $blog_id ] ) ) {
 			/**
@@ -1342,10 +1468,11 @@ final class WP_Theme implements ArrayAccess {
 				$allowed_themes[ $blog_id ] = array();
 			} else {
 				$converted = array();
-				$themes = wp_get_themes();
+				$themes    = wp_get_themes();
 				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
+					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get( 'Name' ) ] ) ) {
 						$converted[ $stylesheet ] = true;
+					}
 				}
 				$allowed_themes[ $blog_id ] = $converted;
 			}
diff --git a/wp-includes/class-wp-user-query.php b/wp-includes/class-wp-user-query.php
index 979819b722..d7ebfec60f 100644
--- a/wp-includes/class-wp-user-query.php
+++ b/wp-includes/class-wp-user-query.php
@@ -89,32 +89,32 @@ class WP_User_Query {
 	 */
 	public static function fill_query_vars( $args ) {
 		$defaults = array(
-			'blog_id' => get_current_blog_id(),
-			'role' => '',
-			'role__in' => array(),
-			'role__not_in' => array(),
-			'meta_key' => '',
-			'meta_value' => '',
-			'meta_compare' => '',
-			'include' => array(),
-			'exclude' => array(),
-			'search' => '',
-			'search_columns' => array(),
-			'orderby' => 'login',
-			'order' => 'ASC',
-			'offset' => '',
-			'number' => '',
-			'paged' => 1,
-			'count_total' => true,
-			'fields' => 'all',
-			'who' => '',
+			'blog_id'             => get_current_blog_id(),
+			'role'                => '',
+			'role__in'            => array(),
+			'role__not_in'        => array(),
+			'meta_key'            => '',
+			'meta_value'          => '',
+			'meta_compare'        => '',
+			'include'             => array(),
+			'exclude'             => array(),
+			'search'              => '',
+			'search_columns'      => array(),
+			'orderby'             => 'login',
+			'order'               => 'ASC',
+			'offset'              => '',
+			'number'              => '',
+			'paged'               => 1,
+			'count_total'         => true,
+			'fields'              => 'all',
+			'who'                 => '',
 			'has_published_posts' => null,
-			'nicename' => '',
-			'nicename__in' => array(),
-			'nicename__not_in' => array(),
-			'login' => '',
-			'login__in' => array(),
-			'login__not_in' => array()
+			'nicename'            => '',
+			'nicename__in'        => array(),
+			'nicename__not_in'    => array(),
+			'login'               => '',
+			'login__in'           => array(),
+			'login__not_in'       => array(),
 		);
 
 		return wp_parse_args( $args, $defaults );
@@ -134,7 +134,6 @@ class WP_User_Query {
 	 * @since 4.7.0 Added 'nicename', 'nicename__in', 'nicename__not_in', 'login', 'login__in',
 	 *              and 'login__not_in' parameters.
 	 *
-	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 * @global int  $blog_id
 	 *
@@ -213,7 +212,7 @@ class WP_User_Query {
 
 		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
 			$this->query_limit = null;
-			$this->query_vars = $this->fill_query_vars( $query );
+			$this->query_vars  = $this->fill_query_vars( $query );
 		}
 
 		/**
@@ -231,14 +230,14 @@ class WP_User_Query {
 
 		// Ensure that query vars are filled after 'pre_get_users'.
 		$qv =& $this->query_vars;
-		$qv =  $this->fill_query_vars( $qv );
+		$qv = $this->fill_query_vars( $qv );
 
 		if ( is_array( $qv['fields'] ) ) {
 			$qv['fields'] = array_unique( $qv['fields'] );
 
 			$this->query_fields = array();
 			foreach ( $qv['fields'] as $field ) {
-				$field = 'ID' === $field ? 'ID' : sanitize_key( $field );
+				$field                = 'ID' === $field ? 'ID' : sanitize_key( $field );
 				$this->query_fields[] = "$wpdb->users.$field";
 			}
 			$this->query_fields = implode( ',', $this->query_fields );
@@ -248,11 +247,12 @@ class WP_User_Query {
 			$this->query_fields = "$wpdb->users.ID";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
 			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		}
 
-		$this->query_from = "FROM $wpdb->users";
-		$this->query_where = "WHERE 1=1";
+		$this->query_from  = "FROM $wpdb->users";
+		$this->query_where = 'WHERE 1=1';
 
 		// Parse and sanitize 'include', for use by 'orderby' as well as 'include' below.
 		if ( ! empty( $qv['include'] ) ) {
@@ -277,42 +277,42 @@ class WP_User_Query {
 				$post_type = $wpdb->prepare( '%s', $post_type );
 			}
 
-			$posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
-			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
+			$posts_table        = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
+			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ', ', $post_types ) . ' ) )';
 		}
 
 		// nicename
-		if ( '' !== $qv['nicename']) {
+		if ( '' !== $qv['nicename'] ) {
 			$this->query_where .= $wpdb->prepare( ' AND user_nicename = %s', $qv['nicename'] );
 		}
 
 		if ( ! empty( $qv['nicename__in'] ) ) {
 			$sanitized_nicename__in = array_map( 'esc_sql', $qv['nicename__in'] );
-			$nicename__in = implode( "','", $sanitized_nicename__in );
-			$this->query_where .= " AND user_nicename IN ( '$nicename__in' )";
+			$nicename__in           = implode( "','", $sanitized_nicename__in );
+			$this->query_where     .= " AND user_nicename IN ( '$nicename__in' )";
 		}
 
 		if ( ! empty( $qv['nicename__not_in'] ) ) {
 			$sanitized_nicename__not_in = array_map( 'esc_sql', $qv['nicename__not_in'] );
-			$nicename__not_in = implode( "','", $sanitized_nicename__not_in );
-			$this->query_where .= " AND user_nicename NOT IN ( '$nicename__not_in' )";
+			$nicename__not_in           = implode( "','", $sanitized_nicename__not_in );
+			$this->query_where         .= " AND user_nicename NOT IN ( '$nicename__not_in' )";
 		}
 
 		// login
-		if ( '' !== $qv['login']) {
+		if ( '' !== $qv['login'] ) {
 			$this->query_where .= $wpdb->prepare( ' AND user_login = %s', $qv['login'] );
 		}
 
 		if ( ! empty( $qv['login__in'] ) ) {
 			$sanitized_login__in = array_map( 'esc_sql', $qv['login__in'] );
-			$login__in = implode( "','", $sanitized_login__in );
-			$this->query_where .= " AND user_login IN ( '$login__in' )";
+			$login__in           = implode( "','", $sanitized_login__in );
+			$this->query_where  .= " AND user_login IN ( '$login__in' )";
 		}
 
 		if ( ! empty( $qv['login__not_in'] ) ) {
 			$sanitized_login__not_in = array_map( 'esc_sql', $qv['login__not_in'] );
-			$login__not_in = implode( "','", $sanitized_login__not_in );
-			$this->query_where .= " AND user_login NOT IN ( '$login__not_in' )";
+			$login__not_in           = implode( "','", $sanitized_login__not_in );
+			$this->query_where      .= " AND user_login NOT IN ( '$login__not_in' )";
 		}
 
 		// Meta query.
@@ -321,8 +321,8 @@ class WP_User_Query {
 
 		if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
 			$who_query = array(
-				'key' => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
-				'value' => 0,
+				'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
+				'value'   => 0,
 				'compare' => '!=',
 			);
 
@@ -362,7 +362,7 @@ class WP_User_Query {
 		}
 
 		if ( $blog_id && ( ! empty( $roles ) || ! empty( $role__in ) || ! empty( $role__not_in ) || is_multisite() ) ) {
-			$role_queries  = array();
+			$role_queries = array();
 
 			$roles_clauses = array( 'relation' => 'AND' );
 			if ( ! empty( $roles ) ) {
@@ -406,7 +406,7 @@ class WP_User_Query {
 			// If there are no specific roles named, make sure the user is a member of the site.
 			if ( empty( $role_queries ) ) {
 				$role_queries[] = array(
-					'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+					'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
 					'compare' => 'EXISTS',
 				);
 			}
@@ -428,8 +428,8 @@ class WP_User_Query {
 		}
 
 		if ( ! empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
-			$this->query_from .= $clauses['join'];
+			$clauses            = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
+			$this->query_from  .= $clauses['join'];
 			$this->query_where .= $clauses['where'];
 
 			if ( $this->meta_query->has_or_relation() ) {
@@ -439,7 +439,7 @@ class WP_User_Query {
 
 		// sorting
 		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order = $this->parse_order( $qv['order'] );
+		$order       = $this->parse_order( $qv['order'] );
 
 		if ( empty( $qv['orderby'] ) ) {
 			// Default order is by 'user_login'.
@@ -460,11 +460,11 @@ class WP_User_Query {
 			if ( is_int( $_key ) ) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
-				$_order = $order;
+				$_order   = $order;
 			} else {
 				// Non-integer key means this the key is the field and the value is ASC/DESC.
 				$_orderby = $_key;
-				$_order = $_value;
+				$_order   = $_value;
 			}
 
 			$parsed = $this->parse_orderby( $_orderby );
@@ -490,43 +490,47 @@ class WP_User_Query {
 		// limit
 		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
 			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
+				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
 			} else {
-				$this->query_limit = $wpdb->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
 			}
 		}
 
 		$search = '';
-		if ( isset( $qv['search'] ) )
+		if ( isset( $qv['search'] ) ) {
 			$search = trim( $qv['search'] );
+		}
 
 		if ( $search ) {
-			$leading_wild = ( ltrim($search, '*') != $search );
-			$trailing_wild = ( rtrim($search, '*') != $search );
-			if ( $leading_wild && $trailing_wild )
+			$leading_wild  = ( ltrim( $search, '*' ) != $search );
+			$trailing_wild = ( rtrim( $search, '*' ) != $search );
+			if ( $leading_wild && $trailing_wild ) {
 				$wild = 'both';
-			elseif ( $leading_wild )
+			} elseif ( $leading_wild ) {
 				$wild = 'leading';
-			elseif ( $trailing_wild )
+			} elseif ( $trailing_wild ) {
 				$wild = 'trailing';
-			else
+			} else {
 				$wild = false;
-			if ( $wild )
-				$search = trim($search, '*');
+			}
+			if ( $wild ) {
+				$search = trim( $search, '*' );
+			}
 
 			$search_columns = array();
 			if ( $qv['search_columns'] ) {
 				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename', 'display_name' ) );
 			}
 			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@') )
-					$search_columns = array('user_email');
-				elseif ( is_numeric($search) )
-					$search_columns = array('user_login', 'ID');
-				elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) )
-					$search_columns = array('user_url');
-				else
-					$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
+				if ( false !== strpos( $search, '@' ) ) {
+					$search_columns = array( 'user_email' );
+				} elseif ( is_numeric( $search ) ) {
+					$search_columns = array( 'user_login', 'ID' );
+				} elseif ( preg_match( '|^https?://|', $search ) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) ) {
+					$search_columns = array( 'user_url' );
+				} else {
+					$search_columns = array( 'user_login', 'user_url', 'user_email', 'user_nicename', 'display_name' );
+				}
 			}
 
 			/**
@@ -548,16 +552,16 @@ class WP_User_Query {
 
 		if ( ! empty( $include ) ) {
 			// Sanitized earlier.
-			$ids = implode( ',', $include );
+			$ids                = implode( ',', $include );
 			$this->query_where .= " AND $wpdb->users.ID IN ($ids)";
 		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+			$ids                = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
 			$this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
 		}
 
 		// Date queries are allowed for the user_registered field.
 		if ( ! empty( $qv['date_query'] ) && is_array( $qv['date_query'] ) ) {
-			$date_query = new WP_Date_Query( $qv['date_query'], 'user_registered' );
+			$date_query         = new WP_Date_Query( $qv['date_query'], 'user_registered' );
 			$this->query_where .= $date_query->get_sql();
 		}
 
@@ -605,18 +609,21 @@ class WP_User_Query {
 		 *
 		 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
 		 */
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
 			$this->total_users = (int) $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		}
 
-		if ( !$this->results )
+		if ( ! $this->results ) {
 			return;
+		}
 
 		if ( 'all_with_meta' == $qv['fields'] ) {
 			cache_users( $this->results );
 
 			$r = array();
-			foreach ( $this->results as $userid )
+			foreach ( $this->results as $userid ) {
 				$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			}
 
 			$this->results = $r;
 		} elseif ( 'all' == $qv['fields'] ) {
@@ -635,8 +642,9 @@ class WP_User_Query {
 	 * @return mixed
 	 */
 	public function get( $query_var ) {
-		if ( isset( $this->query_vars[$query_var] ) )
-			return $this->query_vars[$query_var];
+		if ( isset( $this->query_vars[ $query_var ] ) ) {
+			return $this->query_vars[ $query_var ];
+		}
 
 		return null;
 	}
@@ -650,7 +658,7 @@ class WP_User_Query {
 	 * @param mixed $value Query variable value.
 	 */
 	public function set( $query_var, $value ) {
-		$this->query_vars[$query_var] = $value;
+		$this->query_vars[ $query_var ] = $value;
 	}
 
 	/**
@@ -669,10 +677,10 @@ class WP_User_Query {
 	protected function get_search_sql( $string, $cols, $wild = false ) {
 		global $wpdb;
 
-		$searches = array();
-		$leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
+		$searches      = array();
+		$leading_wild  = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
 		$trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
-		$like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
+		$like          = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
 
 		foreach ( $cols as $col ) {
 			if ( 'ID' == $col ) {
@@ -682,7 +690,7 @@ class WP_User_Query {
 			}
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND (' . implode( ' OR ', $searches ) . ')';
 	}
 
 	/**
@@ -731,7 +739,7 @@ class WP_User_Query {
 			$_orderby = 'display_name';
 		} elseif ( 'post_count' == $orderby ) {
 			// todo: avoid the JOIN
-			$where = get_posts_by_author_sql( 'post' );
+			$where             = get_posts_by_author_sql( 'post' );
 			$this->query_from .= " LEFT OUTER JOIN (
 				SELECT post_author, COUNT(*) as post_count
 				FROM $wpdb->posts
@@ -739,7 +747,7 @@ class WP_User_Query {
 				GROUP BY post_author
 			) p ON ({$wpdb->users}.ID = p.post_author)
 			";
-			$_orderby = 'post_count';
+			$_orderby          = 'post_count';
 		} elseif ( 'ID' == $orderby || 'id' == $orderby ) {
 			$_orderby = 'ID';
 		} elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
@@ -747,20 +755,20 @@ class WP_User_Query {
 		} elseif ( 'meta_value_num' == $orderby ) {
 			$_orderby = "$wpdb->usermeta.meta_value+0";
 		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include = wp_parse_id_list( $this->query_vars['include'] );
+			$include     = wp_parse_id_list( $this->query_vars['include'] );
 			$include_sql = implode( ',', $include );
-			$_orderby = "FIELD( $wpdb->users.ID, $include_sql )";
+			$_orderby    = "FIELD( $wpdb->users.ID, $include_sql )";
 		} elseif ( 'nicename__in' === $orderby ) {
 			$sanitized_nicename__in = array_map( 'esc_sql', $this->query_vars['nicename__in'] );
-			$nicename__in = implode( "','", $sanitized_nicename__in );
-			$_orderby = "FIELD( user_nicename, '$nicename__in' )";
+			$nicename__in           = implode( "','", $sanitized_nicename__in );
+			$_orderby               = "FIELD( user_nicename, '$nicename__in' )";
 		} elseif ( 'login__in' === $orderby ) {
 			$sanitized_login__in = array_map( 'esc_sql', $this->query_vars['login__in'] );
-			$login__in = implode( "','", $sanitized_login__in );
-			$_orderby = "FIELD( user_login, '$login__in' )";
+			$login__in           = implode( "','", $sanitized_login__in );
+			$_orderby            = "FIELD( user_login, '$login__in' )";
 		} elseif ( isset( $meta_query_clauses[ $orderby ] ) ) {
 			$meta_clause = $meta_query_clauses[ $orderby ];
-			$_orderby = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+			$_orderby    = sprintf( 'CAST(%s.meta_value AS %s)', esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
 		}
 
 		return $_orderby;
diff --git a/wp-includes/class-wp-user.php b/wp-includes/class-wp-user.php
index f2a7b412ee..f67780f1f4 100644
--- a/wp-includes/class-wp-user.php
+++ b/wp-includes/class-wp-user.php
@@ -122,13 +122,13 @@ class WP_User {
 	 */
 	public function __construct( $id = 0, $name = '', $site_id = '' ) {
 		if ( ! isset( self::$back_compat_keys ) ) {
-			$prefix = $GLOBALS['wpdb']->prefix;
+			$prefix                 = $GLOBALS['wpdb']->prefix;
 			self::$back_compat_keys = array(
-				'user_firstname' => 'first_name',
-				'user_lastname' => 'last_name',
-				'user_description' => 'description',
-				'user_level' => $prefix . 'user_level',
-				$prefix . 'usersettings' => $prefix . 'user-settings',
+				'user_firstname'             => 'first_name',
+				'user_lastname'              => 'last_name',
+				'user_description'           => 'description',
+				'user_level'                 => $prefix . 'user_level',
+				$prefix . 'usersettings'     => $prefix . 'user-settings',
 				$prefix . 'usersettingstime' => $prefix . 'user-settings-time',
 			);
 		}
@@ -143,7 +143,7 @@ class WP_User {
 
 		if ( ! empty( $id ) && ! is_numeric( $id ) ) {
 			$name = $id;
-			$id = 0;
+			$id   = 0;
 		}
 
 		if ( $id ) {
@@ -169,7 +169,7 @@ class WP_User {
 	 */
 	public function init( $data, $site_id = '' ) {
 		$this->data = $data;
-		$this->ID = (int) $data->ID;
+		$this->ID   = (int) $data->ID;
 
 		$this->for_site( $site_id );
 	}
@@ -199,34 +199,37 @@ class WP_User {
 		if ( 'id' == $field ) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
+			if ( ! is_numeric( $value ) ) {
 				return false;
+			}
 			$value = intval( $value );
-			if ( $value < 1 )
+			if ( $value < 1 ) {
 				return false;
+			}
 		} else {
 			$value = trim( $value );
 		}
 
-		if ( !$value )
+		if ( ! $value ) {
 			return false;
+		}
 
 		switch ( $field ) {
 			case 'id':
-				$user_id = $value;
+				$user_id  = $value;
 				$db_field = 'ID';
 				break;
 			case 'slug':
-				$user_id = wp_cache_get($value, 'userslugs');
+				$user_id  = wp_cache_get( $value, 'userslugs' );
 				$db_field = 'user_nicename';
 				break;
 			case 'email':
-				$user_id = wp_cache_get($value, 'useremail');
+				$user_id  = wp_cache_get( $value, 'useremail' );
 				$db_field = 'user_email';
 				break;
 			case 'login':
-				$value = sanitize_user( $value );
-				$user_id = wp_cache_get($value, 'userlogins');
+				$value    = sanitize_user( $value );
+				$user_id  = wp_cache_get( $value, 'userlogins' );
 				$db_field = 'user_login';
 				break;
 			default:
@@ -234,14 +237,18 @@ class WP_User {
 		}
 
 		if ( false !== $user_id ) {
-			if ( $user = wp_cache_get( $user_id, 'users' ) )
+			if ( $user = wp_cache_get( $user_id, 'users' ) ) {
 				return $user;
+			}
 		}
 
-		if ( !$user = $wpdb->get_row( $wpdb->prepare(
-			"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
-		) ) )
+		if ( ! $user = $wpdb->get_row(
+			$wpdb->prepare(
+				"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
+			)
+		) ) {
 			return false;
+		}
 
 		update_user_caches( $user );
 
@@ -258,7 +265,8 @@ class WP_User {
 	 */
 	public function __isset( $key ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+			_deprecated_argument(
+				'WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
@@ -268,11 +276,13 @@ class WP_User {
 			$key = 'ID';
 		}
 
-		if ( isset( $this->data->$key ) )
+		if ( isset( $this->data->$key ) ) {
 			return true;
+		}
 
-		if ( isset( self::$back_compat_keys[ $key ] ) )
+		if ( isset( self::$back_compat_keys[ $key ] ) ) {
 			$key = self::$back_compat_keys[ $key ];
+		}
 
 		return metadata_exists( 'user', $this->ID, $key );
 	}
@@ -287,7 +297,8 @@ class WP_User {
 	 */
 	public function __get( $key ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+			_deprecated_argument(
+				'WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
@@ -300,8 +311,9 @@ class WP_User {
 		if ( isset( $this->data->$key ) ) {
 			$value = $this->data->$key;
 		} else {
-			if ( isset( self::$back_compat_keys[ $key ] ) )
+			if ( isset( self::$back_compat_keys[ $key ] ) ) {
 				$key = self::$back_compat_keys[ $key ];
+			}
 			$value = get_user_meta( $this->ID, $key, true );
 		}
 
@@ -325,7 +337,8 @@ class WP_User {
 	 */
 	public function __set( $key, $value ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+			_deprecated_argument(
+				'WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
@@ -348,7 +361,8 @@ class WP_User {
 	 */
 	public function __unset( $key ) {
 		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1.0',
+			_deprecated_argument(
+				'WP_User->id', '2.1.0',
 				sprintf(
 					/* translators: %s: WP_User->ID */
 					__( 'Use %s instead.' ),
@@ -486,13 +500,14 @@ class WP_User {
 		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if ( is_array( $this->caps ) )
+		if ( is_array( $this->caps ) ) {
 			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		}
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
 		foreach ( (array) $this->roles as $role ) {
-			$the_role = $wp_roles->get_role( $role );
+			$the_role      = $wp_roles->get_role( $role );
 			$this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
 		}
 		$this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
@@ -518,7 +533,7 @@ class WP_User {
 			return;
 		}
 
-		$this->caps[$role] = true;
+		$this->caps[ $role ] = true;
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
@@ -542,9 +557,10 @@ class WP_User {
 	 * @param string $role Role name.
 	 */
 	public function remove_role( $role ) {
-		if ( !in_array($role, $this->roles) )
+		if ( ! in_array( $role, $this->roles ) ) {
 			return;
-		unset( $this->caps[$role] );
+		}
+		unset( $this->caps[ $role ] );
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
@@ -572,16 +588,18 @@ class WP_User {
 	 * @param string $role Role name.
 	 */
 	public function set_role( $role ) {
-		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
+		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) {
 			return;
+		}
 
-		foreach ( (array) $this->roles as $oldrole )
-			unset( $this->caps[$oldrole] );
+		foreach ( (array) $this->roles as $oldrole ) {
+			unset( $this->caps[ $oldrole ] );
+		}
 
 		$old_roles = $this->roles;
-		if ( !empty( $role ) ) {
-			$this->caps[$role] = true;
-			$this->roles = array( $role => true );
+		if ( ! empty( $role ) ) {
+			$this->caps[ $role ] = true;
+			$this->roles         = array( $role => true );
 		} else {
 			$this->roles = false;
 		}
@@ -655,7 +673,7 @@ class WP_User {
 	 * @param bool $grant Whether to grant capability to user.
 	 */
 	public function add_cap( $cap, $grant = true ) {
-		$this->caps[$cap] = $grant;
+		$this->caps[ $cap ] = $grant;
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
@@ -723,8 +741,9 @@ class WP_User {
 
 		// Multisite super admin has all caps by definition, Unless specifically denied.
 		if ( is_multisite() && is_super_admin( $this->ID ) ) {
-			if ( in_array('do_not_allow', $caps) )
+			if ( in_array( 'do_not_allow', $caps ) ) {
 				return false;
+			}
 			return true;
 		}
 
@@ -749,8 +768,9 @@ class WP_User {
 
 		// Must have ALL requested caps.
 		foreach ( (array) $caps as $cap ) {
-			if ( empty( $capabilities[ $cap ] ) )
+			if ( empty( $capabilities[ $cap ] ) ) {
 				return false;
+			}
 		}
 
 		return true;
diff --git a/wp-includes/class-wp-walker.php b/wp-includes/class-wp-walker.php
index 12d2fd22ab..6799d42f28 100644
--- a/wp-includes/class-wp-walker.php
+++ b/wp-includes/class-wp-walker.php
@@ -141,34 +141,34 @@ class Walker {
 			$args[0]['has_children'] = $this->has_children; // Back-compat.
 		}
 
-		$cb_args = array_merge( array(&$output, $element, $depth), $args);
-		call_user_func_array(array($this, 'start_el'), $cb_args);
+		$cb_args = array_merge( array( &$output, $element, $depth ), $args );
+		call_user_func_array( array( $this, 'start_el' ), $cb_args );
 
 		// descend only when the depth is right and there are childrens for this element
-		if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {
+		if ( ( $max_depth == 0 || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) {
 
-			foreach ( $children_elements[ $id ] as $child ){
+			foreach ( $children_elements[ $id ] as $child ) {
 
-				if ( !isset($newlevel) ) {
+				if ( ! isset( $newlevel ) ) {
 					$newlevel = true;
 					//start the child delimiter
-					$cb_args = array_merge( array(&$output, $depth), $args);
-					call_user_func_array(array($this, 'start_lvl'), $cb_args);
+					$cb_args = array_merge( array( &$output, $depth ), $args );
+					call_user_func_array( array( $this, 'start_lvl' ), $cb_args );
 				}
 				$this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
 			}
 			unset( $children_elements[ $id ] );
 		}
 
-		if ( isset($newlevel) && $newlevel ){
+		if ( isset( $newlevel ) && $newlevel ) {
 			//end the child delimiter
-			$cb_args = array_merge( array(&$output, $depth), $args);
-			call_user_func_array(array($this, 'end_lvl'), $cb_args);
+			$cb_args = array_merge( array( &$output, $depth ), $args );
+			call_user_func_array( array( $this, 'end_lvl' ), $cb_args );
 		}
 
 		//end this element
-		$cb_args = array_merge( array(&$output, $element, $depth), $args);
-		call_user_func_array(array($this, 'end_el'), $cb_args);
+		$cb_args = array_merge( array( &$output, $element, $depth ), $args );
+		call_user_func_array( array( $this, 'end_el' ), $cb_args );
 	}
 
 	/**
@@ -187,7 +187,7 @@ class Walker {
 	 * @return string The hierarchical item output.
 	 */
 	public function walk( $elements, $max_depth ) {
-		$args = array_slice(func_get_args(), 2);
+		$args   = array_slice( func_get_args(), 2 );
 		$output = '';
 
 		//invalid parameter or nothing to walk
@@ -200,8 +200,9 @@ class Walker {
 		// flat display
 		if ( -1 == $max_depth ) {
 			$empty_array = array();
-			foreach ( $elements as $e )
+			foreach ( $elements as $e ) {
 				$this->display_element( $e, $empty_array, 1, 0, $args, $output );
+			}
 			return $output;
 		}
 
@@ -213,34 +214,37 @@ class Walker {
 		 */
 		$top_level_elements = array();
 		$children_elements  = array();
-		foreach ( $elements as $e) {
-			if ( empty( $e->$parent_field ) )
+		foreach ( $elements as $e ) {
+			if ( empty( $e->$parent_field ) ) {
 				$top_level_elements[] = $e;
-			else
+			} else {
 				$children_elements[ $e->$parent_field ][] = $e;
+			}
 		}
 
 		/*
 		 * When none of the elements is top level.
 		 * Assume the first one must be root of the sub elements.
 		 */
-		if ( empty($top_level_elements) ) {
+		if ( empty( $top_level_elements ) ) {
 
 			$first = array_slice( $elements, 0, 1 );
-			$root = $first[0];
+			$root  = $first[0];
 
 			$top_level_elements = array();
 			$children_elements  = array();
-			foreach ( $elements as $e) {
-				if ( $root->$parent_field == $e->$parent_field )
+			foreach ( $elements as $e ) {
+				if ( $root->$parent_field == $e->$parent_field ) {
 					$top_level_elements[] = $e;
-				else
+				} else {
 					$children_elements[ $e->$parent_field ][] = $e;
+				}
 			}
 		}
 
-		foreach ( $top_level_elements as $e )
+		foreach ( $top_level_elements as $e ) {
 			$this->display_element( $e, $children_elements, $max_depth, 0, $args, $output );
+		}
 
 		/*
 		 * If we are displaying all levels, and remaining children_elements is not empty,
@@ -248,25 +252,27 @@ class Walker {
 		 */
 		if ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) {
 			$empty_array = array();
-			foreach ( $children_elements as $orphans )
-				foreach ( $orphans as $op )
+			foreach ( $children_elements as $orphans ) {
+				foreach ( $orphans as $op ) {
 					$this->display_element( $op, $empty_array, 1, 0, $args, $output );
+				}
+			}
 		}
 
 		return $output;
 	}
 
 	/**
- 	 * paged_walk() - produce a page of nested elements
- 	 *
- 	 * Given an array of hierarchical elements, the maximum depth, a specific page number,
- 	 * and number of elements per page, this function first determines all top level root elements
- 	 * belonging to that page, then lists them and all of their children in hierarchical order.
- 	 *
+	 * paged_walk() - produce a page of nested elements
+	 *
+	 * Given an array of hierarchical elements, the maximum depth, a specific page number,
+	 * and number of elements per page, this function first determines all top level root elements
+	 * belonging to that page, then lists them and all of their children in hierarchical order.
+	 *
 	 * $max_depth = 0 means display all levels.
 	 * $max_depth > 0 specifies the number of display levels.
 	 *
- 	 * @since 2.7.0
+	 * @since 2.7.0
 	 *
 	 * @param array $elements
 	 * @param int   $max_depth The maximum hierarchical depth.
@@ -279,45 +285,50 @@ class Walker {
 			return '';
 		}
 
-		$args = array_slice( func_get_args(), 4 );
+		$args   = array_slice( func_get_args(), 4 );
 		$output = '';
 
 		$parent_field = $this->db_fields['parent'];
 
 		$count = -1;
-		if ( -1 == $max_depth )
+		if ( -1 == $max_depth ) {
 			$total_top = count( $elements );
-		if ( $page_num < 1 || $per_page < 0  ) {
+		}
+		if ( $page_num < 1 || $per_page < 0 ) {
 			// No paging
 			$paging = false;
-			$start = 0;
-			if ( -1 == $max_depth )
+			$start  = 0;
+			if ( -1 == $max_depth ) {
 				$end = $total_top;
+			}
 			$this->max_pages = 1;
 		} else {
 			$paging = true;
-			$start = ( (int)$page_num - 1 ) * (int)$per_page;
-			$end   = $start + $per_page;
-			if ( -1 == $max_depth )
-				$this->max_pages = ceil($total_top / $per_page);
+			$start  = ( (int) $page_num - 1 ) * (int) $per_page;
+			$end    = $start + $per_page;
+			if ( -1 == $max_depth ) {
+				$this->max_pages = ceil( $total_top / $per_page );
+			}
 		}
 
 		// flat display
 		if ( -1 == $max_depth ) {
-			if ( !empty($args[0]['reverse_top_level']) ) {
+			if ( ! empty( $args[0]['reverse_top_level'] ) ) {
 				$elements = array_reverse( $elements );
 				$oldstart = $start;
-				$start = $total_top - $end;
-				$end = $total_top - $oldstart;
+				$start    = $total_top - $end;
+				$end      = $total_top - $oldstart;
 			}
 
 			$empty_array = array();
 			foreach ( $elements as $e ) {
 				$count++;
-				if ( $count < $start )
+				if ( $count < $start ) {
 					continue;
-				if ( $count >= $end )
+				}
+				if ( $count >= $end ) {
 					break;
+				}
 				$this->display_element( $e, $empty_array, 1, 0, $args, $output );
 			}
 			return $output;
@@ -330,51 +341,59 @@ class Walker {
 		 */
 		$top_level_elements = array();
 		$children_elements  = array();
-		foreach ( $elements as $e) {
-			if ( 0 == $e->$parent_field )
+		foreach ( $elements as $e ) {
+			if ( 0 == $e->$parent_field ) {
 				$top_level_elements[] = $e;
-			else
+			} else {
 				$children_elements[ $e->$parent_field ][] = $e;
+			}
 		}
 
 		$total_top = count( $top_level_elements );
-		if ( $paging )
-			$this->max_pages = ceil($total_top / $per_page);
-		else
+		if ( $paging ) {
+			$this->max_pages = ceil( $total_top / $per_page );
+		} else {
 			$end = $total_top;
-
-		if ( !empty($args[0]['reverse_top_level']) ) {
-			$top_level_elements = array_reverse( $top_level_elements );
-			$oldstart = $start;
-			$start = $total_top - $end;
-			$end = $total_top - $oldstart;
 		}
-		if ( !empty($args[0]['reverse_children']) ) {
-			foreach ( $children_elements as $parent => $children )
-				$children_elements[$parent] = array_reverse( $children );
+
+		if ( ! empty( $args[0]['reverse_top_level'] ) ) {
+			$top_level_elements = array_reverse( $top_level_elements );
+			$oldstart           = $start;
+			$start              = $total_top - $end;
+			$end                = $total_top - $oldstart;
+		}
+		if ( ! empty( $args[0]['reverse_children'] ) ) {
+			foreach ( $children_elements as $parent => $children ) {
+				$children_elements[ $parent ] = array_reverse( $children );
+			}
 		}
 
 		foreach ( $top_level_elements as $e ) {
 			$count++;
 
 			// For the last page, need to unset earlier children in order to keep track of orphans.
-			if ( $end >= $total_top && $count < $start )
+			if ( $end >= $total_top && $count < $start ) {
 					$this->unset_children( $e, $children_elements );
+			}
 
-			if ( $count < $start )
+			if ( $count < $start ) {
 				continue;
+			}
 
-			if ( $count >= $end )
+			if ( $count >= $end ) {
 				break;
+			}
 
 			$this->display_element( $e, $children_elements, $max_depth, 0, $args, $output );
 		}
 
 		if ( $end >= $total_top && count( $children_elements ) > 0 ) {
 			$empty_array = array();
-			foreach ( $children_elements as $orphans )
-				foreach ( $orphans as $op )
+			foreach ( $children_elements as $orphans ) {
+				foreach ( $orphans as $op ) {
 					$this->display_element( $op, $empty_array, 1, 0, $args, $output );
+				}
+			}
 		}
 
 		return $output;
@@ -388,13 +407,14 @@ class Walker {
 	 * @param array $elements Elements to list.
 	 * @return int Number of root elements.
 	 */
-	public function get_number_of_root_elements( $elements ){
-		$num = 0;
+	public function get_number_of_root_elements( $elements ) {
+		$num          = 0;
 		$parent_field = $this->db_fields['parent'];
 
-		foreach ( $elements as $e) {
-			if ( 0 == $e->$parent_field )
+		foreach ( $elements as $e ) {
+			if ( 0 == $e->$parent_field ) {
 				$num++;
+			}
 		}
 		return $num;
 	}
@@ -407,17 +427,19 @@ class Walker {
 	 * @param object $e
 	 * @param array $children_elements
 	 */
-	public function unset_children( $e, &$children_elements ){
+	public function unset_children( $e, &$children_elements ) {
 		if ( ! $e || ! $children_elements ) {
 			return;
 		}
 
 		$id_field = $this->db_fields['id'];
-		$id = $e->$id_field;
+		$id       = $e->$id_field;
 
-		if ( !empty($children_elements[$id]) && is_array($children_elements[$id]) )
-			foreach ( (array) $children_elements[$id] as $child )
+		if ( ! empty( $children_elements[ $id ] ) && is_array( $children_elements[ $id ] ) ) {
+			foreach ( (array) $children_elements[ $id ] as $child ) {
 				$this->unset_children( $child, $children_elements );
+			}
+		}
 
 		unset( $children_elements[ $id ] );
 	}
diff --git a/wp-includes/class-wp-widget-factory.php b/wp-includes/class-wp-widget-factory.php
index 1c0f79793f..68f4623098 100644
--- a/wp-includes/class-wp-widget-factory.php
+++ b/wp-includes/class-wp-widget-factory.php
@@ -71,13 +71,13 @@ class WP_Widget_Factory {
 			return spl_object_hash( $widget );
 		} else {
 			$class_name = get_class( $widget );
-			$hash = $class_name;
+			$hash       = $class_name;
 			if ( ! isset( $widget->_wp_widget_factory_hash_id ) ) {
 				if ( ! isset( $this->hashed_class_counts[ $class_name ] ) ) {
 					$this->hashed_class_counts[ $class_name ] = 0;
 				}
 				$this->hashed_class_counts[ $class_name ] += 1;
-				$widget->_wp_widget_factory_hash_id = $this->hashed_class_counts[ $class_name ];
+				$widget->_wp_widget_factory_hash_id        = $this->hashed_class_counts[ $class_name ];
 			}
 			$hash .= ':' . $widget->_wp_widget_factory_hash_id;
 			return $hash;
@@ -127,18 +127,18 @@ class WP_Widget_Factory {
 	 */
 	public function _register_widgets() {
 		global $wp_registered_widgets;
-		$keys = array_keys($this->widgets);
-		$registered = array_keys($wp_registered_widgets);
-		$registered = array_map('_get_widget_id_base', $registered);
+		$keys       = array_keys( $this->widgets );
+		$registered = array_keys( $wp_registered_widgets );
+		$registered = array_map( '_get_widget_id_base', $registered );
 
 		foreach ( $keys as $key ) {
 			// don't register new widget if old widget with the same id is already registered
-			if ( in_array($this->widgets[$key]->id_base, $registered, true) ) {
-				unset($this->widgets[$key]);
+			if ( in_array( $this->widgets[ $key ]->id_base, $registered, true ) ) {
+				unset( $this->widgets[ $key ] );
 				continue;
 			}
 
-			$this->widgets[$key]->_register();
+			$this->widgets[ $key ]->_register();
 		}
 	}
 }
diff --git a/wp-includes/class-wp-widget.php b/wp-includes/class-wp-widget.php
index c7da819785..cd100c2d83 100644
--- a/wp-includes/class-wp-widget.php
+++ b/wp-includes/class-wp-widget.php
@@ -110,7 +110,7 @@ class WP_Widget {
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
 	public function widget( $args, $instance ) {
-		die('function WP_Widget::widget() must be over-ridden in a sub-class.');
+		die( 'function WP_Widget::widget() must be over-ridden in a sub-class.' );
 	}
 
 	/**
@@ -140,7 +140,7 @@ class WP_Widget {
 	 * @return string Default return is 'noform'.
 	 */
 	public function form( $instance ) {
-		echo '<p class="no-options-widget">' . __('There are no options for this widget.') . '</p>';
+		echo '<p class="no-options-widget">' . __( 'There are no options for this widget.' ) . '</p>';
 		return 'noform';
 	}
 
@@ -160,10 +160,15 @@ class WP_Widget {
 	 *                                information on accepted arguments. Default empty array.
 	 */
 	public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		$this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base);
-		$this->name = $name;
-		$this->option_name = 'widget_' . $this->id_base;
-		$this->widget_options = wp_parse_args( $widget_options, array( 'classname' => $this->option_name, 'customize_selective_refresh' => false ) );
+		$this->id_base         = empty( $id_base ) ? preg_replace( '/(wp_)?widget_/', '', strtolower( get_class( $this ) ) ) : strtolower( $id_base );
+		$this->name            = $name;
+		$this->option_name     = 'widget_' . $this->id_base;
+		$this->widget_options  = wp_parse_args(
+			$widget_options, array(
+				'classname'                   => $this->option_name,
+				'customize_selective_refresh' => false,
+			)
+		);
 		$this->control_options = wp_parse_args( $control_options, array( 'id_base' => $this->id_base ) );
 	}
 
@@ -199,7 +204,7 @@ class WP_Widget {
 	 * @param string $field_name Field name
 	 * @return string Name attribute for $field_name
 	 */
-	public function get_field_name($field_name) {
+	public function get_field_name( $field_name ) {
 		if ( false === $pos = strpos( $field_name, '[' ) ) {
 			return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
 		} else {
@@ -230,7 +235,7 @@ class WP_Widget {
 	 */
 	public function _register() {
 		$settings = $this->get_settings();
-		$empty = true;
+		$empty    = true;
 
 		// When $settings is an array-like object, get an intrinsic array for use with array_keys().
 		if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
@@ -262,9 +267,9 @@ class WP_Widget {
 	 * @param int $number The unique order number of this widget instance compared to other
 	 *                    instances of the same class.
 	 */
-	public function _set($number) {
+	public function _set( $number ) {
 		$this->number = $number;
-		$this->id = $this->id_base . '-' . $number;
+		$this->id     = $this->id_base . '-' . $number;
 	}
 
 	/**
@@ -275,7 +280,7 @@ class WP_Widget {
 	 * @return callable Display callback.
 	 */
 	public function _get_display_callback() {
-		return array($this, 'display_callback');
+		return array( $this, 'display_callback' );
 	}
 
 	/**
@@ -286,7 +291,7 @@ class WP_Widget {
 	 * @return callable Update callback.
 	 */
 	public function _get_update_callback() {
-		return array($this, 'update_callback');
+		return array( $this, 'update_callback' );
 	}
 
 	/**
@@ -297,7 +302,7 @@ class WP_Widget {
 	 * @return callable Form callback.
 	 */
 	public function _get_form_callback() {
-		return array($this, 'form_callback');
+		return array( $this, 'form_callback' );
 	}
 
 	/**
@@ -316,7 +321,7 @@ class WP_Widget {
 	 */
 	public function is_preview() {
 		global $wp_customize;
-		return ( isset( $wp_customize ) && $wp_customize->is_preview() ) ;
+		return ( isset( $wp_customize ) && $wp_customize->is_preview() );
 	}
 
 	/**
@@ -392,37 +397,40 @@ class WP_Widget {
 		$all_instances = $this->get_settings();
 
 		// We need to update the data
-		if ( $this->updated )
+		if ( $this->updated ) {
 			return;
+		}
 
-		if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+		if ( isset( $_POST['delete_widget'] ) && $_POST['delete_widget'] ) {
 			// Delete the settings for this instance of the widget
-			if ( isset($_POST['the-widget-id']) )
+			if ( isset( $_POST['the-widget-id'] ) ) {
 				$del_id = $_POST['the-widget-id'];
-			else
+			} else {
 				return;
+			}
 
-			if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) {
-				$number = $wp_registered_widgets[$del_id]['params'][0]['number'];
+			if ( isset( $wp_registered_widgets[ $del_id ]['params'][0]['number'] ) ) {
+				$number = $wp_registered_widgets[ $del_id ]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id )
-					unset($all_instances[$number]);
+				if ( $this->id_base . '-' . $number == $del_id ) {
+					unset( $all_instances[ $number ] );
+				}
 			}
 		} else {
-			if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) {
-				$settings = $_POST['widget-' . $this->id_base];
-			} elseif ( isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base ) {
-				$num = $_POST['multi_number'] ? (int) $_POST['multi_number'] : (int) $_POST['widget_number'];
+			if ( isset( $_POST[ 'widget-' . $this->id_base ] ) && is_array( $_POST[ 'widget-' . $this->id_base ] ) ) {
+				$settings = $_POST[ 'widget-' . $this->id_base ];
+			} elseif ( isset( $_POST['id_base'] ) && $_POST['id_base'] == $this->id_base ) {
+				$num      = $_POST['multi_number'] ? (int) $_POST['multi_number'] : (int) $_POST['widget_number'];
 				$settings = array( $num => array() );
 			} else {
 				return;
 			}
 
 			foreach ( $settings as $number => $new_instance ) {
-				$new_instance = stripslashes_deep($new_instance);
-				$this->_set($number);
+				$new_instance = stripslashes_deep( $new_instance );
+				$this->_set( $number );
 
-				$old_instance = isset($all_instances[$number]) ? $all_instances[$number] : array();
+				$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
 
 				$was_cache_addition_suspended = wp_suspend_cache_addition();
 				if ( $this->is_preview() && ! $was_cache_addition_suspended ) {
@@ -450,14 +458,14 @@ class WP_Widget {
 				 */
 				$instance = apply_filters( 'widget_update_callback', $instance, $new_instance, $old_instance, $this );
 				if ( false !== $instance ) {
-					$all_instances[$number] = $instance;
+					$all_instances[ $number ] = $instance;
 				}
 
 				break; // run only once
 			}
 		}
 
-		$this->save_settings($all_instances);
+		$this->save_settings( $all_instances );
 		$this->updated = true;
 	}
 
@@ -475,18 +483,19 @@ class WP_Widget {
 	 * @return string|null
 	 */
 	public function form_callback( $widget_args = 1 ) {
-		if ( is_numeric($widget_args) )
+		if ( is_numeric( $widget_args ) ) {
 			$widget_args = array( 'number' => $widget_args );
+		}
 
-		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
+		$widget_args   = wp_parse_args( $widget_args, array( 'number' => -1 ) );
 		$all_instances = $this->get_settings();
 
 		if ( -1 == $widget_args['number'] ) {
 			// We echo out a form where 'number' can be set later
-			$this->_set('__i__');
+			$this->_set( '__i__' );
 			$instance = array();
 		} else {
-			$this->_set($widget_args['number']);
+			$this->_set( $widget_args['number'] );
 			$instance = $all_instances[ $widget_args['number'] ];
 		}
 
@@ -504,7 +513,7 @@ class WP_Widget {
 
 		$return = null;
 		if ( false !== $instance ) {
-			$return = $this->form($instance);
+			$return = $this->form( $instance );
 
 			/**
 			 * Fires at the end of the widget control form.
@@ -536,9 +545,9 @@ class WP_Widget {
 	 *                        compared to other instances of the same class. Default -1.
 	 */
 	public function _register_one( $number = -1 ) {
-		wp_register_sidebar_widget(	$this->id, $this->name,	$this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
+		wp_register_sidebar_widget( $this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
 		_register_widget_update_callback( $this->id_base, $this->_get_update_callback(), $this->control_options, array( 'number' => -1 ) );
-		_register_widget_form_callback(	$this->id, $this->name,	$this->_get_form_callback(), $this->control_options, array( 'number' => $number ) );
+		_register_widget_form_callback( $this->id, $this->name, $this->_get_form_callback(), $this->control_options, array( 'number' => $number ) );
 	}
 
 	/**
diff --git a/wp-includes/class-wp-xmlrpc-server.php b/wp-includes/class-wp-xmlrpc-server.php
index 3e8dce5d8d..c6e6cd8002 100644
--- a/wp-includes/class-wp-xmlrpc-server.php
+++ b/wp-includes/class-wp-xmlrpc-server.php
@@ -61,95 +61,95 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function __construct() {
 		$this->methods = array(
 			// WordPress API
-			'wp.getUsersBlogs'		=> 'this:wp_getUsersBlogs',
-			'wp.newPost'			=> 'this:wp_newPost',
-			'wp.editPost'			=> 'this:wp_editPost',
-			'wp.deletePost'			=> 'this:wp_deletePost',
-			'wp.getPost'			=> 'this:wp_getPost',
-			'wp.getPosts'			=> 'this:wp_getPosts',
-			'wp.newTerm'			=> 'this:wp_newTerm',
-			'wp.editTerm'			=> 'this:wp_editTerm',
-			'wp.deleteTerm'			=> 'this:wp_deleteTerm',
-			'wp.getTerm'			=> 'this:wp_getTerm',
-			'wp.getTerms'			=> 'this:wp_getTerms',
-			'wp.getTaxonomy'		=> 'this:wp_getTaxonomy',
-			'wp.getTaxonomies'		=> 'this:wp_getTaxonomies',
-			'wp.getUser'			=> 'this:wp_getUser',
-			'wp.getUsers'			=> 'this:wp_getUsers',
-			'wp.getProfile'			=> 'this:wp_getProfile',
-			'wp.editProfile'		=> 'this:wp_editProfile',
-			'wp.getPage'			=> 'this:wp_getPage',
-			'wp.getPages'			=> 'this:wp_getPages',
-			'wp.newPage'			=> 'this:wp_newPage',
-			'wp.deletePage'			=> 'this:wp_deletePage',
-			'wp.editPage'			=> 'this:wp_editPage',
-			'wp.getPageList'		=> 'this:wp_getPageList',
-			'wp.getAuthors'			=> 'this:wp_getAuthors',
-			'wp.getCategories'		=> 'this:mw_getCategories',		// Alias
-			'wp.getTags'			=> 'this:wp_getTags',
-			'wp.newCategory'		=> 'this:wp_newCategory',
-			'wp.deleteCategory'		=> 'this:wp_deleteCategory',
-			'wp.suggestCategories'	=> 'this:wp_suggestCategories',
-			'wp.uploadFile'			=> 'this:mw_newMediaObject',	// Alias
-			'wp.deleteFile'			=> 'this:wp_deletePost',		// Alias
-			'wp.getCommentCount'	=> 'this:wp_getCommentCount',
-			'wp.getPostStatusList'	=> 'this:wp_getPostStatusList',
-			'wp.getPageStatusList'	=> 'this:wp_getPageStatusList',
-			'wp.getPageTemplates'	=> 'this:wp_getPageTemplates',
-			'wp.getOptions'			=> 'this:wp_getOptions',
-			'wp.setOptions'			=> 'this:wp_setOptions',
-			'wp.getComment'			=> 'this:wp_getComment',
-			'wp.getComments'		=> 'this:wp_getComments',
-			'wp.deleteComment'		=> 'this:wp_deleteComment',
-			'wp.editComment'		=> 'this:wp_editComment',
-			'wp.newComment'			=> 'this:wp_newComment',
-			'wp.getCommentStatusList' => 'this:wp_getCommentStatusList',
-			'wp.getMediaItem'		=> 'this:wp_getMediaItem',
-			'wp.getMediaLibrary'	=> 'this:wp_getMediaLibrary',
-			'wp.getPostFormats'     => 'this:wp_getPostFormats',
-			'wp.getPostType'		=> 'this:wp_getPostType',
-			'wp.getPostTypes'		=> 'this:wp_getPostTypes',
-			'wp.getRevisions'		=> 'this:wp_getRevisions',
-			'wp.restoreRevision'	=> 'this:wp_restoreRevision',
+			'wp.getUsersBlogs'                 => 'this:wp_getUsersBlogs',
+			'wp.newPost'                       => 'this:wp_newPost',
+			'wp.editPost'                      => 'this:wp_editPost',
+			'wp.deletePost'                    => 'this:wp_deletePost',
+			'wp.getPost'                       => 'this:wp_getPost',
+			'wp.getPosts'                      => 'this:wp_getPosts',
+			'wp.newTerm'                       => 'this:wp_newTerm',
+			'wp.editTerm'                      => 'this:wp_editTerm',
+			'wp.deleteTerm'                    => 'this:wp_deleteTerm',
+			'wp.getTerm'                       => 'this:wp_getTerm',
+			'wp.getTerms'                      => 'this:wp_getTerms',
+			'wp.getTaxonomy'                   => 'this:wp_getTaxonomy',
+			'wp.getTaxonomies'                 => 'this:wp_getTaxonomies',
+			'wp.getUser'                       => 'this:wp_getUser',
+			'wp.getUsers'                      => 'this:wp_getUsers',
+			'wp.getProfile'                    => 'this:wp_getProfile',
+			'wp.editProfile'                   => 'this:wp_editProfile',
+			'wp.getPage'                       => 'this:wp_getPage',
+			'wp.getPages'                      => 'this:wp_getPages',
+			'wp.newPage'                       => 'this:wp_newPage',
+			'wp.deletePage'                    => 'this:wp_deletePage',
+			'wp.editPage'                      => 'this:wp_editPage',
+			'wp.getPageList'                   => 'this:wp_getPageList',
+			'wp.getAuthors'                    => 'this:wp_getAuthors',
+			'wp.getCategories'                 => 'this:mw_getCategories',     // Alias
+			'wp.getTags'                       => 'this:wp_getTags',
+			'wp.newCategory'                   => 'this:wp_newCategory',
+			'wp.deleteCategory'                => 'this:wp_deleteCategory',
+			'wp.suggestCategories'             => 'this:wp_suggestCategories',
+			'wp.uploadFile'                    => 'this:mw_newMediaObject',    // Alias
+			'wp.deleteFile'                    => 'this:wp_deletePost',        // Alias
+			'wp.getCommentCount'               => 'this:wp_getCommentCount',
+			'wp.getPostStatusList'             => 'this:wp_getPostStatusList',
+			'wp.getPageStatusList'             => 'this:wp_getPageStatusList',
+			'wp.getPageTemplates'              => 'this:wp_getPageTemplates',
+			'wp.getOptions'                    => 'this:wp_getOptions',
+			'wp.setOptions'                    => 'this:wp_setOptions',
+			'wp.getComment'                    => 'this:wp_getComment',
+			'wp.getComments'                   => 'this:wp_getComments',
+			'wp.deleteComment'                 => 'this:wp_deleteComment',
+			'wp.editComment'                   => 'this:wp_editComment',
+			'wp.newComment'                    => 'this:wp_newComment',
+			'wp.getCommentStatusList'          => 'this:wp_getCommentStatusList',
+			'wp.getMediaItem'                  => 'this:wp_getMediaItem',
+			'wp.getMediaLibrary'               => 'this:wp_getMediaLibrary',
+			'wp.getPostFormats'                => 'this:wp_getPostFormats',
+			'wp.getPostType'                   => 'this:wp_getPostType',
+			'wp.getPostTypes'                  => 'this:wp_getPostTypes',
+			'wp.getRevisions'                  => 'this:wp_getRevisions',
+			'wp.restoreRevision'               => 'this:wp_restoreRevision',
 
 			// Blogger API
-			'blogger.getUsersBlogs' => 'this:blogger_getUsersBlogs',
-			'blogger.getUserInfo' => 'this:blogger_getUserInfo',
-			'blogger.getPost' => 'this:blogger_getPost',
-			'blogger.getRecentPosts' => 'this:blogger_getRecentPosts',
-			'blogger.newPost' => 'this:blogger_newPost',
-			'blogger.editPost' => 'this:blogger_editPost',
-			'blogger.deletePost' => 'this:blogger_deletePost',
+			'blogger.getUsersBlogs'            => 'this:blogger_getUsersBlogs',
+			'blogger.getUserInfo'              => 'this:blogger_getUserInfo',
+			'blogger.getPost'                  => 'this:blogger_getPost',
+			'blogger.getRecentPosts'           => 'this:blogger_getRecentPosts',
+			'blogger.newPost'                  => 'this:blogger_newPost',
+			'blogger.editPost'                 => 'this:blogger_editPost',
+			'blogger.deletePost'               => 'this:blogger_deletePost',
 
 			// MetaWeblog API (with MT extensions to structs)
-			'metaWeblog.newPost' => 'this:mw_newPost',
-			'metaWeblog.editPost' => 'this:mw_editPost',
-			'metaWeblog.getPost' => 'this:mw_getPost',
-			'metaWeblog.getRecentPosts' => 'this:mw_getRecentPosts',
-			'metaWeblog.getCategories' => 'this:mw_getCategories',
-			'metaWeblog.newMediaObject' => 'this:mw_newMediaObject',
+			'metaWeblog.newPost'               => 'this:mw_newPost',
+			'metaWeblog.editPost'              => 'this:mw_editPost',
+			'metaWeblog.getPost'               => 'this:mw_getPost',
+			'metaWeblog.getRecentPosts'        => 'this:mw_getRecentPosts',
+			'metaWeblog.getCategories'         => 'this:mw_getCategories',
+			'metaWeblog.newMediaObject'        => 'this:mw_newMediaObject',
 
 			// MetaWeblog API aliases for Blogger API
 			// see http://www.xmlrpc.com/stories/storyReader$2460
-			'metaWeblog.deletePost' => 'this:blogger_deletePost',
-			'metaWeblog.getUsersBlogs' => 'this:blogger_getUsersBlogs',
+			'metaWeblog.deletePost'            => 'this:blogger_deletePost',
+			'metaWeblog.getUsersBlogs'         => 'this:blogger_getUsersBlogs',
 
 			// MovableType API
-			'mt.getCategoryList' => 'this:mt_getCategoryList',
-			'mt.getRecentPostTitles' => 'this:mt_getRecentPostTitles',
-			'mt.getPostCategories' => 'this:mt_getPostCategories',
-			'mt.setPostCategories' => 'this:mt_setPostCategories',
-			'mt.supportedMethods' => 'this:mt_supportedMethods',
-			'mt.supportedTextFilters' => 'this:mt_supportedTextFilters',
-			'mt.getTrackbackPings' => 'this:mt_getTrackbackPings',
-			'mt.publishPost' => 'this:mt_publishPost',
+			'mt.getCategoryList'               => 'this:mt_getCategoryList',
+			'mt.getRecentPostTitles'           => 'this:mt_getRecentPostTitles',
+			'mt.getPostCategories'             => 'this:mt_getPostCategories',
+			'mt.setPostCategories'             => 'this:mt_setPostCategories',
+			'mt.supportedMethods'              => 'this:mt_supportedMethods',
+			'mt.supportedTextFilters'          => 'this:mt_supportedTextFilters',
+			'mt.getTrackbackPings'             => 'this:mt_getTrackbackPings',
+			'mt.publishPost'                   => 'this:mt_publishPost',
 
 			// PingBack
-			'pingback.ping' => 'this:pingback_ping',
+			'pingback.ping'                    => 'this:pingback_ping',
 			'pingback.extensions.getPingbacks' => 'this:pingback_extensions_getPingbacks',
 
-			'demo.sayHello' => 'this:sayHello',
-			'demo.addTwoNumbers' => 'this:addTwoNumbers'
+			'demo.sayHello'                    => 'this:sayHello',
+			'demo.addTwoNumbers'               => 'this:addTwoNumbers',
 		);
 
 		$this->initialise_blog_option_info();
@@ -188,7 +188,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @since 2.9.0
 	 */
 	public function serve_request() {
-		$this->IXR_Server($this->methods);
+		$this->IXR_Server( $this->methods );
 	}
 
 	/**
@@ -322,14 +322,16 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *                     when array is passed.
 	 */
 	public function escape( &$data ) {
-		if ( ! is_array( $data ) )
+		if ( ! is_array( $data ) ) {
 			return wp_slash( $data );
+		}
 
 		foreach ( $data as &$v ) {
-			if ( is_array( $v ) )
+			if ( is_array( $v ) ) {
 				$this->escape( $v );
-			elseif ( ! is_object( $v ) )
+			} elseif ( ! is_object( $v ) ) {
 				$v = wp_slash( $v );
+			}
 		}
 	}
 
@@ -341,20 +343,21 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @param int $post_id Post ID.
 	 * @return array Custom fields, if exist.
 	 */
-	public function get_custom_fields($post_id) {
+	public function get_custom_fields( $post_id ) {
 		$post_id = (int) $post_id;
 
 		$custom_fields = array();
 
-		foreach ( (array) has_meta($post_id) as $meta ) {
+		foreach ( (array) has_meta( $post_id ) as $meta ) {
 			// Don't expose protected fields.
-			if ( ! current_user_can( 'edit_post_meta', $post_id , $meta['meta_key'] ) )
+			if ( ! current_user_can( 'edit_post_meta', $post_id, $meta['meta_key'] ) ) {
 				continue;
+			}
 
 			$custom_fields[] = array(
-				"id"    => $meta['meta_id'],
-				"key"   => $meta['meta_key'],
-				"value" => $meta['meta_value']
+				'id'    => $meta['meta_id'],
+				'key'   => $meta['meta_key'],
+				'value' => $meta['meta_value'],
 			);
 		}
 
@@ -369,25 +372,27 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @param int $post_id Post ID.
 	 * @param array $fields Custom fields.
 	 */
-	public function set_custom_fields($post_id, $fields) {
+	public function set_custom_fields( $post_id, $fields ) {
 		$post_id = (int) $post_id;
 
 		foreach ( (array) $fields as $meta ) {
-			if ( isset($meta['id']) ) {
+			if ( isset( $meta['id'] ) ) {
 				$meta['id'] = (int) $meta['id'];
-				$pmeta = get_metadata_by_mid( 'post', $meta['id'] );
+				$pmeta      = get_metadata_by_mid( 'post', $meta['id'] );
 
 				if ( ! $pmeta || $pmeta->post_id != $post_id ) {
 					continue;
 				}
 
-				if ( isset($meta['key']) ) {
+				if ( isset( $meta['key'] ) ) {
 					$meta['key'] = wp_unslash( $meta['key'] );
-					if ( $meta['key'] !== $pmeta->meta_key )
+					if ( $meta['key'] !== $pmeta->meta_key ) {
 						continue;
+					}
 					$meta['value'] = wp_unslash( $meta['value'] );
-					if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) )
+					if ( current_user_can( 'edit_post_meta', $post_id, $meta['key'] ) ) {
 						update_metadata_by_mid( 'post', $meta['id'], $meta['value'] );
+					}
 				} elseif ( current_user_can( 'delete_post_meta', $post_id, $pmeta->meta_key ) ) {
 					delete_metadata_by_mid( 'post', $meta['id'] );
 				}
@@ -440,7 +445,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		foreach ( (array) $fields as $meta ) {
 			if ( isset( $meta['id'] ) ) {
 				$meta['id'] = (int) $meta['id'];
-				$pmeta = get_metadata_by_mid( 'term', $meta['id'] );
+				$pmeta      = get_metadata_by_mid( 'term', $meta['id'] );
 				if ( isset( $meta['key'] ) ) {
 					$meta['key'] = wp_unslash( $meta['key'] );
 					if ( $meta['key'] !== $pmeta->meta_key ) {
@@ -469,153 +474,153 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function initialise_blog_option_info() {
 		$this->blog_options = array(
 			// Read only options
-			'software_name'     => array(
-				'desc'          => __( 'Software Name' ),
-				'readonly'      => true,
-				'value'         => 'WordPress'
+			'software_name'           => array(
+				'desc'     => __( 'Software Name' ),
+				'readonly' => true,
+				'value'    => 'WordPress',
 			),
-			'software_version'  => array(
-				'desc'          => __( 'Software Version' ),
-				'readonly'      => true,
-				'value'         => get_bloginfo( 'version' )
+			'software_version'        => array(
+				'desc'     => __( 'Software Version' ),
+				'readonly' => true,
+				'value'    => get_bloginfo( 'version' ),
 			),
-			'blog_url'          => array(
-				'desc'          => __( 'WordPress Address (URL)' ),
-				'readonly'      => true,
-				'option'        => 'siteurl'
+			'blog_url'                => array(
+				'desc'     => __( 'WordPress Address (URL)' ),
+				'readonly' => true,
+				'option'   => 'siteurl',
 			),
-			'home_url'          => array(
-				'desc'          => __( 'Site Address (URL)' ),
-				'readonly'      => true,
-				'option'        => 'home'
+			'home_url'                => array(
+				'desc'     => __( 'Site Address (URL)' ),
+				'readonly' => true,
+				'option'   => 'home',
 			),
-			'login_url'          => array(
-				'desc'          => __( 'Login Address (URL)' ),
-				'readonly'      => true,
-				'value'         => wp_login_url( )
+			'login_url'               => array(
+				'desc'     => __( 'Login Address (URL)' ),
+				'readonly' => true,
+				'value'    => wp_login_url(),
 			),
-			'admin_url'          => array(
-				'desc'          => __( 'The URL to the admin area' ),
-				'readonly'      => true,
-				'value'         => get_admin_url( )
+			'admin_url'               => array(
+				'desc'     => __( 'The URL to the admin area' ),
+				'readonly' => true,
+				'value'    => get_admin_url(),
 			),
 			'image_default_link_type' => array(
-				'desc'          => __( 'Image default link type' ),
-				'readonly'      => true,
-				'option'        => 'image_default_link_type'
+				'desc'     => __( 'Image default link type' ),
+				'readonly' => true,
+				'option'   => 'image_default_link_type',
 			),
-			'image_default_size' => array(
-				'desc'          => __( 'Image default size' ),
-				'readonly'      => true,
-				'option'        => 'image_default_size'
+			'image_default_size'      => array(
+				'desc'     => __( 'Image default size' ),
+				'readonly' => true,
+				'option'   => 'image_default_size',
 			),
-			'image_default_align' => array(
-				'desc'          => __( 'Image default align' ),
-				'readonly'      => true,
-				'option'        => 'image_default_align'
+			'image_default_align'     => array(
+				'desc'     => __( 'Image default align' ),
+				'readonly' => true,
+				'option'   => 'image_default_align',
 			),
-			'template'          => array(
-				'desc'          => __( 'Template' ),
-				'readonly'      => true,
-				'option'        => 'template'
+			'template'                => array(
+				'desc'     => __( 'Template' ),
+				'readonly' => true,
+				'option'   => 'template',
 			),
-			'stylesheet'        => array(
-				'desc'          => __( 'Stylesheet' ),
-				'readonly'      => true,
-				'option'        => 'stylesheet'
+			'stylesheet'              => array(
+				'desc'     => __( 'Stylesheet' ),
+				'readonly' => true,
+				'option'   => 'stylesheet',
 			),
-			'post_thumbnail'    => array(
-				'desc'          => __('Post Thumbnail'),
-				'readonly'      => true,
-				'value'         => current_theme_supports( 'post-thumbnails' )
+			'post_thumbnail'          => array(
+				'desc'     => __( 'Post Thumbnail' ),
+				'readonly' => true,
+				'value'    => current_theme_supports( 'post-thumbnails' ),
 			),
 
 			// Updatable options
-			'time_zone'         => array(
-				'desc'          => __( 'Time Zone' ),
-				'readonly'      => false,
-				'option'        => 'gmt_offset'
+			'time_zone'               => array(
+				'desc'     => __( 'Time Zone' ),
+				'readonly' => false,
+				'option'   => 'gmt_offset',
 			),
-			'blog_title'        => array(
-				'desc'          => __( 'Site Title' ),
-				'readonly'      => false,
-				'option'        => 'blogname'
+			'blog_title'              => array(
+				'desc'     => __( 'Site Title' ),
+				'readonly' => false,
+				'option'   => 'blogname',
 			),
-			'blog_tagline'      => array(
-				'desc'          => __( 'Site Tagline' ),
-				'readonly'      => false,
-				'option'        => 'blogdescription'
+			'blog_tagline'            => array(
+				'desc'     => __( 'Site Tagline' ),
+				'readonly' => false,
+				'option'   => 'blogdescription',
 			),
-			'date_format'       => array(
-				'desc'          => __( 'Date Format' ),
-				'readonly'      => false,
-				'option'        => 'date_format'
+			'date_format'             => array(
+				'desc'     => __( 'Date Format' ),
+				'readonly' => false,
+				'option'   => 'date_format',
 			),
-			'time_format'       => array(
-				'desc'          => __( 'Time Format' ),
-				'readonly'      => false,
-				'option'        => 'time_format'
+			'time_format'             => array(
+				'desc'     => __( 'Time Format' ),
+				'readonly' => false,
+				'option'   => 'time_format',
 			),
-			'users_can_register' => array(
-				'desc'          => __( 'Allow new users to sign up' ),
-				'readonly'      => false,
-				'option'        => 'users_can_register'
+			'users_can_register'      => array(
+				'desc'     => __( 'Allow new users to sign up' ),
+				'readonly' => false,
+				'option'   => 'users_can_register',
 			),
-			'thumbnail_size_w'  => array(
-				'desc'          => __( 'Thumbnail Width' ),
-				'readonly'      => false,
-				'option'        => 'thumbnail_size_w'
+			'thumbnail_size_w'        => array(
+				'desc'     => __( 'Thumbnail Width' ),
+				'readonly' => false,
+				'option'   => 'thumbnail_size_w',
 			),
-			'thumbnail_size_h'  => array(
-				'desc'          => __( 'Thumbnail Height' ),
-				'readonly'      => false,
-				'option'        => 'thumbnail_size_h'
+			'thumbnail_size_h'        => array(
+				'desc'     => __( 'Thumbnail Height' ),
+				'readonly' => false,
+				'option'   => 'thumbnail_size_h',
 			),
-			'thumbnail_crop'    => array(
-				'desc'          => __( 'Crop thumbnail to exact dimensions' ),
-				'readonly'      => false,
-				'option'        => 'thumbnail_crop'
+			'thumbnail_crop'          => array(
+				'desc'     => __( 'Crop thumbnail to exact dimensions' ),
+				'readonly' => false,
+				'option'   => 'thumbnail_crop',
 			),
-			'medium_size_w'     => array(
-				'desc'          => __( 'Medium size image width' ),
-				'readonly'      => false,
-				'option'        => 'medium_size_w'
+			'medium_size_w'           => array(
+				'desc'     => __( 'Medium size image width' ),
+				'readonly' => false,
+				'option'   => 'medium_size_w',
 			),
-			'medium_size_h'     => array(
-				'desc'          => __( 'Medium size image height' ),
-				'readonly'      => false,
-				'option'        => 'medium_size_h'
+			'medium_size_h'           => array(
+				'desc'     => __( 'Medium size image height' ),
+				'readonly' => false,
+				'option'   => 'medium_size_h',
 			),
-			'medium_large_size_w'   => array(
-				'desc'          => __( 'Medium-Large size image width' ),
-				'readonly'      => false,
-				'option'        => 'medium_large_size_w'
+			'medium_large_size_w'     => array(
+				'desc'     => __( 'Medium-Large size image width' ),
+				'readonly' => false,
+				'option'   => 'medium_large_size_w',
 			),
-			'medium_large_size_h'   => array(
-				'desc'          => __( 'Medium-Large size image height' ),
-				'readonly'      => false,
-				'option'        => 'medium_large_size_h'
+			'medium_large_size_h'     => array(
+				'desc'     => __( 'Medium-Large size image height' ),
+				'readonly' => false,
+				'option'   => 'medium_large_size_h',
 			),
-			'large_size_w'      => array(
-				'desc'          => __( 'Large size image width' ),
-				'readonly'      => false,
-				'option'        => 'large_size_w'
+			'large_size_w'            => array(
+				'desc'     => __( 'Large size image width' ),
+				'readonly' => false,
+				'option'   => 'large_size_w',
 			),
-			'large_size_h'      => array(
-				'desc'          => __( 'Large size image height' ),
-				'readonly'      => false,
-				'option'        => 'large_size_h'
+			'large_size_h'            => array(
+				'desc'     => __( 'Large size image height' ),
+				'readonly' => false,
+				'option'   => 'large_size_h',
 			),
-			'default_comment_status' => array(
-				'desc'          => __( 'Allow people to post comments on new articles' ),
-				'readonly'      => false,
-				'option'        => 'default_comment_status'
+			'default_comment_status'  => array(
+				'desc'     => __( 'Allow people to post comments on new articles' ),
+				'readonly' => false,
+				'option'   => 'default_comment_status',
+			),
+			'default_ping_status'     => array(
+				'desc'     => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
+				'readonly' => false,
+				'option'   => 'default_ping_status',
 			),
-			'default_ping_status' => array(
-				'desc'          => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ),
-				'readonly'      => false,
-				'option'        => 'default_ping_status'
-			)
 		);
 
 		/**
@@ -653,7 +658,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		}
 
 		// If this isn't on WPMU then just use blogger_getUsersBlogs
-		if ( !is_multisite() ) {
+		if ( ! is_multisite() ) {
 			array_unshift( $args, 1 );
 			return $this->blogger_getUsersBlogs( $args );
 		}
@@ -663,8 +668,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[0];
 		$password = $args[1];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/**
 		 * Fires after the XML-RPC user has been authenticated but before the rest of
@@ -679,24 +685,25 @@ class wp_xmlrpc_server extends IXR_Server {
 		 */
 		do_action( 'xmlrpc_call', 'wp.getUsersBlogs' );
 
-		$blogs = (array) get_blogs_of_user( $user->ID );
-		$struct = array();
+		$blogs           = (array) get_blogs_of_user( $user->ID );
+		$struct          = array();
 		$primary_blog_id = 0;
-		$active_blog = get_active_blog_for_user( $user->ID );
+		$active_blog     = get_active_blog_for_user( $user->ID );
 		if ( $active_blog ) {
 			$primary_blog_id = (int) $active_blog->blog_id;
 		}
 
 		foreach ( $blogs as $blog ) {
 			// Don't include blogs that aren't hosted at this site.
-			if ( $blog->site_id != get_current_network_id() )
+			if ( $blog->site_id != get_current_network_id() ) {
 				continue;
+			}
 
 			$blog_id = $blog->userblog_id;
 
 			switch_to_blog( $blog_id );
 
-			$is_admin = current_user_can( 'manage_options' );
+			$is_admin   = current_user_can( 'manage_options' );
 			$is_primary = ( (int) $blog_id === $primary_blog_id );
 
 			$struct[] = array(
@@ -735,32 +742,35 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares taxonomy data for return in an XML-RPC object.
 	 *
-	 *
 	 * @param object $taxonomy The unprepared taxonomy data.
 	 * @param array $fields    The subset of taxonomy fields to return.
 	 * @return array The prepared taxonomy data.
 	 */
 	protected function _prepare_taxonomy( $taxonomy, $fields ) {
 		$_taxonomy = array(
-			'name' => $taxonomy->name,
-			'label' => $taxonomy->label,
+			'name'         => $taxonomy->name,
+			'label'        => $taxonomy->label,
 			'hierarchical' => (bool) $taxonomy->hierarchical,
-			'public' => (bool) $taxonomy->public,
-			'show_ui' => (bool) $taxonomy->show_ui,
-			'_builtin' => (bool) $taxonomy->_builtin,
+			'public'       => (bool) $taxonomy->public,
+			'show_ui'      => (bool) $taxonomy->show_ui,
+			'_builtin'     => (bool) $taxonomy->_builtin,
 		);
 
-		if ( in_array( 'labels', $fields ) )
+		if ( in_array( 'labels', $fields ) ) {
 			$_taxonomy['labels'] = (array) $taxonomy->labels;
+		}
 
-		if ( in_array( 'cap', $fields ) )
+		if ( in_array( 'cap', $fields ) ) {
 			$_taxonomy['cap'] = (array) $taxonomy->cap;
+		}
 
-		if ( in_array( 'menu', $fields ) )
+		if ( in_array( 'menu', $fields ) ) {
 			$_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_menu;
+		}
 
-		if ( in_array( 'object_type', $fields ) )
+		if ( in_array( 'object_type', $fields ) ) {
 			$_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_type );
+		}
 
 		/**
 		 * Filters XML-RPC-prepared data for the given taxonomy.
@@ -777,20 +787,20 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares term data for return in an XML-RPC object.
 	 *
-	 *
 	 * @param array|object $term The unprepared term data.
 	 * @return array The prepared term data.
 	 */
 	protected function _prepare_term( $term ) {
 		$_term = $term;
-		if ( ! is_array( $_term ) )
+		if ( ! is_array( $_term ) ) {
 			$_term = get_object_vars( $_term );
+		}
 
 		// For integers which may be larger than XML-RPC supports ensure we return strings.
-		$_term['term_id'] = strval( $_term['term_id'] );
-		$_term['term_group'] = strval( $_term['term_group'] );
+		$_term['term_id']          = strval( $_term['term_id'] );
+		$_term['term_group']       = strval( $_term['term_group'] );
 		$_term['term_taxonomy_id'] = strval( $_term['term_taxonomy_id'] );
-		$_term['parent'] = strval( $_term['parent'] );
+		$_term['parent']           = strval( $_term['parent'] );
 
 		// Count we are happy to return as an integer because people really shouldn't use terms that much.
 		$_term['count'] = intval( $_term['count'] );
@@ -812,7 +822,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Convert a WordPress date string to an IXR_Date object.
 	 *
-	 *
 	 * @param string $date Date string to convert.
 	 * @return IXR_Date IXR_Date object.
 	 */
@@ -826,7 +835,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Convert a WordPress GMT date string to an IXR_Date object.
 	 *
-	 *
 	 * @param string $date_gmt WordPress GMT date string.
 	 * @param string $date     Date string.
 	 * @return IXR_Date IXR_Date object.
@@ -841,7 +849,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares post data for return in an XML-RPC object.
 	 *
-	 *
 	 * @param array $post   The unprepared post data.
 	 * @param array $fields The subset of post type fields to return.
 	 * @return array The prepared post data.
@@ -876,51 +883,54 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		// Thumbnail.
 		$post_fields['post_thumbnail'] = array();
-		$thumbnail_id = get_post_thumbnail_id( $post['ID'] );
+		$thumbnail_id                  = get_post_thumbnail_id( $post['ID'] );
 		if ( $thumbnail_id ) {
-			$thumbnail_size = current_theme_supports('post-thumbnail') ? 'post-thumbnail' : 'thumbnail';
+			$thumbnail_size                = current_theme_supports( 'post-thumbnail' ) ? 'post-thumbnail' : 'thumbnail';
 			$post_fields['post_thumbnail'] = $this->_prepare_media_item( get_post( $thumbnail_id ), $thumbnail_size );
 		}
 
 		// Consider future posts as published.
-		if ( $post_fields['post_status'] === 'future' )
+		if ( $post_fields['post_status'] === 'future' ) {
 			$post_fields['post_status'] = 'publish';
+		}
 
 		// Fill in blank post format.
 		$post_fields['post_format'] = get_post_format( $post['ID'] );
-		if ( empty( $post_fields['post_format'] ) )
+		if ( empty( $post_fields['post_format'] ) ) {
 			$post_fields['post_format'] = 'standard';
+		}
 
 		// Merge requested $post_fields fields into $_post.
 		if ( in_array( 'post', $fields ) ) {
 			$_post = array_merge( $_post, $post_fields );
 		} else {
 			$requested_fields = array_intersect_key( $post_fields, array_flip( $fields ) );
-			$_post = array_merge( $_post, $requested_fields );
+			$_post            = array_merge( $_post, $requested_fields );
 		}
 
 		$all_taxonomy_fields = in_array( 'taxonomies', $fields );
 
 		if ( $all_taxonomy_fields || in_array( 'terms', $fields ) ) {
 			$post_type_taxonomies = get_object_taxonomies( $post['post_type'], 'names' );
-			$terms = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
-			$_post['terms'] = array();
+			$terms                = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
+			$_post['terms']       = array();
 			foreach ( $terms as $term ) {
 				$_post['terms'][] = $this->_prepare_term( $term );
 			}
 		}
 
-		if ( in_array( 'custom_fields', $fields ) )
+		if ( in_array( 'custom_fields', $fields ) ) {
 			$_post['custom_fields'] = $this->get_custom_fields( $post['ID'] );
+		}
 
 		if ( in_array( 'enclosure', $fields ) ) {
 			$_post['enclosure'] = array();
-			$enclosures = (array) get_post_meta( $post['ID'], 'enclosure' );
+			$enclosures         = (array) get_post_meta( $post['ID'], 'enclosure' );
 			if ( ! empty( $enclosures ) ) {
-				$encdata = explode( "\n", $enclosures[0] );
-				$_post['enclosure']['url'] = trim( htmlspecialchars( $encdata[0] ) );
+				$encdata                      = explode( "\n", $enclosures[0] );
+				$_post['enclosure']['url']    = trim( htmlspecialchars( $encdata[0] ) );
 				$_post['enclosure']['length'] = (int) trim( $encdata[1] );
-				$_post['enclosure']['type'] = trim( $encdata[2] );
+				$_post['enclosure']['type']   = trim( $encdata[2] );
 			}
 		}
 
@@ -948,14 +958,14 @@ class wp_xmlrpc_server extends IXR_Server {
 	 */
 	protected function _prepare_post_type( $post_type, $fields ) {
 		$_post_type = array(
-			'name' => $post_type->name,
-			'label' => $post_type->label,
+			'name'         => $post_type->name,
+			'label'        => $post_type->label,
 			'hierarchical' => (bool) $post_type->hierarchical,
-			'public' => (bool) $post_type->public,
-			'show_ui' => (bool) $post_type->show_ui,
-			'_builtin' => (bool) $post_type->_builtin,
-			'has_archive' => (bool) $post_type->has_archive,
-			'supports' => get_all_post_type_supports( $post_type->name ),
+			'public'       => (bool) $post_type->public,
+			'show_ui'      => (bool) $post_type->show_ui,
+			'_builtin'     => (bool) $post_type->_builtin,
+			'has_archive'  => (bool) $post_type->has_archive,
+			'supports'     => get_all_post_type_supports( $post_type->name ),
 		);
 
 		if ( in_array( 'labels', $fields ) ) {
@@ -963,18 +973,19 @@ class wp_xmlrpc_server extends IXR_Server {
 		}
 
 		if ( in_array( 'cap', $fields ) ) {
-			$_post_type['cap'] = (array) $post_type->cap;
+			$_post_type['cap']          = (array) $post_type->cap;
 			$_post_type['map_meta_cap'] = (bool) $post_type->map_meta_cap;
 		}
 
 		if ( in_array( 'menu', $fields ) ) {
 			$_post_type['menu_position'] = (int) $post_type->menu_position;
-			$_post_type['menu_icon'] = $post_type->menu_icon;
-			$_post_type['show_in_menu'] = (bool) $post_type->show_in_menu;
+			$_post_type['menu_icon']     = $post_type->menu_icon;
+			$_post_type['show_in_menu']  = (bool) $post_type->show_in_menu;
 		}
 
-		if ( in_array( 'taxonomies', $fields ) )
+		if ( in_array( 'taxonomies', $fields ) ) {
 			$_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
+		}
 
 		/**
 		 * Filters XML-RPC-prepared date for the given post type.
@@ -991,7 +1002,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares media item data for return in an XML-RPC object.
 	 *
-	 *
 	 * @param object $media_item     The unprepared media item data.
 	 * @param string $thumbnail_size The image size to use for the thumbnail URL.
 	 * @return array The prepared media item data.
@@ -1006,14 +1016,15 @@ class wp_xmlrpc_server extends IXR_Server {
 			'caption'          => $media_item->post_excerpt,
 			'description'      => $media_item->post_content,
 			'metadata'         => wp_get_attachment_metadata( $media_item->ID ),
-			'type'             => $media_item->post_mime_type
+			'type'             => $media_item->post_mime_type,
 		);
 
 		$thumbnail_src = image_downsize( $media_item->ID, $thumbnail_size );
-		if ( $thumbnail_src )
+		if ( $thumbnail_src ) {
 			$_media_item['thumbnail'] = $thumbnail_src[0];
-		else
+		} else {
 			$_media_item['thumbnail'] = $_media_item['link'];
+		}
 
 		/**
 		 * Filters XML-RPC-prepared data for the given media item.
@@ -1030,28 +1041,27 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares page data for return in an XML-RPC object.
 	 *
-	 *
 	 * @param object $page The unprepared page data.
 	 * @return array The prepared page data.
 	 */
 	protected function _prepare_page( $page ) {
 		// Get all of the page content and link.
 		$full_page = get_extended( $page->post_content );
-		$link = get_permalink( $page->ID );
+		$link      = get_permalink( $page->ID );
 
 		// Get info the page parent if there is one.
-		$parent_title = "";
+		$parent_title = '';
 		if ( ! empty( $page->post_parent ) ) {
-			$parent = get_post( $page->post_parent );
+			$parent       = get_post( $page->post_parent );
 			$parent_title = $parent->post_title;
 		}
 
 		// Determine comment and ping settings.
 		$allow_comments = comments_open( $page->ID ) ? 1 : 0;
-		$allow_pings = pings_open( $page->ID ) ? 1 : 0;
+		$allow_pings    = pings_open( $page->ID ) ? 1 : 0;
 
 		// Format page date.
-		$page_date = $this->_convert_date( $page->post_date );
+		$page_date     = $this->_convert_date( $page->post_date );
 		$page_date_gmt = $this->_convert_date_gmt( $page->post_date_gmt, $page->post_date );
 
 		// Pull the categories info together.
@@ -1066,8 +1076,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$author = get_userdata( $page->post_author );
 
 		$page_template = get_page_template_slug( $page->ID );
-		if ( empty( $page_template ) )
+		if ( empty( $page_template ) ) {
 			$page_template = 'default';
+		}
 
 		$_page = array(
 			'dateCreated'            => $page_date,
@@ -1093,7 +1104,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			'wp_author_display_name' => $author->display_name,
 			'date_created_gmt'       => $page_date_gmt,
 			'custom_fields'          => $this->get_custom_fields( $page->ID ),
-			'wp_page_template'       => $page_template
+			'wp_page_template'       => $page_template,
 		);
 
 		/**
@@ -1110,7 +1121,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares comment data for return in an XML-RPC object.
 	 *
-	 *
 	 * @param object $comment The unprepared comment data.
 	 * @return array The prepared comment data.
 	 */
@@ -1134,9 +1144,9 @@ class wp_xmlrpc_server extends IXR_Server {
 			'parent'           => $comment->comment_parent,
 			'status'           => $comment_status,
 			'content'          => $comment->comment_content,
-			'link'             => get_comment_link($comment),
+			'link'             => get_comment_link( $comment ),
 			'post_id'          => $comment->comment_post_ID,
-			'post_title'       => get_the_title($comment->comment_post_ID),
+			'post_title'       => get_the_title( $comment->comment_post_ID ),
 			'author'           => $comment->comment_author,
 			'author_url'       => $comment->comment_author_url,
 			'author_email'     => $comment->comment_author_email,
@@ -1158,7 +1168,6 @@ class wp_xmlrpc_server extends IXR_Server {
 	/**
 	 * Prepares user data for return in an XML-RPC object.
 	 *
-	 *
 	 * @param WP_User $user   The unprepared user object.
 	 * @param array   $fields The subset of user fields to return.
 	 * @return array The prepared user data.
@@ -1167,17 +1176,17 @@ class wp_xmlrpc_server extends IXR_Server {
 		$_user = array( 'user_id' => strval( $user->ID ) );
 
 		$user_fields = array(
-			'username'          => $user->user_login,
-			'first_name'        => $user->user_firstname,
-			'last_name'         => $user->user_lastname,
-			'registered'        => $this->_convert_date( $user->user_registered ),
-			'bio'               => $user->user_description,
-			'email'             => $user->user_email,
-			'nickname'          => $user->nickname,
-			'nicename'          => $user->user_nicename,
-			'url'               => $user->user_url,
-			'display_name'      => $user->display_name,
-			'roles'             => $user->roles,
+			'username'     => $user->user_login,
+			'first_name'   => $user->user_firstname,
+			'last_name'    => $user->user_lastname,
+			'registered'   => $this->_convert_date( $user->user_registered ),
+			'bio'          => $user->user_description,
+			'email'        => $user->user_email,
+			'nickname'     => $user->nickname,
+			'nicename'     => $user->user_nicename,
+			'url'          => $user->user_url,
+			'display_name' => $user->display_name,
+			'roles'        => $user->roles,
 		);
 
 		if ( in_array( 'all', $fields ) ) {
@@ -1185,10 +1194,10 @@ class wp_xmlrpc_server extends IXR_Server {
 		} else {
 			if ( in_array( 'basic', $fields ) ) {
 				$basic_fields = array( 'username', 'email', 'registered', 'display_name', 'nicename' );
-				$fields = array_merge( $fields, $basic_fields );
+				$fields       = array_merge( $fields, $basic_fields );
 			}
 			$requested_fields = array_intersect_key( $user_fields, array_flip( $fields ) );
-			$_user = array_merge( $_user, $requested_fields );
+			$_user            = array_merge( $_user, $requested_fields );
 		}
 
 		/**
@@ -1251,8 +1260,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return int|IXR_Error Post ID on success, IXR_Error instance otherwise.
 	 */
 	public function wp_newPost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1260,8 +1270,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		// convert the date field back to IXR form
 		if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {
@@ -1320,7 +1331,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			if ( $update ) {
 				unstick_post( $post_data['ID'] );
 			}
-		} elseif ( isset( $post_data['sticky'] ) )  {
+		} elseif ( isset( $post_data['sticky'] ) ) {
 			if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you are not allowed to make posts sticky.' ) );
 			}
@@ -1373,21 +1384,26 @@ class wp_xmlrpc_server extends IXR_Server {
 		$post_data = wp_parse_args( array_intersect_key( $content_struct, $defaults ), $defaults );
 
 		$post_type = get_post_type_object( $post_data['post_type'] );
-		if ( ! $post_type )
+		if ( ! $post_type ) {
 			return new IXR_Error( 403, __( 'Invalid post type.' ) );
+		}
 
 		$update = ! empty( $post_data['ID'] );
 
 		if ( $update ) {
-			if ( ! get_post( $post_data['ID'] ) )
+			if ( ! get_post( $post_data['ID'] ) ) {
 				return new IXR_Error( 401, __( 'Invalid post ID.' ) );
-			if ( ! current_user_can( 'edit_post', $post_data['ID'] ) )
+			}
+			if ( ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
-			if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) )
+			}
+			if ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) ) {
 				return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+			}
 		} else {
-			if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
+			if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+			}
 		}
 
 		switch ( $post_data['post_status'] ) {
@@ -1395,41 +1411,49 @@ class wp_xmlrpc_server extends IXR_Server {
 			case 'pending':
 				break;
 			case 'private':
-				if ( ! current_user_can( $post_type->cap->publish_posts ) )
+				if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
 					return new IXR_Error( 401, __( 'Sorry, you are not allowed to create private posts in this post type.' ) );
+				}
 				break;
 			case 'publish':
 			case 'future':
-				if ( ! current_user_can( $post_type->cap->publish_posts ) )
+				if ( ! current_user_can( $post_type->cap->publish_posts ) ) {
 					return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts in this post type.' ) );
+				}
 				break;
 			default:
-				if ( ! get_post_status_object( $post_data['post_status'] ) )
+				if ( ! get_post_status_object( $post_data['post_status'] ) ) {
 					$post_data['post_status'] = 'draft';
-			break;
+				}
+				break;
 		}
 
-		if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) )
+		if ( ! empty( $post_data['post_password'] ) && ! current_user_can( $post_type->cap->publish_posts ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to create password protected posts in this post type.' ) );
+		}
 
 		$post_data['post_author'] = absint( $post_data['post_author'] );
 		if ( ! empty( $post_data['post_author'] ) && $post_data['post_author'] != $user->ID ) {
-			if ( ! current_user_can( $post_type->cap->edit_others_posts ) )
+			if ( ! current_user_can( $post_type->cap->edit_others_posts ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			}
 
 			$author = get_userdata( $post_data['post_author'] );
 
-			if ( ! $author )
+			if ( ! $author ) {
 				return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			}
 		} else {
 			$post_data['post_author'] = $user->ID;
 		}
 
-		if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' )
+		if ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' ) {
 			unset( $post_data['comment_status'] );
+		}
 
-		if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' )
+		if ( isset( $post_data['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' ) {
 			unset( $post_data['ping_status'] );
+		}
 
 		// Do some timestamp voodoo.
 		if ( ! empty( $post_data['post_date_gmt'] ) ) {
@@ -1443,15 +1467,16 @@ class wp_xmlrpc_server extends IXR_Server {
 		$post_data['edit_date'] = false;
 
 		if ( ! empty( $dateCreated ) ) {
-			$post_data['post_date'] = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+			$post_data['post_date']     = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
 			$post_data['post_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
 
 			// Flag the post date to be edited.
 			$post_data['edit_date'] = true;
 		}
 
-		if ( ! isset( $post_data['ID'] ) )
+		if ( ! isset( $post_data['ID'] ) ) {
 			$post_data['ID'] = get_default_post_to_edit( $post_data['post_type'], true )->ID;
+		}
 		$post_ID = $post_data['ID'];
 
 		if ( $post_data['post_type'] == 'post' ) {
@@ -1463,16 +1488,18 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		if ( isset( $post_data['post_thumbnail'] ) ) {
 			// empty value deletes, non-empty value adds/updates.
-			if ( ! $post_data['post_thumbnail'] )
+			if ( ! $post_data['post_thumbnail'] ) {
 				delete_post_thumbnail( $post_ID );
-			elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) )
+			} elseif ( ! get_post( absint( $post_data['post_thumbnail'] ) ) ) {
 				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+			}
 			set_post_thumbnail( $post_ID, $post_data['post_thumbnail'] );
 			unset( $content_struct['post_thumbnail'] );
 		}
 
-		if ( isset( $post_data['custom_fields'] ) )
+		if ( isset( $post_data['custom_fields'] ) ) {
 			$this->set_custom_fields( $post_ID, $post_data['custom_fields'] );
+		}
 
 		if ( isset( $post_data['terms'] ) || isset( $post_data['terms_names'] ) ) {
 			$post_type_taxonomies = get_object_taxonomies( $post_data['post_type'], 'objects' );
@@ -1486,21 +1513,24 @@ class wp_xmlrpc_server extends IXR_Server {
 
 				// Validating term ids.
 				foreach ( $taxonomies as $taxonomy ) {
-					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
+					if ( ! array_key_exists( $taxonomy, $post_type_taxonomies ) ) {
 						return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+					}
 
-					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
+					if ( ! current_user_can( $post_type_taxonomies[ $taxonomy ]->cap->assign_terms ) ) {
 						return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					}
 
-					$term_ids = $post_data['terms'][$taxonomy];
+					$term_ids           = $post_data['terms'][ $taxonomy ];
 					$terms[ $taxonomy ] = array();
 					foreach ( $term_ids as $term_id ) {
 						$term = get_term_by( 'id', $term_id, $taxonomy );
 
-						if ( ! $term )
+						if ( ! $term ) {
 							return new IXR_Error( 403, __( 'Invalid term ID.' ) );
+						}
 
-						$terms[$taxonomy][] = (int) $term_id;
+						$terms[ $taxonomy ][] = (int) $term_id;
 					}
 				}
 			}
@@ -1510,11 +1540,13 @@ class wp_xmlrpc_server extends IXR_Server {
 				$taxonomies = array_keys( $post_data['terms_names'] );
 
 				foreach ( $taxonomies as $taxonomy ) {
-					if ( ! array_key_exists( $taxonomy , $post_type_taxonomies ) )
+					if ( ! array_key_exists( $taxonomy, $post_type_taxonomies ) ) {
 						return new IXR_Error( 401, __( 'Sorry, one of the given taxonomies is not supported by the post type.' ) );
+					}
 
-					if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->assign_terms ) )
+					if ( ! current_user_can( $post_type_taxonomies[ $taxonomy ]->cap->assign_terms ) ) {
 						return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign a term to one of the given taxonomies.' ) );
+					}
 
 					/*
 					 * For hierarchical taxonomies, we can't assign a term when multiple terms
@@ -1522,37 +1554,45 @@ class wp_xmlrpc_server extends IXR_Server {
 					 */
 					$ambiguous_terms = array();
 					if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-						$tax_term_names = get_terms( $taxonomy, array( 'fields' => 'names', 'hide_empty' => false ) );
+						$tax_term_names = get_terms(
+							$taxonomy, array(
+								'fields'     => 'names',
+								'hide_empty' => false,
+							)
+						);
 
 						// Count the number of terms with the same name.
 						$tax_term_names_count = array_count_values( $tax_term_names );
 
 						// Filter out non-ambiguous term names.
-						$ambiguous_tax_term_counts = array_filter( $tax_term_names_count, array( $this, '_is_greater_than_one') );
+						$ambiguous_tax_term_counts = array_filter( $tax_term_names_count, array( $this, '_is_greater_than_one' ) );
 
 						$ambiguous_terms = array_keys( $ambiguous_tax_term_counts );
 					}
 
-					$term_names = $post_data['terms_names'][$taxonomy];
+					$term_names = $post_data['terms_names'][ $taxonomy ];
 					foreach ( $term_names as $term_name ) {
-						if ( in_array( $term_name, $ambiguous_terms ) )
+						if ( in_array( $term_name, $ambiguous_terms ) ) {
 							return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
+						}
 
 						$term = get_term_by( 'name', $term_name, $taxonomy );
 
 						if ( ! $term ) {
 							// Term doesn't exist, so check that the user is allowed to create new terms.
-							if ( ! current_user_can( $post_type_taxonomies[$taxonomy]->cap->edit_terms ) )
+							if ( ! current_user_can( $post_type_taxonomies[ $taxonomy ]->cap->edit_terms ) ) {
 								return new IXR_Error( 401, __( 'Sorry, you are not allowed to add a term to one of the given taxonomies.' ) );
+							}
 
 							// Create the new term.
 							$term_info = wp_insert_term( $term_name, $taxonomy );
-							if ( is_wp_error( $term_info ) )
+							if ( is_wp_error( $term_info ) ) {
 								return new IXR_Error( 500, $term_info->get_error_message() );
+							}
 
-							$terms[$taxonomy][] = (int) $term_info['term_id'];
+							$terms[ $taxonomy ][] = (int) $term_info['term_id'];
 						} else {
-							$terms[$taxonomy][] = (int) $term->term_id;
+							$terms[ $taxonomy ][] = (int) $term->term_id;
 						}
 					}
 				}
@@ -1565,8 +1605,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( isset( $post_data['post_format'] ) ) {
 			$format = set_post_format( $post_ID, $post_data['post_format'] );
 
-			if ( is_wp_error( $format ) )
+			if ( is_wp_error( $format ) ) {
 				return new IXR_Error( 500, $format->get_error_message() );
+			}
 
 			unset( $post_data['post_format'] );
 		}
@@ -1588,11 +1629,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		$post_data = apply_filters( 'xmlrpc_wp_insert_post_data', $post_data, $content_struct );
 
 		$post_ID = $update ? wp_update_post( $post_data, true ) : wp_insert_post( $post_data, true );
-		if ( is_wp_error( $post_ID ) )
+		if ( is_wp_error( $post_ID ) ) {
 			return new IXR_Error( 500, $post_ID->get_error_message() );
+		}
 
-		if ( ! $post_ID )
+		if ( ! $post_ID ) {
 			return new IXR_Error( 401, __( 'Sorry, your entry could not be posted.' ) );
+		}
 
 		return strval( $post_ID );
 	}
@@ -1617,8 +1660,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return true|IXR_Error True on success, IXR_Error on failure.
 	 */
 	public function wp_editPost( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+		if ( ! $this->minimum_args( $args, 5 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1627,16 +1671,18 @@ class wp_xmlrpc_server extends IXR_Server {
 		$post_id        = (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editPost' );
 
 		$post = get_post( $post_id, ARRAY_A );
 
-		if ( empty( $post['ID'] ) )
+		if ( empty( $post['ID'] ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
 		if ( isset( $content_struct['if_not_modified_since'] ) ) {
 			// If the post has been modified since the date provided, return an error.
@@ -1652,17 +1698,19 @@ class wp_xmlrpc_server extends IXR_Server {
 		 * Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
 		 * since _insert_post() will ignore the non-GMT date if the GMT date is set.
 		 */
-		if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) )
+		if ( $post['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
 			unset( $post['post_date_gmt'] );
-		else
+		} else {
 			$post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
+		}
 
 		$this->escape( $post );
 		$merged_content_struct = array_merge( $post, $content_struct );
 
 		$retval = $this->_insert_post( $user, $merged_content_struct );
-		if ( $retval instanceof IXR_Error )
+		if ( $retval instanceof IXR_Error ) {
 			return $retval;
+		}
 
 		return true;
 	}
@@ -1685,17 +1733,19 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
 	 */
 	public function wp_deletePost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
-		$username   = $args[1];
-		$password   = $args[2];
-		$post_id    = (int) $args[3];
+		$username = $args[1];
+		$password = $args[2];
+		$post_id  = (int) $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deletePost' );
@@ -1768,8 +1818,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - 'enclosure'
 	 */
 	public function wp_getPost( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1791,19 +1842,22 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPost' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPost' );
 
 		$post = get_post( $post_id, ARRAY_A );
 
-		if ( empty( $post['ID'] ) )
+		if ( empty( $post['ID'] ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $post_id ) )
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 
 		return $this->_prepare_post( $post, $fields );
 	}
@@ -1831,8 +1885,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return array|IXR_Error Array contains a collection of posts.
 	 */
 	public function wp_getPosts( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+		if ( ! $this->minimum_args( $args, 3 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1847,8 +1902,9 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_post_fields', array( 'post', 'terms', 'custom_fields' ), 'wp.getPosts' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPosts' );
@@ -1857,31 +1913,37 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		if ( isset( $filter['post_type'] ) ) {
 			$post_type = get_post_type_object( $filter['post_type'] );
-			if ( ! ( (bool) $post_type ) )
+			if ( ! ( (bool) $post_type ) ) {
 				return new IXR_Error( 403, __( 'Invalid post type.' ) );
+			}
 		} else {
 			$post_type = get_post_type_object( 'post' );
 		}
 
-		if ( ! current_user_can( $post_type->cap->edit_posts ) )
+		if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+		}
 
 		$query['post_type'] = $post_type->name;
 
-		if ( isset( $filter['post_status'] ) )
+		if ( isset( $filter['post_status'] ) ) {
 			$query['post_status'] = $filter['post_status'];
+		}
 
-		if ( isset( $filter['number'] ) )
+		if ( isset( $filter['number'] ) ) {
 			$query['numberposts'] = absint( $filter['number'] );
+		}
 
-		if ( isset( $filter['offset'] ) )
+		if ( isset( $filter['offset'] ) ) {
 			$query['offset'] = absint( $filter['offset'] );
+		}
 
 		if ( isset( $filter['orderby'] ) ) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
+			if ( isset( $filter['order'] ) ) {
 				$query['order'] = $filter['order'];
+			}
 		}
 
 		if ( isset( $filter['s'] ) ) {
@@ -1890,15 +1952,17 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$posts_list = wp_get_recent_posts( $query );
 
-		if ( ! $posts_list )
+		if ( ! $posts_list ) {
 			return array();
+		}
 
 		// Holds all the posts data.
 		$struct = array();
 
 		foreach ( $posts_list as $post ) {
-			if ( ! current_user_can( 'edit_post', $post['ID'] ) )
+			if ( ! current_user_can( 'edit_post', $post['ID'] ) ) {
 				continue;
+			}
 
 			$struct[] = $this->_prepare_post( $post, $fields );
 		}
@@ -1926,8 +1990,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return int|IXR_Error The term ID on success, or an IXR_Error object on failure.
 	 */
 	public function wp_newTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -1935,14 +2000,16 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newTerm' );
 
-		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
+		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+		}
 
 		$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
 
@@ -1956,38 +2023,46 @@ class wp_xmlrpc_server extends IXR_Server {
 		$term_data = array();
 
 		$term_data['name'] = trim( $content_struct['name'] );
-		if ( empty( $term_data['name'] ) )
+		if ( empty( $term_data['name'] ) ) {
 			return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+		}
 
 		if ( isset( $content_struct['parent'] ) ) {
-			if ( ! $taxonomy['hierarchical'] )
+			if ( ! $taxonomy['hierarchical'] ) {
 				return new IXR_Error( 403, __( 'This taxonomy is not hierarchical.' ) );
+			}
 
 			$parent_term_id = (int) $content_struct['parent'];
-			$parent_term = get_term( $parent_term_id , $taxonomy['name'] );
+			$parent_term    = get_term( $parent_term_id, $taxonomy['name'] );
 
-			if ( is_wp_error( $parent_term ) )
+			if ( is_wp_error( $parent_term ) ) {
 				return new IXR_Error( 500, $parent_term->get_error_message() );
+			}
 
-			if ( ! $parent_term )
+			if ( ! $parent_term ) {
 				return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			}
 
 			$term_data['parent'] = $content_struct['parent'];
 		}
 
-		if ( isset( $content_struct['description'] ) )
+		if ( isset( $content_struct['description'] ) ) {
 			$term_data['description'] = $content_struct['description'];
+		}
 
-		if ( isset( $content_struct['slug'] ) )
+		if ( isset( $content_struct['slug'] ) ) {
 			$term_data['slug'] = $content_struct['slug'];
+		}
 
-		$term = wp_insert_term( $term_data['name'] , $taxonomy['name'] , $term_data );
+		$term = wp_insert_term( $term_data['name'], $taxonomy['name'], $term_data );
 
-		if ( is_wp_error( $term ) )
+		if ( is_wp_error( $term ) ) {
 			return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
+		if ( ! $term ) {
 			return new IXR_Error( 500, __( 'Sorry, your term could not be created.' ) );
+		}
 
 		// Add term meta.
 		if ( isset( $content_struct['custom_fields'] ) ) {
@@ -2018,8 +2093,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return true|IXR_Error True on success, IXR_Error instance on failure.
 	 */
 	public function wp_editTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+		if ( ! $this->minimum_args( $args, 5 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2028,14 +2104,16 @@ class wp_xmlrpc_server extends IXR_Server {
 		$term_id        = (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editTerm' );
 
-		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) )
+		if ( ! taxonomy_exists( $content_struct['taxonomy'] ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+		}
 
 		$taxonomy = get_taxonomy( $content_struct['taxonomy'] );
 
@@ -2044,13 +2122,15 @@ class wp_xmlrpc_server extends IXR_Server {
 		// hold the data of the term
 		$term_data = array();
 
-		$term = get_term( $term_id , $content_struct['taxonomy'] );
+		$term = get_term( $term_id, $content_struct['taxonomy'] );
 
-		if ( is_wp_error( $term ) )
+		if ( is_wp_error( $term ) ) {
 			return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
+		if ( ! $term ) {
 			return new IXR_Error( 404, __( 'Invalid term ID.' ) );
+		}
 
 		if ( ! current_user_can( 'edit_term', $term_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this term.' ) );
@@ -2059,39 +2139,47 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( isset( $content_struct['name'] ) ) {
 			$term_data['name'] = trim( $content_struct['name'] );
 
-			if ( empty( $term_data['name'] ) )
+			if ( empty( $term_data['name'] ) ) {
 				return new IXR_Error( 403, __( 'The term name cannot be empty.' ) );
+			}
 		}
 
 		if ( ! empty( $content_struct['parent'] ) ) {
-			if ( ! $taxonomy['hierarchical'] )
+			if ( ! $taxonomy['hierarchical'] ) {
 				return new IXR_Error( 403, __( 'Cannot set parent term, taxonomy is not hierarchical.' ) );
+			}
 
 			$parent_term_id = (int) $content_struct['parent'];
-			$parent_term = get_term( $parent_term_id , $taxonomy['name'] );
+			$parent_term    = get_term( $parent_term_id, $taxonomy['name'] );
 
-			if ( is_wp_error( $parent_term ) )
+			if ( is_wp_error( $parent_term ) ) {
 				return new IXR_Error( 500, $parent_term->get_error_message() );
+			}
 
-			if ( ! $parent_term )
+			if ( ! $parent_term ) {
 				return new IXR_Error( 403, __( 'Parent term does not exist.' ) );
+			}
 
 			$term_data['parent'] = $content_struct['parent'];
 		}
 
-		if ( isset( $content_struct['description'] ) )
+		if ( isset( $content_struct['description'] ) ) {
 			$term_data['description'] = $content_struct['description'];
+		}
 
-		if ( isset( $content_struct['slug'] ) )
+		if ( isset( $content_struct['slug'] ) ) {
 			$term_data['slug'] = $content_struct['slug'];
+		}
 
-		$term = wp_update_term( $term_id , $taxonomy['name'] , $term_data );
+		$term = wp_update_term( $term_id, $taxonomy['name'], $term_data );
 
-		if ( is_wp_error( $term ) )
+		if ( is_wp_error( $term ) ) {
 			return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
+		if ( ! $term ) {
 			return new IXR_Error( 500, __( 'Sorry, editing the term failed.' ) );
+		}
 
 		// Update term meta.
 		if ( isset( $content_struct['custom_fields'] ) ) {
@@ -2120,33 +2208,38 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return bool|IXR_Error True on success, IXR_Error instance on failure.
 	 */
 	public function wp_deleteTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+		if ( ! $this->minimum_args( $args, 5 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
-		$username           = $args[1];
-		$password           = $args[2];
-		$taxonomy           = $args[3];
-		$term_id            = (int) $args[4];
+		$username = $args[1];
+		$password = $args[2];
+		$taxonomy = $args[3];
+		$term_id  = (int) $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deleteTerm' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
+		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
-		$term = get_term( $term_id, $taxonomy->name );
+		$term     = get_term( $term_id, $taxonomy->name );
 
-		if ( is_wp_error( $term ) )
+		if ( is_wp_error( $term ) ) {
 			return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
+		if ( ! $term ) {
 			return new IXR_Error( 404, __( 'Invalid term ID.' ) );
+		}
 
 		if ( ! current_user_can( 'delete_term', $term_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this term.' ) );
@@ -2154,11 +2247,13 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$result = wp_delete_term( $term_id, $taxonomy->name );
 
-		if ( is_wp_error( $result ) )
+		if ( is_wp_error( $result ) ) {
 			return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $result )
+		if ( ! $result ) {
 			return new IXR_Error( 500, __( 'Sorry, deleting the term failed.' ) );
+		}
 
 		return $result;
 	}
@@ -2191,34 +2286,39 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - 'count'
 	 */
 	public function wp_getTerm( $args ) {
-		if ( ! $this->minimum_args( $args, 5 ) )
+		if ( ! $this->minimum_args( $args, 5 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
-		$username           = $args[1];
-		$password           = $args[2];
-		$taxonomy           = $args[3];
-		$term_id            = (int) $args[4];
+		$username = $args[1];
+		$password = $args[2];
+		$taxonomy = $args[3];
+		$term_id  = (int) $args[4];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTerm' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
+		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
 
-		$term = get_term( $term_id , $taxonomy->name, ARRAY_A );
+		$term = get_term( $term_id, $taxonomy->name, ARRAY_A );
 
-		if ( is_wp_error( $term ) )
+		if ( is_wp_error( $term ) ) {
 			return new IXR_Error( 500, $term->get_error_message() );
+		}
 
-		if ( ! $term )
+		if ( ! $term ) {
 			return new IXR_Error( 404, __( 'Invalid term ID.' ) );
+		}
 
 		if ( ! current_user_can( 'assign_term', $term_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign this term.' ) );
@@ -2250,57 +2350,67 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return array|IXR_Error An associative array of terms data on success, IXR_Error instance otherwise.
 	 */
 	public function wp_getTerms( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
-		$username       = $args[1];
-		$password       = $args[2];
-		$taxonomy       = $args[3];
-		$filter         = isset( $args[4] ) ? $args[4] : array();
+		$username = $args[1];
+		$password = $args[2];
+		$taxonomy = $args[3];
+		$filter   = isset( $args[4] ) ? $args[4] : array();
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTerms' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
+		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+		if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
+		}
 
 		$query = array();
 
-		if ( isset( $filter['number'] ) )
+		if ( isset( $filter['number'] ) ) {
 			$query['number'] = absint( $filter['number'] );
+		}
 
-		if ( isset( $filter['offset'] ) )
+		if ( isset( $filter['offset'] ) ) {
 			$query['offset'] = absint( $filter['offset'] );
+		}
 
 		if ( isset( $filter['orderby'] ) ) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
+			if ( isset( $filter['order'] ) ) {
 				$query['order'] = $filter['order'];
+			}
 		}
 
-		if ( isset( $filter['hide_empty'] ) )
+		if ( isset( $filter['hide_empty'] ) ) {
 			$query['hide_empty'] = $filter['hide_empty'];
-		else
+		} else {
 			$query['get'] = 'all';
+		}
 
-		if ( isset( $filter['search'] ) )
+		if ( isset( $filter['search'] ) ) {
 			$query['search'] = $filter['search'];
+		}
 
 		$terms = get_terms( $taxonomy->name, $query );
 
-		if ( is_wp_error( $terms ) )
+		if ( is_wp_error( $terms ) ) {
 			return new IXR_Error( 500, $terms->get_error_message() );
+		}
 
 		$struct = array();
 
@@ -2332,8 +2442,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return array|IXR_Error An array of taxonomy data on success, IXR_Error instance otherwise.
 	 */
 	public function wp_getTaxonomy( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2355,19 +2466,22 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomy' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTaxonomy' );
 
-		if ( ! taxonomy_exists( $taxonomy ) )
+		if ( ! taxonomy_exists( $taxonomy ) ) {
 			return new IXR_Error( 403, __( 'Invalid taxonomy.' ) );
+		}
 
 		$taxonomy = get_taxonomy( $taxonomy );
 
-		if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+		if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to assign terms in this taxonomy.' ) );
+		}
 
 		return $this->_prepare_taxonomy( $taxonomy, $fields );
 	}
@@ -2392,8 +2506,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *                         by `$fields`, or an IXR_Error instance on failure.
 	 */
 	public function wp_getTaxonomies( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+		if ( ! $this->minimum_args( $args, 3 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2408,8 +2523,9 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_taxonomy_fields', array( 'labels', 'cap', 'object_type' ), 'wp.getTaxonomies' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getTaxonomies' );
@@ -2421,8 +2537,9 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		foreach ( $taxonomies as $taxonomy ) {
 			// capability check for post_types
-			if ( ! current_user_can( $taxonomy->cap->assign_terms ) )
+			if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
 				continue;
+			}
 
 			$struct[] = $this->_prepare_taxonomy( $taxonomy, $fields );
 		}
@@ -2467,8 +2584,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - 'roles'
 	 */
 	public function wp_getUser( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2490,19 +2608,22 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUser' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getUser' );
 
-		if ( ! current_user_can( 'edit_user', $user_id ) )
+		if ( ! current_user_can( 'edit_user', $user_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this user.' ) );
+		}
 
 		$user_data = get_userdata( $user_id );
 
-		if ( ! $user_data )
+		if ( ! $user_data ) {
 			return new IXR_Error( 404, __( 'Invalid user ID.' ) );
+		}
 
 		return $this->_prepare_user( $user_data, $fields );
 	}
@@ -2532,8 +2653,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return array|IXR_Error users data
 	 */
 	public function wp_getUsers( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+		if ( ! $this->minimum_args( $args, 3 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2548,14 +2670,16 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getUsers' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getUsers' );
 
-		if ( ! current_user_can( 'list_users' ) )
+		if ( ! current_user_can( 'list_users' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to list users.' ) );
+		}
 
 		$query = array( 'fields' => 'all_with_meta' );
 
@@ -2565,13 +2689,15 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( isset( $filter['orderby'] ) ) {
 			$query['orderby'] = $filter['orderby'];
 
-			if ( isset( $filter['order'] ) )
+			if ( isset( $filter['order'] ) ) {
 				$query['order'] = $filter['order'];
+			}
 		}
 
 		if ( isset( $filter['role'] ) ) {
-			if ( get_role( $filter['role'] ) === null )
+			if ( get_role( $filter['role'] ) === null ) {
 				return new IXR_Error( 403, __( 'Invalid role.' ) );
+			}
 
 			$query['role'] = $filter['role'];
 		}
@@ -2584,8 +2710,9 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$_users = array();
 		foreach ( $users as $user_data ) {
-			if ( current_user_can( 'edit_user', $user_data->ID ) )
+			if ( current_user_can( 'edit_user', $user_data->ID ) ) {
 				$_users[] = $this->_prepare_user( $user_data, $fields );
+			}
 		}
 		return $_users;
 	}
@@ -2606,8 +2733,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return array|IXR_Error (@see wp_getUser)
 	 */
 	public function wp_getProfile( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+		if ( ! $this->minimum_args( $args, 3 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2621,14 +2749,16 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_user_fields', array( 'all' ), 'wp.getProfile' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getProfile' );
 
-		if ( ! current_user_can( 'edit_user', $user->ID ) )
+		if ( ! current_user_can( 'edit_user', $user->ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
+		}
 
 		$user_data = get_userdata( $user->ID );
 
@@ -2658,8 +2788,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return true|IXR_Error True, on success.
 	 */
 	public function wp_editProfile( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -2667,48 +2798,59 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password       = $args[2];
 		$content_struct = $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editProfile' );
 
-		if ( ! current_user_can( 'edit_user', $user->ID ) )
+		if ( ! current_user_can( 'edit_user', $user->ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit your profile.' ) );
+		}
 
 		// holds data of the user
-		$user_data = array();
+		$user_data       = array();
 		$user_data['ID'] = $user->ID;
 
 		// only set the user details if it was given
-		if ( isset( $content_struct['first_name'] ) )
+		if ( isset( $content_struct['first_name'] ) ) {
 			$user_data['first_name'] = $content_struct['first_name'];
+		}
 
-		if ( isset( $content_struct['last_name'] ) )
+		if ( isset( $content_struct['last_name'] ) ) {
 			$user_data['last_name'] = $content_struct['last_name'];
+		}
 
-		if ( isset( $content_struct['url'] ) )
+		if ( isset( $content_struct['url'] ) ) {
 			$user_data['user_url'] = $content_struct['url'];
+		}
 
-		if ( isset( $content_struct['display_name'] ) )
+		if ( isset( $content_struct['display_name'] ) ) {
 			$user_data['display_name'] = $content_struct['display_name'];
+		}
 
-		if ( isset( $content_struct['nickname'] ) )
+		if ( isset( $content_struct['nickname'] ) ) {
 			$user_data['nickname'] = $content_struct['nickname'];
+		}
 
-		if ( isset( $content_struct['nicename'] ) )
+		if ( isset( $content_struct['nicename'] ) ) {
 			$user_data['user_nicename'] = $content_struct['nicename'];
+		}
 
-		if ( isset( $content_struct['bio'] ) )
+		if ( isset( $content_struct['bio'] ) ) {
 			$user_data['description'] = $content_struct['bio'];
+		}
 
 		$result = wp_update_user( $user_data );
 
-		if ( is_wp_error( $result ) )
+		if ( is_wp_error( $result ) ) {
 			return new IXR_Error( 500, $result->get_error_message() );
+		}
 
-		if ( ! $result )
+		if ( ! $result ) {
 			return new IXR_Error( 500, __( 'Sorry, the user cannot be updated.' ) );
+		}
 
 		return true;
 	}
@@ -2735,25 +2877,26 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) ) {
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
 		}
 
-		$page = get_post($page_id);
-		if ( ! $page )
+		$page = get_post( $page_id );
+		if ( ! $page ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_page', $page_id ) )
+		if ( ! current_user_can( 'edit_page', $page_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this page.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPage' );
 
 		// If we found the page then format the data.
-		if ( $page->ID && ($page->post_type == 'page') ) {
+		if ( $page->ID && ( $page->post_type == 'page' ) ) {
 			return $this->_prepare_page( $page );
-		}
-		// If the page doesn't exist indicate that.
+		} // If the page doesn't exist indicate that.
 		else {
 			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
 		}
@@ -2779,27 +2922,36 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$username  = $args[1];
 		$password  = $args[2];
-		$num_pages = isset($args[3]) ? (int) $args[3] : 10;
+		$num_pages = isset( $args[3] ) ? (int) $args[3] : 10;
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
+		if ( ! current_user_can( 'edit_pages' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit pages.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPages' );
 
-		$pages = get_posts( array('post_type' => 'page', 'post_status' => 'any', 'numberposts' => $num_pages) );
-		$num_pages = count($pages);
+		$pages     = get_posts(
+			array(
+				'post_type'   => 'page',
+				'post_status' => 'any',
+				'numberposts' => $num_pages,
+			)
+		);
+		$num_pages = count( $pages );
 
 		// If we have pages, put together their info.
 		if ( $num_pages >= 1 ) {
 			$pages_struct = array();
 
-			foreach ($pages as $page) {
-				if ( current_user_can( 'edit_page', $page->ID ) )
+			foreach ( $pages as $page ) {
+				if ( current_user_can( 'edit_page', $page->ID ) ) {
 					$pages_struct[] = $this->_prepare_page( $page );
+				}
 			}
 
 			return $pages_struct;
@@ -2830,14 +2982,15 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $this->escape( $args[1] );
 		$password = $this->escape( $args[2] );
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newPage' );
 
 		// Mark this as content for a page.
-		$args[3]["post_type"] = 'page';
+		$args[3]['post_type'] = 'page';
 
 		// Let mw_newPost do all of the heavy lifting.
 		return $this->mw_newPost( $args );
@@ -2865,26 +3018,30 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password = $args[2];
 		$page_id  = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deletePage' );
 
 		// Get the current page based on the page_id and
 		// make sure it is a page and not a post.
-		$actual_page = get_post($page_id, ARRAY_A);
-		if ( !$actual_page || ($actual_page['post_type'] != 'page') )
+		$actual_page = get_post( $page_id, ARRAY_A );
+		if ( ! $actual_page || ( $actual_page['post_type'] != 'page' ) ) {
 			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		}
 
 		// Make sure the user can delete pages.
-		if ( !current_user_can('delete_page', $page_id) )
+		if ( ! current_user_can( 'delete_page', $page_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to delete this page.' ) );
+		}
 
 		// Attempt to delete the page.
-		$result = wp_delete_post($page_id);
-		if ( !$result )
+		$result = wp_delete_post( $page_id );
+		if ( ! $result ) {
 			return new IXR_Error( 500, __( 'Failed to delete the page.' ) );
+		}
 
 		/**
 		 * Fires after a page has been successfully deleted via XML-RPC.
@@ -2927,7 +3084,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		$escaped_username = $this->escape( $username );
 		$escaped_password = $this->escape( $password );
 
-		if ( !$user = $this->login( $escaped_username, $escaped_password ) ) {
+		if ( ! $user = $this->login( $escaped_username, $escaped_password ) ) {
 			return $this->error;
 		}
 
@@ -2935,13 +3092,15 @@ class wp_xmlrpc_server extends IXR_Server {
 		do_action( 'xmlrpc_call', 'wp.editPage' );
 
 		// Get the page data and make sure it is a page.
-		$actual_page = get_post($page_id, ARRAY_A);
-		if ( !$actual_page || ($actual_page['post_type'] != 'page') )
+		$actual_page = get_post( $page_id, ARRAY_A );
+		if ( ! $actual_page || ( $actual_page['post_type'] != 'page' ) ) {
 			return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
+		}
 
 		// Make sure the user is allowed to edit pages.
-		if ( !current_user_can('edit_page', $page_id) )
+		if ( ! current_user_can( 'edit_page', $page_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this page.' ) );
+		}
 
 		// Mark this as content for a page.
 		$content['post_type'] = 'page';
@@ -2952,7 +3111,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			$username,
 			$password,
 			$content,
-			$publish
+			$publish,
 		);
 
 		// Let mw_editPost do all of the heavy lifting.
@@ -2983,17 +3142,20 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
+		if ( ! current_user_can( 'edit_pages' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit pages.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPageList' );
 
 		// Get list of pages ids and titles
-		$page_list = $wpdb->get_results("
+		$page_list = $wpdb->get_results(
+			"
 			SELECT ID page_id,
 				post_title page_title,
 				post_parent page_parent_id,
@@ -3003,17 +3165,18 @@ class wp_xmlrpc_server extends IXR_Server {
 			FROM {$wpdb->posts}
 			WHERE post_type = 'page'
 			ORDER BY ID
-		");
+		"
+		);
 
 		// The date needs to be formatted properly.
-		$num_pages = count($page_list);
+		$num_pages = count( $page_list );
 		for ( $i = 0; $i < $num_pages; $i++ ) {
-			$page_list[$i]->dateCreated = $this->_convert_date(  $page_list[$i]->post_date );
-			$page_list[$i]->date_created_gmt = $this->_convert_date_gmt( $page_list[$i]->post_date_gmt, $page_list[$i]->post_date );
+			$page_list[ $i ]->dateCreated      = $this->_convert_date( $page_list[ $i ]->post_date );
+			$page_list[ $i ]->date_created_gmt = $this->_convert_date_gmt( $page_list[ $i ]->post_date_gmt, $page_list[ $i ]->post_date );
 
-			unset($page_list[$i]->post_date_gmt);
-			unset($page_list[$i]->post_date);
-			unset($page_list[$i]->post_status);
+			unset( $page_list[ $i ]->post_date_gmt );
+			unset( $page_list[ $i ]->post_date );
+			unset( $page_list[ $i ]->post_status );
 		}
 
 		return $page_list;
@@ -3039,21 +3202,23 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can('edit_posts') )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getAuthors' );
 
 		$authors = array();
-		foreach ( get_users( array( 'fields' => array('ID','user_login','display_name') ) ) as $user ) {
+		foreach ( get_users( array( 'fields' => array( 'ID', 'user_login', 'display_name' ) ) ) as $user ) {
 			$authors[] = array(
-				'user_id'       => $user->ID,
-				'user_login'    => $user->user_login,
-				'display_name'  => $user->display_name
+				'user_id'      => $user->ID,
+				'user_login'   => $user->user_login,
+				'display_name' => $user->display_name,
 			);
 		}
 
@@ -3080,11 +3245,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getKeywords' );
@@ -3093,13 +3260,13 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		if ( $all_tags = get_tags() ) {
 			foreach ( (array) $all_tags as $tag ) {
-				$struct = array();
-				$struct['tag_id']			= $tag->term_id;
-				$struct['name']				= $tag->name;
-				$struct['count']			= $tag->count;
-				$struct['slug']				= $tag->slug;
-				$struct['html_url']			= esc_html( get_tag_link( $tag->term_id ) );
-				$struct['rss_url']			= esc_html( get_tag_feed_link( $tag->term_id ) );
+				$struct             = array();
+				$struct['tag_id']   = $tag->term_id;
+				$struct['name']     = $tag->name;
+				$struct['count']    = $tag->count;
+				$struct['slug']     = $tag->slug;
+				$struct['html_url'] = esc_html( get_tag_link( $tag->term_id ) );
+				$struct['rss_url']  = esc_html( get_tag_feed_link( $tag->term_id ) );
 
 				$tags[] = $struct;
 			}
@@ -3130,8 +3297,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password = $args[2];
 		$category = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newCategory' );
@@ -3143,33 +3311,37 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		// If no slug was provided make it empty so that
 		// WordPress will generate one.
-		if ( empty($category['slug']) )
+		if ( empty( $category['slug'] ) ) {
 			$category['slug'] = '';
+		}
 
 		// If no parent_id was provided make it empty
 		// so that it will be a top level page (no parent).
-		if ( !isset($category['parent_id']) )
+		if ( ! isset( $category['parent_id'] ) ) {
 			$category['parent_id'] = '';
+		}
 
 		// If no description was provided make it empty.
-		if ( empty($category["description"]) )
-			$category["description"] = "";
+		if ( empty( $category['description'] ) ) {
+			$category['description'] = '';
+		}
 
 		$new_category = array(
-			'cat_name'				=> $category['name'],
-			'category_nicename'		=> $category['slug'],
-			'category_parent'		=> $category['parent_id'],
-			'category_description'	=> $category['description']
+			'cat_name'             => $category['name'],
+			'category_nicename'    => $category['slug'],
+			'category_parent'      => $category['parent_id'],
+			'category_description' => $category['description'],
 		);
 
-		$cat_id = wp_insert_category($new_category, true);
+		$cat_id = wp_insert_category( $new_category, true );
 		if ( is_wp_error( $cat_id ) ) {
-			if ( 'term_exists' == $cat_id->get_error_code() )
+			if ( 'term_exists' == $cat_id->get_error_code() ) {
 				return (int) $cat_id->get_error_data();
-			else
-				return new IXR_Error(500, __('Sorry, the new category failed.'));
+			} else {
+				return new IXR_Error( 500, __( 'Sorry, the new category failed.' ) );
+			}
 		} elseif ( ! $cat_id ) {
-			return new IXR_Error(500, __('Sorry, the new category failed.'));
+			return new IXR_Error( 500, __( 'Sorry, the new category failed.' ) );
 		}
 
 		/**
@@ -3207,8 +3379,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password    = $args[2];
 		$category_id = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.deleteCategory' );
@@ -3258,21 +3431,27 @@ class wp_xmlrpc_server extends IXR_Server {
 		$category    = $args[3];
 		$max_results = (int) $args[4];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.suggestCategories' );
 
 		$category_suggestions = array();
-		$args = array('get' => 'all', 'number' => $max_results, 'name__like' => $category);
-		foreach ( (array) get_categories($args) as $cat ) {
+		$args                 = array(
+			'get'        => 'all',
+			'number'     => $max_results,
+			'name__like' => $category,
+		);
+		foreach ( (array) get_categories( $args ) as $cat ) {
 			$category_suggestions[] = array(
-				'category_id'	=> $cat->term_id,
-				'category_name'	=> $cat->name
+				'category_id'   => $cat->term_id,
+				'category_name' => $cat->name,
 			);
 		}
 
@@ -3294,12 +3473,12 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function wp_getComment($args) {
-		$this->escape($args);
+	public function wp_getComment( $args ) {
+		$this->escape( $args );
 
-		$username	= $args[1];
-		$password	= $args[2];
-		$comment_id	= (int) $args[3];
+		$username   = $args[1];
+		$password   = $args[2];
+		$comment_id = (int) $args[3];
 
 		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
@@ -3350,7 +3529,7 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$username = $args[1];
 		$password = $args[2];
-		$struct	  = isset( $args[3] ) ? $args[3] : array();
+		$struct   = isset( $args[3] ) ? $args[3] : array();
 
 		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
@@ -3393,13 +3572,15 @@ class wp_xmlrpc_server extends IXR_Server {
 			$number = absint( $struct['number'] );
 		}
 
-		$comments = get_comments( array(
-			'status' => $status,
-			'post_id' => $post_id,
-			'offset' => $offset,
-			'number' => $number,
-			'post_type' => $post_type,
-		) );
+		$comments = get_comments(
+			array(
+				'status'    => $status,
+				'post_id'   => $post_id,
+				'offset'    => $offset,
+				'number'    => $number,
+				'post_type' => $post_type,
+			)
+		);
 
 		$comments_struct = array();
 		if ( is_array( $comments ) ) {
@@ -3430,11 +3611,11 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return bool|IXR_Error See wp_delete_comment().
 	 */
 	public function wp_deleteComment( $args ) {
-		$this->escape($args);
+		$this->escape( $args );
 
-		$username	= $args[1];
-		$password	= $args[2];
-		$comment_ID	= (int) $args[3];
+		$username   = $args[1];
+		$password   = $args[2];
+		$comment_ID = (int) $args[3];
 
 		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
@@ -3498,12 +3679,12 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function wp_editComment( $args ) {
 		$this->escape( $args );
 
-		$username	= $args[1];
-		$password	= $args[2];
-		$comment_ID	= (int) $args[3];
+		$username       = $args[1];
+		$password       = $args[2];
+		$comment_ID     = (int) $args[3];
 		$content_struct = $args[4];
 
-		if ( !$user = $this->login( $username, $password ) ) {
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
 		}
 
@@ -3518,44 +3699,51 @@ class wp_xmlrpc_server extends IXR_Server {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.editComment' );
 
-		if ( isset($content_struct['status']) ) {
+		if ( isset( $content_struct['status'] ) ) {
 			$statuses = get_comment_statuses();
-			$statuses = array_keys($statuses);
+			$statuses = array_keys( $statuses );
 
-			if ( ! in_array($content_struct['status'], $statuses) )
+			if ( ! in_array( $content_struct['status'], $statuses ) ) {
 				return new IXR_Error( 401, __( 'Invalid comment status.' ) );
+			}
 			$comment_approved = $content_struct['status'];
 		}
 
 		// Do some timestamp voodoo
-		if ( !empty( $content_struct['date_created_gmt'] ) ) {
+		if ( ! empty( $content_struct['date_created_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
-			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-			$comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-			$comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+			$dateCreated      = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+			$comment_date     = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+			$comment_date_gmt = iso8601_to_datetime( $dateCreated, 'GMT' );
 		}
 
-		if ( isset($content_struct['content']) )
+		if ( isset( $content_struct['content'] ) ) {
 			$comment_content = $content_struct['content'];
+		}
 
-		if ( isset($content_struct['author']) )
+		if ( isset( $content_struct['author'] ) ) {
 			$comment_author = $content_struct['author'];
+		}
 
-		if ( isset($content_struct['author_url']) )
+		if ( isset( $content_struct['author_url'] ) ) {
 			$comment_author_url = $content_struct['author_url'];
+		}
 
-		if ( isset($content_struct['author_email']) )
+		if ( isset( $content_struct['author_email'] ) ) {
 			$comment_author_email = $content_struct['author_email'];
+		}
 
 		// We've got all the data -- post it:
-		$comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url');
+		$comment = compact( 'comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url' );
 
-		$result = wp_update_comment($comment);
-		if ( is_wp_error( $result ) )
-			return new IXR_Error(500, $result->get_error_message());
+		$result = wp_update_comment( $comment );
+		if ( is_wp_error( $result ) ) {
+			return new IXR_Error( 500, $result->get_error_message() );
+		}
 
-		if ( !$result )
-			return new IXR_Error(500, __('Sorry, the comment could not be edited.'));
+		if ( ! $result ) {
+			return new IXR_Error( 500, __( 'Sorry, the comment could not be edited.' ) );
+		}
 
 		/**
 		 * Fires after a comment has been successfully updated via XML-RPC.
@@ -3586,8 +3774,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * }
 	 * @return int|IXR_Error See wp_new_comment().
 	 */
-	public function wp_newComment($args) {
-		$this->escape($args);
+	public function wp_newComment( $args ) {
+		$this->escape( $args );
 
 		$username       = $args[1];
 		$password       = $args[2];
@@ -3604,11 +3792,11 @@ class wp_xmlrpc_server extends IXR_Server {
 		 */
 		$allow_anon = apply_filters( 'xmlrpc_allow_anonymous_comments', false );
 
-		$user = $this->login($username, $password);
+		$user = $this->login( $username, $password );
 
-		if ( !$user ) {
+		if ( ! $user ) {
 			$logged_in = false;
-			if ( $allow_anon && get_option('comment_registration') ) {
+			if ( $allow_anon && get_option( 'comment_registration' ) ) {
 				return new IXR_Error( 403, __( 'You must be registered to comment.' ) );
 			} elseif ( ! $allow_anon ) {
 				return $this->error;
@@ -3617,10 +3805,11 @@ class wp_xmlrpc_server extends IXR_Server {
 			$logged_in = true;
 		}
 
-		if ( is_numeric($post) )
-			$post_id = absint($post);
-		else
-			$post_id = url_to_postid($post);
+		if ( is_numeric( $post ) ) {
+			$post_id = absint( $post );
+		} else {
+			$post_id = url_to_postid( $post );
+		}
 
 		if ( ! $post_id ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
@@ -3645,37 +3834,41 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		if ( $logged_in ) {
 			$display_name = $user->display_name;
-			$user_email = $user->user_email;
-			$user_url = $user->user_url;
+			$user_email   = $user->user_email;
+			$user_url     = $user->user_url;
 
-			$comment['comment_author'] = $this->escape( $display_name );
+			$comment['comment_author']       = $this->escape( $display_name );
 			$comment['comment_author_email'] = $this->escape( $user_email );
-			$comment['comment_author_url'] = $this->escape( $user_url );
-			$comment['user_ID'] = $user->ID;
+			$comment['comment_author_url']   = $this->escape( $user_url );
+			$comment['user_ID']              = $user->ID;
 		} else {
 			$comment['comment_author'] = '';
-			if ( isset($content_struct['author']) )
+			if ( isset( $content_struct['author'] ) ) {
 				$comment['comment_author'] = $content_struct['author'];
+			}
 
 			$comment['comment_author_email'] = '';
-			if ( isset($content_struct['author_email']) )
+			if ( isset( $content_struct['author_email'] ) ) {
 				$comment['comment_author_email'] = $content_struct['author_email'];
+			}
 
 			$comment['comment_author_url'] = '';
-			if ( isset($content_struct['author_url']) )
+			if ( isset( $content_struct['author_url'] ) ) {
 				$comment['comment_author_url'] = $content_struct['author_url'];
+			}
 
 			$comment['user_ID'] = 0;
 
-			if ( get_option('require_name_email') ) {
-				if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] )
+			if ( get_option( 'require_name_email' ) ) {
+				if ( 6 > strlen( $comment['comment_author_email'] ) || '' == $comment['comment_author'] ) {
 					return new IXR_Error( 403, __( 'Comment author name and email are required.' ) );
-				elseif ( !is_email($comment['comment_author_email']) )
+				} elseif ( ! is_email( $comment['comment_author_email'] ) ) {
 					return new IXR_Error( 403, __( 'A valid email address is required.' ) );
+				}
 			}
 		}
 
-		$comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0;
+		$comment['comment_parent'] = isset( $content_struct['comment_parent'] ) ? absint( $content_struct['comment_parent'] ) : 0;
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.newComment' );
@@ -3754,9 +3947,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function wp_getCommentCount( $args ) {
 		$this->escape( $args );
 
-		$username	= $args[1];
-		$password	= $args[2];
-		$post_id	= (int) $args[3];
+		$username = $args[1];
+		$password = $args[2];
+		$post_id  = (int) $args[3];
 
 		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
@@ -3777,10 +3970,10 @@ class wp_xmlrpc_server extends IXR_Server {
 		$count = wp_count_comments( $post_id );
 
 		return array(
-			'approved' => $count->approved,
+			'approved'            => $count->approved,
 			'awaiting_moderation' => $count->moderated,
-			'spam' => $count->spam,
-			'total_comments' => $count->total_comments
+			'spam'                => $count->spam,
+			'total_comments'      => $count->total_comments,
 		);
 	}
 
@@ -3804,11 +3997,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostStatusList' );
@@ -3836,11 +4031,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
+		if ( ! current_user_can( 'edit_pages' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPageStatusList' );
@@ -3868,13 +4065,15 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_pages' ) )
+		if ( ! current_user_can( 'edit_pages' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
+		}
 
-		$templates = get_page_templates();
+		$templates            = get_page_templates();
 		$templates['Default'] = 'default';
 
 		return $templates;
@@ -3898,18 +4097,20 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function wp_getOptions( $args ) {
 		$this->escape( $args );
 
-		$username	= $args[1];
-		$password	= $args[2];
-		$options	= isset( $args[3] ) ? (array) $args[3] : array();
+		$username = $args[1];
+		$password = $args[2];
+		$options  = isset( $args[3] ) ? (array) $args[3] : array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		// If no specific options where asked for, return all of them
-		if ( count( $options ) == 0 )
-			$options = array_keys($this->blog_options);
+		if ( count( $options ) == 0 ) {
+			$options = array_keys( $this->blog_options );
+		}
 
-		return $this->_getOptions($options);
+		return $this->_getOptions( $options );
 	}
 
 	/**
@@ -3920,20 +4121,21 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @param array $options Options to retrieve.
 	 * @return array
 	 */
-	public function _getOptions($options) {
-		$data = array();
+	public function _getOptions( $options ) {
+		$data       = array();
 		$can_manage = current_user_can( 'manage_options' );
 		foreach ( $options as $option ) {
 			if ( array_key_exists( $option, $this->blog_options ) ) {
-				$data[$option] = $this->blog_options[$option];
+				$data[ $option ] = $this->blog_options[ $option ];
 				//Is the value static or dynamic?
-				if ( isset( $data[$option]['option'] ) ) {
-					$data[$option]['value'] = get_option( $data[$option]['option'] );
-					unset($data[$option]['option']);
+				if ( isset( $data[ $option ]['option'] ) ) {
+					$data[ $option ]['value'] = get_option( $data[ $option ]['option'] );
+					unset( $data[ $option ]['option'] );
 				}
 
-				if ( ! $can_manage )
-					$data[$option]['readonly'] = true;
+				if ( ! $can_manage ) {
+					$data[ $option ]['readonly'] = true;
+				}
 			}
 		}
 
@@ -3958,30 +4160,34 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function wp_setOptions( $args ) {
 		$this->escape( $args );
 
-		$username	= $args[1];
-		$password	= $args[2];
-		$options	= (array) $args[3];
+		$username = $args[1];
+		$password = $args[2];
+		$options  = (array) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'manage_options' ) )
+		if ( ! current_user_can( 'manage_options' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to update options.' ) );
+		}
 
 		$option_names = array();
 		foreach ( $options as $o_name => $o_value ) {
 			$option_names[] = $o_name;
-			if ( !array_key_exists( $o_name, $this->blog_options ) )
+			if ( ! array_key_exists( $o_name, $this->blog_options ) ) {
 				continue;
+			}
 
-			if ( $this->blog_options[$o_name]['readonly'] == true )
+			if ( $this->blog_options[ $o_name ]['readonly'] == true ) {
 				continue;
+			}
 
-			update_option( $this->blog_options[$o_name]['option'], wp_unslash( $o_value ) );
+			update_option( $this->blog_options[ $o_name ]['option'], wp_unslash( $o_value ) );
 		}
 
 		//Now return the updated values
-		return $this->_getOptions($option_names);
+		return $this->_getOptions( $option_names );
 	}
 
 	/**
@@ -4010,21 +4216,24 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function wp_getMediaItem( $args ) {
 		$this->escape( $args );
 
-		$username		= $args[1];
-		$password		= $args[2];
-		$attachment_id	= (int) $args[3];
+		$username      = $args[1];
+		$password      = $args[2];
+		$attachment_id = (int) $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'upload_files' ) )
+		if ( ! current_user_can( 'upload_files' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed to upload files.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getMediaItem' );
 
-		if ( ! $attachment = get_post($attachment_id) )
+		if ( ! $attachment = get_post( $attachment_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+		}
 
 		return $this->_prepare_media_item( $attachment );
 	}
@@ -4055,33 +4264,44 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * }
 	 * @return array|IXR_Error Contains a collection of media items. See wp_xmlrpc_server::wp_getMediaItem() for a description of each item contents
 	 */
-	public function wp_getMediaLibrary($args) {
-		$this->escape($args);
+	public function wp_getMediaLibrary( $args ) {
+		$this->escape( $args );
 
-		$username	= $args[1];
-		$password	= $args[2];
-		$struct		= isset( $args[3] ) ? $args[3] : array() ;
+		$username = $args[1];
+		$password = $args[2];
+		$struct   = isset( $args[3] ) ? $args[3] : array();
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'upload_files' ) )
+		if ( ! current_user_can( 'upload_files' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getMediaLibrary' );
 
-		$parent_id = ( isset($struct['parent_id']) ) ? absint($struct['parent_id']) : '' ;
-		$mime_type = ( isset($struct['mime_type']) ) ? $struct['mime_type'] : '' ;
-		$offset = ( isset($struct['offset']) ) ? absint($struct['offset']) : 0 ;
-		$number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ;
+		$parent_id = ( isset( $struct['parent_id'] ) ) ? absint( $struct['parent_id'] ) : '';
+		$mime_type = ( isset( $struct['mime_type'] ) ) ? $struct['mime_type'] : '';
+		$offset    = ( isset( $struct['offset'] ) ) ? absint( $struct['offset'] ) : 0;
+		$number    = ( isset( $struct['number'] ) ) ? absint( $struct['number'] ) : -1;
 
-		$attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
+		$attachments = get_posts(
+			array(
+				'post_type'      => 'attachment',
+				'post_parent'    => $parent_id,
+				'offset'         => $offset,
+				'numberposts'    => $number,
+				'post_mime_type' => $mime_type,
+			)
+		);
 
 		$attachments_struct = array();
 
-		foreach ($attachments as $attachment )
+		foreach ( $attachments as $attachment ) {
 			$attachments_struct[] = $this->_prepare_media_item( $attachment );
+		}
 
 		return $attachments_struct;
 	}
@@ -4106,11 +4326,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 403, __( 'Sorry, you are not allowed access to details about this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostFormats' );
@@ -4123,8 +4345,8 @@ class wp_xmlrpc_server extends IXR_Server {
 				if ( current_theme_supports( 'post-formats' ) ) {
 					$supported = get_theme_support( 'post-formats' );
 
-					$data = array();
-					$data['all'] = $formats;
+					$data              = array();
+					$data['all']       = $formats;
 					$data['supported'] = $supported[0];
 
 					$formats = $data;
@@ -4163,8 +4385,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 *  - 'supports'
 	 */
 	public function wp_getPostType( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -4186,19 +4409,22 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostType' );
 		}
 
-		if ( !$user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostType' );
 
-		if ( ! post_type_exists( $post_type_name ) )
+		if ( ! post_type_exists( $post_type_name ) ) {
 			return new IXR_Error( 403, __( 'Invalid post type.' ) );
+		}
 
 		$post_type = get_post_type_object( $post_type_name );
 
-		if ( ! current_user_can( $post_type->cap->edit_posts ) )
+		if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts in this post type.' ) );
+		}
 
 		return $this->_prepare_post_type( $post_type, $fields );
 	}
@@ -4222,8 +4448,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return array|IXR_Error
 	 */
 	public function wp_getPostTypes( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+		if ( ! $this->minimum_args( $args, 3 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -4238,8 +4465,9 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_posttype_fields', array( 'labels', 'cap', 'taxonomies' ), 'wp.getPostTypes' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getPostTypes' );
@@ -4249,10 +4477,11 @@ class wp_xmlrpc_server extends IXR_Server {
 		$struct = array();
 
 		foreach ( $post_types as $post_type ) {
-			if ( ! current_user_can( $post_type->cap->edit_posts ) )
+			if ( ! current_user_can( $post_type->cap->edit_posts ) ) {
 				continue;
+			}
 
-			$struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
+			$struct[ $post_type->name ] = $this->_prepare_post_type( $post_type, $fields );
 		}
 
 		return $struct;
@@ -4281,8 +4510,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return array|IXR_Error contains a collection of posts.
 	 */
 	public function wp_getRevisions( $args ) {
-		if ( ! $this->minimum_args( $args, 4 ) )
+		if ( ! $this->minimum_args( $args, 4 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -4304,36 +4534,43 @@ class wp_xmlrpc_server extends IXR_Server {
 			$fields = apply_filters( 'xmlrpc_default_revision_fields', array( 'post_date', 'post_date_gmt' ), 'wp.getRevisions' );
 		}
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.getRevisions' );
 
-		if ( ! $post = get_post( $post_id ) )
+		if ( ! $post = get_post( $post_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $post_id ) )
+		if ( ! current_user_can( 'edit_post', $post_id ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+		}
 
 		// Check if revisions are enabled.
-		if ( ! wp_revisions_enabled( $post ) )
+		if ( ! wp_revisions_enabled( $post ) ) {
 			return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		}
 
 		$revisions = wp_get_post_revisions( $post_id );
 
-		if ( ! $revisions )
+		if ( ! $revisions ) {
 			return array();
+		}
 
 		$struct = array();
 
 		foreach ( $revisions as $revision ) {
-			if ( ! current_user_can( 'read_post', $revision->ID ) )
+			if ( ! current_user_can( 'read_post', $revision->ID ) ) {
 				continue;
+			}
 
 			// Skip autosaves
-			if ( wp_is_post_autosave( $revision ) )
+			if ( wp_is_post_autosave( $revision ) ) {
 				continue;
+			}
 
 			$struct[] = $this->_prepare_post( get_object_vars( $revision ), $fields );
 		}
@@ -4359,8 +4596,9 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @return bool|IXR_Error false if there was an error restoring, true if success.
 	 */
 	public function wp_restoreRevision( $args ) {
-		if ( ! $this->minimum_args( $args, 3 ) )
+		if ( ! $this->minimum_args( $args, 3 ) ) {
 			return $this->error;
+		}
 
 		$this->escape( $args );
 
@@ -4368,27 +4606,33 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password    = $args[2];
 		$revision_id = (int) $args[3];
 
-		if ( ! $user = $this->login( $username, $password ) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'wp.restoreRevision' );
 
-		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+		if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( wp_is_post_autosave( $revision ) )
+		if ( wp_is_post_autosave( $revision ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! $post = get_post( $revision->post_parent ) )
+		if ( ! $post = get_post( $revision->post_parent ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+		if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 
 		// Check if revisions are disabled.
-		if ( ! wp_revisions_enabled( $post ) )
+		if ( ! wp_revisions_enabled( $post ) ) {
 			return new IXR_Error( 401, __( 'Sorry, revisions are disabled.' ) );
+		}
 
 		$post = wp_restore_post_revision( $revision_id );
 
@@ -4415,37 +4659,38 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * }
 	 * @return array|IXR_Error
 	 */
-	public function blogger_getUsersBlogs($args) {
+	public function blogger_getUsersBlogs( $args ) {
 		if ( ! $this->minimum_args( $args, 3 ) ) {
 			return $this->error;
 		}
 
 		if ( is_multisite() ) {
-			return $this->_multisite_getUsersBlogs($args);
+			return $this->_multisite_getUsersBlogs( $args );
 		}
 
-		$this->escape($args);
+		$this->escape( $args );
 
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getUsersBlogs' );
 
-		$is_admin = current_user_can('manage_options');
+		$is_admin = current_user_can( 'manage_options' );
 
 		$struct = array(
 			'isAdmin'  => $is_admin,
-			'url'      => get_option('home') . '/',
+			'url'      => get_option( 'home' ) . '/',
 			'blogid'   => '1',
-			'blogName' => get_option('blogname'),
+			'blogName' => get_option( 'blogname' ),
 			'xmlrpc'   => site_url( 'xmlrpc.php', 'rpc' ),
 		);
 
-		return array($struct);
+		return array( $struct );
 	}
 
 	/**
@@ -4465,21 +4710,23 @@ class wp_xmlrpc_server extends IXR_Server {
 		$current_blog = get_site();
 
 		$domain = $current_blog->domain;
-		$path = $current_blog->path . 'xmlrpc.php';
+		$path   = $current_blog->path . 'xmlrpc.php';
 
 		$rpc = new IXR_Client( set_url_scheme( "http://{$domain}{$path}" ) );
-		$rpc->query('wp.getUsersBlogs', $args[1], $args[2]);
+		$rpc->query( 'wp.getUsersBlogs', $args[1], $args[2] );
 		$blogs = $rpc->getResponse();
 
-		if ( isset($blogs['faultCode']) )
-			return new IXR_Error($blogs['faultCode'], $blogs['faultString']);
+		if ( isset( $blogs['faultCode'] ) ) {
+			return new IXR_Error( $blogs['faultCode'], $blogs['faultString'] );
+		}
 
 		if ( $_SERVER['HTTP_HOST'] == $domain && $_SERVER['REQUEST_URI'] == $path ) {
 			return $blogs;
 		} else {
 			foreach ( (array) $blogs as $blog ) {
-				if ( strpos($blog['url'], $_SERVER['HTTP_HOST']) )
-					return array($blog);
+				if ( strpos( $blog['url'], $_SERVER['HTTP_HOST'] ) ) {
+					return array( $blog );
+				}
 			}
 			return array();
 		}
@@ -4507,11 +4754,13 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to access user data on this site.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getUserInfo' );
@@ -4521,7 +4770,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			'userid'    => $user->ID,
 			'url'       => $user->user_url,
 			'lastname'  => $user->last_name,
-			'firstname' => $user->first_name
+			'firstname' => $user->first_name,
 		);
 
 		return $struct;
@@ -4549,30 +4798,33 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		$post_data = get_post($post_ID, ARRAY_A);
-		if ( ! $post_data )
+		$post_data = get_post( $post_ID, ARRAY_A );
+		if ( ! $post_data ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getPost' );
 
-		$categories = implode(',', wp_get_post_categories($post_ID));
+		$categories = implode( ',', wp_get_post_categories( $post_ID ) );
 
-		$content  = '<title>'.wp_unslash($post_data['post_title']).'</title>';
-		$content .= '<category>'.$categories.'</category>';
-		$content .= wp_unslash($post_data['post_content']);
+		$content  = '<title>' . wp_unslash( $post_data['post_title'] ) . '</title>';
+		$content .= '<category>' . $categories . '</category>';
+		$content .= wp_unslash( $post_data['post_content'] );
 
 		$struct = array(
-			'userid'    => $post_data['post_author'],
+			'userid'      => $post_data['post_author'],
 			'dateCreated' => $this->_convert_date( $post_data['post_date'] ),
 			'content'     => $content,
-			'postid'  => (string) $post_data['ID']
+			'postid'      => (string) $post_data['ID'],
 		);
 
 		return $struct;
@@ -4596,49 +4848,53 @@ class wp_xmlrpc_server extends IXR_Server {
 	 */
 	public function blogger_getRecentPosts( $args ) {
 
-		$this->escape($args);
+		$this->escape( $args );
 
 		// $args[0] = appkey - ignored
 		$username = $args[2];
 		$password = $args[3];
-		if ( isset( $args[4] ) )
+		if ( isset( $args[4] ) ) {
 			$query = array( 'numberposts' => absint( $args[4] ) );
-		else
+		} else {
 			$query = array();
+		}
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( ! current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.getRecentPosts' );
 
 		$posts_list = wp_get_recent_posts( $query );
 
-		if ( !$posts_list ) {
-			$this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
+		if ( ! $posts_list ) {
+			$this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
 			return $this->error;
 		}
 
 		$recent_posts = array();
-		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+		foreach ( $posts_list as $entry ) {
+			if ( ! current_user_can( 'edit_post', $entry['ID'] ) ) {
 				continue;
+			}
 
 			$post_date  = $this->_convert_date( $entry['post_date'] );
-			$categories = implode(',', wp_get_post_categories($entry['ID']));
+			$categories = implode( ',', wp_get_post_categories( $entry['ID'] ) );
 
-			$content  = '<title>'.wp_unslash($entry['post_title']).'</title>';
-			$content .= '<category>'.$categories.'</category>';
-			$content .= wp_unslash($entry['post_content']);
+			$content  = '<title>' . wp_unslash( $entry['post_title'] ) . '</title>';
+			$content .= '<category>' . $categories . '</category>';
+			$content .= wp_unslash( $entry['post_content'] );
 
 			$recent_posts[] = array(
-				'userid' => $entry['post_author'],
+				'userid'      => $entry['post_author'],
 				'dateCreated' => $post_date,
-				'content' => $content,
-				'postid' => (string) $entry['ID'],
+				'content'     => $content,
+				'postid'      => (string) $entry['ID'],
 			);
 		}
 
@@ -4654,8 +4910,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @param array $args Unused.
 	 * @return IXR_Error Error object.
 	 */
-	public function blogger_getTemplate($args) {
-		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
+	public function blogger_getTemplate( $args ) {
+		return new IXR_Error( 403, __( 'Sorry, that file cannot be edited.' ) );
 	}
 
 	/**
@@ -4667,8 +4923,8 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * @param array $args Unused.
 	 * @return IXR_Error Error object.
 	 */
-	public function blogger_setTemplate($args) {
-		return new IXR_Error( 403, __('Sorry, that file cannot be edited.' ) );
+	public function blogger_setTemplate( $args ) {
+		return new IXR_Error( 403, __( 'Sorry, that file cannot be edited.' ) );
 	}
 
 	/**
@@ -4696,35 +4952,39 @@ class wp_xmlrpc_server extends IXR_Server {
 		$content  = $args[4];
 		$publish  = $args[5];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.newPost' );
 
-		$cap = ($publish) ? 'publish_posts' : 'edit_posts';
-		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
-			return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
+		$cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
+		if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || ! current_user_can( $cap ) ) {
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
+		}
 
-		$post_status = ($publish) ? 'publish' : 'draft';
+		$post_status = ( $publish ) ? 'publish' : 'draft';
 
 		$post_author = $user->ID;
 
-		$post_title = xmlrpc_getposttitle($content);
-		$post_category = xmlrpc_getpostcategory($content);
-		$post_content = xmlrpc_removepostdata($content);
+		$post_title    = xmlrpc_getposttitle( $content );
+		$post_category = xmlrpc_getpostcategory( $content );
+		$post_content  = xmlrpc_removepostdata( $content );
 
-		$post_date = current_time('mysql');
-		$post_date_gmt = current_time('mysql', 1);
+		$post_date     = current_time( 'mysql' );
+		$post_date_gmt = current_time( 'mysql', 1 );
 
-		$post_data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status');
+		$post_data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status' );
 
-		$post_ID = wp_insert_post($post_data);
-		if ( is_wp_error( $post_ID ) )
-			return new IXR_Error(500, $post_ID->get_error_message());
+		$post_ID = wp_insert_post( $post_data );
+		if ( is_wp_error( $post_ID ) ) {
+			return new IXR_Error( 500, $post_ID->get_error_message() );
+		}
 
-		if ( !$post_ID )
-			return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
+		if ( ! $post_ID ) {
+			return new IXR_Error( 500, __( 'Sorry, your entry could not be posted.' ) );
+		}
 
 		$this->attach_uploads( $post_ID, $post_content );
 
@@ -4760,7 +5020,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	 */
 	public function blogger_editPost( $args ) {
 
-		$this->escape($args);
+		$this->escape( $args );
 
 		$post_ID  = (int) $args[1];
 		$username = $args[2];
@@ -4781,28 +5041,28 @@ class wp_xmlrpc_server extends IXR_Server {
 			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
 		}
 
-		$this->escape($actual_post);
+		$this->escape( $actual_post );
 
 		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
-			return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
 		}
 		if ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
 		}
 
-		$postdata = array();
-		$postdata['ID'] = $actual_post['ID'];
-		$postdata['post_content'] = xmlrpc_removepostdata( $content );
-		$postdata['post_title'] = xmlrpc_getposttitle( $content );
+		$postdata                  = array();
+		$postdata['ID']            = $actual_post['ID'];
+		$postdata['post_content']  = xmlrpc_removepostdata( $content );
+		$postdata['post_title']    = xmlrpc_getposttitle( $content );
 		$postdata['post_category'] = xmlrpc_getpostcategory( $content );
-		$postdata['post_status'] = $actual_post['post_status'];
-		$postdata['post_excerpt'] = $actual_post['post_excerpt'];
-		$postdata['post_status'] = $publish ? 'publish' : 'draft';
+		$postdata['post_status']   = $actual_post['post_status'];
+		$postdata['post_excerpt']  = $actual_post['post_excerpt'];
+		$postdata['post_status']   = $publish ? 'publish' : 'draft';
 
 		$result = wp_update_post( $postdata );
 
 		if ( ! $result ) {
-			return new IXR_Error(500, __('For some strange yet very annoying reason, this post could not be edited.'));
+			return new IXR_Error( 500, __( 'For some strange yet very annoying reason, this post could not be edited.' ) );
 		}
 		$this->attach_uploads( $actual_post['ID'], $postdata['post_content'] );
 
@@ -4841,8 +5101,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[2];
 		$password = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'blogger.deletePost' );
@@ -4918,122 +5179,136 @@ class wp_xmlrpc_server extends IXR_Server {
 	 * }
 	 * @return int|IXR_Error
 	 */
-	public function mw_newPost($args) {
-		$this->escape($args);
+	public function mw_newPost( $args ) {
+		$this->escape( $args );
 
 		$username       = $args[1];
 		$password       = $args[2];
 		$content_struct = $args[3];
 		$publish        = isset( $args[4] ) ? $args[4] : 0;
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.newPost' );
 
 		$page_template = '';
-		if ( !empty( $content_struct['post_type'] ) ) {
+		if ( ! empty( $content_struct['post_type'] ) ) {
 			if ( $content_struct['post_type'] == 'page' ) {
-				if ( $publish )
-					$cap  = 'publish_pages';
-				elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] )
-					$cap  = 'publish_pages';
-				else
+				if ( $publish ) {
+					$cap = 'publish_pages';
+				} elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] ) {
+					$cap = 'publish_pages';
+				} else {
 					$cap = 'edit_pages';
+				}
 				$error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
-				$post_type = 'page';
-				if ( !empty( $content_struct['wp_page_template'] ) )
+				$post_type     = 'page';
+				if ( ! empty( $content_struct['wp_page_template'] ) ) {
 					$page_template = $content_struct['wp_page_template'];
+				}
 			} elseif ( $content_struct['post_type'] == 'post' ) {
-				if ( $publish )
-					$cap  = 'publish_posts';
-				elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] )
-					$cap  = 'publish_posts';
-				else
+				if ( $publish ) {
+					$cap = 'publish_posts';
+				} elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] ) {
+					$cap = 'publish_posts';
+				} else {
 					$cap = 'edit_posts';
+				}
 				$error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-				$post_type = 'post';
+				$post_type     = 'post';
 			} else {
 				// No other post_type values are allowed here
 				return new IXR_Error( 401, __( 'Invalid post type.' ) );
 			}
 		} else {
-			if ( $publish )
-				$cap  = 'publish_posts';
-			elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'])
-				$cap  = 'publish_posts';
-			else
+			if ( $publish ) {
+				$cap = 'publish_posts';
+			} elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] ) {
+				$cap = 'publish_posts';
+			} else {
 				$cap = 'edit_posts';
+			}
 			$error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
-			$post_type = 'post';
+			$post_type     = 'post';
 		}
 
-		if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
+		if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
-		if ( !current_user_can( $cap ) )
+		}
+		if ( ! current_user_can( $cap ) ) {
 			return new IXR_Error( 401, $error_message );
+		}
 
 		// Check for a valid post format if one was given
 		if ( isset( $content_struct['wp_post_format'] ) ) {
 			$content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
-			if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
+			if ( ! array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
 				return new IXR_Error( 404, __( 'Invalid post format.' ) );
 			}
 		}
 
 		// Let WordPress generate the post_name (slug) unless
 		// one has been provided.
-		$post_name = "";
-		if ( isset($content_struct['wp_slug']) )
+		$post_name = '';
+		if ( isset( $content_struct['wp_slug'] ) ) {
 			$post_name = $content_struct['wp_slug'];
+		}
 
 		// Only use a password if one was given.
-		if ( isset($content_struct['wp_password']) )
+		if ( isset( $content_struct['wp_password'] ) ) {
 			$post_password = $content_struct['wp_password'];
+		}
 
 		// Only set a post parent if one was provided.
-		if ( isset($content_struct['wp_page_parent_id']) )
+		if ( isset( $content_struct['wp_page_parent_id'] ) ) {
 			$post_parent = $content_struct['wp_page_parent_id'];
+		}
 
 		// Only set the menu_order if it was provided.
-		if ( isset($content_struct['wp_page_order']) )
+		if ( isset( $content_struct['wp_page_order'] ) ) {
 			$menu_order = $content_struct['wp_page_order'];
+		}
 
 		$post_author = $user->ID;
 
 		// If an author id was provided then use it instead.
 		if ( isset( $content_struct['wp_author_id'] ) && ( $user->ID != $content_struct['wp_author_id'] ) ) {
 			switch ( $post_type ) {
-				case "post":
-					if ( !current_user_can( 'edit_others_posts' ) )
+				case 'post':
+					if ( ! current_user_can( 'edit_others_posts' ) ) {
 						return new IXR_Error( 401, __( 'Sorry, you are not allowed to create posts as this user.' ) );
+					}
 					break;
-				case "page":
-					if ( !current_user_can( 'edit_others_pages' ) )
+				case 'page':
+					if ( ! current_user_can( 'edit_others_pages' ) ) {
 						return new IXR_Error( 401, __( 'Sorry, you are not allowed to create pages as this user.' ) );
+					}
 					break;
 				default:
 					return new IXR_Error( 401, __( 'Invalid post type.' ) );
 			}
 			$author = get_userdata( $content_struct['wp_author_id'] );
-			if ( ! $author )
+			if ( ! $author ) {
 				return new IXR_Error( 404, __( 'Invalid author ID.' ) );
+			}
 			$post_author = $content_struct['wp_author_id'];
 		}
 
-		$post_title = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
+		$post_title   = isset( $content_struct['title'] ) ? $content_struct['title'] : null;
 		$post_content = isset( $content_struct['description'] ) ? $content_struct['description'] : null;
 
 		$post_status = $publish ? 'publish' : 'draft';
 
-		if ( isset( $content_struct["{$post_type}_status"] ) ) {
-			switch ( $content_struct["{$post_type}_status"] ) {
+		if ( isset( $content_struct[ "{$post_type}_status" ] ) ) {
+			switch ( $content_struct[ "{$post_type}_status" ] ) {
 				case 'draft':
 				case 'pending':
 				case 'private':
 				case 'publish':
-					$post_status = $content_struct["{$post_type}_status"];
+					$post_status = $content_struct[ "{$post_type}_status" ];
 					break;
 				default:
 					$post_status = $publish ? 'publish' : 'draft';
@@ -5041,13 +5316,13 @@ class wp_xmlrpc_server extends IXR_Server {
 			}
 		}
 
-		$post_excerpt = isset($content_struct['mt_excerpt']) ? $content_struct['mt_excerpt'] : null;
-		$post_more = isset($content_struct['mt_text_more']) ? $content_struct['mt_text_more'] : null;
+		$post_excerpt = isset( $content_struct['mt_excerpt'] ) ? $content_struct['mt_excerpt'] : null;
+		$post_more    = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null;
 
-		$tags_input = isset($content_struct['mt_keywords']) ? $content_struct['mt_keywords'] : null;
+		$tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
 
-		if ( isset($content_struct['mt_allow_comments']) ) {
-			if ( !is_numeric($content_struct['mt_allow_comments']) ) {
+		if ( isset( $content_struct['mt_allow_comments'] ) ) {
+			if ( ! is_numeric( $content_struct['mt_allow_comments'] ) ) {
 				switch ( $content_struct['mt_allow_comments'] ) {
 					case 'closed':
 						$comment_status = 'closed';
@@ -5077,8 +5352,8 @@ class wp_xmlrpc_server extends IXR_Server {
 			$comment_status = get_default_comment_status( $post_type );
 		}
 
-		if ( isset($content_struct['mt_allow_pings']) ) {
-			if ( !is_numeric($content_struct['mt_allow_pings']) ) {
+		if ( isset( $content_struct['mt_allow_pings'] ) ) {
+			if ( ! is_numeric( $content_struct['mt_allow_pings'] ) ) {
 				switch ( $content_struct['mt_allow_pings'] ) {
 					case 'closed':
 						$ping_status = 'closed';
@@ -5107,28 +5382,31 @@ class wp_xmlrpc_server extends IXR_Server {
 			$ping_status = get_default_comment_status( $post_type, 'pingback' );
 		}
 
-		if ( $post_more )
+		if ( $post_more ) {
 			$post_content = $post_content . '<!--more-->' . $post_more;
+		}
 
 		$to_ping = null;
 		if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
 			$to_ping = $content_struct['mt_tb_ping_urls'];
-			if ( is_array($to_ping) )
-				$to_ping = implode(' ', $to_ping);
+			if ( is_array( $to_ping ) ) {
+				$to_ping = implode( ' ', $to_ping );
+			}
 		}
 
 		// Do some timestamp voodoo
-		if ( !empty( $content_struct['date_created_gmt'] ) )
+		if ( ! empty( $content_struct['date_created_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force
 			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-		elseif ( !empty( $content_struct['dateCreated']) )
+		} elseif ( ! empty( $content_struct['dateCreated'] ) ) {
 			$dateCreated = $content_struct['dateCreated']->getIso();
+		}
 
-		if ( !empty( $dateCreated ) ) {
-			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+		if ( ! empty( $dateCreated ) ) {
+			$post_date     = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+			$post_date_gmt = iso8601_to_datetime( $dateCreated, 'GMT' );
 		} else {
-			$post_date = '';
+			$post_date     = '';
 			$post_date_gmt = '';
 		}
 
@@ -5136,54 +5414,59 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( isset( $content_struct['categories'] ) ) {
 			$catnames = $content_struct['categories'];
 
-			if ( is_array($catnames) ) {
-				foreach ($catnames as $cat) {
-					$post_category[] = get_cat_ID($cat);
+			if ( is_array( $catnames ) ) {
+				foreach ( $catnames as $cat ) {
+					$post_category[] = get_cat_ID( $cat );
 				}
 			}
 		}
 
-		$postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input', 'page_template');
+		$postdata = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'to_ping', 'post_type', 'post_name', 'post_password', 'post_parent', 'menu_order', 'tags_input', 'page_template' );
 
 		$post_ID = $postdata['ID'] = get_default_post_to_edit( $post_type, true )->ID;
 
 		// Only posts can be sticky
 		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
-			$data = $postdata;
+			$data           = $postdata;
 			$data['sticky'] = $content_struct['sticky'];
-			$error = $this->_toggle_sticky( $data );
+			$error          = $this->_toggle_sticky( $data );
 			if ( $error ) {
 				return $error;
 			}
 		}
 
-		if ( isset($content_struct['custom_fields']) )
-			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+		if ( isset( $content_struct['custom_fields'] ) ) {
+			$this->set_custom_fields( $post_ID, $content_struct['custom_fields'] );
+		}
 
-		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
-			if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
+		if ( isset( $content_struct['wp_post_thumbnail'] ) ) {
+			if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
 				return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+			}
 
 			unset( $content_struct['wp_post_thumbnail'] );
 		}
 
 		// Handle enclosures
-		$thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
-		$this->add_enclosure_if_new($post_ID, $thisEnclosure);
+		$thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
+		$this->add_enclosure_if_new( $post_ID, $thisEnclosure );
 
 		$this->attach_uploads( $post_ID, $post_content );
 
 		// Handle post formats if assigned, value is validated earlier
 		// in this function
-		if ( isset( $content_struct['wp_post_format'] ) )
+		if ( isset( $content_struct['wp_post_format'] ) ) {
 			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		}
 
 		$post_ID = wp_insert_post( $postdata, true );
-		if ( is_wp_error( $post_ID ) )
-			return new IXR_Error(500, $post_ID->get_error_message());
+		if ( is_wp_error( $post_ID ) ) {
+			return new IXR_Error( 500, $post_ID->get_error_message() );
+		}
 
-		if ( !$post_ID )
-			return new IXR_Error(500, __('Sorry, your entry could not be posted.'));
+		if ( ! $post_ID ) {
+			return new IXR_Error( 500, __( 'Sorry, your entry could not be posted.' ) );
+		}
 
 		/**
 		 * Fires after a new post has been successfully created via the XML-RPC MovableType API.
@@ -5195,7 +5478,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		 */
 		do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args );
 
-		return strval($post_ID);
+		return strval( $post_ID );
 	}
 
 	/**
@@ -5209,7 +5492,7 @@ class wp_xmlrpc_server extends IXR_Server {
 	public function add_enclosure_if_new( $post_ID, $enclosure ) {
 		if ( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
 			$encstring = $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] . "\n";
-			$found = false;
+			$found     = false;
 			if ( $enclosures = get_post_meta( $post_ID, 'enclosure' ) ) {
 				foreach ( $enclosures as $enc ) {
 					// This method used to omit the trailing new line. #23219
@@ -5219,8 +5502,9 @@ class wp_xmlrpc_server extends IXR_Server {
 					}
 				}
 			}
-			if ( ! $found )
+			if ( ! $found ) {
 				add_post_meta( $post_ID, 'enclosure', $encstring );
+			}
 		}
 	}
 
@@ -5241,8 +5525,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
 		if ( is_array( $attachments ) ) {
 			foreach ( $attachments as $file ) {
-				if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false )
-					$wpdb->update($wpdb->posts, array('post_parent' => $post_ID), array('ID' => $file->ID) );
+				if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false ) {
+					$wpdb->update( $wpdb->posts, array( 'post_parent' => $post_ID ), array( 'ID' => $file->ID ) );
+				}
 			}
 		}
 	}
@@ -5272,8 +5557,9 @@ class wp_xmlrpc_server extends IXR_Server {
 		$content_struct = $args[3];
 		$publish        = isset( $args[4] ) ? $args[4] : 0;
 
-		if ( ! $user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.editPost' );
@@ -5284,59 +5570,68 @@ class wp_xmlrpc_server extends IXR_Server {
 		 * If there is no post data for the give post id, stop now and return an error.
 		 * Otherwise a new post will be created (which was the old behavior).
 		 */
-		if ( ! $postdata || empty( $postdata[ 'ID' ] ) )
+		if ( ! $postdata || empty( $postdata['ID'] ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 
 		// Use wp.editPost to edit post types other than post and page.
-		if ( ! in_array( $postdata[ 'post_type' ], array( 'post', 'page' ) ) )
+		if ( ! in_array( $postdata['post_type'], array( 'post', 'page' ) ) ) {
 			return new IXR_Error( 401, __( 'Invalid post type.' ) );
+		}
 
 		// Thwart attempt to change the post type.
-		if ( ! empty( $content_struct[ 'post_type' ] ) && ( $content_struct['post_type'] != $postdata[ 'post_type' ] ) )
+		if ( ! empty( $content_struct['post_type'] ) && ( $content_struct['post_type'] != $postdata['post_type'] ) ) {
 			return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
+		}
 
 		// Check for a valid post format if one was given
 		if ( isset( $content_struct['wp_post_format'] ) ) {
 			$content_struct['wp_post_format'] = sanitize_key( $content_struct['wp_post_format'] );
-			if ( !array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
+			if ( ! array_key_exists( $content_struct['wp_post_format'], get_post_format_strings() ) ) {
 				return new IXR_Error( 404, __( 'Invalid post format.' ) );
 			}
 		}
 
-		$this->escape($postdata);
+		$this->escape( $postdata );
 
-		$ID = $postdata['ID'];
-		$post_content = $postdata['post_content'];
-		$post_title = $postdata['post_title'];
-		$post_excerpt = $postdata['post_excerpt'];
+		$ID            = $postdata['ID'];
+		$post_content  = $postdata['post_content'];
+		$post_title    = $postdata['post_title'];
+		$post_excerpt  = $postdata['post_excerpt'];
 		$post_password = $postdata['post_password'];
-		$post_parent = $postdata['post_parent'];
-		$post_type = $postdata['post_type'];
-		$menu_order = $postdata['menu_order'];
+		$post_parent   = $postdata['post_parent'];
+		$post_type     = $postdata['post_type'];
+		$menu_order    = $postdata['menu_order'];
 
 		// Let WordPress manage slug if none was provided.
 		$post_name = $postdata['post_name'];
-		if ( isset($content_struct['wp_slug']) )
+		if ( isset( $content_struct['wp_slug'] ) ) {
 			$post_name = $content_struct['wp_slug'];
+		}
 
 		// Only use a password if one was given.
-		if ( isset($content_struct['wp_password']) )
+		if ( isset( $content_struct['wp_password'] ) ) {
 			$post_password = $content_struct['wp_password'];
+		}
 
 		// Only set a post parent if one was given.
-		if ( isset($content_struct['wp_page_parent_id']) )
+		if ( isset( $content_struct['wp_page_parent_id'] ) ) {
 			$post_parent = $content_struct['wp_page_parent_id'];
+		}
 
 		// Only set the menu_order if it was given.
-		if ( isset($content_struct['wp_page_order']) )
+		if ( isset( $content_struct['wp_page_order'] ) ) {
 			$menu_order = $content_struct['wp_page_order'];
+		}
 
 		$page_template = null;
-		if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type )
+		if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type ) {
 			$page_template = $content_struct['wp_page_template'];
+		}
 
 		$post_author = $postdata['post_author'];
 
@@ -5362,8 +5657,8 @@ class wp_xmlrpc_server extends IXR_Server {
 			}
 		}
 
-		if ( isset($content_struct['mt_allow_comments']) ) {
-			if ( !is_numeric($content_struct['mt_allow_comments']) ) {
+		if ( isset( $content_struct['mt_allow_comments'] ) ) {
+			if ( ! is_numeric( $content_struct['mt_allow_comments'] ) ) {
 				switch ( $content_struct['mt_allow_comments'] ) {
 					case 'closed':
 						$comment_status = 'closed';
@@ -5391,8 +5686,8 @@ class wp_xmlrpc_server extends IXR_Server {
 			}
 		}
 
-		if ( isset($content_struct['mt_allow_pings']) ) {
-			if ( !is_numeric($content_struct['mt_allow_pings']) ) {
+		if ( isset( $content_struct['mt_allow_pings'] ) ) {
+			if ( ! is_numeric( $content_struct['mt_allow_pings'] ) ) {
 				switch ( $content_struct['mt_allow_pings'] ) {
 					case 'closed':
 						$ping_status = 'closed';
@@ -5405,7 +5700,7 @@ class wp_xmlrpc_server extends IXR_Server {
 						break;
 				}
 			} else {
-				switch ( (int) $content_struct["mt_allow_pings"] ) {
+				switch ( (int) $content_struct['mt_allow_pings'] ) {
 					case 0:
 						$ping_status = 'closed';
 						break;
@@ -5419,35 +5714,38 @@ class wp_xmlrpc_server extends IXR_Server {
 			}
 		}
 
-		if ( isset( $content_struct['title'] ) )
-			$post_title =  $content_struct['title'];
+		if ( isset( $content_struct['title'] ) ) {
+			$post_title = $content_struct['title'];
+		}
 
-		if ( isset( $content_struct['description'] ) )
+		if ( isset( $content_struct['description'] ) ) {
 			$post_content = $content_struct['description'];
+		}
 
 		$post_category = array();
 		if ( isset( $content_struct['categories'] ) ) {
 			$catnames = $content_struct['categories'];
-			if ( is_array($catnames) ) {
-				foreach ($catnames as $cat) {
-					$post_category[] = get_cat_ID($cat);
+			if ( is_array( $catnames ) ) {
+				foreach ( $catnames as $cat ) {
+					$post_category[] = get_cat_ID( $cat );
 				}
 			}
 		}
 
-		if ( isset( $content_struct['mt_excerpt'] ) )
-			$post_excerpt =  $content_struct['mt_excerpt'];
+		if ( isset( $content_struct['mt_excerpt'] ) ) {
+			$post_excerpt = $content_struct['mt_excerpt'];
+		}
 
 		$post_more = isset( $content_struct['mt_text_more'] ) ? $content_struct['mt_text_more'] : null;
 
 		$post_status = $publish ? 'publish' : 'draft';
-		if ( isset( $content_struct["{$post_type}_status"] ) ) {
-			switch( $content_struct["{$post_type}_status"] ) {
+		if ( isset( $content_struct[ "{$post_type}_status" ] ) ) {
+			switch ( $content_struct[ "{$post_type}_status" ] ) {
 				case 'draft':
 				case 'pending':
 				case 'private':
 				case 'publish':
-					$post_status = $content_struct["{$post_type}_status"];
+					$post_status = $content_struct[ "{$post_type}_status" ];
 					break;
 				default:
 					$post_status = $publish ? 'publish' : 'draft';
@@ -5465,29 +5763,32 @@ class wp_xmlrpc_server extends IXR_Server {
 			}
 		}
 
-		if ( $post_more )
-			$post_content = $post_content . "<!--more-->" . $post_more;
+		if ( $post_more ) {
+			$post_content = $post_content . '<!--more-->' . $post_more;
+		}
 
 		$to_ping = null;
 		if ( isset( $content_struct['mt_tb_ping_urls'] ) ) {
 			$to_ping = $content_struct['mt_tb_ping_urls'];
-			if ( is_array($to_ping) )
-				$to_ping = implode(' ', $to_ping);
+			if ( is_array( $to_ping ) ) {
+				$to_ping = implode( ' ', $to_ping );
+			}
 		}
 
 		// Do some timestamp voodoo.
-		if ( !empty( $content_struct['date_created_gmt'] ) )
+		if ( ! empty( $content_struct['date_created_gmt'] ) ) {
 			// We know this is supposed to be GMT, so we're going to slap that Z on there by force.
 			$dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-		elseif ( !empty( $content_struct['dateCreated']) )
+		} elseif ( ! empty( $content_struct['dateCreated'] ) ) {
 			$dateCreated = $content_struct['dateCreated']->getIso();
+		}
 
 		// Default to not flagging the post date to be edited unless it's intentional.
 		$edit_date = false;
 
-		if ( !empty( $dateCreated ) ) {
-			$post_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-			$post_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
+		if ( ! empty( $dateCreated ) ) {
+			$post_date     = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+			$post_date_gmt = iso8601_to_datetime( $dateCreated, 'GMT' );
 
 			// Flag the post date to be edited.
 			$edit_date = true;
@@ -5497,50 +5798,55 @@ class wp_xmlrpc_server extends IXR_Server {
 		}
 
 		// We've got all the data -- post it.
-		$newpost = compact('ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'edit_date', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template');
+		$newpost = compact( 'ID', 'post_content', 'post_title', 'post_category', 'post_status', 'post_excerpt', 'comment_status', 'ping_status', 'edit_date', 'post_date', 'post_date_gmt', 'to_ping', 'post_name', 'post_password', 'post_parent', 'menu_order', 'post_author', 'tags_input', 'page_template' );
 
-		$result = wp_update_post($newpost, true);
-		if ( is_wp_error( $result ) )
-			return new IXR_Error(500, $result->get_error_message());
+		$result = wp_update_post( $newpost, true );
+		if ( is_wp_error( $result ) ) {
+			return new IXR_Error( 500, $result->get_error_message() );
+		}
 
-		if ( !$result )
-			return new IXR_Error(500, __('Sorry, your entry could not be edited.'));
+		if ( ! $result ) {
+			return new IXR_Error( 500, __( 'Sorry, your entry could not be edited.' ) );
+		}
 
 		// Only posts can be sticky
 		if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
-			$data = $newpost;
-			$data['sticky'] = $content_struct['sticky'];
+			$data              = $newpost;
+			$data['sticky']    = $content_struct['sticky'];
 			$data['post_type'] = 'post';
-			$error = $this->_toggle_sticky( $data, true );
+			$error             = $this->_toggle_sticky( $data, true );
 			if ( $error ) {
 				return $error;
 			}
 		}
 
-		if ( isset($content_struct['custom_fields']) )
-			$this->set_custom_fields($post_ID, $content_struct['custom_fields']);
+		if ( isset( $content_struct['custom_fields'] ) ) {
+			$this->set_custom_fields( $post_ID, $content_struct['custom_fields'] );
+		}
 
-		if ( isset ( $content_struct['wp_post_thumbnail'] ) ) {
+		if ( isset( $content_struct['wp_post_thumbnail'] ) ) {
 
 			// Empty value deletes, non-empty value adds/updates.
 			if ( empty( $content_struct['wp_post_thumbnail'] ) ) {
 				delete_post_thumbnail( $post_ID );
 			} else {
-				if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false )
+				if ( set_post_thumbnail( $post_ID, $content_struct['wp_post_thumbnail'] ) === false ) {
 					return new IXR_Error( 404, __( 'Invalid attachment ID.' ) );
+				}
 			}
 			unset( $content_struct['wp_post_thumbnail'] );
 		}
 
 		// Handle enclosures.
-		$thisEnclosure = isset($content_struct['enclosure']) ? $content_struct['enclosure'] : null;
-		$this->add_enclosure_if_new($post_ID, $thisEnclosure);
+		$thisEnclosure = isset( $content_struct['enclosure'] ) ? $content_struct['enclosure'] : null;
+		$this->add_enclosure_if_new( $post_ID, $thisEnclosure );
 
 		$this->attach_uploads( $ID, $post_content );
 
 		// Handle post formats if assigned, validation is handled earlier in this function.
-		if ( isset( $content_struct['wp_post_format'] ) )
+		if ( isset( $content_struct['wp_post_format'] ) ) {
 			set_post_format( $post_ID, $content_struct['wp_post_format'] );
+		}
 
 		/**
 		 * Fires after a post has been successfully updated via the XML-RPC MovableType API.
@@ -5577,112 +5883,122 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		$postdata = get_post($post_ID, ARRAY_A);
-		if ( ! $postdata )
+		$postdata = get_post( $post_ID, ARRAY_A );
+		if ( ! $postdata ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getPost' );
 
-		if ($postdata['post_date'] != '') {
-			$post_date = $this->_convert_date( $postdata['post_date'] );
-			$post_date_gmt = $this->_convert_date_gmt( $postdata['post_date_gmt'],  $postdata['post_date'] );
-			$post_modified = $this->_convert_date( $postdata['post_modified'] );
+		if ( $postdata['post_date'] != '' ) {
+			$post_date         = $this->_convert_date( $postdata['post_date'] );
+			$post_date_gmt     = $this->_convert_date_gmt( $postdata['post_date_gmt'], $postdata['post_date'] );
+			$post_modified     = $this->_convert_date( $postdata['post_modified'] );
 			$post_modified_gmt = $this->_convert_date_gmt( $postdata['post_modified_gmt'], $postdata['post_modified'] );
 
 			$categories = array();
-			$catids = wp_get_post_categories($post_ID);
-			foreach ($catids as $catid)
-				$categories[] = get_cat_name($catid);
+			$catids     = wp_get_post_categories( $post_ID );
+			foreach ( $catids as $catid ) {
+				$categories[] = get_cat_name( $catid );
+			}
 
 			$tagnames = array();
-			$tags = wp_get_post_tags( $post_ID );
-			if ( !empty( $tags ) ) {
-				foreach ( $tags as $tag )
+			$tags     = wp_get_post_tags( $post_ID );
+			if ( ! empty( $tags ) ) {
+				foreach ( $tags as $tag ) {
 					$tagnames[] = $tag->name;
+				}
 				$tagnames = implode( ', ', $tagnames );
 			} else {
 				$tagnames = '';
 			}
 
-			$post = get_extended($postdata['post_content']);
-			$link = get_permalink($postdata['ID']);
+			$post = get_extended( $postdata['post_content'] );
+			$link = get_permalink( $postdata['ID'] );
 
 			// Get the author info.
-			$author = get_userdata($postdata['post_author']);
+			$author = get_userdata( $postdata['post_author'] );
 
-			$allow_comments = ('open' == $postdata['comment_status']) ? 1 : 0;
-			$allow_pings = ('open' == $postdata['ping_status']) ? 1 : 0;
+			$allow_comments = ( 'open' == $postdata['comment_status'] ) ? 1 : 0;
+			$allow_pings    = ( 'open' == $postdata['ping_status'] ) ? 1 : 0;
 
 			// Consider future posts as published
-			if ( $postdata['post_status'] === 'future' )
+			if ( $postdata['post_status'] === 'future' ) {
 				$postdata['post_status'] = 'publish';
+			}
 
 			// Get post format
 			$post_format = get_post_format( $post_ID );
-			if ( empty( $post_format ) )
+			if ( empty( $post_format ) ) {
 				$post_format = 'standard';
+			}
 
 			$sticky = false;
-			if ( is_sticky( $post_ID ) )
+			if ( is_sticky( $post_ID ) ) {
 				$sticky = true;
+			}
 
 			$enclosure = array();
-			foreach ( (array) get_post_custom($post_ID) as $key => $val) {
-				if ($key == 'enclosure') {
+			foreach ( (array) get_post_custom( $post_ID ) as $key => $val ) {
+				if ( $key == 'enclosure' ) {
 					foreach ( (array) $val as $enc ) {
-						$encdata = explode("\n", $enc);
-						$enclosure['url'] = trim(htmlspecialchars($encdata[0]));
-						$enclosure['length'] = (int) trim($encdata[1]);
-						$enclosure['type'] = trim($encdata[2]);
+						$encdata             = explode( "\n", $enc );
+						$enclosure['url']    = trim( htmlspecialchars( $encdata[0] ) );
+						$enclosure['length'] = (int) trim( $encdata[1] );
+						$enclosure['type']   = trim( $encdata[2] );
 						break 2;
 					}
 				}
 			}
 
 			$resp = array(
-				'dateCreated' => $post_date,
-				'userid' => $postdata['post_author'],
-				'postid' => $postdata['ID'],
-				'description' => $post['main'],
-				'title' => $postdata['post_title'],
-				'link' => $link,
-				'permaLink' => $link,
+				'dateCreated'            => $post_date,
+				'userid'                 => $postdata['post_author'],
+				'postid'                 => $postdata['ID'],
+				'description'            => $post['main'],
+				'title'                  => $postdata['post_title'],
+				'link'                   => $link,
+				'permaLink'              => $link,
 				// commented out because no other tool seems to use this
 				//	      'content' => $entry['post_content'],
-				'categories' => $categories,
-				'mt_excerpt' => $postdata['post_excerpt'],
-				'mt_text_more' => $post['extended'],
-				'wp_more_text' => $post['more_text'],
-				'mt_allow_comments' => $allow_comments,
-				'mt_allow_pings' => $allow_pings,
-				'mt_keywords' => $tagnames,
-				'wp_slug' => $postdata['post_name'],
-				'wp_password' => $postdata['post_password'],
-				'wp_author_id' => (string) $author->ID,
+				'categories'             => $categories,
+				'mt_excerpt'             => $postdata['post_excerpt'],
+				'mt_text_more'           => $post['extended'],
+				'wp_more_text'           => $post['more_text'],
+				'mt_allow_comments'      => $allow_comments,
+				'mt_allow_pings'         => $allow_pings,
+				'mt_keywords'            => $tagnames,
+				'wp_slug'                => $postdata['post_name'],
+				'wp_password'            => $postdata['post_password'],
+				'wp_author_id'           => (string) $author->ID,
 				'wp_author_display_name' => $author->display_name,
-				'date_created_gmt' => $post_date_gmt,
-				'post_status' => $postdata['post_status'],
-				'custom_fields' => $this->get_custom_fields($post_ID),
-				'wp_post_format' => $post_format,
-				'sticky' => $sticky,
-				'date_modified' => $post_modified,
-				'date_modified_gmt' => $post_modified_gmt
+				'date_created_gmt'       => $post_date_gmt,
+				'post_status'            => $postdata['post_status'],
+				'custom_fields'          => $this->get_custom_fields( $post_ID ),
+				'wp_post_format'         => $post_format,
+				'sticky'                 => $sticky,
+				'date_modified'          => $post_modified,
+				'date_modified_gmt'      => $post_modified_gmt,
 			);
 
-			if ( !empty($enclosure) ) $resp['enclosure'] = $enclosure;
+			if ( ! empty( $enclosure ) ) {
+				$resp['enclosure'] = $enclosure;
+			}
 
 			$resp['wp_post_thumbnail'] = get_post_thumbnail_id( $postdata['ID'] );
 
 			return $resp;
 		} else {
-			return new IXR_Error(404, __('Sorry, no such post.'));
+			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
 		}
 	}
 
@@ -5706,43 +6022,49 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$username = $args[1];
 		$password = $args[2];
-		if ( isset( $args[3] ) )
+		if ( isset( $args[3] ) ) {
 			$query = array( 'numberposts' => absint( $args[3] ) );
-		else
+		} else {
 			$query = array();
+		}
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( ! current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit posts.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getRecentPosts' );
 
 		$posts_list = wp_get_recent_posts( $query );
 
-		if ( !$posts_list )
+		if ( ! $posts_list ) {
 			return array();
+		}
 
 		$recent_posts = array();
-		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+		foreach ( $posts_list as $entry ) {
+			if ( ! current_user_can( 'edit_post', $entry['ID'] ) ) {
 				continue;
+			}
 
-			$post_date = $this->_convert_date( $entry['post_date'] );
-			$post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
-			$post_modified = $this->_convert_date( $entry['post_modified'] );
+			$post_date         = $this->_convert_date( $entry['post_date'] );
+			$post_date_gmt     = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
+			$post_modified     = $this->_convert_date( $entry['post_modified'] );
 			$post_modified_gmt = $this->_convert_date_gmt( $entry['post_modified_gmt'], $entry['post_modified'] );
 
 			$categories = array();
-			$catids = wp_get_post_categories($entry['ID']);
-			foreach ( $catids as $catid )
-				$categories[] = get_cat_name($catid);
+			$catids     = wp_get_post_categories( $entry['ID'] );
+			foreach ( $catids as $catid ) {
+				$categories[] = get_cat_name( $catid );
+			}
 
 			$tagnames = array();
-			$tags = wp_get_post_tags( $entry['ID'] );
-			if ( !empty( $tags ) ) {
+			$tags     = wp_get_post_tags( $entry['ID'] );
+			if ( ! empty( $tags ) ) {
 				foreach ( $tags as $tag ) {
 					$tagnames[] = $tag->name;
 				}
@@ -5751,53 +6073,55 @@ class wp_xmlrpc_server extends IXR_Server {
 				$tagnames = '';
 			}
 
-			$post = get_extended($entry['post_content']);
-			$link = get_permalink($entry['ID']);
+			$post = get_extended( $entry['post_content'] );
+			$link = get_permalink( $entry['ID'] );
 
 			// Get the post author info.
-			$author = get_userdata($entry['post_author']);
+			$author = get_userdata( $entry['post_author'] );
 
-			$allow_comments = ('open' == $entry['comment_status']) ? 1 : 0;
-			$allow_pings = ('open' == $entry['ping_status']) ? 1 : 0;
+			$allow_comments = ( 'open' == $entry['comment_status'] ) ? 1 : 0;
+			$allow_pings    = ( 'open' == $entry['ping_status'] ) ? 1 : 0;
 
 			// Consider future posts as published
-			if ( $entry['post_status'] === 'future' )
+			if ( $entry['post_status'] === 'future' ) {
 				$entry['post_status'] = 'publish';
+			}
 
 			// Get post format
 			$post_format = get_post_format( $entry['ID'] );
-			if ( empty( $post_format ) )
+			if ( empty( $post_format ) ) {
 				$post_format = 'standard';
+			}
 
 			$recent_posts[] = array(
-				'dateCreated' => $post_date,
-				'userid' => $entry['post_author'],
-				'postid' => (string) $entry['ID'],
-				'description' => $post['main'],
-				'title' => $entry['post_title'],
-				'link' => $link,
-				'permaLink' => $link,
+				'dateCreated'            => $post_date,
+				'userid'                 => $entry['post_author'],
+				'postid'                 => (string) $entry['ID'],
+				'description'            => $post['main'],
+				'title'                  => $entry['post_title'],
+				'link'                   => $link,
+				'permaLink'              => $link,
 				// commented out because no other tool seems to use this
 				// 'content' => $entry['post_content'],
-				'categories' => $categories,
-				'mt_excerpt' => $entry['post_excerpt'],
-				'mt_text_more' => $post['extended'],
-				'wp_more_text' => $post['more_text'],
-				'mt_allow_comments' => $allow_comments,
-				'mt_allow_pings' => $allow_pings,
-				'mt_keywords' => $tagnames,
-				'wp_slug' => $entry['post_name'],
-				'wp_password' => $entry['post_password'],
-				'wp_author_id' => (string) $author->ID,
+				'categories'             => $categories,
+				'mt_excerpt'             => $entry['post_excerpt'],
+				'mt_text_more'           => $post['extended'],
+				'wp_more_text'           => $post['more_text'],
+				'mt_allow_comments'      => $allow_comments,
+				'mt_allow_pings'         => $allow_pings,
+				'mt_keywords'            => $tagnames,
+				'wp_slug'                => $entry['post_name'],
+				'wp_password'            => $entry['post_password'],
+				'wp_author_id'           => (string) $author->ID,
 				'wp_author_display_name' => $author->display_name,
-				'date_created_gmt' => $post_date_gmt,
-				'post_status' => $entry['post_status'],
-				'custom_fields' => $this->get_custom_fields($entry['ID']),
-				'wp_post_format' => $post_format,
-				'date_modified' => $post_modified,
-				'date_modified_gmt' => $post_modified_gmt,
-				'sticky' => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ),
-				'wp_post_thumbnail' => get_post_thumbnail_id( $entry['ID'] )
+				'date_created_gmt'       => $post_date_gmt,
+				'post_status'            => $entry['post_status'],
+				'custom_fields'          => $this->get_custom_fields( $entry['ID'] ),
+				'wp_post_format'         => $post_format,
+				'date_modified'          => $post_modified,
+				'date_modified_gmt'      => $post_modified_gmt,
+				'sticky'                 => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ),
+				'wp_post_thumbnail'      => get_post_thumbnail_id( $entry['ID'] ),
 			);
 		}
 
@@ -5824,27 +6148,29 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.getCategories' );
 
 		$categories_struct = array();
 
-		if ( $cats = get_categories(array('get' => 'all')) ) {
+		if ( $cats = get_categories( array( 'get' => 'all' ) ) ) {
 			foreach ( $cats as $cat ) {
-				$struct = array();
-				$struct['categoryId'] = $cat->term_id;
-				$struct['parentId'] = $cat->parent;
-				$struct['description'] = $cat->name;
+				$struct                        = array();
+				$struct['categoryId']          = $cat->term_id;
+				$struct['parentId']            = $cat->parent;
+				$struct['description']         = $cat->name;
 				$struct['categoryDescription'] = $cat->description;
-				$struct['categoryName'] = $cat->name;
-				$struct['htmlUrl'] = esc_html(get_category_link($cat->term_id));
-				$struct['rssUrl'] = esc_html(get_category_feed_link($cat->term_id, 'rss2'));
+				$struct['categoryName']        = $cat->name;
+				$struct['htmlUrl']             = esc_html( get_category_link( $cat->term_id ) );
+				$struct['rssUrl']              = esc_html( get_category_feed_link( $cat->term_id, 'rss2' ) );
 
 				$categories_struct[] = $struct;
 			}
@@ -5885,13 +6211,14 @@ class wp_xmlrpc_server extends IXR_Server {
 		$type = $data['type'];
 		$bits = $data['bits'];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'metaWeblog.newMediaObject' );
 
-		if ( !current_user_can('upload_files') ) {
+		if ( ! current_user_can( 'upload_files' ) ) {
 			$this->error = new IXR_Error( 401, __( 'Sorry, you are not allowed to upload files.' ) );
 			return $this->error;
 		}
@@ -5915,8 +6242,8 @@ class wp_xmlrpc_server extends IXR_Server {
 			return new IXR_Error( 500, $upload_err );
 		}
 
-		$upload = wp_upload_bits($name, null, $bits);
-		if ( ! empty($upload['error']) ) {
+		$upload = wp_upload_bits( $name, null, $bits );
+		if ( ! empty( $upload['error'] ) ) {
 			/* translators: 1: file name, 2: error message */
 			$errorString = sprintf( __( 'Could not write file %1$s (%2$s).' ), $name, $upload['error'] );
 			return new IXR_Error( 500, $errorString );
@@ -5926,20 +6253,21 @@ class wp_xmlrpc_server extends IXR_Server {
 		if ( ! empty( $data['post_id'] ) ) {
 			$post_id = (int) $data['post_id'];
 
-			if ( ! current_user_can( 'edit_post', $post_id ) )
+			if ( ! current_user_can( 'edit_post', $post_id ) ) {
 				return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+			}
 		}
 		$attachment = array(
-			'post_title' => $name,
-			'post_content' => '',
-			'post_type' => 'attachment',
-			'post_parent' => $post_id,
+			'post_title'     => $name,
+			'post_content'   => '',
+			'post_type'      => 'attachment',
+			'post_parent'    => $post_id,
 			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ]
+			'guid'           => $upload['url'],
 		);
 
 		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $post_id );
+		$id = wp_insert_attachment( $attachment, $upload['file'], $post_id );
 		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
 
 		/**
@@ -5986,40 +6314,43 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$username = $args[1];
 		$password = $args[2];
-		if ( isset( $args[3] ) )
+		if ( isset( $args[3] ) ) {
 			$query = array( 'numberposts' => absint( $args[3] ) );
-		else
+		} else {
 			$query = array();
+		}
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getRecentPostTitles' );
 
 		$posts_list = wp_get_recent_posts( $query );
 
-		if ( !$posts_list ) {
-			$this->error = new IXR_Error(500, __('Either there are no posts, or something went wrong.'));
+		if ( ! $posts_list ) {
+			$this->error = new IXR_Error( 500, __( 'Either there are no posts, or something went wrong.' ) );
 			return $this->error;
 		}
 
 		$recent_posts = array();
 
-		foreach ($posts_list as $entry) {
-			if ( !current_user_can( 'edit_post', $entry['ID'] ) )
+		foreach ( $posts_list as $entry ) {
+			if ( ! current_user_can( 'edit_post', $entry['ID'] ) ) {
 				continue;
+			}
 
-			$post_date = $this->_convert_date( $entry['post_date'] );
+			$post_date     = $this->_convert_date( $entry['post_date'] );
 			$post_date_gmt = $this->_convert_date_gmt( $entry['post_date_gmt'], $entry['post_date'] );
 
 			$recent_posts[] = array(
-				'dateCreated' => $post_date,
-				'userid' => $entry['post_author'],
-				'postid' => (string) $entry['ID'],
-				'title' => $entry['post_title'],
-				'post_status' => $entry['post_status'],
-				'date_created_gmt' => $post_date_gmt
+				'dateCreated'      => $post_date,
+				'userid'           => $entry['post_author'],
+				'postid'           => (string) $entry['ID'],
+				'title'            => $entry['post_title'],
+				'post_status'      => $entry['post_status'],
+				'date_created_gmt' => $post_date_gmt,
 			);
 		}
 
@@ -6046,21 +6377,28 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( !current_user_can( 'edit_posts' ) )
+		if ( ! current_user_can( 'edit_posts' ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getCategoryList' );
 
 		$categories_struct = array();
 
-		if ( $cats = get_categories(array('hide_empty' => 0, 'hierarchical' => 0)) ) {
+		if ( $cats = get_categories(
+			array(
+				'hide_empty'   => 0,
+				'hierarchical' => 0,
+			)
+		) ) {
 			foreach ( $cats as $cat ) {
-				$struct = array();
-				$struct['categoryId'] = $cat->term_id;
+				$struct                 = array();
+				$struct['categoryId']   = $cat->term_id;
 				$struct['categoryName'] = $cat->name;
 
 				$categories_struct[] = $struct;
@@ -6091,29 +6429,32 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
-		if ( ! get_post( $post_ID ) )
+		if ( ! get_post( $post_ID ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can( 'edit_post', $post_ID ) )
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
 			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getPostCategories' );
 
 		$categories = array();
-		$catids = wp_get_post_categories(intval($post_ID));
+		$catids     = wp_get_post_categories( intval( $post_ID ) );
 		// first listed category will be the primary category
 		$isPrimary = true;
 		foreach ( $catids as $catid ) {
 			$categories[] = array(
-				'categoryName' => get_cat_name($catid),
-				'categoryId' => (string) $catid,
-				'isPrimary' => $isPrimary
+				'categoryName' => get_cat_name( $catid ),
+				'categoryId'   => (string) $catid,
+				'isPrimary'    => $isPrimary,
 			);
-			$isPrimary = false;
+			$isPrimary    = false;
 		}
 
 		return $categories;
@@ -6142,24 +6483,27 @@ class wp_xmlrpc_server extends IXR_Server {
 		$password   = $args[2];
 		$categories = $args[3];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.setPostCategories' );
 
-		if ( ! get_post( $post_ID ) )
+		if ( ! get_post( $post_ID ) ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can('edit_post', $post_ID) )
-			return new IXR_Error(401, __('Sorry, you are not allowed to edit this post.'));
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post.' ) );
+		}
 
 		$catids = array();
 		foreach ( $categories as $cat ) {
 			$catids[] = $cat['categoryId'];
 		}
 
-		wp_set_post_categories($post_ID, $catids);
+		wp_set_post_categories( $post_ID, $catids );
 
 		return true;
 	}
@@ -6213,25 +6557,27 @@ class wp_xmlrpc_server extends IXR_Server {
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.getTrackbackPings' );
 
-		$actual_post = get_post($post_ID, ARRAY_A);
+		$actual_post = get_post( $post_ID, ARRAY_A );
 
-		if ( !$actual_post )
-			return new IXR_Error(404, __('Sorry, no such post.'));
+		if ( ! $actual_post ) {
+			return new IXR_Error( 404, __( 'Sorry, no such post.' ) );
+		}
 
-		$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+		$comments = $wpdb->get_results( $wpdb->prepare( "SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID ) );
 
-		if ( !$comments )
+		if ( ! $comments ) {
 			return array();
+		}
 
 		$trackback_pings = array();
 		foreach ( $comments as $comment ) {
 			if ( 'trackback' == $comment->comment_type ) {
-				$content = $comment->comment_content;
-				$title = substr($content, 8, (strpos($content, '</strong>') - 8));
+				$content           = $comment->comment_content;
+				$title             = substr( $content, 8, ( strpos( $content, '</strong>' ) - 8 ) );
 				$trackback_pings[] = array(
 					'pingTitle' => $title,
 					'pingURL'   => $comment->comment_author_url,
-					'pingIP'    => $comment->comment_author_IP
+					'pingIP'    => $comment->comment_author_IP,
 				);
 			}
 		}
@@ -6260,25 +6606,28 @@ class wp_xmlrpc_server extends IXR_Server {
 		$username = $args[1];
 		$password = $args[2];
 
-		if ( !$user = $this->login($username, $password) )
+		if ( ! $user = $this->login( $username, $password ) ) {
 			return $this->error;
+		}
 
 		/** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
 		do_action( 'xmlrpc_call', 'mt.publishPost' );
 
-		$postdata = get_post($post_ID, ARRAY_A);
-		if ( ! $postdata )
+		$postdata = get_post( $post_ID, ARRAY_A );
+		if ( ! $postdata ) {
 			return new IXR_Error( 404, __( 'Invalid post ID.' ) );
+		}
 
-		if ( !current_user_can('publish_posts') || !current_user_can('edit_post', $post_ID) )
-			return new IXR_Error(401, __('Sorry, you are not allowed to publish this post.'));
+		if ( ! current_user_can( 'publish_posts' ) || ! current_user_can( 'edit_post', $post_ID ) ) {
+			return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this post.' ) );
+		}
 
 		$postdata['post_status'] = 'publish';
 
 		// retain old cats
-		$cats = wp_get_post_categories($post_ID);
+		$cats                      = wp_get_post_categories( $post_ID );
 		$postdata['post_category'] = $cats;
-		$this->escape($postdata);
+		$this->escape( $postdata );
 
 		return wp_update_post( $postdata );
 	}
@@ -6309,8 +6658,8 @@ class wp_xmlrpc_server extends IXR_Server {
 		$this->escape( $args );
 
 		$pagelinkedfrom = str_replace( '&amp;', '&', $args[0] );
-		$pagelinkedto = str_replace( '&amp;', '&', $args[1] );
-		$pagelinkedto = str_replace( '&', '&amp;', $pagelinkedto );
+		$pagelinkedto   = str_replace( '&amp;', '&', $args[1] );
+		$pagelinkedto   = str_replace( '&', '&amp;', $pagelinkedto );
 
 		/**
 		 * Filters the pingback source URI.
@@ -6322,69 +6671,75 @@ class wp_xmlrpc_server extends IXR_Server {
 		 */
 		$pagelinkedfrom = apply_filters( 'pingback_ping_source_uri', $pagelinkedfrom, $pagelinkedto );
 
-		if ( ! $pagelinkedfrom )
+		if ( ! $pagelinkedfrom ) {
 			return $this->pingback_error( 0, __( 'A valid URL was not provided.' ) );
+		}
 
 		// Check if the page linked to is in our site
-		$pos1 = strpos($pagelinkedto, str_replace(array('http://www.','http://','https://www.','https://'), '', get_option('home')));
-		if ( !$pos1 )
+		$pos1 = strpos( $pagelinkedto, str_replace( array( 'http://www.', 'http://', 'https://www.', 'https://' ), '', get_option( 'home' ) ) );
+		if ( ! $pos1 ) {
 			return $this->pingback_error( 0, __( 'Is there no link to us?' ) );
+		}
 
 		// let's find which post is linked to
 		// FIXME: does url_to_postid() cover all these cases already?
 		//        if so, then let's use it and drop the old code.
-		$urltest = parse_url($pagelinkedto);
-		if ( $post_ID = url_to_postid($pagelinkedto) ) {
+		$urltest = parse_url( $pagelinkedto );
+		if ( $post_ID = url_to_postid( $pagelinkedto ) ) {
 			// $way
-		} elseif ( isset( $urltest['path'] ) && preg_match('#p/[0-9]{1,}#', $urltest['path'], $match) ) {
+		} elseif ( isset( $urltest['path'] ) && preg_match( '#p/[0-9]{1,}#', $urltest['path'], $match ) ) {
 			// the path defines the post_ID (archives/p/XXXX)
-			$blah = explode('/', $match[0]);
+			$blah    = explode( '/', $match[0] );
 			$post_ID = (int) $blah[1];
-		} elseif ( isset( $urltest['query'] ) && preg_match('#p=[0-9]{1,}#', $urltest['query'], $match) ) {
+		} elseif ( isset( $urltest['query'] ) && preg_match( '#p=[0-9]{1,}#', $urltest['query'], $match ) ) {
 			// the querystring defines the post_ID (?p=XXXX)
-			$blah = explode('=', $match[0]);
+			$blah    = explode( '=', $match[0] );
 			$post_ID = (int) $blah[1];
-		} elseif ( isset($urltest['fragment']) ) {
+		} elseif ( isset( $urltest['fragment'] ) ) {
 			// an #anchor is there, it's either...
-			if ( intval($urltest['fragment']) ) {
+			if ( intval( $urltest['fragment'] ) ) {
 				// ...an integer #XXXX (simplest case)
 				$post_ID = (int) $urltest['fragment'];
-			} elseif ( preg_match('/post-[0-9]+/',$urltest['fragment']) ) {
+			} elseif ( preg_match( '/post-[0-9]+/', $urltest['fragment'] ) ) {
 				// ...a post id in the form 'post-###'
-				$post_ID = preg_replace('/[^0-9]+/', '', $urltest['fragment']);
-			} elseif ( is_string($urltest['fragment']) ) {
+				$post_ID = preg_replace( '/[^0-9]+/', '', $urltest['fragment'] );
+			} elseif ( is_string( $urltest['fragment'] ) ) {
 				// ...or a string #title, a little more complicated
-				$title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']);
-				$sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
-				if (! ($post_ID = $wpdb->get_var($sql)) ) {
+				$title = preg_replace( '/[^a-z0-9]/i', '.', $urltest['fragment'] );
+				$sql   = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title );
+				if ( ! ( $post_ID = $wpdb->get_var( $sql ) ) ) {
 					// returning unknown error '0' is better than die()ing
-			  		return $this->pingback_error( 0, '' );
+					return $this->pingback_error( 0, '' );
 				}
 			}
 		} else {
 			// TODO: Attempt to extract a post ID from the given URL
-	  		return $this->pingback_error( 33, __('The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
 		}
 		$post_ID = (int) $post_ID;
 
-		$post = get_post($post_ID);
+		$post = get_post( $post_ID );
 
-		if ( !$post ) // Post_ID not found
-	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		if ( ! $post ) { // Post_ID not found
+			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		}
 
-		if ( $post_ID == url_to_postid($pagelinkedfrom) )
+		if ( $post_ID == url_to_postid( $pagelinkedfrom ) ) {
 			return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
+		}
 
 		// Check if pings are on
-		if ( !pings_open($post) )
-	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		if ( ! pings_open( $post ) ) {
+			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+		}
 
 		// Let's check that the remote site didn't already pingback this entry
-		if ( $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom) ) )
+		if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $post_ID, $pagelinkedfrom ) ) ) {
 			return $this->pingback_error( 48, __( 'The pingback has already been registered.' ) );
+		}
 
 		// very stupid, but gives time to the 'from' server to publish !
-		sleep(1);
+		sleep( 1 );
 
 		$remote_ip = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
 
@@ -6393,16 +6748,16 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		// Let's check the remote site
 		$http_api_args = array(
-			'timeout' => 10,
-			'redirection' => 0,
+			'timeout'             => 10,
+			'redirection'         => 0,
 			'limit_response_size' => 153600, // 150 KB
-			'user-agent' => "$user_agent; verifying pingback from $remote_ip",
-			'headers' => array(
+			'user-agent'          => "$user_agent; verifying pingback from $remote_ip",
+			'headers'             => array(
 				'X-Pingback-Forwarded-For' => $remote_ip,
 			),
 		);
 
-		$request = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
+		$request       = wp_safe_remote_get( $pagelinkedfrom, $http_api_args );
 		$remote_source = $remote_source_original = wp_remote_retrieve_body( $request );
 
 		if ( ! $remote_source ) {
@@ -6422,7 +6777,7 @@ class wp_xmlrpc_server extends IXR_Server {
 		// Work around bug in strip_tags():
 		$remote_source = str_replace( '<!DOC', '<DOC', $remote_source );
 		$remote_source = preg_replace( '/[\r\n\t ]+/', ' ', $remote_source ); // normalize spaces
-		$remote_source = preg_replace( "/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/", "\n\n", $remote_source );
+		$remote_source = preg_replace( '/<\/*(h1|h2|h3|h4|h5|h6|p|th|td|li|dt|dd|pre|caption|input|textarea|button|body)[^>]*>/', "\n\n", $remote_source );
 
 		preg_match( '|<title>([^<]*?)</title>|is', $remote_source, $matchtitle );
 		$title = isset( $matchtitle[1] ) ? $matchtitle[1] : '';
@@ -6434,50 +6789,53 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$p = explode( "\n\n", $remote_source );
 
-		$preg_target = preg_quote($pagelinkedto, '|');
+		$preg_target = preg_quote( $pagelinkedto, '|' );
 
 		foreach ( $p as $para ) {
-			if ( strpos($para, $pagelinkedto) !== false ) { // it exists, but is it a link?
-				preg_match("|<a[^>]+?".$preg_target."[^>]*>([^>]+?)</a>|", $para, $context);
+			if ( strpos( $para, $pagelinkedto ) !== false ) { // it exists, but is it a link?
+				preg_match( '|<a[^>]+?' . $preg_target . '[^>]*>([^>]+?)</a>|', $para, $context );
 
 				// If the URL isn't in a link context, keep looking
-				if ( empty($context) )
+				if ( empty( $context ) ) {
 					continue;
+				}
 
 				// We're going to use this fake tag to mark the context in a bit
 				// the marker is needed in case the link text appears more than once in the paragraph
-				$excerpt = preg_replace('|\</?wpcontext\>|', '', $para);
+				$excerpt = preg_replace( '|\</?wpcontext\>|', '', $para );
 
 				// prevent really long link text
-				if ( strlen($context[1]) > 100 )
-					$context[1] = substr($context[1], 0, 100) . '&#8230;';
+				if ( strlen( $context[1] ) > 100 ) {
+					$context[1] = substr( $context[1], 0, 100 ) . '&#8230;';
+				}
 
-				$marker = '<wpcontext>'.$context[1].'</wpcontext>';    // set up our marker
-				$excerpt= str_replace($context[0], $marker, $excerpt); // swap out the link for our marker
-				$excerpt = strip_tags($excerpt, '<wpcontext>');        // strip all tags but our context marker
-				$excerpt = trim($excerpt);
-				$preg_marker = preg_quote($marker, '|');
-				$excerpt = preg_replace("|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt);
-				$excerpt = strip_tags($excerpt); // YES, again, to remove the marker wrapper
+				$marker      = '<wpcontext>' . $context[1] . '</wpcontext>';    // set up our marker
+				$excerpt     = str_replace( $context[0], $marker, $excerpt ); // swap out the link for our marker
+				$excerpt     = strip_tags( $excerpt, '<wpcontext>' );        // strip all tags but our context marker
+				$excerpt     = trim( $excerpt );
+				$preg_marker = preg_quote( $marker, '|' );
+				$excerpt     = preg_replace( "|.*?\s(.{0,100}$preg_marker.{0,100})\s.*|s", '$1', $excerpt );
+				$excerpt     = strip_tags( $excerpt ); // YES, again, to remove the marker wrapper
 				break;
 			}
 		}
 
-		if ( empty($context) ) // Link to target not found
+		if ( empty( $context ) ) { // Link to target not found
 			return $this->pingback_error( 17, __( 'The source URL does not contain a link to the target URL, and so cannot be used as a source.' ) );
+		}
 
-		$pagelinkedfrom = str_replace('&', '&amp;', $pagelinkedfrom);
+		$pagelinkedfrom = str_replace( '&', '&amp;', $pagelinkedfrom );
 
-		$context = '[&#8230;] ' . esc_html( $excerpt ) . ' [&#8230;]';
+		$context        = '[&#8230;] ' . esc_html( $excerpt ) . ' [&#8230;]';
 		$pagelinkedfrom = $this->escape( $pagelinkedfrom );
 
-		$comment_post_ID = (int) $post_ID;
-		$comment_author = $title;
+		$comment_post_ID      = (int) $post_ID;
+		$comment_author       = $title;
 		$comment_author_email = '';
-		$this->escape($comment_author);
+		$this->escape( $comment_author );
 		$comment_author_url = $pagelinkedfrom;
-		$comment_content = $context;
-		$this->escape($comment_content);
+		$comment_content    = $context;
+		$this->escape( $comment_content );
 		$comment_type = 'pingback';
 
 		$commentdata = compact(
@@ -6485,7 +6843,7 @@ class wp_xmlrpc_server extends IXR_Server {
 			'comment_content', 'comment_type', 'remote_source', 'remote_source_original'
 		);
 
-		$comment_ID = wp_new_comment($commentdata);
+		$comment_ID = wp_new_comment( $commentdata );
 
 		if ( is_wp_error( $comment_ID ) ) {
 			return $this->pingback_error( 0, $comment_ID->get_error_message() );
@@ -6524,28 +6882,30 @@ class wp_xmlrpc_server extends IXR_Server {
 
 		$url = $this->escape( $url );
 
-		$post_ID = url_to_postid($url);
-		if ( !$post_ID ) {
+		$post_ID = url_to_postid( $url );
+		if ( ! $post_ID ) {
 			// We aren't sure that the resource is available and/or pingback enabled
-	  		return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
+			return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn&#8217;t exist, or it is not a pingback-enabled resource.' ) );
 		}
 
-		$actual_post = get_post($post_ID, ARRAY_A);
+		$actual_post = get_post( $post_ID, ARRAY_A );
 
-		if ( !$actual_post ) {
+		if ( ! $actual_post ) {
 			// No such post = resource not found
-	  		return $this->pingback_error( 32, __('The specified target URL does not exist.' ) );
+			return $this->pingback_error( 32, __( 'The specified target URL does not exist.' ) );
 		}
 
-		$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) );
+		$comments = $wpdb->get_results( $wpdb->prepare( "SELECT comment_author_url, comment_content, comment_author_IP, comment_type FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID ) );
 
-		if ( !$comments )
+		if ( ! $comments ) {
 			return array();
+		}
 
 		$pingbacks = array();
 		foreach ( $comments as $comment ) {
-			if ( 'pingback' == $comment->comment_type )
+			if ( 'pingback' == $comment->comment_type ) {
 				$pingbacks[] = $comment->comment_author_url;
+			}
 		}
 
 		return $pingbacks;
diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 161e3a2347..5298ff21ab 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -14,7 +14,7 @@ class WP {
 	 * @since 2.0.0
 	 * @var array
 	 */
-	public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
+	public $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
 
 	/**
 	 * Private query variables.
@@ -89,9 +89,10 @@ class WP {
 	 *
 	 * @param string $qv Query variable name.
 	 */
-	public function add_query_var($qv) {
-		if ( !in_array($qv, $this->public_query_vars) )
+	public function add_query_var( $qv ) {
+		if ( ! in_array( $qv, $this->public_query_vars ) ) {
 			$this->public_query_vars[] = $qv;
+		}
 	}
 
 	/**
@@ -113,8 +114,8 @@ class WP {
 	 * @param string $key Query variable name.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set_query_var($key, $value) {
-		$this->query_vars[$key] = $value;
+	public function set_query_var( $key, $value ) {
+		$this->query_vars[ $key ] = $value;
 	}
 
 	/**
@@ -129,7 +130,7 @@ class WP {
 	 *
 	 * @param array|string $extra_query_vars Set the extra query variables.
 	 */
-	public function parse_request($extra_query_vars = '') {
+	public function parse_request( $extra_query_vars = '' ) {
 		global $wp_rewrite;
 
 		/**
@@ -141,10 +142,11 @@ class WP {
 		 * @param WP           $this             Current WordPress environment instance.
 		 * @param array|string $extra_query_vars Extra passed query variables.
 		 */
-		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) )
+		if ( ! apply_filters( 'do_parse_request', true, $this, $extra_query_vars ) ) {
 			return;
+		}
 
-		$this->query_vars = array();
+		$this->query_vars     = array();
 		$post_type_query_vars = array();
 
 		if ( is_array( $extra_query_vars ) ) {
@@ -157,43 +159,44 @@ class WP {
 		// Fetch the rewrite rules.
 		$rewrite = $wp_rewrite->wp_rewrite_rules();
 
-		if ( ! empty($rewrite) ) {
+		if ( ! empty( $rewrite ) ) {
 			// If we match a rewrite rule, this will be cleared.
-			$error = '404';
+			$error               = '404';
 			$this->did_permalink = true;
 
-			$pathinfo = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
+			$pathinfo         = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
 			list( $pathinfo ) = explode( '?', $pathinfo );
-			$pathinfo = str_replace( "%", "%25", $pathinfo );
+			$pathinfo         = str_replace( '%', '%25', $pathinfo );
 
 			list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
-			$self = $_SERVER['PHP_SELF'];
-			$home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
+			$self            = $_SERVER['PHP_SELF'];
+			$home_path       = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
 			$home_path_regex = sprintf( '|^%s|i', preg_quote( $home_path, '|' ) );
 
 			// Trim path info from the end and the leading home path from the
 			// front. For path info requests, this leaves us with the requesting
 			// filename, if any. For 404 requests, this leaves us with the
 			// requested permalink.
-			$req_uri = str_replace($pathinfo, '', $req_uri);
-			$req_uri = trim($req_uri, '/');
-			$req_uri = preg_replace( $home_path_regex, '', $req_uri );
-			$req_uri = trim($req_uri, '/');
-			$pathinfo = trim($pathinfo, '/');
+			$req_uri  = str_replace( $pathinfo, '', $req_uri );
+			$req_uri  = trim( $req_uri, '/' );
+			$req_uri  = preg_replace( $home_path_regex, '', $req_uri );
+			$req_uri  = trim( $req_uri, '/' );
+			$pathinfo = trim( $pathinfo, '/' );
 			$pathinfo = preg_replace( $home_path_regex, '', $pathinfo );
-			$pathinfo = trim($pathinfo, '/');
-			$self = trim($self, '/');
-			$self = preg_replace( $home_path_regex, '', $self );
-			$self = trim($self, '/');
+			$pathinfo = trim( $pathinfo, '/' );
+			$self     = trim( $self, '/' );
+			$self     = preg_replace( $home_path_regex, '', $self );
+			$self     = trim( $self, '/' );
 
 			// The requested permalink is in $pathinfo for path info requests and
 			//  $req_uri for other requests.
-			if ( ! empty($pathinfo) && !preg_match('|^.*' . $wp_rewrite->index . '$|', $pathinfo) ) {
+			if ( ! empty( $pathinfo ) && ! preg_match( '|^.*' . $wp_rewrite->index . '$|', $pathinfo ) ) {
 				$requested_path = $pathinfo;
 			} else {
 				// If the request uri is the index, blank it out so that we don't try to match it against a rule.
-				if ( $req_uri == $wp_rewrite->index )
+				if ( $req_uri == $wp_rewrite->index ) {
 					$req_uri = '';
+				}
 				$requested_path = $req_uri;
 			}
 			$requested_file = $req_uri;
@@ -206,23 +209,24 @@ class WP {
 				// An empty request could only match against ^$ regex
 				if ( isset( $rewrite['$'] ) ) {
 					$this->matched_rule = '$';
-					$query = $rewrite['$'];
-					$matches = array('');
+					$query              = $rewrite['$'];
+					$matches            = array( '' );
 				}
 			} else {
 				foreach ( (array) $rewrite as $match => $query ) {
 					// If the requested file is the anchor of the match, prepend it to the path info.
-					if ( ! empty($requested_file) && strpos($match, $requested_file) === 0 && $requested_file != $requested_path )
+					if ( ! empty( $requested_file ) && strpos( $match, $requested_file ) === 0 && $requested_file != $requested_path ) {
 						$request_match = $requested_file . '/' . $requested_path;
+					}
 
-					if ( preg_match("#^$match#", $request_match, $matches) ||
-						preg_match("#^$match#", urldecode($request_match), $matches) ) {
+					if ( preg_match( "#^$match#", $request_match, $matches ) ||
+						preg_match( "#^$match#", urldecode( $request_match ), $matches ) ) {
 
 						if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
 							// This is a verbose page match, let's check to be sure about it.
 							$page = get_page_by_path( $matches[ $varmatch[1] ] );
 							if ( ! $page ) {
-						 		continue;
+								continue;
 							}
 
 							$post_status_obj = get_post_status_object( $page->post_status );
@@ -241,27 +245,29 @@ class WP {
 
 			if ( isset( $this->matched_rule ) ) {
 				// Trim the query of everything up to the '?'.
-				$query = preg_replace("!^.+\?!", '', $query);
+				$query = preg_replace( '!^.+\?!', '', $query );
 
 				// Substitute the substring matches into the query.
-				$query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
+				$query = addslashes( WP_MatchesMapRegex::apply( $query, $matches ) );
 
 				$this->matched_query = $query;
 
 				// Parse the query.
-				parse_str($query, $perma_query_vars);
+				parse_str( $query, $perma_query_vars );
 
 				// If we're processing a 404 request, clear the error var since we found something.
-				if ( '404' == $error )
+				if ( '404' == $error ) {
 					unset( $error, $_GET['error'] );
+				}
 			}
 
 			// If req_uri is empty or if it is a request for ourself, unset error.
-			if ( empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
+			if ( empty( $requested_path ) || $requested_file == $self || strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
 				unset( $error, $_GET['error'] );
 
-				if ( isset($perma_query_vars) && strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false )
+				if ( isset( $perma_query_vars ) && strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
 					unset( $perma_query_vars );
+				}
 
 				$this->did_permalink = false;
 			}
@@ -282,42 +288,45 @@ class WP {
 
 		foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
 			if ( is_post_type_viewable( $t ) && $t->query_var ) {
-				$post_type_query_vars[$t->query_var] = $post_type;
+				$post_type_query_vars[ $t->query_var ] = $post_type;
 			}
 		}
 
 		foreach ( $this->public_query_vars as $wpvar ) {
-			if ( isset( $this->extra_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
-			elseif ( isset( $_POST[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_POST[$wpvar];
-			elseif ( isset( $_GET[$wpvar] ) )
-				$this->query_vars[$wpvar] = $_GET[$wpvar];
-			elseif ( isset( $perma_query_vars[$wpvar] ) )
-				$this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
+			if ( isset( $this->extra_query_vars[ $wpvar ] ) ) {
+				$this->query_vars[ $wpvar ] = $this->extra_query_vars[ $wpvar ];
+			} elseif ( isset( $_POST[ $wpvar ] ) ) {
+				$this->query_vars[ $wpvar ] = $_POST[ $wpvar ];
+			} elseif ( isset( $_GET[ $wpvar ] ) ) {
+				$this->query_vars[ $wpvar ] = $_GET[ $wpvar ];
+			} elseif ( isset( $perma_query_vars[ $wpvar ] ) ) {
+				$this->query_vars[ $wpvar ] = $perma_query_vars[ $wpvar ];
+			}
 
-			if ( !empty( $this->query_vars[$wpvar] ) ) {
-				if ( ! is_array( $this->query_vars[$wpvar] ) ) {
-					$this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
+			if ( ! empty( $this->query_vars[ $wpvar ] ) ) {
+				if ( ! is_array( $this->query_vars[ $wpvar ] ) ) {
+					$this->query_vars[ $wpvar ] = (string) $this->query_vars[ $wpvar ];
 				} else {
-					foreach ( $this->query_vars[$wpvar] as $vkey => $v ) {
-						if ( !is_object( $v ) ) {
-							$this->query_vars[$wpvar][$vkey] = (string) $v;
+					foreach ( $this->query_vars[ $wpvar ] as $vkey => $v ) {
+						if ( ! is_object( $v ) ) {
+							$this->query_vars[ $wpvar ][ $vkey ] = (string) $v;
 						}
 					}
 				}
 
-				if ( isset($post_type_query_vars[$wpvar] ) ) {
-					$this->query_vars['post_type'] = $post_type_query_vars[$wpvar];
-					$this->query_vars['name'] = $this->query_vars[$wpvar];
+				if ( isset( $post_type_query_vars[ $wpvar ] ) ) {
+					$this->query_vars['post_type'] = $post_type_query_vars[ $wpvar ];
+					$this->query_vars['name']      = $this->query_vars[ $wpvar ];
 				}
 			}
 		}
 
 		// Convert urldecoded spaces back into +
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t )
-			if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
-				$this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
+		foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy => $t ) {
+			if ( $t->query_var && isset( $this->query_vars[ $t->query_var ] ) ) {
+				$this->query_vars[ $t->query_var ] = str_replace( ' ', '+', $this->query_vars[ $t->query_var ] );
+			}
+		}
 
 		// Don't allow non-publicly queryable taxonomies to be queried from the front end.
 		if ( ! is_admin() ) {
@@ -333,11 +342,12 @@ class WP {
 		}
 
 		// Limit publicly queried post_types to those that are publicly_queryable
-		if ( isset( $this->query_vars['post_type']) ) {
-			$queryable_post_types = get_post_types( array('publicly_queryable' => true) );
+		if ( isset( $this->query_vars['post_type'] ) ) {
+			$queryable_post_types = get_post_types( array( 'publicly_queryable' => true ) );
 			if ( ! is_array( $this->query_vars['post_type'] ) ) {
-				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) )
+				if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) ) {
 					unset( $this->query_vars['post_type'] );
+				}
 			} else {
 				$this->query_vars['post_type'] = array_intersect( $this->query_vars['post_type'], $queryable_post_types );
 			}
@@ -346,13 +356,15 @@ class WP {
 		// Resolve conflicts between posts with numeric slugs and date archive queries.
 		$this->query_vars = wp_resolve_numeric_slug_conflicts( $this->query_vars );
 
-		foreach ( (array) $this->private_query_vars as $var) {
-			if ( isset($this->extra_query_vars[$var]) )
-				$this->query_vars[$var] = $this->extra_query_vars[$var];
+		foreach ( (array) $this->private_query_vars as $var ) {
+			if ( isset( $this->extra_query_vars[ $var ] ) ) {
+				$this->query_vars[ $var ] = $this->extra_query_vars[ $var ];
+			}
 		}
 
-		if ( isset($error) )
+		if ( isset( $error ) ) {
 			$this->query_vars['error'] = $error;
+		}
 
 		/**
 		 * Filters the array of parsed query variables.
@@ -383,23 +395,25 @@ class WP {
 	 * @since 4.4.0 `X-Pingback` header is added conditionally after posts have been queried in handle_404().
 	 */
 	public function send_headers() {
-		$headers = array();
-		$status = null;
+		$headers       = array();
+		$status        = null;
 		$exit_required = false;
 
-		if ( is_user_logged_in() )
-			$headers = array_merge($headers, wp_get_nocache_headers());
+		if ( is_user_logged_in() ) {
+			$headers = array_merge( $headers, wp_get_nocache_headers() );
+		}
 		if ( ! empty( $this->query_vars['error'] ) ) {
 			$status = (int) $this->query_vars['error'];
 			if ( 404 === $status ) {
-				if ( ! is_user_logged_in() )
-					$headers = array_merge($headers, wp_get_nocache_headers());
-				$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+				if ( ! is_user_logged_in() ) {
+					$headers = array_merge( $headers, wp_get_nocache_headers() );
+				}
+				$headers['Content-Type'] = get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' );
 			} elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
 				$exit_required = true;
 			}
 		} elseif ( empty( $this->query_vars['feed'] ) ) {
-			$headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
+			$headers['Content-Type'] = get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' );
 		} else {
 			// Set the correct content type for feeds
 			$type = $this->query_vars['feed'];
@@ -432,26 +446,28 @@ class WP {
 
 			$wp_last_modified .= ' GMT';
 
-			$wp_etag = '"' . md5($wp_last_modified) . '"';
+			$wp_etag                  = '"' . md5( $wp_last_modified ) . '"';
 			$headers['Last-Modified'] = $wp_last_modified;
-			$headers['ETag'] = $wp_etag;
+			$headers['ETag']          = $wp_etag;
 
 			// Support for Conditional GET
-			if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
+			if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ) {
 				$client_etag = wp_unslash( $_SERVER['HTTP_IF_NONE_MATCH'] );
-			else $client_etag = false;
+			} else {
+				$client_etag = false;
+			}
 
-			$client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
+			$client_last_modified = empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ? '' : trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 			// If string is empty, return 0. If not, attempt to parse into a timestamp
-			$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
+			$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
 
 			// Make a timestamp for our most recent modification...
-			$wp_modified_timestamp = strtotime($wp_last_modified);
+			$wp_modified_timestamp = strtotime( $wp_last_modified );
 
-			if ( ($client_last_modified && $client_etag) ?
-					(($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
-					(($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
-				$status = 304;
+			if ( ( $client_last_modified && $client_etag ) ?
+					( ( $client_modified_timestamp >= $wp_modified_timestamp ) && ( $client_etag == $wp_etag ) ) :
+					( ( $client_modified_timestamp >= $wp_modified_timestamp ) || ( $client_etag == $wp_etag ) ) ) {
+				$status        = 304;
 				$exit_required = true;
 			}
 		}
@@ -466,8 +482,9 @@ class WP {
 		 */
 		$headers = apply_filters( 'wp_headers', $headers, $this );
 
-		if ( ! empty( $status ) )
+		if ( ! empty( $status ) ) {
 			status_header( $status );
+		}
 
 		// If Last-Modified is set to false, it should not be sent (no-cache situation).
 		if ( isset( $headers['Last-Modified'] ) && false === $headers['Last-Modified'] ) {
@@ -488,11 +505,13 @@ class WP {
 			}
 		}
 
-		foreach ( (array) $headers as $name => $field_value )
-			@header("{$name}: {$field_value}");
+		foreach ( (array) $headers as $name => $field_value ) {
+			@header( "{$name}: {$field_value}" );
+		}
 
-		if ( $exit_required )
+		if ( $exit_required ) {
 			exit();
+		}
 
 		/**
 		 * Fires once the requested HTTP headers for caching, content type, etc. have been sent.
@@ -514,12 +533,13 @@ class WP {
 	 */
 	public function build_query_string() {
 		$this->query_string = '';
-		foreach ( (array) array_keys($this->query_vars) as $wpvar) {
-			if ( '' != $this->query_vars[$wpvar] ) {
-				$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-				if ( !is_scalar($this->query_vars[$wpvar]) ) // Discard non-scalars.
+		foreach ( (array) array_keys( $this->query_vars ) as $wpvar ) {
+			if ( '' != $this->query_vars[ $wpvar ] ) {
+				$this->query_string .= ( strlen( $this->query_string ) < 1 ) ? '' : '&';
+				if ( ! is_scalar( $this->query_vars[ $wpvar ] ) ) { // Discard non-scalars.
 					continue;
-				$this->query_string .= $wpvar . '=' . rawurlencode($this->query_vars[$wpvar]);
+				}
+				$this->query_string .= $wpvar . '=' . rawurlencode( $this->query_vars[ $wpvar ] );
 			}
 		}
 
@@ -533,7 +553,7 @@ class WP {
 			 * @param string $query_string The query string to modify.
 			 */
 			$this->query_string = apply_filters( 'query_string', $this->query_string );
-			parse_str($this->query_string, $this->query_vars);
+			parse_str( $this->query_string, $this->query_vars );
 		}
 	}
 
@@ -564,17 +584,18 @@ class WP {
 		}
 
 		$GLOBALS['query_string'] = $this->query_string;
-		$GLOBALS['posts'] = & $wp_query->posts;
-		$GLOBALS['post'] = isset( $wp_query->post ) ? $wp_query->post : null;
-		$GLOBALS['request'] = $wp_query->request;
+		$GLOBALS['posts']        = & $wp_query->posts;
+		$GLOBALS['post']         = isset( $wp_query->post ) ? $wp_query->post : null;
+		$GLOBALS['request']      = $wp_query->request;
 
 		if ( $wp_query->is_single() || $wp_query->is_page() ) {
 			$GLOBALS['more']   = 1;
 			$GLOBALS['single'] = 1;
 		}
 
-		if ( $wp_query->is_author() && isset( $wp_query->post ) )
+		if ( $wp_query->is_author() && isset( $wp_query->post ) ) {
 			$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
+		}
 	}
 
 	/**
@@ -596,10 +617,10 @@ class WP {
 	public function query_posts() {
 		global $wp_the_query;
 		$this->build_query_string();
-		$wp_the_query->query($this->query_vars);
- 	}
+		$wp_the_query->query( $this->query_vars );
+	}
 
- 	/**
+	/**
 	 * Set the Headers for 404, if nothing is found for requested URL.
 	 *
 	 * Issue a 404 if a request doesn't match any posts and doesn't match
@@ -613,9 +634,9 @@ class WP {
 	 * a 404 so that canonical redirection logic can kick in.
 	 *
 	 * @since 2.0.0
-     *
+	 *
 	 * @global WP_Query $wp_query
- 	 */
+	 */
 	public function handle_404() {
 		global $wp_query;
 
@@ -635,8 +656,9 @@ class WP {
 		}
 
 		// If we've already issued a 404, bail.
-		if ( is_404() )
+		if ( is_404() ) {
 			return;
+		}
 
 		// Never 404 for the admin, robots, or if we found posts.
 		if ( is_admin() || is_robots() || $wp_query->posts ) {
@@ -657,7 +679,7 @@ class WP {
 				// check for paged content that exceeds the max number of pages
 				$next = '<!--nextpage-->';
 				if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
-					$page = trim( $this->query_vars['page'], '/' );
+					$page    = trim( $this->query_vars['page'], '/' );
 					$success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
 				}
 			}
@@ -708,9 +730,9 @@ class WP {
 	 *
 	 * @param string|array $query_args Passed to parse_request().
 	 */
-	public function main($query_args = '') {
+	public function main( $query_args = '' ) {
 		$this->init();
-		$this->parse_request($query_args);
+		$this->parse_request( $query_args );
 		$this->send_headers();
 		$this->query_posts();
 		$this->handle_404();
diff --git a/wp-includes/class.wp-dependencies.php b/wp-includes/class.wp-dependencies.php
index ba6425836e..716fa0c230 100644
--- a/wp-includes/class.wp-dependencies.php
+++ b/wp-includes/class.wp-dependencies.php
@@ -96,17 +96,18 @@ class WP_Dependencies {
 		$this->all_deps( $handles );
 
 		foreach ( $this->to_do as $key => $handle ) {
-			if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
+			if ( ! in_array( $handle, $this->done, true ) && isset( $this->registered[ $handle ] ) ) {
 				/*
 				 * Attempt to process the item. If successful,
 				 * add the handle to the done array.
 				 *
 				 * Unset the item from the to_do array.
 				 */
-				if ( $this->do_item( $handle, $group ) )
+				if ( $this->do_item( $handle, $group ) ) {
 					$this->done[] = $handle;
+				}
 
-				unset( $this->to_do[$key] );
+				unset( $this->to_do[ $key ] );
 			}
 		}
 
@@ -122,7 +123,7 @@ class WP_Dependencies {
 	 * @return bool True on success, false if not set.
 	 */
 	public function do_item( $handle ) {
-		return isset($this->registered[$handle]);
+		return isset( $this->registered[ $handle ] );
 	}
 
 	/**
@@ -141,43 +142,50 @@ class WP_Dependencies {
 	 * @return bool True on success, false on failure.
 	 */
 	public function all_deps( $handles, $recursion = false, $group = false ) {
-		if ( !$handles = (array) $handles )
+		if ( ! $handles = (array) $handles ) {
 			return false;
+		}
 
 		foreach ( $handles as $handle ) {
-			$handle_parts = explode('?', $handle);
-			$handle = $handle_parts[0];
-			$queued = in_array($handle, $this->to_do, true);
+			$handle_parts = explode( '?', $handle );
+			$handle       = $handle_parts[0];
+			$queued       = in_array( $handle, $this->to_do, true );
 
-			if ( in_array($handle, $this->done, true) ) // Already done
+			if ( in_array( $handle, $this->done, true ) ) { // Already done
 				continue;
+			}
 
 			$moved     = $this->set_group( $handle, $recursion, $group );
 			$new_group = $this->groups[ $handle ];
 
-			if ( $queued && !$moved ) // already queued and in the right group
+			if ( $queued && ! $moved ) { // already queued and in the right group
 				continue;
-
-			$keep_going = true;
-			if ( !isset($this->registered[$handle]) )
-				$keep_going = false; // Item doesn't exist.
-			elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
-				$keep_going = false; // Item requires dependencies that don't exist.
-			elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $new_group ) )
-				$keep_going = false; // Item requires dependencies that don't exist.
-
-			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
-				if ( $recursion )
-					return false; // Abort this branch.
-				else
-					continue; // We're at the top level. Move on to the next one.
 			}
 
-			if ( $queued ) // Already grabbed it and its dependencies.
-				continue;
+			$keep_going = true;
+			if ( ! isset( $this->registered[ $handle ] ) ) {
+				$keep_going = false; // Item doesn't exist.
+			} elseif ( $this->registered[ $handle ]->deps && array_diff( $this->registered[ $handle ]->deps, array_keys( $this->registered ) ) ) {
+				$keep_going = false; // Item requires dependencies that don't exist.
+			} elseif ( $this->registered[ $handle ]->deps && ! $this->all_deps( $this->registered[ $handle ]->deps, true, $new_group ) ) {
+				$keep_going = false; // Item requires dependencies that don't exist.
+			}
 
-			if ( isset($handle_parts[1]) )
-				$this->args[$handle] = $handle_parts[1];
+			if ( ! $keep_going ) { // Either item or its dependencies don't exist.
+				if ( $recursion ) {
+					return false; // Abort this branch.
+				} else {
+					continue; // We're at the top level. Move on to the next one.
+				}
+			}
+
+			if ( $queued ) { // Already grabbed it and its dependencies.
+				continue;
+			}
+
+			if ( isset( $handle_parts[1] ) ) {
+				$this->args[ $handle ] = $handle_parts[1];
+			}
 
 			$this->to_do[] = $handle;
 		}
@@ -204,9 +212,10 @@ class WP_Dependencies {
 	 * @return bool Whether the item has been registered. True on success, false on failure.
 	 */
 	public function add( $handle, $src, $deps = array(), $ver = false, $args = null ) {
-		if ( isset($this->registered[$handle]) )
+		if ( isset( $this->registered[ $handle ] ) ) {
 			return false;
-		$this->registered[$handle] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
+		}
+		$this->registered[ $handle ] = new _WP_Dependency( $handle, $src, $deps, $ver, $args );
 		return true;
 	}
 
@@ -223,10 +232,11 @@ class WP_Dependencies {
 	 * @return bool True on success, false on failure.
 	 */
 	public function add_data( $handle, $key, $value ) {
-		if ( !isset( $this->registered[$handle] ) )
+		if ( ! isset( $this->registered[ $handle ] ) ) {
 			return false;
+		}
 
-		return $this->registered[$handle]->add_data( $key, $value );
+		return $this->registered[ $handle ]->add_data( $key, $value );
 	}
 
 	/**
@@ -241,13 +251,15 @@ class WP_Dependencies {
 	 * @return mixed Extra item data (string), false otherwise.
 	 */
 	public function get_data( $handle, $key ) {
-		if ( !isset( $this->registered[$handle] ) )
+		if ( ! isset( $this->registered[ $handle ] ) ) {
 			return false;
+		}
 
-		if ( !isset( $this->registered[$handle]->extra[$key] ) )
+		if ( ! isset( $this->registered[ $handle ]->extra[ $key ] ) ) {
 			return false;
+		}
 
-		return $this->registered[$handle]->extra[$key];
+		return $this->registered[ $handle ]->extra[ $key ];
 	}
 
 	/**
@@ -260,8 +272,9 @@ class WP_Dependencies {
 	 * @return void
 	 */
 	public function remove( $handles ) {
-		foreach ( (array) $handles as $handle )
-			unset($this->registered[$handle]);
+		foreach ( (array) $handles as $handle ) {
+			unset( $this->registered[ $handle ] );
+		}
 	}
 
 	/**
@@ -279,11 +292,12 @@ class WP_Dependencies {
 	 */
 	public function enqueue( $handles ) {
 		foreach ( (array) $handles as $handle ) {
-			$handle = explode('?', $handle);
-			if ( !in_array($handle[0], $this->queue) && isset($this->registered[$handle[0]]) ) {
+			$handle = explode( '?', $handle );
+			if ( ! in_array( $handle[0], $this->queue ) && isset( $this->registered[ $handle[0] ] ) ) {
 				$this->queue[] = $handle[0];
-				if ( isset($handle[1]) )
-					$this->args[$handle[0]] = $handle[1];
+				if ( isset( $handle[1] ) ) {
+					$this->args[ $handle[0] ] = $handle[1];
+				}
 			}
 		}
 	}
@@ -301,11 +315,11 @@ class WP_Dependencies {
 	 */
 	public function dequeue( $handles ) {
 		foreach ( (array) $handles as $handle ) {
-			$handle = explode('?', $handle);
-			$key = array_search($handle[0], $this->queue);
+			$handle = explode( '?', $handle );
+			$key    = array_search( $handle[0], $this->queue );
 			if ( false !== $key ) {
-				unset($this->queue[$key]);
-				unset($this->args[$handle[0]]);
+				unset( $this->queue[ $key ] );
+				unset( $this->args[ $handle[0] ] );
 			}
 		}
 	}
@@ -347,24 +361,25 @@ class WP_Dependencies {
 	 */
 	public function query( $handle, $list = 'registered' ) {
 		switch ( $list ) {
-			case 'registered' :
+			case 'registered':
 			case 'scripts': // back compat
-				if ( isset( $this->registered[ $handle ] ) )
+				if ( isset( $this->registered[ $handle ] ) ) {
 					return $this->registered[ $handle ];
+				}
 				return false;
 
-			case 'enqueued' :
-			case 'queue' :
+			case 'enqueued':
+			case 'queue':
 				if ( in_array( $handle, $this->queue ) ) {
 					return true;
 				}
 				return $this->recurse_deps( $this->queue, $handle );
 
-			case 'to_do' :
+			case 'to_do':
 			case 'to_print': // back compat
 				return in_array( $handle, $this->to_do );
 
-			case 'done' :
+			case 'done':
 			case 'printed': // back compat
 				return in_array( $handle, $this->done );
 		}
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index a9299f0b91..42422d3db4 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -145,7 +145,7 @@ class WP_Scripts extends WP_Dependencies {
 		 *
 		 * @param WP_Scripts $this WP_Scripts instance (passed by reference).
 		 */
-		do_action_ref_array( 'wp_default_scripts', array(&$this) );
+		do_action_ref_array( 'wp_default_scripts', array( &$this ) );
 	}
 
 	/**
@@ -196,11 +196,13 @@ class WP_Scripts extends WP_Dependencies {
 	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true, true otherwise.
 	 */
 	public function print_extra_script( $handle, $echo = true ) {
-		if ( !$output = $this->get_data( $handle, 'data' ) )
+		if ( ! $output = $this->get_data( $handle, 'data' ) ) {
 			return;
+		}
 
-		if ( !$echo )
+		if ( ! $echo ) {
 			return $output;
+		}
 
 		echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5
 		echo "/* <![CDATA[ */\n";
@@ -224,18 +226,20 @@ class WP_Scripts extends WP_Dependencies {
 	 * @return bool True on success, false on failure.
 	 */
 	public function do_item( $handle, $group = false ) {
-		if ( !parent::do_item($handle) )
+		if ( ! parent::do_item( $handle ) ) {
 			return false;
+		}
 
-		if ( 0 === $group && $this->groups[$handle] > 0 ) {
+		if ( 0 === $group && $this->groups[ $handle ] > 0 ) {
 			$this->in_footer[] = $handle;
 			return false;
 		}
 
-		if ( false === $group && in_array($handle, $this->in_footer, true) )
+		if ( false === $group && in_array( $handle, $this->in_footer, true ) ) {
 			$this->in_footer = array_diff( $this->in_footer, (array) $handle );
+		}
 
-		$obj = $this->registered[$handle];
+		$obj = $this->registered[ $handle ];
 
 		if ( null === $obj->ver ) {
 			$ver = '';
@@ -243,20 +247,21 @@ class WP_Scripts extends WP_Dependencies {
 			$ver = $obj->ver ? $obj->ver : $this->default_version;
 		}
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&amp;' . $this->args[$handle] : $this->args[$handle];
+		if ( isset( $this->args[ $handle ] ) ) {
+			$ver = $ver ? $ver . '&amp;' . $this->args[ $handle ] : $this->args[ $handle ];
+		}
 
-		$src = $obj->src;
+		$src         = $obj->src;
 		$cond_before = $cond_after = '';
 		$conditional = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
 
 		if ( $conditional ) {
 			$cond_before = "<!--[if {$conditional}]>\n";
-			$cond_after = "<![endif]-->\n";
+			$cond_after  = "<![endif]-->\n";
 		}
 
 		$before_handle = $this->print_inline_script( $handle, 'before', false );
-		$after_handle = $this->print_inline_script( $handle, 'after', false );
+		$after_handle  = $this->print_inline_script( $handle, 'after', false );
 
 		if ( $before_handle ) {
 			$before_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $before_handle );
@@ -284,8 +289,8 @@ class WP_Scripts extends WP_Dependencies {
 				_print_scripts();
 				$this->reset();
 			} elseif ( $this->in_default_dir( $srce ) && ! $conditional ) {
-				$this->print_code .= $this->print_extra_script( $handle, false );
-				$this->concat .= "$handle,";
+				$this->print_code     .= $this->print_extra_script( $handle, false );
+				$this->concat         .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 				return true;
 			} else {
@@ -315,14 +320,16 @@ class WP_Scripts extends WP_Dependencies {
 			$src = $this->base_url . $src;
 		}
 
-		if ( ! empty( $ver ) )
+		if ( ! empty( $ver ) ) {
 			$src = add_query_arg( 'ver', $ver, $src );
+		}
 
 		/** This filter is documented in wp-includes/class.wp-scripts.php */
 		$src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
 
-		if ( ! $src )
+		if ( ! $src ) {
 			return true;
+		}
 
 		$tag = "{$cond_before}{$before_handle}<script type='text/javascript' src='$src'></script>\n{$after_handle}{$cond_after}";
 
@@ -411,30 +418,34 @@ class WP_Scripts extends WP_Dependencies {
 	 * @return bool
 	 */
 	public function localize( $handle, $object_name, $l10n ) {
-		if ( $handle === 'jquery' )
+		if ( $handle === 'jquery' ) {
 			$handle = 'jquery-core';
+		}
 
-		if ( is_array($l10n) && isset($l10n['l10n_print_after']) ) { // back compat, preserve the code in 'l10n_print_after' if present
+		if ( is_array( $l10n ) && isset( $l10n['l10n_print_after'] ) ) { // back compat, preserve the code in 'l10n_print_after' if present
 			$after = $l10n['l10n_print_after'];
-			unset($l10n['l10n_print_after']);
+			unset( $l10n['l10n_print_after'] );
 		}
 
 		foreach ( (array) $l10n as $key => $value ) {
-			if ( !is_scalar($value) )
+			if ( ! is_scalar( $value ) ) {
 				continue;
+			}
 
-			$l10n[$key] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8');
+			$l10n[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
 		}
 
 		$script = "var $object_name = " . wp_json_encode( $l10n ) . ';';
 
-		if ( !empty($after) )
+		if ( ! empty( $after ) ) {
 			$script .= "\n$after;";
+		}
 
 		$data = $this->get_data( $handle, 'data' );
 
-		if ( !empty( $data ) )
+		if ( ! empty( $data ) ) {
 			$script = "$data\n$script";
+		}
 
 		return $this->add_data( $handle, 'data', $script );
 	}
@@ -452,20 +463,22 @@ class WP_Scripts extends WP_Dependencies {
 	 * @return bool Not already in the group or a lower group
 	 */
 	public function set_group( $handle, $recursion, $group = false ) {
-		if ( isset( $this->registered[$handle]->args ) && $this->registered[$handle]->args === 1 )
+		if ( isset( $this->registered[ $handle ]->args ) && $this->registered[ $handle ]->args === 1 ) {
 			$grp = 1;
-		else
+		} else {
 			$grp = (int) $this->get_data( $handle, 'group' );
+		}
 
-		if ( false !== $group && $grp > $group )
+		if ( false !== $group && $grp > $group ) {
 			$grp = $group;
+		}
 
 		return parent::set_group( $handle, $recursion, $grp );
 	}
 
 	/**
 	 * Determines script dependencies.
-     *
+	 *
 	 * @since 2.1.0
 	 *
 	 * @see WP_Dependencies::all_deps()
@@ -500,7 +513,7 @@ class WP_Scripts extends WP_Dependencies {
 	 * @return array Handles of items that have been processed.
 	 */
 	public function do_head_items() {
-		$this->do_items(false, 0);
+		$this->do_items( false, 0 );
 		return $this->done;
 	}
 
@@ -514,7 +527,7 @@ class WP_Scripts extends WP_Dependencies {
 	 * @return array Handles of items that have been processed.
 	 */
 	public function do_footer_items() {
-		$this->do_items(false, 1);
+		$this->do_items( false, 1 );
 		return $this->done;
 	}
 
@@ -549,12 +562,12 @@ class WP_Scripts extends WP_Dependencies {
 	 * @since 2.8.0
 	 */
 	public function reset() {
-		$this->do_concat = false;
-		$this->print_code = '';
-		$this->concat = '';
+		$this->do_concat      = false;
+		$this->print_code     = '';
+		$this->concat         = '';
 		$this->concat_version = '';
-		$this->print_html = '';
-		$this->ext_version = '';
-		$this->ext_handles = '';
+		$this->print_html     = '';
+		$this->ext_version    = '';
+		$this->ext_handles    = '';
 	}
 }
diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php
index 93e008af43..fed69962bc 100644
--- a/wp-includes/class.wp-styles.php
+++ b/wp-includes/class.wp-styles.php
@@ -113,7 +113,7 @@ class WP_Styles extends WP_Dependencies {
 		 *
 		 * @param WP_Styles $this WP_Styles instance (passed by reference).
 		 */
-		do_action_ref_array( 'wp_default_styles', array(&$this) );
+		do_action_ref_array( 'wp_default_styles', array( &$this ) );
 	}
 
 	/**
@@ -127,21 +127,24 @@ class WP_Styles extends WP_Dependencies {
 	 * @return bool True on success, false on failure.
 	 */
 	public function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
+		if ( ! parent::do_item( $handle ) ) {
 			return false;
+		}
 
-		$obj = $this->registered[$handle];
-		if ( null === $obj->ver )
+		$obj = $this->registered[ $handle ];
+		if ( null === $obj->ver ) {
 			$ver = '';
-		else
+		} else {
 			$ver = $obj->ver ? $obj->ver : $this->default_version;
+		}
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&amp;' . $this->args[$handle] : $this->args[$handle];
+		if ( isset( $this->args[ $handle ] ) ) {
+			$ver = $ver ? $ver . '&amp;' . $this->args[ $handle ] : $this->args[ $handle ];
+		}
 
 		if ( $this->do_concat ) {
-			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
-				$this->concat .= "$handle,";
+			if ( $this->in_default_dir( $obj->src ) && ! isset( $obj->extra['conditional'] ) && ! isset( $obj->extra['alt'] ) ) {
+				$this->concat         .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 
 				$this->print_code .= $this->print_inline_style( $handle, false );
@@ -150,10 +153,11 @@ class WP_Styles extends WP_Dependencies {
 			}
 		}
 
-		if ( isset($obj->args) )
+		if ( isset( $obj->args ) ) {
 			$media = esc_attr( $obj->args );
-		else
+		} else {
 			$media = 'all';
+		}
 
 		// A single item may alias a set of items, by having dependencies, but no source.
 		if ( ! $obj->src ) {
@@ -173,8 +177,8 @@ class WP_Styles extends WP_Dependencies {
 			return true;
 		}
 
-		$rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
-		$title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
+		$rel   = isset( $obj->extra['alt'] ) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
+		$title = isset( $obj->extra['title'] ) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
 
 		/**
 		 * Filters the HTML link tag of an enqueued style.
@@ -188,11 +192,11 @@ class WP_Styles extends WP_Dependencies {
 		 * @param string $href   The stylesheet's source URL.
 		 * @param string $media  The stylesheet's media attribute.
 		 */
-		$tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href, $media);
-		if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
+		$tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href, $media );
+		if ( 'rtl' === $this->text_direction && isset( $obj->extra['rtl'] ) && $obj->extra['rtl'] ) {
 			if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
-				$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
-				$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
+				$suffix   = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
+				$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src, $ver, "$handle-rtl" ) );
 			} else {
 				$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
 			}
@@ -320,12 +324,13 @@ class WP_Styles extends WP_Dependencies {
 	 * @return string Style's fully-qualified URL.
 	 */
 	public function _css_href( $src, $ver, $handle ) {
-		if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+		if ( ! is_bool( $src ) && ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
 			$src = $this->base_url . $src;
 		}
 
-		if ( !empty($ver) )
-			$src = add_query_arg('ver', $ver, $src);
+		if ( ! empty( $ver ) ) {
+			$src = add_query_arg( 'ver', $ver, $src );
+		}
 
 		/**
 		 * Filters an enqueued style's fully-qualified URL.
@@ -348,12 +353,14 @@ class WP_Styles extends WP_Dependencies {
 	 * @return bool True if found, false if not.
 	 */
 	public function in_default_dir( $src ) {
-		if ( ! $this->default_dirs )
+		if ( ! $this->default_dirs ) {
 			return true;
+		}
 
 		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
+			if ( 0 === strpos( $src, $test ) ) {
 				return true;
+			}
 		}
 		return false;
 	}
@@ -370,7 +377,7 @@ class WP_Styles extends WP_Dependencies {
 	 * @return array Handles of items that have been processed.
 	 */
 	public function do_footer_items() {
-		$this->do_items(false, 1);
+		$this->do_items( false, 1 );
 		return $this->done;
 	}
 
@@ -380,9 +387,9 @@ class WP_Styles extends WP_Dependencies {
 	 * @since 3.3.0
 	 */
 	public function reset() {
-		$this->do_concat = false;
-		$this->concat = '';
+		$this->do_concat      = false;
+		$this->concat         = '';
 		$this->concat_version = '';
-		$this->print_html = '';
+		$this->print_html     = '';
 	}
 }
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index fe21169796..0f8f7a39c8 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -18,17 +18,18 @@
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
- *									 Default current comment.
+ *                                   Default current comment.
  * @return string The comment author
  */
 function get_comment_author( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
 
 	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
+		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) ) {
 			$author = $user->display_name;
-		else
-			$author = __('Anonymous');
+		} else {
+			$author = __( 'Anonymous' );
+		}
 	} else {
 		$author = $comment->comment_author;
 	}
@@ -53,7 +54,7 @@ function get_comment_author( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
- *									 Default current comment.
+ *                                   Default current comment.
  */
 function comment_author( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
@@ -78,7 +79,7 @@ function comment_author( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
- *									 Default current comment.
+ *                                   Default current comment.
  * @return string The current comment author's email
  */
 function get_comment_author_email( $comment_ID = 0 ) {
@@ -110,7 +111,7 @@ function get_comment_author_email( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
- *									 Default current comment.
+ *                                   Default current comment.
  */
 function comment_author_email( $comment_ID = 0 ) {
 	$comment      = get_comment( $comment_ID );
@@ -189,11 +190,11 @@ function get_comment_author_email_link( $linktext = '', $before = '', $after = '
 	 */
 	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
 
-	if ((!empty($email)) && ($email != '@')) {
-	$display = ($linktext != '') ? $linktext : $email;
+	if ( ( ! empty( $email ) ) && ( $email != '@' ) ) {
+		$display = ( $linktext != '' ) ? $linktext : $email;
 		$return  = $before;
 		$return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
-	 	$return .= $after;
+		$return .= $after;
 		return $return;
 	} else {
 		return '';
@@ -210,7 +211,7 @@ function get_comment_author_email_link( $linktext = '', $before = '', $after = '
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
- *									 Default current comment.
+ *                                   Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
 function get_comment_author_link( $comment_ID = 0 ) {
@@ -218,10 +219,11 @@ function get_comment_author_link( $comment_ID = 0 ) {
 	$url     = get_comment_author_url( $comment );
 	$author  = get_comment_author( $comment );
 
-	if ( empty( $url ) || 'http://' == $url )
+	if ( empty( $url ) || 'http://' == $url ) {
 		$return = $author;
-	else
+	} else {
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	}
 
 	/**
 	 * Filters the comment author's link for display.
@@ -244,7 +246,7 @@ function get_comment_author_link( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
- *									 Default current comment.
+ *                                   Default current comment.
  */
 function comment_author_link( $comment_ID = 0 ) {
 	echo get_comment_author_link( $comment_ID );
@@ -257,7 +259,7 @@ function comment_author_link( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
- *									 Default current comment.
+ *                                   Default current comment.
  * @return string Comment author's IP address.
  */
 function get_comment_author_IP( $comment_ID = 0 ) {
@@ -283,7 +285,7 @@ function get_comment_author_IP( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
- *									 Default current comment.
+ *                                   Default current comment.
  */
 function comment_author_IP( $comment_ID = 0 ) {
 	echo esc_html( get_comment_author_IP( $comment_ID ) );
@@ -296,17 +298,17 @@ function comment_author_IP( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
- *									 Default current comment.
+ *                                   Default current comment.
  * @return string Comment author URL.
  */
 function get_comment_author_url( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	$url = '';
-	$id = 0;
+	$url     = '';
+	$id      = 0;
 	if ( ! empty( $comment ) ) {
 		$author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
-		$url = esc_url( $author_url, array( 'http', 'https' ) );
-		$id = $comment->comment_ID;
+		$url        = esc_url( $author_url, array( 'http', 'https' ) );
+		$id         = $comment->comment_ID;
 	}
 
 	/**
@@ -329,7 +331,7 @@ function get_comment_author_url( $comment_ID = 0 ) {
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
- *									 Default current comment.
+ *                                   Default current comment.
  */
 function comment_author_url( $comment_ID = 0 ) {
 	$comment    = get_comment( $comment_ID );
@@ -371,13 +373,13 @@ function comment_author_url( $comment_ID = 0 ) {
  * @return string The HTML link between the $before and $after parameters.
  */
 function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	$url = get_comment_author_url( $comment );
-	$display = ($linktext != '') ? $linktext : $url;
+	$url     = get_comment_author_url( $comment );
+	$display = ( $linktext != '' ) ? $linktext : $url;
 	$display = str_replace( 'http://www.', '', $display );
 	$display = str_replace( 'http://', '', $display );
 
-	if ( '/' == substr($display, -1) ) {
-		$display = substr($display, 0, -1);
+	if ( '/' == substr( $display, -1 ) ) {
+		$display = substr( $display, 0, -1 );
 	}
 
 	$return = "$before<a href='$url' rel='external'>$display</a>$after";
@@ -428,10 +430,11 @@ function comment_author_url_link( $linktext = '', $before = '', $after = '', $co
 function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
 	// Separates classes with a single space, collates classes for comment DIV
 	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
+	if ( $echo ) {
 		echo $class;
-	else
+	} else {
 		return $class;
+	}
 }
 
 /**
@@ -467,19 +470,22 @@ function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
 		$classes[] = 'byuser';
 		$classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
 		// For comment authors who are the author of the post
-		if ( $post = get_post($post_id) ) {
+		if ( $post = get_post( $post_id ) ) {
 			if ( $comment->user_id === $post->post_author ) {
 				$classes[] = 'bypostauthor';
 			}
 		}
 	}
 
-	if ( empty($comment_alt) )
+	if ( empty( $comment_alt ) ) {
 		$comment_alt = 0;
-	if ( empty($comment_depth) )
+	}
+	if ( empty( $comment_depth ) ) {
 		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
+	}
+	if ( empty( $comment_thread_alt ) ) {
 		$comment_thread_alt = 0;
+	}
 
 	if ( $comment_alt % 2 ) {
 		$classes[] = 'odd';
@@ -503,13 +509,14 @@ function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
 
 	$classes[] = "depth-$comment_depth";
 
-	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split('#\s+#', $class);
-		$classes = array_merge($classes, $class);
+	if ( ! empty( $class ) ) {
+		if ( ! is_array( $class ) ) {
+			$class = preg_split( '#\s+#', $class );
+		}
+		$classes = array_merge( $classes, $class );
 	}
 
-	$classes = array_map('esc_attr', $classes);
+	$classes = array_map( 'esc_attr', $classes );
 
 	/**
 	 * Filters the returned CSS classes for the current comment.
@@ -538,10 +545,11 @@ function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
  */
 function get_comment_date( $d = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
-		$date = mysql2date(get_option('date_format'), $comment->comment_date);
-	else
-		$date = mysql2date($d, $comment->comment_date);
+	if ( '' == $d ) {
+		$date = mysql2date( get_option( 'date_format' ), $comment->comment_date );
+	} else {
+		$date = mysql2date( $d, $comment->comment_date );
+	}
 	/**
 	 * Filters the returned comment date.
 	 *
@@ -583,9 +591,9 @@ function comment_date( $d = '', $comment_ID = 0 ) {
  * @return string The maybe truncated comment with 20 words or less.
  */
 function get_comment_excerpt( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+	$comment      = get_comment( $comment_ID );
 	$comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
-	$words = explode( ' ', $comment_text );
+	$words        = explode( ' ', $comment_text );
 
 	/**
 	 * Filters the amount of words used in the comment excerpt.
@@ -702,7 +710,7 @@ function comment_ID() {
 function get_comment_link( $comment = null, $args = array() ) {
 	global $wp_rewrite, $in_comment_loop;
 
-	$comment = get_comment($comment);
+	$comment = get_comment( $comment );
 
 	// Back-compat.
 	if ( ! is_array( $args ) ) {
@@ -716,7 +724,7 @@ function get_comment_link( $comment = null, $args = array() ) {
 		'max_depth' => '',
 		'cpage'     => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 
 	$link = get_permalink( $comment->comment_post_ID );
 
@@ -724,15 +732,15 @@ function get_comment_link( $comment = null, $args = array() ) {
 	if ( ! is_null( $args['cpage'] ) ) {
 		$cpage = $args['cpage'];
 
-	// No 'cpage' is provided, so we calculate one.
+		// No 'cpage' is provided, so we calculate one.
 	} else {
 		if ( '' === $args['per_page'] && get_option( 'page_comments' ) ) {
-			$args['per_page'] = get_option('comments_per_page');
+			$args['per_page'] = get_option( 'comments_per_page' );
 		}
 
 		if ( empty( $args['per_page'] ) ) {
 			$args['per_page'] = 0;
-			$args['page'] = 0;
+			$args['page']     = 0;
 		}
 
 		$cpage = $args['page'];
@@ -765,7 +773,6 @@ function get_comment_link( $comment = null, $args = array() ) {
 		} elseif ( $cpage ) {
 			$link = add_query_arg( 'cpage', $cpage, $link );
 		}
-
 	}
 
 	if ( $wp_rewrite->using_permalinks() ) {
@@ -799,7 +806,7 @@ function get_comment_link( $comment = null, $args = array() ) {
  * @return string The link to the comments.
  */
 function get_comments_link( $post_id = 0 ) {
-	$hash = get_comments_number( $post_id ) ? '#comments' : '#respond';
+	$hash          = get_comments_number( $post_id ) ? '#comments' : '#respond';
 	$comments_link = get_permalink( $post_id ) . $hash;
 
 	/**
@@ -822,10 +829,12 @@ function get_comments_link( $post_id = 0 ) {
  * @param string $deprecated_2 Not Used.
  */
 function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
+	}
+	if ( ! empty( $deprecated_2 ) ) {
 		_deprecated_argument( __FUNCTION__, '1.3.0' );
+	}
 	echo esc_url( get_comments_link() );
 }
 
@@ -844,7 +853,7 @@ function get_comments_number( $post_id = 0 ) {
 	if ( ! $post ) {
 		$count = 0;
 	} else {
-		$count = $post->comment_count;
+		$count   = $post->comment_count;
 		$post_id = $post->ID;
 	}
 
@@ -1011,10 +1020,11 @@ function get_comment_time( $d = '', $gmt = false, $translate = true ) {
 	$comment = get_comment();
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
-		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
-	else
-		$date = mysql2date($d, $comment_date, $translate);
+	if ( '' == $d ) {
+		$date = mysql2date( get_option( 'time_format' ), $comment_date, $translate );
+	} else {
+		$date = mysql2date( $d, $comment_date, $translate );
+	}
 
 	/**
 	 * Filters the returned comment time.
@@ -1038,7 +1048,7 @@ function get_comment_time( $d = '', $gmt = false, $translate = true ) {
  * @param string $d Optional. The format of the time. Default user's settings.
  */
 function comment_time( $d = '' ) {
-	echo get_comment_time($d);
+	echo get_comment_time( $d );
 }
 
 /**
@@ -1053,8 +1063,9 @@ function comment_time( $d = '' ) {
  */
 function get_comment_type( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
+	if ( '' == $comment->comment_type ) {
 		$comment->comment_type = 'comment';
+	}
 
 	/**
 	 * Filters the returned comment type.
@@ -1063,7 +1074,7 @@ function get_comment_type( $comment_ID = 0 ) {
 	 * @since 4.1.0 The `$comment_ID` and `$comment` parameters were added.
 	 *
 	 * @param string     $comment_type The type of comment, such as 'comment', 'pingback', or 'trackback'.
-	 * @param int 	     $comment_ID   The comment ID.
+	 * @param int        $comment_ID   The comment ID.
 	 * @param WP_Comment $comment      The comment object.
 	 */
 	return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
@@ -1079,18 +1090,24 @@ function get_comment_type( $comment_ID = 0 ) {
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
 function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	if ( false === $commenttxt ) {
+		$commenttxt = _x( 'Comment', 'noun' );
+	}
+	if ( false === $trackbacktxt ) {
+		$trackbacktxt = __( 'Trackback' );
+	}
+	if ( false === $pingbacktxt ) {
+		$pingbacktxt = __( 'Pingback' );
+	}
 	$type = get_comment_type();
-	switch( $type ) {
-		case 'trackback' :
+	switch ( $type ) {
+		case 'trackback':
 			echo $trackbacktxt;
 			break;
-		case 'pingback' :
+		case 'pingback':
 			echo $pingbacktxt;
 			break;
-		default :
+		default:
 			echo $commenttxt;
 	}
 }
@@ -1107,10 +1124,11 @@ function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
-	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	if ( '' != get_option( 'permalink_structure' ) ) {
+		$tb_url = trailingslashit( get_permalink() ) . user_trailingslashit( 'trackback', 'single_trackback' );
+	} else {
+		$tb_url = get_option( 'siteurl' ) . '/wp-trackback.php?p=' . get_the_ID();
+	}
 
 	/**
 	 * Filters the returned trackback URL.
@@ -1133,9 +1151,11 @@ function get_trackback_url() {
  */
 function trackback_url( $deprecated_echo = true ) {
 	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '2.5.0',
+		_deprecated_argument(
+			__FUNCTION__, '2.5.0',
 			/* translators: %s: get_trackback_url() */
-			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+			sprintf(
+				__( 'Use %s instead if you do not want the value echoed.' ),
 				'<code>get_trackback_url()</code>'
 			)
 		);
@@ -1171,12 +1191,12 @@ function trackback_rdf( $deprecated = '' ) {
 			xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/">
 		<rdf:Description rdf:about="';
 	the_permalink();
-	echo '"'."\n";
+	echo '"' . "\n";
 	echo '    dc:identifier="';
 	the_permalink();
-	echo '"'."\n";
-	echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
-	echo '    trackback:ping="'.get_trackback_url().'"'." />\n";
+	echo '"' . "\n";
+	echo '    dc:title="' . str_replace( '--', '&#x2d;&#x2d;', wptexturize( strip_tags( get_the_title() ) ) ) . '"' . "\n";
+	echo '    trackback:ping="' . get_trackback_url() . '"' . " />\n";
 	echo '</rdf:RDF>';
 }
 
@@ -1190,10 +1210,10 @@ function trackback_rdf( $deprecated = '' ) {
  */
 function comments_open( $post_id = null ) {
 
-	$_post = get_post($post_id);
+	$_post = get_post( $post_id );
 
 	$post_id = $_post ? $_post->ID : 0;
-	$open = ( 'open' == $_post->comment_status );
+	$open    = ( 'open' == $_post->comment_status );
 
 	/**
 	 * Filters whether the current post is open for comments.
@@ -1216,10 +1236,10 @@ function comments_open( $post_id = null ) {
  */
 function pings_open( $post_id = null ) {
 
-	$_post = get_post($post_id);
+	$_post = get_post( $post_id );
 
 	$post_id = $_post ? $_post->ID : 0;
-	$open = ( 'open' == $_post->ping_status );
+	$open    = ( 'open' == $_post->ping_status );
 
 	/**
 	 * Filters whether the current post is open for pings.
@@ -1247,7 +1267,7 @@ function pings_open( $post_id = null ) {
  * @since 2.1.3
  */
 function wp_comment_form_unfiltered_html_nonce() {
-	$post = get_post();
+	$post    = get_post();
 	$post_id = $post ? $post->ID : 0;
 
 	if ( current_user_can( 'unfiltered_html' ) ) {
@@ -1294,13 +1314,15 @@ function wp_comment_form_unfiltered_html_nonce() {
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
+	if ( ! ( is_single() || is_page() || $withcomments ) || empty( $post ) ) {
 		return;
+	}
 
-	if ( empty($file) )
+	if ( empty( $file ) ) {
 		$file = '/comments.php';
+	}
 
-	$req = get_option('require_name_email');
+	$req = get_option( 'require_name_email' );
 
 	/*
 	 * Comment author information fetched from the comment cookies.
@@ -1322,18 +1344,18 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 	/*
 	 * The url of the current comment author escaped for use in attributes.
 	 */
-	$comment_author_url = esc_url($commenter['comment_author_url']);
+	$comment_author_url = esc_url( $commenter['comment_author_url'] );
 
 	$comment_args = array(
-		'orderby' => 'comment_date_gmt',
-		'order' => 'ASC',
-		'status'  => 'approve',
-		'post_id' => $post->ID,
-		'no_found_rows' => false,
+		'orderby'                   => 'comment_date_gmt',
+		'order'                     => 'ASC',
+		'status'                    => 'approve',
+		'post_id'                   => $post->ID,
+		'no_found_rows'             => false,
 		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
 	);
 
-	if ( get_option('thread_comments') ) {
+	if ( get_option( 'thread_comments' ) ) {
 		$comment_args['hierarchical'] = 'threaded';
 	} else {
 		$comment_args['hierarchical'] = false;
@@ -1353,7 +1375,7 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 		}
 
 		$comment_args['number'] = $per_page;
-		$page = (int) get_query_var( 'cpage' );
+		$page                   = (int) get_query_var( 'cpage' );
 
 		if ( $page ) {
 			$comment_args['offset'] = ( $page - 1 ) * $per_page;
@@ -1406,20 +1428,22 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 	 *     @type int          $number                    Number of comments to fetch.
 	 * }
 	 */
-	$comment_args = apply_filters( 'comments_template_query_args', $comment_args );
+	$comment_args  = apply_filters( 'comments_template_query_args', $comment_args );
 	$comment_query = new WP_Comment_Query( $comment_args );
-	$_comments = $comment_query->comments;
+	$_comments     = $comment_query->comments;
 
 	// Trees must be flattened before they're passed to the walker.
 	if ( $comment_args['hierarchical'] ) {
 		$comments_flat = array();
 		foreach ( $_comments as $_comment ) {
 			$comments_flat[]  = $_comment;
-			$comment_children = $_comment->get_children( array(
-				'format' => 'flat',
-				'status' => $comment_args['status'],
-				'orderby' => $comment_args['orderby']
-			) );
+			$comment_children = $_comment->get_children(
+				array(
+					'format'  => 'flat',
+					'status'  => $comment_args['status'],
+					'orderby' => $comment_args['orderby'],
+				)
+			);
 
 			foreach ( $comment_children as $comment_child ) {
 				$comments_flat[] = $comment_child;
@@ -1439,25 +1463,26 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 	 */
 	$wp_query->comments = apply_filters( 'comments_array', $comments_flat, $post->ID );
 
-	$comments = &$wp_query->comments;
-	$wp_query->comment_count = count($wp_query->comments);
+	$comments                        = &$wp_query->comments;
+	$wp_query->comment_count         = count( $wp_query->comments );
 	$wp_query->max_num_comment_pages = $comment_query->max_num_pages;
 
 	if ( $separate_comments ) {
-		$wp_query->comments_by_type = separate_comments($comments);
-		$comments_by_type = &$wp_query->comments_by_type;
+		$wp_query->comments_by_type = separate_comments( $comments );
+		$comments_by_type           = &$wp_query->comments_by_type;
 	} else {
 		$wp_query->comments_by_type = array();
 	}
 
 	$overridden_cpage = false;
 	if ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
-		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+		set_query_var( 'cpage', 'newest' == get_option( 'default_comments_page' ) ? get_comment_pages_count() : 1 );
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
-		define('COMMENTS_TEMPLATE', true);
+	if ( ! defined( 'COMMENTS_TEMPLATE' ) ) {
+		define( 'COMMENTS_TEMPLATE', true );
+	}
 
 	$theme_template = STYLESHEETPATH . $file;
 	/**
@@ -1468,12 +1493,13 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 	 * @param string $theme_template The path to the theme template file.
 	 */
 	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
+	if ( file_exists( $include ) ) {
 		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
+	} elseif ( file_exists( TEMPLATEPATH . $file ) ) {
 		require( TEMPLATEPATH . $file );
-	else // Backward compat code will be removed in a future release
-		require( ABSPATH . WPINC . '/theme-compat/comments.php');
+	} else { // Backward compat code will be removed in a future release
+		require( ABSPATH . WPINC . '/theme-compat/comments.php' );
+	}
 }
 
 /**
@@ -1491,8 +1517,8 @@ function comments_template( $file = '/comments.php', $separate_comments = false
  *                          Default false.
  */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-	$id = get_the_ID();
-	$title = get_the_title();
+	$id     = get_the_ID();
+	$title  = get_the_title();
 	$number = get_comments_number( $id );
 
 	if ( false === $zero ) {
@@ -1516,8 +1542,8 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 		$none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $title );
 	}
 
-	if ( 0 == $number && !comments_open() && !pings_open() ) {
-		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+	if ( 0 == $number && ! comments_open() && ! pings_open() ) {
+		echo '<span' . ( ( ! empty( $css_class ) ) ? ' class="' . esc_attr( $css_class ) . '"' : '' ) . '>' . $none . '</span>';
 		return;
 	}
 
@@ -1543,8 +1569,8 @@ function comments_popup_link( $zero = false, $one = false, $more = false, $css_c
 	}
 	echo '"';
 
-	if ( !empty( $css_class ) ) {
-		echo ' class="'.$css_class.'" ';
+	if ( ! empty( $css_class ) ) {
+		echo ' class="' . $css_class . '" ';
 	}
 
 	$attributes = '';
@@ -1601,7 +1627,7 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null
 		'max_depth'     => 0,
 		'depth'         => 0,
 		'before'        => '',
-		'after'         => ''
+		'after'         => '',
 	);
 
 	$args = wp_parse_args( $args, $defaults );
@@ -1635,17 +1661,20 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null
 	$args = apply_filters( 'comment_reply_link_args', $args, $comment, $post );
 
 	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+		$link = sprintf(
+			'<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
 			esc_url( wp_login_url( get_permalink() ) ),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
+		$onclick = sprintf(
+			'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
 			$args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
+		$link = sprintf(
+			"<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . '#' . $args['respond_id'],
 			$onclick,
 			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
 			$args['reply_text']
@@ -1678,8 +1707,8 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null
  *                             Default current post.
  * @return mixed Link to show comment form, if successful. False, if comments are closed.
  */
-function comment_reply_link($args = array(), $comment = null, $post = null) {
-	echo get_comment_reply_link($args, $comment, $post);
+function comment_reply_link( $args = array(), $comment = null, $post = null ) {
+	echo get_comment_reply_link( $args, $comment, $post );
 }
 
 /**
@@ -1705,35 +1734,38 @@ function comment_reply_link($args = array(), $comment = null, $post = null) {
  *                             Default current post.
  * @return false|null|string Link to show comment form, if successful. False, if comments are closed.
  */
-function get_post_reply_link($args = array(), $post = null) {
+function get_post_reply_link( $args = array(), $post = null ) {
 	$defaults = array(
 		'add_below'  => 'post',
 		'respond_id' => 'respond',
-		'reply_text' => __('Leave a Comment'),
-		'login_text' => __('Log in to leave a Comment'),
+		'reply_text' => __( 'Leave a Comment' ),
+		'login_text' => __( 'Log in to leave a Comment' ),
 		'before'     => '',
 		'after'      => '',
 	);
 
-	$args = wp_parse_args($args, $defaults);
+	$args = wp_parse_args( $args, $defaults );
 
-	$post = get_post($post);
+	$post = get_post( $post );
 
 	if ( ! comments_open( $post->ID ) ) {
 		return false;
 	}
 
-	if ( get_option('comment_registration') && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
+		$link = sprintf(
+			'<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
 			wp_login_url( get_permalink() ),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+		$onclick = sprintf(
+			'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
 			$args['add_below'], $post->ID, $args['respond_id']
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
+		$link = sprintf(
+			"<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
 			get_permalink( $post->ID ) . '#' . $args['respond_id'],
 			$onclick,
 			$args['reply_text']
@@ -1764,8 +1796,8 @@ function get_post_reply_link($args = array(), $post = null) {
  *                          Default current post.
  * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
  */
-function post_reply_link($args = array(), $post = null) {
-	echo get_post_reply_link($args, $post);
+function post_reply_link( $args = array(), $post = null ) {
+	echo get_post_reply_link( $args, $post );
 }
 
 /**
@@ -1777,11 +1809,12 @@ function post_reply_link($args = array(), $post = null) {
  * @return string
  */
 function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
-		$text = __('Click here to cancel reply.');
+	if ( empty( $text ) ) {
+		$text = __( 'Click here to cancel reply.' );
+	}
 
-	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
-	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+	$style = isset( $_GET['replytocom'] ) ? '' : ' style="display:none;"';
+	$link  = esc_html( remove_query_arg( 'replytocom' ) ) . '#respond';
 
 	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
 
@@ -1805,7 +1838,7 @@ function get_cancel_comment_reply_link( $text = '' ) {
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  */
 function cancel_comment_reply_link( $text = '' ) {
-	echo get_cancel_comment_reply_link($text);
+	echo get_cancel_comment_reply_link( $text );
 }
 
 /**
@@ -1817,12 +1850,13 @@ function cancel_comment_reply_link( $text = '' ) {
  * @return string Hidden input HTML for replying to comments
  */
 function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
+	if ( empty( $id ) ) {
 		$id = get_the_ID();
+	}
 
-	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
-	$result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
-	$result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
+	$replytoid = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
+	$result    = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
+	$result   .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
 
 	/**
 	 * Filters the returned comment id fields.
@@ -1870,17 +1904,21 @@ function comment_id_fields( $id = 0 ) {
 function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if ( false === $noreplytext ) {
+		$noreplytext = __( 'Leave a Reply' );
+	}
+	if ( false === $replytext ) {
+		$replytext = __( 'Leave a Reply to %s' );
+	}
 
-	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+	$replytoid = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
+	if ( 0 == $replytoid ) {
 		echo $noreplytext;
-	else {
+	} else {
 		// Sets the global so that template tags can be used in the comment form.
-		$comment = get_comment($replytoid);
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
+		$comment = get_comment( $replytoid );
+		$author  = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
 		printf( $replytext, $author );
 	}
 }
@@ -1928,7 +1966,7 @@ function wp_list_comments( $args = array(), $comments = null ) {
 
 	$in_comment_loop = true;
 
-	$comment_alt = $comment_thread_alt = 0;
+	$comment_alt   = $comment_thread_alt = 0;
 	$comment_depth = 1;
 
 	$defaults = array(
@@ -1964,13 +2002,15 @@ function wp_list_comments( $args = array(), $comments = null ) {
 	// Figure out what comments we'll be looping through ($_comments)
 	if ( null !== $comments ) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
+		if ( empty( $comments ) ) {
 			return;
+		}
 		if ( 'all' != $r['type'] ) {
-			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
+			$comments_by_type = separate_comments( $comments );
+			if ( empty( $comments_by_type[ $r['type'] ] ) ) {
 				return;
-			$_comments = $comments_by_type[$r['type']];
+			}
+			$_comments = $comments_by_type[ $r['type'] ];
 		} else {
 			$_comments = $comments;
 		}
@@ -1990,8 +2030,8 @@ function wp_list_comments( $args = array(), $comments = null ) {
 				$comment_args = array(
 					'post_id' => get_the_ID(),
 					'orderby' => 'comment_date_gmt',
-					'order' => 'ASC',
-					'status' => 'approve',
+					'order'   => 'ASC',
+					'status'  => 'approve',
 				);
 
 				if ( is_user_logged_in() ) {
@@ -2017,74 +2057,80 @@ function wp_list_comments( $args = array(), $comments = null ) {
 				}
 			}
 
-		// Otherwise, fall back on the comments from `$wp_query->comments`.
+			// Otherwise, fall back on the comments from `$wp_query->comments`.
 		} else {
-			if ( empty($wp_query->comments) )
+			if ( empty( $wp_query->comments ) ) {
 				return;
+			}
 			if ( 'all' != $r['type'] ) {
-				if ( empty($wp_query->comments_by_type) )
-					$wp_query->comments_by_type = separate_comments($wp_query->comments);
-				if ( empty($wp_query->comments_by_type[$r['type']]) )
+				if ( empty( $wp_query->comments_by_type ) ) {
+					$wp_query->comments_by_type = separate_comments( $wp_query->comments );
+				}
+				if ( empty( $wp_query->comments_by_type[ $r['type'] ] ) ) {
 					return;
-				$_comments = $wp_query->comments_by_type[$r['type']];
+				}
+				$_comments = $wp_query->comments_by_type[ $r['type'] ];
 			} else {
 				$_comments = $wp_query->comments;
 			}
 
 			if ( $wp_query->max_num_comment_pages ) {
 				$default_comments_page = get_option( 'default_comments_page' );
-				$cpage = get_query_var( 'cpage' );
+				$cpage                 = get_query_var( 'cpage' );
 				if ( 'newest' === $default_comments_page ) {
 					$r['cpage'] = $cpage;
 
-				/*
-				 * When first page shows oldest comments, post permalink is the same as
-				 * the comment permalink.
-				 */
+					/*
+					* When first page shows oldest comments, post permalink is the same as
+					* the comment permalink.
+					*/
 				} elseif ( $cpage == 1 ) {
 					$r['cpage'] = '';
 				} else {
 					$r['cpage'] = $cpage;
 				}
 
-				$r['page'] = 0;
+				$r['page']     = 0;
 				$r['per_page'] = 0;
 			}
 		}
 	}
 
 	if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
-		$r['per_page'] = get_query_var('comments_per_page');
+		$r['per_page'] = get_query_var( 'comments_per_page' );
 	}
 
-	if ( empty($r['per_page']) ) {
+	if ( empty( $r['per_page'] ) ) {
 		$r['per_page'] = 0;
-		$r['page'] = 0;
+		$r['page']     = 0;
 	}
 
 	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
-			$r['max_depth'] = get_option('thread_comments_depth');
-		else
+		if ( get_option( 'thread_comments' ) ) {
+			$r['max_depth'] = get_option( 'thread_comments_depth' );
+		} else {
 			$r['max_depth'] = -1;
+		}
 	}
 
 	if ( '' === $r['page'] ) {
-		if ( empty($overridden_cpage) ) {
-			$r['page'] = get_query_var('cpage');
+		if ( empty( $overridden_cpage ) ) {
+			$r['page'] = get_query_var( 'cpage' );
 		} else {
-			$threaded = ( -1 != $r['max_depth'] );
-			$r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+			$threaded  = ( -1 != $r['max_depth'] );
+			$r['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $r['per_page'], $threaded ) : 1;
 			set_query_var( 'cpage', $r['page'] );
 		}
 	}
 	// Validation check
-	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
+	$r['page'] = intval( $r['page'] );
+	if ( 0 == $r['page'] && 0 != $r['per_page'] ) {
 		$r['page'] = 1;
+	}
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if ( null === $r['reverse_top_level'] ) {
+		$r['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) );
+	}
 
 	wp_queue_comments_for_comment_meta_lazyload( $_comments );
 
@@ -2168,8 +2214,9 @@ function wp_list_comments( $args = array(), $comments = null ) {
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
 function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
+	if ( null === $post_id ) {
 		$post_id = get_the_ID();
+	}
 
 	// Exit the function when comments for the post are closed.
 	if ( ! comments_open( $post_id ) ) {
@@ -2183,28 +2230,29 @@ function comment_form( $args = array(), $post_id = null ) {
 		return;
 	}
 
-	$commenter = wp_get_current_commenter();
-	$user = wp_get_current_user();
+	$commenter     = wp_get_current_commenter();
+	$user          = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
 
 	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
+	if ( ! isset( $args['format'] ) ) {
 		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	}
 
 	$req      = get_option( 'require_name_email' );
 	$aria_req = ( $req ? " aria-required='true'" : '' );
 	$html_req = ( $req ? " required='required'" : '' );
 	$html5    = 'html5' === $args['format'];
-	$fields   =  array(
+	$fields   = array(
 		'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"' . $aria_req . $html_req . ' /></p>',
+					'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
 		'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"' . $aria_req . $html_req  . ' /></p>',
+					'<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"' . $aria_req . $html_req . ' /></p>',
 		'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>',
+					'<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
 
-	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+	$required_text = sprintf( ' ' . __( 'Required fields are marked %s' ), '<span class="required">*</span>' );
 
 	/**
 	 * Filters the default comment form fields.
@@ -2213,27 +2261,27 @@ function comment_form( $args = array(), $post_id = null ) {
 	 *
 	 * @param array $fields The default comment fields.
 	 */
-	$fields = apply_filters( 'comment_form_default_fields', $fields );
+	$fields   = apply_filters( 'comment_form_default_fields', $fields );
 	$defaults = array(
 		'fields'               => $fields,
 		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'must_log_in'          => '<p class="must-log-in">' . sprintf(
-									/* translators: %s: login URL */
+			/* translators: %s: login URL */
 									__( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-									wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
-								) . '</p>',
+			wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+		) . '</p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
-									/* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+			/* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
 									__( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
-									get_edit_user_link(),
-									/* translators: %s: user name */
+			get_edit_user_link(),
+			/* translators: %s: user name */
 									esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
-									$user_identity,
-									wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
-								) . '</p>',
-		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
+			$user_identity,
+			wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+		) . '</p>',
+		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>' . ( $req ? $required_text : '' ) . '</p>',
 		'comment_notes_after'  => '',
 		'action'               => site_url( '/wp-comments-post.php' ),
 		'id_form'              => 'commentform',
@@ -2289,7 +2337,7 @@ function comment_form( $args = array(), $post_id = null ) {
 
 		echo $args['title_reply_after'];
 
-		if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
+		if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) :
 			echo $args['must_log_in'];
 			/**
 			 * Fires after the HTML-formatted 'must log in after' message in the comment form.
@@ -2297,7 +2345,8 @@ function comment_form( $args = array(), $post_id = null ) {
 			 * @since 3.0.0
 			 */
 			do_action( 'comment_form_must_log_in_after' );
-		else : ?>
+		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 7c7a829035..c134aadcd0 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -33,15 +33,16 @@
  * @param string $user_ip      Comment author IP address.
  * @param string $user_agent   Comment author User-Agent.
  * @param string $comment_type Comment type, either user-submitted comment,
- *		                       trackback, or pingback.
+ *                             trackback, or pingback.
  * @return bool If all checks pass, true, otherwise false.
  */
-function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) {
+function check_comment( $author, $email, $url, $comment, $user_ip, $user_agent, $comment_type ) {
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
+	if ( 1 == get_option( 'comment_moderation' ) ) {
 		return false;
+	}
 
 	/** This filter is documented in wp-includes/comment-template.php */
 	$comment = apply_filters( 'comment_text', $comment, null, array() );
@@ -66,40 +67,54 @@ function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
+		if ( $num_links >= $max_links ) {
 			return false;
+		}
 	}
 
-	$mod_keys = trim(get_option('moderation_keys'));
+	$mod_keys = trim( get_option( 'moderation_keys' ) );
 
 	// If moderation 'keys' (keywords) are set, process them.
-	if ( !empty($mod_keys) ) {
-		$words = explode("\n", $mod_keys );
+	if ( ! empty( $mod_keys ) ) {
+		$words = explode( "\n", $mod_keys );
 
-		foreach ( (array) $words as $word) {
-			$word = trim($word);
+		foreach ( (array) $words as $word ) {
+			$word = trim( $word );
 
 			// Skip empty lines.
-			if ( empty($word) )
+			if ( empty( $word ) ) {
 				continue;
+			}
 
 			/*
 			 * Do some escaping magic so that '#' (number of) characters in the spam
 			 * words don't break things:
 			 */
-			$word = preg_quote($word, '#');
+			$word = preg_quote( $word, '#' );
 
 			/*
 			 * Check the comment fields for moderation keywords. If any are found,
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if ( preg_match( $pattern, $author ) ) {
+				return false;
+			}
+			if ( preg_match( $pattern, $email ) ) {
+				return false;
+			}
+			if ( preg_match( $pattern, $url ) ) {
+				return false;
+			}
+			if ( preg_match( $pattern, $comment ) ) {
+				return false;
+			}
+			if ( preg_match( $pattern, $user_ip ) ) {
+				return false;
+			}
+			if ( preg_match( $pattern, $user_agent ) ) {
+				return false;
+			}
 		}
 	}
 
@@ -110,7 +125,7 @@ function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $
 	 * as well as whether there are any moderation keywords (if set) present in the author
 	 * email address. If both checks pass, return true. Otherwise, return false.
 	 */
-	if ( 1 == get_option('comment_whitelist')) {
+	if ( 1 == get_option( 'comment_whitelist' ) ) {
 		if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
 			$comment_user = get_user_by( 'email', wp_unslash( $email ) );
 			if ( ! empty( $comment_user->ID ) ) {
@@ -120,10 +135,11 @@ function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $
 				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
 			}
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
+				( empty( $mod_keys ) || false === strpos( $email, $mod_keys ) ) ) {
 					return true;
-			else
+			} else {
 				return false;
+			}
 		} else {
 			return false;
 		}
@@ -152,7 +168,7 @@ function get_approved_comments( $post_id, $args = array() ) {
 		'post_id' => $post_id,
 		'order'   => 'ASC',
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r        = wp_parse_args( $args, $defaults );
 
 	$query = new WP_Comment_Query;
 	return $query->query( $r );
@@ -238,10 +254,10 @@ function get_comments( $args = '' ) {
  */
 function get_comment_statuses() {
 	$status = array(
-		'hold'		=> __( 'Unapproved' ),
-		'approve'	=> _x( 'Approved', 'comment status' ),
-		'spam'		=> _x( 'Spam', 'comment status' ),
-		'trash'		=> _x( 'Trash', 'comment status' ),
+		'hold'    => __( 'Unapproved' ),
+		'approve' => _x( 'Approved', 'comment status' ),
+		'spam'    => _x( 'Spam', 'comment status' ),
+		'trash'   => _x( 'Trash', 'comment status' ),
 	);
 
 	return $status;
@@ -258,14 +274,14 @@ function get_comment_statuses() {
  */
 function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) {
 	switch ( $comment_type ) {
-		case 'pingback' :
-		case 'trackback' :
+		case 'pingback':
+		case 'trackback':
 			$supports = 'trackbacks';
-			$option = 'ping';
+			$option   = 'ping';
 			break;
-		default :
+		default:
 			$supports = 'comments';
-			$option = 'comment';
+			$option   = 'comment';
 	}
 
 	// Set the status.
@@ -287,7 +303,7 @@ function get_default_comment_status( $post_type = 'post', $comment_type = 'comme
 	 * @param string $post_type    Post type. Default is `post`.
 	 * @param string $comment_type Type of comment. Default is `comment`.
 	 */
-	return apply_filters( 'get_default_comment_status' , $status, $post_type, $comment_type );
+	return apply_filters( 'get_default_comment_status', $status, $post_type, $comment_type );
 }
 
 /**
@@ -306,7 +322,7 @@ function get_lastcommentmodified( $timezone = 'server' ) {
 	global $wpdb;
 
 	$timezone = strtolower( $timezone );
-	$key = "lastcommentmodified:$timezone";
+	$key      = "lastcommentmodified:$timezone";
 
 	$comment_modified_date = wp_cache_get( $key, 'timeinfo' );
 	if ( false !== $comment_modified_date ) {
@@ -356,15 +372,17 @@ function get_comment_count( $post_id = 0 ) {
 
 	$where = '';
 	if ( $post_id > 0 ) {
-		$where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
+		$where = $wpdb->prepare( 'WHERE comment_post_ID = %d', $post_id );
 	}
 
-	$totals = (array) $wpdb->get_results("
+	$totals = (array) $wpdb->get_results(
+		"
 		SELECT comment_approved, COUNT( * ) AS total
 		FROM {$wpdb->comments}
 		{$where}
 		GROUP BY comment_approved
-	", ARRAY_A);
+	", ARRAY_A
+	);
 
 	$comment_count = array(
 		'approved'            => 0,
@@ -385,18 +403,18 @@ function get_comment_count( $post_id = 0 ) {
 				$comment_count['post-trashed'] = $row['total'];
 				break;
 			case 'spam':
-				$comment_count['spam'] = $row['total'];
+				$comment_count['spam']            = $row['total'];
 				$comment_count['total_comments'] += $row['total'];
 				break;
 			case '1':
-				$comment_count['approved'] = $row['total'];
+				$comment_count['approved']        = $row['total'];
 				$comment_count['total_comments'] += $row['total'];
-				$comment_count['all'] += $row['total'];
+				$comment_count['all']            += $row['total'];
 				break;
 			case '0':
 				$comment_count['awaiting_moderation'] = $row['total'];
-				$comment_count['total_comments'] += $row['total'];
-				$comment_count['all'] += $row['total'];
+				$comment_count['total_comments']     += $row['total'];
+				$comment_count['all']                += $row['total'];
 				break;
 			default:
 				break;
@@ -422,7 +440,7 @@ function get_comment_count( $post_id = 0 ) {
  * @param bool $unique Optional, default is false. Whether the same key should not be added.
  * @return int|bool Meta ID on success, false on failure.
  */
-function add_comment_meta($comment_id, $meta_key, $meta_value, $unique = false) {
+function add_comment_meta( $comment_id, $meta_key, $meta_value, $unique = false ) {
 	$added = add_metadata( 'comment', $comment_id, $meta_key, $meta_value, $unique );
 	if ( $added ) {
 		wp_cache_set( 'last_changed', microtime(), 'comment' );
@@ -445,7 +463,7 @@ function add_comment_meta($comment_id, $meta_key, $meta_value, $unique = false)
  * @param mixed $meta_value Optional. Metadata value.
  * @return bool True on success, false on failure.
  */
-function delete_comment_meta($comment_id, $meta_key, $meta_value = '') {
+function delete_comment_meta( $comment_id, $meta_key, $meta_value = '' ) {
 	$deleted = delete_metadata( 'comment', $comment_id, $meta_key, $meta_value );
 	if ( $deleted ) {
 		wp_cache_set( 'last_changed', microtime(), 'comment' );
@@ -465,8 +483,8 @@ function delete_comment_meta($comment_id, $meta_key, $meta_value = '') {
  * @return mixed Will be an array if $single is false. Will be value of meta data field if $single
  *  is true.
  */
-function get_comment_meta($comment_id, $key = '', $single = false) {
-	return get_metadata('comment', $comment_id, $key, $single);
+function get_comment_meta( $comment_id, $key = '', $single = false ) {
+	return get_metadata( 'comment', $comment_id, $key, $single );
 }
 
 /**
@@ -486,7 +504,7 @@ function get_comment_meta($comment_id, $key = '', $single = false) {
  * @param mixed $prev_value Optional. Previous value to check before removing.
  * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
  */
-function update_comment_meta($comment_id, $meta_key, $meta_value, $prev_value = '') {
+function update_comment_meta( $comment_id, $meta_key, $meta_value, $prev_value = '' ) {
 	$updated = update_metadata( 'comment', $comment_id, $meta_key, $meta_value, $prev_value );
 	if ( $updated ) {
 		wp_cache_set( 'last_changed', microtime(), 'comment' );
@@ -527,9 +545,10 @@ function wp_queue_comments_for_comment_meta_lazyload( $comments ) {
  *
  * @since 3.4.0
  */
-function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
+function wp_set_comment_cookies( $comment, $user ) {
+	if ( $user->exists() ) {
 		return;
+	}
 
 	/**
 	 * Filters the lifetime of the comment cookie in seconds.
@@ -539,10 +558,10 @@ function wp_set_comment_cookies($comment, $user) {
 	 * @param int $seconds Comment cookie lifetime. Default 30000000.
 	 */
 	$comment_cookie_lifetime = apply_filters( 'comment_cookie_lifetime', 30000000 );
-	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
+	$secure                  = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
 	setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
 	setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
+	setcookie( 'comment_author_url_' . COOKIEHASH, esc_url( $comment->comment_author_url ), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
 }
 
 /**
@@ -554,7 +573,7 @@ function wp_set_comment_cookies($comment, $user) {
  * @since 2.0.4
  */
 function sanitize_comment_cookies() {
-	if ( isset( $_COOKIE['comment_author_' . COOKIEHASH] ) ) {
+	if ( isset( $_COOKIE[ 'comment_author_' . COOKIEHASH ] ) ) {
 		/**
 		 * Filters the comment author's name cookie before it is set.
 		 *
@@ -565,13 +584,13 @@ function sanitize_comment_cookies() {
 		 *
 		 * @param string $author_cookie The comment author name cookie.
 		 */
-		$comment_author = apply_filters( 'pre_comment_author_name', $_COOKIE['comment_author_' . COOKIEHASH] );
-		$comment_author = wp_unslash($comment_author);
-		$comment_author = esc_attr($comment_author);
-		$_COOKIE['comment_author_' . COOKIEHASH] = $comment_author;
+		$comment_author                            = apply_filters( 'pre_comment_author_name', $_COOKIE[ 'comment_author_' . COOKIEHASH ] );
+		$comment_author                            = wp_unslash( $comment_author );
+		$comment_author                            = esc_attr( $comment_author );
+		$_COOKIE[ 'comment_author_' . COOKIEHASH ] = $comment_author;
 	}
 
-	if ( isset( $_COOKIE['comment_author_email_' . COOKIEHASH] ) ) {
+	if ( isset( $_COOKIE[ 'comment_author_email_' . COOKIEHASH ] ) ) {
 		/**
 		 * Filters the comment author's email cookie before it is set.
 		 *
@@ -582,13 +601,13 @@ function sanitize_comment_cookies() {
 		 *
 		 * @param string $author_email_cookie The comment author email cookie.
 		 */
-		$comment_author_email = apply_filters( 'pre_comment_author_email', $_COOKIE['comment_author_email_' . COOKIEHASH] );
-		$comment_author_email = wp_unslash($comment_author_email);
-		$comment_author_email = esc_attr($comment_author_email);
-		$_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
+		$comment_author_email                            = apply_filters( 'pre_comment_author_email', $_COOKIE[ 'comment_author_email_' . COOKIEHASH ] );
+		$comment_author_email                            = wp_unslash( $comment_author_email );
+		$comment_author_email                            = esc_attr( $comment_author_email );
+		$_COOKIE[ 'comment_author_email_' . COOKIEHASH ] = $comment_author_email;
 	}
 
-	if ( isset( $_COOKIE['comment_author_url_' . COOKIEHASH] ) ) {
+	if ( isset( $_COOKIE[ 'comment_author_url_' . COOKIEHASH ] ) ) {
 		/**
 		 * Filters the comment author's URL cookie before it is set.
 		 *
@@ -599,9 +618,9 @@ function sanitize_comment_cookies() {
 		 *
 		 * @param string $author_url_cookie The comment author URL cookie.
 		 */
-		$comment_author_url = apply_filters( 'pre_comment_author_url', $_COOKIE['comment_author_url_' . COOKIEHASH] );
-		$comment_author_url = wp_unslash($comment_author_url);
-		$_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url;
+		$comment_author_url                            = apply_filters( 'pre_comment_author_url', $_COOKIE[ 'comment_author_url_' . COOKIEHASH ] );
+		$comment_author_url                            = wp_unslash( $comment_author_url );
+		$_COOKIE[ 'comment_author_url_' . COOKIEHASH ] = $comment_author_url;
 	}
 }
 
@@ -634,12 +653,12 @@ function wp_allow_comment( $commentdata, $avoid_die = false ) {
 	);
 	if ( $commentdata['comment_author_email'] ) {
 		$dupe .= $wpdb->prepare(
-			"AND comment_author_email = %s ",
+			'AND comment_author_email = %s ',
 			wp_unslash( $commentdata['comment_author_email'] )
 		);
 	}
 	$dupe .= $wpdb->prepare(
-		") AND comment_content = %s LIMIT 1",
+		') AND comment_content = %s LIMIT 1',
 		wp_unslash( $commentdata['comment_content'] )
 	);
 
@@ -670,7 +689,7 @@ function wp_allow_comment( $commentdata, $avoid_die = false ) {
 			return new WP_Error( 'comment_duplicate', __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
 		} else {
 			if ( wp_doing_ajax() ) {
-				die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') );
+				die( __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ) );
 			}
 
 			wp_die( __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
@@ -727,11 +746,13 @@ function wp_allow_comment( $commentdata, $avoid_die = false ) {
 	}
 
 	if ( ! empty( $commentdata['user_id'] ) ) {
-		$user = get_userdata( $commentdata['user_id'] );
-		$post_author = $wpdb->get_var( $wpdb->prepare(
-			"SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1",
-			$commentdata['comment_post_ID']
-		) );
+		$user        = get_userdata( $commentdata['user_id'] );
+		$post_author = $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1",
+				$commentdata['comment_post_ID']
+			)
+		);
 	}
 
 	if ( isset( $user ) && ( $commentdata['user_id'] == $post_author || $user->has_cap( 'moderate_comments' ) ) ) {
@@ -828,14 +849,14 @@ function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = fal
 	$hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
 
 	if ( is_user_logged_in() ) {
-		$user = get_current_user_id();
+		$user         = get_current_user_id();
 		$check_column = '`user_id`';
 	} else {
-		$user = $ip;
+		$user         = $ip;
 		$check_column = '`comment_author_IP`';
 	}
 
-	$sql = $wpdb->prepare(
+	$sql      = $wpdb->prepare(
 		"SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( $check_column = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1",
 		$hour_ago,
 		$user,
@@ -843,8 +864,8 @@ function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = fal
 	);
 	$lasttime = $wpdb->get_var( $sql );
 	if ( $lasttime ) {
-		$time_lastcomment = mysql2date('U', $lasttime, false);
-		$time_newcomment  = mysql2date('U', $date, false);
+		$time_lastcomment = mysql2date( 'U', $lasttime, false );
+		$time_newcomment  = mysql2date( 'U', $date, false );
 		/**
 		 * Filters the comment flood status.
 		 *
@@ -869,7 +890,7 @@ function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = fal
 				return true;
 			} else {
 				if ( wp_doing_ajax() ) {
-					die( __('You are posting comments too quickly. Slow down.') );
+					die( __( 'You are posting comments too quickly. Slow down.' ) );
 				}
 
 				wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
@@ -888,16 +909,23 @@ function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = fal
  * @param array $comments Array of comments
  * @return array Array of comments keyed by comment_type.
  */
-function separate_comments(&$comments) {
-	$comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
-	$count = count($comments);
+function separate_comments( &$comments ) {
+	$comments_by_type = array(
+		'comment'   => array(),
+		'trackback' => array(),
+		'pingback'  => array(),
+		'pings'     => array(),
+	);
+	$count            = count( $comments );
 	for ( $i = 0; $i < $count; $i++ ) {
-		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
+		$type = $comments[ $i ]->comment_type;
+		if ( empty( $type ) ) {
 			$type = 'comment';
-		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
-			$comments_by_type['pings'][] = &$comments[$i];
+		}
+		$comments_by_type[ $type ][] = &$comments[ $i ];
+		if ( 'trackback' == $type || 'pingback' == $type ) {
+			$comments_by_type['pings'][] = &$comments[ $i ];
+		}
 	}
 
 	return $comments_by_type;
@@ -920,32 +948,39 @@ function separate_comments(&$comments) {
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
+	if ( null === $comments && null === $per_page && null === $threaded && ! empty( $wp_query->max_num_comment_pages ) ) {
 		return $wp_query->max_num_comment_pages;
+	}
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
+	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments ) ) {
 		$comments = $wp_query->comments;
+	}
 
-	if ( empty($comments) )
+	if ( empty( $comments ) ) {
 		return 0;
+	}
 
 	if ( ! get_option( 'page_comments' ) ) {
 		return 1;
 	}
 
-	if ( !isset($per_page) )
-		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
-		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
+	if ( ! isset( $per_page ) ) {
+		$per_page = (int) get_query_var( 'comments_per_page' );
+	}
+	if ( 0 === $per_page ) {
+		$per_page = (int) get_option( 'comments_per_page' );
+	}
+	if ( 0 === $per_page ) {
 		return 1;
+	}
 
-	if ( !isset($threaded) )
-		$threaded = get_option('thread_comments');
+	if ( ! isset( $threaded ) ) {
+		$threaded = get_option( 'thread_comments' );
+	}
 
 	if ( $threaded ) {
 		$walker = new Walker_Comment;
-		$count = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
+		$count  = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
 	} else {
 		$count = ceil( count( $comments ) / $per_page );
 	}
@@ -978,11 +1013,17 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 
 	$page = null;
 
-	if ( !$comment = get_comment( $comment_ID ) )
+	if ( ! $comment = get_comment( $comment_ID ) ) {
 		return;
+	}
 
-	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults      = array(
+		'type'      => 'all',
+		'page'      => '',
+		'per_page'  => '',
+		'max_depth' => '',
+	);
+	$args          = wp_parse_args( $args, $defaults );
 	$original_args = $args;
 
 	// Order of precedence: 1. `$args['per_page']`, 2. 'comments_per_page' query_var, 3. 'comments_per_page' option.
@@ -996,9 +1037,9 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 		}
 	}
 
-	if ( empty($args['per_page']) ) {
+	if ( empty( $args['per_page'] ) ) {
 		$args['per_page'] = 0;
-		$args['page'] = 0;
+		$args['page']     = 0;
 	}
 
 	if ( $args['per_page'] < 1 ) {
@@ -1007,15 +1048,17 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 
 	if ( null === $page ) {
 		if ( '' === $args['max_depth'] ) {
-			if ( get_option('thread_comments') )
-				$args['max_depth'] = get_option('thread_comments_depth');
-			else
+			if ( get_option( 'thread_comments' ) ) {
+				$args['max_depth'] = get_option( 'thread_comments_depth' );
+			} else {
 				$args['max_depth'] = -1;
+			}
 		}
 
 		// Find this comment's top level parent if threading is enabled
-		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
+		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent ) {
 			return get_page_of_comment( $comment->comment_parent, $args );
+		}
 
 		$comment_args = array(
 			'type'       => $args['type'],
@@ -1028,18 +1071,18 @@ function get_page_of_comment( $comment_ID, $args = array() ) {
 				array(
 					'column' => "$wpdb->comments.comment_date_gmt",
 					'before' => $comment->comment_date_gmt,
-				)
+				),
 			),
 		);
 
-		$comment_query = new WP_Comment_Query();
+		$comment_query       = new WP_Comment_Query();
 		$older_comment_count = $comment_query->query( $comment_args );
 
 		// No older comments? Then it's page #1.
 		if ( 0 == $older_comment_count ) {
 			$page = 1;
 
-		// Divide comments older than this one by comments per page to get this comment's page number
+			// Divide comments older than this one by comments per page to get this comment's page number
 		} else {
 			$page = ceil( ( $older_comment_count + 1 ) / $args['per_page'] );
 		}
@@ -1174,7 +1217,7 @@ function wp_check_comment_data_max_lengths( $comment_data ) {
  * @param string $user_agent The author's browser user agent
  * @return bool True if comment contains blacklisted content, false if comment does not
  */
-function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) {
+function wp_blacklist_check( $author, $email, $url, $comment, $user_ip, $user_agent ) {
 	/**
 	 * Fires before the comment is tested for blacklisted characters or words.
 	 *
@@ -1189,35 +1232,38 @@ function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_age
 	 */
 	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
 
-	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
+	$mod_keys = trim( get_option( 'blacklist_keys' ) );
+	if ( '' == $mod_keys ) {
 		return false; // If moderation keys are empty
+	}
 
 	// Ensure HTML tags are not being used to bypass the blacklist.
 	$comment_without_html = wp_strip_all_tags( $comment );
 
-	$words = explode("\n", $mod_keys );
+	$words = explode( "\n", $mod_keys );
 
 	foreach ( (array) $words as $word ) {
-		$word = trim($word);
+		$word = trim( $word );
 
 		// Skip empty lines
-		if ( empty($word) ) { continue; }
+		if ( empty( $word ) ) {
+			continue; }
 
 		// Do some escaping magic so that '#' chars in the
 		// spam words don't break things:
-		$word = preg_quote($word, '#');
+		$word = preg_quote( $word, '#' );
 
 		$pattern = "#$word#i";
-		if ( preg_match($pattern, $author)
-			|| preg_match($pattern, $email)
-			|| preg_match($pattern, $url)
-			|| preg_match($pattern, $comment)
-			|| preg_match($pattern, $comment_without_html)
-			|| preg_match($pattern, $user_ip)
-			|| preg_match($pattern, $user_agent)
-		)
+		if ( preg_match( $pattern, $author )
+			|| preg_match( $pattern, $email )
+			|| preg_match( $pattern, $url )
+			|| preg_match( $pattern, $comment )
+			|| preg_match( $pattern, $comment_without_html )
+			|| preg_match( $pattern, $user_ip )
+			|| preg_match( $pattern, $user_agent )
+		) {
 			return true;
+		}
 	}
 	return false;
 }
@@ -1259,7 +1305,7 @@ function wp_count_comments( $post_id = 0 ) {
 		return $count;
 	}
 
-	$stats = get_comment_count( $post_id );
+	$stats              = get_comment_count( $post_id );
 	$stats['moderated'] = $stats['awaiting_moderation'];
 	unset( $stats['awaiting_moderation'] );
 
@@ -1286,13 +1332,15 @@ function wp_count_comments( $post_id = 0 ) {
  * @param bool           $force_delete Whether to bypass trash and force deletion. Default is false.
  * @return bool True on success, false on failure.
  */
-function wp_delete_comment($comment_id, $force_delete = false) {
+function wp_delete_comment( $comment_id, $force_delete = false ) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
+	if ( ! $comment = get_comment( $comment_id ) ) {
 		return false;
+	}
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) )
-		return wp_trash_comment($comment_id);
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && ! in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) ) {
+		return wp_trash_comment( $comment_id );
+	}
 
 	/**
 	 * Fires immediately before a comment is deleted from the database.
@@ -1306,19 +1354,21 @@ function wp_delete_comment($comment_id, $force_delete = false) {
 	do_action( 'delete_comment', $comment->comment_ID, $comment );
 
 	// Move children up a level.
-	$children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID) );
-	if ( !empty($children) ) {
-		$wpdb->update($wpdb->comments, array('comment_parent' => $comment->comment_parent), array('comment_parent' => $comment->comment_ID));
-		clean_comment_cache($children);
+	$children = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID ) );
+	if ( ! empty( $children ) ) {
+		$wpdb->update( $wpdb->comments, array( 'comment_parent' => $comment->comment_parent ), array( 'comment_parent' => $comment->comment_ID ) );
+		clean_comment_cache( $children );
 	}
 
 	// Delete metadata
 	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );
-	foreach ( $meta_ids as $mid )
+	foreach ( $meta_ids as $mid ) {
 		delete_metadata_by_mid( 'comment', $mid );
+	}
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) )
+	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) ) {
 		return false;
+	}
 
 	/**
 	 * Fires immediately after a comment is deleted from the database.
@@ -1332,15 +1382,16 @@ function wp_delete_comment($comment_id, $force_delete = false) {
 	do_action( 'deleted_comment', $comment->comment_ID, $comment );
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
-		wp_update_comment_count($post_id);
+	if ( $post_id && $comment->comment_approved == 1 ) {
+		wp_update_comment_count( $post_id );
+	}
 
 	clean_comment_cache( $comment->comment_ID );
 
 	/** This action is documented in wp-includes/comment.php */
 	do_action( 'wp_set_comment_status', $comment->comment_ID, 'delete' );
 
-	wp_transition_comment_status('delete', $comment->comment_approved, $comment);
+	wp_transition_comment_status( 'delete', $comment->comment_approved, $comment );
 	return true;
 }
 
@@ -1354,12 +1405,14 @@ function wp_delete_comment($comment_id, $force_delete = false) {
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_comment($comment_id, true);
+function wp_trash_comment( $comment_id ) {
+	if ( ! EMPTY_TRASH_DAYS ) {
+		return wp_delete_comment( $comment_id, true );
+	}
 
-	if ( !$comment = get_comment($comment_id) )
+	if ( ! $comment = get_comment( $comment_id ) ) {
 		return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is sent to the Trash.
@@ -1402,7 +1455,7 @@ function wp_trash_comment($comment_id) {
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_untrash_comment($comment_id) {
+function wp_untrash_comment( $comment_id ) {
 	$comment = get_comment( $comment_id );
 	if ( ! $comment ) {
 		return false;
@@ -1420,8 +1473,9 @@ function wp_untrash_comment($comment_id) {
 	do_action( 'untrash_comment', $comment->comment_ID, $comment );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	if ( empty( $status ) ) {
 		$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
@@ -1514,8 +1568,9 @@ function wp_unspam_comment( $comment_id ) {
 	do_action( 'unspam_comment', $comment->comment_ID, $comment );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	if ( empty( $status ) ) {
 		$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
@@ -1544,25 +1599,27 @@ function wp_unspam_comment( $comment_id ) {
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object
  * @return false|string Status might be 'trash', 'approved', 'unapproved', 'spam'. False on failure.
  */
-function wp_get_comment_status($comment_id) {
-	$comment = get_comment($comment_id);
-	if ( !$comment )
+function wp_get_comment_status( $comment_id ) {
+	$comment = get_comment( $comment_id );
+	if ( ! $comment ) {
 		return false;
+	}
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
+	if ( $approved == null ) {
 		return false;
-	elseif ( $approved == '1' )
+	} elseif ( $approved == '1' ) {
 		return 'approved';
-	elseif ( $approved == '0' )
+	} elseif ( $approved == '0' ) {
 		return 'unapproved';
-	elseif ( $approved == 'spam' )
+	} elseif ( $approved == 'spam' ) {
 		return 'spam';
-	elseif ( $approved == 'trash' )
+	} elseif ( $approved == 'trash' ) {
 		return 'trash';
-	else
+	} else {
 		return false;
+	}
 }
 
 /**
@@ -1583,7 +1640,7 @@ function wp_get_comment_status($comment_id) {
  * @param string $old_status Previous comment status.
  * @param object $comment Comment data.
  */
-function wp_transition_comment_status($new_status, $old_status, $comment) {
+function wp_transition_comment_status( $new_status, $old_status, $comment ) {
 	/*
 	 * Translate raw statuses to human readable formats for the hooks.
 	 * This is not a complete list of comment status, it's only the ones
@@ -1595,8 +1652,12 @@ function wp_transition_comment_status($new_status, $old_status, $comment) {
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if ( isset( $comment_statuses[ $new_status ] ) ) {
+		$new_status = $comment_statuses[ $new_status ];
+	}
+	if ( isset( $comment_statuses[ $old_status ] ) ) {
+		$old_status = $comment_statuses[ $old_status ];
+	}
 
 	// Call the hooks
 	if ( $new_status != $old_status ) {
@@ -1675,16 +1736,19 @@ function wp_get_current_commenter() {
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
-		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	if ( isset( $_COOKIE[ 'comment_author_' . COOKIEHASH ] ) ) {
+		$comment_author = $_COOKIE[ 'comment_author_' . COOKIEHASH ];
+	}
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
-		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	if ( isset( $_COOKIE[ 'comment_author_email_' . COOKIEHASH ] ) ) {
+		$comment_author_email = $_COOKIE[ 'comment_author_email_' . COOKIEHASH ];
+	}
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
-		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	if ( isset( $_COOKIE[ 'comment_author_url_' . COOKIEHASH ] ) ) {
+		$comment_author_url = $_COOKIE[ 'comment_author_url_' . COOKIEHASH ];
+	}
 
 	/**
 	 * Filters the current commenter's name, email, and URL.
@@ -1699,7 +1763,7 @@ function wp_get_current_commenter() {
 	 *     @type string $comment_author_url   The URL address of the `$comment_author`. Default empty.
 	 * }
 	 */
-	return apply_filters( 'wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url') );
+	return apply_filters( 'wp_get_current_commenter', compact( 'comment_author', 'comment_author_email', 'comment_author_url' ) );
 }
 
 /**
@@ -1741,23 +1805,23 @@ function wp_insert_comment( $commentdata ) {
 	global $wpdb;
 	$data = wp_unslash( $commentdata );
 
-	$comment_author       = ! isset( $data['comment_author'] )       ? '' : $data['comment_author'];
+	$comment_author       = ! isset( $data['comment_author'] ) ? '' : $data['comment_author'];
 	$comment_author_email = ! isset( $data['comment_author_email'] ) ? '' : $data['comment_author_email'];
-	$comment_author_url   = ! isset( $data['comment_author_url'] )   ? '' : $data['comment_author_url'];
-	$comment_author_IP    = ! isset( $data['comment_author_IP'] )    ? '' : $data['comment_author_IP'];
+	$comment_author_url   = ! isset( $data['comment_author_url'] ) ? '' : $data['comment_author_url'];
+	$comment_author_IP    = ! isset( $data['comment_author_IP'] ) ? '' : $data['comment_author_IP'];
 
-	$comment_date     = ! isset( $data['comment_date'] )     ? current_time( 'mysql' )            : $data['comment_date'];
+	$comment_date     = ! isset( $data['comment_date'] ) ? current_time( 'mysql' ) : $data['comment_date'];
 	$comment_date_gmt = ! isset( $data['comment_date_gmt'] ) ? get_gmt_from_date( $comment_date ) : $data['comment_date_gmt'];
 
-	$comment_post_ID  = ! isset( $data['comment_post_ID'] )  ? 0  : $data['comment_post_ID'];
-	$comment_content  = ! isset( $data['comment_content'] )  ? '' : $data['comment_content'];
-	$comment_karma    = ! isset( $data['comment_karma'] )    ? 0  : $data['comment_karma'];
-	$comment_approved = ! isset( $data['comment_approved'] ) ? 1  : $data['comment_approved'];
-	$comment_agent    = ! isset( $data['comment_agent'] )    ? '' : $data['comment_agent'];
-	$comment_type     = ! isset( $data['comment_type'] )     ? '' : $data['comment_type'];
-	$comment_parent   = ! isset( $data['comment_parent'] )   ? 0  : $data['comment_parent'];
+	$comment_post_ID  = ! isset( $data['comment_post_ID'] ) ? 0 : $data['comment_post_ID'];
+	$comment_content  = ! isset( $data['comment_content'] ) ? '' : $data['comment_content'];
+	$comment_karma    = ! isset( $data['comment_karma'] ) ? 0 : $data['comment_karma'];
+	$comment_approved = ! isset( $data['comment_approved'] ) ? 1 : $data['comment_approved'];
+	$comment_agent    = ! isset( $data['comment_agent'] ) ? '' : $data['comment_agent'];
+	$comment_type     = ! isset( $data['comment_type'] ) ? '' : $data['comment_type'];
+	$comment_parent   = ! isset( $data['comment_parent'] ) ? 0 : $data['comment_parent'];
 
-	$user_id  = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
+	$user_id = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
 
 	$compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
 	if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
@@ -1810,7 +1874,7 @@ function wp_insert_comment( $commentdata ) {
  * @param array $commentdata Contains information on the comment.
  * @return array Parsed comment information.
  */
-function wp_filter_comment($commentdata) {
+function wp_filter_comment( $commentdata ) {
 	if ( isset( $commentdata['user_ID'] ) ) {
 		/**
 		 * Filters the comment author's user id before it is set.
@@ -1858,7 +1922,7 @@ function wp_filter_comment($commentdata) {
 	$commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
 	/** This filter is documented in wp-includes/comment.php */
 	$commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
-	$commentdata['filtered'] = true;
+	$commentdata['filtered']             = true;
 	return $commentdata;
 }
 
@@ -1872,11 +1936,13 @@ function wp_filter_comment($commentdata) {
  * @param int $time_newcomment Timestamp for new comment.
  * @return bool Whether comment should be blocked.
  */
-function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+function wp_throttle_comment_flood( $block, $time_lastcomment, $time_newcomment ) {
+	if ( $block ) { // a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
+	}
+	if ( ( $time_newcomment - $time_lastcomment ) < 15 ) {
 		return true;
+	}
 	return false;
 }
 
@@ -1949,8 +2015,8 @@ function wp_new_comment( $commentdata, $avoid_die = false ) {
 		$commentdata['user_id'] = (int) $commentdata['user_id'];
 	}
 
-	$commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;
-	$parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status($commentdata['comment_parent']) : '';
+	$commentdata['comment_parent'] = isset( $commentdata['comment_parent'] ) ? absint( $commentdata['comment_parent'] ) : 0;
+	$parent_status                 = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status( $commentdata['comment_parent'] ) : '';
 	$commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
 
 	if ( ! isset( $commentdata['comment_author_IP'] ) ) {
@@ -1959,26 +2025,26 @@ function wp_new_comment( $commentdata, $avoid_die = false ) {
 	$commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP'] );
 
 	if ( ! isset( $commentdata['comment_agent'] ) ) {
-		$commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT']: '';
+		$commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : '';
 	}
 	$commentdata['comment_agent'] = substr( $commentdata['comment_agent'], 0, 254 );
 
 	if ( empty( $commentdata['comment_date'] ) ) {
-		$commentdata['comment_date'] = current_time('mysql');
+		$commentdata['comment_date'] = current_time( 'mysql' );
 	}
 
 	if ( empty( $commentdata['comment_date_gmt'] ) ) {
 		$commentdata['comment_date_gmt'] = current_time( 'mysql', 1 );
 	}
 
-	$commentdata = wp_filter_comment($commentdata);
+	$commentdata = wp_filter_comment( $commentdata );
 
 	$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die );
 	if ( is_wp_error( $commentdata['comment_approved'] ) ) {
 		return $commentdata['comment_approved'];
 	}
 
-	$comment_ID = wp_insert_comment($commentdata);
+	$comment_ID = wp_insert_comment( $commentdata );
 	if ( ! $comment_ID ) {
 		$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
 
@@ -2098,7 +2164,7 @@ function wp_new_comment_notify_postauthor( $comment_ID ) {
  * @param bool           $wp_error       Whether to return a WP_Error object if there is a failure. Default is false.
  * @return bool|WP_Error True on success, false or WP_Error on failure.
  */
-function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
+function wp_set_comment_status( $comment_id, $comment_status, $wp_error = false ) {
 	global $wpdb;
 
 	switch ( $comment_status ) {
@@ -2121,13 +2187,14 @@ function wp_set_comment_status($comment_id, $comment_status, $wp_error = false)
 			return false;
 	}
 
-	$comment_old = clone get_comment($comment_id);
+	$comment_old = clone get_comment( $comment_id );
 
-	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-		if ( $wp_error )
-			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
-		else
+	if ( ! $wpdb->update( $wpdb->comments, array( 'comment_approved' => $status ), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
+		if ( $wp_error ) {
+			return new WP_Error( 'db_update_error', __( 'Could not update comment status' ), $wpdb->last_error );
+		} else {
 			return false;
+		}
 	}
 
 	clean_comment_cache( $comment_old->comment_ID );
@@ -2146,9 +2213,9 @@ function wp_set_comment_status($comment_id, $comment_status, $wp_error = false)
 	 */
 	do_action( 'wp_set_comment_status', $comment->comment_ID, $comment_status );
 
-	wp_transition_comment_status($comment_status, $comment_old->comment_approved, $comment);
+	wp_transition_comment_status( $comment_status, $comment_old->comment_approved, $comment );
 
-	wp_update_comment_count($comment->comment_post_ID);
+	wp_update_comment_count( $comment->comment_post_ID );
 
 	return true;
 }
@@ -2166,11 +2233,11 @@ function wp_set_comment_status($comment_id, $comment_status, $wp_error = false)
  * @param array $commentarr Contains information on the comment.
  * @return int Comment was updated if value is 1, or was not updated if value is 0.
  */
-function wp_update_comment($commentarr) {
+function wp_update_comment( $commentarr ) {
 	global $wpdb;
 
 	// First, get all of the original fields
-	$comment = get_comment($commentarr['comment_ID'], ARRAY_A);
+	$comment = get_comment( $commentarr['comment_ID'], ARRAY_A );
 	if ( empty( $comment ) ) {
 		return 0;
 	}
@@ -2181,12 +2248,12 @@ function wp_update_comment($commentarr) {
 	}
 
 	// Escape data pulled from DB.
-	$comment = wp_slash($comment);
+	$comment = wp_slash( $comment );
 
 	$old_status = $comment['comment_approved'];
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$commentarr = array_merge($comment, $commentarr);
+	$commentarr = array_merge( $comment, $commentarr );
 
 	$commentarr = wp_filter_comment( $commentarr );
 
@@ -2212,7 +2279,7 @@ function wp_update_comment($commentarr) {
 		$data['comment_approved'] = 1;
 	}
 
-	$comment_ID = $data['comment_ID'];
+	$comment_ID      = $data['comment_ID'];
 	$comment_post_ID = $data['comment_post_ID'];
 
 	/**
@@ -2254,8 +2321,8 @@ function wp_update_comment($commentarr) {
 	 * @param array $data       Comment data.
 	 */
 	do_action( 'edit_comment', $comment_ID, $data );
-	$comment = get_comment($comment_ID);
-	wp_transition_comment_status($comment->comment_approved, $old_status, $comment);
+	$comment = get_comment( $comment_ID );
+	wp_transition_comment_status( $comment->comment_approved, $old_status, $comment );
 	return $rval;
 }
 
@@ -2273,14 +2340,15 @@ function wp_update_comment($commentarr) {
  * @param bool $defer
  * @return bool
  */
-function wp_defer_comment_counting($defer=null) {
+function wp_defer_comment_counting( $defer = null ) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if ( is_bool( $defer ) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
+		if ( ! $defer ) {
 			wp_update_comment_count( null, true );
+		}
 	}
 
 	return $_defer;
@@ -2308,7 +2376,7 @@ function wp_defer_comment_counting($defer=null) {
  * @return bool|void True on success, false on failure or if post with ID does
  *                   not exist.
  */
-function wp_update_comment_count($post_id, $do_deferred=false) {
+function wp_update_comment_count( $post_id, $do_deferred = false ) {
 	static $_deferred = array();
 
 	if ( empty( $post_id ) && ! $do_deferred ) {
@@ -2316,19 +2384,19 @@ function wp_update_comment_count($post_id, $do_deferred=false) {
 	}
 
 	if ( $do_deferred ) {
-		$_deferred = array_unique($_deferred);
+		$_deferred = array_unique( $_deferred );
 		foreach ( $_deferred as $i => $_post_id ) {
-			wp_update_comment_count_now($_post_id);
-			unset( $_deferred[$i] ); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
+			wp_update_comment_count_now( $_post_id );
+			unset( $_deferred[ $i ] );
+			/** @todo Move this outside of the foreach and reset $_deferred to an array instead */
 		}
 	}
 
 	if ( wp_defer_comment_counting() ) {
 		$_deferred[] = $post_id;
 		return true;
-	}
-	elseif ( $post_id ) {
-		return wp_update_comment_count_now($post_id);
+	} elseif ( $post_id ) {
+		return wp_update_comment_count_now( $post_id );
 	}
 
 }
@@ -2343,17 +2411,19 @@ function wp_update_comment_count($post_id, $do_deferred=false) {
  * @param int $post_id Post ID
  * @return bool True on success, false on '0' $post_id or if post with ID does not exist.
  */
-function wp_update_comment_count_now($post_id) {
+function wp_update_comment_count_now( $post_id ) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id ) {
 		return false;
+	}
 
 	wp_cache_delete( 'comments-0', 'counts' );
 	wp_cache_delete( "comments-{$post_id}", 'counts' );
 
-	if ( !$post = get_post($post_id) )
+	if ( ! $post = get_post( $post_id ) ) {
 		return false;
+	}
 
 	$old = (int) $post->comment_count;
 
@@ -2374,7 +2444,7 @@ function wp_update_comment_count_now($post_id) {
 		$new = (int) $new;
 	}
 
-	$wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
+	$wpdb->update( $wpdb->posts, array( 'comment_count' => $new ), array( 'ID' => $post_id ) );
 
 	clean_post_cache( $post );
 
@@ -2412,53 +2482,70 @@ function wp_update_comment_count_now($post_id) {
  * @return false|string False on failure, string containing URI on success.
  */
 function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.7.0' );
+	}
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
-	$parsed_url = parse_url($url);
+	$parsed_url = parse_url( $url );
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not a URL. This should never happen.
+	if ( ! isset( $parsed_url['host'] ) ) { // Not a URL. This should never happen.
 		return false;
+	}
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
+	if ( 0 === strpos( $url, $uploads_dir['baseurl'] ) ) {
 		return false;
+	}
 
-	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_head(
+		$url, array(
+			'timeout'     => 2,
+			'httpversion' => '1.0',
+		)
+	);
 
-	if ( is_wp_error( $response ) )
+	if ( is_wp_error( $response ) ) {
 		return false;
+	}
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
+	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
 		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	}
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
+	if ( preg_match( '#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' ) ) ) {
 		return false;
+	}
 
 	// 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( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_get(
+		$url, array(
+			'timeout'     => 2,
+			'httpversion' => '1.0',
+		)
+	);
 
-	if ( is_wp_error( $response ) )
+	if ( is_wp_error( $response ) ) {
 		return false;
+	}
 
 	$contents = wp_remote_retrieve_body( $response );
 
-	$pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
-	$pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
+	$pingback_link_offset_dquote = strpos( $contents, $pingback_str_dquote );
+	$pingback_link_offset_squote = strpos( $contents, $pingback_str_squote );
 	if ( $pingback_link_offset_dquote || $pingback_link_offset_squote ) {
-		$quote = ($pingback_link_offset_dquote) ? '"' : '\'';
-		$pingback_link_offset = ($quote=='"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
-		$pingback_href_pos = @strpos($contents, 'href=', $pingback_link_offset);
-		$pingback_href_start = $pingback_href_pos+6;
-		$pingback_href_end = @strpos($contents, $quote, $pingback_href_start);
+		$quote                   = ( $pingback_link_offset_dquote ) ? '"' : '\'';
+		$pingback_link_offset    = ( $quote == '"' ) ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
+		$pingback_href_pos       = @strpos( $contents, 'href=', $pingback_link_offset );
+		$pingback_href_start     = $pingback_href_pos + 6;
+		$pingback_href_end       = @strpos( $contents, $quote, $pingback_href_start );
 		$pingback_server_url_len = $pingback_href_end - $pingback_href_start;
-		$pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
+		$pingback_server_url     = substr( $contents, $pingback_href_start, $pingback_server_url_len );
 
 		// We may find rel="pingback" but an incomplete pingback URL
 		if ( $pingback_server_url_len > 0 ) { // We got it!
@@ -2480,22 +2567,24 @@ function do_all_pings() {
 	global $wpdb;
 
 	// Do pingbacks
-	while ($ping = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
+	while ( $ping = $wpdb->get_row( "SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1" ) ) {
 		delete_metadata_by_mid( 'post', $ping->meta_id );
 		pingback( $ping->post_content, $ping->ID );
 	}
 
 	// Do Enclosures
-	while ($enclosure = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
+	while ( $enclosure = $wpdb->get_row( "SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1" ) ) {
 		delete_metadata_by_mid( 'post', $enclosure->meta_id );
 		do_enclose( $enclosure->post_content, $enclosure->ID );
 	}
 
 	// Do Trackbacks
-	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
-			do_trackbacks($trackback);
+	$trackbacks = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'" );
+	if ( is_array( $trackbacks ) ) {
+		foreach ( $trackbacks as $trackback ) {
+			do_trackbacks( $trackback );
+		}
+	}
 
 	//Do Update Services/Generic Pings
 	generic_ping();
@@ -2521,11 +2610,11 @@ function do_trackbacks( $post_id ) {
 	$to_ping = get_to_ping( $post );
 	$pinged  = get_pung( $post );
 	if ( empty( $to_ping ) ) {
-		$wpdb->update($wpdb->posts, array( 'to_ping' => '' ), array( 'ID' => $post->ID ) );
+		$wpdb->update( $wpdb->posts, array( 'to_ping' => '' ), array( 'ID' => $post->ID ) );
 		return;
 	}
 
-	if ( empty($post->post_excerpt) ) {
+	if ( empty( $post->post_excerpt ) ) {
 		/** This filter is documented in wp-includes/post-template.php */
 		$excerpt = apply_filters( 'the_content', $post->post_content, $post->ID );
 	} else {
@@ -2533,22 +2622,26 @@ function do_trackbacks( $post_id ) {
 		$excerpt = apply_filters( 'the_excerpt', $post->post_excerpt );
 	}
 
-	$excerpt = str_replace(']]>', ']]&gt;', $excerpt);
-	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
+	$excerpt = str_replace( ']]>', ']]&gt;', $excerpt );
+	$excerpt = wp_html_excerpt( $excerpt, 252, '&#8230;' );
 
 	/** This filter is documented in wp-includes/post-template.php */
 	$post_title = apply_filters( 'the_title', $post->post_title, $post->ID );
-	$post_title = strip_tags($post_title);
+	$post_title = strip_tags( $post_title );
 
 	if ( $to_ping ) {
 		foreach ( (array) $to_ping as $tb_ping ) {
-			$tb_ping = trim($tb_ping);
-			if ( !in_array($tb_ping, $pinged) ) {
+			$tb_ping = trim( $tb_ping );
+			if ( ! in_array( $tb_ping, $pinged ) ) {
 				trackback( $tb_ping, $post_title, $excerpt, $post->ID );
 				$pinged[] = $tb_ping;
 			} else {
-				$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s,
-					'')) WHERE ID = %d", $tb_ping, $post->ID ) );
+				$wpdb->query(
+					$wpdb->prepare(
+						"UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s,
+					'')) WHERE ID = %d", $tb_ping, $post->ID
+					)
+				);
 			}
 		}
 	}
@@ -2563,13 +2656,14 @@ function do_trackbacks( $post_id ) {
  * @return int Same as Post ID from parameter
  */
 function generic_ping( $post_id = 0 ) {
-	$services = get_option('ping_sites');
+	$services = get_option( 'ping_sites' );
 
-	$services = explode("\n", $services);
+	$services = explode( "\n", $services );
 	foreach ( (array) $services as $service ) {
-		$service = trim($service);
-		if ( '' != $service )
-			weblog_ping($service);
+		$service = trim( $service );
+		if ( '' != $service ) {
+			weblog_ping( $service );
+		}
 	}
 
 	return $post_id;
@@ -2617,12 +2711,13 @@ function pingback( $content, $post_id ) {
 
 	foreach ( (array) $post_links_temp as $link_test ) :
 		if ( ! in_array( $link_test, $pung ) && ( url_to_postid( $link_test ) != $post->ID ) // If we haven't pung it already and it isn't a link to itself
-				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
-			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
+				&& ! is_local_attachment( $link_test ) ) : // Also, let's never ping local attachments.
+			if ( $test = @parse_url( $link_test ) ) {
+				if ( isset( $test['query'] ) ) {
 					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
+				} elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) ) {
 					$post_links[] = $link_test;
+				}
 			}
 		endif;
 	endforeach;
@@ -2648,7 +2743,7 @@ function pingback( $content, $post_id ) {
 			$pagelinkedfrom = get_permalink( $post );
 
 			// using a timeout of 3 seconds should be enough to cover slow servers
-			$client = new WP_HTTP_IXR_Client($pingback_server_url);
+			$client          = new WP_HTTP_IXR_Client( $pingback_server_url );
 			$client->timeout = 3;
 			/**
 			 * Filters the user agent sent when pinging-back a URL.
@@ -2666,8 +2761,9 @@ function pingback( $content, $post_id ) {
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
+			if ( $client->query( 'pingback.ping', $pagelinkedfrom, $pagelinkedto ) || ( isset( $client->error->code ) && 48 == $client->error->code ) ) { // Already registered
 				add_ping( $post, $pagelinkedto );
+			}
 		}
 	}
 }
@@ -2680,11 +2776,12 @@ function pingback( $content, $post_id ) {
  * @param mixed $sites Will return if blog is public, will not return if not public.
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
-function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
+function privacy_ping_filter( $sites ) {
+	if ( '0' != get_option( 'blog_public' ) ) {
 		return $sites;
-	else
+	} else {
 		return '';
+	}
 }
 
 /**
@@ -2702,28 +2799,30 @@ function privacy_ping_filter($sites) {
  * @param int $ID Post ID.
  * @return int|false|void Database query from update.
  */
-function trackback($trackback_url, $title, $excerpt, $ID) {
+function trackback( $trackback_url, $title, $excerpt, $ID ) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
+	if ( empty( $trackback_url ) ) {
 		return;
+	}
 
-	$options = array();
+	$options            = array();
 	$options['timeout'] = 10;
-	$options['body'] = array(
-		'title' => $title,
-		'url' => get_permalink($ID),
-		'blog_name' => get_option('blogname'),
-		'excerpt' => $excerpt
+	$options['body']    = array(
+		'title'     => $title,
+		'url'       => get_permalink( $ID ),
+		'blog_name' => get_option( 'blogname' ),
+		'excerpt'   => $excerpt,
 	);
 
 	$response = wp_safe_remote_post( $trackback_url, $options );
 
-	if ( is_wp_error( $response ) )
+	if ( is_wp_error( $response ) ) {
 		return;
+	}
 
-	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
-	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
+	$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID ) );
+	return $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID ) );
 }
 
 /**
@@ -2734,20 +2833,21 @@ function trackback($trackback_url, $title, $excerpt, $ID) {
  * @param string $server Host of blog to connect to.
  * @param string $path Path to send the ping.
  */
-function weblog_ping($server = '', $path = '') {
+function weblog_ping( $server = '', $path = '' ) {
 	include_once( ABSPATH . WPINC . '/class-IXR.php' );
 	include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );
 
 	// using a timeout of 3 seconds should be enough to cover slow servers
-	$client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
-	$client->timeout = 3;
+	$client             = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' == $path ) ) ? false : $path ) );
+	$client->timeout    = 3;
 	$client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );
 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
-	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
-		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
+	$home          = trailingslashit( home_url() );
+	if ( ! $client->query( 'weblogUpdates.extendedPing', get_option( 'blogname' ), $home, get_bloginfo( 'rss2_url' ) ) ) { // then try a normal ping
+		$client->query( 'weblogUpdates.ping', get_option( 'blogname' ), $home );
+	}
 }
 
 /**
@@ -2776,8 +2876,9 @@ function pingback_ping_source_uri( $source_uri ) {
  * @return IXR_Error
  */
 function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
+	if ( $ixr_error->code === 48 ) {
 		return $ixr_error;
+	}
 	return new IXR_Error( 0, '' );
 }
 
@@ -2792,7 +2893,7 @@ function xmlrpc_pingback_error( $ixr_error ) {
  *
  * @param int|array $ids Comment ID or an array of comment IDs to remove from cache.
  */
-function clean_comment_cache($ids) {
+function clean_comment_cache( $ids ) {
 	foreach ( (array) $ids as $id ) {
 		wp_cache_delete( $id, 'comment' );
 
@@ -2823,8 +2924,9 @@ function clean_comment_cache($ids) {
  * @param bool  $update_meta_cache Whether to update commentmeta cache. Default true.
  */
 function update_comment_cache( $comments, $update_meta_cache = true ) {
-	foreach ( (array) $comments as $comment )
-		wp_cache_add($comment->comment_ID, $comment, 'comment');
+	foreach ( (array) $comments as $comment ) {
+		wp_cache_add( $comment->comment_ID, $comment, 'comment' );
+	}
 
 	if ( $update_meta_cache ) {
 		// Avoid `wp_list_pluck()` in case `$comments` is passed by reference.
@@ -2852,8 +2954,8 @@ function _prime_comment_caches( $comment_ids, $update_meta_cache = true ) {
 	global $wpdb;
 
 	$non_cached_ids = _get_non_cached_ids( $comment_ids, 'comment' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	if ( ! empty( $non_cached_ids ) ) {
+		$fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) );
 
 		update_comment_cache( $fresh_comments, $update_meta_cache );
 	}
@@ -2874,8 +2976,9 @@ function _prime_comment_caches( $comment_ids, $update_meta_cache = true ) {
  * @return array
  */
 function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
+	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) ) {
 		return $posts;
+	}
 
 	/**
 	 * Filters the list of post types to automatically close comments for.
@@ -2885,16 +2988,18 @@ function _close_comments_for_old_posts( $posts, $query ) {
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
+	if ( ! in_array( $posts[0]->post_type, $post_types ) ) {
 		return $posts;
+	}
 
 	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
+	if ( ! $days_old ) {
 		return $posts;
+	}
 
 	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
 		$posts[0]->comment_status = 'closed';
-		$posts[0]->ping_status = 'closed';
+		$posts[0]->ping_status    = 'closed';
 	}
 
 	return $posts;
@@ -2911,30 +3016,35 @@ function _close_comments_for_old_posts( $posts, $query ) {
  * @return bool $open
  */
 function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
+	if ( ! $open ) {
 		return $open;
+	}
 
-	if ( !get_option('close_comments_for_old_posts') )
+	if ( ! get_option( 'close_comments_for_old_posts' ) ) {
 		return $open;
+	}
 
-	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
+	$days_old = (int) get_option( 'close_comments_days_old' );
+	if ( ! $days_old ) {
 		return $open;
+	}
 
-	$post = get_post($post_id);
+	$post = get_post( $post_id );
 
 	/** This filter is documented in wp-includes/comment.php */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
+	if ( ! in_array( $post->post_type, $post_types ) ) {
 		return $open;
+	}
 
 	// Undated drafts should not show up as comments closed.
 	if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
 		return $open;
 	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
+	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
 		return false;
+	}
 
 	return $open;
 }
@@ -2963,7 +3073,7 @@ function _close_comments_for_old_post( $open, $post_id ) {
 function wp_handle_comment_submission( $comment_data ) {
 
 	$comment_post_ID = $comment_parent = 0;
-	$comment_author = $comment_author_email = $comment_author_url = $comment_content = null;
+	$comment_author  = $comment_author_email = $comment_author_url = $comment_content = null;
 
 	if ( isset( $comment_data['comment_post_ID'] ) ) {
 		$comment_post_ID = (int) $comment_data['comment_post_ID'];
@@ -3046,13 +3156,12 @@ function wp_handle_comment_submission( $comment_data ) {
 		 * @param int $comment_post_ID Post ID.
 		 */
 		do_action( 'comment_on_draft', $comment_post_ID );
-		
+
 		if ( current_user_can( 'read_post', $comment_post_ID ) ) {
 			return new WP_Error( 'comment_on_draft', __( 'Sorry, comments are not allowed for this item.' ), 403 );
 		} else {
 			return new WP_Error( 'comment_on_draft' );
 		}
-
 	} elseif ( post_password_required( $comment_post_ID ) ) {
 
 		/**
@@ -3083,7 +3192,7 @@ function wp_handle_comment_submission( $comment_data ) {
 	$user = wp_get_current_user();
 	if ( $user->exists() ) {
 		if ( empty( $user->display_name ) ) {
-			$user->display_name=$user->user_login;
+			$user->display_name = $user->user_login;
 		}
 		$comment_author       = $user->display_name;
 		$comment_author_email = $user->user_email;
diff --git a/wp-includes/compat.php b/wp-includes/compat.php
index af76006303..7377a384c8 100644
--- a/wp-includes/compat.php
+++ b/wp-includes/compat.php
@@ -7,8 +7,8 @@
  */
 
 // If gettext isn't available
-if ( !function_exists('_') ) {
-	function _($string) {
+if ( ! function_exists( '_' ) ) {
+	function _( $string ) {
 		return $string;
 	}
 }
@@ -125,7 +125,7 @@ function _mb_substr( $str, $start, $length = null, $encoding = null ) {
 
 		$chars = array_merge( $chars, $pieces );
 
-	// If there's anything left over, repeat the loop.
+		// If there's anything left over, repeat the loop.
 	} while ( count( $pieces ) > 1 && $str = array_pop( $pieces ) );
 
 	return join( '', array_slice( $chars, $start, $length ) );
@@ -209,33 +209,33 @@ function _mb_strlen( $str, $encoding = null ) {
 		// Increment.
 		$count += count( $pieces );
 
-	// If there's anything left over, repeat the loop.
+		// If there's anything left over, repeat the loop.
 	} while ( $str = array_pop( $pieces ) );
 
 	// Fencepost: preg_split() always returns one extra item in the array.
 	return --$count;
 }
 
-if ( !function_exists('hash_hmac') ):
-/**
- * Compat function to mimic hash_hmac().
- *
- * @ignore
- * @since 3.2.0
- *
- * @see _hash_hmac()
- *
- * @param string $algo       Hash algorithm. Accepts 'md5' or 'sha1'.
- * @param string $data       Data to be hashed.
- * @param string $key        Secret key to use for generating the hash.
- * @param bool   $raw_output Optional. Whether to output raw binary data (true),
- *                           or lowercase hexits (false). Default false.
- * @return string|false The hash in output determined by `$raw_output`. False if `$algo`
- *                      is unknown or invalid.
- */
-function hash_hmac($algo, $data, $key, $raw_output = false) {
-	return _hash_hmac($algo, $data, $key, $raw_output);
-}
+if ( ! function_exists( 'hash_hmac' ) ) :
+	/**
+	 * Compat function to mimic hash_hmac().
+	 *
+	 * @ignore
+	 * @since 3.2.0
+	 *
+	 * @see _hash_hmac()
+	 *
+	 * @param string $algo       Hash algorithm. Accepts 'md5' or 'sha1'.
+	 * @param string $data       Data to be hashed.
+	 * @param string $key        Secret key to use for generating the hash.
+	 * @param bool   $raw_output Optional. Whether to output raw binary data (true),
+	 *                           or lowercase hexits (false). Default false.
+	 * @return string|false The hash in output determined by `$raw_output`. False if `$algo`
+	 *                      is unknown or invalid.
+	 */
+	function hash_hmac( $algo, $data, $key, $raw_output = false ) {
+		return _hash_hmac( $algo, $data, $key, $raw_output );
+	}
 endif;
 
 /**
@@ -252,30 +252,36 @@ endif;
  * @return string|false The hash in output determined by `$raw_output`. False if `$algo`
  *                      is unknown or invalid.
  */
-function _hash_hmac($algo, $data, $key, $raw_output = false) {
-	$packs = array('md5' => 'H32', 'sha1' => 'H40');
+function _hash_hmac( $algo, $data, $key, $raw_output = false ) {
+	$packs = array(
+		'md5'  => 'H32',
+		'sha1' => 'H40',
+	);
 
-	if ( !isset($packs[$algo]) )
+	if ( ! isset( $packs[ $algo ] ) ) {
 		return false;
+	}
 
-	$pack = $packs[$algo];
+	$pack = $packs[ $algo ];
 
-	if (strlen($key) > 64)
-		$key = pack($pack, $algo($key));
+	if ( strlen( $key ) > 64 ) {
+		$key = pack( $pack, $algo( $key ) );
+	}
 
-	$key = str_pad($key, 64, chr(0));
+	$key = str_pad( $key, 64, chr( 0 ) );
 
-	$ipad = (substr($key, 0, 64) ^ str_repeat(chr(0x36), 64));
-	$opad = (substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64));
+	$ipad = ( substr( $key, 0, 64 ) ^ str_repeat( chr( 0x36 ), 64 ) );
+	$opad = ( substr( $key, 0, 64 ) ^ str_repeat( chr( 0x5C ), 64 ) );
 
-	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
+	$hmac = $algo( $opad . pack( $pack, $algo( $ipad . $data ) ) );
 
-	if ( $raw_output )
+	if ( $raw_output ) {
 		return pack( $pack, $hmac );
+	}
 	return $hmac;
 }
 
-if ( !function_exists('json_encode') ) {
+if ( ! function_exists( 'json_encode' ) ) {
 	function json_encode( $string ) {
 		global $wp_json;
 
@@ -288,7 +294,7 @@ if ( !function_exists('json_encode') ) {
 	}
 }
 
-if ( !function_exists('json_decode') ) {
+if ( ! function_exists( 'json_decode' ) ) {
 	/**
 	 * @global Services_JSON $wp_json
 	 * @param string $string
@@ -298,14 +304,15 @@ if ( !function_exists('json_decode') ) {
 	function json_decode( $string, $assoc_array = false ) {
 		global $wp_json;
 
-		if ( ! ($wp_json instanceof Services_JSON ) ) {
+		if ( ! ( $wp_json instanceof Services_JSON ) ) {
 			require_once( ABSPATH . WPINC . '/class-json.php' );
 			$wp_json = new Services_JSON();
 		}
 
 		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
+		if ( $assoc_array ) {
 			$res = _json_decode_object_helper( $res );
+		}
 		return $res;
 	}
 
@@ -313,43 +320,44 @@ if ( !function_exists('json_decode') ) {
 	 * @param object $data
 	 * @return array
 	 */
-	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
-			$data = get_object_vars($data);
-		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
+	function _json_decode_object_helper( $data ) {
+		if ( is_object( $data ) ) {
+			$data = get_object_vars( $data );
+		}
+		return is_array( $data ) ? array_map( __FUNCTION__, $data ) : $data;
 	}
 }
 
 if ( ! function_exists( 'hash_equals' ) ) :
-/**
- * Timing attack safe string comparison
- *
- * Compares two strings using the same time whether they're equal or not.
- *
- * This function was added in PHP 5.6.
- *
- * Note: It can leak the length of a string when arguments of differing length are supplied.
- *
- * @since 3.9.2
- *
- * @param string $a Expected string.
- * @param string $b Actual, user supplied, string.
- * @return bool Whether strings are equal.
- */
-function hash_equals( $a, $b ) {
-	$a_length = strlen( $a );
-	if ( $a_length !== strlen( $b ) ) {
-		return false;
-	}
-	$result = 0;
+	/**
+	 * Timing attack safe string comparison
+	 *
+	 * Compares two strings using the same time whether they're equal or not.
+	 *
+	 * This function was added in PHP 5.6.
+	 *
+	 * Note: It can leak the length of a string when arguments of differing length are supplied.
+	 *
+	 * @since 3.9.2
+	 *
+	 * @param string $a Expected string.
+	 * @param string $b Actual, user supplied, string.
+	 * @return bool Whether strings are equal.
+	 */
+	function hash_equals( $a, $b ) {
+		$a_length = strlen( $a );
+		if ( $a_length !== strlen( $b ) ) {
+			return false;
+		}
+		$result = 0;
 
-	// Do not attempt to "optimize" this.
-	for ( $i = 0; $i < $a_length; $i++ ) {
-		$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
-	}
+		// Do not attempt to "optimize" this.
+		for ( $i = 0; $i < $a_length; $i++ ) {
+			$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
+		}
 
-	return $result === 0;
-}
+		return $result === 0;
+	}
 endif;
 
 // JSON_PRETTY_PRINT was introduced in PHP 5.4
diff --git a/wp-includes/cron.php b/wp-includes/cron.php
index 3b4d094928..fbf5a629af 100644
--- a/wp-includes/cron.php
+++ b/wp-includes/cron.php
@@ -28,20 +28,25 @@
  * @param array  $args       Optional. Array containing each separate argument to pass to the hook's callback function.
  * @return false|void False if the event did not get scheduled.
  */
-function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
+function wp_schedule_single_event( $timestamp, $hook, $args = array() ) {
 	// Make sure timestamp is a positive integer
 	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
 		return false;
 	}
 
 	// Don't schedule a duplicate if there's already an identical event due within 10 minutes of it
-	$next = wp_next_scheduled($hook, $args);
+	$next = wp_next_scheduled( $hook, $args );
 	if ( $next && abs( $next - $timestamp ) <= 10 * MINUTE_IN_SECONDS ) {
 		return false;
 	}
 
 	$crons = _get_cron_array();
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => false, 'args' => $args );
+	$event = (object) array(
+		'hook'      => $hook,
+		'timestamp' => $timestamp,
+		'schedule'  => false,
+		'args'      => $args,
+	);
 
 	/**
 	 * Filters a single event before it is scheduled.
@@ -61,13 +66,17 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
 	$event = apply_filters( 'schedule_event', $event );
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event ) {
 		return false;
+	}
 
-	$key = md5(serialize($event->args));
+	$key = md5( serialize( $event->args ) );
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args );
-	uksort( $crons, "strnatcasecmp" );
+	$crons[ $event->timestamp ][ $event->hook ][ $key ] = array(
+		'schedule' => $event->schedule,
+		'args'     => $event->args,
+	);
+	uksort( $crons, 'strnatcasecmp' );
 	_set_cron_array( $crons );
 }
 
@@ -98,30 +107,42 @@ function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
  * @param array  $args       Optional. Array containing each separate argument to pass to the hook's callback function.
  * @return false|void False if the event did not get scheduled.
  */
-function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
+function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
 	// Make sure timestamp is a positive integer
 	if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
 		return false;
 	}
 
-	$crons = _get_cron_array();
+	$crons     = _get_cron_array();
 	$schedules = wp_get_schedules();
 
-	if ( !isset( $schedules[$recurrence] ) )
+	if ( ! isset( $schedules[ $recurrence ] ) ) {
 		return false;
+	}
 
-	$event = (object) array( 'hook' => $hook, 'timestamp' => $timestamp, 'schedule' => $recurrence, 'args' => $args, 'interval' => $schedules[$recurrence]['interval'] );
+	$event = (object) array(
+		'hook'      => $hook,
+		'timestamp' => $timestamp,
+		'schedule'  => $recurrence,
+		'args'      => $args,
+		'interval'  => $schedules[ $recurrence ]['interval'],
+	);
 	/** This filter is documented in wp-includes/cron.php */
 	$event = apply_filters( 'schedule_event', $event );
 
 	// A plugin disallowed this event
-	if ( ! $event )
+	if ( ! $event ) {
 		return false;
+	}
 
-	$key = md5(serialize($event->args));
+	$key = md5( serialize( $event->args ) );
 
-	$crons[$event->timestamp][$event->hook][$key] = array( 'schedule' => $event->schedule, 'args' => $event->args, 'interval' => $event->interval );
-	uksort( $crons, "strnatcasecmp" );
+	$crons[ $event->timestamp ][ $event->hook ][ $key ] = array(
+		'schedule' => $event->schedule,
+		'args'     => $event->args,
+		'interval' => $event->interval,
+	);
+	uksort( $crons, 'strnatcasecmp' );
 	_set_cron_array( $crons );
 }
 
@@ -142,10 +163,10 @@ function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() )
 		return false;
 	}
 
-	$crons = _get_cron_array();
+	$crons     = _get_cron_array();
 	$schedules = wp_get_schedules();
-	$key = md5( serialize( $args ) );
-	$interval = 0;
+	$key       = md5( serialize( $args ) );
+	$interval  = 0;
 
 	// First we try to get it from the schedule
 	if ( isset( $schedules[ $recurrence ] ) ) {
@@ -193,12 +214,14 @@ function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
 	}
 
 	$crons = _get_cron_array();
-	$key = md5(serialize($args));
-	unset( $crons[$timestamp][$hook][$key] );
-	if ( empty($crons[$timestamp][$hook]) )
-		unset( $crons[$timestamp][$hook] );
-	if ( empty($crons[$timestamp]) )
-		unset( $crons[$timestamp] );
+	$key   = md5( serialize( $args ) );
+	unset( $crons[ $timestamp ][ $hook ][ $key ] );
+	if ( empty( $crons[ $timestamp ][ $hook ] ) ) {
+		unset( $crons[ $timestamp ][ $hook ] );
+	}
+	if ( empty( $crons[ $timestamp ] ) ) {
+		unset( $crons[ $timestamp ] );
+	}
 	_set_cron_array( $crons );
 }
 
@@ -213,8 +236,8 @@ function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
 function wp_clear_scheduled_hook( $hook, $args = array() ) {
 	// Backward compatibility
 	// Previously this function took the arguments as discrete vars rather than an array like the rest of the API
-	if ( !is_array($args) ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0', __('This argument has changed to an array to match the behavior of the other cron functions.') );
+	if ( ! is_array( $args ) ) {
+		_deprecated_argument( __FUNCTION__, '3.0.0', __( 'This argument has changed to an array to match the behavior of the other cron functions.' ) );
 		$args = array_slice( func_get_args(), 1 );
 	}
 
@@ -222,8 +245,9 @@ function wp_clear_scheduled_hook( $hook, $args = array() ) {
 	// It's required due to a scenario where wp_unschedule_event() fails due to update_option() failing,
 	// and, wp_next_scheduled() returns the same schedule in an infinite loop.
 	$crons = _get_cron_array();
-	if ( empty( $crons ) )
+	if ( empty( $crons ) ) {
 		return;
+	}
 
 	$key = md5( serialize( $args ) );
 	foreach ( $crons as $timestamp => $cron ) {
@@ -245,7 +269,7 @@ function wp_clear_scheduled_hook( $hook, $args = array() ) {
 function wp_unschedule_hook( $hook ) {
 	$crons = _get_cron_array();
 
-	foreach( $crons as $timestamp => $args ) {
+	foreach ( $crons as $timestamp => $args ) {
 		unset( $crons[ $timestamp ][ $hook ] );
 
 		if ( empty( $crons[ $timestamp ] ) ) {
@@ -269,12 +293,14 @@ function wp_unschedule_hook( $hook ) {
  */
 function wp_next_scheduled( $hook, $args = array() ) {
 	$crons = _get_cron_array();
-	$key = md5(serialize($args));
-	if ( empty($crons) )
+	$key   = md5( serialize( $args ) );
+	if ( empty( $crons ) ) {
 		return false;
+	}
 	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
+		if ( isset( $cron[ $hook ][ $key ] ) ) {
 			return $timestamp;
+		}
 	}
 	return false;
 }
@@ -287,11 +313,13 @@ function wp_next_scheduled( $hook, $args = array() ) {
  * @param int $gmt_time Optional. Unix timestamp (UTC). Default 0 (current time is used).
  */
 function spawn_cron( $gmt_time = 0 ) {
-	if ( ! $gmt_time )
+	if ( ! $gmt_time ) {
 		$gmt_time = microtime( true );
+	}
 
-	if ( defined('DOING_CRON') || isset($_GET['doing_wp_cron']) )
+	if ( defined( 'DOING_CRON' ) || isset( $_GET['doing_wp_cron'] ) ) {
 		return;
+	}
 
 	/*
 	 * Get the cron lock, which is a Unix timestamp of when the last cron was spawned
@@ -300,26 +328,30 @@ function spawn_cron( $gmt_time = 0 ) {
 	 * Multiple processes on multiple web servers can run this code concurrently,
 	 * this lock attempts to make spawning as atomic as possible.
 	 */
-	$lock = get_transient('doing_cron');
+	$lock = get_transient( 'doing_cron' );
 
-	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS )
+	if ( $lock > $gmt_time + 10 * MINUTE_IN_SECONDS ) {
 		$lock = 0;
+	}
 
 	// don't run if another process is currently running it or more than once every 60 sec.
-	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time )
+	if ( $lock + WP_CRON_LOCK_TIMEOUT > $gmt_time ) {
 		return;
+	}
 
 	//sanity check
 	$crons = _get_cron_array();
-	if ( !is_array($crons) )
+	if ( ! is_array( $crons ) ) {
 		return;
+	}
 
 	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {
 		return;
+	}
 
 	if ( defined( 'ALTERNATE_WP_CRON' ) && ALTERNATE_WP_CRON ) {
-		if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) ||  defined( 'XMLRPC_REQUEST' ) ) {
+		if ( 'GET' !== $_SERVER['REQUEST_METHOD'] || defined( 'DOING_AJAX' ) || defined( 'XMLRPC_REQUEST' ) ) {
 			return;
 		}
 
@@ -331,7 +363,8 @@ function spawn_cron( $gmt_time = 0 ) {
 		echo ' ';
 
 		// flush any buffers and send the headers
-		while ( @ob_end_flush() );
+		while ( @ob_end_flush() ) {
+		}
 		flush();
 
 		WP_DEBUG ? include_once( ABSPATH . 'wp-cron.php' ) : @include_once( ABSPATH . 'wp-cron.php' );
@@ -363,16 +396,18 @@ 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(
-		'url'  => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
-		'key'  => $doing_wp_cron,
-		'args' => array(
-			'timeout'   => 0.01,
-			'blocking'  => false,
-			/** This filter is documented in wp-includes/class-wp-http-streams.php */
-			'sslverify' => apply_filters( 'https_local_ssl_verify', false )
-		)
-	), $doing_wp_cron );
+	$cron_request = apply_filters(
+		'cron_request', array(
+			'url'  => add_query_arg( 'doing_wp_cron', $doing_wp_cron, site_url( 'wp-cron.php' ) ),
+			'key'  => $doing_wp_cron,
+			'args' => array(
+				'timeout'   => 0.01,
+				'blocking'  => false,
+				/** This filter is documented in wp-includes/class-wp-http-streams.php */
+				'sslverify' => apply_filters( 'https_local_ssl_verify', false ),
+			),
+		), $doing_wp_cron
+	);
 
 	wp_remote_post( $cron_request['url'], $cron_request['args'] );
 }
@@ -384,23 +419,29 @@ function spawn_cron( $gmt_time = 0 ) {
  */
 function wp_cron() {
 	// Prevent infinite loops caused by lack of wp-cron.php
-	if ( strpos($_SERVER['REQUEST_URI'], '/wp-cron.php') !== false || ( defined('DISABLE_WP_CRON') && DISABLE_WP_CRON ) )
+	if ( strpos( $_SERVER['REQUEST_URI'], '/wp-cron.php' ) !== false || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {
 		return;
+	}
 
-	if ( false === $crons = _get_cron_array() )
+	if ( false === $crons = _get_cron_array() ) {
 		return;
+	}
 
 	$gmt_time = microtime( true );
-	$keys = array_keys( $crons );
-	if ( isset($keys[0]) && $keys[0] > $gmt_time )
+	$keys     = array_keys( $crons );
+	if ( isset( $keys[0] ) && $keys[0] > $gmt_time ) {
 		return;
+	}
 
 	$schedules = wp_get_schedules();
 	foreach ( $crons as $timestamp => $cronhooks ) {
-		if ( $timestamp > $gmt_time ) break;
+		if ( $timestamp > $gmt_time ) {
+			break;
+		}
 		foreach ( (array) $cronhooks as $hook => $args ) {
-			if ( isset($schedules[$hook]['callback']) && !call_user_func( $schedules[$hook]['callback'] ) )
+			if ( isset( $schedules[ $hook ]['callback'] ) && ! call_user_func( $schedules[ $hook ]['callback'] ) ) {
 				continue;
+			}
 			spawn_cron( $gmt_time );
 			break 2;
 		}
@@ -429,19 +470,27 @@ function wp_cron() {
  *     // Filter parameter variable name is 'array'.
  *     $array['weekly'] = array(
  *         'interval' => 604800,
- *     	   'display'  => __( 'Once Weekly' )
+ *         'display'  => __( 'Once Weekly' )
  *     );
  *
- *
  * @since 2.1.0
  *
  * @return array
  */
 function wp_get_schedules() {
 	$schedules = array(
-		'hourly'     => array( 'interval' => HOUR_IN_SECONDS,      'display' => __( 'Once Hourly' ) ),
-		'twicedaily' => array( 'interval' => 12 * HOUR_IN_SECONDS, 'display' => __( 'Twice Daily' ) ),
-		'daily'      => array( 'interval' => DAY_IN_SECONDS,       'display' => __( 'Once Daily' ) ),
+		'hourly'     => array(
+			'interval' => HOUR_IN_SECONDS,
+			'display'  => __( 'Once Hourly' ),
+		),
+		'twicedaily' => array(
+			'interval' => 12 * HOUR_IN_SECONDS,
+			'display'  => __( 'Twice Daily' ),
+		),
+		'daily'      => array(
+			'interval' => DAY_IN_SECONDS,
+			'display'  => __( 'Once Daily' ),
+		),
 	);
 	/**
 	 * Filters the non-default cron schedules.
@@ -464,14 +513,16 @@ function wp_get_schedules() {
  * @param array $args Optional. Arguments passed to the event's callback function.
  * @return string|false False, if no schedule. Schedule name on success.
  */
-function wp_get_schedule($hook, $args = array()) {
+function wp_get_schedule( $hook, $args = array() ) {
 	$crons = _get_cron_array();
-	$key = md5(serialize($args));
-	if ( empty($crons) )
+	$key   = md5( serialize( $args ) );
+	if ( empty( $crons ) ) {
 		return false;
+	}
 	foreach ( $crons as $timestamp => $cron ) {
-		if ( isset( $cron[$hook][$key] ) )
-			return $cron[$hook][$key]['schedule'];
+		if ( isset( $cron[ $hook ][ $key ] ) ) {
+			return $cron[ $hook ][ $key ]['schedule'];
+		}
 	}
 	return false;
 }
@@ -488,15 +539,17 @@ function wp_get_schedule($hook, $args = array()) {
  *
  * @return false|array CRON info array.
  */
-function _get_cron_array()  {
-	$cron = get_option('cron');
-	if ( ! is_array($cron) )
+function _get_cron_array() {
+	$cron = get_option( 'cron' );
+	if ( ! is_array( $cron ) ) {
 		return false;
+	}
 
-	if ( !isset($cron['version']) )
-		$cron = _upgrade_cron_array($cron);
+	if ( ! isset( $cron['version'] ) ) {
+		$cron = _upgrade_cron_array( $cron );
+	}
 
-	unset($cron['version']);
+	unset( $cron['version'] );
 
 	return $cron;
 }
@@ -509,7 +562,7 @@ function _get_cron_array()  {
  *
  * @param array $cron Cron info array from _get_cron_array().
  */
-function _set_cron_array($cron) {
+function _set_cron_array( $cron ) {
 	$cron['version'] = 2;
 	update_option( 'cron', $cron );
 }
@@ -525,16 +578,17 @@ function _set_cron_array($cron) {
  * @param array $cron Cron info array from _get_cron_array().
  * @return array An upgraded Cron info array.
  */
-function _upgrade_cron_array($cron) {
-	if ( isset($cron['version']) && 2 == $cron['version'])
+function _upgrade_cron_array( $cron ) {
+	if ( isset( $cron['version'] ) && 2 == $cron['version'] ) {
 		return $cron;
+	}
 
 	$new_cron = array();
 
-	foreach ( (array) $cron as $timestamp => $hooks) {
+	foreach ( (array) $cron as $timestamp => $hooks ) {
 		foreach ( (array) $hooks as $hook => $args ) {
-			$key = md5(serialize($args['args']));
-			$new_cron[$timestamp][$hook][$key] = $args;
+			$key                                     = md5( serialize( $args['args'] ) );
+			$new_cron[ $timestamp ][ $hook ][ $key ] = $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 50956f8522..38c04f5315 100644
--- a/wp-includes/customize/class-wp-customize-background-image-control.php
+++ b/wp-includes/customize/class-wp-customize-background-image-control.php
@@ -26,10 +26,12 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
 	 */
 	public function __construct( $manager ) {
-		parent::__construct( $manager, 'background_image', array(
-			'label'    => __( 'Background Image' ),
-			'section'  => 'background_image',
-		) );
+		parent::__construct(
+			$manager, 'background_image', array(
+				'label'   => __( 'Background Image' ),
+				'section' => 'background_image',
+			)
+		);
 	}
 
 	/**
@@ -41,11 +43,13 @@ class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
 		parent::enqueue();
 
 		$custom_background = get_theme_support( 'custom-background' );
-		wp_localize_script( 'customize-controls', '_wpCustomizeBackground', array(
-			'defaults' => ! empty( $custom_background[0] ) ? $custom_background[0] : array(),
-			'nonces' => array(
-				'add' => wp_create_nonce( 'background-add' ),
-			),
-		) );
+		wp_localize_script(
+			'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-background-position-control.php b/wp-includes/customize/class-wp-customize-background-position-control.php
index b1cd1a7dfa..bb35b052d0 100644
--- a/wp-includes/customize/class-wp-customize-background-position-control.php
+++ b/wp-includes/customize/class-wp-customize-background-position-control.php
@@ -39,19 +39,46 @@ class WP_Customize_Background_Position_Control extends WP_Customize_Control {
 	public function content_template() {
 		$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' ),
+				'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' ),
+				'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' ),
+				'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',
+				),
 			),
 		);
 		?>
diff --git a/wp-includes/customize/class-wp-customize-code-editor-control.php b/wp-includes/customize/class-wp-customize-code-editor-control.php
index 32fd10962b..0e687a2249 100644
--- a/wp-includes/customize/class-wp-customize-code-editor-control.php
+++ b/wp-includes/customize/class-wp-customize-code-editor-control.php
@@ -47,16 +47,18 @@ class WP_Customize_Code_Editor_Control extends WP_Customize_Control {
 	 * @since 4.9.0
 	 */
 	public function enqueue() {
-		$this->editor_settings = wp_enqueue_code_editor( array_merge(
-			array(
-				'type' => $this->code_type,
-				'codemirror' => array(
-					'indentUnit' => 2,
-					'tabSize' => 2,
+		$this->editor_settings = wp_enqueue_code_editor(
+			array_merge(
+				array(
+					'type'       => $this->code_type,
+					'codemirror' => array(
+						'indentUnit' => 2,
+						'tabSize'    => 2,
+					),
 				),
-			),
-			$this->editor_settings
-		) );
+				$this->editor_settings
+			)
+		);
 	}
 
 	/**
@@ -68,9 +70,9 @@ class WP_Customize_Code_Editor_Control extends WP_Customize_Control {
 	 * @return array Array of parameters passed to the JavaScript.
 	 */
 	public function json() {
-		$json = parent::json();
+		$json                    = parent::json();
 		$json['editor_settings'] = $this->editor_settings;
-		$json['input_attrs'] = $this->input_attrs;
+		$json['input_attrs']     = $this->input_attrs;
 		return $json;
 	}
 
diff --git a/wp-includes/customize/class-wp-customize-color-control.php b/wp-includes/customize/class-wp-customize-color-control.php
index f8538e18d1..dff593bb06 100644
--- a/wp-includes/customize/class-wp-customize-color-control.php
+++ b/wp-includes/customize/class-wp-customize-color-control.php
@@ -48,7 +48,7 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 	 * @param array                $args    Optional. Arguments to override class property defaults.
 	 */
 	public function __construct( $manager, $id, $args = array() ) {
-		$this->statuses = array( '' => __('Default') );
+		$this->statuses = array( '' => __( 'Default' ) );
 		parent::__construct( $manager, $id, $args );
 	}
 
@@ -70,9 +70,9 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['statuses'] = $this->statuses;
+		$this->json['statuses']     = $this->statuses;
 		$this->json['defaultValue'] = $this->setting->default;
-		$this->json['mode'] = $this->mode;
+		$this->json['mode']         = $this->mode;
 	}
 
 	/**
@@ -111,7 +111,7 @@ class WP_Customize_Color_Control extends WP_Customize_Control {
 				<input class="color-picker-hue" type="text" data-type="hue" />
 			<# } else { #>
 				<input class="color-picker-hex" type="text" maxlength="7" placeholder="{{ defaultValue }}" {{ defaultValueAttr }} />
- 			<# } #>
+			 <# } #>
 			</label>
 		</div>
 		<?php
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 7df3fb04a3..d18b9aaaa9 100644
--- a/wp-includes/customize/class-wp-customize-custom-css-setting.php
+++ b/wp-includes/customize/class-wp-customize-custom-css-setting.php
@@ -127,8 +127,8 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 			}
 		}
 		$id_base = $this->id_data['base'];
-		$value = '';
-		$post = wp_get_custom_css_post( $this->stylesheet );
+		$value   = '';
+		$post    = wp_get_custom_css_post( $this->stylesheet );
 		if ( $post ) {
 			$value = $post->post_content;
 		}
@@ -180,9 +180,11 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting {
 			$css = '';
 		}
 
-		$r = wp_update_custom_css_post( $css, array(
-			'stylesheet' => $this->stylesheet,
-		) );
+		$r = wp_update_custom_css_post(
+			$css, array(
+				'stylesheet' => $this->stylesheet,
+			)
+		);
 
 		if ( $r instanceof WP_Error ) {
 			return false;
diff --git a/wp-includes/customize/class-wp-customize-date-time-control.php b/wp-includes/customize/class-wp-customize-date-time-control.php
index fdaa6837dc..11c5b67cb9 100644
--- a/wp-includes/customize/class-wp-customize-date-time-control.php
+++ b/wp-includes/customize/class-wp-customize-date-time-control.php
@@ -81,11 +81,11 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control {
 	public function json() {
 		$data = parent::json();
 
-		$data['maxYear'] = intval( $this->max_year );
-		$data['minYear'] = intval( $this->min_year );
-		$data['allowPastDate'] = (bool) $this->allow_past_date;
+		$data['maxYear']          = intval( $this->max_year );
+		$data['minYear']          = intval( $this->min_year );
+		$data['allowPastDate']    = (bool) $this->allow_past_date;
 		$data['twelveHourFormat'] = (bool) $this->twelve_hour_format;
-		$data['includeTime'] = (bool) $this->include_time;
+		$data['includeTime']      = (bool) $this->include_time;
 
 		return $data;
 	}
@@ -96,7 +96,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control {
 	 * @since 4.9.0
 	 */
 	public function content_template() {
-		$data = array_merge( $this->json(), $this->get_month_choices() );
+		$data          = array_merge( $this->json(), $this->get_month_choices() );
 		$timezone_info = $this->get_timezone_info();
 
 		$date_format = get_option( 'date_format' );
@@ -198,7 +198,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control {
 			$month_text = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
 
 			/* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
-			$months[ $i ]['text'] = sprintf( __( '%1$s-%2$s' ), $i, $month_text );
+			$months[ $i ]['text']  = sprintf( __( '%1$s-%2$s' ), $i, $month_text );
 			$months[ $i ]['value'] = $i;
 		}
 		return array(
@@ -214,7 +214,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control {
 	 * @return array abbr and description.
 	 */
 	public function get_timezone_info() {
-		$tz_string = get_option( 'timezone_string' );
+		$tz_string     = get_option( 'timezone_string' );
 		$timezone_info = array();
 
 		if ( $tz_string ) {
@@ -225,9 +225,9 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control {
 			}
 
 			if ( $tz ) {
-				$now = new DateTime( 'now', $tz );
-				$formatted_gmt_offset = sprintf( 'UTC%s', $this->format_gmt_offset( $tz->getOffset( $now ) / 3600 ) );
-				$tz_name = str_replace( '_', ' ', $tz->getName() );
+				$now                   = new DateTime( 'now', $tz );
+				$formatted_gmt_offset  = sprintf( 'UTC%s', $this->format_gmt_offset( $tz->getOffset( $now ) / 3600 ) );
+				$tz_name               = str_replace( '_', ' ', $tz->getName() );
 				$timezone_info['abbr'] = $now->format( 'T' );
 
 				/* translators: 1: timezone name, 2: timezone abbreviation, 3: gmt offset  */
@@ -236,7 +236,7 @@ class WP_Customize_Date_Time_Control extends WP_Customize_Control {
 				$timezone_info['description'] = '';
 			}
 		} else {
-			$formatted_gmt_offset = $this->format_gmt_offset( intval( get_option( 'gmt_offset', 0 ) ) );
+			$formatted_gmt_offset  = $this->format_gmt_offset( intval( get_option( 'gmt_offset', 0 ) ) );
 			$timezone_info['abbr'] = sprintf( 'UTC%s', $formatted_gmt_offset );
 
 			/* translators: %s: UTC offset  */
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 edc8f891b2..68262dd62c 100644
--- a/wp-includes/customize/class-wp-customize-header-image-control.php
+++ b/wp-includes/customize/class-wp-customize-header-image-control.php
@@ -27,16 +27,18 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	 * @param WP_Customize_Manager $manager Customizer bootstrap instance.
 	 */
 	public function __construct( $manager ) {
-		parent::__construct( $manager, 'header_image', array(
-			'label'    => __( 'Header Image' ),
-			'settings' => array(
-				'default' => 'header_image',
-				'data'    => 'header_image_data',
-			),
-			'section'  => 'header_image',
-			'removed'  => 'remove-header',
-			'get_url'  => 'get_header_image',
-		) );
+		parent::__construct(
+			$manager, 'header_image', array(
+				'label'    => __( 'Header Image' ),
+				'settings' => array(
+					'default' => 'header_image',
+					'data'    => 'header_image_data',
+				),
+				'section'  => 'header_image',
+				'removed'  => 'remove-header',
+				'get_url'  => 'get_header_image',
+			)
+		);
 
 	}
 
@@ -48,27 +50,28 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 
 		$this->prepare_control();
 
-		wp_localize_script( 'customize-views', '_wpCustomizeHeader', array(
-			'data' => array(
-				'width' => absint( get_theme_support( 'custom-header', 'width' ) ),
-				'height' => absint( get_theme_support( 'custom-header', 'height' ) ),
-				'flex-width' => absint( get_theme_support( 'custom-header', 'flex-width' ) ),
-				'flex-height' => absint( get_theme_support( 'custom-header', 'flex-height' ) ),
-				'currentImgSrc' => $this->get_current_image_src(),
-			),
-			'nonces' => array(
-				'add' => wp_create_nonce( 'header-add' ),
-				'remove' => wp_create_nonce( 'header-remove' ),
-			),
-			'uploads' => $this->uploaded_headers,
-			'defaults' => $this->default_headers
-		) );
+		wp_localize_script(
+			'customize-views', '_wpCustomizeHeader', array(
+				'data'     => array(
+					'width'         => absint( get_theme_support( 'custom-header', 'width' ) ),
+					'height'        => absint( get_theme_support( 'custom-header', 'height' ) ),
+					'flex-width'    => absint( get_theme_support( 'custom-header', 'flex-width' ) ),
+					'flex-height'   => absint( get_theme_support( 'custom-header', 'flex-height' ) ),
+					'currentImgSrc' => $this->get_current_image_src(),
+				),
+				'nonces'   => array(
+					'add'    => wp_create_nonce( 'header-add' ),
+					'remove' => wp_create_nonce( 'header-remove' ),
+				),
+				'uploads'  => $this->uploaded_headers,
+				'defaults' => $this->default_headers,
+			)
+		);
 
 		parent::enqueue();
 	}
 
 	/**
-	 *
 	 * @global Custom_Image_Header $custom_image_header
 	 */
 	public function prepare_control() {
@@ -81,7 +84,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 
 		// Process default headers and uploaded headers.
 		$custom_image_header->process_default_headers();
-		$this->default_headers = $custom_image_header->get_default_header_images();
+		$this->default_headers  = $custom_image_header->get_default_header_images();
 		$this->uploaded_headers = $custom_image_header->get_uploaded_header_images();
 	}
 
@@ -160,13 +163,15 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 	 */
 	public function render_content() {
 		$visibility = $this->get_current_image_src() ? '' : ' style="display:none" ';
-		$width = absint( get_theme_support( 'custom-header', 'width' ) );
-		$height = absint( get_theme_support( 'custom-header', 'height' ) );
+		$width      = absint( get_theme_support( 'custom-header', 'width' ) );
+		$height     = absint( get_theme_support( 'custom-header', 'height' ) );
 		?>
 		<div class="customize-control-content">
-			<?php if ( current_theme_supports( 'custom-header', 'video' ) ) {
+			<?php
+			if ( current_theme_supports( 'custom-header', 'video' ) ) {
 				echo '<span class="customize-control-title">' . $this->label . '</span>';
-			} ?>
+			}
+			?>
 			<div class="customize-control-notifications-container"></div>
 			<p class="customizer-section-intro customize-control-description">
 				<?php
@@ -174,17 +179,20 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 					_e( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image that matches the size of your video &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' );
 				} elseif ( $width && $height ) {
 					/* translators: %s: header size in pixels */
-					printf( __( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header size of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
+					printf(
+						__( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header size of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
 						sprintf( '<strong>%s &times; %s</strong>', $width, $height )
 					);
 				} elseif ( $width ) {
 					/* translators: %s: header width in pixels */
-					printf( __( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header width of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
+					printf(
+						__( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header width of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
 						sprintf( '<strong>%s</strong>', $width )
 					);
 				} else {
 					/* translators: %s: header height in pixels */
-					printf( __( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header height of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
+					printf(
+						__( 'Click &#8220;Add new image&#8221; to upload an image file from your computer. Your theme works best with an image with a header height of %s pixels &#8212; you&#8217;ll be able to crop your image once you upload it for a perfect fit.' ),
 						sprintf( '<strong>%s</strong>', $height )
 					);
 				}
@@ -200,7 +208,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 				</div>
 			</div>
 			<div class="actions">
-				<?php if ( current_user_can( 'upload_files' ) ): ?>
+				<?php if ( current_user_can( 'upload_files' ) ) : ?>
 				<button type="button"<?php echo $visibility; ?> class="button remove" aria-label="<?php esc_attr_e( 'Hide header image' ); ?>"><?php _e( 'Hide image' ); ?></button>
 				<button type="button" class="button new" id="header_image-button" aria-label="<?php esc_attr_e( 'Add new header image' ); ?>"><?php _e( 'Add new image' ); ?></button>
 				<?php endif; ?>
diff --git a/wp-includes/customize/class-wp-customize-header-image-setting.php b/wp-includes/customize/class-wp-customize-header-image-setting.php
index af5c516243..e486e7e0b6 100644
--- a/wp-includes/customize/class-wp-customize-header-image-setting.php
+++ b/wp-includes/customize/class-wp-customize-header-image-setting.php
@@ -32,20 +32,22 @@ final class WP_Customize_Header_Image_Setting extends WP_Customize_Setting {
 		// If _custom_header_background_just_in_time() fails to initialize $custom_image_header when not is_admin().
 		if ( empty( $custom_image_header ) ) {
 			require_once( ABSPATH . 'wp-admin/custom-header.php' );
-			$args = get_theme_support( 'custom-header' );
-			$admin_head_callback = isset( $args[0]['admin-head-callback'] ) ? $args[0]['admin-head-callback'] : null;
+			$args                   = get_theme_support( 'custom-header' );
+			$admin_head_callback    = isset( $args[0]['admin-head-callback'] ) ? $args[0]['admin-head-callback'] : null;
 			$admin_preview_callback = isset( $args[0]['admin-preview-callback'] ) ? $args[0]['admin-preview-callback'] : null;
-			$custom_image_header = new Custom_Image_Header( $admin_head_callback, $admin_preview_callback );
+			$custom_image_header    = new Custom_Image_Header( $admin_head_callback, $admin_preview_callback );
 		}
 
 		// If the value doesn't exist (removed or random),
 		// use the header_image value.
-		if ( ! $value )
-			$value = $this->manager->get_setting('header_image')->post_value();
+		if ( ! $value ) {
+			$value = $this->manager->get_setting( 'header_image' )->post_value();
+		}
 
-		if ( is_array( $value ) && isset( $value['choice'] ) )
+		if ( is_array( $value ) && isset( $value['choice'] ) ) {
 			$custom_image_header->set_header_image( $value['choice'] );
-		else
+		} else {
 			$custom_image_header->set_header_image( $value );
+		}
 	}
 }
diff --git a/wp-includes/customize/class-wp-customize-image-control.php b/wp-includes/customize/class-wp-customize-image-control.php
index d056f8be61..6244579414 100644
--- a/wp-includes/customize/class-wp-customize-image-control.php
+++ b/wp-includes/customize/class-wp-customize-image-control.php
@@ -15,7 +15,7 @@
  * @see WP_Customize_Upload_Control
  */
 class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
-	public $type = 'image';
+	public $type      = 'image';
 	public $mime_type = 'image';
 
 	/**
@@ -34,7 +34,7 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
 	 */
 	public function add_tab( $id, $label, $callback ) {
 		_deprecated_function( __METHOD__, '4.1.0' );
-    }
+	}
 
 	/**
 	 * @since 3.4.0
@@ -44,7 +44,7 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
 	 */
 	public function remove_tab( $id ) {
 		_deprecated_function( __METHOD__, '4.1.0' );
-    }
+	}
 
 	/**
 	 * @since 3.4.0
@@ -55,5 +55,5 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
 	 */
 	public function print_tab_image( $url, $thumbnail_url = null ) {
 		_deprecated_function( __METHOD__, '4.1.0' );
-    }
+	}
 }
diff --git a/wp-includes/customize/class-wp-customize-media-control.php b/wp-includes/customize/class-wp-customize-media-control.php
index 33540c3fda..338324fd36 100644
--- a/wp-includes/customize/class-wp-customize-media-control.php
+++ b/wp-includes/customize/class-wp-customize-media-control.php
@@ -75,10 +75,10 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	 */
 	public function to_json() {
 		parent::to_json();
-		$this->json['label'] = html_entity_decode( $this->label, ENT_QUOTES, get_bloginfo( 'charset' ) );
-		$this->json['mime_type'] = $this->mime_type;
+		$this->json['label']         = html_entity_decode( $this->label, ENT_QUOTES, get_bloginfo( 'charset' ) );
+		$this->json['mime_type']     = $this->mime_type;
 		$this->json['button_labels'] = $this->button_labels;
-		$this->json['canUpload'] = current_user_can( 'upload_files' );
+		$this->json['canUpload']     = current_user_can( 'upload_files' );
 
 		$value = $this->value();
 
@@ -86,12 +86,12 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 			if ( $this->setting->default ) {
 				// Fake an attachment model - needs all fields used by template.
 				// Note that the default value must be a URL, NOT an attachment ID.
-				$type = in_array( substr( $this->setting->default, -3 ), array( 'jpg', 'png', 'gif', 'bmp' ) ) ? 'image' : 'document';
+				$type               = in_array( substr( $this->setting->default, -3 ), array( 'jpg', 'png', 'gif', 'bmp' ) ) ? 'image' : 'document';
 				$default_attachment = array(
-					'id' => 1,
-					'url' => $this->setting->default,
-					'type' => $type,
-					'icon' => wp_mime_type_icon( $type ),
+					'id'    => 1,
+					'url'   => $this->setting->default,
+					'type'  => $type,
+					'icon'  => wp_mime_type_icon( $type ),
 					'title' => basename( $this->setting->default ),
 				);
 
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
index 424c8ba5d0..28fea1848f 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
@@ -67,14 +67,18 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 					<span class="menu-item-title<# if ( ! data.title && ! data.original_title ) { #> no-title<# } #>">{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}</span>
 				</span>
 				<span class="item-controls">
-					<button type="button" class="button-link item-edit" aria-expanded="false"><span class="screen-reader-text"><?php
+					<button type="button" class="button-link item-edit" aria-expanded="false"><span class="screen-reader-text">
+					<?php
 						/* translators: 1: Title of a menu item, 2: Type of a menu item */
 						printf( __( 'Edit menu item: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}' );
-					?></span><span class="toggle-indicator" aria-hidden="true"></span></button>
-					<button type="button" class="button-link item-delete submitdelete deletion"><span class="screen-reader-text"><?php
+					?>
+					</span><span class="toggle-indicator" aria-hidden="true"></span></button>
+					<button type="button" class="button-link item-delete submitdelete deletion"><span class="screen-reader-text">
+					<?php
 						/* translators: 1: Title of a menu item, 2: Type of a menu item */
 						printf( __( 'Remove Menu Item: %1$s (%2$s)' ), '{{ data.title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}' );
-					?></span></button>
+					?>
+					</span></button>
 				</span>
 			</div>
 		</div>
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 b3a9954d22..545c2f6ba0 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
@@ -233,7 +233,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 				$post = get_post( $this->post_id );
 				if ( $post && self::POST_TYPE === $post->post_type ) {
 					$is_title_empty = empty( $post->post_title );
-					$value = (array) wp_setup_nav_menu_item( $post );
+					$value          = (array) wp_setup_nav_menu_item( $post );
 					if ( $is_title_empty ) {
 						$value['title'] = '';
 					}
@@ -352,9 +352,11 @@ 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(
-				'fields' => 'ids',
-			) );
+			$menus = wp_get_post_terms(
+				$this->post_id, WP_Customize_Nav_Menu_Setting::TAXONOMY, array(
+					'fields' => 'ids',
+				)
+			);
 			if ( ! empty( $menus ) ) {
 				$this->value['nav_menu_term_id'] = array_shift( $menus );
 			} else {
@@ -379,7 +381,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 
 		if ( ! isset( $this->value['_invalid'] ) ) {
 			$this->value['_invalid'] = false;
-			$is_known_invalid = (
+			$is_known_invalid        = (
 				( ( 'post_type' === $this->value['type'] || 'post_type_archive' === $this->value['type'] ) && ! post_type_exists( $this->value['object'] ) )
 				||
 				( 'taxonomy' === $this->value['type'] && ! taxonomy_exists( $this->value['object'] ) )
@@ -435,9 +437,9 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 			return false;
 		}
 
-		$undefined = new stdClass();
+		$undefined      = new stdClass();
 		$is_placeholder = ( $this->post_id < 0 );
-		$is_dirty = ( $undefined !== $this->post_value( $undefined ) );
+		$is_dirty       = ( $undefined !== $this->post_value( $undefined ) );
 		if ( ! $is_placeholder && ! $is_dirty ) {
 			return false;
 		}
@@ -472,7 +474,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 	 * @return array Array of menu items,
 	 */
 	public function filter_wp_get_nav_menu_items( $items, $menu, $args ) {
-		$this_item = $this->value();
+		$this_item                = $this->value();
 		$current_nav_menu_term_id = $this_item['nav_menu_term_id'];
 		unset( $this_item['nav_menu_term_id'] );
 
@@ -507,7 +509,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 			return $filtered_items;
 		}
 
-		$mutated = false;
+		$mutated       = false;
 		$should_update = (
 			is_array( $this_item )
 			&&
@@ -555,10 +557,12 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 		}
 
 		if ( ARRAY_A === $args['output'] ) {
-			$items = wp_list_sort( $items, array(
-				$args['output_key'] => 'ASC',
-			) );
-			$i = 1;
+			$items = wp_list_sort(
+				$items, array(
+					$args['output_key'] => 'ASC',
+				)
+			);
+			$i     = 1;
 
 			foreach ( $items as $k => $item ) {
 				$items[ $k ]->{$args['output_key']} = $i++;
@@ -582,7 +586,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 		$item->post_status = $item->status;
 		unset( $item->status );
 
-		$item->post_type = 'nav_menu_item';
+		$item->post_type  = 'nav_menu_item';
 		$item->menu_order = $item->position;
 		unset( $item->position );
 
@@ -596,9 +600,9 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 			$item->post_title = $item->title;
 		}
 
-		$item->ID = $this->post_id;
+		$item->ID    = $this->post_id;
 		$item->db_id = $this->post_id;
-		$post = new WP_Post( (object) $item );
+		$post        = new WP_Post( (object) $item );
 
 		if ( empty( $post->post_author ) ) {
 			$post->post_author = get_current_user_id();
@@ -655,7 +659,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 			return null;
 		}
 
-		$default = array(
+		$default                     = array(
 			'object_id'        => 0,
 			'object'           => '',
 			'menu_item_parent' => 0,
@@ -673,8 +677,8 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 			'nav_menu_term_id' => 0,
 			'_invalid'         => false,
 		);
-		$menu_item_value = array_merge( $default, $menu_item_value );
-		$menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
+		$menu_item_value             = array_merge( $default, $menu_item_value );
+		$menu_item_value             = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
 		$menu_item_value['position'] = intval( $menu_item_value['position'] );
 
 		foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
@@ -849,12 +853,12 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting {
 
 			if ( is_wp_error( $r ) ) {
 				$this->update_status = 'error';
-				$this->update_error = $r;
+				$this->update_error  = $r;
 			} else {
 				if ( $is_placeholder ) {
 					$this->previous_post_id = $this->post_id;
-					$this->post_id = $r;
-					$this->update_status = 'inserted';
+					$this->post_id          = $r;
+					$this->update_status    = 'inserted';
 				} else {
 					$this->update_status = 'updated';
 				}
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php b/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
index 868dcf4db7..2fda036299 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-locations-control.php
@@ -51,7 +51,8 @@ class WP_Customize_Nav_Menu_Locations_Control extends WP_Customize_Control {
 									_x( '(If you plan to use a menu <a href="%1$s" %2$s>widget%3$s</a>, skip this step.)', 'menu locations' ),
 									__( 'https://codex.wordpress.org/WordPress_Widgets' ),
 									' class="external-link" target="_blank"',
-									sprintf( '<span class="screen-reader-text"> %s</span>',
+									sprintf(
+										'<span class="screen-reader-text"> %s</span>',
 										/* translators: accessibility text */
 										__( '(opens in a new window)' )
 									)
@@ -74,7 +75,8 @@ class WP_Customize_Nav_Menu_Locations_Control extends WP_Customize_Control {
 								<span class="theme-location-set">
 									<?php
 									/* translators: %s: menu name */
-									printf( _x( '(Current: %s)', 'menu location' ),
+									printf(
+										_x( '(Current: %s)', 'menu location' ),
 										'<span class="current-menu-location-name-' . esc_attr( $location ) . '"></span>'
 									);
 									?>
diff --git a/wp-includes/customize/class-wp-customize-nav-menu-section.php b/wp-includes/customize/class-wp-customize-nav-menu-section.php
index c7fb5a6182..bbb5f95e7d 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-section.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-section.php
@@ -33,7 +33,7 @@ class WP_Customize_Nav_Menu_Section extends WP_Customize_Section {
 	 * @return array Exported parameters.
 	 */
 	public function json() {
-		$exported = parent::json();
+		$exported            = parent::json();
 		$exported['menu_id'] = intval( preg_replace( '/^nav_menu\[(-?\d+)\]/', '$1', $this->id ) );
 
 		return $exported;
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 e3205e060a..44c99bacfd 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-setting.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-setting.php
@@ -206,9 +206,9 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 			return false;
 		}
 
-		$undefined = new stdClass();
+		$undefined      = new stdClass();
 		$is_placeholder = ( $this->term_id < 0 );
-		$is_dirty = ( $undefined !== $this->post_value( $undefined ) );
+		$is_dirty       = ( $undefined !== $this->post_value( $undefined ) );
 		if ( ! $is_placeholder && ! $is_dirty ) {
 			return false;
 		}
@@ -242,8 +242,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 		}
 
 		$setting_value = $this->value();
-		$is_delete = ( false === $setting_value );
-		$index = -1;
+		$is_delete     = ( false === $setting_value );
+		$index         = -1;
 
 		// Find the existing menu item's position in the list.
 		foreach ( $menus as $i => $menu ) {
@@ -260,24 +260,28 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 			}
 		} else {
 			// Handle menus being updated or inserted.
-			$menu_obj = (object) array_merge( array(
-				'term_id'          => $this->term_id,
-				'term_taxonomy_id' => $this->term_id,
-				'slug'             => sanitize_title( $setting_value['name'] ),
-				'count'            => 0,
-				'term_group'       => 0,
-				'taxonomy'         => self::TAXONOMY,
-				'filter'           => 'raw',
-			), $setting_value );
+			$menu_obj = (object) array_merge(
+				array(
+					'term_id'          => $this->term_id,
+					'term_taxonomy_id' => $this->term_id,
+					'slug'             => sanitize_title( $setting_value['name'] ),
+					'count'            => 0,
+					'term_group'       => 0,
+					'taxonomy'         => self::TAXONOMY,
+					'filter'           => 'raw',
+				), $setting_value
+			);
 
 			array_splice( $menus, $index, ( -1 === $index ? 0 : 1 ), array( $menu_obj ) );
 		}
 
 		// Make sure the menu objects get re-sorted after an update/insert.
 		if ( ! $is_delete && ! empty( $args['orderby'] ) ) {
-			$menus = wp_list_sort( $menus, array(
-				$args['orderby'] => 'ASC',
-			) );
+			$menus = wp_list_sort(
+				$menus, array(
+					$args['orderby'] => 'ASC',
+				)
+			);
 		}
 		// @todo add support for $args['hide_empty'] === true
 
@@ -353,7 +357,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 			return $menu_obj;
 		}
 
-		$menu_obj = (object) array_merge( array(
+		$menu_obj = (object) array_merge(
+			array(
 				'term_id'          => $this->term_id,
 				'term_taxonomy_id' => $this->term_id,
 				'slug'             => sanitize_title( $setting_value['name'] ),
@@ -361,7 +366,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;
 	}
@@ -379,7 +385,7 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 			return $nav_menu_options;
 		}
 
-		$menu = $this->value();
+		$menu             = $this->value();
 		$nav_menu_options = $this->filter_nav_menu_options_value(
 			$nav_menu_options,
 			$this->term_id,
@@ -418,8 +424,8 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 			'parent'      => 0,
 			'auto_add'    => false,
 		);
-		$value = array_merge( $default, $value );
-		$value = wp_array_slice_assoc( $value, array_keys( $default ) );
+		$value   = array_merge( $default, $value );
+		$value   = wp_array_slice_assoc( $value, array_keys( $default ) );
 
 		$value['name']        = trim( esc_html( $value['name'] ) ); // This sanitization code is used in wp-admin/nav-menus.php.
 		$value['description'] = sanitize_text_field( $value['description'] );
@@ -494,23 +500,23 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 					$this->update_error  = $r;
 				} else {
 					$this->update_status = 'deleted';
-					$auto_add = false;
+					$auto_add            = false;
 				}
 			}
 		} else {
 			// Insert or update menu.
-			$menu_data = wp_array_slice_assoc( $value, array( 'description', 'parent' ) );
+			$menu_data              = wp_array_slice_assoc( $value, array( 'description', 'parent' ) );
 			$menu_data['menu-name'] = $value['name'];
 
-			$menu_id = $is_placeholder ? 0 : $this->term_id;
-			$r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
-			$original_name = $menu_data['menu-name'];
+			$menu_id              = $is_placeholder ? 0 : $this->term_id;
+			$r                    = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
+			$original_name        = $menu_data['menu-name'];
 			$name_conflict_suffix = 1;
 			while ( is_wp_error( $r ) && 'menu_exists' === $r->get_error_code() ) {
 				$name_conflict_suffix += 1;
 				/* translators: 1: original menu name, 2: duplicate count */
 				$menu_data['menu-name'] = sprintf( __( '%1$s (%2$d)' ), $original_name, $name_conflict_suffix );
-				$r = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
+				$r                      = wp_update_nav_menu_object( $menu_id, wp_slash( $menu_data ) );
 			}
 
 			if ( is_wp_error( $r ) ) {
@@ -565,7 +571,7 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 				}
 
 				$widget_instance['nav_menu'] = $this->term_id;
-				$updated_widget_instance = $this->manager->widgets->sanitize_widget_js_instance( $widget_instance );
+				$updated_widget_instance     = $this->manager->widgets->sanitize_widget_js_instance( $widget_instance );
 				$this->manager->set_post_value( $nav_menu_widget_setting->id, $updated_widget_instance );
 				$nav_menu_widget_setting->save();
 
@@ -633,7 +639,7 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting {
 			$data['widget_nav_menu_updates'],
 			$this->_widget_nav_menu_updates
 		);
-		$this->_widget_nav_menu_updates = array();
+		$this->_widget_nav_menu_updates  = array();
 
 		return $data;
 	}
diff --git a/wp-includes/customize/class-wp-customize-partial.php b/wp-includes/customize/class-wp-customize-partial.php
index c4ee52db6d..5d8ff42945 100644
--- a/wp-includes/customize/class-wp-customize-partial.php
+++ b/wp-includes/customize/class-wp-customize-partial.php
@@ -159,7 +159,7 @@ class WP_Customize_Partial {
 		// Process settings.
 		if ( ! isset( $this->settings ) ) {
 			$this->settings = array( $id );
-		} else if ( is_string( $this->settings ) ) {
+		} elseif ( is_string( $this->settings ) ) {
 			$this->settings = array( $this->settings );
 		}
 
@@ -201,7 +201,7 @@ class WP_Customize_Partial {
 		if ( ! empty( $this->render_callback ) ) {
 			ob_start();
 			$return_render = call_user_func( $this->render_callback, $this, $container_context );
-			$ob_render = ob_get_clean();
+			$ob_render     = ob_get_clean();
 
 			if ( null !== $return_render && '' !== $ob_render ) {
 				_doing_it_wrong( __FUNCTION__, __( 'Partial render must echo the content or return the content string (or array), but not both.' ), '4.5.0' );
diff --git a/wp-includes/customize/class-wp-customize-selective-refresh.php b/wp-includes/customize/class-wp-customize-selective-refresh.php
index 31156635f7..34a1963599 100644
--- a/wp-includes/customize/class-wp-customize-selective-refresh.php
+++ b/wp-includes/customize/class-wp-customize-selective-refresh.php
@@ -188,12 +188,12 @@ final class WP_Customize_Selective_Refresh {
 		}
 
 		$switched_locale = switch_to_locale( get_user_locale() );
-		$l10n = array(
+		$l10n            = array(
 			'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
-			'clickEditMenu' => __( 'Click to edit this menu.' ),
-			'clickEditWidget' => __( 'Click to edit this widget.' ),
-			'clickEditTitle' => __( 'Click to edit the site title.' ),
-			'clickEditMisc' => __( 'Click to edit this element.' ),
+			'clickEditMenu'    => __( 'Click to edit this menu.' ),
+			'clickEditWidget'  => __( 'Click to edit this widget.' ),
+			'clickEditTitle'   => __( 'Click to edit the site title.' ),
+			'clickEditMisc'    => __( 'Click to edit this element.' ),
 			/* translators: %s: document.write() */
 			'badDocumentWrite' => sprintf( __( '%s is forbidden' ), 'document.write()' ),
 		);
@@ -232,7 +232,7 @@ final class WP_Customize_Selective_Refresh {
 				continue;
 			}
 
-			$partial_args = false;
+			$partial_args  = false;
 			$partial_class = 'WP_Customize_Partial';
 
 			/**
@@ -415,8 +415,8 @@ final class WP_Customize_Selective_Refresh {
 			$response['errors'] = $this->triggered_errors;
 		}
 
-		$setting_validities = $this->manager->validate_setting_values( $this->manager->unsanitized_post_values() );
-		$exported_setting_validities = array_map( array( $this->manager, 'prepare_setting_validity_for_js' ), $setting_validities );
+		$setting_validities             = $this->manager->validate_setting_values( $this->manager->unsanitized_post_values() );
+		$exported_setting_validities    = array_map( array( $this->manager, 'prepare_setting_validity_for_js' ), $setting_validities );
 		$response['setting_validities'] = $exported_setting_validities;
 
 		/**
diff --git a/wp-includes/customize/class-wp-customize-sidebar-section.php b/wp-includes/customize/class-wp-customize-sidebar-section.php
index 2813251e78..1d048b6445 100644
--- a/wp-includes/customize/class-wp-customize-sidebar-section.php
+++ b/wp-includes/customize/class-wp-customize-sidebar-section.php
@@ -40,7 +40,7 @@ class WP_Customize_Sidebar_Section extends WP_Customize_Section {
 	 * @return array The array to be exported to the client as JSON.
 	 */
 	public function json() {
-		$json = parent::json();
+		$json              = parent::json();
 		$json['sidebarId'] = $this->sidebar_id;
 		return $json;
 	}
diff --git a/wp-includes/customize/class-wp-customize-theme-control.php b/wp-includes/customize/class-wp-customize-theme-control.php
index b80e93d194..13b803ac60 100644
--- a/wp-includes/customize/class-wp-customize-theme-control.php
+++ b/wp-includes/customize/class-wp-customize-theme-control.php
@@ -82,10 +82,12 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
 
 			<span class="more-details theme-details" id="{{ data.section }}-{{ data.theme.id }}-action" aria-label="<?php echo esc_attr( $details_label ); ?>"><?php _e( 'Theme Details' ); ?></span>
 
-			<div class="theme-author"><?php
+			<div class="theme-author">
+			<?php
 				/* translators: Theme author name */
 				printf( _x( 'By %s', 'theme author' ), '{{ data.theme.author }}' );
-			?></div>
+			?>
+			</div>
 
 			<# if ( 'installed' === data.theme.type && data.theme.hasUpdate ) { #>
 				<div class="update-message notice inline notice-warning notice-alt" data-slug="{{ data.theme.id }}">
diff --git a/wp-includes/customize/class-wp-customize-themes-section.php b/wp-includes/customize/class-wp-customize-themes-section.php
index 42796bf475..eff894f8f4 100644
--- a/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/wp-includes/customize/class-wp-customize-themes-section.php
@@ -54,8 +54,8 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 	 * @return array Exported parameters.
 	 */
 	public function json() {
-		$exported = parent::json();
-		$exported['action'] = $this->action;
+		$exported                = parent::json();
+		$exported['action']      = $this->action;
 		$exported['filter_type'] = $this->filter_type;
 
 		return $exported;
@@ -88,7 +88,8 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 					<p class="no-themes-local">
 						<?php
 						/* translators: %s: "Search WordPress.org themes" button */
-						printf( __( 'No themes found. Try a different search, or %s.' ),
+						printf(
+							__( 'No themes found. Try a different search, or %s.' ),
 							sprintf( '<button type="button" class="button-link search-dotorg-themes">%s</button>', __( 'Search WordPress.org themes' ) )
 						);
 						?>
diff --git a/wp-includes/customize/class-wp-customize-upload-control.php b/wp-includes/customize/class-wp-customize-upload-control.php
index 0e3b024e85..46e2b98b97 100644
--- a/wp-includes/customize/class-wp-customize-upload-control.php
+++ b/wp-includes/customize/class-wp-customize-upload-control.php
@@ -18,7 +18,7 @@ class WP_Customize_Upload_Control extends WP_Customize_Media_Control {
 	public $type          = 'upload';
 	public $mime_type     = '';
 	public $button_labels = array();
-	public $removed = ''; // unused
+	public $removed       = ''; // unused
 	public $context; // unused
 	public $extensions = array(); // unused
 
diff --git a/wp-includes/customize/class-wp-widget-form-customize-control.php b/wp-includes/customize/class-wp-widget-form-customize-control.php
index aada4474eb..01acdd6c06 100644
--- a/wp-includes/customize/class-wp-widget-form-customize-control.php
+++ b/wp-includes/customize/class-wp-widget-form-customize-control.php
@@ -49,11 +49,16 @@ class WP_Widget_Form_Customize_Control extends WP_Customize_Control {
 		}
 
 		$args = array(
-			'widget_id' => $widget['id'],
+			'widget_id'   => $widget['id'],
 			'widget_name' => $widget['name'],
 		);
 
-		$args = wp_list_widget_controls_dynamic_sidebar( array( 0 => $args, 1 => $widget['params'][0] ) );
+		$args                 = wp_list_widget_controls_dynamic_sidebar(
+			array(
+				0 => $args,
+				1 => $widget['params'][0],
+			)
+		);
 		$widget_control_parts = $this->manager->widgets->get_widget_control_parts( $args );
 
 		$this->json['widget_control'] = $widget_control_parts['control'];
diff --git a/wp-includes/date.php b/wp-includes/date.php
index 591cf79319..ef7cb2e214 100644
--- a/wp-includes/date.php
+++ b/wp-includes/date.php
@@ -263,8 +263,9 @@ class WP_Date_Query {
 	 * @return string The comparison operator.
 	 */
 	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
+		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
 			return strtoupper( $query['compare'] );
+		}
 
 		return $this->compare;
 	}
@@ -293,11 +294,11 @@ class WP_Date_Query {
 		 * validation routine continue to be sure that all invalid
 		 * values generate errors too.
 		 */
-		if ( array_key_exists( 'before', $date_query ) && is_array( $date_query['before'] ) ){
+		if ( array_key_exists( 'before', $date_query ) && is_array( $date_query['before'] ) ) {
 			$valid = $this->validate_date_values( $date_query['before'] );
 		}
 
-		if ( array_key_exists( 'after', $date_query ) && is_array( $date_query['after'] ) ){
+		if ( array_key_exists( 'after', $date_query ) && is_array( $date_query['after'] ) ) {
 			$valid = $this->validate_date_values( $date_query['after'] );
 		}
 
@@ -324,25 +325,25 @@ class WP_Date_Query {
 
 		$min_max_checks['dayofyear'] = array(
 			'min' => 1,
-			'max' => $max_days_of_year
+			'max' => $max_days_of_year,
 		);
 
 		// Days per week.
 		$min_max_checks['dayofweek'] = array(
 			'min' => 1,
-			'max' => 7
+			'max' => 7,
 		);
 
 		// Days per week.
 		$min_max_checks['dayofweek_iso'] = array(
 			'min' => 1,
-			'max' => 7
+			'max' => 7,
 		);
 
 		// Months per year.
 		$min_max_checks['month'] = array(
 			'min' => 1,
-			'max' => 12
+			'max' => 12,
 		);
 
 		// Weeks per year.
@@ -360,31 +361,31 @@ class WP_Date_Query {
 
 		$min_max_checks['week'] = array(
 			'min' => 1,
-			'max' => $week_count
+			'max' => $week_count,
 		);
 
 		// Days per month.
 		$min_max_checks['day'] = array(
 			'min' => 1,
-			'max' => 31
+			'max' => 31,
 		);
 
 		// Hours per day.
 		$min_max_checks['hour'] = array(
 			'min' => 0,
-			'max' => 23
+			'max' => 23,
 		);
 
 		// Minutes per hour.
 		$min_max_checks['minute'] = array(
 			'min' => 0,
-			'max' => 59
+			'max' => 59,
 		);
 
 		// Seconds per minute.
 		$min_max_checks['second'] = array(
 			'min' => 0,
-			'max' => 59
+			'max' => 59,
 		);
 
 		// Concatenate and throw a notice for each invalid value.
@@ -438,7 +439,6 @@ class WP_Date_Query {
 
 				$valid = false;
 			}
-
 		} elseif ( $day_exists && $month_exists ) {
 			/*
 			 * 2. checking day, month combination
@@ -480,9 +480,15 @@ class WP_Date_Query {
 		global $wpdb;
 
 		$valid_columns = array(
-			'post_date', 'post_date_gmt', 'post_modified',
-			'post_modified_gmt', 'comment_date', 'comment_date_gmt',
-			'user_registered', 'registered', 'last_updated',
+			'post_date',
+			'post_date_gmt',
+			'post_modified',
+			'post_modified_gmt',
+			'comment_date',
+			'comment_date_gmt',
+			'user_registered',
+			'registered',
+			'last_updated',
 		);
 
 		// Attempt to detect a table prefix.
@@ -496,14 +502,14 @@ class WP_Date_Query {
 			 * @param array $valid_columns An array of valid date query columns. Defaults
 			 *                             are 'post_date', 'post_date_gmt', 'post_modified',
 			 *                             'post_modified_gmt', 'comment_date', 'comment_date_gmt',
-			 *	                           'user_registered'
+			 *                             'user_registered'
 			 */
 			if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
 				$column = 'post_date';
 			}
 
 			$known_columns = array(
-				$wpdb->posts => array(
+				$wpdb->posts    => array(
 					'post_date',
 					'post_date_gmt',
 					'post_modified',
@@ -513,10 +519,10 @@ class WP_Date_Query {
 					'comment_date',
 					'comment_date_gmt',
 				),
-				$wpdb->users => array(
+				$wpdb->users    => array(
 					'user_registered',
 				),
-				$wpdb->blogs => array(
+				$wpdb->blogs    => array(
 					'registered',
 					'last_updated',
 				),
@@ -529,7 +535,6 @@ class WP_Date_Query {
 					break;
 				}
 			}
-
 		}
 
 		// Remove unsafe characters.
@@ -615,7 +620,7 @@ class WP_Date_Query {
 
 		$indent = '';
 		for ( $i = 0; $i < $depth; $i++ ) {
-			$indent .= "  ";
+			$indent .= '  ';
 		}
 
 		foreach ( $query as $key => $clause ) {
@@ -637,7 +642,7 @@ class WP_Date_Query {
 					}
 
 					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
-				// This is a subquery, so we recurse.
+					// This is a subquery, so we recurse.
 				} else {
 					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
 
@@ -734,8 +739,9 @@ class WP_Date_Query {
 		}
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
+		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) ) {
 			$where_parts[] = "YEAR( $column ) $compare $value";
+		}
 
 		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
@@ -747,17 +753,21 @@ class WP_Date_Query {
 		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
 			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
+		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) ) {
 			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		}
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
+		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) ) {
 			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
+		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) ) {
 			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
+		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) ) {
 			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		}
 
 		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
 			// Avoid notices.
@@ -792,8 +802,9 @@ class WP_Date_Query {
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
+		if ( ! isset( $value ) ) {
 			return false;
+		}
 
 		switch ( $compare ) {
 			case 'IN':
@@ -903,23 +914,29 @@ class WP_Date_Query {
 
 		$datetime = array_map( 'absint', $datetime );
 
-		if ( ! isset( $datetime['year'] ) )
+		if ( ! isset( $datetime['year'] ) ) {
 			$datetime['year'] = gmdate( 'Y', $now );
+		}
 
-		if ( ! isset( $datetime['month'] ) )
+		if ( ! isset( $datetime['month'] ) ) {
 			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		}
 
-		if ( ! isset( $datetime['day'] ) )
+		if ( ! isset( $datetime['day'] ) ) {
 			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		}
 
-		if ( ! isset( $datetime['hour'] ) )
+		if ( ! isset( $datetime['hour'] ) ) {
 			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		}
 
-		if ( ! isset( $datetime['minute'] ) )
+		if ( ! isset( $datetime['minute'] ) ) {
 			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		}
 
-		if ( ! isset( $datetime['second'] ) )
+		if ( ! isset( $datetime['second'] ) ) {
 			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		}
 
 		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
 	}
@@ -944,21 +961,25 @@ class WP_Date_Query {
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
+		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) ) {
 			return false;
+		}
 
 		// Complex combined queries aren't supported for multi-value queries
 		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
+			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
 				$return[] = "HOUR( $column ) $compare $value";
+			}
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
+			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
 				$return[] = "MINUTE( $column ) $compare $value";
+			}
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
+			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
 				$return[] = "SECOND( $column ) $compare $value";
+			}
 
 			return implode( ' AND ', $return );
 		}
@@ -973,8 +994,9 @@ class WP_Date_Query {
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
+		if ( ! isset( $minute ) ) {
 			return false;
+		}
 
 		$format = $time = '';
 
diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php
index 94da94d2c3..e6c23b6a0f 100644
--- a/wp-includes/default-constants.php
+++ b/wp-includes/default-constants.php
@@ -59,27 +59,33 @@ function wp_initial_constants() {
 		@ini_set( 'memory_limit', WP_MEMORY_LIMIT );
 	}
 
-	if ( ! isset($blog_id) )
+	if ( ! isset( $blog_id ) ) {
 		$blog_id = 1;
+	}
 
-	if ( !defined('WP_CONTENT_DIR') )
+	if ( ! defined( 'WP_CONTENT_DIR' ) ) {
 		define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
+	}
 
 	// Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
-	if ( !defined('WP_DEBUG') )
+	if ( ! defined( 'WP_DEBUG' ) ) {
 		define( 'WP_DEBUG', false );
+	}
 
 	// Add define('WP_DEBUG_DISPLAY', null); to wp-config.php use the globally configured setting for
 	// display_errors and not force errors to be displayed. Use false to force display_errors off.
-	if ( !defined('WP_DEBUG_DISPLAY') )
+	if ( ! defined( 'WP_DEBUG_DISPLAY' ) ) {
 		define( 'WP_DEBUG_DISPLAY', true );
+	}
 
 	// Add define('WP_DEBUG_LOG', true); to enable error logging to wp-content/debug.log.
-	if ( !defined('WP_DEBUG_LOG') )
-		define('WP_DEBUG_LOG', false);
+	if ( ! defined( 'WP_DEBUG_LOG' ) ) {
+		define( 'WP_DEBUG_LOG', false );
+	}
 
-	if ( !defined('WP_CACHE') )
-		define('WP_CACHE', false);
+	if ( ! defined( 'WP_CACHE' ) ) {
+		define( 'WP_CACHE', false );
+	}
 
 	// Add define('SCRIPT_DEBUG', true); to wp-config.php to enable loading of non-minified,
 	// non-concatenated scripts and stylesheets.
@@ -96,11 +102,13 @@ function wp_initial_constants() {
 	/**
 	 * Private
 	 */
-	if ( !defined('MEDIA_TRASH') )
-		define('MEDIA_TRASH', false);
+	if ( ! defined( 'MEDIA_TRASH' ) ) {
+		define( 'MEDIA_TRASH', false );
+	}
 
-	if ( !defined('SHORTINIT') )
-		define('SHORTINIT', false);
+	if ( ! defined( 'SHORTINIT' ) ) {
+		define( 'SHORTINIT', false );
+	}
 
 	// Constants for features added to WP that should short-circuit their plugin implementations
 	define( 'WP_FEATURE_BETTER_PASSWORDS', true );
@@ -119,11 +127,11 @@ function wp_initial_constants() {
 	 * @since 4.4.0 Introduced `MONTH_IN_SECONDS`.
 	 */
 	define( 'MINUTE_IN_SECONDS', 60 );
-	define( 'HOUR_IN_SECONDS',   60 * MINUTE_IN_SECONDS );
-	define( 'DAY_IN_SECONDS',    24 * HOUR_IN_SECONDS   );
-	define( 'WEEK_IN_SECONDS',    7 * DAY_IN_SECONDS    );
-	define( 'MONTH_IN_SECONDS',  30 * DAY_IN_SECONDS    );
-	define( 'YEAR_IN_SECONDS',  365 * DAY_IN_SECONDS    );
+	define( 'HOUR_IN_SECONDS', 60 * MINUTE_IN_SECONDS );
+	define( 'DAY_IN_SECONDS', 24 * HOUR_IN_SECONDS );
+	define( 'WEEK_IN_SECONDS', 7 * DAY_IN_SECONDS );
+	define( 'MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS );
+	define( 'YEAR_IN_SECONDS', 365 * DAY_IN_SECONDS );
 	/**#@-*/
 }
 
@@ -135,24 +143,27 @@ function wp_initial_constants() {
  * @since 3.0.0
  */
 function wp_plugin_directory_constants() {
-	if ( !defined('WP_CONTENT_URL') )
-		define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
+	if ( ! defined( 'WP_CONTENT_URL' ) ) {
+		define( 'WP_CONTENT_URL', get_option( 'siteurl' ) . '/wp-content' ); // full url - WP_CONTENT_DIR is defined further up
+	}
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
 	 *
 	 * @since 2.6.0
 	 */
-	if ( !defined('WP_PLUGIN_DIR') )
+	if ( ! defined( 'WP_PLUGIN_DIR' ) ) {
 		define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
+	}
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
 	 *
 	 * @since 2.6.0
 	 */
-	if ( !defined('WP_PLUGIN_URL') )
+	if ( ! defined( 'WP_PLUGIN_URL' ) ) {
 		define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
+	}
 
 	/**
 	 * Allows for the plugins directory to be moved from the default location.
@@ -160,24 +171,27 @@ function wp_plugin_directory_constants() {
 	 * @since 2.1.0
 	 * @deprecated
 	 */
-	if ( !defined('PLUGINDIR') )
+	if ( ! defined( 'PLUGINDIR' ) ) {
 		define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
+	}
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
 	 *
 	 * @since 2.8.0
 	 */
-	if ( !defined('WPMU_PLUGIN_DIR') )
+	if ( ! defined( 'WPMU_PLUGIN_DIR' ) ) {
 		define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash
+	}
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
 	 *
 	 * @since 2.8.0
 	 */
-	if ( !defined('WPMU_PLUGIN_URL') )
+	if ( ! defined( 'WPMU_PLUGIN_URL' ) ) {
 		define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash
+	}
 
 	/**
 	 * Allows for the mu-plugins directory to be moved from the default location.
@@ -185,14 +199,16 @@ function wp_plugin_directory_constants() {
 	 * @since 2.8.0
 	 * @deprecated
 	 */
-	if ( !defined( 'MUPLUGINDIR' ) )
+	if ( ! defined( 'MUPLUGINDIR' ) ) {
 		define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
+	}
 }
 
 /**
  * Defines cookie related WordPress constants
  *
  * Defines constants after multisite is loaded.
+ *
  * @since 3.0.0
  */
 function wp_cookie_constants() {
@@ -201,79 +217,91 @@ function wp_cookie_constants() {
 	 *
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'COOKIEHASH' ) ) {
+	if ( ! defined( 'COOKIEHASH' ) ) {
 		$siteurl = get_site_option( 'siteurl' );
-		if ( $siteurl )
+		if ( $siteurl ) {
 			define( 'COOKIEHASH', md5( $siteurl ) );
-		else
+		} else {
 			define( 'COOKIEHASH', '' );
+		}
 	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('USER_COOKIE') )
-		define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
+	if ( ! defined( 'USER_COOKIE' ) ) {
+		define( 'USER_COOKIE', 'wordpressuser_' . COOKIEHASH );
+	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('PASS_COOKIE') )
-		define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
+	if ( ! defined( 'PASS_COOKIE' ) ) {
+		define( 'PASS_COOKIE', 'wordpresspass_' . COOKIEHASH );
+	}
 
 	/**
 	 * @since 2.5.0
 	 */
-	if ( !defined('AUTH_COOKIE') )
-		define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
+	if ( ! defined( 'AUTH_COOKIE' ) ) {
+		define( 'AUTH_COOKIE', 'wordpress_' . COOKIEHASH );
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('SECURE_AUTH_COOKIE') )
-		define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
+	if ( ! defined( 'SECURE_AUTH_COOKIE' ) ) {
+		define( 'SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH );
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('LOGGED_IN_COOKIE') )
-		define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
+	if ( ! defined( 'LOGGED_IN_COOKIE' ) ) {
+		define( 'LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH );
+	}
 
 	/**
 	 * @since 2.3.0
 	 */
-	if ( !defined('TEST_COOKIE') )
-		define('TEST_COOKIE', 'wordpress_test_cookie');
+	if ( ! defined( 'TEST_COOKIE' ) ) {
+		define( 'TEST_COOKIE', 'wordpress_test_cookie' );
+	}
 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined('COOKIEPATH') )
-		define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
+	if ( ! defined( 'COOKIEPATH' ) ) {
+		define( 'COOKIEPATH', preg_replace( '|https?://[^/]+|i', '', get_option( 'home' ) . '/' ) );
+	}
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined('SITECOOKIEPATH') )
-		define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+	if ( ! defined( 'SITECOOKIEPATH' ) ) {
+		define( 'SITECOOKIEPATH', preg_replace( '|https?://[^/]+|i', '', get_option( 'siteurl' ) . '/' ) );
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('ADMIN_COOKIE_PATH') )
+	if ( ! defined( 'ADMIN_COOKIE_PATH' ) ) {
 		define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined('PLUGINS_COOKIE_PATH') )
-		define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL)  );
+	if ( ! defined( 'PLUGINS_COOKIE_PATH' ) ) {
+		define( 'PLUGINS_COOKIE_PATH', preg_replace( '|https?://[^/]+|i', '', WP_PLUGIN_URL ) );
+	}
 
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('COOKIE_DOMAIN') )
-		define('COOKIE_DOMAIN', false);
+	if ( ! defined( 'COOKIE_DOMAIN' ) ) {
+		define( 'COOKIE_DOMAIN', false );
+	}
 }
 
 /**
@@ -285,7 +313,7 @@ function wp_ssl_constants() {
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined( 'FORCE_SSL_ADMIN' ) ) {
+	if ( ! defined( 'FORCE_SSL_ADMIN' ) ) {
 		if ( 'https' === parse_url( get_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
 			define( 'FORCE_SSL_ADMIN', true );
 		} else {
@@ -312,23 +340,27 @@ function wp_functionality_constants() {
 	/**
 	 * @since 2.5.0
 	 */
-	if ( !defined( 'AUTOSAVE_INTERVAL' ) )
+	if ( ! defined( 'AUTOSAVE_INTERVAL' ) ) {
 		define( 'AUTOSAVE_INTERVAL', 60 );
+	}
 
 	/**
 	 * @since 2.9.0
 	 */
-	if ( !defined( 'EMPTY_TRASH_DAYS' ) )
+	if ( ! defined( 'EMPTY_TRASH_DAYS' ) ) {
 		define( 'EMPTY_TRASH_DAYS', 30 );
+	}
 
-	if ( !defined('WP_POST_REVISIONS') )
-		define('WP_POST_REVISIONS', true);
+	if ( ! defined( 'WP_POST_REVISIONS' ) ) {
+		define( 'WP_POST_REVISIONS', true );
+	}
 
 	/**
 	 * @since 3.3.0
 	 */
-	if ( !defined( 'WP_CRON_LOCK_TIMEOUT' ) )
-		define('WP_CRON_LOCK_TIMEOUT', 60);  // In seconds
+	if ( ! defined( 'WP_CRON_LOCK_TIMEOUT' ) ) {
+		define( 'WP_CRON_LOCK_TIMEOUT', 60 );  // In seconds
+	}
 }
 
 /**
@@ -339,15 +371,17 @@ function wp_functionality_constants() {
 function wp_templating_constants() {
 	/**
 	 * Filesystem path to the current active template directory
+	 *
 	 * @since 1.5.0
 	 */
-	define('TEMPLATEPATH', get_template_directory());
+	define( 'TEMPLATEPATH', get_template_directory() );
 
 	/**
 	 * Filesystem path to the current active template stylesheet directory
+	 *
 	 * @since 2.1.0
 	 */
-	define('STYLESHEETPATH', get_stylesheet_directory());
+	define( 'STYLESHEETPATH', get_stylesheet_directory() );
 
 	/**
 	 * Slug of the default theme for this installation.
@@ -357,7 +391,8 @@ function wp_templating_constants() {
 	 * @since 3.0.0
 	 * @see WP_Theme::get_core_default_theme()
 	 */
-	if ( !defined('WP_DEFAULT_THEME') )
+	if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
 		define( 'WP_DEFAULT_THEME', 'twentyseventeen' );
+	}
 
 }
diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 9315d397ff..a7c732fc65 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -14,8 +14,8 @@
 
 // Strip, trim, kses, special chars for string saves
 foreach ( array( 'pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target', 'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name', 'pre_user_nickname' ) as $filter ) {
-	add_filter( $filter, 'sanitize_text_field'  );
-	add_filter( $filter, 'wp_filter_kses'       );
+	add_filter( $filter, 'sanitize_text_field' );
+	add_filter( $filter, 'wp_filter_kses' );
 	add_filter( $filter, '_wp_specialchars', 30 );
 }
 
@@ -23,8 +23,8 @@ foreach ( array( 'pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'p
 foreach ( array( 'term_name', 'comment_author_name', 'link_name', 'link_target', 'link_rel', 'user_display_name', 'user_first_name', 'user_last_name', 'user_nickname' ) as $filter ) {
 	if ( is_admin() ) {
 		// These are expensive. Run only on admin pages for defense in depth.
-		add_filter( $filter, 'sanitize_text_field'  );
-		add_filter( $filter, 'wp_kses_data'       );
+		add_filter( $filter, 'sanitize_text_field' );
+		add_filter( $filter, 'wp_kses_data' );
 	}
 	add_filter( $filter, '_wp_specialchars', 30 );
 }
@@ -44,7 +44,7 @@ if ( is_admin() ) {
 
 // Email saves
 foreach ( array( 'pre_comment_author_email', 'pre_user_email' ) as $filter ) {
-	add_filter( $filter, 'trim'           );
+	add_filter( $filter, 'trim' );
 	add_filter( $filter, 'sanitize_email' );
 	add_filter( $filter, 'wp_filter_kses' );
 }
@@ -52,25 +52,34 @@ foreach ( array( 'pre_comment_author_email', 'pre_user_email' ) as $filter ) {
 // Email admin display
 foreach ( array( 'comment_author_email', 'user_email' ) as $filter ) {
 	add_filter( $filter, 'sanitize_email' );
-	if ( is_admin() )
+	if ( is_admin() ) {
 		add_filter( $filter, 'wp_kses_data' );
+	}
 }
 
 // Save URL
-foreach ( array( 'pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
-	'pre_link_rss', 'pre_post_guid' ) as $filter ) {
+foreach ( array(
+	'pre_comment_author_url',
+	'pre_user_url',
+	'pre_link_url',
+	'pre_link_image',
+	'pre_link_rss',
+	'pre_post_guid',
+) as $filter ) {
 	add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url_raw'       );
-	add_filter( $filter, 'wp_filter_kses'    );
+	add_filter( $filter, 'esc_url_raw' );
+	add_filter( $filter, 'wp_filter_kses' );
 }
 
 // Display URL
 foreach ( array( 'user_url', 'link_url', 'link_image', 'link_rss', 'comment_url', 'post_guid' ) as $filter ) {
-	if ( is_admin() )
+	if ( is_admin() ) {
 		add_filter( $filter, 'wp_strip_all_tags' );
-	add_filter( $filter, 'esc_url'           );
-	if ( is_admin() )
-		add_filter( $filter, 'wp_kses_data'    );
+	}
+	add_filter( $filter, 'esc_url' );
+	if ( is_admin() ) {
+		add_filter( $filter, 'wp_kses_data' );
+	}
 }
 
 // Slugs
@@ -97,28 +106,29 @@ foreach ( array( 'content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pr
 
 // Format strings for display.
 foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'   );
+	add_filter( $filter, 'wptexturize' );
 	add_filter( $filter, 'convert_chars' );
-	add_filter( $filter, 'esc_html'      );
+	add_filter( $filter, 'esc_html' );
 }
 
 // Format WordPress
-foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter )
+foreach ( array( 'the_content', 'the_title', 'wp_title' ) as $filter ) {
 	add_filter( $filter, 'capital_P_dangit', 11 );
+}
 add_filter( 'comment_text', 'capital_P_dangit', 31 );
 
 // Format titles
 foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
 	add_filter( $filter, 'wptexturize' );
-	add_filter( $filter, 'strip_tags'  );
+	add_filter( $filter, 'strip_tags' );
 }
 
 // Format text area for display.
 foreach ( array( 'term_description', 'get_the_author_description', 'get_the_post_type_description' ) as $filter ) {
-	add_filter( $filter, 'wptexturize'      );
-	add_filter( $filter, 'convert_chars'    );
-	add_filter( $filter, 'wpautop'          );
-	add_filter( $filter, 'shortcode_unautop');
+	add_filter( $filter, 'wptexturize' );
+	add_filter( $filter, 'convert_chars' );
+	add_filter( $filter, 'wpautop' );
+	add_filter( $filter, 'shortcode_unautop' );
 }
 
 // Format for RSS
@@ -129,67 +139,67 @@ add_filter( 'wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2
 add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
 
 // Display filters
-add_filter( 'the_title', 'wptexturize'   );
+add_filter( 'the_title', 'wptexturize' );
 add_filter( 'the_title', 'convert_chars' );
-add_filter( 'the_title', 'trim'          );
+add_filter( 'the_title', 'trim' );
 
-add_filter( 'the_content', 'wptexturize'                       );
-add_filter( 'the_content', 'convert_smilies',               20 );
-add_filter( 'the_content', 'wpautop'                           );
-add_filter( 'the_content', 'shortcode_unautop'                 );
-add_filter( 'the_content', 'prepend_attachment'                );
+add_filter( 'the_content', 'wptexturize' );
+add_filter( 'the_content', 'convert_smilies', 20 );
+add_filter( 'the_content', 'wpautop' );
+add_filter( 'the_content', 'shortcode_unautop' );
+add_filter( 'the_content', 'prepend_attachment' );
 add_filter( 'the_content', 'wp_make_content_images_responsive' );
 
-add_filter( 'the_excerpt',     'wptexturize'      );
-add_filter( 'the_excerpt',     'convert_smilies'  );
-add_filter( 'the_excerpt',     'convert_chars'    );
-add_filter( 'the_excerpt',     'wpautop'          );
-add_filter( 'the_excerpt',     'shortcode_unautop');
-add_filter( 'get_the_excerpt', 'wp_trim_excerpt'  );
+add_filter( 'the_excerpt', 'wptexturize' );
+add_filter( 'the_excerpt', 'convert_smilies' );
+add_filter( 'the_excerpt', 'convert_chars' );
+add_filter( 'the_excerpt', 'wpautop' );
+add_filter( 'the_excerpt', 'shortcode_unautop' );
+add_filter( 'get_the_excerpt', 'wp_trim_excerpt' );
 
-add_filter( 'the_post_thumbnail_caption', 'wptexturize'     );
+add_filter( 'the_post_thumbnail_caption', 'wptexturize' );
 add_filter( 'the_post_thumbnail_caption', 'convert_smilies' );
-add_filter( 'the_post_thumbnail_caption', 'convert_chars'   );
+add_filter( 'the_post_thumbnail_caption', 'convert_chars' );
 
-add_filter( 'comment_text', 'wptexturize'            );
-add_filter( 'comment_text', 'convert_chars'          );
-add_filter( 'comment_text', 'make_clickable',      9 );
+add_filter( 'comment_text', 'wptexturize' );
+add_filter( 'comment_text', 'convert_chars' );
+add_filter( 'comment_text', 'make_clickable', 9 );
 add_filter( 'comment_text', 'force_balance_tags', 25 );
-add_filter( 'comment_text', 'convert_smilies',    20 );
-add_filter( 'comment_text', 'wpautop',            30 );
+add_filter( 'comment_text', 'convert_smilies', 20 );
+add_filter( 'comment_text', 'wpautop', 30 );
 
 add_filter( 'comment_excerpt', 'convert_chars' );
 
-add_filter( 'list_cats',         'wptexturize' );
+add_filter( 'list_cats', 'wptexturize' );
 
 add_filter( 'wp_sprintf', 'wp_sprintf_l', 10, 2 );
 
-add_filter( 'widget_text',         'balanceTags'          );
+add_filter( 'widget_text', 'balanceTags' );
 add_filter( 'widget_text_content', 'capital_P_dangit', 11 );
-add_filter( 'widget_text_content', 'wptexturize'          );
-add_filter( 'widget_text_content', 'convert_smilies',  20 );
-add_filter( 'widget_text_content', 'wpautop'              );
-add_filter( 'widget_text_content', 'shortcode_unautop'    );
-add_filter( 'widget_text_content', 'do_shortcode',     11 ); // Runs after wpautop(); note that $post global will be null when shortcodes run.
+add_filter( 'widget_text_content', 'wptexturize' );
+add_filter( 'widget_text_content', 'convert_smilies', 20 );
+add_filter( 'widget_text_content', 'wpautop' );
+add_filter( 'widget_text_content', 'shortcode_unautop' );
+add_filter( 'widget_text_content', 'do_shortcode', 11 ); // Runs after wpautop(); note that $post global will be null when shortcodes run.
 
 add_filter( 'date_i18n', 'wp_maybe_decline_date' );
 
 // RSS filters
-add_filter( 'the_title_rss',      'strip_tags'                    );
-add_filter( 'the_title_rss',      'ent2ncr',                    8 );
-add_filter( 'the_title_rss',      'esc_html'                      );
-add_filter( 'the_content_rss',    'ent2ncr',                    8 );
-add_filter( 'the_content_feed',   'wp_staticize_emoji'            );
-add_filter( 'the_content_feed',   '_oembed_filter_feed_content'   );
-add_filter( 'the_excerpt_rss',    'convert_chars'                 );
-add_filter( 'the_excerpt_rss',    'ent2ncr',                    8 );
-add_filter( 'comment_author_rss', 'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'ent2ncr',                    8 );
-add_filter( 'comment_text_rss',   'esc_html'                      );
-add_filter( 'comment_text_rss',   'wp_staticize_emoji'            );
-add_filter( 'bloginfo_rss',       'ent2ncr',                    8 );
-add_filter( 'the_author',         'ent2ncr',                    8 );
-add_filter( 'the_guid',           'esc_url'                       );
+add_filter( 'the_title_rss', 'strip_tags' );
+add_filter( 'the_title_rss', 'ent2ncr', 8 );
+add_filter( 'the_title_rss', 'esc_html' );
+add_filter( 'the_content_rss', 'ent2ncr', 8 );
+add_filter( 'the_content_feed', 'wp_staticize_emoji' );
+add_filter( 'the_content_feed', '_oembed_filter_feed_content' );
+add_filter( 'the_excerpt_rss', 'convert_chars' );
+add_filter( 'the_excerpt_rss', 'ent2ncr', 8 );
+add_filter( 'comment_author_rss', 'ent2ncr', 8 );
+add_filter( 'comment_text_rss', 'ent2ncr', 8 );
+add_filter( 'comment_text_rss', 'esc_html' );
+add_filter( 'comment_text_rss', 'wp_staticize_emoji' );
+add_filter( 'bloginfo_rss', 'ent2ncr', 8 );
+add_filter( 'the_author', 'ent2ncr', 8 );
+add_filter( 'the_guid', 'esc_url' );
 
 // Email filters
 add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
@@ -200,84 +210,85 @@ foreach ( array( 'publish_post', 'publish_page', 'wp_ajax_save-widget', 'wp_ajax
 }
 
 // Misc filters
-add_filter( 'option_ping_sites',        'privacy_ping_filter'                 );
-add_filter( 'option_blog_charset',      '_wp_specialchars'                    ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
-add_filter( 'option_blog_charset',      '_canonical_charset'                  );
-add_filter( 'option_home',              '_config_wp_home'                     );
-add_filter( 'option_siteurl',           '_config_wp_siteurl'                  );
-add_filter( 'tiny_mce_before_init',     '_mce_set_direction'                  );
-add_filter( 'teeny_mce_before_init',    '_mce_set_direction'                  );
-add_filter( 'pre_kses',                 'wp_pre_kses_less_than'               );
-add_filter( 'sanitize_title',           'sanitize_title_with_dashes',   10, 3 );
-add_action( 'check_comment_flood',      'check_comment_flood_db',       10, 4 );
-add_filter( 'comment_flood_filter',     'wp_throttle_comment_flood',    10, 3 );
-add_filter( 'pre_comment_content',      'wp_rel_nofollow',              15    );
-add_filter( 'comment_email',            'antispambot'                         );
-add_filter( 'option_tag_base',          '_wp_filter_taxonomy_base'            );
-add_filter( 'option_category_base',     '_wp_filter_taxonomy_base'            );
-add_filter( 'the_posts',                '_close_comments_for_old_posts', 10, 2);
-add_filter( 'comments_open',            '_close_comments_for_old_post', 10, 2 );
-add_filter( 'pings_open',               '_close_comments_for_old_post', 10, 2 );
-add_filter( 'editable_slug',            'urldecode'                           );
-add_filter( 'editable_slug',            'esc_textarea'                        );
-add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object'        );
-add_filter( 'pingback_ping_source_uri', 'pingback_ping_source_uri'            );
-add_filter( 'xmlrpc_pingback_error',    'xmlrpc_pingback_error'               );
-add_filter( 'title_save_pre',           'trim'                                );
+add_filter( 'option_ping_sites', 'privacy_ping_filter' );
+add_filter( 'option_blog_charset', '_wp_specialchars' ); // IMPORTANT: This must not be wp_specialchars() or esc_html() or it'll cause an infinite loop
+add_filter( 'option_blog_charset', '_canonical_charset' );
+add_filter( 'option_home', '_config_wp_home' );
+add_filter( 'option_siteurl', '_config_wp_siteurl' );
+add_filter( 'tiny_mce_before_init', '_mce_set_direction' );
+add_filter( 'teeny_mce_before_init', '_mce_set_direction' );
+add_filter( 'pre_kses', 'wp_pre_kses_less_than' );
+add_filter( 'sanitize_title', 'sanitize_title_with_dashes', 10, 3 );
+add_action( 'check_comment_flood', 'check_comment_flood_db', 10, 4 );
+add_filter( 'comment_flood_filter', 'wp_throttle_comment_flood', 10, 3 );
+add_filter( 'pre_comment_content', 'wp_rel_nofollow', 15 );
+add_filter( 'comment_email', 'antispambot' );
+add_filter( 'option_tag_base', '_wp_filter_taxonomy_base' );
+add_filter( 'option_category_base', '_wp_filter_taxonomy_base' );
+add_filter( 'the_posts', '_close_comments_for_old_posts', 10, 2 );
+add_filter( 'comments_open', '_close_comments_for_old_post', 10, 2 );
+add_filter( 'pings_open', '_close_comments_for_old_post', 10, 2 );
+add_filter( 'editable_slug', 'urldecode' );
+add_filter( 'editable_slug', 'esc_textarea' );
+add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object' );
+add_filter( 'pingback_ping_source_uri', 'pingback_ping_source_uri' );
+add_filter( 'xmlrpc_pingback_error', 'xmlrpc_pingback_error' );
+add_filter( 'title_save_pre', 'trim' );
 
 add_action( 'transition_comment_status', '_clear_modified_cache_on_transition_comment_status', 10, 2 );
 
-add_filter( 'http_request_host_is_external',    'allowed_http_request_hosts', 10, 2 );
+add_filter( 'http_request_host_is_external', 'allowed_http_request_hosts', 10, 2 );
 
 // REST API filters.
-add_action( 'xmlrpc_rsd_apis',            'rest_output_rsd' );
-add_action( 'wp_head',                    'rest_output_link_wp_head', 10, 0 );
-add_action( 'template_redirect',          'rest_output_link_header', 11, 0 );
-add_action( 'auth_cookie_malformed',      'rest_cookie_collect_status' );
-add_action( 'auth_cookie_expired',        'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_username',   'rest_cookie_collect_status' );
-add_action( 'auth_cookie_bad_hash',       'rest_cookie_collect_status' );
-add_action( 'auth_cookie_valid',          'rest_cookie_collect_status' );
+add_action( 'xmlrpc_rsd_apis', 'rest_output_rsd' );
+add_action( 'wp_head', 'rest_output_link_wp_head', 10, 0 );
+add_action( 'template_redirect', 'rest_output_link_header', 11, 0 );
+add_action( 'auth_cookie_malformed', 'rest_cookie_collect_status' );
+add_action( 'auth_cookie_expired', 'rest_cookie_collect_status' );
+add_action( 'auth_cookie_bad_username', 'rest_cookie_collect_status' );
+add_action( 'auth_cookie_bad_hash', 'rest_cookie_collect_status' );
+add_action( 'auth_cookie_valid', 'rest_cookie_collect_status' );
 add_filter( 'rest_authentication_errors', 'rest_cookie_check_errors', 100 );
 
 // Actions
-add_action( 'wp_head',             '_wp_render_title_tag',            1     );
-add_action( 'wp_head',             'wp_enqueue_scripts',              1     );
-add_action( 'wp_head',             'wp_resource_hints',               2     );
-add_action( 'wp_head',             'feed_links',                      2     );
-add_action( 'wp_head',             'feed_links_extra',                3     );
-add_action( 'wp_head',             'rsd_link'                               );
-add_action( 'wp_head',             'wlwmanifest_link'                       );
-add_action( 'wp_head',             'adjacent_posts_rel_link_wp_head', 10, 0 );
-add_action( 'wp_head',             'locale_stylesheet'                      );
-add_action( 'publish_future_post', 'check_and_publish_future_post',   10, 1 );
-add_action( 'wp_head',             'noindex',                          1    );
-add_action( 'wp_head',             'print_emoji_detection_script',     7    );
-add_action( 'wp_head',             'wp_print_styles',                  8    );
-add_action( 'wp_head',             'wp_print_head_scripts',            9    );
-add_action( 'wp_head',             'wp_generator'                           );
-add_action( 'wp_head',             'rel_canonical'                          );
-add_action( 'wp_head',             'wp_shortlink_wp_head',            10, 0 );
-add_action( 'wp_head',             'wp_custom_css_cb',                101   );
-add_action( 'wp_head',             'wp_site_icon',                    99    );
-add_action( 'wp_footer',           'wp_print_footer_scripts',         20    );
-add_action( 'template_redirect',   'wp_shortlink_header',             11, 0 );
-add_action( 'wp_print_footer_scripts', '_wp_footer_scripts'                 );
-add_action( 'init',                'check_theme_switched',            99    );
-add_action( 'after_switch_theme',  '_wp_menus_changed'                      );
-add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
-add_action( 'wp_print_styles',     'print_emoji_styles'                     );
+add_action( 'wp_head', '_wp_render_title_tag', 1 );
+add_action( 'wp_head', 'wp_enqueue_scripts', 1 );
+add_action( 'wp_head', 'wp_resource_hints', 2 );
+add_action( 'wp_head', 'feed_links', 2 );
+add_action( 'wp_head', 'feed_links_extra', 3 );
+add_action( 'wp_head', 'rsd_link' );
+add_action( 'wp_head', 'wlwmanifest_link' );
+add_action( 'wp_head', 'adjacent_posts_rel_link_wp_head', 10, 0 );
+add_action( 'wp_head', 'locale_stylesheet' );
+add_action( 'publish_future_post', 'check_and_publish_future_post', 10, 1 );
+add_action( 'wp_head', 'noindex', 1 );
+add_action( 'wp_head', 'print_emoji_detection_script', 7 );
+add_action( 'wp_head', 'wp_print_styles', 8 );
+add_action( 'wp_head', 'wp_print_head_scripts', 9 );
+add_action( 'wp_head', 'wp_generator' );
+add_action( 'wp_head', 'rel_canonical' );
+add_action( 'wp_head', 'wp_shortlink_wp_head', 10, 0 );
+add_action( 'wp_head', 'wp_custom_css_cb', 101 );
+add_action( 'wp_head', 'wp_site_icon', 99 );
+add_action( 'wp_footer', 'wp_print_footer_scripts', 20 );
+add_action( 'template_redirect', 'wp_shortlink_header', 11, 0 );
+add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
+add_action( 'init', 'check_theme_switched', 99 );
+add_action( 'after_switch_theme', '_wp_menus_changed' );
+add_action( 'after_switch_theme', '_wp_sidebars_changed' );
+add_action( 'wp_print_styles', 'print_emoji_styles' );
 
-if ( isset( $_GET['replytocom'] ) )
-    add_action( 'wp_head', 'wp_no_robots' );
+if ( isset( $_GET['replytocom'] ) ) {
+	add_action( 'wp_head', 'wp_no_robots' );
+}
 
 // Login actions
-add_filter( 'login_head',          'wp_resource_hints',             8     );
-add_action( 'login_head',          'wp_print_head_scripts',         9     );
-add_action( 'login_head',          'print_admin_styles',            9     );
-add_action( 'login_head',          'wp_site_icon',                  99    );
-add_action( 'login_footer',        'wp_print_footer_scripts',       20    );
-add_action( 'login_init',          'send_frame_options_header',     10, 0 );
+add_filter( 'login_head', 'wp_resource_hints', 8 );
+add_action( 'login_head', 'wp_print_head_scripts', 9 );
+add_action( 'login_head', 'print_admin_styles', 9 );
+add_action( 'login_head', 'wp_site_icon', 99 );
+add_action( 'login_footer', 'wp_print_footer_scripts', 20 );
+add_action( 'login_init', 'send_frame_options_header', 10, 0 );
 
 // Feed Generator Tags
 foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {
@@ -290,56 +301,57 @@ add_action( 'rss2_head', 'rss2_site_icon' );
 
 
 // WP Cron
-if ( !defined( 'DOING_CRON' ) )
+if ( ! defined( 'DOING_CRON' ) ) {
 	add_action( 'init', 'wp_cron' );
+}
 
 // 2 Actions 2 Furious
-add_action( 'do_feed_rdf',                'do_feed_rdf',                             10, 1 );
-add_action( 'do_feed_rss',                'do_feed_rss',                             10, 1 );
-add_action( 'do_feed_rss2',               'do_feed_rss2',                            10, 1 );
-add_action( 'do_feed_atom',               'do_feed_atom',                            10, 1 );
-add_action( 'do_pings',                   'do_all_pings',                            10, 1 );
-add_action( 'do_robots',                  'do_robots'                                      );
-add_action( 'set_comment_cookies',        'wp_set_comment_cookies',                  10, 2 );
-add_action( 'sanitize_comment_cookies',   'sanitize_comment_cookies'                       );
-add_action( 'admin_print_scripts',        'print_emoji_detection_script'                   );
-add_action( 'admin_print_scripts',        'print_head_scripts',                      20    );
-add_action( 'admin_print_footer_scripts', '_wp_footer_scripts'                             );
-add_action( 'admin_print_styles',         'print_emoji_styles'                             );
-add_action( 'admin_print_styles',         'print_admin_styles',                      20    );
-add_action( 'init',                       'smilies_init',                             5    );
-add_action( 'plugins_loaded',             'wp_maybe_load_widgets',                    0    );
-add_action( 'plugins_loaded',             'wp_maybe_load_embeds',                     0    );
-add_action( 'shutdown',                   'wp_ob_end_flush_all',                      1    );
+add_action( 'do_feed_rdf', 'do_feed_rdf', 10, 1 );
+add_action( 'do_feed_rss', 'do_feed_rss', 10, 1 );
+add_action( 'do_feed_rss2', 'do_feed_rss2', 10, 1 );
+add_action( 'do_feed_atom', 'do_feed_atom', 10, 1 );
+add_action( 'do_pings', 'do_all_pings', 10, 1 );
+add_action( 'do_robots', 'do_robots' );
+add_action( 'set_comment_cookies', 'wp_set_comment_cookies', 10, 2 );
+add_action( 'sanitize_comment_cookies', 'sanitize_comment_cookies' );
+add_action( 'admin_print_scripts', 'print_emoji_detection_script' );
+add_action( 'admin_print_scripts', 'print_head_scripts', 20 );
+add_action( 'admin_print_footer_scripts', '_wp_footer_scripts' );
+add_action( 'admin_print_styles', 'print_emoji_styles' );
+add_action( 'admin_print_styles', 'print_admin_styles', 20 );
+add_action( 'init', 'smilies_init', 5 );
+add_action( 'plugins_loaded', 'wp_maybe_load_widgets', 0 );
+add_action( 'plugins_loaded', 'wp_maybe_load_embeds', 0 );
+add_action( 'shutdown', 'wp_ob_end_flush_all', 1 );
 // Create a revision whenever a post is updated.
-add_action( 'post_updated',               'wp_save_post_revision',                   10, 1 );
-add_action( 'publish_post',               '_publish_post_hook',                       5, 1 );
-add_action( 'transition_post_status',     '_transition_post_status',                  5, 3 );
-add_action( 'transition_post_status',     '_update_term_count_on_transition_post_status', 10, 3 );
-add_action( 'comment_form',               'wp_comment_form_unfiltered_html_nonce'          );
-add_action( 'admin_init',                 'send_frame_options_header',               10, 0 );
-add_action( 'welcome_panel',              'wp_welcome_panel'                               );
+add_action( 'post_updated', 'wp_save_post_revision', 10, 1 );
+add_action( 'publish_post', '_publish_post_hook', 5, 1 );
+add_action( 'transition_post_status', '_transition_post_status', 5, 3 );
+add_action( 'transition_post_status', '_update_term_count_on_transition_post_status', 10, 3 );
+add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' );
+add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
+add_action( 'welcome_panel', 'wp_welcome_panel' );
 
 // Cron tasks
-add_action( 'wp_scheduled_delete',            'wp_scheduled_delete'       );
-add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts'     );
-add_action( 'importer_scheduled_cleanup',     'wp_delete_attachment'      );
-add_action( 'upgrader_scheduled_cleanup',     'wp_delete_attachment'      );
-add_action( 'delete_expired_transients',      'delete_expired_transients' );
+add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
+add_action( 'wp_scheduled_auto_draft_delete', 'wp_delete_auto_drafts' );
+add_action( 'importer_scheduled_cleanup', 'wp_delete_attachment' );
+add_action( 'upgrader_scheduled_cleanup', 'wp_delete_attachment' );
+add_action( 'delete_expired_transients', 'delete_expired_transients' );
 
 // Navigation menu actions
-add_action( 'delete_post',                '_wp_delete_post_menu_item'         );
-add_action( 'delete_term',                '_wp_delete_tax_menu_item',   10, 3 );
-add_action( 'transition_post_status',     '_wp_auto_add_pages_to_menu', 10, 3 );
-add_action( 'delete_post',                '_wp_delete_customize_changeset_dependent_auto_drafts' );
+add_action( 'delete_post', '_wp_delete_post_menu_item' );
+add_action( 'delete_term', '_wp_delete_tax_menu_item', 10, 3 );
+add_action( 'transition_post_status', '_wp_auto_add_pages_to_menu', 10, 3 );
+add_action( 'delete_post', '_wp_delete_customize_changeset_dependent_auto_drafts' );
 
 // Post Thumbnail CSS class filtering
-add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add'    );
-add_action( 'end_fetch_post_thumbnail_html',   '_wp_post_thumbnail_class_filter_remove' );
+add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add' );
+add_action( 'end_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_remove' );
 
 // Redirect Old Slugs
-add_action( 'template_redirect',  'wp_old_slug_redirect'              );
-add_action( 'post_updated',       'wp_check_for_changed_slugs', 12, 3 );
+add_action( 'template_redirect', 'wp_old_slug_redirect' );
+add_action( 'post_updated', 'wp_check_for_changed_slugs', 12, 3 );
 add_action( 'attachment_updated', 'wp_check_for_changed_slugs', 12, 3 );
 
 // Nonce check for Post Previews
@@ -349,10 +361,10 @@ add_action( 'init', '_show_post_preview' );
 add_action( 'wp_head', 'wp_post_preview_js', 1 );
 
 // Timezone
-add_filter( 'pre_option_gmt_offset','wp_timezone_override_offset' );
+add_filter( 'pre_option_gmt_offset', 'wp_timezone_override_offset' );
 
 // Admin Color Schemes
-add_action( 'admin_init', 'register_admin_color_schemes', 1);
+add_action( 'admin_init', 'register_admin_color_schemes', 1 );
 add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
 
 // If the upgrade hasn't run yet, assume link manager is used.
@@ -366,19 +378,19 @@ add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );
 
 // Check if the user is logged out
 add_action( 'admin_enqueue_scripts', 'wp_auth_check_load' );
-add_filter( 'heartbeat_send',        'wp_auth_check' );
+add_filter( 'heartbeat_send', 'wp_auth_check' );
 add_filter( 'heartbeat_nopriv_send', 'wp_auth_check' );
 
 // Default authentication filters
-add_filter( 'authenticate', 'wp_authenticate_username_password',  20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_email_password',     20, 3 );
-add_filter( 'authenticate', 'wp_authenticate_spam_check',         99    );
-add_filter( 'determine_current_user', 'wp_validate_auth_cookie'          );
+add_filter( 'authenticate', 'wp_authenticate_username_password', 20, 3 );
+add_filter( 'authenticate', 'wp_authenticate_email_password', 20, 3 );
+add_filter( 'authenticate', 'wp_authenticate_spam_check', 99 );
+add_filter( 'determine_current_user', 'wp_validate_auth_cookie' );
 add_filter( 'determine_current_user', 'wp_validate_logged_in_cookie', 20 );
 
 // Split term updates.
-add_action( 'admin_init',        '_wp_check_for_scheduled_split_terms' );
-add_action( 'split_shared_term', '_wp_check_split_default_terms',  10, 4 );
+add_action( 'admin_init', '_wp_check_for_scheduled_split_terms' );
+add_action( 'split_shared_term', '_wp_check_split_default_terms', 10, 4 );
 add_action( 'split_shared_term', '_wp_check_split_terms_in_menus', 10, 4 );
 add_action( 'split_shared_term', '_wp_check_split_nav_menu_terms', 10, 4 );
 add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
@@ -387,13 +399,13 @@ add_action( 'wp_split_shared_term_batch', '_wp_batch_split_terms' );
 add_action( 'comment_post', 'wp_new_comment_notify_moderator' );
 add_action( 'comment_post', 'wp_new_comment_notify_postauthor' );
 add_action( 'after_password_reset', 'wp_password_change_notification' );
-add_action( 'register_new_user',      'wp_send_new_user_notifications' );
+add_action( 'register_new_user', 'wp_send_new_user_notifications' );
 add_action( 'edit_user_created_user', 'wp_send_new_user_notifications', 10, 2 );
 
 // REST API actions.
-add_action( 'init',          'rest_api_init' );
-add_action( 'rest_api_init', 'rest_api_default_filters',   10, 1 );
-add_action( 'rest_api_init', 'register_initial_settings',  10 );
+add_action( 'init', 'rest_api_init' );
+add_action( 'rest_api_init', 'rest_api_default_filters', 10, 1 );
+add_action( 'rest_api_init', 'register_initial_settings', 10 );
 add_action( 'rest_api_init', 'create_initial_rest_routes', 99 );
 add_action( 'parse_request', 'rest_api_loaded' );
 
@@ -422,7 +434,7 @@ add_action( 'transition_post_status', '__clear_multi_author_cache' );
 add_action( 'init', 'create_initial_post_types', 0 ); // highest priority
 add_action( 'admin_menu', '_add_post_type_submenus' );
 add_action( 'before_delete_post', '_reset_front_page_settings_for_post' );
-add_action( 'wp_trash_post',      '_reset_front_page_settings_for_post' );
+add_action( 'wp_trash_post', '_reset_front_page_settings_for_post' );
 add_action( 'change_locale', 'create_initial_post_types' );
 
 // Post Formats
@@ -484,38 +496,38 @@ add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
 add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 );
 
 // Embeds
-add_action( 'rest_api_init',          'wp_oembed_register_route'              );
+add_action( 'rest_api_init', 'wp_oembed_register_route' );
 add_filter( 'rest_pre_serve_request', '_oembed_rest_pre_serve_request', 10, 4 );
 
-add_action( 'wp_head',                'wp_oembed_add_discovery_links'         );
-add_action( 'wp_head',                'wp_oembed_add_host_js'                 );
+add_action( 'wp_head', 'wp_oembed_add_discovery_links' );
+add_action( 'wp_head', 'wp_oembed_add_host_js' );
 
-add_action( 'embed_head',             'enqueue_embed_scripts',           1    );
-add_action( 'embed_head',             'print_emoji_detection_script'          );
-add_action( 'embed_head',             'print_embed_styles'                    );
-add_action( 'embed_head',             'wp_print_head_scripts',          20    );
-add_action( 'embed_head',             'wp_print_styles',                20    );
-add_action( 'embed_head',             'wp_no_robots'                          );
-add_action( 'embed_head',             'rel_canonical'                         );
-add_action( 'embed_head',             'locale_stylesheet',              30    );
+add_action( 'embed_head', 'enqueue_embed_scripts', 1 );
+add_action( 'embed_head', 'print_emoji_detection_script' );
+add_action( 'embed_head', 'print_embed_styles' );
+add_action( 'embed_head', 'wp_print_head_scripts', 20 );
+add_action( 'embed_head', 'wp_print_styles', 20 );
+add_action( 'embed_head', 'wp_no_robots' );
+add_action( 'embed_head', 'rel_canonical' );
+add_action( 'embed_head', 'locale_stylesheet', 30 );
 
-add_action( 'embed_content_meta',     'print_embed_comments_button'           );
-add_action( 'embed_content_meta',     'print_embed_sharing_button'            );
+add_action( 'embed_content_meta', 'print_embed_comments_button' );
+add_action( 'embed_content_meta', 'print_embed_sharing_button' );
 
-add_action( 'embed_footer',           'print_embed_sharing_dialog'            );
-add_action( 'embed_footer',           'print_embed_scripts'                   );
-add_action( 'embed_footer',           'wp_print_footer_scripts',        20    );
+add_action( 'embed_footer', 'print_embed_sharing_dialog' );
+add_action( 'embed_footer', 'print_embed_scripts' );
+add_action( 'embed_footer', 'wp_print_footer_scripts', 20 );
 
-add_filter( 'excerpt_more',           'wp_embed_excerpt_more',          20    );
-add_filter( 'the_excerpt_embed',      'wptexturize'                           );
-add_filter( 'the_excerpt_embed',      'convert_chars'                         );
-add_filter( 'the_excerpt_embed',      'wpautop'                               );
-add_filter( 'the_excerpt_embed',      'shortcode_unautop'                     );
-add_filter( 'the_excerpt_embed',      'wp_embed_excerpt_attachment'           );
+add_filter( 'excerpt_more', 'wp_embed_excerpt_more', 20 );
+add_filter( 'the_excerpt_embed', 'wptexturize' );
+add_filter( 'the_excerpt_embed', 'convert_chars' );
+add_filter( 'the_excerpt_embed', 'wpautop' );
+add_filter( 'the_excerpt_embed', 'shortcode_unautop' );
+add_filter( 'the_excerpt_embed', 'wp_embed_excerpt_attachment' );
 
-add_filter( 'oembed_dataparse',       'wp_filter_oembed_result',        10, 3 );
-add_filter( 'oembed_response_data',   'get_oembed_response_data_rich',  10, 4 );
-add_filter( 'pre_oembed_result',      'wp_filter_pre_oembed_result',    10, 3 );
+add_filter( 'oembed_dataparse', 'wp_filter_oembed_result', 10, 3 );
+add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );
+add_filter( 'pre_oembed_result', 'wp_filter_pre_oembed_result', 10, 3 );
 
 // Capabilities
 add_filter( 'user_has_cap', 'wp_maybe_grant_install_languages_cap', 1 );
diff --git a/wp-includes/embed.php b/wp-includes/embed.php
index d9aba2e00c..461dced3f1 100644
--- a/wp-includes/embed.php
+++ b/wp-includes/embed.php
@@ -61,11 +61,13 @@ function wp_embed_unregister_handler( $id, $priority = 10 ) {
  * @return array Default embed parameters.
  */
 function wp_embed_defaults( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
+	if ( ! empty( $GLOBALS['content_width'] ) ) {
 		$width = (int) $GLOBALS['content_width'];
+	}
 
-	if ( empty( $width ) )
+	if ( empty( $width ) ) {
 		$width = 500;
+	}
 
 	$height = min( ceil( $width * 1.5 ), 1000 );
 
@@ -131,8 +133,8 @@ function _wp_oembed_get_object() {
  */
 function wp_oembed_add_provider( $format, $provider, $regex = false ) {
 	if ( did_action( 'plugins_loaded' ) ) {
-		$oembed = _wp_oembed_get_object();
-		$oembed->providers[$format] = array( $provider, $regex );
+		$oembed                       = _wp_oembed_get_object();
+		$oembed->providers[ $format ] = array( $provider, $regex );
 	} else {
 		WP_oEmbed::_add_provider_early( $format, $provider, $regex );
 	}
@@ -226,7 +228,7 @@ function wp_maybe_load_embeds() {
  */
 function wp_embed_handler_youtube( $matches, $attr, $url, $rawattr ) {
 	global $wp_embed;
-	$embed = $wp_embed->autoembed( sprintf( "https://youtube.com/watch?v=%s", urlencode( $matches[2] ) ) );
+	$embed = $wp_embed->autoembed( sprintf( 'https://youtube.com/watch?v=%s', urlencode( $matches[2] ) ) );
 
 	/**
 	 * Filters the YoutTube embed output.
@@ -395,10 +397,12 @@ function get_oembed_endpoint_url( $permalink = '', $format = 'json' ) {
 	$url = rest_url( 'oembed/1.0/embed' );
 
 	if ( '' !== $permalink ) {
-		$url = add_query_arg( array(
-			'url'    => urlencode( $permalink ),
-			'format' => ( 'json' !== $format ) ? $format : false,
-		), $url );
+		$url = add_query_arg(
+			array(
+				'url'    => urlencode( $permalink ),
+				'format' => ( 'json' !== $format ) ? $format : false,
+			), $url
+		);
 	}
 
 	/**
@@ -449,7 +453,7 @@ function get_post_embed_html( $width, $height, $post = null ) {
 		 * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
 		 * and edit wp-embed.js directly.
 		 */
-		$output .=<<<JS
+		$output .= <<<JS
 		!function(a,b){"use strict";function c(){if(!e){e=!0;var a,c,d,f,g=-1!==navigator.appVersion.indexOf("MSIE 10"),h=!!navigator.userAgent.match(/Trident.*rv:11\./),i=b.querySelectorAll("iframe.wp-embedded-content");for(c=0;c<i.length;c++){if(d=i[c],!d.getAttribute("data-secret"))f=Math.random().toString(36).substr(2,10),d.src+="#?secret="+f,d.setAttribute("data-secret",f);if(g||h)a=d.cloneNode(!0),a.removeAttribute("security"),d.parentNode.replaceChild(a,d)}}}var d=!1,e=!1;if(b.querySelector)if(a.addEventListener)d=!0;if(a.wp=a.wp||{},!a.wp.receiveEmbedMessage)if(a.wp.receiveEmbedMessage=function(c){var d=c.data;if(d.secret||d.message||d.value)if(!/[^a-zA-Z0-9]/.test(d.secret)){var e,f,g,h,i,j=b.querySelectorAll('iframe[data-secret="'+d.secret+'"]'),k=b.querySelectorAll('blockquote[data-secret="'+d.secret+'"]');for(e=0;e<k.length;e++)k[e].style.display="none";for(e=0;e<j.length;e++)if(f=j[e],c.source===f.contentWindow){if(f.removeAttribute("style"),"height"===d.message){if(g=parseInt(d.value,10),g>1e3)g=1e3;else if(~~g<200)g=200;f.height=g}if("link"===d.message)if(h=b.createElement("a"),i=b.createElement("a"),h.href=f.getAttribute("src"),i.href=d.value,i.host===h.host)if(b.activeElement===f)a.top.location.href=d.value}else;}},d)a.addEventListener("message",a.wp.receiveEmbedMessage,!1),b.addEventListener("DOMContentLoaded",c,!1),a.addEventListener("load",c,!1)}(window,document);
 JS;
 	}
@@ -517,10 +521,12 @@ function get_oembed_response_data( $post, $width ) {
 	 *     @type int $max Maximum width. Default 600.
 	 * }
 	 */
-	$min_max_width = apply_filters( 'oembed_min_max_width', array(
-		'min' => 200,
-		'max' => 600
-	) );
+	$min_max_width = apply_filters(
+		'oembed_min_max_width', array(
+			'min' => 200,
+			'max' => 600,
+		)
+	);
 
 	$width  = min( max( $min_max_width['min'], $width ), $min_max_width['max'] );
 	$height = max( ceil( $width / 16 * 9 ), 200 );
@@ -582,7 +588,7 @@ function get_oembed_response_data_rich( $data, $post, $width, $height ) {
 	if ( 'attachment' === get_post_type( $post ) ) {
 		if ( wp_attachment_is_image( $post ) ) {
 			$thumbnail_id = $post->ID;
-		} else if ( wp_attachment_is( 'video', $post ) ) {
+		} elseif ( wp_attachment_is( 'video', $post ) ) {
 			$thumbnail_id = get_post_thumbnail_id( $post );
 			$data['type'] = 'video';
 		}
@@ -590,9 +596,9 @@ function get_oembed_response_data_rich( $data, $post, $width, $height ) {
 
 	if ( $thumbnail_id ) {
 		list( $thumbnail_url, $thumbnail_width, $thumbnail_height ) = wp_get_attachment_image_src( $thumbnail_id, array( $width, 99999 ) );
-		$data['thumbnail_url']    = $thumbnail_url;
-		$data['thumbnail_width']  = $thumbnail_width;
-		$data['thumbnail_height'] = $thumbnail_height;
+		$data['thumbnail_url']                                      = $thumbnail_url;
+		$data['thumbnail_width']                                    = $thumbnail_width;
+		$data['thumbnail_height']                                   = $thumbnail_height;
 	}
 
 	return $data;
@@ -729,7 +735,7 @@ function wp_filter_oembed_result( $result, $data, $url ) {
 
 	$allowed_html = array(
 		'a'          => array(
-			'href'         => true,
+			'href' => true,
 		),
 		'blockquote' => array(),
 		'iframe'     => array(
@@ -759,14 +765,14 @@ function wp_filter_oembed_result( $result, $data, $url ) {
 		$secret = wp_generate_password( 10, false );
 
 		$url = esc_url( "{$results[2]}#?secret=$secret" );
-		$q = $results[1];
+		$q   = $results[1];
 
 		$html = str_replace( $results[0], ' src=' . $q . $url . $q . ' data-secret=' . $q . $secret . $q, $html );
 		$html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
 	}
 
 	$allowed_html['blockquote']['data-secret'] = true;
-	$allowed_html['iframe']['data-secret'] = true;
+	$allowed_html['iframe']['data-secret']     = true;
 
 	$html = wp_kses( $html, $allowed_html );
 
@@ -797,7 +803,8 @@ function wp_embed_excerpt_more( $more_string ) {
 		return $more_string;
 	}
 
-	$link = sprintf( '<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
+	$link = sprintf(
+		'<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
 		esc_url( get_permalink() ),
 		/* translators: %s: Name of current post */
 		sprintf( __( 'Continue reading %s' ), '<span class="screen-reader-text">' . get_the_title() . '</span>' )
@@ -873,23 +880,23 @@ function print_embed_styles() {
 	?>
 	<style type="text/css">
 	<?php
-		if ( SCRIPT_DEBUG ) {
-			readfile( ABSPATH . WPINC . "/css/wp-embed-template.css" );
-		} else {
-			/*
-			 * If you're looking at a src version of this file, you'll see an "include"
-			 * statement below. This is used by the `grunt build` process to directly
-			 * include a minified version of wp-oembed-embed.css, instead of using the
-			 * readfile() method from above.
-			 *
-			 * If you're looking at a build version of this file, you'll see a string of
-			 * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
-			 * and edit wp-embed-template.css directly.
-			 */
-			?>
-			body,html{padding:0;margin:0}body{font-family:sans-serif}.wp-embed,.wp-embed-share-input{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif}.screen-reader-text{border:0;clip:rect(1px,1px,1px,1px);-webkit-clip-path:inset(50%);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px;word-wrap:normal!important}.dashicons{display:inline-block;width:20px;height:20px;background-color:transparent;background-repeat:no-repeat;background-size:20px;background-position:center;transition:background .1s ease-in;position:relative;top:5px}.dashicons-no{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M15.55%2013.7l-2.19%202.06-3.42-3.65-3.64%203.43-2.06-2.18%203.64-3.43-3.42-3.64%202.18-2.06%203.43%203.64%203.64-3.42%202.05%202.18-3.64%203.43z%27%20fill%3D%27%23fff%27%2F%3E%3C%2Fsvg%3E")}.dashicons-admin-comments{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E")}.wp-embed-comments a:hover .dashicons-admin-comments{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E")}.dashicons-share{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E");display:none}.js .dashicons-share{display:inline-block}.wp-embed-share-dialog-open:hover .dashicons-share{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E")}.wp-embed{padding:25px;font-size:14px;font-weight:400;line-height:1.5;color:#82878c;background:#fff;border:1px solid #e5e5e5;box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:auto;zoom:1}.wp-embed a{color:#82878c;text-decoration:none}.wp-embed a:hover{text-decoration:underline}.wp-embed-featured-image{margin-bottom:20px}.wp-embed-featured-image img{width:100%;height:auto;border:none}.wp-embed-featured-image.square{float:left;max-width:160px;margin-right:20px}.wp-embed p{margin:0}p.wp-embed-heading{margin:0 0 15px;font-weight:600;font-size:22px;line-height:1.3}.wp-embed-heading a{color:#32373c}.wp-embed .wp-embed-more{color:#b4b9be}.wp-embed-footer{display:table;width:100%;margin-top:30px}.wp-embed-site-icon{position:absolute;top:50%;left:0;-webkit-transform:translateY(-50%);transform:translateY(-50%);height:25px;width:25px;border:0}.wp-embed-site-title{font-weight:600;line-height:25px}.wp-embed-site-title a{position:relative;display:inline-block;padding-left:35px}.wp-embed-meta,.wp-embed-site-title{display:table-cell}.wp-embed-meta{text-align:right;white-space:nowrap;vertical-align:middle}.wp-embed-comments,.wp-embed-share{display:inline}.wp-embed-comments a,.wp-embed-share-tab-button{display:inline-block}.wp-embed-meta a:hover{text-decoration:none;color:#0073aa}.wp-embed-comments a{line-height:25px}.wp-embed-comments+.wp-embed-share{margin-left:10px}.wp-embed-share-dialog{position:absolute;top:0;left:0;right:0;bottom:0;background-color:#222;background-color:rgba(10,10,10,.9);color:#fff;opacity:1;transition:opacity .25s ease-in-out}.wp-embed-share-dialog.hidden{opacity:0;visibility:hidden}.wp-embed-share-dialog-close,.wp-embed-share-dialog-open{margin:-8px 0 0;padding:0;background:0 0;border:none;cursor:pointer;outline:0}.wp-embed-share-dialog-close .dashicons,.wp-embed-share-dialog-open .dashicons{padding:4px}.wp-embed-share-dialog-open .dashicons{top:8px}.wp-embed-share-dialog-close:focus .dashicons,.wp-embed-share-dialog-open:focus .dashicons{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);border-radius:100%}.wp-embed-share-dialog-close{position:absolute;top:20px;right:20px;font-size:22px}.wp-embed-share-dialog-close:hover{text-decoration:none}.wp-embed-share-dialog-close .dashicons{height:24px;width:24px;background-size:24px}.wp-embed-share-dialog-content{height:100%;-webkit-transform-style:preserve-3d;transform-style:preserve-3d;overflow:hidden}.wp-embed-share-dialog-text{margin-top:25px;padding:20px}.wp-embed-share-tabs{margin:0 0 20px;padding:0;list-style:none}.wp-embed-share-tab-button button{margin:0;padding:0;border:none;background:0 0;font-size:16px;line-height:1.3;color:#aaa;cursor:pointer;transition:color .1s ease-in}.wp-embed-share-tab-button [aria-selected=true],.wp-embed-share-tab-button button:hover{color:#fff}.wp-embed-share-tab-button+.wp-embed-share-tab-button{margin:0 0 0 10px;padding:0 0 0 11px;border-left:1px solid #aaa}.wp-embed-share-tab[aria-hidden=true]{display:none}p.wp-embed-share-description{margin:0;font-size:14px;line-height:1;font-style:italic;color:#aaa}.wp-embed-share-input{box-sizing:border-box;width:100%;border:none;height:28px;margin:0 0 10px;padding:0 5px;font-size:14px;font-weight:400;line-height:1.5;resize:none;cursor:text}textarea.wp-embed-share-input{height:72px}html[dir=rtl] .wp-embed-featured-image.square{float:right;margin-right:0;margin-left:20px}html[dir=rtl] .wp-embed-site-title a{padding-left:0;padding-right:35px}html[dir=rtl] .wp-embed-site-icon{margin-right:0;margin-left:10px;left:auto;right:0}html[dir=rtl] .wp-embed-meta{text-align:left}html[dir=rtl] .wp-embed-share{margin-left:0;margin-right:10px}html[dir=rtl] .wp-embed-share-dialog-close{right:auto;left:20px}html[dir=rtl] .wp-embed-share-tab-button+.wp-embed-share-tab-button{margin:0 10px 0 0;padding:0 11px 0 0;border-left:none;border-right:1px solid #aaa}
-			<?php
-		}
+	if ( SCRIPT_DEBUG ) {
+		readfile( ABSPATH . WPINC . '/css/wp-embed-template.css' );
+	} else {
+		/*
+		 * If you're looking at a src version of this file, you'll see an "include"
+		 * statement below. This is used by the `grunt build` process to directly
+		 * include a minified version of wp-oembed-embed.css, instead of using the
+		 * readfile() method from above.
+		 *
+		 * If you're looking at a build version of this file, you'll see a string of
+		 * minified CSS. If you need to debug it, please turn on SCRIPT_DEBUG
+		 * and edit wp-embed-template.css directly.
+		 */
+		?>
+		body,html{padding:0;margin:0}body{font-family:sans-serif}.wp-embed,.wp-embed-share-input{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif}.screen-reader-text{border:0;clip:rect(1px,1px,1px,1px);-webkit-clip-path:inset(50%);clip-path:inset(50%);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px;word-wrap:normal!important}.dashicons{display:inline-block;width:20px;height:20px;background-color:transparent;background-repeat:no-repeat;background-size:20px;background-position:center;transition:background .1s ease-in;position:relative;top:5px}.dashicons-no{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M15.55%2013.7l-2.19%202.06-3.42-3.65-3.64%203.43-2.06-2.18%203.64-3.43-3.42-3.64%202.18-2.06%203.43%203.64%203.64-3.42%202.05%202.18-3.64%203.43z%27%20fill%3D%27%23fff%27%2F%3E%3C%2Fsvg%3E")}.dashicons-admin-comments{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E")}.wp-embed-comments a:hover .dashicons-admin-comments{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M5%202h9q.82%200%201.41.59T16%204v7q0%20.82-.59%201.41T14%2013h-2l-5%205v-5H5q-.82%200-1.41-.59T3%2011V4q0-.82.59-1.41T5%202z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E")}.dashicons-share{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%2382878c%27%2F%3E%3C%2Fsvg%3E");display:none}.js .dashicons-share{display:inline-block}.wp-embed-share-dialog-open:hover .dashicons-share{background-image:url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2020%2020%27%3E%3Cpath%20d%3D%27M14.5%2012q1.24%200%202.12.88T17.5%2015t-.88%202.12-2.12.88-2.12-.88T11.5%2015q0-.34.09-.69l-4.38-2.3Q6.32%2013%205%2013q-1.24%200-2.12-.88T2%2010t.88-2.12T5%207q1.3%200%202.21.99l4.38-2.3q-.09-.35-.09-.69%200-1.24.88-2.12T14.5%202t2.12.88T17.5%205t-.88%202.12T14.5%208q-1.3%200-2.21-.99l-4.38%202.3Q8%209.66%208%2010t-.09.69l4.38%202.3q.89-.99%202.21-.99z%27%20fill%3D%27%230073aa%27%2F%3E%3C%2Fsvg%3E")}.wp-embed{padding:25px;font-size:14px;font-weight:400;line-height:1.5;color:#82878c;background:#fff;border:1px solid #e5e5e5;box-shadow:0 1px 1px rgba(0,0,0,.05);overflow:auto;zoom:1}.wp-embed a{color:#82878c;text-decoration:none}.wp-embed a:hover{text-decoration:underline}.wp-embed-featured-image{margin-bottom:20px}.wp-embed-featured-image img{width:100%;height:auto;border:none}.wp-embed-featured-image.square{float:left;max-width:160px;margin-right:20px}.wp-embed p{margin:0}p.wp-embed-heading{margin:0 0 15px;font-weight:600;font-size:22px;line-height:1.3}.wp-embed-heading a{color:#32373c}.wp-embed .wp-embed-more{color:#b4b9be}.wp-embed-footer{display:table;width:100%;margin-top:30px}.wp-embed-site-icon{position:absolute;top:50%;left:0;-webkit-transform:translateY(-50%);transform:translateY(-50%);height:25px;width:25px;border:0}.wp-embed-site-title{font-weight:600;line-height:25px}.wp-embed-site-title a{position:relative;display:inline-block;padding-left:35px}.wp-embed-meta,.wp-embed-site-title{display:table-cell}.wp-embed-meta{text-align:right;white-space:nowrap;vertical-align:middle}.wp-embed-comments,.wp-embed-share{display:inline}.wp-embed-comments a,.wp-embed-share-tab-button{display:inline-block}.wp-embed-meta a:hover{text-decoration:none;color:#0073aa}.wp-embed-comments a{line-height:25px}.wp-embed-comments+.wp-embed-share{margin-left:10px}.wp-embed-share-dialog{position:absolute;top:0;left:0;right:0;bottom:0;background-color:#222;background-color:rgba(10,10,10,.9);color:#fff;opacity:1;transition:opacity .25s ease-in-out}.wp-embed-share-dialog.hidden{opacity:0;visibility:hidden}.wp-embed-share-dialog-close,.wp-embed-share-dialog-open{margin:-8px 0 0;padding:0;background:0 0;border:none;cursor:pointer;outline:0}.wp-embed-share-dialog-close .dashicons,.wp-embed-share-dialog-open .dashicons{padding:4px}.wp-embed-share-dialog-open .dashicons{top:8px}.wp-embed-share-dialog-close:focus .dashicons,.wp-embed-share-dialog-open:focus .dashicons{box-shadow:0 0 0 1px #5b9dd9,0 0 2px 1px rgba(30,140,190,.8);border-radius:100%}.wp-embed-share-dialog-close{position:absolute;top:20px;right:20px;font-size:22px}.wp-embed-share-dialog-close:hover{text-decoration:none}.wp-embed-share-dialog-close .dashicons{height:24px;width:24px;background-size:24px}.wp-embed-share-dialog-content{height:100%;-webkit-transform-style:preserve-3d;transform-style:preserve-3d;overflow:hidden}.wp-embed-share-dialog-text{margin-top:25px;padding:20px}.wp-embed-share-tabs{margin:0 0 20px;padding:0;list-style:none}.wp-embed-share-tab-button button{margin:0;padding:0;border:none;background:0 0;font-size:16px;line-height:1.3;color:#aaa;cursor:pointer;transition:color .1s ease-in}.wp-embed-share-tab-button [aria-selected=true],.wp-embed-share-tab-button button:hover{color:#fff}.wp-embed-share-tab-button+.wp-embed-share-tab-button{margin:0 0 0 10px;padding:0 0 0 11px;border-left:1px solid #aaa}.wp-embed-share-tab[aria-hidden=true]{display:none}p.wp-embed-share-description{margin:0;font-size:14px;line-height:1;font-style:italic;color:#aaa}.wp-embed-share-input{box-sizing:border-box;width:100%;border:none;height:28px;margin:0 0 10px;padding:0 5px;font-size:14px;font-weight:400;line-height:1.5;resize:none;cursor:text}textarea.wp-embed-share-input{height:72px}html[dir=rtl] .wp-embed-featured-image.square{float:right;margin-right:0;margin-left:20px}html[dir=rtl] .wp-embed-site-title a{padding-left:0;padding-right:35px}html[dir=rtl] .wp-embed-site-icon{margin-right:0;margin-left:10px;left:auto;right:0}html[dir=rtl] .wp-embed-meta{text-align:left}html[dir=rtl] .wp-embed-share{margin-left:0;margin-right:10px}html[dir=rtl] .wp-embed-share-dialog-close{right:auto;left:20px}html[dir=rtl] .wp-embed-share-tab-button+.wp-embed-share-tab-button{margin:0 10px 0 0;padding:0 11px 0 0;border-left:none;border-right:1px solid #aaa}
+		<?php
+	}
 	?>
 	</style>
 	<?php
@@ -904,23 +911,23 @@ function print_embed_scripts() {
 	?>
 	<script type="text/javascript">
 	<?php
-		if ( SCRIPT_DEBUG ) {
-			readfile( ABSPATH . WPINC . "/js/wp-embed-template.js" );
-		} else {
-			/*
-			 * If you're looking at a src version of this file, you'll see an "include"
-			 * statement below. This is used by the `grunt build` process to directly
-			 * include a minified version of wp-embed-template.js, instead of using the
-			 * readfile() method from above.
-			 *
-			 * If you're looking at a build version of this file, you'll see a string of
-			 * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
-			 * and edit wp-embed-template.js directly.
-			 */
-			?>
-			!function(a,b){"use strict";function c(b,c){a.parent.postMessage({message:b,value:c,secret:g},"*")}function d(){function d(){l.className=l.className.replace("hidden",""),b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]').focus()}function e(){l.className+=" hidden",b.querySelector(".wp-embed-share-dialog-open").focus()}function f(a){var c=b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]');c.setAttribute("aria-selected","false"),b.querySelector("#"+c.getAttribute("aria-controls")).setAttribute("aria-hidden","true"),a.target.setAttribute("aria-selected","true"),b.querySelector("#"+a.target.getAttribute("aria-controls")).setAttribute("aria-hidden","false")}function g(a){var c,d,e=a.target,f=e.parentElement.previousElementSibling,g=e.parentElement.nextElementSibling;if(37===a.keyCode)c=f;else{if(39!==a.keyCode)return!1;c=g}"rtl"===b.documentElement.getAttribute("dir")&&(c=c===f?g:f),c&&(d=c.firstElementChild,e.setAttribute("tabindex","-1"),e.setAttribute("aria-selected",!1),b.querySelector("#"+e.getAttribute("aria-controls")).setAttribute("aria-hidden","true"),d.setAttribute("tabindex","0"),d.setAttribute("aria-selected","true"),d.focus(),b.querySelector("#"+d.getAttribute("aria-controls")).setAttribute("aria-hidden","false"))}function h(a){var c=b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]');n!==a.target||a.shiftKey?c===a.target&&a.shiftKey&&(n.focus(),a.preventDefault()):(c.focus(),a.preventDefault())}function i(a){var b,d=a.target;b=d.hasAttribute("href")?d.getAttribute("href"):d.parentElement.getAttribute("href"),b&&(c("link",b),a.preventDefault())}if(!k){k=!0;var j,l=b.querySelector(".wp-embed-share-dialog"),m=b.querySelector(".wp-embed-share-dialog-open"),n=b.querySelector(".wp-embed-share-dialog-close"),o=b.querySelectorAll(".wp-embed-share-input"),p=b.querySelectorAll(".wp-embed-share-tab-button button"),q=b.querySelector(".wp-embed-featured-image img");if(o)for(j=0;j<o.length;j++)o[j].addEventListener("click",function(a){a.target.select()});if(m&&m.addEventListener("click",function(){d()}),n&&n.addEventListener("click",function(){e()}),p)for(j=0;j<p.length;j++)p[j].addEventListener("click",f),p[j].addEventListener("keydown",g);b.addEventListener("keydown",function(a){27===a.keyCode&&-1===l.className.indexOf("hidden")?e():9===a.keyCode&&h(a)},!1),a.self!==a.top&&(c("height",Math.ceil(b.body.getBoundingClientRect().height)),q&&q.addEventListener("load",function(){c("height",Math.ceil(b.body.getBoundingClientRect().height))}),b.addEventListener("click",i))}}function e(){a.self!==a.top&&(clearTimeout(i),i=setTimeout(function(){c("height",Math.ceil(b.body.getBoundingClientRect().height))},100))}function f(){a.self===a.top||g||(g=a.location.hash.replace(/.*secret=([\d\w]{10}).*/,"$1"),clearTimeout(h),h=setTimeout(function(){f()},100))}var g,h,i,j=b.querySelector&&a.addEventListener,k=!1;j&&(f(),b.documentElement.className=b.documentElement.className.replace(/\bno-js\b/,"")+" js",b.addEventListener("DOMContentLoaded",d,!1),a.addEventListener("load",d,!1),a.addEventListener("resize",e,!1))}(window,document);
-			<?php
-		}
+	if ( SCRIPT_DEBUG ) {
+		readfile( ABSPATH . WPINC . '/js/wp-embed-template.js' );
+	} else {
+		/*
+		 * If you're looking at a src version of this file, you'll see an "include"
+		 * statement below. This is used by the `grunt build` process to directly
+		 * include a minified version of wp-embed-template.js, instead of using the
+		 * readfile() method from above.
+		 *
+		 * If you're looking at a build version of this file, you'll see a string of
+		 * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
+		 * and edit wp-embed-template.js directly.
+		 */
+		?>
+		!function(a,b){"use strict";function c(b,c){a.parent.postMessage({message:b,value:c,secret:g},"*")}function d(){function d(){l.className=l.className.replace("hidden",""),b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]').focus()}function e(){l.className+=" hidden",b.querySelector(".wp-embed-share-dialog-open").focus()}function f(a){var c=b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]');c.setAttribute("aria-selected","false"),b.querySelector("#"+c.getAttribute("aria-controls")).setAttribute("aria-hidden","true"),a.target.setAttribute("aria-selected","true"),b.querySelector("#"+a.target.getAttribute("aria-controls")).setAttribute("aria-hidden","false")}function g(a){var c,d,e=a.target,f=e.parentElement.previousElementSibling,g=e.parentElement.nextElementSibling;if(37===a.keyCode)c=f;else{if(39!==a.keyCode)return!1;c=g}"rtl"===b.documentElement.getAttribute("dir")&&(c=c===f?g:f),c&&(d=c.firstElementChild,e.setAttribute("tabindex","-1"),e.setAttribute("aria-selected",!1),b.querySelector("#"+e.getAttribute("aria-controls")).setAttribute("aria-hidden","true"),d.setAttribute("tabindex","0"),d.setAttribute("aria-selected","true"),d.focus(),b.querySelector("#"+d.getAttribute("aria-controls")).setAttribute("aria-hidden","false"))}function h(a){var c=b.querySelector('.wp-embed-share-tab-button [aria-selected="true"]');n!==a.target||a.shiftKey?c===a.target&&a.shiftKey&&(n.focus(),a.preventDefault()):(c.focus(),a.preventDefault())}function i(a){var b,d=a.target;b=d.hasAttribute("href")?d.getAttribute("href"):d.parentElement.getAttribute("href"),b&&(c("link",b),a.preventDefault())}if(!k){k=!0;var j,l=b.querySelector(".wp-embed-share-dialog"),m=b.querySelector(".wp-embed-share-dialog-open"),n=b.querySelector(".wp-embed-share-dialog-close"),o=b.querySelectorAll(".wp-embed-share-input"),p=b.querySelectorAll(".wp-embed-share-tab-button button"),q=b.querySelector(".wp-embed-featured-image img");if(o)for(j=0;j<o.length;j++)o[j].addEventListener("click",function(a){a.target.select()});if(m&&m.addEventListener("click",function(){d()}),n&&n.addEventListener("click",function(){e()}),p)for(j=0;j<p.length;j++)p[j].addEventListener("click",f),p[j].addEventListener("keydown",g);b.addEventListener("keydown",function(a){27===a.keyCode&&-1===l.className.indexOf("hidden")?e():9===a.keyCode&&h(a)},!1),a.self!==a.top&&(c("height",Math.ceil(b.body.getBoundingClientRect().height)),q&&q.addEventListener("load",function(){c("height",Math.ceil(b.body.getBoundingClientRect().height))}),b.addEventListener("click",i))}}function e(){a.self!==a.top&&(clearTimeout(i),i=setTimeout(function(){c("height",Math.ceil(b.body.getBoundingClientRect().height))},100))}function f(){a.self===a.top||g||(g=a.location.hash.replace(/.*secret=([\d\w]{10}).*/,"$1"),clearTimeout(h),h=setTimeout(function(){f()},100))}var g,h,i,j=b.querySelector&&a.addEventListener,k=!1;j&&(f(),b.documentElement.className=b.documentElement.className.replace(/\bno-js\b/,"")+" js",b.addEventListener("DOMContentLoaded",d,!1),a.addEventListener("load",d,!1),a.addEventListener("resize",e,!1))}(window,document);
+		<?php
+	}
 	?>
 	</script>
 	<?php
@@ -1074,12 +1081,17 @@ function wp_filter_pre_oembed_result( $result, $url, $args ) {
 	$switched_blog = false;
 
 	if ( is_multisite() ) {
-		$url_parts = wp_parse_args( wp_parse_url( $url ), array(
-			'host'   => '',
-			'path'   => '/',
-		) );
+		$url_parts = wp_parse_args(
+			wp_parse_url( $url ), array(
+				'host' => '',
+				'path' => '/',
+			)
+		);
 
-		$qv = array( 'domain' => $url_parts['host'], 'path' => '/' );
+		$qv = array(
+			'domain' => $url_parts['host'],
+			'path'   => '/',
+		);
 
 		// In case of subdirectory configs, set the path.
 		if ( ! is_subdomain_install() ) {
diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php
index cfdae4ac08..ff53e0e1cd 100644
--- a/wp-includes/feed-atom-comments.php
+++ b/wp-includes/feed-atom-comments.php
@@ -5,8 +5,8 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
-echo '<?xml version="1.0" encoding="' . get_option('blog_charset') . '" ?' . '>';
+header( 'Content-Type: ' . feed_content_type( 'atom' ) . '; charset=' . get_option( 'blog_charset' ), true );
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '" ?' . '>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
 do_action( 'rss_tag_pre', 'atom-comments' );
@@ -27,37 +27,41 @@ do_action( 'rss_tag_pre', 'atom-comments' );
 		do_action( 'atom_comments_ns' );
 	?>
 >
-	<title type="text"><?php
-		if ( is_singular() ) {
-			/* translators: Comments feed title. 1: Post title */
-			printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
-		} elseif ( is_search() ) {
-			/* translators: Comments feed title. 1: Site name, 2: Search query */
-			printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
-		} else {
-			/* translators: Comments feed title. 1: Site name */
-			printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
-		}
-	?></title>
-	<subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
+	<title type="text">
+	<?php
+	if ( is_singular() ) {
+		/* translators: Comments feed title. 1: Post title */
+		printf( ent2ncr( __( 'Comments on %s' ) ), get_the_title_rss() );
+	} elseif ( is_search() ) {
+		/* translators: Comments feed title. 1: Site name, 2: Search query */
+		printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
+	} else {
+		/* translators: Comments feed title. 1: Site name */
+		printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
+	}
+	?>
+	</title>
+	<subtitle type="text"><?php bloginfo_rss( 'description' ); ?></subtitle>
 
-	<updated><?php
+	<updated>
+	<?php
 		$date = get_lastcommentmodified( 'GMT' );
 		echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date, false ) : date( 'Y-m-d\TH:i:s\Z' );
-	?></updated>
+	?>
+	</updated>
 
 <?php if ( is_singular() ) { ?>
-	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php comments_link_feed(); ?>" />
-	<link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?>" />
-	<id><?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?></id>
-<?php } elseif (is_search()) { ?>
-	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
-	<link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link('', 'atom'); ?>" />
-	<id><?php echo get_search_comments_feed_link('', 'atom'); ?></id>
+	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php comments_link_feed(); ?>" />
+	<link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?>" />
+	<id><?php echo esc_url( get_post_comments_feed_link( '', 'atom' ) ); ?></id>
+<?php } elseif ( is_search() ) { ?>
+	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
+	<link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link( '', 'atom' ); ?>" />
+	<id><?php echo get_search_comments_feed_link( '', 'atom' ); ?></id>
 <?php } else { ?>
-	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('url'); ?>" />
-	<link rel="self" type="application/atom+xml" href="<?php bloginfo_rss('comments_atom_url'); ?>" />
-	<id><?php bloginfo_rss('comments_atom_url'); ?></id>
+	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php bloginfo_rss( 'url' ); ?>" />
+	<link rel="self" type="application/atom+xml" href="<?php bloginfo_rss( 'comments_atom_url' ); ?>" />
+	<id><?php bloginfo_rss( 'comments_atom_url' ); ?></id>
 <?php } ?>
 <?php
 	/**
@@ -68,47 +72,58 @@ do_action( 'rss_tag_pre', 'atom-comments' );
 	do_action( 'comments_atom_head' );
 ?>
 <?php
-if ( have_comments() ) : while ( have_comments() ) : the_comment();
-	$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
-?>
+if ( have_comments() ) :
+	while ( have_comments() ) :
+		the_comment();
+		$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
+	?>
 	<entry>
-		<title><?php
-			if ( !is_singular() ) {
-				$title = get_the_title($comment_post->ID);
-				/** This filter is documented in wp-includes/feed.php */
-				$title = apply_filters( 'the_title_rss', $title );
-				/* translators: Individual comment title. 1: Post title, 2: Comment author name */
-				printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
-			} else {
-				/* translators: Comment author title. 1: 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'); ?>" />
+		<title>
+		<?php
+		if ( ! is_singular() ) {
+			$title = get_the_title( $comment_post->ID );
+			/** This filter is documented in wp-includes/feed.php */
+			$title = apply_filters( 'the_title_rss', $title );
+			/* translators: Individual comment title. 1: Post title, 2: Comment author name */
+			printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
+		} else {
+			/* translators: Comment author title. 1: 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' ); ?>" />
 
 		<author>
 			<name><?php comment_author_rss(); ?></name>
-			<?php if (get_comment_author_url()) echo '<uri>' . get_comment_author_url() . '</uri>'; ?>
+			<?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) ) : ?>
+		<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 ) ) : ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php echo get_the_password_form(); ?>]]></content>
-<?php else : // post pass ?>
+	<?php else : // post pass ?>
 		<content type="html" xml:base="<?php comment_link(); ?>"><![CDATA[<?php comment_text(); ?>]]></content>
-<?php endif; // post pass
+	<?php
+	endif; // post pass
 	// Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt)
-	if ( $comment->comment_parent == 0 ) : // This comment is top level ?>
-		<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss() ?>" type="<?php bloginfo_rss('html_type'); ?>" />
-<?php 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 endif;
+if ( $comment->comment_parent == 0 ) : // This comment is top level
+	?>
+	<thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
+	<?php
+	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
+endif;
 	/**
 	 * Fires at the end of each Atom comment feed item.
 	 *
@@ -118,7 +133,10 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment();
 	 * @param int $comment_post_id ID of the post the current comment is connected to.
 	 */
 	do_action( 'comment_atom_entry', $comment->comment_ID, $comment_post->ID );
-?>
+	?>
 	</entry>
-<?php endwhile; endif; ?>
+	<?php
+	endwhile;
+endif;
+?>
 </feed>
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index 09296b4278..dbc2ccf90a 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -5,10 +5,10 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: ' . feed_content_type( 'atom' ) . '; charset=' . get_option( 'blog_charset' ), true );
 $more = 1;
 
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
 do_action( 'rss_tag_pre', 'atom' );
@@ -17,7 +17,7 @@ do_action( 'rss_tag_pre', 'atom' );
 	xmlns="http://www.w3.org/2005/Atom"
 	xmlns:thr="http://purl.org/syndication/thread/1.0"
 	xml:lang="<?php bloginfo_rss( 'language' ); ?>"
-	xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
+	xml:base="<?php bloginfo_rss( 'url' ); ?>/wp-atom.php"
 	<?php
 	/**
 	 * Fires at end of the Atom feed root to add namespaces.
@@ -28,15 +28,17 @@ do_action( 'rss_tag_pre', 'atom' );
 	?>
 >
 	<title type="text"><?php wp_title_rss(); ?></title>
-	<subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
+	<subtitle type="text"><?php bloginfo_rss( 'description' ); ?></subtitle>
 
-	<updated><?php
+	<updated>
+	<?php
 		$date = get_lastpostmodified( 'GMT' );
 		echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date, false ) : date( 'Y-m-d\TH:i:s\Z' );
-	?></updated>
+	?>
+	</updated>
 
-	<link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('url') ?>" />
-	<id><?php bloginfo('atom_url'); ?></id>
+	<link rel="alternate" type="<?php bloginfo_rss( 'html_type' ); ?>" href="<?php bloginfo_rss( 'url' ); ?>" />
+	<id><?php bloginfo( 'atom_url' ); ?></id>
 	<link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
 	<?php
@@ -47,14 +49,16 @@ do_action( 'rss_tag_pre', 'atom' );
 	 */
 	do_action( 'atom_head' );
 
-	while ( have_posts() ) : the_post();
+	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 endif;
+			<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
+			endif;
 
 			/**
 			 * Fires at the end of each Atom feed author entry.
@@ -64,17 +68,18 @@ do_action( 'rss_tag_pre', 'atom' );
 			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() ?>" />
-		<id><?php the_guid() ; ?></id>
-		<updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
-		<published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
-		<?php the_category_rss('atom') ?>
+		<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(); ?>" />
+		<id><?php the_guid(); ?></id>
+		<updated><?php echo get_post_modified_time( 'Y-m-d\TH:i:s\Z', true ); ?></updated>
+		<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') ) : ?>
-		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content_feed('atom') ?>]]></content>
+<?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();
+	<?php
+	atom_enclosure();
 	/**
 	 * Fires at the end of each Atom feed item.
 	 *
@@ -84,10 +89,10 @@ do_action( 'rss_tag_pre', 'atom' );
 
 	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>
+		<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; ?>
 	</entry>
-	<?php endwhile ; ?>
+	<?php endwhile; ?>
 </feed>
diff --git a/wp-includes/feed-rdf.php b/wp-includes/feed-rdf.php
index b748400032..fe6e4cb741 100644
--- a/wp-includes/feed-rdf.php
+++ b/wp-includes/feed-rdf.php
@@ -5,10 +5,10 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: ' . feed_content_type( 'rdf' ) . '; charset=' . get_option( 'blog_charset' ), true );
 $more = 1;
 
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
 do_action( 'rss_tag_pre', 'rdf' );
@@ -29,22 +29,28 @@ do_action( 'rss_tag_pre', 'rdf' );
 	do_action( 'rdf_ns' );
 	?>
 >
-<channel rdf:about="<?php bloginfo_rss("url") ?>">
+<channel rdf:about="<?php bloginfo_rss( 'url' ); ?>">
 	<title><?php wp_title_rss(); ?></title>
-	<link><?php bloginfo_rss('url') ?></link>
-	<description><?php bloginfo_rss('description') ?></description>
-	<dc:date><?php
+	<link><?php bloginfo_rss( 'url' ); ?></link>
+	<description><?php bloginfo_rss( 'description' ); ?></description>
+	<dc:date>
+	<?php
 		$date = get_lastpostmodified( 'GMT' );
 		echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date ) : date( 'Y-m-d\TH:i:s\Z' );
-	?></dc:date>
-	<sy:updatePeriod><?php
+	?>
+	</dc:date>
+	<sy:updatePeriod>
+	<?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
 		echo apply_filters( 'rss_update_period', 'hourly' );
-	?></sy:updatePeriod>
-	<sy:updateFrequency><?php
+	?>
+	</sy:updatePeriod>
+	<sy:updateFrequency>
+	<?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
 		echo apply_filters( 'rss_update_frequency', '1' );
-	?></sy:updateFrequency>
+	?>
+	</sy:updateFrequency>
 	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
 	<?php
 	/**
@@ -56,24 +62,31 @@ do_action( 'rss_tag_pre', 'rdf' );
 	?>
 	<items>
 		<rdf:Seq>
-		<?php while (have_posts()): the_post(); ?>
-			<rdf:li rdf:resource="<?php the_permalink_rss() ?>"/>
+		<?php
+		while ( have_posts() ) :
+			the_post();
+?>
+			<rdf:li rdf:resource="<?php the_permalink_rss(); ?>"/>
 		<?php endwhile; ?>
 		</rdf:Seq>
 	</items>
 </channel>
-<?php 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')) : ?>
-	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
+<?php
+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' ) ) : ?>
+	<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
 <?php else : ?>
-	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-	<content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
+	<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
+	<content:encoded><![CDATA[<?php the_content_feed( 'rdf' ); ?>]]></content:encoded>
 <?php endif; ?>
 	<?php
 	/**
@@ -84,5 +97,5 @@ do_action( 'rss_tag_pre', 'rdf' );
 	do_action( 'rdf_item' );
 	?>
 </item>
-<?php endwhile;  ?>
+<?php endwhile; ?>
 </rdf:RDF>
diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index 39202b83b2..15e049fc07 100644
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -5,19 +5,21 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss') . '; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: ' . feed_content_type( 'rss' ) . '; charset=' . get_option( 'blog_charset' ), true );
 $more = 1;
 
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>'; ?>
 <rss version="0.92">
 <channel>
 	<title><?php wp_title_rss(); ?></title>
-	<link><?php bloginfo_rss('url') ?></link>
-	<description><?php bloginfo_rss('description') ?></description>
-	<lastBuildDate><?php
+	<link><?php bloginfo_rss( 'url' ); ?></link>
+	<description><?php bloginfo_rss( 'description' ); ?></description>
+	<lastBuildDate>
+	<?php
 		$date = get_lastpostmodified( 'GMT' );
 		echo $date ? mysql2date( 'D, d M Y H:i:s +0000', $date ) : date( 'D, d M Y H:i:s +0000' );
-	?></lastBuildDate>
+	?>
+	</lastBuildDate>
 	<docs>http://backend.userland.com/rss092</docs>
 	<language><?php bloginfo_rss( 'language' ); ?></language>
 
@@ -30,11 +32,14 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 	do_action( 'rss_head' );
 	?>
 
-<?php while (have_posts()) : the_post(); ?>
+<?php
+while ( have_posts() ) :
+	the_post();
+?>
 	<item>
-		<title><?php the_title_rss() ?></title>
-		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-		<link><?php the_permalink_rss() ?></link>
+		<title><?php the_title_rss(); ?></title>
+		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
+		<link><?php the_permalink_rss(); ?></link>
 		<?php
 		/**
 		 * Fires at the end of each RSS feed item.
diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index d6137bac41..2aef725a55 100644
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -5,9 +5,9 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: ' . feed_content_type( 'rss2' ) . '; charset=' . get_option( 'blog_charset' ), true );
 
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
 do_action( 'rss_tag_pre', 'rss2-comments' );
@@ -32,33 +32,41 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
 	?>
 >
 <channel>
-	<title><?php
-		if ( is_singular() ) {
-			/* translators: Comments feed title. 1: Post title */
-			printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
-		} elseif ( is_search() ) {
-			/* translators: Comments feed title. 1: Site name, 2: Search query */
-			printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
-		} else {
-			/* translators: Comments feed title. 1: Site name */
-			printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
-		}
-	?></title>
+	<title>
+	<?php
+	if ( is_singular() ) {
+		/* translators: Comments feed title. 1: Post title */
+		printf( ent2ncr( __( 'Comments on: %s' ) ), get_the_title_rss() );
+	} elseif ( is_search() ) {
+		/* translators: Comments feed title. 1: Site name, 2: Search query */
+		printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
+	} else {
+		/* translators: Comments feed title. 1: Site name */
+		printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
+	}
+	?>
+	</title>
 	<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-	<link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
-	<description><?php bloginfo_rss("description") ?></description>
-	<lastBuildDate><?php
+	<link><?php ( is_single() ) ? the_permalink_rss() : bloginfo_rss( 'url' ); ?></link>
+	<description><?php bloginfo_rss( 'description' ); ?></description>
+	<lastBuildDate>
+	<?php
 		$date = get_lastcommentmodified( 'GMT' );
 		echo $date ? mysql2date( 'r', $date, false ) : date( 'r' );
-	?></lastBuildDate>
-	<sy:updatePeriod><?php
+	?>
+	</lastBuildDate>
+	<sy:updatePeriod>
+	<?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
 		echo apply_filters( 'rss_update_period', 'hourly' );
-	?></sy:updatePeriod>
-	<sy:updateFrequency><?php
+	?>
+	</sy:updatePeriod>
+	<sy:updateFrequency>
+	<?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
 		echo apply_filters( 'rss_update_frequency', '1' );
-	?></sy:updateFrequency>
+	?>
+	</sy:updateFrequency>
 	<?php
 	/**
 	 * Fires at the end of the RSS2 comment feed header.
@@ -67,44 +75,52 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
 	 */
 	do_action( 'commentsrss2_head' );
 
-	if ( have_comments() ) : while ( have_comments() ) : the_comment();
-		$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
-	?>
-	<item>
-		<title><?php
-			if ( !is_singular() ) {
-				$title = get_the_title($comment_post->ID);
-				/** This filter is documented in wp-includes/feed.php */
-				$title = apply_filters( 'the_title_rss', $title );
-				/* translators: Individual comment title. 1: Post title, 2: Comment author name */
-				printf(ent2ncr(__('Comment on %1$s by %2$s')), $title, get_comment_author_rss());
-			} else {
-				/* translators: Comment author title. 1: Comment author name */
-				printf(ent2ncr(__('By: %s')), get_comment_author_rss());
-			}
-		?></title>
-		<link><?php comment_link() ?></link>
-		<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) ) : ?>
-		<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 ?>
-		<description><![CDATA[<?php comment_text_rss() ?>]]></description>
-		<content:encoded><![CDATA[<?php comment_text() ?>]]></content:encoded>
-<?php endif; // post pass
-	/**
-	 * Fires at the end of each RSS2 comment feed item.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param int $comment->comment_ID The ID of the comment being displayed.
-	 * @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 );
+	if ( have_comments() ) :
+		while ( have_comments() ) :
+			the_comment();
+			$comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
+			?>
+			<item>
+				<title>
+				<?php
+				if ( ! is_singular() ) {
+					$title = get_the_title( $comment_post->ID );
+					/** This filter is documented in wp-includes/feed.php */
+					$title = apply_filters( 'the_title_rss', $title );
+					/* translators: Individual comment title. 1: Post title, 2: Comment author name */
+					printf( ent2ncr( __( 'Comment on %1$s by %2$s' ) ), $title, get_comment_author_rss() );
+				} else {
+					/* translators: Comment author title. 1: Comment author name */
+					printf( ent2ncr( __( 'By: %s' ) ), get_comment_author_rss() );
+				}
+				?>
+				</title>
+				<link><?php comment_link(); ?></link>
+		<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 ) ) : ?>
+		<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 ?>
+		<description><![CDATA[<?php comment_text_rss(); ?>]]></description>
+		<content:encoded><![CDATA[<?php comment_text(); ?>]]></content:encoded>
+		<?php
+		endif; // post pass
+			/**
+			 * Fires at the end of each RSS2 comment feed item.
+			 *
+			 * @since 2.1.0
+			 *
+			 * @param int $comment->comment_ID The ID of the comment being displayed.
+			 * @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
+		endwhile;
+endif;
 ?>
-	</item>
-<?php endwhile; endif; ?>
 </channel>
 </rss>
diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index 2e53b1701b..fede1c4b5e 100644
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -5,10 +5,10 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: ' . feed_content_type( 'rss2' ) . '; charset=' . get_option( 'blog_charset' ), true );
 $more = 1;
 
-echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
+echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>';
 
 /**
  * Fires between the xml and rss tags in a feed.
@@ -40,14 +40,17 @@ do_action( 'rss_tag_pre', 'rss2' );
 <channel>
 	<title><?php wp_title_rss(); ?></title>
 	<atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
-	<link><?php bloginfo_rss('url') ?></link>
-	<description><?php bloginfo_rss("description") ?></description>
-	<lastBuildDate><?php
+	<link><?php bloginfo_rss( 'url' ); ?></link>
+	<description><?php bloginfo_rss( 'description' ); ?></description>
+	<lastBuildDate>
+	<?php
 		$date = get_lastpostmodified( 'GMT' );
 		echo $date ? mysql2date( 'r', $date, false ) : date( 'r' );
-	?></lastBuildDate>
+	?>
+	</lastBuildDate>
 	<language><?php bloginfo_rss( 'language' ); ?></language>
-	<sy:updatePeriod><?php
+	<sy:updatePeriod>
+	<?php
 		$duration = 'hourly';
 
 		/**
@@ -59,8 +62,10 @@ do_action( 'rss_tag_pre', 'rss2' );
 		 *                         'yearly'. Default 'hourly'.
 		 */
 		echo apply_filters( 'rss_update_period', $duration );
-	?></sy:updatePeriod>
-	<sy:updateFrequency><?php
+	?>
+	</sy:updatePeriod>
+	<sy:updateFrequency>
+	<?php
 		$frequency = '1';
 
 		/**
@@ -72,33 +77,35 @@ do_action( 'rss_tag_pre', 'rss2' );
 		 *                          of RSS updates within the update period. Default '1'.
 		 */
 		echo apply_filters( 'rss_update_frequency', $frequency );
-	?></sy:updateFrequency>
+	?>
+	</sy:updateFrequency>
 	<?php
 	/**
 	 * Fires at the end of the RSS2 Feed Header.
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rss2_head');
+	do_action( 'rss2_head' );
 
-	while( have_posts()) : the_post();
+	while ( have_posts() ) :
+		the_post();
 	?>
 	<item>
-		<title><?php the_title_rss() ?></title>
-		<link><?php the_permalink_rss() ?></link>
+		<title><?php the_title_rss(); ?></title>
+		<link><?php the_permalink_rss(); ?></link>
 <?php if ( get_comments_number() || comments_open() ) : ?>
 		<comments><?php comments_link_feed(); ?></comments>
 <?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') ?>
+		<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 : ?>
 		<description><![CDATA[<?php the_excerpt_rss(); ?>]]></description>
-	<?php $content = get_the_content_feed('rss2'); ?>
+	<?php $content = get_the_content_feed( 'rss2' ); ?>
 	<?php if ( strlen( $content ) > 0 ) : ?>
 		<content:encoded><![CDATA[<?php echo $content; ?>]]></content:encoded>
 	<?php else : ?>
@@ -106,7 +113,7 @@ do_action( 'rss_tag_pre', 'rss2' );
 	<?php endif; ?>
 <?php endif; ?>
 <?php if ( get_comments_number() || comments_open() ) : ?>
-		<wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
+		<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(); ?>
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index ef6bf29562..b5a7c95fc9 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -23,8 +23,8 @@
  * @param string $show See get_bloginfo() for possible values.
  * @return string
  */
-function get_bloginfo_rss($show = '') {
-	$info = strip_tags(get_bloginfo($show));
+function get_bloginfo_rss( $show = '' ) {
+	$info = strip_tags( get_bloginfo( $show ) );
 	/**
 	 * Filters the bloginfo for use in RSS feeds.
 	 *
@@ -51,7 +51,7 @@ function get_bloginfo_rss($show = '') {
  *
  * @param string $show See get_bloginfo() for possible values.
  */
-function bloginfo_rss($show = '') {
+function bloginfo_rss( $show = '' ) {
 	/**
 	 * Filters the bloginfo for display in RSS feeds.
 	 *
@@ -182,13 +182,14 @@ function the_title_rss() {
  * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
  * @return string The filtered content.
  */
-function get_the_content_feed($feed_type = null) {
-	if ( !$feed_type )
+function get_the_content_feed( $feed_type = null ) {
+	if ( ! $feed_type ) {
 		$feed_type = get_default_feed();
+	}
 
 	/** This filter is documented in wp-includes/post-template.php */
 	$content = apply_filters( 'the_content', get_the_content() );
-	$content = str_replace(']]>', ']]&gt;', $content);
+	$content = str_replace( ']]>', ']]&gt;', $content );
 	/**
 	 * Filters the post content for use in feeds.
 	 *
@@ -208,8 +209,8 @@ function get_the_content_feed($feed_type = null) {
  *
  * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
  */
-function the_content_feed($feed_type = null) {
-	echo get_the_content_feed($feed_type);
+function the_content_feed( $feed_type = null ) {
+	echo get_the_content_feed( $feed_type );
 }
 
 /**
@@ -270,8 +271,8 @@ function comments_link_feed() {
  *
  * @param int|WP_Comment $comment_id Optional comment object or id. Defaults to global comment object.
  */
-function comment_guid($comment_id = null) {
-	echo esc_url( get_comment_guid($comment_id) );
+function comment_guid( $comment_id = null ) {
+	echo esc_url( get_comment_guid( $comment_id ) );
 }
 
 /**
@@ -282,13 +283,14 @@ function comment_guid($comment_id = null) {
  * @param int|WP_Comment $comment_id Optional comment object or id. Defaults to global comment object.
  * @return false|string false on failure or guid for comment on success.
  */
-function get_comment_guid($comment_id = null) {
-	$comment = get_comment($comment_id);
+function get_comment_guid( $comment_id = null ) {
+	$comment = get_comment( $comment_id );
 
-	if ( !is_object($comment) )
+	if ( ! is_object( $comment ) ) {
 		return false;
+	}
 
-	return get_the_guid($comment->comment_post_ID) . '#comment-' . $comment->comment_ID;
+	return get_the_guid( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
 }
 
 /**
@@ -371,35 +373,42 @@ function comment_text_rss() {
  * @param string $type Optional, default is the type returned by get_default_feed().
  * @return string All of the post categories for displaying in the feed.
  */
-function get_the_category_rss($type = null) {
-	if ( empty($type) )
+function get_the_category_rss( $type = null ) {
+	if ( empty( $type ) ) {
 		$type = get_default_feed();
+	}
 	$categories = get_the_category();
-	$tags = get_the_tags();
-	$the_list = '';
-	$cat_names = array();
+	$tags       = get_the_tags();
+	$the_list   = '';
+	$cat_names  = array();
 
 	$filter = 'rss';
-	if ( 'atom' == $type )
+	if ( 'atom' == $type ) {
 		$filter = 'raw';
-
-	if ( !empty($categories) ) foreach ( (array) $categories as $category ) {
-		$cat_names[] = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter);
 	}
 
-	if ( !empty($tags) ) foreach ( (array) $tags as $tag ) {
-		$cat_names[] = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter);
+	if ( ! empty( $categories ) ) {
+		foreach ( (array) $categories as $category ) {
+			$cat_names[] = sanitize_term_field( 'name', $category->name, $category->term_id, 'category', $filter );
+		}
 	}
 
-	$cat_names = array_unique($cat_names);
+	if ( ! empty( $tags ) ) {
+		foreach ( (array) $tags as $tag ) {
+			$cat_names[] = sanitize_term_field( 'name', $tag->name, $tag->term_id, 'post_tag', $filter );
+		}
+	}
+
+	$cat_names = array_unique( $cat_names );
 
 	foreach ( $cat_names as $cat_name ) {
-		if ( 'rdf' == $type )
+		if ( 'rdf' == $type ) {
 			$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
-		elseif ( 'atom' == $type )
+		} elseif ( 'atom' == $type ) {
 			$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
-		else
-			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
+		} else {
+			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option( 'blog_charset' ) ) . "]]></category>\n";
+		}
 	}
 
 	/**
@@ -422,8 +431,8 @@ function get_the_category_rss($type = null) {
  *
  * @param string $type Optional, default is the type returned by get_default_feed().
  */
-function the_category_rss($type = null) {
-	echo get_the_category_rss($type);
+function the_category_rss( $type = null ) {
+	echo get_the_category_rss( $type );
 }
 
 /**
@@ -434,11 +443,12 @@ function the_category_rss($type = null) {
  * @since 2.2.0
  */
 function html_type_rss() {
-	$type = get_bloginfo('html_type');
-	if (strpos($type, 'xhtml') !== false)
+	$type = get_bloginfo( 'html_type' );
+	if ( strpos( $type, 'xhtml' ) !== false ) {
 		$type = 'xhtml';
-	else
+	} else {
 		$type = 'html';
+	}
 	echo $type;
 }
 
@@ -457,16 +467,17 @@ function html_type_rss() {
  * @since 1.5.0
  */
 function rss_enclosure() {
-	if ( post_password_required() )
+	if ( post_password_required() ) {
 		return;
+	}
 
-	foreach ( (array) get_post_custom() as $key => $val) {
-		if ($key == 'enclosure') {
+	foreach ( (array) get_post_custom() as $key => $val ) {
+		if ( $key == 'enclosure' ) {
 			foreach ( (array) $val as $enc ) {
-				$enclosure = explode("\n", $enc);
+				$enclosure = explode( "\n", $enc );
 
 				// only get the first element, e.g. audio/mpeg from 'audio/mpeg mpga mp2 mp3'
-				$t = preg_split('/[ \t]/', trim($enclosure[2]) );
+				$t    = preg_split( '/[ \t]/', trim( $enclosure[2] ) );
 				$type = $t[0];
 
 				/**
@@ -496,13 +507,14 @@ function rss_enclosure() {
  * @since 2.2.0
  */
 function atom_enclosure() {
-	if ( post_password_required() )
+	if ( post_password_required() ) {
 		return;
+	}
 
 	foreach ( (array) get_post_custom() as $key => $val ) {
-		if ($key == 'enclosure') {
+		if ( $key == 'enclosure' ) {
 			foreach ( (array) $val as $enc ) {
-				$enclosure = explode("\n", $enc);
+				$enclosure = explode( "\n", $enc );
 				/**
 				 * Filters the atom enclosure HTML link tag for the current post.
 				 *
@@ -533,9 +545,9 @@ function atom_enclosure() {
  * @param string $data Input string
  * @return array array(type, value)
  */
-function prep_atom_text_construct($data) {
-	if (strpos($data, '<') === false && strpos($data, '&') === false) {
-		return array('text', $data);
+function prep_atom_text_construct( $data ) {
+	if ( strpos( $data, '<' ) === false && strpos( $data, '&' ) === false ) {
+		return array( 'text', $data );
 	}
 
 	if ( ! function_exists( 'xml_parser_create' ) ) {
@@ -545,23 +557,23 @@ function prep_atom_text_construct($data) {
 	}
 
 	$parser = xml_parser_create();
-	xml_parse($parser, '<div>' . $data . '</div>', true);
-	$code = xml_get_error_code($parser);
-	xml_parser_free($parser);
+	xml_parse( $parser, '<div>' . $data . '</div>', true );
+	$code = xml_get_error_code( $parser );
+	xml_parser_free( $parser );
 
-	if (!$code) {
-		if (strpos($data, '<') === false) {
-			return array('text', $data);
+	if ( ! $code ) {
+		if ( strpos( $data, '<' ) === false ) {
+			return array( 'text', $data );
 		} else {
 			$data = "<div xmlns='http://www.w3.org/1999/xhtml'>$data</div>";
-			return array('xhtml', $data);
+			return array( 'xhtml', $data );
 		}
 	}
 
-	if (strpos($data, ']]>') === false) {
-		return array('html', "<![CDATA[$data]]>");
+	if ( strpos( $data, ']]>' ) === false ) {
+		return array( 'html', "<![CDATA[$data]]>" );
 	} else {
-		return array('html', htmlspecialchars($data));
+		return array( 'html', htmlspecialchars( $data ) );
 	}
 }
 
@@ -611,7 +623,7 @@ function rss2_site_icon() {
  * @since 2.5.0
  */
 function self_link() {
-	$host = @parse_url(home_url());
+	$host = @parse_url( home_url() );
 	/**
 	 * Filters the current feed URL.
 	 *
@@ -633,18 +645,19 @@ function self_link() {
  * @param string $type Type of feed. Possible values include 'rss', rss2', 'atom', and 'rdf'.
  */
 function feed_content_type( $type = '' ) {
-	if ( empty($type) )
+	if ( empty( $type ) ) {
 		$type = get_default_feed();
+	}
 
 	$types = array(
 		'rss'      => 'application/rss+xml',
 		'rss2'     => 'application/rss+xml',
 		'rss-http' => 'text/xml',
 		'atom'     => 'application/atom+xml',
-		'rdf'      => 'application/rdf+xml'
+		'rdf'      => 'application/rdf+xml',
 	);
 
-	$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
+	$content_type = ( ! empty( $types[ $type ] ) ) ? $types[ $type ] : 'application/octet-stream';
 
 	/**
 	 * Filters the content type for a specific feed type.
@@ -703,8 +716,9 @@ function fetch_feed( $url ) {
 	$feed->init();
 	$feed->set_output_encoding( get_option( 'blog_charset' ) );
 
-	if ( $feed->error() )
+	if ( $feed->error() ) {
 		return new WP_Error( 'simplepie-error', $feed->error() );
+	}
 
 	return $feed;
 }
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 442a6f282c..b0312d462c 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -50,23 +50,23 @@
  */
 function wptexturize( $text, $reset = false ) {
 	global $wp_cockneyreplace, $shortcode_tags;
-	static $static_characters = null,
-		$static_replacements = null,
-		$dynamic_characters = null,
-		$dynamic_replacements = null,
-		$default_no_texturize_tags = null,
+	static $static_characters            = null,
+		$static_replacements             = null,
+		$dynamic_characters              = null,
+		$dynamic_replacements            = null,
+		$default_no_texturize_tags       = null,
 		$default_no_texturize_shortcodes = null,
-		$run_texturize = true,
-		$apos = null,
-		$prime = null,
-		$double_prime = null,
-		$opening_quote = null,
-		$closing_quote = null,
-		$opening_single_quote = null,
-		$closing_single_quote = null,
-		$open_q_flag = '<!--oq-->',
-		$open_sq_flag = '<!--osq-->',
-		$apos_flag = '<!--apos-->';
+		$run_texturize                   = true,
+		$apos                            = null,
+		$prime                           = null,
+		$double_prime                    = null,
+		$opening_quote                   = null,
+		$closing_quote                   = null,
+		$opening_single_quote            = null,
+		$closing_single_quote            = null,
+		$open_q_flag                     = '<!--oq-->',
+		$open_sq_flag                    = '<!--osq-->',
+		$apos_flag                       = '<!--apos-->';
 
 	// If there's nothing to do, just stop.
 	if ( empty( $text ) || false === $run_texturize ) {
@@ -117,35 +117,50 @@ function wptexturize( $text, $reset = false ) {
 		/* translators: em dash */
 		$em_dash = _x( '&#8212;', 'em dash' );
 
-		$default_no_texturize_tags = array('pre', 'code', 'kbd', 'style', 'script', 'tt');
-		$default_no_texturize_shortcodes = array('code');
+		$default_no_texturize_tags       = array( 'pre', 'code', 'kbd', 'style', 'script', 'tt' );
+		$default_no_texturize_shortcodes = array( 'code' );
 
 		// if a plugin has provided an autocorrect array, use it
-		if ( isset($wp_cockneyreplace) ) {
-			$cockney = array_keys( $wp_cockneyreplace );
+		if ( isset( $wp_cockneyreplace ) ) {
+			$cockney        = array_keys( $wp_cockneyreplace );
 			$cockneyreplace = array_values( $wp_cockneyreplace );
 		} else {
 			/* translators: This is a comma-separated list of words that defy the syntax of quotations in normal use,
 			 * for example...  'We do not have enough words yet' ... is a typical quoted phrase.  But when we write
 			 * lines of code 'til we have enough of 'em, then we need to insert apostrophes instead of quotes.
 			 */
-			$cockney = explode( ',', _x( "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
-				'Comma-separated list of words to texturize in your language' ) );
+			$cockney = explode(
+				',', _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( '&#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' ) );
+			$cockneyreplace = explode(
+				',', _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'
+				)
+			);
 		}
 
-		$static_characters = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
+		$static_characters   = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
 		$static_replacements = array_merge( array( '&#8230;', $opening_quote, $closing_quote, ' &#8482;' ), $cockneyreplace );
 
-
 		// Pattern-based replacements of characters.
 		// Sort the remaining patterns into several arrays for performance tuning.
-		$dynamic_characters = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
-		$dynamic_replacements = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
-		$dynamic = array();
-		$spaces = wp_spaces_regexp();
+		$dynamic_characters   = array(
+			'apos'  => array(),
+			'quote' => array(),
+			'dash'  => array(),
+		);
+		$dynamic_replacements = array(
+			'apos'  => array(),
+			'quote' => array(),
+			'dash'  => array(),
+		);
+		$dynamic              = array();
+		$spaces               = wp_spaces_regexp();
 
 		// '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
 		if ( "'" !== $apos || "'" !== $closing_single_quote ) {
@@ -157,7 +172,7 @@ function wptexturize( $text, $reset = false ) {
 
 		// '99 '99s '99's (apostrophe)  But never '9 or '99% or '999 or '99.0.
 		if ( "'" !== $apos ) {
-			$dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos_flag;
+			$dynamic['/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/'] = $apos_flag;
 		}
 
 		// Quoted Numbers like '0.42'
@@ -175,9 +190,9 @@ function wptexturize( $text, $reset = false ) {
 			$dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos_flag;
 		}
 
-		$dynamic_characters['apos'] = array_keys( $dynamic );
+		$dynamic_characters['apos']   = array_keys( $dynamic );
 		$dynamic_replacements['apos'] = array_values( $dynamic );
-		$dynamic = array();
+		$dynamic                      = array();
 
 		// Quoted Numbers like "42"
 		if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
@@ -189,17 +204,17 @@ function wptexturize( $text, $reset = false ) {
 			$dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')"(?!' . $spaces . ')/' ] = $open_q_flag;
 		}
 
-		$dynamic_characters['quote'] = array_keys( $dynamic );
+		$dynamic_characters['quote']   = array_keys( $dynamic );
 		$dynamic_replacements['quote'] = array_values( $dynamic );
-		$dynamic = array();
+		$dynamic                       = array();
 
 		// Dashes and spaces
-		$dynamic[ '/---/' ] = $em_dash;
+		$dynamic['/---/'] = $em_dash;
 		$dynamic[ '/(?<=^|' . $spaces . ')--(?=$|' . $spaces . ')/' ] = $em_dash;
-		$dynamic[ '/(?<!xn)--/' ] = $en_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')-(?=$|' . $spaces . ')/' ] = $en_dash;
+		$dynamic['/(?<!xn)--/']                                       = $en_dash;
+		$dynamic[ '/(?<=^|' . $spaces . ')-(?=$|' . $spaces . ')/' ]  = $en_dash;
 
-		$dynamic_characters['dash'] = array_keys( $dynamic );
+		$dynamic_characters['dash']   = array_keys( $dynamic );
 		$dynamic_replacements['dash'] = array_values( $dynamic );
 	}
 
@@ -221,16 +236,16 @@ function wptexturize( $text, $reset = false ) {
 	 */
 	$no_texturize_shortcodes = apply_filters( 'no_texturize_shortcodes', $default_no_texturize_shortcodes );
 
-	$no_texturize_tags_stack = array();
+	$no_texturize_tags_stack       = array();
 	$no_texturize_shortcodes_stack = array();
 
 	// Look for shortcodes and HTML elements.
 
 	preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches );
-	$tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
+	$tagnames         = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
 	$found_shortcodes = ! empty( $tagnames );
-	$shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex( $tagnames ) : '';
-	$regex = _get_wptexturize_split_regex( $shortcode_regex );
+	$shortcode_regex  = $found_shortcodes ? _get_wptexturize_shortcode_regex( $tagnames ) : '';
+	$regex            = _get_wptexturize_split_regex( $shortcode_regex );
 
 	$textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
 
@@ -249,7 +264,6 @@ function wptexturize( $text, $reset = false ) {
 
 				_wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
 			}
-
 		} elseif ( '' === trim( $curl ) ) {
 			// This is a newline between delimiters.  Performance improves when we check this.
 			continue;
@@ -264,7 +278,6 @@ function wptexturize( $text, $reset = false ) {
 				// Looks like an escaped shortcode.
 				continue;
 			}
-
 		} elseif ( empty( $no_texturize_shortcodes_stack ) && empty( $no_texturize_tags_stack ) ) {
 			// This is neither a delimiter, nor is this content inside of no_texturize pairs.  Do texturize.
 
@@ -314,9 +327,9 @@ function wptexturize( $text, $reset = false ) {
  * @return string The $haystack value after primes and quotes replacements.
  */
 function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quote ) {
-	$spaces = wp_spaces_regexp();
-	$flag = '<!--wp-prime-or-quote-->';
-	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|" . $spaces . ")/";
+	$spaces           = wp_spaces_regexp();
+	$flag             = '<!--wp-prime-or-quote-->';
+	$quote_pattern    = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|" . $spaces . ')/';
 	$prime_pattern    = "/(?<=\\d)$needle/";
 	$flag_after_digit = "/(?<=\\d)$flag/";
 	$flag_no_digit    = "/(?<!\\d)$flag/";
@@ -439,8 +452,9 @@ function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
 function wpautop( $pee, $br = true ) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
+	if ( trim( $pee ) === '' ) {
 		return '';
+	}
 
 	// Just to make things a little easier, pad the end.
 	$pee = $pee . "\n";
@@ -449,14 +463,14 @@ function wpautop( $pee, $br = true ) {
 	 * Pre tags shouldn't be touched by autop.
 	 * Replace pre tags with placeholders and bring them back after autop.
 	 */
-	if ( strpos($pee, '<pre') !== false ) {
+	if ( strpos( $pee, '<pre' ) !== false ) {
 		$pee_parts = explode( '</pre>', $pee );
-		$last_pee = array_pop($pee_parts);
-		$pee = '';
-		$i = 0;
+		$last_pee  = array_pop( $pee_parts );
+		$pee       = '';
+		$i         = 0;
 
 		foreach ( $pee_parts as $pee_part ) {
-			$start = strpos($pee_part, '<pre');
+			$start = strpos( $pee_part, '<pre' );
 
 			// Malformed html?
 			if ( $start === false ) {
@@ -464,8 +478,8 @@ function wpautop( $pee, $br = true ) {
 				continue;
 			}
 
-			$name = "<pre wp-pre-tag-$i></pre>";
-			$pre_tags[$name] = substr( $pee_part, $start ) . '</pre>';
+			$name              = "<pre wp-pre-tag-$i></pre>";
+			$pre_tags[ $name ] = substr( $pee_part, $start ) . '</pre>';
 
 			$pee .= substr( $pee_part, 0, $start ) . $name;
 			$i++;
@@ -474,21 +488,21 @@ function wpautop( $pee, $br = true ) {
 		$pee .= $last_pee;
 	}
 	// Change multiple <br>s into two line breaks, which will turn into paragraphs.
-	$pee = preg_replace('|<br\s*/?>\s*<br\s*/?>|', "\n\n", $pee);
+	$pee = preg_replace( '|<br\s*/?>\s*<br\s*/?>|', "\n\n", $pee );
 
 	$allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 
 	// Add a double line break above block-level opening tags.
-	$pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n\n$1", $pee);
+	$pee = preg_replace( '!(<' . $allblocks . '[\s/>])!', "\n\n$1", $pee );
 
 	// Add a double line break below block-level closing tags.
-	$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
+	$pee = preg_replace( '!(</' . $allblocks . '>)!', "$1\n\n", $pee );
 
 	// Standardize newline characters to "\n".
-	$pee = str_replace(array("\r\n", "\r"), "\n", $pee);
+	$pee = str_replace( array( "\r\n", "\r" ), "\n", $pee );
 
 	// Find newlines in all elements and add placeholders.
-	$pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
+	$pee = wp_replace_in_html_tags( $pee, array( "\n" => ' <!-- wpnl --> ' ) );
 
 	// Collapse line breaks before and after <option> elements so they don't get autop'd.
 	if ( strpos( $pee, '<option' ) !== false ) {
@@ -523,66 +537,67 @@ function wpautop( $pee, $br = true ) {
 	}
 
 	// Remove more than two contiguous line breaks.
-	$pee = preg_replace("/\n\n+/", "\n\n", $pee);
+	$pee = preg_replace( "/\n\n+/", "\n\n", $pee );
 
 	// Split up the contents into an array of strings, separated by double line breaks.
-	$pees = preg_split('/\n\s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY);
+	$pees = preg_split( '/\n\s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY );
 
 	// Reset $pee prior to rebuilding.
 	$pee = '';
 
 	// Rebuild the content as a string, wrapping every bit with a <p>.
 	foreach ( $pees as $tinkle ) {
-		$pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
+		$pee .= '<p>' . trim( $tinkle, "\n" ) . "</p>\n";
 	}
 
 	// Under certain strange conditions it could create a P of entirely whitespace.
-	$pee = preg_replace('|<p>\s*</p>|', '', $pee);
+	$pee = preg_replace( '|<p>\s*</p>|', '', $pee );
 
 	// Add a closing <p> inside <div>, <address>, or <form> tag if missing.
-	$pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
+	$pee = preg_replace( '!<p>([^<]+)</(div|address|form)>!', '<p>$1</p></$2>', $pee );
 
 	// If an opening or closing block element tag is wrapped in a <p>, unwrap it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace( '!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', '$1', $pee );
 
 	// In some cases <li> may get wrapped in <p>, fix them.
-	$pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee);
+	$pee = preg_replace( '|<p>(<li.+?)</p>|', '$1', $pee );
 
 	// If a <blockquote> is wrapped with a <p>, move it inside the <blockquote>.
-	$pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
-	$pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
+	$pee = preg_replace( '|<p><blockquote([^>]*)>|i', '<blockquote$1><p>', $pee );
+	$pee = str_replace( '</blockquote></p>', '</p></blockquote>', $pee );
 
 	// If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
+	$pee = preg_replace( '!<p>\s*(</?' . $allblocks . '[^>]*>)!', '$1', $pee );
 
 	// If an opening or closing block element tag is followed by a closing <p> tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace( '!(</?' . $allblocks . '[^>]*>)\s*</p>!', '$1', $pee );
 
 	// Optionally insert line breaks.
 	if ( $br ) {
 		// Replace newlines that shouldn't be touched with a placeholder.
-		$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
+		$pee = preg_replace_callback( '/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee );
 
 		// Normalize <br>
 		$pee = str_replace( array( '<br>', '<br/>' ), '<br />', $pee );
 
 		// Replace any new line characters that aren't preceded by a <br /> with a <br />.
-		$pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee);
+		$pee = preg_replace( '|(?<!<br />)\s*\n|', "<br />\n", $pee );
 
 		// Replace newline placeholders with newlines.
-		$pee = str_replace('<WPPreserveNewline />', "\n", $pee);
+		$pee = str_replace( '<WPPreserveNewline />', "\n", $pee );
 	}
 
 	// If a <br /> tag is after an opening or closing block tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
+	$pee = preg_replace( '!(</?' . $allblocks . '[^>]*>)\s*<br />!', '$1', $pee );
 
 	// If a <br /> tag is before a subset of opening or closing block tags, remove it.
-	$pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
+	$pee = preg_replace( '!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee );
 	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
-		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	if ( ! empty( $pre_tags ) ) {
+		$pee = str_replace( array_keys( $pre_tags ), array_values( $pre_tags ), $pee );
+	}
 
 	// Restore newlines in all elements.
 	if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
@@ -688,7 +703,7 @@ function _get_wptexturize_split_regex( $shortcode_regex = '' ) {
 			. ')*+'         // Loop possessively.
 			. '(?:-->)?';   // End of comment. If not found, match all input.
 
-		$html_regex =			 // Needs replaced with wp_html_split() per Shortcode API Roadmap.
+		$html_regex = // Needs replaced with wp_html_split() per Shortcode API Roadmap.
 			'<'                  // Find start of element.
 			. '(?(?=!--)'        // Is this a comment?
 			.     $comment_regex // Find end of comment.
@@ -755,13 +770,14 @@ function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
 	// Optimize when searching for one item.
 	if ( 1 === count( $replace_pairs ) ) {
 		// Extract $needle and $replace.
-		foreach ( $replace_pairs as $needle => $replace );
+		foreach ( $replace_pairs as $needle => $replace ) {
+		}
 
 		// Loop through delimiters (elements) only.
 		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			if ( false !== strpos( $textarr[$i], $needle ) ) {
-				$textarr[$i] = str_replace( $needle, $replace, $textarr[$i] );
-				$changed = true;
+			if ( false !== strpos( $textarr[ $i ], $needle ) ) {
+				$textarr[ $i ] = str_replace( $needle, $replace, $textarr[ $i ] );
+				$changed       = true;
 			}
 		}
 	} else {
@@ -771,9 +787,9 @@ function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
 		// Loop through delimiters (elements) only.
 		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
 			foreach ( $needles as $needle ) {
-				if ( false !== strpos( $textarr[$i], $needle ) ) {
-					$textarr[$i] = strtr( $textarr[$i], $replace_pairs );
-					$changed = true;
+				if ( false !== strpos( $textarr[ $i ], $needle ) ) {
+					$textarr[ $i ] = strtr( $textarr[ $i ], $replace_pairs );
+					$changed       = true;
 					// After one strtr() break out of the foreach loop and look at next element.
 					break;
 				}
@@ -798,7 +814,7 @@ function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
  * @return string
  */
 function _autop_newline_preservation_helper( $matches ) {
-	return str_replace( "\n", "<WPPreserveNewline />", $matches[0] );
+	return str_replace( "\n", '<WPPreserveNewline />', $matches[0] );
 }
 
 /**
@@ -816,12 +832,12 @@ function _autop_newline_preservation_helper( $matches ) {
 function shortcode_unautop( $pee ) {
 	global $shortcode_tags;
 
-	if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
+	if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
 		return $pee;
 	}
 
 	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
-	$spaces = wp_spaces_regexp();
+	$spaces    = wp_spaces_regexp();
 
 	// phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
 	$pattern =
@@ -832,7 +848,7 @@ function shortcode_unautop( $pee ) {
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
 		.     '(?![\\w-])'                   // Not followed by word character or hyphen
-		                                     // Unroll the loop: Inside the opening shortcode tag
+											 // Unroll the loop: Inside the opening shortcode tag
 		.     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
 		.     '(?:'
 		.         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
@@ -874,20 +890,29 @@ function shortcode_unautop( $pee ) {
  */
 function seems_utf8( $str ) {
 	mbstring_binary_safe_encoding();
-	$length = strlen($str);
+	$length = strlen( $str );
 	reset_mbstring_encoding();
-	for ($i=0; $i < $length; $i++) {
-		$c = ord($str[$i]);
-		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
-		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
+	for ( $i = 0; $i < $length; $i++ ) {
+		$c = ord( $str[ $i ] );
+		if ( $c < 0x80 ) {
+			$n = 0; // 0bbbbbbb
+		} elseif ( ( $c & 0xE0 ) == 0xC0 ) {
+			$n = 1; // 110bbbbb
+		} elseif ( ( $c & 0xF0 ) == 0xE0 ) {
+			$n = 2; // 1110bbbb
+		} elseif ( ( $c & 0xF8 ) == 0xF0 ) {
+			$n = 3; // 11110bbb
+		} elseif ( ( $c & 0xFC ) == 0xF8 ) {
+			$n = 4; // 111110bb
+		} elseif ( ( $c & 0xFE ) == 0xFC ) {
+			$n = 5; // 1111110b
+		} else {
+			return false; // Does not match any model
+		}
+		for ( $j = 0; $j < $n; $j++ ) { // n bytes matching 10bbbbbb follow ?
+			if ( ( ++$i == $length ) || ( ( ord( $str[ $i ] ) & 0xC0 ) != 0x80 ) ) {
 				return false;
+			}
 		}
 	}
 	return true;
@@ -919,36 +944,40 @@ function seems_utf8( $str ) {
 function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
+	if ( 0 === strlen( $string ) ) {
 		return '';
+	}
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
+	if ( ! preg_match( '/[&<>"\']/', $string ) ) {
 		return $string;
+	}
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
+	if ( empty( $quote_style ) ) {
 		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
+	} elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
 		$quote_style = ENT_QUOTES;
+	}
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
 	if ( ! $charset ) {
 		static $_charset = null;
 		if ( ! isset( $_charset ) ) {
 			$alloptions = wp_load_alloptions();
-			$_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
+			$_charset   = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
 		}
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
+	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
 		$charset = 'UTF-8';
+	}
 
 	$_quote_style = $quote_style;
 
 	if ( $quote_style === 'double' ) {
-		$quote_style = ENT_COMPAT;
+		$quote_style  = ENT_COMPAT;
 		$_quote_style = ENT_COMPAT;
 	} elseif ( $quote_style === 'single' ) {
 		$quote_style = ENT_NOQUOTES;
@@ -963,8 +992,9 @@ function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = fals
 	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
 
 	// Back-compat.
-	if ( 'single' === $_quote_style )
+	if ( 'single' === $_quote_style ) {
 		$string = str_replace( "'", '&#039;', $string );
+	}
 
 	return $string;
 }
@@ -1004,29 +1034,55 @@ function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
 	// Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
 	if ( empty( $quote_style ) ) {
 		$quote_style = ENT_NOQUOTES;
-	} elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+	} elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
 		$quote_style = ENT_QUOTES;
 	}
 
 	// More complete than get_html_translation_table( HTML_SPECIALCHARS )
-	$single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
-	$single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
-	$double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
-	$double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
-	$others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
-	$others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
+	$single      = array(
+		'&#039;' => '\'',
+		'&#x27;' => '\'',
+	);
+	$single_preg = array(
+		'/&#0*39;/'   => '&#039;',
+		'/&#x0*27;/i' => '&#x27;',
+	);
+	$double      = array(
+		'&quot;' => '"',
+		'&#034;' => '"',
+		'&#x22;' => '"',
+	);
+	$double_preg = array(
+		'/&#0*34;/'   => '&#034;',
+		'/&#x0*22;/i' => '&#x22;',
+	);
+	$others      = array(
+		'&lt;'   => '<',
+		'&#060;' => '<',
+		'&gt;'   => '>',
+		'&#062;' => '>',
+		'&amp;'  => '&',
+		'&#038;' => '&',
+		'&#x26;' => '&',
+	);
+	$others_preg = array(
+		'/&#0*60;/'   => '&#060;',
+		'/&#0*62;/'   => '&#062;',
+		'/&#0*38;/'   => '&#038;',
+		'/&#x0*26;/i' => '&#x26;',
+	);
 
 	if ( $quote_style === ENT_QUOTES ) {
-		$translation = array_merge( $single, $double, $others );
+		$translation      = array_merge( $single, $double, $others );
 		$translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
 	} elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
-		$translation = array_merge( $double, $others );
+		$translation      = array_merge( $double, $others );
 		$translation_preg = array_merge( $double_preg, $others_preg );
 	} elseif ( $quote_style === 'single' ) {
-		$translation = array_merge( $single, $others );
+		$translation      = array_merge( $single, $others );
 		$translation_preg = array_merge( $single_preg, $others_preg );
 	} elseif ( $quote_style === ENT_NOQUOTES ) {
-		$translation = $others;
+		$translation      = $others;
 		$translation_preg = $others_preg;
 	}
 
@@ -1071,7 +1127,7 @@ function wp_check_invalid_utf8( $string, $strip = false ) {
 		$utf8_pcre = @preg_match( '/^./u', 'a' );
 	}
 	// We can't demand utf8 in the PCRE installation, so just return the string in those cases
-	if ( !$utf8_pcre ) {
+	if ( ! $utf8_pcre ) {
 		return $string;
 	}
 
@@ -1098,23 +1154,24 @@ function wp_check_invalid_utf8( $string, $strip = false ) {
  * @return string String with Unicode encoded for URI.
  */
 function utf8_uri_encode( $utf8_string, $length = 0 ) {
-	$unicode = '';
-	$values = array();
-	$num_octets = 1;
+	$unicode        = '';
+	$values         = array();
+	$num_octets     = 1;
 	$unicode_length = 0;
 
 	mbstring_binary_safe_encoding();
 	$string_length = strlen( $utf8_string );
 	reset_mbstring_encoding();
 
-	for ($i = 0; $i < $string_length; $i++ ) {
+	for ( $i = 0; $i < $string_length; $i++ ) {
 
 		$value = ord( $utf8_string[ $i ] );
 
 		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
+			if ( $length && ( $unicode_length >= $length ) ) {
 				break;
-			$unicode .= chr($value);
+			}
+			$unicode .= chr( $value );
 			$unicode_length++;
 		} else {
 			if ( count( $values ) == 0 ) {
@@ -1129,8 +1186,9 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
+			if ( $length && ( $unicode_length + ( $num_octets * 3 ) ) > $length ) {
 				break;
+			}
 			if ( count( $values ) == $num_octets ) {
 				for ( $j = 0; $j < $num_octets; $j++ ) {
 					$unicode .= '%' . dechex( $values[ $j ] );
@@ -1138,7 +1196,7 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
 
 				$unicode_length += $num_octets * 3;
 
-				$values = array();
+				$values     = array();
 				$num_octets = 1;
 			}
 		}
@@ -1534,233 +1592,387 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
  * @return string Filtered string with replaced "nice" characters.
  */
 function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
+	if ( ! preg_match( '/[\x80-\xff]/', $string ) ) {
 		return $string;
+	}
 
-	if (seems_utf8($string)) {
+	if ( seems_utf8( $string ) ) {
 		$chars = array(
-		// Decompositions for Latin-1 Supplement
-		'ª' => 'a', 'º' => 'o',
-		'À' => 'A', 'Á' => 'A',
-		'Â' => 'A', 'Ã' => 'A',
-		'Ä' => 'A', 'Å' => 'A',
-		'Æ' => 'AE','Ç' => 'C',
-		'È' => 'E', 'É' => 'E',
-		'Ê' => 'E', 'Ë' => 'E',
-		'Ì' => 'I', 'Í' => 'I',
-		'Î' => 'I', 'Ï' => 'I',
-		'Ð' => 'D', 'Ñ' => 'N',
-		'Ò' => 'O', 'Ó' => 'O',
-		'Ô' => 'O', 'Õ' => 'O',
-		'Ö' => 'O', 'Ù' => 'U',
-		'Ú' => 'U', 'Û' => 'U',
-		'Ü' => 'U', 'Ý' => 'Y',
-		'Þ' => 'TH','ß' => 's',
-		'à' => 'a', 'á' => 'a',
-		'â' => 'a', 'ã' => 'a',
-		'ä' => 'a', 'å' => 'a',
-		'æ' => 'ae','ç' => 'c',
-		'è' => 'e', 'é' => 'e',
-		'ê' => 'e', 'ë' => 'e',
-		'ì' => 'i', 'í' => 'i',
-		'î' => 'i', 'ï' => 'i',
-		'ð' => 'd', 'ñ' => 'n',
-		'ò' => 'o', 'ó' => 'o',
-		'ô' => 'o', 'õ' => 'o',
-		'ö' => 'o', 'ø' => 'o',
-		'ù' => 'u', 'ú' => 'u',
-		'û' => 'u', 'ü' => 'u',
-		'ý' => 'y', 'þ' => 'th',
-		'ÿ' => 'y', 'Ø' => 'O',
-		// Decompositions for Latin Extended-A
-		'Ā' => 'A', 'ā' => 'a',
-		'Ă' => 'A', 'ă' => 'a',
-		'Ą' => 'A', 'ą' => 'a',
-		'Ć' => 'C', 'ć' => 'c',
-		'Ĉ' => 'C', 'ĉ' => 'c',
-		'Ċ' => 'C', 'ċ' => 'c',
-		'Č' => 'C', 'č' => 'c',
-		'Ď' => 'D', 'ď' => 'd',
-		'Đ' => 'D', 'đ' => 'd',
-		'Ē' => 'E', 'ē' => 'e',
-		'Ĕ' => 'E', 'ĕ' => 'e',
-		'Ė' => 'E', 'ė' => 'e',
-		'Ę' => 'E', 'ę' => 'e',
-		'Ě' => 'E', 'ě' => 'e',
-		'Ĝ' => 'G', 'ĝ' => 'g',
-		'Ğ' => 'G', 'ğ' => 'g',
-		'Ġ' => 'G', 'ġ' => 'g',
-		'Ģ' => 'G', 'ģ' => 'g',
-		'Ĥ' => 'H', 'ĥ' => 'h',
-		'Ħ' => 'H', 'ħ' => 'h',
-		'Ĩ' => 'I', 'ĩ' => 'i',
-		'Ī' => 'I', 'ī' => 'i',
-		'Ĭ' => 'I', 'ĭ' => 'i',
-		'Į' => 'I', 'į' => 'i',
-		'İ' => 'I', 'ı' => 'i',
-		'IJ' => 'IJ','ij' => 'ij',
-		'Ĵ' => 'J', 'ĵ' => 'j',
-		'Ķ' => 'K', 'ķ' => 'k',
-		'ĸ' => 'k', 'Ĺ' => 'L',
-		'ĺ' => 'l', 'Ļ' => 'L',
-		'ļ' => 'l', 'Ľ' => 'L',
-		'ľ' => 'l', 'Ŀ' => 'L',
-		'ŀ' => 'l', 'Ł' => 'L',
-		'ł' => 'l', 'Ń' => 'N',
-		'ń' => 'n', 'Ņ' => 'N',
-		'ņ' => 'n', 'Ň' => 'N',
-		'ň' => 'n', 'ʼn' => 'n',
-		'Ŋ' => 'N', 'ŋ' => 'n',
-		'Ō' => 'O', 'ō' => 'o',
-		'Ŏ' => 'O', 'ŏ' => 'o',
-		'Ő' => 'O', 'ő' => 'o',
-		'Œ' => 'OE','œ' => 'oe',
-		'Ŕ' => 'R','ŕ' => 'r',
-		'Ŗ' => 'R','ŗ' => 'r',
-		'Ř' => 'R','ř' => 'r',
-		'Ś' => 'S','ś' => 's',
-		'Ŝ' => 'S','ŝ' => 's',
-		'Ş' => 'S','ş' => 's',
-		'Š' => 'S', 'š' => 's',
-		'Ţ' => 'T', 'ţ' => 't',
-		'Ť' => 'T', 'ť' => 't',
-		'Ŧ' => 'T', 'ŧ' => 't',
-		'Ũ' => 'U', 'ũ' => 'u',
-		'Ū' => 'U', 'ū' => 'u',
-		'Ŭ' => 'U', 'ŭ' => 'u',
-		'Ů' => 'U', 'ů' => 'u',
-		'Ű' => 'U', 'ű' => 'u',
-		'Ų' => 'U', 'ų' => 'u',
-		'Ŵ' => 'W', 'ŵ' => 'w',
-		'Ŷ' => 'Y', 'ŷ' => 'y',
-		'Ÿ' => 'Y', 'Ź' => 'Z',
-		'ź' => 'z', 'Ż' => 'Z',
-		'ż' => 'z', 'Ž' => 'Z',
-		'ž' => 'z', 'ſ' => 's',
-		// Decompositions for Latin Extended-B
-		'Ș' => 'S', 'ș' => 's',
-		'Ț' => 'T', 'ț' => 't',
-		// Euro Sign
-		'€' => 'E',
-		// GBP (Pound) Sign
-		'£' => '',
-		// Vowels with diacritic (Vietnamese)
-		// unmarked
-		'Ơ' => 'O', 'ơ' => 'o',
-		'Ư' => 'U', 'ư' => 'u',
-		// grave accent
-		'Ầ' => 'A', 'ầ' => 'a',
-		'Ằ' => 'A', 'ằ' => 'a',
-		'Ề' => 'E', 'ề' => 'e',
-		'Ồ' => 'O', 'ồ' => 'o',
-		'Ờ' => 'O', 'ờ' => 'o',
-		'Ừ' => 'U', 'ừ' => 'u',
-		'Ỳ' => 'Y', 'ỳ' => 'y',
-		// hook
-		'Ả' => 'A', 'ả' => 'a',
-		'Ẩ' => 'A', 'ẩ' => 'a',
-		'Ẳ' => 'A', 'ẳ' => 'a',
-		'Ẻ' => 'E', 'ẻ' => 'e',
-		'Ể' => 'E', 'ể' => 'e',
-		'Ỉ' => 'I', 'ỉ' => 'i',
-		'Ỏ' => 'O', 'ỏ' => 'o',
-		'Ổ' => 'O', 'ổ' => 'o',
-		'Ở' => 'O', 'ở' => 'o',
-		'Ủ' => 'U', 'ủ' => 'u',
-		'Ử' => 'U', 'ử' => 'u',
-		'Ỷ' => 'Y', 'ỷ' => 'y',
-		// tilde
-		'Ẫ' => 'A', 'ẫ' => 'a',
-		'Ẵ' => 'A', 'ẵ' => 'a',
-		'Ẽ' => 'E', 'ẽ' => 'e',
-		'Ễ' => 'E', 'ễ' => 'e',
-		'Ỗ' => 'O', 'ỗ' => 'o',
-		'Ỡ' => 'O', 'ỡ' => 'o',
-		'Ữ' => 'U', 'ữ' => 'u',
-		'Ỹ' => 'Y', 'ỹ' => 'y',
-		// acute accent
-		'Ấ' => 'A', 'ấ' => 'a',
-		'Ắ' => 'A', 'ắ' => 'a',
-		'Ế' => 'E', 'ế' => 'e',
-		'Ố' => 'O', 'ố' => 'o',
-		'Ớ' => 'O', 'ớ' => 'o',
-		'Ứ' => 'U', 'ứ' => 'u',
-		// dot below
-		'Ạ' => 'A', 'ạ' => 'a',
-		'Ậ' => 'A', 'ậ' => 'a',
-		'Ặ' => 'A', 'ặ' => 'a',
-		'Ẹ' => 'E', 'ẹ' => 'e',
-		'Ệ' => 'E', 'ệ' => 'e',
-		'Ị' => 'I', 'ị' => 'i',
-		'Ọ' => 'O', 'ọ' => 'o',
-		'Ộ' => 'O', 'ộ' => 'o',
-		'Ợ' => 'O', 'ợ' => 'o',
-		'Ụ' => 'U', 'ụ' => 'u',
-		'Ự' => 'U', 'ự' => 'u',
-		'Ỵ' => 'Y', 'ỵ' => 'y',
-		// Vowels with diacritic (Chinese, Hanyu Pinyin)
-		'ɑ' => 'a',
-		// macron
-		'Ǖ' => 'U', 'ǖ' => 'u',
-		// acute accent
-		'Ǘ' => 'U', 'ǘ' => 'u',
-		// caron
-		'Ǎ' => 'A', 'ǎ' => 'a',
-		'Ǐ' => 'I', 'ǐ' => 'i',
-		'Ǒ' => 'O', 'ǒ' => 'o',
-		'Ǔ' => 'U', 'ǔ' => 'u',
-		'Ǚ' => 'U', 'ǚ' => 'u',
-		// grave accent
-		'Ǜ' => 'U', 'ǜ' => 'u',
+			// Decompositions for Latin-1 Supplement
+			'ª' => 'a',
+			'º' => 'o',
+			'À' => 'A',
+			'Á' => 'A',
+			'Â' => 'A',
+			'Ã' => 'A',
+			'Ä' => 'A',
+			'Å' => 'A',
+			'Æ' => 'AE',
+			'Ç' => 'C',
+			'È' => 'E',
+			'É' => 'E',
+			'Ê' => 'E',
+			'Ë' => 'E',
+			'Ì' => 'I',
+			'Í' => 'I',
+			'Î' => 'I',
+			'Ï' => 'I',
+			'Ð' => 'D',
+			'Ñ' => 'N',
+			'Ò' => 'O',
+			'Ó' => 'O',
+			'Ô' => 'O',
+			'Õ' => 'O',
+			'Ö' => 'O',
+			'Ù' => 'U',
+			'Ú' => 'U',
+			'Û' => 'U',
+			'Ü' => 'U',
+			'Ý' => 'Y',
+			'Þ' => 'TH',
+			'ß' => 's',
+			'à' => 'a',
+			'á' => 'a',
+			'â' => 'a',
+			'ã' => 'a',
+			'ä' => 'a',
+			'å' => 'a',
+			'æ' => 'ae',
+			'ç' => 'c',
+			'è' => 'e',
+			'é' => 'e',
+			'ê' => 'e',
+			'ë' => 'e',
+			'ì' => 'i',
+			'í' => 'i',
+			'î' => 'i',
+			'ï' => 'i',
+			'ð' => 'd',
+			'ñ' => 'n',
+			'ò' => 'o',
+			'ó' => 'o',
+			'ô' => 'o',
+			'õ' => 'o',
+			'ö' => 'o',
+			'ø' => 'o',
+			'ù' => 'u',
+			'ú' => 'u',
+			'û' => 'u',
+			'ü' => 'u',
+			'ý' => 'y',
+			'þ' => 'th',
+			'ÿ' => 'y',
+			'Ø' => 'O',
+			// Decompositions for Latin Extended-A
+			'Ā' => 'A',
+			'ā' => 'a',
+			'Ă' => 'A',
+			'ă' => 'a',
+			'Ą' => 'A',
+			'ą' => 'a',
+			'Ć' => 'C',
+			'ć' => 'c',
+			'Ĉ' => 'C',
+			'ĉ' => 'c',
+			'Ċ' => 'C',
+			'ċ' => 'c',
+			'Č' => 'C',
+			'č' => 'c',
+			'Ď' => 'D',
+			'ď' => 'd',
+			'Đ' => 'D',
+			'đ' => 'd',
+			'Ē' => 'E',
+			'ē' => 'e',
+			'Ĕ' => 'E',
+			'ĕ' => 'e',
+			'Ė' => 'E',
+			'ė' => 'e',
+			'Ę' => 'E',
+			'ę' => 'e',
+			'Ě' => 'E',
+			'ě' => 'e',
+			'Ĝ' => 'G',
+			'ĝ' => 'g',
+			'Ğ' => 'G',
+			'ğ' => 'g',
+			'Ġ' => 'G',
+			'ġ' => 'g',
+			'Ģ' => 'G',
+			'ģ' => 'g',
+			'Ĥ' => 'H',
+			'ĥ' => 'h',
+			'Ħ' => 'H',
+			'ħ' => 'h',
+			'Ĩ' => 'I',
+			'ĩ' => 'i',
+			'Ī' => 'I',
+			'ī' => 'i',
+			'Ĭ' => 'I',
+			'ĭ' => 'i',
+			'Į' => 'I',
+			'į' => 'i',
+			'İ' => 'I',
+			'ı' => 'i',
+			'IJ' => 'IJ',
+			'ij' => 'ij',
+			'Ĵ' => 'J',
+			'ĵ' => 'j',
+			'Ķ' => 'K',
+			'ķ' => 'k',
+			'ĸ' => 'k',
+			'Ĺ' => 'L',
+			'ĺ' => 'l',
+			'Ļ' => 'L',
+			'ļ' => 'l',
+			'Ľ' => 'L',
+			'ľ' => 'l',
+			'Ŀ' => 'L',
+			'ŀ' => 'l',
+			'Ł' => 'L',
+			'ł' => 'l',
+			'Ń' => 'N',
+			'ń' => 'n',
+			'Ņ' => 'N',
+			'ņ' => 'n',
+			'Ň' => 'N',
+			'ň' => 'n',
+			'ʼn' => 'n',
+			'Ŋ' => 'N',
+			'ŋ' => 'n',
+			'Ō' => 'O',
+			'ō' => 'o',
+			'Ŏ' => 'O',
+			'ŏ' => 'o',
+			'Ő' => 'O',
+			'ő' => 'o',
+			'Œ' => 'OE',
+			'œ' => 'oe',
+			'Ŕ' => 'R',
+			'ŕ' => 'r',
+			'Ŗ' => 'R',
+			'ŗ' => 'r',
+			'Ř' => 'R',
+			'ř' => 'r',
+			'Ś' => 'S',
+			'ś' => 's',
+			'Ŝ' => 'S',
+			'ŝ' => 's',
+			'Ş' => 'S',
+			'ş' => 's',
+			'Š' => 'S',
+			'š' => 's',
+			'Ţ' => 'T',
+			'ţ' => 't',
+			'Ť' => 'T',
+			'ť' => 't',
+			'Ŧ' => 'T',
+			'ŧ' => 't',
+			'Ũ' => 'U',
+			'ũ' => 'u',
+			'Ū' => 'U',
+			'ū' => 'u',
+			'Ŭ' => 'U',
+			'ŭ' => 'u',
+			'Ů' => 'U',
+			'ů' => 'u',
+			'Ű' => 'U',
+			'ű' => 'u',
+			'Ų' => 'U',
+			'ų' => 'u',
+			'Ŵ' => 'W',
+			'ŵ' => 'w',
+			'Ŷ' => 'Y',
+			'ŷ' => 'y',
+			'Ÿ' => 'Y',
+			'Ź' => 'Z',
+			'ź' => 'z',
+			'Ż' => 'Z',
+			'ż' => 'z',
+			'Ž' => 'Z',
+			'ž' => 'z',
+			'ſ' => 's',
+			// Decompositions for Latin Extended-B
+			'Ș' => 'S',
+			'ș' => 's',
+			'Ț' => 'T',
+			'ț' => 't',
+			// Euro Sign
+			'€' => 'E',
+			// GBP (Pound) Sign
+			'£' => '',
+			// Vowels with diacritic (Vietnamese)
+			// unmarked
+			'Ơ' => 'O',
+			'ơ' => 'o',
+			'Ư' => 'U',
+			'ư' => 'u',
+			// grave accent
+			'Ầ' => 'A',
+			'ầ' => 'a',
+			'Ằ' => 'A',
+			'ằ' => 'a',
+			'Ề' => 'E',
+			'ề' => 'e',
+			'Ồ' => 'O',
+			'ồ' => 'o',
+			'Ờ' => 'O',
+			'ờ' => 'o',
+			'Ừ' => 'U',
+			'ừ' => 'u',
+			'Ỳ' => 'Y',
+			'ỳ' => 'y',
+			// hook
+			'Ả' => 'A',
+			'ả' => 'a',
+			'Ẩ' => 'A',
+			'ẩ' => 'a',
+			'Ẳ' => 'A',
+			'ẳ' => 'a',
+			'Ẻ' => 'E',
+			'ẻ' => 'e',
+			'Ể' => 'E',
+			'ể' => 'e',
+			'Ỉ' => 'I',
+			'ỉ' => 'i',
+			'Ỏ' => 'O',
+			'ỏ' => 'o',
+			'Ổ' => 'O',
+			'ổ' => 'o',
+			'Ở' => 'O',
+			'ở' => 'o',
+			'Ủ' => 'U',
+			'ủ' => 'u',
+			'Ử' => 'U',
+			'ử' => 'u',
+			'Ỷ' => 'Y',
+			'ỷ' => 'y',
+			// tilde
+			'Ẫ' => 'A',
+			'ẫ' => 'a',
+			'Ẵ' => 'A',
+			'ẵ' => 'a',
+			'Ẽ' => 'E',
+			'ẽ' => 'e',
+			'Ễ' => 'E',
+			'ễ' => 'e',
+			'Ỗ' => 'O',
+			'ỗ' => 'o',
+			'Ỡ' => 'O',
+			'ỡ' => 'o',
+			'Ữ' => 'U',
+			'ữ' => 'u',
+			'Ỹ' => 'Y',
+			'ỹ' => 'y',
+			// acute accent
+			'Ấ' => 'A',
+			'ấ' => 'a',
+			'Ắ' => 'A',
+			'ắ' => 'a',
+			'Ế' => 'E',
+			'ế' => 'e',
+			'Ố' => 'O',
+			'ố' => 'o',
+			'Ớ' => 'O',
+			'ớ' => 'o',
+			'Ứ' => 'U',
+			'ứ' => 'u',
+			// dot below
+			'Ạ' => 'A',
+			'ạ' => 'a',
+			'Ậ' => 'A',
+			'ậ' => 'a',
+			'Ặ' => 'A',
+			'ặ' => 'a',
+			'Ẹ' => 'E',
+			'ẹ' => 'e',
+			'Ệ' => 'E',
+			'ệ' => 'e',
+			'Ị' => 'I',
+			'ị' => 'i',
+			'Ọ' => 'O',
+			'ọ' => 'o',
+			'Ộ' => 'O',
+			'ộ' => 'o',
+			'Ợ' => 'O',
+			'ợ' => 'o',
+			'Ụ' => 'U',
+			'ụ' => 'u',
+			'Ự' => 'U',
+			'ự' => 'u',
+			'Ỵ' => 'Y',
+			'ỵ' => 'y',
+			// Vowels with diacritic (Chinese, Hanyu Pinyin)
+			'ɑ' => 'a',
+			// macron
+			'Ǖ' => 'U',
+			'ǖ' => 'u',
+			// acute accent
+			'Ǘ' => 'U',
+			'ǘ' => 'u',
+			// caron
+			'Ǎ' => 'A',
+			'ǎ' => 'a',
+			'Ǐ' => 'I',
+			'ǐ' => 'i',
+			'Ǒ' => 'O',
+			'ǒ' => 'o',
+			'Ǔ' => 'U',
+			'ǔ' => 'u',
+			'Ǚ' => 'U',
+			'ǚ' => 'u',
+			// grave accent
+			'Ǜ' => 'U',
+			'ǜ' => 'u',
 		);
 
 		// Used for locale-specific rules
 		$locale = get_locale();
 
 		if ( 'de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale ) {
-			$chars[ 'Ä' ] = 'Ae';
-			$chars[ 'ä' ] = 'ae';
-			$chars[ 'Ö' ] = 'Oe';
-			$chars[ 'ö' ] = 'oe';
-			$chars[ 'Ü' ] = 'Ue';
-			$chars[ 'ü' ] = 'ue';
-			$chars[ 'ß' ] = 'ss';
+			$chars['Ä'] = 'Ae';
+			$chars['ä'] = 'ae';
+			$chars['Ö'] = 'Oe';
+			$chars['ö'] = 'oe';
+			$chars['Ü'] = 'Ue';
+			$chars['ü'] = 'ue';
+			$chars['ß'] = 'ss';
 		} elseif ( 'da_DK' === $locale ) {
-			$chars[ 'Æ' ] = 'Ae';
- 			$chars[ 'æ' ] = 'ae';
-			$chars[ 'Ø' ] = 'Oe';
-			$chars[ 'ø' ] = 'oe';
-			$chars[ 'Å' ] = 'Aa';
-			$chars[ 'å' ] = 'aa';
+			$chars['Æ'] = 'Ae';
+			$chars['æ'] = 'ae';
+			$chars['Ø'] = 'Oe';
+			$chars['ø'] = 'oe';
+			$chars['Å'] = 'Aa';
+			$chars['å'] = 'aa';
 		} elseif ( 'ca' === $locale ) {
-			$chars[ 'l·l' ] = 'll';
+			$chars['l·l'] = 'll';
 		} elseif ( 'sr_RS' === $locale || 'bs_BA' === $locale ) {
-			$chars[ 'Đ' ] = 'DJ';
-			$chars[ 'đ' ] = 'dj';
+			$chars['Đ'] = 'DJ';
+			$chars['đ'] = 'dj';
 		}
 
-		$string = strtr($string, $chars);
+		$string = strtr( $string, $chars );
 	} else {
 		$chars = array();
 		// Assume ISO-8859-1 if not UTF-8
 		$chars['in'] = "\x80\x83\x8a\x8e\x9a\x9e"
-			."\x9f\xa2\xa5\xb5\xc0\xc1\xc2"
-			."\xc3\xc4\xc5\xc7\xc8\xc9\xca"
-			."\xcb\xcc\xcd\xce\xcf\xd1\xd2"
-			."\xd3\xd4\xd5\xd6\xd8\xd9\xda"
-			."\xdb\xdc\xdd\xe0\xe1\xe2\xe3"
-			."\xe4\xe5\xe7\xe8\xe9\xea\xeb"
-			."\xec\xed\xee\xef\xf1\xf2\xf3"
-			."\xf4\xf5\xf6\xf8\xf9\xfa\xfb"
-			."\xfc\xfd\xff";
+			. "\x9f\xa2\xa5\xb5\xc0\xc1\xc2"
+			. "\xc3\xc4\xc5\xc7\xc8\xc9\xca"
+			. "\xcb\xcc\xcd\xce\xcf\xd1\xd2"
+			. "\xd3\xd4\xd5\xd6\xd8\xd9\xda"
+			. "\xdb\xdc\xdd\xe0\xe1\xe2\xe3"
+			. "\xe4\xe5\xe7\xe8\xe9\xea\xeb"
+			. "\xec\xed\xee\xef\xf1\xf2\xf3"
+			. "\xf4\xf5\xf6\xf8\xf9\xfa\xfb"
+			. "\xfc\xfd\xff";
 
-		$chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
+		$chars['out'] = 'EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy';
 
-		$string = strtr($string, $chars['in'], $chars['out']);
-		$double_chars = array();
-		$double_chars['in'] = array("\x8c", "\x9c", "\xc6", "\xd0", "\xde", "\xdf", "\xe6", "\xf0", "\xfe");
-		$double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
-		$string = str_replace($double_chars['in'], $double_chars['out'], $string);
+		$string              = strtr( $string, $chars['in'], $chars['out'] );
+		$double_chars        = array();
+		$double_chars['in']  = array( "\x8c", "\x9c", "\xc6", "\xd0", "\xde", "\xdf", "\xe6", "\xf0", "\xfe" );
+		$double_chars['out'] = array( 'OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th' );
+		$string              = str_replace( $double_chars['in'], $double_chars['out'], $string );
 	}
 
 	return $string;
@@ -1782,8 +1994,8 @@ function remove_accents( $string ) {
  * @return string The sanitized filename
  */
 function sanitize_file_name( $filename ) {
-	$filename_raw = $filename;
-	$special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0));
+	$filename_raw  = $filename;
+	$special_chars = array( '?', '[', ']', '/', '\\', '=', '<', '>', ':', ';', ',', "'", '"', '&', '$', '#', '*', '(', ')', '|', '~', '`', '!', '{', '}', '%', '+', chr( 0 ) );
 	/**
 	 * Filters the list of characters to remove from a filename.
 	 *
@@ -1793,22 +2005,22 @@ function sanitize_file_name( $filename ) {
 	 * @param string $filename_raw  Filename as it was passed into sanitize_file_name().
 	 */
 	$special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
-	$filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
-	$filename = str_replace( $special_chars, '', $filename );
-	$filename = str_replace( array( '%20', '+' ), '-', $filename );
-	$filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
-	$filename = trim( $filename, '.-_' );
+	$filename      = preg_replace( "#\x{00a0}#siu", ' ', $filename );
+	$filename      = str_replace( $special_chars, '', $filename );
+	$filename      = str_replace( array( '%20', '+' ), '-', $filename );
+	$filename      = preg_replace( '/[\r\n\t -]+/', '-', $filename );
+	$filename      = trim( $filename, '.-_' );
 
 	if ( false === strpos( $filename, '.' ) ) {
 		$mime_types = wp_get_mime_types();
-		$filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
+		$filetype   = wp_check_filetype( 'test.' . $filename, $mime_types );
 		if ( $filetype['ext'] === $filename ) {
 			$filename = 'unnamed-file.' . $filetype['ext'];
 		}
 	}
 
 	// Split the filename into a base and extension[s]
-	$parts = explode('.', $filename);
+	$parts = explode( '.', $filename );
 
 	// Return if only one extension
 	if ( count( $parts ) <= 2 ) {
@@ -1824,18 +2036,18 @@ function sanitize_file_name( $filename ) {
 	}
 
 	// Process multiple extensions
-	$filename = array_shift($parts);
-	$extension = array_pop($parts);
-	$mimes = get_allowed_mime_types();
+	$filename  = array_shift( $parts );
+	$extension = array_pop( $parts );
+	$mimes     = get_allowed_mime_types();
 
 	/*
 	 * Loop over any intermediate extensions. Postfix them with a trailing underscore
 	 * if they are a 2 - 5 character long alpha string not in the extension whitelist.
 	 */
-	foreach ( (array) $parts as $part) {
+	foreach ( (array) $parts as $part ) {
 		$filename .= '.' . $part;
 
-		if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
+		if ( preg_match( '/^[a-zA-Z]{2,5}\d?$/', $part ) ) {
 			$allowed = false;
 			foreach ( $mimes as $ext_preg => $mime_match ) {
 				$ext_preg = '!^(' . $ext_preg . ')$!i';
@@ -1844,13 +2056,14 @@ function sanitize_file_name( $filename ) {
 					break;
 				}
 			}
-			if ( !$allowed )
+			if ( ! $allowed ) {
 				$filename .= '_';
+			}
 		}
 	}
 	$filename .= '.' . $extension;
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters('sanitize_file_name', $filename, $filename_raw);
+	return apply_filters( 'sanitize_file_name', $filename, $filename_raw );
 }
 
 /**
@@ -1869,15 +2082,16 @@ function sanitize_file_name( $filename ) {
  */
 function sanitize_user( $username, $strict = false ) {
 	$raw_username = $username;
-	$username = wp_strip_all_tags( $username );
-	$username = remove_accents( $username );
+	$username     = wp_strip_all_tags( $username );
+	$username     = remove_accents( $username );
 	// Kill octets
 	$username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
 	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
+	if ( $strict ) {
 		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	}
 
 	$username = trim( $username );
 	// Consolidate contiguous whitespace
@@ -1907,8 +2121,8 @@ function sanitize_user( $username, $strict = false ) {
  */
 function sanitize_key( $key ) {
 	$raw_key = $key;
-	$key = strtolower( $key );
-	$key = preg_replace( '/[^a-z0-9_\-]/', '', $key );
+	$key     = strtolower( $key );
+	$key     = preg_replace( '/[^a-z0-9_\-]/', '', $key );
 
 	/**
 	 * Filters a sanitized key string.
@@ -1938,8 +2152,9 @@ function sanitize_key( $key ) {
 function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
-		$title = remove_accents($title);
+	if ( 'save' == $context ) {
+		$title = remove_accents( $title );
+	}
 
 	/**
 	 * Filters a sanitized title string.
@@ -1952,8 +2167,9 @@ function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
 	 */
 	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
 
-	if ( '' === $title || false === $title )
+	if ( '' === $title || false === $title ) {
 		$title = $fallback_title;
+	}
 
 	return $title;
 }
@@ -1986,22 +2202,22 @@ function sanitize_title_for_query( $title ) {
  * @return string The sanitized title.
  */
 function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'display' ) {
-	$title = strip_tags($title);
+	$title = strip_tags( $title );
 	// Preserve escaped octets.
-	$title = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title);
+	$title = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title );
 	// Remove percent signs that are not part of an octet.
-	$title = str_replace('%', '', $title);
+	$title = str_replace( '%', '', $title );
 	// Restore octets.
-	$title = preg_replace('|---([a-fA-F0-9][a-fA-F0-9])---|', '%$1', $title);
+	$title = preg_replace( '|---([a-fA-F0-9][a-fA-F0-9])---|', '%$1', $title );
 
-	if (seems_utf8($title)) {
-		if (function_exists('mb_strtolower')) {
-			$title = mb_strtolower($title, 'UTF-8');
+	if ( seems_utf8( $title ) ) {
+		if ( function_exists( 'mb_strtolower' ) ) {
+			$title = mb_strtolower( $title, 'UTF-8' );
 		}
-		$title = utf8_uri_encode($title, 200);
+		$title = utf8_uri_encode( $title, 200 );
 	}
 
-	$title = strtolower($title);
+	$title = strtolower( $title );
 
 	if ( 'save' == $context ) {
 		// Convert nbsp, ndash and mdash to hyphens
@@ -2012,33 +2228,54 @@ function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'displa
 		$title = str_replace( '/', '-', $title );
 
 		// Strip these characters entirely
-		$title = str_replace( array(
-			// iexcl and iquest
-			'%c2%a1', '%c2%bf',
-			// angle quotes
-			'%c2%ab', '%c2%bb', '%e2%80%b9', '%e2%80%ba',
-			// curly quotes
-			'%e2%80%98', '%e2%80%99', '%e2%80%9c', '%e2%80%9d',
-			'%e2%80%9a', '%e2%80%9b', '%e2%80%9e', '%e2%80%9f',
-			// copy, reg, deg, hellip and trade
-			'%c2%a9', '%c2%ae', '%c2%b0', '%e2%80%a6', '%e2%84%a2',
-			// acute accents
-			'%c2%b4', '%cb%8a', '%cc%81', '%cd%81',
-			// grave accent, macron, caron
-			'%cc%80', '%cc%84', '%cc%8c',
-		), '', $title );
+		$title = str_replace(
+			array(
+				// iexcl and iquest
+				'%c2%a1',
+				'%c2%bf',
+				// angle quotes
+				'%c2%ab',
+				'%c2%bb',
+				'%e2%80%b9',
+				'%e2%80%ba',
+				// curly quotes
+				'%e2%80%98',
+				'%e2%80%99',
+				'%e2%80%9c',
+				'%e2%80%9d',
+				'%e2%80%9a',
+				'%e2%80%9b',
+				'%e2%80%9e',
+				'%e2%80%9f',
+				// copy, reg, deg, hellip and trade
+				'%c2%a9',
+				'%c2%ae',
+				'%c2%b0',
+				'%e2%80%a6',
+				'%e2%84%a2',
+				// acute accents
+				'%c2%b4',
+				'%cb%8a',
+				'%cc%81',
+				'%cd%81',
+				// grave accent, macron, caron
+				'%cc%80',
+				'%cc%84',
+				'%cc%8c',
+			), '', $title
+		);
 
 		// Convert times to x
 		$title = str_replace( '%c3%97', 'x', $title );
 	}
 
-	$title = preg_replace('/&.+?;/', '', $title); // kill entities
-	$title = str_replace('.', '-', $title);
+	$title = preg_replace( '/&.+?;/', '', $title ); // kill entities
+	$title = str_replace( '.', '-', $title );
 
-	$title = preg_replace('/[^%a-z0-9 _-]/', '', $title);
-	$title = preg_replace('/\s+/', '-', $title);
-	$title = preg_replace('|-+|', '-', $title);
-	$title = trim($title, '-');
+	$title = preg_replace( '/[^%a-z0-9 _-]/', '', $title );
+	$title = preg_replace( '/\s+/', '-', $title );
+	$title = preg_replace( '|-+|', '-', $title );
+	$title = trim( $title, '-' );
 
 	return $title;
 }
@@ -2075,7 +2312,7 @@ function sanitize_sql_orderby( $orderby ) {
  *
  * @param string $class    The classname to be sanitized
  * @param string $fallback Optional. The value to return if the sanitization ends up as an empty string.
- * 	Defaults to an empty string.
+ *  Defaults to an empty string.
  * @return string The sanitized value
  */
 function sanitize_html_class( $class, $fallback = '' ) {
@@ -2162,7 +2399,7 @@ function convert_invalid_entities( $content ) {
 		'&#156;' => '&#339;',
 		'&#157;' => '',
 		'&#158;' => '&#382;',
-		'&#159;' => '&#376;'
+		'&#159;' => '&#376;',
 	);
 
 	if ( strpos( $content, '&#1' ) !== false ) {
@@ -2182,7 +2419,7 @@ function convert_invalid_entities( $content ) {
  * @return string Balanced text
  */
 function balanceTags( $text, $force = false ) {
-	if ( $force || get_option('use_balanceTags') == 1 ) {
+	if ( $force || get_option( 'use_balanceTags' ) == 1 ) {
 		return force_balance_tags( $text );
 	} else {
 		return $text;
@@ -2200,55 +2437,54 @@ function balanceTags( $text, $force = false ) {
  * @version 1.1
  * @todo Make better - change loop condition to $text in 1.2
  * @internal Modified by Scott Reilly (coffee2code) 02 Aug 2004
- *		1.1  Fixed handling of append/stack pop order of end text
- *			 Added Cleaning Hooks
- *		1.0  First Version
+ *      1.1  Fixed handling of append/stack pop order of end text
+ *           Added Cleaning Hooks
+ *      1.0  First Version
  *
  * @param string $text Text to be balanced.
  * @return string Balanced text.
  */
 function force_balance_tags( $text ) {
-	$tagstack = array();
+	$tagstack  = array();
 	$stacksize = 0;
-	$tagqueue = '';
-	$newtext = '';
+	$tagqueue  = '';
+	$newtext   = '';
 	// Known single-entity/self-closing tags
 	$single_tags = array( 'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source' );
 	// Tags that can be immediately nested within themselves
 	$nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' );
 
 	// WP bug fix for comments - in case you REALLY meant to type '< !--'
-	$text = str_replace('< !--', '<    !--', $text);
+	$text = str_replace( '< !--', '<    !--', $text );
 	// WP bug fix for LOVE <3 (and other situations with '<' before a number)
-	$text = preg_replace('#<([0-9]{1})#', '&lt;$1', $text);
+	$text = preg_replace( '#<([0-9]{1})#', '&lt;$1', $text );
 
-	while ( preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex) ) {
+	while ( preg_match( '/<(\/?[\w:]*)\s*([^>]*)>/', $text, $regex ) ) {
 		$newtext .= $tagqueue;
 
-		$i = strpos($text, $regex[0]);
-		$l = strlen($regex[0]);
+		$i = strpos( $text, $regex[0] );
+		$l = strlen( $regex[0] );
 
 		// clear the shifter
 		$tagqueue = '';
 		// Pop or Push
-		if ( isset($regex[1][0]) && '/' == $regex[1][0] ) { // End Tag
-			$tag = strtolower(substr($regex[1],1));
+		if ( isset( $regex[1][0] ) && '/' == $regex[1][0] ) { // End Tag
+			$tag = strtolower( substr( $regex[1], 1 ) );
 			// if too many closing tags
 			if ( $stacksize <= 0 ) {
 				$tag = '';
 				// or close to be safe $tag = '/' . $tag;
-			}
-			// if stacktop value = tag close value then pop
-			elseif ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
+			} // if stacktop value = tag close value then pop
+			elseif ( $tagstack[ $stacksize - 1 ] == $tag ) { // found closing tag
 				$tag = '</' . $tag . '>'; // Close Tag
 				// Pop
 				array_pop( $tagstack );
 				$stacksize--;
 			} else { // closing tag not at top, search for it
-				for ( $j = $stacksize-1; $j >= 0; $j-- ) {
-					if ( $tagstack[$j] == $tag ) {
-					// add tag to tagqueue
-						for ( $k = $stacksize-1; $k >= $j; $k--) {
+				for ( $j = $stacksize - 1; $j >= 0; $j-- ) {
+					if ( $tagstack[ $j ] == $tag ) {
+						// add tag to tagqueue
+						for ( $k = $stacksize - 1; $k >= $j; $k-- ) {
 							$tagqueue .= '</' . array_pop( $tagstack ) . '>';
 							$stacksize--;
 						}
@@ -2258,29 +2494,27 @@ function force_balance_tags( $text ) {
 				$tag = '';
 			}
 		} else { // Begin Tag
-			$tag = strtolower($regex[1]);
+			$tag = strtolower( $regex[1] );
 
 			// Tag Cleaning
 
 			// If it's an empty tag "< >", do nothing
 			if ( '' == $tag ) {
 				// do nothing
-			}
-			// ElseIf it presents itself as a self-closing tag...
+			} // ElseIf it presents itself as a self-closing tag...
 			elseif ( substr( $regex[2], -1 ) == '/' ) {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
+				if ( ! in_array( $tag, $single_tags ) ) {
 					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
-			}
-			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
-			elseif ( in_array($tag, $single_tags) ) {
+				}
+			} // ElseIf it's a known single-entity tag but it doesn't close itself, do so
+			elseif ( in_array( $tag, $single_tags ) ) {
 				$regex[2] .= '/';
-			}
-			// Else it's not a single-entity tag
+			} // Else it's not a single-entity tag
 			else {
 				// If the top of the stack is the same as the tag we want to push, close previous tag
-				if ( $stacksize > 0 && !in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag ) {
+				if ( $stacksize > 0 && ! in_array( $tag, $nestable_tags ) && $tagstack[ $stacksize - 1 ] == $tag ) {
 					$tagqueue = '</' . array_pop( $tagstack ) . '>';
 					$stacksize--;
 				}
@@ -2289,18 +2523,19 @@ function force_balance_tags( $text ) {
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
+			if ( ! empty( $attributes ) && $attributes[0] != '>' ) {
 				$attributes = ' ' . $attributes;
+			}
 
 			$tag = '<' . $tag . $attributes . '>';
 			//If already queuing a close tag, then put this tag on, too
-			if ( !empty($tagqueue) ) {
+			if ( ! empty( $tagqueue ) ) {
 				$tagqueue .= $tag;
-				$tag = '';
+				$tag       = '';
 			}
 		}
-		$newtext .= substr($text, 0, $i) . $tag;
-		$text = substr($text, $i + $l);
+		$newtext .= substr( $text, 0, $i ) . $tag;
+		$text     = substr( $text, $i + $l );
 	}
 
 	// Clear Tag Queue
@@ -2310,12 +2545,13 @@ function force_balance_tags( $text ) {
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
+	while ( $x = array_pop( $tagstack ) ) {
 		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	}
 
 	// WP fix for the bug with HTML comments
-	$newtext = str_replace("< !--","<!--",$newtext);
-	$newtext = str_replace("<    !--","< !--",$newtext);
+	$newtext = str_replace( '< !--', '<!--', $newtext );
+	$newtext = str_replace( '<    !--', '< !--', $newtext );
 
 	return $newtext;
 }
@@ -2345,8 +2581,9 @@ function format_to_edit( $content, $rich_text = false ) {
 	 * @param string $content The text, prior to formatting for editing.
 	 */
 	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $rich_text )
+	if ( ! $rich_text ) {
 		$content = esc_textarea( $content );
+	}
 	return $content;
 }
 
@@ -2380,8 +2617,9 @@ function zeroise( $number, $threshold ) {
  * @return string String with backslashes inserted.
  */
 function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
+	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' ) {
 		$string = '\\\\' . $string;
+	}
 	return addcslashes( $string, 'A..Za..z' );
 }
 
@@ -2429,11 +2667,12 @@ function untrailingslashit( $string ) {
  * @param string $gpc The string returned from HTTP request data.
  * @return string Returns a string escaped with slashes.
  */
-function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
-		$gpc = stripslashes($gpc);
+function addslashes_gpc( $gpc ) {
+	if ( get_magic_quotes_gpc() ) {
+		$gpc = stripslashes( $gpc );
+	}
 
-	return wp_slash($gpc);
+	return wp_slash( $gpc );
 }
 
 /**
@@ -2510,11 +2749,11 @@ function antispambot( $email_address, $hex_encoding = 0 ) {
 	for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
 		$j = rand( 0, 1 + $hex_encoding );
 		if ( $j == 0 ) {
-			$email_no_spam_address .= '&#' . ord( $email_address[$i] ) . ';';
+			$email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';';
 		} elseif ( $j == 1 ) {
-			$email_no_spam_address .= $email_address[$i];
+			$email_no_spam_address .= $email_address[ $i ];
 		} elseif ( $j == 2 ) {
-			$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[$i] ) ), 2 );
+			$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[ $i ] ) ), 2 );
 		}
 	}
 
@@ -2538,7 +2777,7 @@ function _make_url_clickable_cb( $matches ) {
 	if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
 		// If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
 		// Then we can let the parenthesis balancer do its thing below.
-		$url .= $matches[3];
+		$url   .= $matches[3];
 		$suffix = '';
 	} else {
 		$suffix = $matches[3];
@@ -2547,12 +2786,13 @@ function _make_url_clickable_cb( $matches ) {
 	// Include parentheses in the URL only if paired
 	while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
 		$suffix = strrchr( $url, ')' ) . $suffix;
-		$url = substr( $url, 0, strrpos( $url, ')' ) );
+		$url    = substr( $url, 0, strrpos( $url, ')' ) );
 	}
 
-	$url = esc_url($url);
-	if ( empty($url) )
+	$url = esc_url( $url );
+	if ( empty( $url ) ) {
 		return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -2569,19 +2809,20 @@ function _make_url_clickable_cb( $matches ) {
  * @return string HTML A element with URL address.
  */
 function _make_web_ftp_clickable_cb( $matches ) {
-	$ret = '';
+	$ret  = '';
 	$dest = $matches[2];
 	$dest = 'http://' . $dest;
 
 	// removed trailing [.,;:)] from URL
-	if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
-		$ret = substr($dest, -1);
-		$dest = substr($dest, 0, strlen($dest)-1);
+	if ( in_array( substr( $dest, -1 ), array( '.', ',', ';', ':', ')' ) ) === true ) {
+		$ret  = substr( $dest, -1 );
+		$dest = substr( $dest, 0, strlen( $dest ) - 1 );
 	}
 
-	$dest = esc_url($dest);
-	if ( empty($dest) )
+	$dest = esc_url( $dest );
+	if ( empty( $dest ) ) {
 		return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
@@ -2614,15 +2855,16 @@ function _make_email_clickable_cb( $matches ) {
  * @return string Content with converted URIs.
  */
 function make_clickable( $text ) {
-	$r = '';
-	$textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+	$r               = '';
+	$textarr         = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
 	foreach ( $textarr as $piece ) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
+		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) ) {
 			$nested_code_pre++;
-		elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
+		} elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) ) {
 			$nested_code_pre--;
+		}
 
 		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
 			$r .= $piece;
@@ -2655,7 +2897,7 @@ function make_clickable( $text ) {
 				)
 				(\)?)                                                  # 3: Trailing closing parenthesis (for parethesis balancing post processing)
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
-			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
+				  // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
 			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
 
@@ -2663,12 +2905,12 @@ function make_clickable( $text ) {
 			$ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
 
 			$ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
-			$r .= $ret;
+			$r  .= $ret;
 		}
 	}
 
 	// Cleanup of accidental links within links
-	return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+	return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', '$1$3</a>', $r );
 }
 
 /**
@@ -2715,8 +2957,8 @@ function _split_str_by_whitespace( $string, $goal ) {
 			}
 		}
 
-		$chunks[] = substr( $string, 0, $pos + 1 );
-		$string = substr( $string, $pos + 1 );
+		$chunks[]         = substr( $string, 0, $pos + 1 );
+		$string           = substr( $string, $pos + 1 );
 		$string_nullspace = substr( $string_nullspace, $pos + 1 );
 	}
 
@@ -2737,8 +2979,8 @@ function _split_str_by_whitespace( $string, $goal ) {
  */
 function wp_rel_nofollow( $text ) {
 	// This is a pre save filter, so text is already escaped.
-	$text = stripslashes($text);
-	$text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text);
+	$text = stripslashes( $text );
+	$text = preg_replace_callback( '|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text );
 	return wp_slash( $text );
 }
 
@@ -2799,14 +3041,15 @@ function wp_rel_nofollow_callback( $matches ) {
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
+	if ( count( $matches ) == 0 ) {
 		return '';
+	}
 
 	$smiley = trim( reset( $matches ) );
-	$img = $wpsmiliestrans[ $smiley ];
+	$img    = $wpsmiliestrans[ $smiley ];
 
-	$matches = array();
-	$ext = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
+	$matches    = array();
+	$ext        = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
 	$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
 
 	// Don't convert smilies that aren't images - they're probably emoji.
@@ -2847,27 +3090,27 @@ function convert_smilies( $text ) {
 	if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {
 		// HTML loop taken from texturize function, could possible be consolidated
 		$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between
-		$stop = count( $textarr );// loop stuff
+		$stop    = count( $textarr );// loop stuff
 
 		// Ignore proessing of specific tags
-		$tags_to_ignore = 'code|pre|style|script|textarea';
+		$tags_to_ignore       = 'code|pre|style|script|textarea';
 		$ignore_block_element = '';
 
 		for ( $i = 0; $i < $stop; $i++ ) {
-			$content = $textarr[$i];
+			$content = $textarr[ $i ];
 
 			// If we're in an ignore block, wait until we find its closing tag
-			if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+			if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
 				$ignore_block_element = $matches[1];
 			}
 
 			// If it's not a tag and not in ignore block
-			if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+			if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
 				$content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
 			}
 
 			// did we exit ignore block
-			if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+			if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
 				$ignore_block_element = '';
 			}
 
@@ -2892,8 +3135,9 @@ function convert_smilies( $text ) {
  * @return string|bool Either false or the valid email address.
  */
 function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
 	// Test for the minimum length the email can be
 	if ( strlen( $email ) < 6 ) {
@@ -2924,7 +3168,7 @@ function is_email( $email, $deprecated = false ) {
 
 	// LOCAL PART
 	// Test for invalid characters
-	if ( !preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
+	if ( ! preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
 		/** This filter is documented in wp-includes/formatting.php */
 		return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );
 	}
@@ -2960,7 +3204,7 @@ function is_email( $email, $deprecated = false ) {
 		}
 
 		// Test for invalid characters
-		if ( !preg_match('/^[a-z0-9-]+$/i', $sub ) ) {
+		if ( ! preg_match( '/^[a-z0-9-]+$/i', $sub ) ) {
 			/** This filter is documented in wp-includes/formatting.php */
 			return apply_filters( 'is_email', false, $email, 'sub_invalid_chars' );
 		}
@@ -2981,10 +3225,10 @@ function is_email( $email, $deprecated = false ) {
  */
 function wp_iso_descrambler( $string ) {
 	/* this may only work with iso-8859-1, I'm afraid */
-	if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
+	if ( ! preg_match( '#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches ) ) {
 		return $string;
 	} else {
-		$subject = str_replace('_', ' ', $matches[2]);
+		$subject = str_replace( '_', ' ', $matches[2] );
 		return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
 	}
 }
@@ -3034,7 +3278,7 @@ function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
 			return gmdate( $format, $datetime );
 		}
 		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_gmt = gmdate( $format, $string_time - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		$string_gmt  = gmdate( $format, $string_time - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 	}
 	return $string_gmt;
 }
@@ -3057,14 +3301,16 @@ function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
 	$tz = get_option( 'timezone_string' );
 	if ( $tz ) {
 		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
+		if ( ! $datetime ) {
 			return date( $format, 0 );
+		}
 		$datetime->setTimezone( new DateTimeZone( $tz ) );
 		$string_localtime = $datetime->format( $format );
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
+		if ( ! preg_match( '#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches ) ) {
 			return date( $format, 0 );
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
+		}
+		$string_time      = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
 		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 	}
 	return $string_localtime;
@@ -3080,13 +3326,13 @@ function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
  */
 function iso8601_timezone_to_offset( $timezone ) {
 	// $timezone is either 'Z' or '[+|-]hhmm'
-	if ($timezone == 'Z') {
+	if ( $timezone == 'Z' ) {
 		$offset = 0;
 	} else {
-		$sign    = (substr($timezone, 0, 1) == '+') ? 1 : -1;
-		$hours   = intval(substr($timezone, 1, 2));
-		$minutes = intval(substr($timezone, 3, 4)) / 60;
-		$offset  = $sign * HOUR_IN_SECONDS * ($hours + $minutes);
+		$sign    = ( substr( $timezone, 0, 1 ) == '+' ) ? 1 : -1;
+		$hours   = intval( substr( $timezone, 1, 2 ) );
+		$minutes = intval( substr( $timezone, 3, 4 ) ) / 60;
+		$offset  = $sign * HOUR_IN_SECONDS * ( $hours + $minutes );
 	}
 	return $offset;
 }
@@ -3101,25 +3347,25 @@ function iso8601_timezone_to_offset( $timezone ) {
  * @return string The date and time in MySQL DateTime format - Y-m-d H:i:s.
  */
 function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
-	$timezone = strtolower($timezone);
+	$timezone = strtolower( $timezone );
 
-	if ($timezone == 'gmt') {
+	if ( $timezone == 'gmt' ) {
 
-		preg_match('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits);
+		preg_match( '#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits );
 
-		if (!empty($date_bits[7])) { // we have a timezone, so let's compute an offset
-			$offset = iso8601_timezone_to_offset($date_bits[7]);
+		if ( ! empty( $date_bits[7] ) ) { // we have a timezone, so let's compute an offset
+			$offset = iso8601_timezone_to_offset( $date_bits[7] );
 		} else { // we don't have a timezone, so we assume user local timezone (not server's!)
-			$offset = HOUR_IN_SECONDS * get_option('gmt_offset');
+			$offset = HOUR_IN_SECONDS * get_option( 'gmt_offset' );
 		}
 
-		$timestamp = gmmktime($date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1]);
+		$timestamp  = gmmktime( $date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1] );
 		$timestamp -= $offset;
 
-		return gmdate('Y-m-d H:i:s', $timestamp);
+		return gmdate( 'Y-m-d H:i:s', $timestamp );
 
-	} elseif ($timezone == 'user') {
-		return preg_replace('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', '$1-$2-$3 $4:$5:$6', $date_string);
+	} elseif ( $timezone == 'user' ) {
+		return preg_replace( '#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', '$1-$2-$3 $4:$5:$6', $date_string );
 	}
 }
 
@@ -3246,38 +3492,44 @@ function human_time_diff( $from, $to = '' ) {
 
 	if ( $diff < HOUR_IN_SECONDS ) {
 		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
+		if ( $mins <= 1 ) {
 			$mins = 1;
+		}
 		/* translators: Time difference between two dates, in minutes (min=minute). 1: Number of minutes */
 		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
 	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
 		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
+		if ( $hours <= 1 ) {
 			$hours = 1;
+		}
 		/* translators: Time difference between two dates, in hours. 1: Number of hours */
 		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
 	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
 		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
+		if ( $days <= 1 ) {
 			$days = 1;
+		}
 		/* translators: Time difference between two dates, in days. 1: Number of days */
 		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
 	} elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
 		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
+		if ( $weeks <= 1 ) {
 			$weeks = 1;
+		}
 		/* translators: Time difference between two dates, in weeks. 1: Number of weeks */
 		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
 	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
 		$months = round( $diff / MONTH_IN_SECONDS );
-		if ( $months <= 1 )
+		if ( $months <= 1 ) {
 			$months = 1;
+		}
 		/* translators: Time difference between two dates, in months. 1: Number of months */
 		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
 	} elseif ( $diff >= YEAR_IN_SECONDS ) {
 		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
+		if ( $years <= 1 ) {
 			$years = 1;
+		}
 		/* translators: Time difference between two dates, in years. 1: Number of years */
 		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
 	}
@@ -3313,13 +3565,13 @@ function human_time_diff( $from, $to = '' ) {
 function wp_trim_excerpt( $text = '' ) {
 	$raw_excerpt = $text;
 	if ( '' == $text ) {
-		$text = get_the_content('');
+		$text = get_the_content( '' );
 
 		$text = strip_shortcodes( $text );
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$text = apply_filters( 'the_content', $text );
-		$text = str_replace(']]>', ']]&gt;', $text);
+		$text = str_replace( ']]>', ']]&gt;', $text );
 
 		/**
 		 * Filters the number of words in an excerpt.
@@ -3337,7 +3589,7 @@ function wp_trim_excerpt( $text = '' ) {
 		 * @param string $more_string The string shown within the more link.
 		 */
 		$excerpt_more = apply_filters( 'excerpt_more', ' ' . '[&hellip;]' );
-		$text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
+		$text         = wp_trim_words( $text, $excerpt_length, $excerpt_more );
 	}
 	/**
 	 * Filters the trimmed excerpt string.
@@ -3370,7 +3622,7 @@ function wp_trim_words( $text, $num_words = 55, $more = null ) {
 	}
 
 	$original_text = $text;
-	$text = wp_strip_all_tags( $text );
+	$text          = wp_strip_all_tags( $text );
 
 	/*
 	 * translators: If your word count is based on single characters (e.g. East Asian characters),
@@ -3381,10 +3633,10 @@ function wp_trim_words( $text, $num_words = 55, $more = null ) {
 		$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
 		preg_match_all( '/./u', $text, $words_array );
 		$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
-		$sep = '';
+		$sep         = '';
 	} else {
 		$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
-		$sep = ' ';
+		$sep         = ' ';
 	}
 
 	if ( count( $words_array ) > $num_words ) {
@@ -3429,269 +3681,270 @@ function ent2ncr( $text ) {
 	 * @param string $text           The text prior to entity conversion.
 	 */
 	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
+	if ( null !== $filtered ) {
 		return $filtered;
+	}
 
 	$to_ncr = array(
-		'&quot;' => '&#34;',
-		'&amp;' => '&#38;',
-		'&lt;' => '&#60;',
-		'&gt;' => '&#62;',
-		'|' => '&#124;',
-		'&nbsp;' => '&#160;',
-		'&iexcl;' => '&#161;',
-		'&cent;' => '&#162;',
-		'&pound;' => '&#163;',
-		'&curren;' => '&#164;',
-		'&yen;' => '&#165;',
-		'&brvbar;' => '&#166;',
-		'&brkbar;' => '&#166;',
-		'&sect;' => '&#167;',
-		'&uml;' => '&#168;',
-		'&die;' => '&#168;',
-		'&copy;' => '&#169;',
-		'&ordf;' => '&#170;',
-		'&laquo;' => '&#171;',
-		'&not;' => '&#172;',
-		'&shy;' => '&#173;',
-		'&reg;' => '&#174;',
-		'&macr;' => '&#175;',
-		'&hibar;' => '&#175;',
-		'&deg;' => '&#176;',
-		'&plusmn;' => '&#177;',
-		'&sup2;' => '&#178;',
-		'&sup3;' => '&#179;',
-		'&acute;' => '&#180;',
-		'&micro;' => '&#181;',
-		'&para;' => '&#182;',
-		'&middot;' => '&#183;',
-		'&cedil;' => '&#184;',
-		'&sup1;' => '&#185;',
-		'&ordm;' => '&#186;',
-		'&raquo;' => '&#187;',
-		'&frac14;' => '&#188;',
-		'&frac12;' => '&#189;',
-		'&frac34;' => '&#190;',
-		'&iquest;' => '&#191;',
-		'&Agrave;' => '&#192;',
-		'&Aacute;' => '&#193;',
-		'&Acirc;' => '&#194;',
-		'&Atilde;' => '&#195;',
-		'&Auml;' => '&#196;',
-		'&Aring;' => '&#197;',
-		'&AElig;' => '&#198;',
-		'&Ccedil;' => '&#199;',
-		'&Egrave;' => '&#200;',
-		'&Eacute;' => '&#201;',
-		'&Ecirc;' => '&#202;',
-		'&Euml;' => '&#203;',
-		'&Igrave;' => '&#204;',
-		'&Iacute;' => '&#205;',
-		'&Icirc;' => '&#206;',
-		'&Iuml;' => '&#207;',
-		'&ETH;' => '&#208;',
-		'&Ntilde;' => '&#209;',
-		'&Ograve;' => '&#210;',
-		'&Oacute;' => '&#211;',
-		'&Ocirc;' => '&#212;',
-		'&Otilde;' => '&#213;',
-		'&Ouml;' => '&#214;',
-		'&times;' => '&#215;',
-		'&Oslash;' => '&#216;',
-		'&Ugrave;' => '&#217;',
-		'&Uacute;' => '&#218;',
-		'&Ucirc;' => '&#219;',
-		'&Uuml;' => '&#220;',
-		'&Yacute;' => '&#221;',
-		'&THORN;' => '&#222;',
-		'&szlig;' => '&#223;',
-		'&agrave;' => '&#224;',
-		'&aacute;' => '&#225;',
-		'&acirc;' => '&#226;',
-		'&atilde;' => '&#227;',
-		'&auml;' => '&#228;',
-		'&aring;' => '&#229;',
-		'&aelig;' => '&#230;',
-		'&ccedil;' => '&#231;',
-		'&egrave;' => '&#232;',
-		'&eacute;' => '&#233;',
-		'&ecirc;' => '&#234;',
-		'&euml;' => '&#235;',
-		'&igrave;' => '&#236;',
-		'&iacute;' => '&#237;',
-		'&icirc;' => '&#238;',
-		'&iuml;' => '&#239;',
-		'&eth;' => '&#240;',
-		'&ntilde;' => '&#241;',
-		'&ograve;' => '&#242;',
-		'&oacute;' => '&#243;',
-		'&ocirc;' => '&#244;',
-		'&otilde;' => '&#245;',
-		'&ouml;' => '&#246;',
-		'&divide;' => '&#247;',
-		'&oslash;' => '&#248;',
-		'&ugrave;' => '&#249;',
-		'&uacute;' => '&#250;',
-		'&ucirc;' => '&#251;',
-		'&uuml;' => '&#252;',
-		'&yacute;' => '&#253;',
-		'&thorn;' => '&#254;',
-		'&yuml;' => '&#255;',
-		'&OElig;' => '&#338;',
-		'&oelig;' => '&#339;',
-		'&Scaron;' => '&#352;',
-		'&scaron;' => '&#353;',
-		'&Yuml;' => '&#376;',
-		'&fnof;' => '&#402;',
-		'&circ;' => '&#710;',
-		'&tilde;' => '&#732;',
-		'&Alpha;' => '&#913;',
-		'&Beta;' => '&#914;',
-		'&Gamma;' => '&#915;',
-		'&Delta;' => '&#916;',
-		'&Epsilon;' => '&#917;',
-		'&Zeta;' => '&#918;',
-		'&Eta;' => '&#919;',
-		'&Theta;' => '&#920;',
-		'&Iota;' => '&#921;',
-		'&Kappa;' => '&#922;',
-		'&Lambda;' => '&#923;',
-		'&Mu;' => '&#924;',
-		'&Nu;' => '&#925;',
-		'&Xi;' => '&#926;',
-		'&Omicron;' => '&#927;',
-		'&Pi;' => '&#928;',
-		'&Rho;' => '&#929;',
-		'&Sigma;' => '&#931;',
-		'&Tau;' => '&#932;',
-		'&Upsilon;' => '&#933;',
-		'&Phi;' => '&#934;',
-		'&Chi;' => '&#935;',
-		'&Psi;' => '&#936;',
-		'&Omega;' => '&#937;',
-		'&alpha;' => '&#945;',
-		'&beta;' => '&#946;',
-		'&gamma;' => '&#947;',
-		'&delta;' => '&#948;',
-		'&epsilon;' => '&#949;',
-		'&zeta;' => '&#950;',
-		'&eta;' => '&#951;',
-		'&theta;' => '&#952;',
-		'&iota;' => '&#953;',
-		'&kappa;' => '&#954;',
-		'&lambda;' => '&#955;',
-		'&mu;' => '&#956;',
-		'&nu;' => '&#957;',
-		'&xi;' => '&#958;',
-		'&omicron;' => '&#959;',
-		'&pi;' => '&#960;',
-		'&rho;' => '&#961;',
-		'&sigmaf;' => '&#962;',
-		'&sigma;' => '&#963;',
-		'&tau;' => '&#964;',
-		'&upsilon;' => '&#965;',
-		'&phi;' => '&#966;',
-		'&chi;' => '&#967;',
-		'&psi;' => '&#968;',
-		'&omega;' => '&#969;',
+		'&quot;'     => '&#34;',
+		'&amp;'      => '&#38;',
+		'&lt;'       => '&#60;',
+		'&gt;'       => '&#62;',
+		'|'          => '&#124;',
+		'&nbsp;'     => '&#160;',
+		'&iexcl;'    => '&#161;',
+		'&cent;'     => '&#162;',
+		'&pound;'    => '&#163;',
+		'&curren;'   => '&#164;',
+		'&yen;'      => '&#165;',
+		'&brvbar;'   => '&#166;',
+		'&brkbar;'   => '&#166;',
+		'&sect;'     => '&#167;',
+		'&uml;'      => '&#168;',
+		'&die;'      => '&#168;',
+		'&copy;'     => '&#169;',
+		'&ordf;'     => '&#170;',
+		'&laquo;'    => '&#171;',
+		'&not;'      => '&#172;',
+		'&shy;'      => '&#173;',
+		'&reg;'      => '&#174;',
+		'&macr;'     => '&#175;',
+		'&hibar;'    => '&#175;',
+		'&deg;'      => '&#176;',
+		'&plusmn;'   => '&#177;',
+		'&sup2;'     => '&#178;',
+		'&sup3;'     => '&#179;',
+		'&acute;'    => '&#180;',
+		'&micro;'    => '&#181;',
+		'&para;'     => '&#182;',
+		'&middot;'   => '&#183;',
+		'&cedil;'    => '&#184;',
+		'&sup1;'     => '&#185;',
+		'&ordm;'     => '&#186;',
+		'&raquo;'    => '&#187;',
+		'&frac14;'   => '&#188;',
+		'&frac12;'   => '&#189;',
+		'&frac34;'   => '&#190;',
+		'&iquest;'   => '&#191;',
+		'&Agrave;'   => '&#192;',
+		'&Aacute;'   => '&#193;',
+		'&Acirc;'    => '&#194;',
+		'&Atilde;'   => '&#195;',
+		'&Auml;'     => '&#196;',
+		'&Aring;'    => '&#197;',
+		'&AElig;'    => '&#198;',
+		'&Ccedil;'   => '&#199;',
+		'&Egrave;'   => '&#200;',
+		'&Eacute;'   => '&#201;',
+		'&Ecirc;'    => '&#202;',
+		'&Euml;'     => '&#203;',
+		'&Igrave;'   => '&#204;',
+		'&Iacute;'   => '&#205;',
+		'&Icirc;'    => '&#206;',
+		'&Iuml;'     => '&#207;',
+		'&ETH;'      => '&#208;',
+		'&Ntilde;'   => '&#209;',
+		'&Ograve;'   => '&#210;',
+		'&Oacute;'   => '&#211;',
+		'&Ocirc;'    => '&#212;',
+		'&Otilde;'   => '&#213;',
+		'&Ouml;'     => '&#214;',
+		'&times;'    => '&#215;',
+		'&Oslash;'   => '&#216;',
+		'&Ugrave;'   => '&#217;',
+		'&Uacute;'   => '&#218;',
+		'&Ucirc;'    => '&#219;',
+		'&Uuml;'     => '&#220;',
+		'&Yacute;'   => '&#221;',
+		'&THORN;'    => '&#222;',
+		'&szlig;'    => '&#223;',
+		'&agrave;'   => '&#224;',
+		'&aacute;'   => '&#225;',
+		'&acirc;'    => '&#226;',
+		'&atilde;'   => '&#227;',
+		'&auml;'     => '&#228;',
+		'&aring;'    => '&#229;',
+		'&aelig;'    => '&#230;',
+		'&ccedil;'   => '&#231;',
+		'&egrave;'   => '&#232;',
+		'&eacute;'   => '&#233;',
+		'&ecirc;'    => '&#234;',
+		'&euml;'     => '&#235;',
+		'&igrave;'   => '&#236;',
+		'&iacute;'   => '&#237;',
+		'&icirc;'    => '&#238;',
+		'&iuml;'     => '&#239;',
+		'&eth;'      => '&#240;',
+		'&ntilde;'   => '&#241;',
+		'&ograve;'   => '&#242;',
+		'&oacute;'   => '&#243;',
+		'&ocirc;'    => '&#244;',
+		'&otilde;'   => '&#245;',
+		'&ouml;'     => '&#246;',
+		'&divide;'   => '&#247;',
+		'&oslash;'   => '&#248;',
+		'&ugrave;'   => '&#249;',
+		'&uacute;'   => '&#250;',
+		'&ucirc;'    => '&#251;',
+		'&uuml;'     => '&#252;',
+		'&yacute;'   => '&#253;',
+		'&thorn;'    => '&#254;',
+		'&yuml;'     => '&#255;',
+		'&OElig;'    => '&#338;',
+		'&oelig;'    => '&#339;',
+		'&Scaron;'   => '&#352;',
+		'&scaron;'   => '&#353;',
+		'&Yuml;'     => '&#376;',
+		'&fnof;'     => '&#402;',
+		'&circ;'     => '&#710;',
+		'&tilde;'    => '&#732;',
+		'&Alpha;'    => '&#913;',
+		'&Beta;'     => '&#914;',
+		'&Gamma;'    => '&#915;',
+		'&Delta;'    => '&#916;',
+		'&Epsilon;'  => '&#917;',
+		'&Zeta;'     => '&#918;',
+		'&Eta;'      => '&#919;',
+		'&Theta;'    => '&#920;',
+		'&Iota;'     => '&#921;',
+		'&Kappa;'    => '&#922;',
+		'&Lambda;'   => '&#923;',
+		'&Mu;'       => '&#924;',
+		'&Nu;'       => '&#925;',
+		'&Xi;'       => '&#926;',
+		'&Omicron;'  => '&#927;',
+		'&Pi;'       => '&#928;',
+		'&Rho;'      => '&#929;',
+		'&Sigma;'    => '&#931;',
+		'&Tau;'      => '&#932;',
+		'&Upsilon;'  => '&#933;',
+		'&Phi;'      => '&#934;',
+		'&Chi;'      => '&#935;',
+		'&Psi;'      => '&#936;',
+		'&Omega;'    => '&#937;',
+		'&alpha;'    => '&#945;',
+		'&beta;'     => '&#946;',
+		'&gamma;'    => '&#947;',
+		'&delta;'    => '&#948;',
+		'&epsilon;'  => '&#949;',
+		'&zeta;'     => '&#950;',
+		'&eta;'      => '&#951;',
+		'&theta;'    => '&#952;',
+		'&iota;'     => '&#953;',
+		'&kappa;'    => '&#954;',
+		'&lambda;'   => '&#955;',
+		'&mu;'       => '&#956;',
+		'&nu;'       => '&#957;',
+		'&xi;'       => '&#958;',
+		'&omicron;'  => '&#959;',
+		'&pi;'       => '&#960;',
+		'&rho;'      => '&#961;',
+		'&sigmaf;'   => '&#962;',
+		'&sigma;'    => '&#963;',
+		'&tau;'      => '&#964;',
+		'&upsilon;'  => '&#965;',
+		'&phi;'      => '&#966;',
+		'&chi;'      => '&#967;',
+		'&psi;'      => '&#968;',
+		'&omega;'    => '&#969;',
 		'&thetasym;' => '&#977;',
-		'&upsih;' => '&#978;',
-		'&piv;' => '&#982;',
-		'&ensp;' => '&#8194;',
-		'&emsp;' => '&#8195;',
-		'&thinsp;' => '&#8201;',
-		'&zwnj;' => '&#8204;',
-		'&zwj;' => '&#8205;',
-		'&lrm;' => '&#8206;',
-		'&rlm;' => '&#8207;',
-		'&ndash;' => '&#8211;',
-		'&mdash;' => '&#8212;',
-		'&lsquo;' => '&#8216;',
-		'&rsquo;' => '&#8217;',
-		'&sbquo;' => '&#8218;',
-		'&ldquo;' => '&#8220;',
-		'&rdquo;' => '&#8221;',
-		'&bdquo;' => '&#8222;',
-		'&dagger;' => '&#8224;',
-		'&Dagger;' => '&#8225;',
-		'&bull;' => '&#8226;',
-		'&hellip;' => '&#8230;',
-		'&permil;' => '&#8240;',
-		'&prime;' => '&#8242;',
-		'&Prime;' => '&#8243;',
-		'&lsaquo;' => '&#8249;',
-		'&rsaquo;' => '&#8250;',
-		'&oline;' => '&#8254;',
-		'&frasl;' => '&#8260;',
-		'&euro;' => '&#8364;',
-		'&image;' => '&#8465;',
-		'&weierp;' => '&#8472;',
-		'&real;' => '&#8476;',
-		'&trade;' => '&#8482;',
-		'&alefsym;' => '&#8501;',
-		'&crarr;' => '&#8629;',
-		'&lArr;' => '&#8656;',
-		'&uArr;' => '&#8657;',
-		'&rArr;' => '&#8658;',
-		'&dArr;' => '&#8659;',
-		'&hArr;' => '&#8660;',
-		'&forall;' => '&#8704;',
-		'&part;' => '&#8706;',
-		'&exist;' => '&#8707;',
-		'&empty;' => '&#8709;',
-		'&nabla;' => '&#8711;',
-		'&isin;' => '&#8712;',
-		'&notin;' => '&#8713;',
-		'&ni;' => '&#8715;',
-		'&prod;' => '&#8719;',
-		'&sum;' => '&#8721;',
-		'&minus;' => '&#8722;',
-		'&lowast;' => '&#8727;',
-		'&radic;' => '&#8730;',
-		'&prop;' => '&#8733;',
-		'&infin;' => '&#8734;',
-		'&ang;' => '&#8736;',
-		'&and;' => '&#8743;',
-		'&or;' => '&#8744;',
-		'&cap;' => '&#8745;',
-		'&cup;' => '&#8746;',
-		'&int;' => '&#8747;',
-		'&there4;' => '&#8756;',
-		'&sim;' => '&#8764;',
-		'&cong;' => '&#8773;',
-		'&asymp;' => '&#8776;',
-		'&ne;' => '&#8800;',
-		'&equiv;' => '&#8801;',
-		'&le;' => '&#8804;',
-		'&ge;' => '&#8805;',
-		'&sub;' => '&#8834;',
-		'&sup;' => '&#8835;',
-		'&nsub;' => '&#8836;',
-		'&sube;' => '&#8838;',
-		'&supe;' => '&#8839;',
-		'&oplus;' => '&#8853;',
-		'&otimes;' => '&#8855;',
-		'&perp;' => '&#8869;',
-		'&sdot;' => '&#8901;',
-		'&lceil;' => '&#8968;',
-		'&rceil;' => '&#8969;',
-		'&lfloor;' => '&#8970;',
-		'&rfloor;' => '&#8971;',
-		'&lang;' => '&#9001;',
-		'&rang;' => '&#9002;',
-		'&larr;' => '&#8592;',
-		'&uarr;' => '&#8593;',
-		'&rarr;' => '&#8594;',
-		'&darr;' => '&#8595;',
-		'&harr;' => '&#8596;',
-		'&loz;' => '&#9674;',
-		'&spades;' => '&#9824;',
-		'&clubs;' => '&#9827;',
-		'&hearts;' => '&#9829;',
-		'&diams;' => '&#9830;'
+		'&upsih;'    => '&#978;',
+		'&piv;'      => '&#982;',
+		'&ensp;'     => '&#8194;',
+		'&emsp;'     => '&#8195;',
+		'&thinsp;'   => '&#8201;',
+		'&zwnj;'     => '&#8204;',
+		'&zwj;'      => '&#8205;',
+		'&lrm;'      => '&#8206;',
+		'&rlm;'      => '&#8207;',
+		'&ndash;'    => '&#8211;',
+		'&mdash;'    => '&#8212;',
+		'&lsquo;'    => '&#8216;',
+		'&rsquo;'    => '&#8217;',
+		'&sbquo;'    => '&#8218;',
+		'&ldquo;'    => '&#8220;',
+		'&rdquo;'    => '&#8221;',
+		'&bdquo;'    => '&#8222;',
+		'&dagger;'   => '&#8224;',
+		'&Dagger;'   => '&#8225;',
+		'&bull;'     => '&#8226;',
+		'&hellip;'   => '&#8230;',
+		'&permil;'   => '&#8240;',
+		'&prime;'    => '&#8242;',
+		'&Prime;'    => '&#8243;',
+		'&lsaquo;'   => '&#8249;',
+		'&rsaquo;'   => '&#8250;',
+		'&oline;'    => '&#8254;',
+		'&frasl;'    => '&#8260;',
+		'&euro;'     => '&#8364;',
+		'&image;'    => '&#8465;',
+		'&weierp;'   => '&#8472;',
+		'&real;'     => '&#8476;',
+		'&trade;'    => '&#8482;',
+		'&alefsym;'  => '&#8501;',
+		'&crarr;'    => '&#8629;',
+		'&lArr;'     => '&#8656;',
+		'&uArr;'     => '&#8657;',
+		'&rArr;'     => '&#8658;',
+		'&dArr;'     => '&#8659;',
+		'&hArr;'     => '&#8660;',
+		'&forall;'   => '&#8704;',
+		'&part;'     => '&#8706;',
+		'&exist;'    => '&#8707;',
+		'&empty;'    => '&#8709;',
+		'&nabla;'    => '&#8711;',
+		'&isin;'     => '&#8712;',
+		'&notin;'    => '&#8713;',
+		'&ni;'       => '&#8715;',
+		'&prod;'     => '&#8719;',
+		'&sum;'      => '&#8721;',
+		'&minus;'    => '&#8722;',
+		'&lowast;'   => '&#8727;',
+		'&radic;'    => '&#8730;',
+		'&prop;'     => '&#8733;',
+		'&infin;'    => '&#8734;',
+		'&ang;'      => '&#8736;',
+		'&and;'      => '&#8743;',
+		'&or;'       => '&#8744;',
+		'&cap;'      => '&#8745;',
+		'&cup;'      => '&#8746;',
+		'&int;'      => '&#8747;',
+		'&there4;'   => '&#8756;',
+		'&sim;'      => '&#8764;',
+		'&cong;'     => '&#8773;',
+		'&asymp;'    => '&#8776;',
+		'&ne;'       => '&#8800;',
+		'&equiv;'    => '&#8801;',
+		'&le;'       => '&#8804;',
+		'&ge;'       => '&#8805;',
+		'&sub;'      => '&#8834;',
+		'&sup;'      => '&#8835;',
+		'&nsub;'     => '&#8836;',
+		'&sube;'     => '&#8838;',
+		'&supe;'     => '&#8839;',
+		'&oplus;'    => '&#8853;',
+		'&otimes;'   => '&#8855;',
+		'&perp;'     => '&#8869;',
+		'&sdot;'     => '&#8901;',
+		'&lceil;'    => '&#8968;',
+		'&rceil;'    => '&#8969;',
+		'&lfloor;'   => '&#8970;',
+		'&rfloor;'   => '&#8971;',
+		'&lang;'     => '&#9001;',
+		'&rang;'     => '&#9002;',
+		'&larr;'     => '&#8592;',
+		'&uarr;'     => '&#8593;',
+		'&rarr;'     => '&#8594;',
+		'&darr;'     => '&#8595;',
+		'&harr;'     => '&#8596;',
+		'&loz;'      => '&#9674;',
+		'&spades;'   => '&#9824;',
+		'&clubs;'    => '&#9827;',
+		'&hearts;'   => '&#9829;',
+		'&diams;'    => '&#9830;',
 	);
 
-	return str_replace( array_keys($to_ncr), array_values($to_ncr), $text );
+	return str_replace( array_keys( $to_ncr ), array_values( $to_ncr ), $text );
 }
 
 /**
@@ -3790,36 +4043,38 @@ function esc_sql( $data ) {
  *
  * @param string $url       The URL to be cleaned.
  * @param array  $protocols Optional. An array of acceptable protocols.
- *		                    Defaults to return value of wp_allowed_protocols()
+ *                          Defaults to return value of wp_allowed_protocols()
  * @param string $_context  Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the {@see 'clean_url'} filter is applied.
  */
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
 	$original_url = $url;
 
-	if ( '' == $url )
+	if ( '' == $url ) {
 		return $url;
+	}
 
 	$url = str_replace( ' ', '%20', $url );
-	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
+	$url = preg_replace( '|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url );
 
 	if ( '' === $url ) {
 		return $url;
 	}
 
 	if ( 0 !== stripos( $url, 'mailto:' ) ) {
-		$strip = array('%0d', '%0a', '%0D', '%0A');
-		$url = _deep_replace($strip, $url);
+		$strip = array( '%0d', '%0a', '%0D', '%0A' );
+		$url   = _deep_replace( $strip, $url );
 	}
 
-	$url = str_replace(';//', '://', $url);
+	$url = str_replace( ';//', '://', $url );
 	/* If the URL doesn't appear to contain a scheme, we
 	 * presume it needs http:// prepended (unless a relative
 	 * link starting with /, # or ? or a php file).
 	 */
-	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
+	if ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
+		! preg_match( '/^[a-z0-9-]+?\.php/i', $url ) ) {
 		$url = 'http://' . $url;
+	}
 
 	// Replace ampersands and single quotes only when displaying.
 	if ( 'display' == $_context ) {
@@ -3868,11 +4123,13 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) {
 	if ( '/' === $url[0] ) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
+		if ( ! is_array( $protocols ) ) {
 			$protocols = wp_allowed_protocols();
+		}
 		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
+		if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) {
 			return '';
+		}
 	}
 
 	/**
@@ -3911,9 +4168,9 @@ function esc_url_raw( $url, $protocols = null ) {
  * @return string Converted text.
  */
 function htmlentities2( $myHTML ) {
-	$translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
-	$translation_table[chr(38)] = '&';
-	return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table) );
+	$translation_table              = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
+	$translation_table[ chr( 38 ) ] = '&';
+	return preg_replace( '/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/', '&amp;', strtr( $myHTML, $translation_table ) );
 }
 
 /**
@@ -3943,7 +4200,7 @@ function esc_js( $text ) {
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'js_escape', $safe_text, $text );
 }
@@ -3968,7 +4225,7 @@ function esc_html( $text ) {
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_html', $safe_text, $text );
 }
@@ -3993,7 +4250,7 @@ function esc_attr( $text ) {
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'attribute_escape', $safe_text, $text );
 }
@@ -4014,7 +4271,7 @@ function esc_textarea( $text ) {
 	 * @since 3.1.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_textarea', $safe_text, $text );
 }
@@ -4028,14 +4285,14 @@ function esc_textarea( $text ) {
  * @return string
  */
 function tag_escape( $tag_name ) {
-	$safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) );
+	$safe_tag = strtolower( preg_replace( '/[^a-zA-Z0-9_:]/', '', $tag_name ) );
 	/**
 	 * Filters a string cleaned and escaped for output as an HTML tag.
 	 *
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_tag The tag name after it has been escaped.
- 	 * @param string $tag_name The text before it was escaped.
+	 * @param string $tag_name The text before it was escaped.
 	 */
 	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
 }
@@ -4074,11 +4331,11 @@ function sanitize_option( $option, $value ) {
 	global $wpdb;
 
 	$original_value = $value;
-	$error = '';
+	$error          = '';
 
 	switch ( $option ) {
-		case 'admin_email' :
-		case 'new_admin_email' :
+		case 'admin_email':
+		case 'new_admin_email':
 			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
@@ -4118,17 +4375,20 @@ function sanitize_option( $option, $value ) {
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
+			if ( empty( $value ) ) {
 				$value = 1;
-			if ( $value < -1 )
-				$value = abs($value);
+			}
+			if ( $value < -1 ) {
+				$value = abs( $value );
+			}
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
+			if ( $value == '0' || $value == '' ) {
 				$value = 'closed';
+			}
 			break;
 
 		case 'blogdescription':
@@ -4146,15 +4406,16 @@ function sanitize_option( $option, $value ) {
 			break;
 
 		case 'blog_charset':
-			$value = preg_replace('/[^a-zA-Z0-9_-]/', '', $value); // strips slashes
+			$value = preg_replace( '/[^a-zA-Z0-9_-]/', '', $value ); // strips slashes
 			break;
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
+			if ( null === $value ) {
 				$value = 1;
-			else
+			} else {
 				$value = intval( $value );
+			}
 			break;
 
 		case 'date_format':
@@ -4180,7 +4441,7 @@ function sanitize_option( $option, $value ) {
 			break;
 
 		case 'gmt_offset':
-			$value = preg_replace('/[^0-9:.-]/', '', $value); // strips slashes
+			$value = preg_replace( '/[^0-9:.-]/', '', $value ); // strips slashes
 			break;
 
 		case 'siteurl':
@@ -4224,13 +4485,15 @@ function sanitize_option( $option, $value ) {
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
+				if ( ! is_array( $value ) ) {
 					$value = explode( ' ', $value );
+				}
 
 				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
 
-				if ( ! $value )
+				if ( ! $value ) {
 					$value = '';
+				}
 			}
 			break;
 
@@ -4240,19 +4503,21 @@ function sanitize_option( $option, $value ) {
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
+				if ( ! is_array( $value ) ) {
 					$value = explode( "\n", $value );
+				}
 
 				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
-				$value = array();
+				$value   = array();
 
 				foreach ( $domains as $domain ) {
 					if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) {
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
+				if ( ! $value ) {
 					$value = '';
+				}
 			}
 			break;
 
@@ -4283,9 +4548,10 @@ function sanitize_option( $option, $value ) {
 			}
 			break;
 
-		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
+		case 'default_role':
+			if ( ! get_role( $value ) && get_role( 'subscriber' ) ) {
 				$value = 'subscriber';
+			}
 			break;
 
 		case 'moderation_keys':
@@ -4363,8 +4629,9 @@ function map_deep( $value, $callback ) {
  */
 function wp_parse_str( $string, &$array ) {
 	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
+	if ( get_magic_quotes_gpc() ) {
 		$array = stripslashes_deep( $array );
+	}
 	/**
 	 * Filters the array of variables derived from a parsed string.
 	 *
@@ -4386,7 +4653,7 @@ function wp_parse_str( $string, &$array ) {
  * @return string Converted text.
  */
 function wp_pre_kses_less_than( $text ) {
-	return preg_replace_callback('%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text);
+	return preg_replace_callback( '%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text );
 }
 
 /**
@@ -4398,8 +4665,9 @@ function wp_pre_kses_less_than( $text ) {
  * @return string The text returned after esc_html if needed.
  */
 function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
-		return esc_html($matches[0]);
+	if ( false === strpos( $matches[0], '>' ) ) {
+		return esc_html( $matches[0] );
+	}
 	return $matches[0];
 }
 
@@ -4414,40 +4682,41 @@ function wp_pre_kses_less_than_callback( $matches ) {
  * @return string The formatted string.
  */
 function wp_sprintf( $pattern ) {
-	$args = func_get_args();
-	$len = strlen($pattern);
-	$start = 0;
-	$result = '';
+	$args      = func_get_args();
+	$len       = strlen( $pattern );
+	$start     = 0;
+	$result    = '';
 	$arg_index = 0;
 	while ( $len > $start ) {
 		// Last character: append and break
-		if ( strlen($pattern) - 1 == $start ) {
-			$result .= substr($pattern, -1);
+		if ( strlen( $pattern ) - 1 == $start ) {
+			$result .= substr( $pattern, -1 );
 			break;
 		}
 
 		// Literal %: append and continue
-		if ( substr($pattern, $start, 2) == '%%' ) {
-			$start += 2;
+		if ( substr( $pattern, $start, 2 ) == '%%' ) {
+			$start  += 2;
 			$result .= '%';
 			continue;
 		}
 
 		// Get fragment before next %
-		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
+		$end = strpos( $pattern, '%', $start + 1 );
+		if ( false === $end ) {
 			$end = $len;
-		$fragment = substr($pattern, $start, $end - $start);
+		}
+		$fragment = substr( $pattern, $start, $end - $start );
 
 		// Fragment has a specifier
-		if ( $pattern[$start] == '%' ) {
+		if ( $pattern[ $start ] == '%' ) {
 			// Find numbered arguments or take the next one in order
-			if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) {
-				$arg = isset($args[$matches[1]]) ? $args[$matches[1]] : '';
-				$fragment = str_replace("%{$matches[1]}$", '%', $fragment);
+			if ( preg_match( '/^%(\d+)\$/', $fragment, $matches ) ) {
+				$arg      = isset( $args[ $matches[1] ] ) ? $args[ $matches[1] ] : '';
+				$fragment = str_replace( "%{$matches[1]}$", '%', $fragment );
 			} else {
 				++$arg_index;
-				$arg = isset($args[$arg_index]) ? $args[$arg_index] : '';
+				$arg = isset( $args[ $arg_index ] ) ? $args[ $arg_index ] : '';
 			}
 
 			/**
@@ -4461,15 +4730,16 @@ function wp_sprintf( $pattern ) {
 			 * @param string $arg      The argument.
 			 */
 			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
+			if ( $_fragment != $fragment ) {
 				$fragment = $_fragment;
-			else
-				$fragment = sprintf($fragment, strval($arg) );
+			} else {
+				$fragment = sprintf( $fragment, strval( $arg ) );
+			}
 		}
 
 		// Append to result and move to next fragment
 		$result .= $fragment;
-		$start = $end;
+		$start   = $end;
 	}
 	return $result;
 }
@@ -4489,12 +4759,14 @@ function wp_sprintf( $pattern ) {
  */
 function wp_sprintf_l( $pattern, $args ) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
+	if ( substr( $pattern, 0, 2 ) != '%l' ) {
 		return $pattern;
+	}
 
 	// Nothing to work with
-	if ( empty($args) )
+	if ( empty( $args ) ) {
 		return '';
+	}
 
 	/**
 	 * Filters the translated delimiters used by wp_sprintf_l().
@@ -4507,30 +4779,34 @@ function wp_sprintf_l( $pattern, $args ) {
 	 *
 	 * @param array $delimiters An array of translated delimiters.
 	 */
-	$l = apply_filters( 'wp_sprintf_l', array(
-		/* translators: used to join items in a list with more than 2 items */
-		'between'          => sprintf( __('%s, %s'), '', '' ),
-		/* translators: used to join last two items in a list with more than 2 times */
-		'between_last_two' => sprintf( __('%s, and %s'), '', '' ),
-		/* translators: used to join items in a list with only 2 items */
-		'between_only_two' => sprintf( __('%s and %s'), '', '' ),
-	) );
+	$l = apply_filters(
+		'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 */
+			'between_last_two' => sprintf( __( '%1$s, and %2$s' ), '', '' ),
+			/* translators: used to join items in a list with only 2 items */
+			'between_only_two' => sprintf( __( '%1$s and %2$s' ), '', '' ),
+		)
+	);
 
-	$args = (array) $args;
-	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
-	// Loop when more than two args
-	$i = count($args);
-	while ( $i ) {
-		$arg = array_shift($args);
-		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
-		else
-			$result .= $l['between'] . $arg;
+	$args   = (array) $args;
+	$result = array_shift( $args );
+	if ( count( $args ) == 1 ) {
+		$result .= $l['between_only_two'] . array_shift( $args );
 	}
-	return $result . substr($pattern, 2);
+	// Loop when more than two args
+	$i = count( $args );
+	while ( $i ) {
+		$arg = array_shift( $args );
+		$i--;
+		if ( 0 == $i ) {
+			$result .= $l['between_last_two'] . $arg;
+		} else {
+			$result .= $l['between'] . $arg;
+		}
+	}
+	return $result . substr( $pattern, 2 );
 }
 
 /**
@@ -4548,14 +4824,16 @@ function wp_sprintf_l( $pattern, $args ) {
  * @return string The excerpt.
  */
 function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
+	if ( null === $more ) {
 		$more = '';
-	$str = wp_strip_all_tags( $str, true );
+	}
+	$str     = wp_strip_all_tags( $str, true );
 	$excerpt = mb_substr( $str, 0, $count );
 	// remove part of an entity at the end
 	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
+	if ( $str != $excerpt ) {
 		$excerpt = trim( $excerpt ) . $more;
+	}
 	return $excerpt;
 }
 
@@ -4574,10 +4852,10 @@ function wp_html_excerpt( $str, $count, $more = null ) {
  * @param array  $attrs   The attributes which should be processed.
  * @return string The processed content.
  */
-function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
+function links_add_base_url( $content, $base, $attrs = array( 'src', 'href' ) ) {
 	global $_links_add_base;
 	$_links_add_base = $base;
-	$attrs = implode('|', (array)$attrs);
+	$attrs           = implode( '|', (array) $attrs );
 	return preg_replace_callback( "!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content );
 }
 
@@ -4620,10 +4898,10 @@ function _links_add_base( $m ) {
  * @param array  $tags    An array of tags to apply to.
  * @return string The processed content.
  */
-function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
+function links_add_target( $content, $target = '_blank', $tags = array( 'a' ) ) {
 	global $_links_add_target;
 	$_links_add_target = $target;
-	$tags = implode('|', (array)$tags);
+	$tags              = implode( '|', (array) $tags );
 	return preg_replace_callback( "!<($tags)([^>]*)>!i", '_links_add_target', $content );
 }
 
@@ -4640,8 +4918,8 @@ function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
  */
 function _links_add_target( $m ) {
 	global $_links_add_target;
-	$tag = $m[1];
-	$link = preg_replace('|( target=([\'"])(.*?)\2)|i', '', $m[2]);
+	$tag  = $m[1];
+	$link = preg_replace( '|( target=([\'"])(.*?)\2)|i', '', $m[2] );
 	return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
 }
 
@@ -4654,9 +4932,9 @@ function _links_add_target( $m ) {
  * @return string The normalized string.
  */
 function normalize_whitespace( $str ) {
-	$str  = trim( $str );
-	$str  = str_replace( "\r", "\n", $str );
-	$str  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $str );
+	$str = trim( $str );
+	$str = str_replace( "\r", "\n", $str );
+	$str = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $str );
 	return $str;
 }
 
@@ -4673,12 +4951,13 @@ function normalize_whitespace( $str ) {
  * @param bool   $remove_breaks Optional. Whether to remove left over line breaks and white space chars
  * @return string The processed string.
  */
-function wp_strip_all_tags($string, $remove_breaks = false) {
+function wp_strip_all_tags( $string, $remove_breaks = false ) {
 	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
-	$string = strip_tags($string);
+	$string = strip_tags( $string );
 
-	if ( $remove_breaks )
-		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	if ( $remove_breaks ) {
+		$string = preg_replace( '/[\r\n\t ]+/', ' ', $string );
+	}
 
 	return trim( $string );
 }
@@ -4756,14 +5035,14 @@ function sanitize_textarea_field( $str ) {
 function _sanitize_text_fields( $str, $keep_newlines = false ) {
 	$filtered = wp_check_invalid_utf8( $str );
 
-	if ( strpos($filtered, '<') !== false ) {
+	if ( strpos( $filtered, '<' ) !== false ) {
 		$filtered = wp_pre_kses_less_than( $filtered );
 		// This will strip extra whitespace for us.
 		$filtered = wp_strip_all_tags( $filtered, false );
 
 		// Use html entities in a special case to make sure no later
 		// newline stripping stage could lead to a functional tag
-		$filtered = str_replace("<\n", "&lt;\n", $filtered);
+		$filtered = str_replace( "<\n", "&lt;\n", $filtered );
 	}
 
 	if ( ! $keep_newlines ) {
@@ -4772,14 +5051,14 @@ function _sanitize_text_fields( $str, $keep_newlines = false ) {
 	$filtered = trim( $filtered );
 
 	$found = false;
-	while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
-		$filtered = str_replace($match[0], '', $filtered);
-		$found = true;
+	while ( preg_match( '/%[a-f0-9]{2}/i', $filtered, $match ) ) {
+		$filtered = str_replace( $match[0], '', $filtered );
+		$found    = true;
 	}
 
 	if ( $found ) {
 		// Strip out the whitespace that may now exist after removing the octets.
-		$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+		$filtered = trim( preg_replace( '/ +/', ' ', $filtered ) );
 	}
 
 	return $filtered;
@@ -4799,7 +5078,7 @@ function wp_basename( $path, $suffix = '' ) {
 }
 
 /**
- * Forever eliminate "Wordpress" from the planet (or at least the little bit we can influence).
+ * Forever eliminate "WordPress" from the planet (or at least the little bit we can influence).
  *
  * Violating our coding standards for a good function name.
  *
@@ -4813,8 +5092,9 @@ function wp_basename( $path, $suffix = '' ) {
 function capital_P_dangit( $text ) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter ) {
+		return str_replace( 'WordPress', 'WordPress', $text );
+	}
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
 	if ( false === $dblq ) {
@@ -4823,7 +5103,8 @@ function capital_P_dangit( $text ) {
 	return str_replace(
 		array( ' Wordpress', '&#8216;Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
 		array( ' WordPress', '&#8216;WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
-	$text );
+		$text
+	);
 }
 
 /**
@@ -4858,8 +5139,9 @@ function sanitize_mime_type( $mime_type ) {
 function sanitize_trackback_urls( $to_ping ) {
 	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
 	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+		if ( ! preg_match( '#^https?://.#i', $url ) ) {
+			unset( $urls_to_ping[ $k ] );
+		}
 	}
 	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
 	$urls_to_ping = implode( "\n", $urls_to_ping );
@@ -4892,9 +5174,9 @@ function wp_slash( $value ) {
 	if ( is_array( $value ) ) {
 		foreach ( $value as $k => $v ) {
 			if ( is_array( $v ) ) {
-				$value[$k] = wp_slash( $v );
+				$value[ $k ] = wp_slash( $v );
 			} else {
-				$value[$k] = addslashes( $v );
+				$value[ $k ] = addslashes( $v );
 			}
 		}
 	} else {
@@ -5050,7 +5332,7 @@ function _print_emoji_detection_script() {
 		 *
 		 * @param string The emoji extension for png files. Default .png.
 		 */
-		'ext' => apply_filters( 'emoji_ext', '.png' ),
+		'ext'     => apply_filters( 'emoji_ext', '.png' ),
 
 		/**
 		 * Filters the URL where emoji SVG images are hosted.
@@ -5059,7 +5341,7 @@ function _print_emoji_detection_script() {
 		 *
 		 * @param string The emoji base URL for svg images.
 		 */
-		'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.3/svg/' ),
+		'svgUrl'  => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.3/svg/' ),
 
 		/**
 		 * Filters the extension of the emoji SVG files.
@@ -5068,7 +5350,7 @@ function _print_emoji_detection_script() {
 		 *
 		 * @param string The emoji extension for svg files. Default .svg.
 		 */
-		'svgExt' => apply_filters( 'emoji_svg_ext', '.svg' ),
+		'svgExt'  => apply_filters( 'emoji_svg_ext', '.svg' ),
 	);
 
 	$version = 'ver=' . get_bloginfo( 'version' );
@@ -5084,7 +5366,7 @@ function _print_emoji_detection_script() {
 		?>
 		<script type="text/javascript">
 			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
-			<?php readfile( ABSPATH . WPINC . "/js/wp-emoji-loader.js" ); ?>
+			<?php readfile( ABSPATH . WPINC . '/js/wp-emoji-loader.js' ); ?>
 		</script>
 		<?php
 	} else {
@@ -5166,7 +5448,7 @@ function wp_staticize_emoji( $text ) {
 
 	// Quickly narrow down the list of emoji that might be in the text and need replacing.
 	$possible_emoji = array();
-	foreach( $emoji as $emojum ) {
+	foreach ( $emoji as $emojum ) {
 		if ( false !== strpos( $text, $emojum ) ) {
 			if ( version_compare( phpversion(), '5.4', '<' ) ) {
 				$possible_emoji[ $emojum ] = html_entity_decode( $emojum, ENT_COMPAT, 'UTF-8' );
@@ -5194,29 +5476,29 @@ function wp_staticize_emoji( $text ) {
 	 * First, capture the tags as well as in between.
 	 */
 	$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-	$stop = count( $textarr );
+	$stop    = count( $textarr );
 
 	// Ignore processing of specific tags.
-	$tags_to_ignore = 'code|pre|style|script|textarea';
+	$tags_to_ignore       = 'code|pre|style|script|textarea';
 	$ignore_block_element = '';
 
 	for ( $i = 0; $i < $stop; $i++ ) {
-		$content = $textarr[$i];
+		$content = $textarr[ $i ];
 
 		// If we're in an ignore block, wait until we find its closing tag.
-		if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+		if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
 			$ignore_block_element = $matches[1];
 		}
 
 		// If it's not a tag and not in ignore block.
-		if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] && false !== strpos( $content, '&#x' ) ) {
+		if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] && false !== strpos( $content, '&#x' ) ) {
 			foreach ( $possible_emoji as $emojum => $emoji_char ) {
 				if ( false === strpos( $content, $emojum ) ) {
 					continue;
 				}
 
 				$file = str_replace( ';&#x', '-', $emojum );
-				$file = str_replace( array( '&#x', ';'), '', $file );
+				$file = str_replace( array( '&#x', ';' ), '', $file );
 
 				$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $file . $ext, $emoji_char );
 
@@ -5225,7 +5507,7 @@ function wp_staticize_emoji( $text ) {
 		}
 
 		// Did we exit ignore block.
-		if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+		if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
 			$ignore_block_element = '';
 		}
 
@@ -5268,7 +5550,7 @@ function wp_staticize_emoji_for_email( $mail ) {
 	}
 
 	foreach ( $headers as $header ) {
-		if ( strpos($header, ':') === false ) {
+		if ( strpos( $header, ':' ) === false ) {
 			continue;
 		}
 
@@ -5276,13 +5558,13 @@ function wp_staticize_emoji_for_email( $mail ) {
 		list( $name, $content ) = explode( ':', trim( $header ), 2 );
 
 		// Cleanup crew.
-		$name    = trim( $name    );
+		$name    = trim( $name );
 		$content = trim( $content );
 
 		if ( 'content-type' === strtolower( $name ) ) {
 			if ( strpos( $content, ';' ) !== false ) {
 				list( $type, $charset ) = explode( ';', $content );
-				$content_type = trim( $type );
+				$content_type           = trim( $type );
 			} else {
 				$content_type = trim( $content );
 			}
@@ -5321,8 +5603,8 @@ function _wp_emoji_list( $type = 'entities' ) {
 	// Do not remove the START/END comments - they're used to find where to insert the arrays.
 
 	// START: emoji arrays
-	$entities = array('&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f48b;&#x200d;&#x1f469;','&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f48b;&#x200d;&#x1f468;','&#x1f468;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f48b;&#x200d;&#x1f468;','&#x1f3f4;&#xe0067;&#xe0062;&#xe0073;&#xe0063;&#xe0074;&#xe007f;','&#x1f3f4;&#xe0067;&#xe0062;&#xe0077;&#xe006c;&#xe0073;&#xe007f;','&#x1f3f4;&#xe0067;&#xe0062;&#xe0065;&#xe006e;&#xe0067;&#xe007f;','&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f466;','&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f466;&#x200d;&#x1f466;','&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f466;&#x200d;&#x1f466;','&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f466;','&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f466;&#x200d;&#x1f466;','&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f466;','&#x1f468;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f468;','&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f468;','&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f469;','&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f466;','&#x1f469;&#x200d;&#x1f466;&#x200d;&#x1f466;','&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f466;','&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f466;','&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f466;','&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f466;','&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f466;&#x200d;&#x1f466;','&#x1f937;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f3cb;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f3cb;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3cb;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f3cb;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f3cb;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f3cb;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f3cb;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f3cb;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f3cb;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f3cc;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f3cc;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f3cc;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3cc;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f3cc;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f3cc;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f3cc;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f3cc;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f3cc;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f3cc;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f482;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f3c3;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3c3;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9dd;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9dd;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9dd;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f9dd;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9dd;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f9dd;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9dd;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9dd;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9dd;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9dd;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f9dc;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9dc;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9dc;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f9dc;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f468;&#x1f3fb;&#x200d;&#x2695;&#xfe0f;','&#x1f468;&#x1f3fb;&#x200d;&#x2696;&#xfe0f;','&#x1f468;&#x1f3fb;&#x200d;&#x2708;&#xfe0f;','&#x1f9dc;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f9dc;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9dc;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9dc;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9dc;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9dc;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f9db;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9db;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9db;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f9db;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9db;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f9db;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9db;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f468;&#x1f3fc;&#x200d;&#x2695;&#xfe0f;','&#x1f468;&#x1f3fc;&#x200d;&#x2696;&#xfe0f;','&#x1f468;&#x1f3fc;&#x200d;&#x2708;&#xfe0f;','&#x1f9db;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9db;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9db;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f9da;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9da;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9da;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f9da;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9da;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f9da;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9da;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9da;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9da;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9da;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f468;&#x1f3fd;&#x200d;&#x2695;&#xfe0f;','&#x1f468;&#x1f3fd;&#x200d;&#x2696;&#xfe0f;','&#x1f468;&#x1f3fd;&#x200d;&#x2708;&#xfe0f;','&#x1f9d9;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9d9;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9d9;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f9d9;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9d9;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f9d9;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9d9;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9d9;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9d9;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9d9;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f9d8;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9d8;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9d8;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f468;&#x1f3fe;&#x200d;&#x2695;&#xfe0f;','&#x1f468;&#x1f3fe;&#x200d;&#x2696;&#xfe0f;','&#x1f468;&#x1f3fe;&#x200d;&#x2708;&#xfe0f;','&#x1f9d8;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9d8;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f9d8;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9d8;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9d8;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9d8;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9d8;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f9d7;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9d7;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9d7;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f9d7;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9d7;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f9d7;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f468;&#x1f3ff;&#x200d;&#x2695;&#xfe0f;','&#x1f468;&#x1f3ff;&#x200d;&#x2696;&#xfe0f;','&#x1f468;&#x1f3ff;&#x200d;&#x2708;&#xfe0f;','&#x1f9d7;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9d7;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9d7;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9d7;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f9d6;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f3c3;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f3c3;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f3c3;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f3c3;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f3c3;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f3c3;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f3c4;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f3c4;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f3c4;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3c4;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f3c4;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f3c4;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f3c4;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f9d6;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f9d6;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f93e;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f93e;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f93e;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f93e;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f3c4;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f3c4;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f93e;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f93e;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f93e;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f93e;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f93e;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f93e;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f93d;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f93d;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f93d;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f93d;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f93d;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f93d;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f93d;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f469;&#x1f3fb;&#x200d;&#x2695;&#xfe0f;','&#x1f469;&#x1f3fb;&#x200d;&#x2696;&#xfe0f;','&#x1f469;&#x1f3fb;&#x200d;&#x2708;&#xfe0f;','&#x1f93d;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f93d;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f93d;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f939;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f939;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f939;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f939;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f939;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f939;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f939;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f939;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f939;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f939;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f469;&#x1f3fc;&#x200d;&#x2695;&#xfe0f;','&#x1f469;&#x1f3fc;&#x200d;&#x2696;&#xfe0f;','&#x1f469;&#x1f3fc;&#x200d;&#x2708;&#xfe0f;','&#x1f938;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f938;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f938;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f938;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f938;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f938;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f938;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f938;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f938;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f938;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f937;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f937;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f937;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f469;&#x1f3fd;&#x200d;&#x2695;&#xfe0f;','&#x1f469;&#x1f3fd;&#x200d;&#x2696;&#xfe0f;','&#x1f469;&#x1f3fd;&#x200d;&#x2708;&#xfe0f;','&#x1f937;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f937;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f937;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f937;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f937;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3c3;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f937;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f926;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f926;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f926;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f926;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f926;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f926;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f469;&#x1f3fe;&#x200d;&#x2695;&#xfe0f;','&#x1f469;&#x1f3fe;&#x200d;&#x2696;&#xfe0f;','&#x1f469;&#x1f3fe;&#x200d;&#x2708;&#xfe0f;','&#x1f926;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f926;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f926;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f926;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f6b6;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6b6;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f6b6;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f6b6;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f6b6;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f6b6;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f6b6;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f6b6;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f6b6;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f469;&#x1f3ff;&#x200d;&#x2695;&#xfe0f;','&#x1f469;&#x1f3ff;&#x200d;&#x2696;&#xfe0f;','&#x1f469;&#x1f3ff;&#x200d;&#x2708;&#xfe0f;','&#x1f6b6;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f6b5;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6b5;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f6b5;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f6b5;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f6b5;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f6b5;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f3c4;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6b5;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f3ca;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f3ca;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f6b5;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3ca;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3ca;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f3ca;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f3ca;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f3ca;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f6b5;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f6b5;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f6b4;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6b4;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f6b4;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f6b4;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f6b4;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f6b4;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f6b4;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f3ca;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f3ca;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f3ca;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f3cb;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f46e;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f46e;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f46e;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f46e;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f46e;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f46e;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f46e;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f46e;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f46e;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f46e;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6b4;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f6b4;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f6b4;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f6a3;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f471;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f471;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f471;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f471;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f471;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f471;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f471;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f471;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f471;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f471;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6a3;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f6a3;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f473;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f473;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f473;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f473;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f473;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f473;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f473;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f473;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f473;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f473;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6a3;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f6a3;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f477;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f477;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f477;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f477;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f477;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f477;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f477;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f477;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f477;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f477;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6a3;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f6a3;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f481;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f481;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f481;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f481;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f481;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f481;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f481;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f481;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f481;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f481;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6a3;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f6a3;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f3c3;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f482;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f482;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f482;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f482;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f482;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f482;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f482;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f482;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f482;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f6a3;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f64e;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f486;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f486;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f486;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f486;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f486;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f486;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f486;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f486;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f486;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f486;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f64e;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f64e;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f487;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f487;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f487;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f487;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f487;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f487;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f487;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f487;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f487;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f487;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f64e;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f64e;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f575;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f575;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f575;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f575;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f575;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f575;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f575;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f575;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f575;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f575;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f645;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f645;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f645;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f645;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f645;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f645;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f645;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f645;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f645;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f645;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f64e;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f64e;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f646;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f646;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f646;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f646;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f646;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f646;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f646;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f646;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f646;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f646;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f64e;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f64e;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f647;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f647;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f647;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f647;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f647;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f647;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f647;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f647;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f647;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f647;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f64e;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f64d;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f64b;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f64b;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f64b;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f64b;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f64b;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f64b;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f64b;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f64b;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f64b;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f64b;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x1f64d;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x1f64d;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x1f64d;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x1f64d;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x1f64d;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f64d;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x1f64d;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x1f64d;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x1f64d;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f3cb;&#xfe0f;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;','&#x1f3cc;&#xfe0f;&#x200d;&#x2640;&#xfe0f;','&#x1f575;&#xfe0f;&#x200d;&#x2640;&#xfe0f;','&#x1f575;&#xfe0f;&#x200d;&#x2642;&#xfe0f;','&#x1f3cc;&#xfe0f;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;','&#x26f9;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;','&#x26f9;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;','&#x26f9;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;','&#x1f3cb;&#xfe0f;&#x200d;&#x2640;&#xfe0f;','&#x26f9;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#xfe0f;&#x200d;&#x2642;&#xfe0f;','&#x26f9;&#xfe0f;&#x200d;&#x2640;&#xfe0f;','&#x1f468;&#x1f3fc;&#x200d;&#x1f33e;','&#x1f469;&#x1f3ff;&#x200d;&#x1f692;','&#x1f469;&#x1f3ff;&#x200d;&#x1f680;','&#x1f469;&#x1f3ff;&#x200d;&#x1f52c;','&#x1f469;&#x1f3ff;&#x200d;&#x1f527;','&#x1f469;&#x1f3ff;&#x200d;&#x1f4bc;','&#x1f469;&#x1f3ff;&#x200d;&#x1f4bb;','&#x1f469;&#x1f3ff;&#x200d;&#x1f3ed;','&#x1f469;&#x1f3ff;&#x200d;&#x1f3eb;','&#x1f469;&#x1f3ff;&#x200d;&#x1f3a8;','&#x1f469;&#x1f3ff;&#x200d;&#x1f3a4;','&#x1f469;&#x1f3ff;&#x200d;&#x1f393;','&#x1f469;&#x1f3ff;&#x200d;&#x1f373;','&#x1f469;&#x1f3ff;&#x200d;&#x1f33e;','&#x1f469;&#x1f3fe;&#x200d;&#x1f692;','&#x1f469;&#x1f3fe;&#x200d;&#x1f680;','&#x1f469;&#x1f3fe;&#x200d;&#x1f52c;','&#x1f469;&#x1f3fe;&#x200d;&#x1f527;','&#x1f469;&#x1f3fe;&#x200d;&#x1f4bc;','&#x1f469;&#x1f3fe;&#x200d;&#x1f4bb;','&#x1f469;&#x1f3fe;&#x200d;&#x1f3ed;','&#x1f469;&#x1f3fe;&#x200d;&#x1f3eb;','&#x1f469;&#x1f3fe;&#x200d;&#x1f3a8;','&#x1f469;&#x1f3fe;&#x200d;&#x1f3a4;','&#x1f469;&#x1f3fe;&#x200d;&#x1f393;','&#x1f469;&#x1f3fe;&#x200d;&#x1f373;','&#x1f469;&#x1f3fe;&#x200d;&#x1f33e;','&#x1f469;&#x1f3fd;&#x200d;&#x1f692;','&#x1f469;&#x1f3fd;&#x200d;&#x1f680;','&#x1f469;&#x1f3fd;&#x200d;&#x1f52c;','&#x1f469;&#x1f3fd;&#x200d;&#x1f527;','&#x1f469;&#x1f3fd;&#x200d;&#x1f4bc;','&#x1f469;&#x1f3fd;&#x200d;&#x1f4bb;','&#x1f469;&#x1f3fd;&#x200d;&#x1f3ed;','&#x1f469;&#x1f3fd;&#x200d;&#x1f3eb;','&#x1f469;&#x1f3fd;&#x200d;&#x1f3a8;','&#x1f469;&#x1f3fd;&#x200d;&#x1f3a4;','&#x1f469;&#x1f3fd;&#x200d;&#x1f393;','&#x1f469;&#x1f3fd;&#x200d;&#x1f373;','&#x1f469;&#x1f3fd;&#x200d;&#x1f33e;','&#x1f469;&#x1f3fc;&#x200d;&#x1f692;','&#x1f469;&#x1f3fc;&#x200d;&#x1f680;','&#x1f469;&#x1f3fc;&#x200d;&#x1f52c;','&#x1f469;&#x1f3fc;&#x200d;&#x1f527;','&#x1f469;&#x1f3fc;&#x200d;&#x1f4bc;','&#x1f469;&#x1f3fc;&#x200d;&#x1f4bb;','&#x1f469;&#x1f3fc;&#x200d;&#x1f3ed;','&#x1f469;&#x1f3fc;&#x200d;&#x1f3eb;','&#x1f469;&#x1f3fc;&#x200d;&#x1f3a8;','&#x1f469;&#x1f3fc;&#x200d;&#x1f3a4;','&#x1f469;&#x1f3fc;&#x200d;&#x1f393;','&#x1f469;&#x1f3fc;&#x200d;&#x1f373;','&#x1f469;&#x1f3fc;&#x200d;&#x1f33e;','&#x1f469;&#x1f3fb;&#x200d;&#x1f692;','&#x1f469;&#x1f3fb;&#x200d;&#x1f680;','&#x1f469;&#x1f3fb;&#x200d;&#x1f52c;','&#x1f469;&#x1f3fb;&#x200d;&#x1f527;','&#x1f469;&#x1f3fb;&#x200d;&#x1f4bc;','&#x1f469;&#x1f3fb;&#x200d;&#x1f4bb;','&#x1f469;&#x1f3fb;&#x200d;&#x1f3ed;','&#x1f469;&#x1f3fb;&#x200d;&#x1f3eb;','&#x1f469;&#x1f3fb;&#x200d;&#x1f3a8;','&#x1f469;&#x1f3fb;&#x200d;&#x1f3a4;','&#x1f469;&#x1f3fb;&#x200d;&#x1f393;','&#x1f468;&#x1f3fb;&#x200d;&#x1f692;','&#x1f469;&#x1f3fb;&#x200d;&#x1f33e;','&#x1f468;&#x1f3fb;&#x200d;&#x1f33e;','&#x1f468;&#x1f3fb;&#x200d;&#x1f373;','&#x1f468;&#x1f3fb;&#x200d;&#x1f393;','&#x1f468;&#x1f3fb;&#x200d;&#x1f3a4;','&#x1f468;&#x1f3fb;&#x200d;&#x1f3a8;','&#x1f468;&#x1f3fb;&#x200d;&#x1f3eb;','&#x1f468;&#x1f3fb;&#x200d;&#x1f3ed;','&#x1f468;&#x1f3fb;&#x200d;&#x1f4bb;','&#x1f468;&#x1f3fb;&#x200d;&#x1f4bc;','&#x1f468;&#x1f3fb;&#x200d;&#x1f527;','&#x1f468;&#x1f3fb;&#x200d;&#x1f52c;','&#x1f468;&#x1f3fb;&#x200d;&#x1f680;','&#x1f468;&#x1f3ff;&#x200d;&#x1f692;','&#x1f468;&#x1f3ff;&#x200d;&#x1f680;','&#x1f468;&#x1f3ff;&#x200d;&#x1f52c;','&#x1f468;&#x1f3ff;&#x200d;&#x1f527;','&#x1f468;&#x1f3ff;&#x200d;&#x1f4bc;','&#x1f468;&#x1f3ff;&#x200d;&#x1f4bb;','&#x1f468;&#x1f3ff;&#x200d;&#x1f3ed;','&#x1f468;&#x1f3ff;&#x200d;&#x1f3eb;','&#x1f468;&#x1f3ff;&#x200d;&#x1f3a8;','&#x1f468;&#x1f3ff;&#x200d;&#x1f3a4;','&#x1f468;&#x1f3ff;&#x200d;&#x1f393;','&#x1f468;&#x1f3ff;&#x200d;&#x1f373;','&#x1f468;&#x1f3ff;&#x200d;&#x1f33e;','&#x1f468;&#x1f3fe;&#x200d;&#x1f692;','&#x1f468;&#x1f3fe;&#x200d;&#x1f680;','&#x1f468;&#x1f3fe;&#x200d;&#x1f52c;','&#x1f468;&#x1f3fe;&#x200d;&#x1f527;','&#x1f468;&#x1f3fe;&#x200d;&#x1f4bc;','&#x1f468;&#x1f3fe;&#x200d;&#x1f4bb;','&#x1f468;&#x1f3fe;&#x200d;&#x1f3ed;','&#x1f468;&#x1f3fe;&#x200d;&#x1f3eb;','&#x1f468;&#x1f3fe;&#x200d;&#x1f3a8;','&#x1f468;&#x1f3fe;&#x200d;&#x1f3a4;','&#x1f468;&#x1f3fe;&#x200d;&#x1f393;','&#x1f468;&#x1f3fe;&#x200d;&#x1f373;','&#x1f468;&#x1f3fe;&#x200d;&#x1f33e;','&#x1f468;&#x1f3fd;&#x200d;&#x1f692;','&#x1f468;&#x1f3fd;&#x200d;&#x1f680;','&#x1f468;&#x1f3fd;&#x200d;&#x1f52c;','&#x1f468;&#x1f3fd;&#x200d;&#x1f527;','&#x1f468;&#x1f3fd;&#x200d;&#x1f4bc;','&#x1f468;&#x1f3fd;&#x200d;&#x1f4bb;','&#x1f468;&#x1f3fd;&#x200d;&#x1f3ed;','&#x1f468;&#x1f3fd;&#x200d;&#x1f3eb;','&#x1f468;&#x1f3fd;&#x200d;&#x1f3a8;','&#x1f468;&#x1f3fd;&#x200d;&#x1f3a4;','&#x1f468;&#x1f3fd;&#x200d;&#x1f393;','&#x1f468;&#x1f3fd;&#x200d;&#x1f373;','&#x1f468;&#x1f3fd;&#x200d;&#x1f33e;','&#x1f468;&#x1f3fc;&#x200d;&#x1f692;','&#x1f468;&#x1f3fc;&#x200d;&#x1f680;','&#x1f468;&#x1f3fc;&#x200d;&#x1f52c;','&#x1f468;&#x1f3fc;&#x200d;&#x1f527;','&#x1f468;&#x1f3fc;&#x200d;&#x1f4bc;','&#x1f468;&#x1f3fc;&#x200d;&#x1f4bb;','&#x1f468;&#x1f3fc;&#x200d;&#x1f3ed;','&#x1f468;&#x1f3fc;&#x200d;&#x1f3eb;','&#x1f468;&#x1f3fc;&#x200d;&#x1f3a8;','&#x1f468;&#x1f3fc;&#x200d;&#x1f3a4;','&#x1f468;&#x1f3fc;&#x200d;&#x1f393;','&#x1f468;&#x1f3fc;&#x200d;&#x1f373;','&#x1f469;&#x1f3fb;&#x200d;&#x1f373;','&#x1f3f3;&#xfe0f;&#x200d;&#x1f308;','&#x1f468;&#x200d;&#x2696;&#xfe0f;','&#x1f468;&#x200d;&#x2695;&#xfe0f;','&#x1f9dd;&#x200d;&#x2640;&#xfe0f;','&#x1f93e;&#x200d;&#x2640;&#xfe0f;','&#x1f93e;&#x200d;&#x2642;&#xfe0f;','&#x1f482;&#x200d;&#x2640;&#xfe0f;','&#x1f481;&#x200d;&#x2642;&#xfe0f;','&#x1f481;&#x200d;&#x2640;&#xfe0f;','&#x1f477;&#x200d;&#x2642;&#xfe0f;','&#x1f477;&#x200d;&#x2640;&#xfe0f;','&#x1f473;&#x200d;&#x2642;&#xfe0f;','&#x1f926;&#x200d;&#x2640;&#xfe0f;','&#x1f926;&#x200d;&#x2642;&#xfe0f;','&#x1f473;&#x200d;&#x2640;&#xfe0f;','&#x1f9dc;&#x200d;&#x2642;&#xfe0f;','&#x1f9d6;&#x200d;&#x2640;&#xfe0f;','&#x1f9d6;&#x200d;&#x2642;&#xfe0f;','&#x1f9dc;&#x200d;&#x2640;&#xfe0f;','&#x1f471;&#x200d;&#x2642;&#xfe0f;','&#x1f471;&#x200d;&#x2640;&#xfe0f;','&#x1f46f;&#x200d;&#x2642;&#xfe0f;','&#x1f6a3;&#x200d;&#x2640;&#xfe0f;','&#x1f6a3;&#x200d;&#x2642;&#xfe0f;','&#x1f46f;&#x200d;&#x2640;&#xfe0f;','&#x1f46e;&#x200d;&#x2642;&#xfe0f;','&#x1f46e;&#x200d;&#x2640;&#xfe0f;','&#x1f469;&#x200d;&#x2708;&#xfe0f;','&#x1f9d7;&#x200d;&#x2640;&#xfe0f;','&#x1f9d7;&#x200d;&#x2642;&#xfe0f;','&#x1f937;&#x200d;&#x2640;&#xfe0f;','&#x1f937;&#x200d;&#x2642;&#xfe0f;','&#x1f469;&#x200d;&#x2696;&#xfe0f;','&#x1f469;&#x200d;&#x2695;&#xfe0f;','&#x1f3c3;&#x200d;&#x2640;&#xfe0f;','&#x1f3c3;&#x200d;&#x2642;&#xfe0f;','&#x1f3c4;&#x200d;&#x2640;&#xfe0f;','&#x1f3c4;&#x200d;&#x2642;&#xfe0f;','&#x1f6b4;&#x200d;&#x2640;&#xfe0f;','&#x1f6b4;&#x200d;&#x2642;&#xfe0f;','&#x1f9d8;&#x200d;&#x2640;&#xfe0f;','&#x1f9d8;&#x200d;&#x2642;&#xfe0f;','&#x1f3ca;&#x200d;&#x2640;&#xfe0f;','&#x1f3ca;&#x200d;&#x2642;&#xfe0f;','&#x1f938;&#x200d;&#x2640;&#xfe0f;','&#x1f938;&#x200d;&#x2642;&#xfe0f;','&#x1f64b;&#x200d;&#x2642;&#xfe0f;','&#x1f647;&#x200d;&#x2642;&#xfe0f;','&#x1f64d;&#x200d;&#x2640;&#xfe0f;','&#x1f3f4;&#x200d;&#x2620;&#xfe0f;','&#x1f9df;&#x200d;&#x2642;&#xfe0f;','&#x1f9df;&#x200d;&#x2640;&#xfe0f;','&#x1f9d9;&#x200d;&#x2640;&#xfe0f;','&#x1f9d9;&#x200d;&#x2642;&#xfe0f;','&#x1f9de;&#x200d;&#x2642;&#xfe0f;','&#x1f9de;&#x200d;&#x2640;&#xfe0f;','&#x1f6b5;&#x200d;&#x2640;&#xfe0f;','&#x1f6b5;&#x200d;&#x2642;&#xfe0f;','&#x1f939;&#x200d;&#x2640;&#xfe0f;','&#x1f939;&#x200d;&#x2642;&#xfe0f;','&#x1f93c;&#x200d;&#x2640;&#xfe0f;','&#x1f93c;&#x200d;&#x2642;&#xfe0f;','&#x1f9dd;&#x200d;&#x2642;&#xfe0f;','&#x1f64d;&#x200d;&#x2642;&#xfe0f;','&#x1f9da;&#x200d;&#x2640;&#xfe0f;','&#x1f9da;&#x200d;&#x2642;&#xfe0f;','&#x1f647;&#x200d;&#x2640;&#xfe0f;','&#x1f646;&#x200d;&#x2642;&#xfe0f;','&#x1f646;&#x200d;&#x2640;&#xfe0f;','&#x1f645;&#x200d;&#x2642;&#xfe0f;','&#x1f645;&#x200d;&#x2640;&#xfe0f;','&#x1f487;&#x200d;&#x2642;&#xfe0f;','&#x1f487;&#x200d;&#x2640;&#xfe0f;','&#x1f486;&#x200d;&#x2642;&#xfe0f;','&#x1f64b;&#x200d;&#x2640;&#xfe0f;','&#x1f93d;&#x200d;&#x2642;&#xfe0f;','&#x1f9db;&#x200d;&#x2640;&#xfe0f;','&#x1f9db;&#x200d;&#x2642;&#xfe0f;','&#x1f6b6;&#x200d;&#x2640;&#xfe0f;','&#x1f6b6;&#x200d;&#x2642;&#xfe0f;','&#x1f486;&#x200d;&#x2640;&#xfe0f;','&#x1f482;&#x200d;&#x2642;&#xfe0f;','&#x1f64e;&#x200d;&#x2640;&#xfe0f;','&#x1f64e;&#x200d;&#x2642;&#xfe0f;','&#x1f468;&#x200d;&#x2708;&#xfe0f;','&#x1f93d;&#x200d;&#x2640;&#xfe0f;','&#x1f468;&#x200d;&#x1f33e;','&#x1f468;&#x200d;&#x1f393;','&#x1f468;&#x200d;&#x1f3a4;','&#x1f468;&#x200d;&#x1f3a8;','&#x1f468;&#x200d;&#x1f3eb;','&#x1f468;&#x200d;&#x1f3ed;','&#x1f468;&#x200d;&#x1f466;','&#x1f468;&#x200d;&#x1f467;','&#x1f468;&#x200d;&#x1f4bb;','&#x1f468;&#x200d;&#x1f4bc;','&#x1f468;&#x200d;&#x1f527;','&#x1f468;&#x200d;&#x1f52c;','&#x1f468;&#x200d;&#x1f680;','&#x1f441;&#x200d;&#x1f5e8;','&#x1f468;&#x200d;&#x1f692;','&#x1f468;&#x200d;&#x1f373;','&#x1f469;&#x200d;&#x1f373;','&#x1f469;&#x200d;&#x1f393;','&#x1f469;&#x200d;&#x1f3a4;','&#x1f469;&#x200d;&#x1f3a8;','&#x1f469;&#x200d;&#x1f3eb;','&#x1f469;&#x200d;&#x1f3ed;','&#x1f469;&#x200d;&#x1f466;','&#x1f469;&#x200d;&#x1f467;','&#x1f469;&#x200d;&#x1f4bb;','&#x1f469;&#x200d;&#x1f4bc;','&#x1f469;&#x200d;&#x1f527;','&#x1f469;&#x200d;&#x1f52c;','&#x1f469;&#x200d;&#x1f680;','&#x1f469;&#x200d;&#x1f692;','&#x1f469;&#x200d;&#x1f33e;','&#x1f1e7;&#x1f1f2;','&#x1f1e7;&#x1f1f3;','&#x1f471;&#x1f3fe;','&#x1f3ca;&#x1f3fc;','&#x1f1e7;&#x1f1f4;','&#x1f471;&#x1f3ff;','&#x1f1e7;&#x1f1f6;','&#x1f3ca;&#x1f3fd;','&#x1f472;&#x1f3fb;','&#x1f472;&#x1f3fc;','&#x1f472;&#x1f3fd;','&#x1f472;&#x1f3fe;','&#x1f472;&#x1f3ff;','&#x1f1e7;&#x1f1f7;','&#x1f1e7;&#x1f1f8;','&#x1f473;&#x1f3fb;','&#x1f3ca;&#x1f3fe;','&#x1f1e7;&#x1f1f9;','&#x1f473;&#x1f3fc;','&#x1f1e7;&#x1f1fb;','&#x1f3ca;&#x1f3ff;','&#x1f473;&#x1f3fd;','&#x1f1e7;&#x1f1fc;','&#x1f1e7;&#x1f1fe;','&#x1f473;&#x1f3fe;','&#x1f1e7;&#x1f1ff;','&#x1f1e8;&#x1f1e6;','&#x1f473;&#x1f3ff;','&#x1f3cb;&#x1f3fb;','&#x1f1e8;&#x1f1e8;','&#x1f474;&#x1f3fb;','&#x1f474;&#x1f3fc;','&#x1f474;&#x1f3fd;','&#x1f474;&#x1f3fe;','&#x1f474;&#x1f3ff;','&#x1f475;&#x1f3fb;','&#x1f475;&#x1f3fc;','&#x1f475;&#x1f3fd;','&#x1f475;&#x1f3fe;','&#x1f475;&#x1f3ff;','&#x1f476;&#x1f3fb;','&#x1f476;&#x1f3fc;','&#x1f476;&#x1f3fd;','&#x1f476;&#x1f3fe;','&#x1f476;&#x1f3ff;','&#x1f1e8;&#x1f1e9;','&#x1f3cb;&#x1f3fc;','&#x1f477;&#x1f3fb;','&#x1f1e8;&#x1f1eb;','&#x1f1e8;&#x1f1ec;','&#x1f477;&#x1f3fc;','&#x1f3cb;&#x1f3fd;','&#x1f1e8;&#x1f1ed;','&#x1f477;&#x1f3fd;','&#x1f1e8;&#x1f1ee;','&#x1f3cb;&#x1f3fe;','&#x1f477;&#x1f3fe;','&#x1f1e8;&#x1f1f0;','&#x1f1e8;&#x1f1f1;','&#x1f477;&#x1f3ff;','&#x1f3cb;&#x1f3ff;','&#x1f1e8;&#x1f1f2;','&#x1f478;&#x1f3fb;','&#x1f478;&#x1f3fc;','&#x1f478;&#x1f3fd;','&#x1f478;&#x1f3fe;','&#x1f478;&#x1f3ff;','&#x1f47c;&#x1f3fb;','&#x1f47c;&#x1f3fc;','&#x1f47c;&#x1f3fd;','&#x1f47c;&#x1f3fe;','&#x1f47c;&#x1f3ff;','&#x1f1e8;&#x1f1f3;','&#x1f1e8;&#x1f1f4;','&#x1f481;&#x1f3fb;','&#x1f1e8;&#x1f1f5;','&#x1f3cc;&#x1f3fb;','&#x1f481;&#x1f3fc;','&#x1f1e8;&#x1f1f7;','&#x1f1e8;&#x1f1fa;','&#x1f481;&#x1f3fd;','&#x1f3cc;&#x1f3fc;','&#x1f1e8;&#x1f1fb;','&#x1f481;&#x1f3fe;','&#x1f1e8;&#x1f1fc;','&#x1f3cc;&#x1f3fd;','&#x1f481;&#x1f3ff;','&#x1f1e8;&#x1f1fd;','&#x1f1e8;&#x1f1fe;','&#x1f3cc;&#x1f3fe;','&#x1f1e8;&#x1f1ff;','&#x1f482;&#x1f3fb;','&#x1f1e9;&#x1f1ea;','&#x1f3cc;&#x1f3ff;','&#x1f482;&#x1f3fc;','&#x1f1e9;&#x1f1ec;','&#x1f1e9;&#x1f1ef;','&#x1f482;&#x1f3fd;','&#x1f1e9;&#x1f1f0;','&#x1f1e9;&#x1f1f2;','&#x1f482;&#x1f3fe;','&#x1f1e9;&#x1f1f4;','&#x1f1e9;&#x1f1ff;','&#x1f482;&#x1f3ff;','&#x1f1ea;&#x1f1e6;','&#x1f1ea;&#x1f1e8;','&#x1f483;&#x1f3fb;','&#x1f483;&#x1f3fc;','&#x1f483;&#x1f3fd;','&#x1f483;&#x1f3fe;','&#x1f483;&#x1f3ff;','&#x1f485;&#x1f3fb;','&#x1f485;&#x1f3fc;','&#x1f485;&#x1f3fd;','&#x1f485;&#x1f3fe;','&#x1f485;&#x1f3ff;','&#x1f442;&#x1f3fb;','&#x1f442;&#x1f3fc;','&#x1f486;&#x1f3fb;','&#x1f442;&#x1f3fd;','&#x1f442;&#x1f3fe;','&#x1f486;&#x1f3fc;','&#x1f442;&#x1f3ff;','&#x1f443;&#x1f3fb;','&#x1f486;&#x1f3fd;','&#x1f443;&#x1f3fc;','&#x1f443;&#x1f3fd;','&#x1f486;&#x1f3fe;','&#x1f443;&#x1f3fe;','&#x1f443;&#x1f3ff;','&#x1f486;&#x1f3ff;','&#x1f446;&#x1f3fb;','&#x1f446;&#x1f3fc;','&#x1f446;&#x1f3fd;','&#x1f446;&#x1f3fe;','&#x1f487;&#x1f3fb;','&#x1f446;&#x1f3ff;','&#x1f447;&#x1f3fb;','&#x1f487;&#x1f3fc;','&#x1f447;&#x1f3fc;','&#x1f447;&#x1f3fd;','&#x1f487;&#x1f3fd;','&#x1f447;&#x1f3fe;','&#x1f447;&#x1f3ff;','&#x1f487;&#x1f3fe;','&#x1f448;&#x1f3fb;','&#x1f448;&#x1f3fc;','&#x1f487;&#x1f3ff;','&#x1f448;&#x1f3fd;','&#x1f448;&#x1f3fe;','&#x1f4aa;&#x1f3fb;','&#x1f4aa;&#x1f3fc;','&#x1f4aa;&#x1f3fd;','&#x1f4aa;&#x1f3fe;','&#x1f4aa;&#x1f3ff;','&#x1f574;&#x1f3fb;','&#x1f574;&#x1f3fc;','&#x1f574;&#x1f3fd;','&#x1f574;&#x1f3fe;','&#x1f574;&#x1f3ff;','&#x1f448;&#x1f3ff;','&#x1f449;&#x1f3fb;','&#x1f575;&#x1f3fb;','&#x1f449;&#x1f3fc;','&#x1f449;&#x1f3fd;','&#x1f575;&#x1f3fc;','&#x1f449;&#x1f3fe;','&#x1f449;&#x1f3ff;','&#x1f575;&#x1f3fd;','&#x1f44a;&#x1f3fb;','&#x1f44a;&#x1f3fc;','&#x1f575;&#x1f3fe;','&#x1f44a;&#x1f3fd;','&#x1f44a;&#x1f3fe;','&#x1f575;&#x1f3ff;','&#x1f44a;&#x1f3ff;','&#x1f44b;&#x1f3fb;','&#x1f57a;&#x1f3fb;','&#x1f57a;&#x1f3fc;','&#x1f57a;&#x1f3fd;','&#x1f57a;&#x1f3fe;','&#x1f57a;&#x1f3ff;','&#x1f590;&#x1f3fb;','&#x1f590;&#x1f3fc;','&#x1f590;&#x1f3fd;','&#x1f590;&#x1f3fe;','&#x1f590;&#x1f3ff;','&#x1f595;&#x1f3fb;','&#x1f595;&#x1f3fc;','&#x1f595;&#x1f3fd;','&#x1f595;&#x1f3fe;','&#x1f595;&#x1f3ff;','&#x1f596;&#x1f3fb;','&#x1f596;&#x1f3fc;','&#x1f596;&#x1f3fd;','&#x1f596;&#x1f3fe;','&#x1f596;&#x1f3ff;','&#x1f44b;&#x1f3fc;','&#x1f44b;&#x1f3fd;','&#x1f645;&#x1f3fb;','&#x1f44b;&#x1f3fe;','&#x1f44b;&#x1f3ff;','&#x1f645;&#x1f3fc;','&#x1f44c;&#x1f3fb;','&#x1f44c;&#x1f3fc;','&#x1f645;&#x1f3fd;','&#x1f1e6;&#x1f1e8;','&#x1f44c;&#x1f3fe;','&#x1f645;&#x1f3fe;','&#x1f44c;&#x1f3ff;','&#x1f44d;&#x1f3fb;','&#x1f645;&#x1f3ff;','&#x1f44d;&#x1f3fc;','&#x1f44d;&#x1f3fd;','&#x1f44d;&#x1f3fe;','&#x1f44d;&#x1f3ff;','&#x1f646;&#x1f3fb;','&#x1f44e;&#x1f3fb;','&#x1f44e;&#x1f3fc;','&#x1f646;&#x1f3fc;','&#x1f44e;&#x1f3fd;','&#x1f44e;&#x1f3fe;','&#x1f646;&#x1f3fd;','&#x1f44e;&#x1f3ff;','&#x1f44f;&#x1f3fb;','&#x1f646;&#x1f3fe;','&#x1f44f;&#x1f3fc;','&#x1f44f;&#x1f3fd;','&#x1f646;&#x1f3ff;','&#x1f44f;&#x1f3fe;','&#x1f44f;&#x1f3ff;','&#x1f450;&#x1f3fb;','&#x1f450;&#x1f3fc;','&#x1f647;&#x1f3fb;','&#x1f450;&#x1f3fd;','&#x1f450;&#x1f3fe;','&#x1f647;&#x1f3fc;','&#x1f450;&#x1f3ff;','&#x1f466;&#x1f3fb;','&#x1f647;&#x1f3fd;','&#x1f466;&#x1f3fc;','&#x1f466;&#x1f3fd;','&#x1f647;&#x1f3fe;','&#x1f466;&#x1f3fe;','&#x1f466;&#x1f3ff;','&#x1f647;&#x1f3ff;','&#x1f467;&#x1f3fb;','&#x1f467;&#x1f3fc;','&#x1f467;&#x1f3fd;','&#x1f467;&#x1f3fe;','&#x1f64b;&#x1f3fb;','&#x1f467;&#x1f3ff;','&#x1f1ea;&#x1f1ea;','&#x1f64b;&#x1f3fc;','&#x1f1ea;&#x1f1ec;','&#x1f1ea;&#x1f1ed;','&#x1f64b;&#x1f3fd;','&#x1f1ea;&#x1f1f7;','&#x1f1ea;&#x1f1f8;','&#x1f64b;&#x1f3fe;','&#x1f1ea;&#x1f1f9;','&#x1f1ea;&#x1f1fa;','&#x1f64b;&#x1f3ff;','&#x1f1eb;&#x1f1ee;','&#x1f1eb;&#x1f1ef;','&#x1f64c;&#x1f3fb;','&#x1f64c;&#x1f3fc;','&#x1f64c;&#x1f3fd;','&#x1f64c;&#x1f3fe;','&#x1f64c;&#x1f3ff;','&#x1f1eb;&#x1f1f0;','&#x1f1eb;&#x1f1f2;','&#x1f64d;&#x1f3fb;','&#x1f1eb;&#x1f1f4;','&#x1f1eb;&#x1f1f7;','&#x1f64d;&#x1f3fc;','&#x1f1ec;&#x1f1e6;','&#x1f1ec;&#x1f1e7;','&#x1f64d;&#x1f3fd;','&#x1f1ec;&#x1f1e9;','&#x1f468;&#x1f3fb;','&#x1f64d;&#x1f3fe;','&#x1f1ec;&#x1f1ea;','&#x1f1ec;&#x1f1eb;','&#x1f64d;&#x1f3ff;','&#x1f1ec;&#x1f1ec;','&#x1f1ec;&#x1f1ed;','&#x1f1ec;&#x1f1ee;','&#x1f1ec;&#x1f1f1;','&#x1f64e;&#x1f3fb;','&#x1f1ec;&#x1f1f2;','&#x1f1ec;&#x1f1f3;','&#x1f64e;&#x1f3fc;','&#x1f1ec;&#x1f1f5;','&#x1f1ec;&#x1f1f6;','&#x1f64e;&#x1f3fd;','&#x1f1ec;&#x1f1f7;','&#x1f1ec;&#x1f1f8;','&#x1f64e;&#x1f3fe;','&#x1f1ec;&#x1f1f9;','&#x1f1ec;&#x1f1fa;','&#x1f64e;&#x1f3ff;','&#x1f1ec;&#x1f1fc;','&#x1f1ec;&#x1f1fe;','&#x1f64f;&#x1f3fb;','&#x1f64f;&#x1f3fc;','&#x1f64f;&#x1f3fd;','&#x1f64f;&#x1f3fe;','&#x1f64f;&#x1f3ff;','&#x1f468;&#x1f3fc;','&#x1f1ed;&#x1f1f0;','&#x1f6a3;&#x1f3fb;','&#x1f1ed;&#x1f1f2;','&#x1f1ed;&#x1f1f3;','&#x1f6a3;&#x1f3fc;','&#x1f1ed;&#x1f1f7;','&#x1f1ed;&#x1f1f9;','&#x1f6a3;&#x1f3fd;','&#x1f1ed;&#x1f1fa;','&#x1f1ee;&#x1f1e8;','&#x1f6a3;&#x1f3fe;','&#x1f1ee;&#x1f1e9;','&#x1f1ee;&#x1f1ea;','&#x1f6a3;&#x1f3ff;','&#x1f1ee;&#x1f1f1;','&#x1f1ee;&#x1f1f2;','&#x1f1ee;&#x1f1f3;','&#x1f1ee;&#x1f1f4;','&#x1f6b4;&#x1f3fb;','&#x1f1ee;&#x1f1f6;','&#x1f1ee;&#x1f1f7;','&#x1f6b4;&#x1f3fc;','&#x1f1ee;&#x1f1f8;','&#x1f468;&#x1f3fd;','&#x1f6b4;&#x1f3fd;','&#x1f1ee;&#x1f1f9;','&#x1f1ef;&#x1f1ea;','&#x1f6b4;&#x1f3fe;','&#x1f1ef;&#x1f1f2;','&#x1f1ef;&#x1f1f4;','&#x1f6b4;&#x1f3ff;','&#x1f1ef;&#x1f1f5;','&#x1f1f0;&#x1f1ea;','&#x1f1f0;&#x1f1ec;','&#x1f1f0;&#x1f1ed;','&#x1f6b5;&#x1f3fb;','&#x1f1f0;&#x1f1ee;','&#x1f1f0;&#x1f1f2;','&#x1f6b5;&#x1f3fc;','&#x1f1f0;&#x1f1f3;','&#x1f1f0;&#x1f1f5;','&#x1f6b5;&#x1f3fd;','&#x1f1f0;&#x1f1f7;','&#x1f1f0;&#x1f1fc;','&#x1f6b5;&#x1f3fe;','&#x1f1f0;&#x1f1fe;','&#x1f1f0;&#x1f1ff;','&#x1f6b5;&#x1f3ff;','&#x1f468;&#x1f3fe;','&#x1f1f1;&#x1f1e6;','&#x1f1f1;&#x1f1e7;','&#x1f1f1;&#x1f1e8;','&#x1f6b6;&#x1f3fb;','&#x1f1f1;&#x1f1ee;','&#x1f1f1;&#x1f1f0;','&#x1f6b6;&#x1f3fc;','&#x1f1f1;&#x1f1f7;','&#x1f1f1;&#x1f1f8;','&#x1f6b6;&#x1f3fd;','&#x1f1f1;&#x1f1f9;','&#x1f1f1;&#x1f1fa;','&#x1f6b6;&#x1f3fe;','&#x1f1f1;&#x1f1fb;','&#x1f1f1;&#x1f1fe;','&#x1f6b6;&#x1f3ff;','&#x1f1f2;&#x1f1e6;','&#x1f1f2;&#x1f1e8;','&#x1f6c0;&#x1f3fb;','&#x1f6c0;&#x1f3fc;','&#x1f6c0;&#x1f3fd;','&#x1f6c0;&#x1f3fe;','&#x1f6c0;&#x1f3ff;','&#x1f6cc;&#x1f3fb;','&#x1f6cc;&#x1f3fc;','&#x1f6cc;&#x1f3fd;','&#x1f6cc;&#x1f3fe;','&#x1f6cc;&#x1f3ff;','&#x1f918;&#x1f3fb;','&#x1f918;&#x1f3fc;','&#x1f918;&#x1f3fd;','&#x1f918;&#x1f3fe;','&#x1f918;&#x1f3ff;','&#x1f919;&#x1f3fb;','&#x1f919;&#x1f3fc;','&#x1f919;&#x1f3fd;','&#x1f919;&#x1f3fe;','&#x1f919;&#x1f3ff;','&#x1f91a;&#x1f3fb;','&#x1f91a;&#x1f3fc;','&#x1f91a;&#x1f3fd;','&#x1f91a;&#x1f3fe;','&#x1f91a;&#x1f3ff;','&#x1f91b;&#x1f3fb;','&#x1f91b;&#x1f3fc;','&#x1f91b;&#x1f3fd;','&#x1f91b;&#x1f3fe;','&#x1f91b;&#x1f3ff;','&#x1f91c;&#x1f3fb;','&#x1f91c;&#x1f3fc;','&#x1f91c;&#x1f3fd;','&#x1f91c;&#x1f3fe;','&#x1f91c;&#x1f3ff;','&#x1f91e;&#x1f3fb;','&#x1f91e;&#x1f3fc;','&#x1f91e;&#x1f3fd;','&#x1f91e;&#x1f3fe;','&#x1f91e;&#x1f3ff;','&#x1f91f;&#x1f3fb;','&#x1f91f;&#x1f3fc;','&#x1f91f;&#x1f3fd;','&#x1f91f;&#x1f3fe;','&#x1f91f;&#x1f3ff;','&#x1f1f2;&#x1f1e9;','&#x1f1f2;&#x1f1ea;','&#x1f926;&#x1f3fb;','&#x1f1f2;&#x1f1eb;','&#x1f468;&#x1f3ff;','&#x1f926;&#x1f3fc;','&#x1f1f2;&#x1f1ec;','&#x1f1f2;&#x1f1ed;','&#x1f926;&#x1f3fd;','&#x1f1f2;&#x1f1f0;','&#x1f1f2;&#x1f1f1;','&#x1f926;&#x1f3fe;','&#x1f1f2;&#x1f1f2;','&#x1f1f2;&#x1f1f3;','&#x1f926;&#x1f3ff;','&#x1f1f2;&#x1f1f4;','&#x1f1f2;&#x1f1f5;','&#x1f930;&#x1f3fb;','&#x1f930;&#x1f3fc;','&#x1f930;&#x1f3fd;','&#x1f930;&#x1f3fe;','&#x1f930;&#x1f3ff;','&#x1f931;&#x1f3fb;','&#x1f931;&#x1f3fc;','&#x1f931;&#x1f3fd;','&#x1f931;&#x1f3fe;','&#x1f931;&#x1f3ff;','&#x1f932;&#x1f3fb;','&#x1f932;&#x1f3fc;','&#x1f932;&#x1f3fd;','&#x1f932;&#x1f3fe;','&#x1f932;&#x1f3ff;','&#x1f933;&#x1f3fb;','&#x1f933;&#x1f3fc;','&#x1f933;&#x1f3fd;','&#x1f933;&#x1f3fe;','&#x1f933;&#x1f3ff;','&#x1f934;&#x1f3fb;','&#x1f934;&#x1f3fc;','&#x1f934;&#x1f3fd;','&#x1f934;&#x1f3fe;','&#x1f934;&#x1f3ff;','&#x1f935;&#x1f3fb;','&#x1f935;&#x1f3fc;','&#x1f935;&#x1f3fd;','&#x1f935;&#x1f3fe;','&#x1f935;&#x1f3ff;','&#x1f936;&#x1f3fb;','&#x1f936;&#x1f3fc;','&#x1f936;&#x1f3fd;','&#x1f936;&#x1f3fe;','&#x1f936;&#x1f3ff;','&#x1f1f2;&#x1f1f6;','&#x1f1f2;&#x1f1f7;','&#x1f937;&#x1f3fb;','&#x1f1f2;&#x1f1f8;','&#x1f1f2;&#x1f1f9;','&#x1f937;&#x1f3fc;','&#x1f1f2;&#x1f1fa;','&#x1f1f2;&#x1f1fb;','&#x1f937;&#x1f3fd;','&#x1f1f2;&#x1f1fc;','&#x1f1f2;&#x1f1fd;','&#x1f937;&#x1f3fe;','&#x1f1f2;&#x1f1fe;','&#x1f1f2;&#x1f1ff;','&#x1f937;&#x1f3ff;','&#x1f1f3;&#x1f1e6;','&#x1f1f3;&#x1f1e8;','&#x1f1f3;&#x1f1ea;','&#x1f1f3;&#x1f1eb;','&#x1f938;&#x1f3fb;','&#x1f1f3;&#x1f1ec;','&#x1f1f3;&#x1f1ee;','&#x1f938;&#x1f3fc;','&#x1f1f3;&#x1f1f1;','&#x1f1f3;&#x1f1f4;','&#x1f938;&#x1f3fd;','&#x1f1f3;&#x1f1f5;','&#x1f1f3;&#x1f1f7;','&#x1f938;&#x1f3fe;','&#x1f1f3;&#x1f1fa;','&#x1f1f3;&#x1f1ff;','&#x1f938;&#x1f3ff;','&#x1f1f4;&#x1f1f2;','&#x1f1f5;&#x1f1e6;','&#x1f1f5;&#x1f1ea;','&#x1f1f5;&#x1f1eb;','&#x1f939;&#x1f3fb;','&#x1f1f5;&#x1f1ec;','&#x1f1f5;&#x1f1ed;','&#x1f939;&#x1f3fc;','&#x1f1f5;&#x1f1f0;','&#x1f1f5;&#x1f1f1;','&#x1f939;&#x1f3fd;','&#x1f1f5;&#x1f1f2;','&#x1f1f5;&#x1f1f3;','&#x1f939;&#x1f3fe;','&#x1f1f5;&#x1f1f7;','&#x1f1f5;&#x1f1f8;','&#x1f939;&#x1f3ff;','&#x1f1f5;&#x1f1f9;','&#x1f1f5;&#x1f1fc;','&#x1f1f5;&#x1f1fe;','&#x1f1f6;&#x1f1e6;','&#x1f1f7;&#x1f1ea;','&#x1f1f7;&#x1f1f4;','&#x1f93d;&#x1f3fb;','&#x1f1f7;&#x1f1f8;','&#x1f469;&#x1f3fb;','&#x1f93d;&#x1f3fc;','&#x1f1f7;&#x1f1fa;','&#x1f1f7;&#x1f1fc;','&#x1f93d;&#x1f3fd;','&#x1f1f8;&#x1f1e6;','&#x1f1f8;&#x1f1e7;','&#x1f93d;&#x1f3fe;','&#x1f1f8;&#x1f1e8;','&#x1f1f8;&#x1f1e9;','&#x1f93d;&#x1f3ff;','&#x1f1f8;&#x1f1ea;','&#x1f1f8;&#x1f1ec;','&#x1f1e6;&#x1f1e9;','&#x1f1f8;&#x1f1ee;','&#x1f93e;&#x1f3fb;','&#x1f1f8;&#x1f1ef;','&#x1f1f8;&#x1f1f0;','&#x1f93e;&#x1f3fc;','&#x1f1f8;&#x1f1f1;','&#x1f1f8;&#x1f1f2;','&#x1f93e;&#x1f3fd;','&#x1f1f8;&#x1f1f3;','&#x1f1f8;&#x1f1f4;','&#x1f93e;&#x1f3fe;','&#x1f469;&#x1f3fc;','&#x1f1f8;&#x1f1f7;','&#x1f93e;&#x1f3ff;','&#x1f1f8;&#x1f1f8;','&#x1f1f8;&#x1f1f9;','&#x1f9d1;&#x1f3fb;','&#x1f9d1;&#x1f3fc;','&#x1f9d1;&#x1f3fd;','&#x1f9d1;&#x1f3fe;','&#x1f9d1;&#x1f3ff;','&#x1f9d2;&#x1f3fb;','&#x1f9d2;&#x1f3fc;','&#x1f9d2;&#x1f3fd;','&#x1f9d2;&#x1f3fe;','&#x1f9d2;&#x1f3ff;','&#x1f9d3;&#x1f3fb;','&#x1f9d3;&#x1f3fc;','&#x1f9d3;&#x1f3fd;','&#x1f9d3;&#x1f3fe;','&#x1f9d3;&#x1f3ff;','&#x1f9d4;&#x1f3fb;','&#x1f9d4;&#x1f3fc;','&#x1f9d4;&#x1f3fd;','&#x1f9d4;&#x1f3fe;','&#x1f9d4;&#x1f3ff;','&#x1f9d5;&#x1f3fb;','&#x1f9d5;&#x1f3fc;','&#x1f9d5;&#x1f3fd;','&#x1f9d5;&#x1f3fe;','&#x1f9d5;&#x1f3ff;','&#x1f1f8;&#x1f1fb;','&#x1f1f8;&#x1f1fd;','&#x1f9d6;&#x1f3fb;','&#x1f1f8;&#x1f1fe;','&#x1f1f8;&#x1f1ff;','&#x1f9d6;&#x1f3fc;','&#x1f1f9;&#x1f1e6;','&#x1f1f9;&#x1f1e8;','&#x1f9d6;&#x1f3fd;','&#x1f1f9;&#x1f1e9;','&#x1f1f9;&#x1f1eb;','&#x1f9d6;&#x1f3fe;','&#x1f1f9;&#x1f1ec;','&#x1f1f9;&#x1f1ed;','&#x1f9d6;&#x1f3ff;','&#x1f1f9;&#x1f1ef;','&#x1f1f9;&#x1f1f0;','&#x1f1f9;&#x1f1f1;','&#x1f469;&#x1f3fd;','&#x1f9d7;&#x1f3fb;','&#x1f1f9;&#x1f1f2;','&#x1f1f9;&#x1f1f3;','&#x1f9d7;&#x1f3fc;','&#x1f1f9;&#x1f1f4;','&#x1f1f9;&#x1f1f7;','&#x1f9d7;&#x1f3fd;','&#x1f1f9;&#x1f1f9;','&#x1f1f9;&#x1f1fb;','&#x1f9d7;&#x1f3fe;','&#x1f1f9;&#x1f1fc;','&#x1f1f9;&#x1f1ff;','&#x1f9d7;&#x1f3ff;','&#x1f1fa;&#x1f1e6;','&#x1f1fa;&#x1f1ec;','&#x1f1fa;&#x1f1f2;','&#x1f1fa;&#x1f1f3;','&#x1f9d8;&#x1f3fb;','&#x1f1fa;&#x1f1f8;','&#x1f1fa;&#x1f1fe;','&#x1f9d8;&#x1f3fc;','&#x1f1fa;&#x1f1ff;','&#x1f1fb;&#x1f1e6;','&#x1f9d8;&#x1f3fd;','&#x1f469;&#x1f3fe;','&#x1f1fb;&#x1f1e8;','&#x1f9d8;&#x1f3fe;','&#x1f1fb;&#x1f1ea;','&#x1f1fb;&#x1f1ec;','&#x1f9d8;&#x1f3ff;','&#x1f1fb;&#x1f1ee;','&#x1f1fb;&#x1f1f3;','&#x1f1fb;&#x1f1fa;','&#x1f1fc;&#x1f1eb;','&#x1f9d9;&#x1f3fb;','&#x1f1fc;&#x1f1f8;','&#x1f1fd;&#x1f1f0;','&#x1f9d9;&#x1f3fc;','&#x1f1fe;&#x1f1ea;','&#x1f1fe;&#x1f1f9;','&#x1f9d9;&#x1f3fd;','&#x1f1ff;&#x1f1e6;','&#x1f1ff;&#x1f1f2;','&#x1f9d9;&#x1f3fe;','&#x1f1ff;&#x1f1fc;','&#x1f385;&#x1f3fb;','&#x1f9d9;&#x1f3ff;','&#x1f385;&#x1f3fc;','&#x1f469;&#x1f3ff;','&#x1f385;&#x1f3fd;','&#x1f385;&#x1f3fe;','&#x1f9da;&#x1f3fb;','&#x1f385;&#x1f3ff;','&#x1f3c2;&#x1f3fb;','&#x1f9da;&#x1f3fc;','&#x1f3c2;&#x1f3fc;','&#x1f3c2;&#x1f3fd;','&#x1f9da;&#x1f3fd;','&#x1f3c2;&#x1f3fe;','&#x1f3c2;&#x1f3ff;','&#x1f9da;&#x1f3fe;','&#x1f44c;&#x1f3fd;','&#x1f1e6;&#x1f1ea;','&#x1f9da;&#x1f3ff;','&#x1f3c3;&#x1f3fb;','&#x1f1e6;&#x1f1eb;','&#x1f1e6;&#x1f1ec;','&#x1f3c3;&#x1f3fc;','&#x1f9db;&#x1f3fb;','&#x1f1e6;&#x1f1ee;','&#x1f1e6;&#x1f1f1;','&#x1f9db;&#x1f3fc;','&#x1f3c3;&#x1f3fd;','&#x1f1e6;&#x1f1f2;','&#x1f9db;&#x1f3fd;','&#x1f1e6;&#x1f1f4;','&#x1f3c3;&#x1f3fe;','&#x1f9db;&#x1f3fe;','&#x1f1e6;&#x1f1f6;','&#x1f1e6;&#x1f1f7;','&#x1f9db;&#x1f3ff;','&#x1f3c3;&#x1f3ff;','&#x1f1e6;&#x1f1f8;','&#x1f1e6;&#x1f1f9;','&#x1f1e6;&#x1f1fa;','&#x1f9dc;&#x1f3fb;','&#x1f1e6;&#x1f1fc;','&#x1f3c4;&#x1f3fb;','&#x1f9dc;&#x1f3fc;','&#x1f1e6;&#x1f1fd;','&#x1f1e6;&#x1f1ff;','&#x1f9dc;&#x1f3fd;','&#x1f3c4;&#x1f3fc;','&#x1f1e7;&#x1f1e6;','&#x1f9dc;&#x1f3fe;','&#x1f46e;&#x1f3fb;','&#x1f1e7;&#x1f1e7;','&#x1f9dc;&#x1f3ff;','&#x1f3c4;&#x1f3fd;','&#x1f46e;&#x1f3fc;','&#x1f1e7;&#x1f1e9;','&#x1f1e7;&#x1f1ea;','&#x1f9dd;&#x1f3fb;','&#x1f46e;&#x1f3fd;','&#x1f3c4;&#x1f3fe;','&#x1f9dd;&#x1f3fc;','&#x1f1e7;&#x1f1eb;','&#x1f46e;&#x1f3fe;','&#x1f9dd;&#x1f3fd;','&#x1f1e7;&#x1f1ec;','&#x1f3c4;&#x1f3ff;','&#x1f9dd;&#x1f3fe;','&#x1f46e;&#x1f3ff;','&#x1f1e7;&#x1f1ed;','&#x1f9dd;&#x1f3ff;','&#x1f1e7;&#x1f1ee;','&#x1f3c7;&#x1f3fb;','&#x1f3c7;&#x1f3fc;','&#x1f470;&#x1f3fb;','&#x1f470;&#x1f3fc;','&#x1f470;&#x1f3fd;','&#x1f470;&#x1f3fe;','&#x1f470;&#x1f3ff;','&#x1f3c7;&#x1f3fd;','&#x1f3c7;&#x1f3fe;','&#x1f471;&#x1f3fb;','&#x1f3c7;&#x1f3ff;','&#x1f1e7;&#x1f1ef;','&#x1f471;&#x1f3fc;','&#x1f1e7;&#x1f1f1;','&#x1f3ca;&#x1f3fb;','&#x1f471;&#x1f3fd;','&#x1f1f8;&#x1f1ed;','&#x270d;&#x1f3ff;','&#x26f9;&#x1f3fb;','&#x270d;&#x1f3fe;','&#x270d;&#x1f3fd;','&#x270d;&#x1f3fc;','&#x270d;&#x1f3fb;','&#x270c;&#x1f3ff;','&#x270c;&#x1f3fe;','&#x270c;&#x1f3fd;','&#x270c;&#x1f3fc;','&#x270c;&#x1f3fb;','&#x270b;&#x1f3ff;','&#x270b;&#x1f3fe;','&#x270b;&#x1f3fd;','&#x270b;&#x1f3fc;','&#x270b;&#x1f3fb;','&#x270a;&#x1f3ff;','&#x270a;&#x1f3fe;','&#x270a;&#x1f3fd;','&#x270a;&#x1f3fc;','&#x270a;&#x1f3fb;','&#x26f7;&#x1f3fd;','&#x26f7;&#x1f3fe;','&#x26f9;&#x1f3ff;','&#x261d;&#x1f3ff;','&#x261d;&#x1f3fe;','&#x26f9;&#x1f3fe;','&#x261d;&#x1f3fd;','&#x261d;&#x1f3fc;','&#x26f9;&#x1f3fd;','&#x261d;&#x1f3fb;','&#x26f7;&#x1f3ff;','&#x26f9;&#x1f3fc;','&#x26f7;&#x1f3fb;','&#x26f7;&#x1f3fc;','&#x34;&#x20e3;','&#x23;&#x20e3;','&#x30;&#x20e3;','&#x31;&#x20e3;','&#x32;&#x20e3;','&#x33;&#x20e3;','&#x2a;&#x20e3;','&#x35;&#x20e3;','&#x36;&#x20e3;','&#x37;&#x20e3;','&#x38;&#x20e3;','&#x39;&#x20e3;','&#x1f1f3;','&#x1f554;','&#x1f555;','&#x1f556;','&#x1f557;','&#x1f558;','&#x1f559;','&#x1f55a;','&#x1f55b;','&#x1f55c;','&#x1f55d;','&#x1f55e;','&#x1f55f;','&#x1f560;','&#x1f561;','&#x1f562;','&#x1f563;','&#x1f564;','&#x1f565;','&#x1f566;','&#x1f567;','&#x1f56f;','&#x1f570;','&#x1f573;','&#x1f387;','&#x1f388;','&#x1f389;','&#x1f38a;','&#x1f38b;','&#x1f574;','&#x1f38c;','&#x1f38d;','&#x1f38e;','&#x1f38f;','&#x1f390;','&#x1f391;','&#x1f392;','&#x1f393;','&#x1f396;','&#x1f397;','&#x1f399;','&#x1f39a;','&#x1f39b;','&#x1f39e;','&#x1f39f;','&#x1f3a0;','&#x1f3a1;','&#x1f575;','&#x1f576;','&#x1f577;','&#x1f578;','&#x1f579;','&#x1f3a2;','&#x1f3a3;','&#x1f3a4;','&#x1f3a5;','&#x1f3a6;','&#x1f57a;','&#x1f587;','&#x1f58a;','&#x1f58b;','&#x1f58c;','&#x1f58d;','&#x1f3a7;','&#x1f3a8;','&#x1f3a9;','&#x1f3aa;','&#x1f3ab;','&#x1f590;','&#x1f3ac;','&#x1f3ad;','&#x1f3ae;','&#x1f3af;','&#x1f3b0;','&#x1f595;','&#x1f3b1;','&#x1f3b2;','&#x1f3b3;','&#x1f3b4;','&#x1f3b5;','&#x1f596;','&#x1f5a4;','&#x1f5a5;','&#x1f5a8;','&#x1f5b1;','&#x1f5b2;','&#x1f5bc;','&#x1f5c2;','&#x1f5c3;','&#x1f5c4;','&#x1f5d1;','&#x1f5d2;','&#x1f5d3;','&#x1f5dc;','&#x1f5dd;','&#x1f5de;','&#x1f5e1;','&#x1f5e3;','&#x1f5e8;','&#x1f5ef;','&#x1f5f3;','&#x1f5fa;','&#x1f5fb;','&#x1f5fc;','&#x1f5fd;','&#x1f5fe;','&#x1f5ff;','&#x1f600;','&#x1f601;','&#x1f602;','&#x1f603;','&#x1f604;','&#x1f605;','&#x1f606;','&#x1f607;','&#x1f608;','&#x1f609;','&#x1f60a;','&#x1f60b;','&#x1f60c;','&#x1f60d;','&#x1f60e;','&#x1f60f;','&#x1f610;','&#x1f611;','&#x1f612;','&#x1f613;','&#x1f614;','&#x1f615;','&#x1f616;','&#x1f617;','&#x1f618;','&#x1f619;','&#x1f61a;','&#x1f61b;','&#x1f61c;','&#x1f61d;','&#x1f61e;','&#x1f61f;','&#x1f620;','&#x1f621;','&#x1f622;','&#x1f623;','&#x1f624;','&#x1f625;','&#x1f626;','&#x1f627;','&#x1f628;','&#x1f629;','&#x1f62a;','&#x1f62b;','&#x1f62c;','&#x1f62d;','&#x1f62e;','&#x1f62f;','&#x1f630;','&#x1f631;','&#x1f632;','&#x1f633;','&#x1f634;','&#x1f635;','&#x1f636;','&#x1f637;','&#x1f638;','&#x1f639;','&#x1f63a;','&#x1f63b;','&#x1f63c;','&#x1f63d;','&#x1f63e;','&#x1f63f;','&#x1f640;','&#x1f641;','&#x1f642;','&#x1f643;','&#x1f644;','&#x1f3b6;','&#x1f3b7;','&#x1f3b8;','&#x1f3b9;','&#x1f3ba;','&#x1f3bb;','&#x1f3bc;','&#x1f3bd;','&#x1f3be;','&#x1f3bf;','&#x1f3c0;','&#x1f3c1;','&#x1f1e7;','&#x1f1ee;','&#x1f1ea;','&#x1f1f7;','&#x1f1f1;','&#x1f645;','&#x1f3c2;','&#x1f18e;','&#x1f191;','&#x1f1e8;','&#x1f1f9;','&#x1f1ef;','&#x1f192;','&#x1f1ec;','&#x1f193;','&#x1f0cf;','&#x1f194;','&#x1f1f4;','&#x1f1fa;','&#x1f1eb;','&#x1f195;','&#x1f196;','&#x1f197;','&#x1f646;','&#x1f1ed;','&#x1f3c3;','&#x1f198;','&#x1f1e9;','&#x1f1fb;','&#x1f1f0;','&#x1f199;','&#x1f1fc;','&#x1f19a;','&#x1f1fd;','&#x1f1f8;','&#x1f004;','&#x1f1fe;','&#x1f1e6;','&#x1f170;','&#x1f171;','&#x1f1ff;','&#x1f647;','&#x1f648;','&#x1f649;','&#x1f64a;','&#x1f201;','&#x1f202;','&#x1f3c4;','&#x1f3c5;','&#x1f3c6;','&#x1f21a;','&#x1f22f;','&#x1f232;','&#x1f233;','&#x1f234;','&#x1f3c7;','&#x1f468;','&#x1f3c8;','&#x1f3c9;','&#x1f235;','&#x1f236;','&#x1f237;','&#x1f64b;','&#x1f238;','&#x1f239;','&#x1f23a;','&#x1f250;','&#x1f251;','&#x1f64c;','&#x1f300;','&#x1f301;','&#x1f302;','&#x1f303;','&#x1f304;','&#x1f305;','&#x1f306;','&#x1f307;','&#x1f308;','&#x1f3ca;','&#x1f309;','&#x1f30a;','&#x1f30b;','&#x1f30c;','&#x1f30d;','&#x1f30e;','&#x1f30f;','&#x1f64d;','&#x1f310;','&#x1f311;','&#x1f312;','&#x1f313;','&#x1f314;','&#x1f315;','&#x1f316;','&#x1f317;','&#x1f318;','&#x1f319;','&#x1f3cb;','&#x1f31a;','&#x1f31b;','&#x1f31c;','&#x1f31d;','&#x1f31e;','&#x1f31f;','&#x1f64e;','&#x1f320;','&#x1f321;','&#x1f324;','&#x1f325;','&#x1f326;','&#x1f64f;','&#x1f680;','&#x1f681;','&#x1f682;','&#x1f683;','&#x1f684;','&#x1f685;','&#x1f686;','&#x1f687;','&#x1f688;','&#x1f689;','&#x1f68a;','&#x1f68b;','&#x1f68c;','&#x1f68d;','&#x1f68e;','&#x1f68f;','&#x1f690;','&#x1f691;','&#x1f692;','&#x1f693;','&#x1f694;','&#x1f695;','&#x1f696;','&#x1f697;','&#x1f698;','&#x1f699;','&#x1f69a;','&#x1f69b;','&#x1f69c;','&#x1f69d;','&#x1f69e;','&#x1f69f;','&#x1f6a0;','&#x1f6a1;','&#x1f6a2;','&#x1f327;','&#x1f328;','&#x1f329;','&#x1f32a;','&#x1f32b;','&#x1f32c;','&#x1f3cc;','&#x1f3cd;','&#x1f3ce;','&#x1f3cf;','&#x1f3d0;','&#x1f3d1;','&#x1f3d2;','&#x1f3d3;','&#x1f3d4;','&#x1f3d5;','&#x1f3d6;','&#x1f6a3;','&#x1f6a4;','&#x1f6a5;','&#x1f6a6;','&#x1f6a7;','&#x1f6a8;','&#x1f6a9;','&#x1f6aa;','&#x1f6ab;','&#x1f6ac;','&#x1f6ad;','&#x1f6ae;','&#x1f6af;','&#x1f6b0;','&#x1f6b1;','&#x1f6b2;','&#x1f6b3;','&#x1f3d7;','&#x1f3d8;','&#x1f3d9;','&#x1f3da;','&#x1f3db;','&#x1f3dc;','&#x1f3dd;','&#x1f3de;','&#x1f3df;','&#x1f3e0;','&#x1f3e1;','&#x1f3e2;','&#x1f3e3;','&#x1f3e4;','&#x1f3e5;','&#x1f3e6;','&#x1f3e7;','&#x1f6b4;','&#x1f3e8;','&#x1f3e9;','&#x1f3ea;','&#x1f3eb;','&#x1f3ec;','&#x1f3ed;','&#x1f3ee;','&#x1f3ef;','&#x1f3f0;','&#x1f32d;','&#x1f3f3;','&#x1f32e;','&#x1f32f;','&#x1f330;','&#x1f331;','&#x1f3f4;','&#x1f3f5;','&#x1f6b5;','&#x1f3f7;','&#x1f3f8;','&#x1f3f9;','&#x1f3fa;','&#x1f3fb;','&#x1f3fc;','&#x1f3fd;','&#x1f3fe;','&#x1f3ff;','&#x1f400;','&#x1f401;','&#x1f402;','&#x1f403;','&#x1f404;','&#x1f405;','&#x1f469;','&#x1f46a;','&#x1f6b6;','&#x1f6b7;','&#x1f6b8;','&#x1f6b9;','&#x1f6ba;','&#x1f6bb;','&#x1f6bc;','&#x1f6bd;','&#x1f6be;','&#x1f6bf;','&#x1f46b;','&#x1f46c;','&#x1f46d;','&#x1f406;','&#x1f407;','&#x1f6c0;','&#x1f6c1;','&#x1f6c2;','&#x1f6c3;','&#x1f6c4;','&#x1f6c5;','&#x1f6cb;','&#x1f408;','&#x1f409;','&#x1f40a;','&#x1f40b;','&#x1f40c;','&#x1f6cc;','&#x1f6cd;','&#x1f6ce;','&#x1f6cf;','&#x1f6d0;','&#x1f6d1;','&#x1f6d2;','&#x1f6e0;','&#x1f6e1;','&#x1f6e2;','&#x1f6e3;','&#x1f6e4;','&#x1f6e5;','&#x1f6e9;','&#x1f6eb;','&#x1f6ec;','&#x1f6f0;','&#x1f6f3;','&#x1f6f4;','&#x1f6f5;','&#x1f6f6;','&#x1f6f7;','&#x1f6f8;','&#x1f910;','&#x1f911;','&#x1f912;','&#x1f913;','&#x1f914;','&#x1f915;','&#x1f916;','&#x1f917;','&#x1f40d;','&#x1f40e;','&#x1f40f;','&#x1f410;','&#x1f411;','&#x1f918;','&#x1f412;','&#x1f413;','&#x1f414;','&#x1f415;','&#x1f416;','&#x1f919;','&#x1f46e;','&#x1f417;','&#x1f418;','&#x1f46f;','&#x1f419;','&#x1f91a;','&#x1f41a;','&#x1f41b;','&#x1f41c;','&#x1f41d;','&#x1f470;','&#x1f91b;','&#x1f41e;','&#x1f41f;','&#x1f420;','&#x1f421;','&#x1f422;','&#x1f91c;','&#x1f91d;','&#x1f423;','&#x1f424;','&#x1f425;','&#x1f426;','&#x1f427;','&#x1f91e;','&#x1f428;','&#x1f429;','&#x1f42a;','&#x1f42b;','&#x1f42c;','&#x1f91f;','&#x1f920;','&#x1f921;','&#x1f922;','&#x1f923;','&#x1f924;','&#x1f925;','&#x1f42d;','&#x1f42e;','&#x1f471;','&#x1f42f;','&#x1f430;','&#x1f431;','&#x1f432;','&#x1f433;','&#x1f472;','&#x1f434;','&#x1f435;','&#x1f436;','&#x1f437;','&#x1f438;','&#x1f439;','&#x1f43a;','&#x1f43b;','&#x1f926;','&#x1f927;','&#x1f928;','&#x1f929;','&#x1f92a;','&#x1f92b;','&#x1f92c;','&#x1f92d;','&#x1f92e;','&#x1f92f;','&#x1f43c;','&#x1f43d;','&#x1f43e;','&#x1f43f;','&#x1f440;','&#x1f930;','&#x1f332;','&#x1f441;','&#x1f333;','&#x1f334;','&#x1f473;','&#x1f931;','&#x1f335;','&#x1f336;','&#x1f337;','&#x1f442;','&#x1f338;','&#x1f932;','&#x1f474;','&#x1f339;','&#x1f33a;','&#x1f33b;','&#x1f33c;','&#x1f933;','&#x1f443;','&#x1f475;','&#x1f444;','&#x1f445;','&#x1f33d;','&#x1f934;','&#x1f33e;','&#x1f33f;','&#x1f476;','&#x1f340;','&#x1f341;','&#x1f935;','&#x1f446;','&#x1f342;','&#x1f343;','&#x1f344;','&#x1f345;','&#x1f936;','&#x1f346;','&#x1f447;','&#x1f347;','&#x1f348;','&#x1f349;','&#x1f34a;','&#x1f34b;','&#x1f448;','&#x1f34c;','&#x1f34d;','&#x1f477;','&#x1f34e;','&#x1f34f;','&#x1f350;','&#x1f449;','&#x1f351;','&#x1f478;','&#x1f937;','&#x1f479;','&#x1f47a;','&#x1f47b;','&#x1f352;','&#x1f353;','&#x1f354;','&#x1f355;','&#x1f44a;','&#x1f47c;','&#x1f47d;','&#x1f47e;','&#x1f47f;','&#x1f480;','&#x1f356;','&#x1f357;','&#x1f358;','&#x1f359;','&#x1f938;','&#x1f35a;','&#x1f44b;','&#x1f35b;','&#x1f35c;','&#x1f35d;','&#x1f35e;','&#x1f35f;','&#x1f44c;','&#x1f360;','&#x1f361;','&#x1f362;','&#x1f363;','&#x1f364;','&#x1f481;','&#x1f44d;','&#x1f365;','&#x1f366;','&#x1f939;','&#x1f93a;','&#x1f367;','&#x1f368;','&#x1f93c;','&#x1f369;','&#x1f44e;','&#x1f36a;','&#x1f36b;','&#x1f36c;','&#x1f36d;','&#x1f36e;','&#x1f44f;','&#x1f36f;','&#x1f370;','&#x1f371;','&#x1f372;','&#x1f482;','&#x1f373;','&#x1f450;','&#x1f451;','&#x1f452;','&#x1f93d;','&#x1f453;','&#x1f483;','&#x1f484;','&#x1f454;','&#x1f455;','&#x1f456;','&#x1f457;','&#x1f458;','&#x1f485;','&#x1f459;','&#x1f45a;','&#x1f45b;','&#x1f45c;','&#x1f45d;','&#x1f45e;','&#x1f45f;','&#x1f460;','&#x1f93e;','&#x1f940;','&#x1f941;','&#x1f942;','&#x1f943;','&#x1f944;','&#x1f945;','&#x1f947;','&#x1f948;','&#x1f949;','&#x1f94a;','&#x1f94b;','&#x1f94c;','&#x1f950;','&#x1f951;','&#x1f952;','&#x1f953;','&#x1f954;','&#x1f955;','&#x1f956;','&#x1f957;','&#x1f958;','&#x1f959;','&#x1f95a;','&#x1f95b;','&#x1f95c;','&#x1f95d;','&#x1f95e;','&#x1f95f;','&#x1f960;','&#x1f961;','&#x1f962;','&#x1f963;','&#x1f964;','&#x1f965;','&#x1f966;','&#x1f967;','&#x1f968;','&#x1f969;','&#x1f96a;','&#x1f96b;','&#x1f980;','&#x1f981;','&#x1f982;','&#x1f983;','&#x1f984;','&#x1f985;','&#x1f986;','&#x1f987;','&#x1f988;','&#x1f989;','&#x1f98a;','&#x1f98b;','&#x1f98c;','&#x1f98d;','&#x1f98e;','&#x1f98f;','&#x1f990;','&#x1f991;','&#x1f992;','&#x1f993;','&#x1f994;','&#x1f995;','&#x1f996;','&#x1f997;','&#x1f9c0;','&#x1f9d0;','&#x1f461;','&#x1f462;','&#x1f463;','&#x1f464;','&#x1f465;','&#x1f9d1;','&#x1f374;','&#x1f375;','&#x1f376;','&#x1f377;','&#x1f486;','&#x1f9d2;','&#x1f378;','&#x1f466;','&#x1f379;','&#x1f37a;','&#x1f37b;','&#x1f9d3;','&#x1f37c;','&#x1f37d;','&#x1f467;','&#x1f37e;','&#x1f37f;','&#x1f9d4;','&#x1f380;','&#x1f381;','&#x1f382;','&#x1f383;','&#x1f384;','&#x1f9d5;','&#x1f1f5;','&#x1f17e;','&#x1f487;','&#x1f488;','&#x1f489;','&#x1f48a;','&#x1f48b;','&#x1f48c;','&#x1f48d;','&#x1f48e;','&#x1f48f;','&#x1f490;','&#x1f491;','&#x1f492;','&#x1f493;','&#x1f494;','&#x1f495;','&#x1f9d6;','&#x1f496;','&#x1f497;','&#x1f498;','&#x1f499;','&#x1f49a;','&#x1f49b;','&#x1f49c;','&#x1f49d;','&#x1f49e;','&#x1f49f;','&#x1f4a0;','&#x1f4a1;','&#x1f4a2;','&#x1f4a3;','&#x1f4a4;','&#x1f4a5;','&#x1f4a6;','&#x1f9d7;','&#x1f4a7;','&#x1f4a8;','&#x1f4a9;','&#x1f1f6;','&#x1f1f2;','&#x1f17f;','&#x1f385;','&#x1f386;','&#x1f4aa;','&#x1f4ab;','&#x1f4ac;','&#x1f4ad;','&#x1f4ae;','&#x1f4af;','&#x1f4b0;','&#x1f4b1;','&#x1f4b2;','&#x1f9d8;','&#x1f4b3;','&#x1f4b4;','&#x1f4b5;','&#x1f4b6;','&#x1f4b7;','&#x1f4b8;','&#x1f4b9;','&#x1f4ba;','&#x1f4bb;','&#x1f4bc;','&#x1f4bd;','&#x1f4be;','&#x1f4bf;','&#x1f4c0;','&#x1f4c1;','&#x1f4c2;','&#x1f4c3;','&#x1f9d9;','&#x1f4c4;','&#x1f4c5;','&#x1f4c6;','&#x1f4c7;','&#x1f4c8;','&#x1f4c9;','&#x1f4ca;','&#x1f4cb;','&#x1f4cc;','&#x1f4cd;','&#x1f4ce;','&#x1f4cf;','&#x1f4d0;','&#x1f4d1;','&#x1f4d2;','&#x1f4d3;','&#x1f4d4;','&#x1f9da;','&#x1f4d5;','&#x1f4d6;','&#x1f4d7;','&#x1f4d8;','&#x1f4d9;','&#x1f4da;','&#x1f4db;','&#x1f4dc;','&#x1f4dd;','&#x1f4de;','&#x1f4df;','&#x1f4e0;','&#x1f4e1;','&#x1f4e2;','&#x1f4e3;','&#x1f4e4;','&#x1f4e5;','&#x1f9db;','&#x1f4e6;','&#x1f4e7;','&#x1f4e8;','&#x1f4e9;','&#x1f4ea;','&#x1f4eb;','&#x1f4ec;','&#x1f4ed;','&#x1f4ee;','&#x1f4ef;','&#x1f4f0;','&#x1f4f1;','&#x1f4f2;','&#x1f4f3;','&#x1f4f4;','&#x1f4f5;','&#x1f4f6;','&#x1f9dc;','&#x1f4f7;','&#x1f4f8;','&#x1f4f9;','&#x1f4fa;','&#x1f4fb;','&#x1f4fc;','&#x1f4fd;','&#x1f4ff;','&#x1f500;','&#x1f501;','&#x1f502;','&#x1f503;','&#x1f504;','&#x1f505;','&#x1f506;','&#x1f507;','&#x1f508;','&#x1f9dd;','&#x1f509;','&#x1f50a;','&#x1f9de;','&#x1f50b;','&#x1f50c;','&#x1f9df;','&#x1f9e0;','&#x1f9e1;','&#x1f9e2;','&#x1f9e3;','&#x1f9e4;','&#x1f9e5;','&#x1f9e6;','&#x1f50d;','&#x1f50e;','&#x1f50f;','&#x1f510;','&#x1f511;','&#x1f512;','&#x1f513;','&#x1f514;','&#x1f515;','&#x1f516;','&#x1f517;','&#x1f518;','&#x1f519;','&#x1f51a;','&#x1f51b;','&#x1f51c;','&#x1f51d;','&#x1f51e;','&#x1f51f;','&#x1f520;','&#x1f521;','&#x1f522;','&#x1f523;','&#x1f524;','&#x1f525;','&#x1f526;','&#x1f527;','&#x1f528;','&#x1f529;','&#x1f52a;','&#x1f52b;','&#x1f52c;','&#x1f52d;','&#x1f52e;','&#x1f52f;','&#x1f530;','&#x1f531;','&#x1f532;','&#x1f533;','&#x1f534;','&#x1f535;','&#x1f536;','&#x1f537;','&#x1f538;','&#x1f539;','&#x1f53a;','&#x1f53b;','&#x1f53c;','&#x1f53d;','&#x1f549;','&#x1f54a;','&#x1f54b;','&#x1f54c;','&#x1f54d;','&#x1f54e;','&#x1f550;','&#x1f551;','&#x1f552;','&#x1f553;','&#x25aa;','&#x2626;','&#x262e;','&#x262f;','&#x2638;','&#x2639;','&#x263a;','&#x2640;','&#x2642;','&#x2648;','&#x2649;','&#x264a;','&#x264b;','&#x264c;','&#x264d;','&#x264e;','&#x264f;','&#x2650;','&#x2651;','&#x2652;','&#x2653;','&#x2660;','&#x2663;','&#x2665;','&#x2666;','&#x2668;','&#x267b;','&#x267f;','&#x2692;','&#x2693;','&#x2694;','&#x2695;','&#x2696;','&#x2697;','&#x2699;','&#x269b;','&#x269c;','&#x26a0;','&#x26a1;','&#x26aa;','&#x26ab;','&#x26b0;','&#x26b1;','&#x26bd;','&#x26be;','&#x26c4;','&#x26c5;','&#x26c8;','&#x26ce;','&#x26cf;','&#x26d1;','&#x26d3;','&#x26d4;','&#x26e9;','&#x26ea;','&#x26f0;','&#x26f1;','&#x26f2;','&#x26f3;','&#x26f4;','&#x26f5;','&#x2623;','&#x2622;','&#x2620;','&#x261d;','&#x2618;','&#x26f7;','&#x26f8;','&#x2615;','&#x2614;','&#x2611;','&#x260e;','&#x2604;','&#x2603;','&#x2602;','&#x2601;','&#x2600;','&#x25fe;','&#x25fd;','&#x25fc;','&#x25fb;','&#x25c0;','&#x25b6;','&#x25ab;','&#x262a;','&#x26f9;','&#x26fa;','&#x26fd;','&#x2702;','&#x2705;','&#x2708;','&#x2709;','&#x24c2;','&#x23fa;','&#x23f9;','&#x23f8;','&#x23f3;','&#x270a;','&#x23f2;','&#x23f1;','&#x23f0;','&#x23ef;','&#x23ee;','&#x270b;','&#x23ed;','&#x23ec;','&#x23eb;','&#x23ea;','&#x23e9;','&#x270c;','&#x23cf;','&#x2328;','&#x231b;','&#x231a;','&#x21aa;','&#x270d;','&#x270f;','&#x2712;','&#x2714;','&#x2716;','&#x271d;','&#x2721;','&#x2728;','&#x2733;','&#x2734;','&#x2744;','&#x2747;','&#x274c;','&#x274e;','&#x2753;','&#x2754;','&#x2755;','&#x2757;','&#x2763;','&#x2764;','&#x2795;','&#x2796;','&#x2797;','&#x27a1;','&#x27b0;','&#x27bf;','&#x2934;','&#x2935;','&#x21a9;','&#x2b05;','&#x2b06;','&#x2b07;','&#x2b1b;','&#x2b1c;','&#x2b50;','&#x2b55;','&#x2199;','&#x3030;','&#x303d;','&#x2198;','&#x2197;','&#x3297;','&#x3299;','&#x2196;','&#x2195;','&#x2194;','&#x2139;','&#x2122;','&#x2049;','&#x203c;','&#xe50a;');
-	$partials = array('&#x1f004;','&#x1f0cf;','&#x1f170;','&#x1f171;','&#x1f17e;','&#x1f17f;','&#x1f18e;','&#x1f191;','&#x1f192;','&#x1f193;','&#x1f194;','&#x1f195;','&#x1f196;','&#x1f197;','&#x1f198;','&#x1f199;','&#x1f19a;','&#x1f1e6;','&#x1f1e8;','&#x1f1e9;','&#x1f1ea;','&#x1f1eb;','&#x1f1ec;','&#x1f1ee;','&#x1f1f1;','&#x1f1f2;','&#x1f1f4;','&#x1f1f6;','&#x1f1f7;','&#x1f1f8;','&#x1f1f9;','&#x1f1fa;','&#x1f1fc;','&#x1f1fd;','&#x1f1ff;','&#x1f1e7;','&#x1f1ed;','&#x1f1ef;','&#x1f1f3;','&#x1f1fb;','&#x1f1fe;','&#x1f1f0;','&#x1f1f5;','&#x1f201;','&#x1f202;','&#x1f21a;','&#x1f22f;','&#x1f232;','&#x1f233;','&#x1f234;','&#x1f235;','&#x1f236;','&#x1f237;','&#x1f238;','&#x1f239;','&#x1f23a;','&#x1f250;','&#x1f251;','&#x1f300;','&#x1f301;','&#x1f302;','&#x1f303;','&#x1f304;','&#x1f305;','&#x1f306;','&#x1f307;','&#x1f308;','&#x1f309;','&#x1f30a;','&#x1f30b;','&#x1f30c;','&#x1f30d;','&#x1f30e;','&#x1f30f;','&#x1f310;','&#x1f311;','&#x1f312;','&#x1f313;','&#x1f314;','&#x1f315;','&#x1f316;','&#x1f317;','&#x1f318;','&#x1f319;','&#x1f31a;','&#x1f31b;','&#x1f31c;','&#x1f31d;','&#x1f31e;','&#x1f31f;','&#x1f320;','&#x1f321;','&#x1f324;','&#x1f325;','&#x1f326;','&#x1f327;','&#x1f328;','&#x1f329;','&#x1f32a;','&#x1f32b;','&#x1f32c;','&#x1f32d;','&#x1f32e;','&#x1f32f;','&#x1f330;','&#x1f331;','&#x1f332;','&#x1f333;','&#x1f334;','&#x1f335;','&#x1f336;','&#x1f337;','&#x1f338;','&#x1f339;','&#x1f33a;','&#x1f33b;','&#x1f33c;','&#x1f33d;','&#x1f33e;','&#x1f33f;','&#x1f340;','&#x1f341;','&#x1f342;','&#x1f343;','&#x1f344;','&#x1f345;','&#x1f346;','&#x1f347;','&#x1f348;','&#x1f349;','&#x1f34a;','&#x1f34b;','&#x1f34c;','&#x1f34d;','&#x1f34e;','&#x1f34f;','&#x1f350;','&#x1f351;','&#x1f352;','&#x1f353;','&#x1f354;','&#x1f355;','&#x1f356;','&#x1f357;','&#x1f358;','&#x1f359;','&#x1f35a;','&#x1f35b;','&#x1f35c;','&#x1f35d;','&#x1f35e;','&#x1f35f;','&#x1f360;','&#x1f361;','&#x1f362;','&#x1f363;','&#x1f364;','&#x1f365;','&#x1f366;','&#x1f367;','&#x1f368;','&#x1f369;','&#x1f36a;','&#x1f36b;','&#x1f36c;','&#x1f36d;','&#x1f36e;','&#x1f36f;','&#x1f370;','&#x1f371;','&#x1f372;','&#x1f373;','&#x1f374;','&#x1f375;','&#x1f376;','&#x1f377;','&#x1f378;','&#x1f379;','&#x1f37a;','&#x1f37b;','&#x1f37c;','&#x1f37d;','&#x1f37e;','&#x1f37f;','&#x1f380;','&#x1f381;','&#x1f382;','&#x1f383;','&#x1f384;','&#x1f385;','&#x1f3fb;','&#x1f3fc;','&#x1f3fd;','&#x1f3fe;','&#x1f3ff;','&#x1f386;','&#x1f387;','&#x1f388;','&#x1f389;','&#x1f38a;','&#x1f38b;','&#x1f38c;','&#x1f38d;','&#x1f38e;','&#x1f38f;','&#x1f390;','&#x1f391;','&#x1f392;','&#x1f393;','&#x1f396;','&#x1f397;','&#x1f399;','&#x1f39a;','&#x1f39b;','&#x1f39e;','&#x1f39f;','&#x1f3a0;','&#x1f3a1;','&#x1f3a2;','&#x1f3a3;','&#x1f3a4;','&#x1f3a5;','&#x1f3a6;','&#x1f3a7;','&#x1f3a8;','&#x1f3a9;','&#x1f3aa;','&#x1f3ab;','&#x1f3ac;','&#x1f3ad;','&#x1f3ae;','&#x1f3af;','&#x1f3b0;','&#x1f3b1;','&#x1f3b2;','&#x1f3b3;','&#x1f3b4;','&#x1f3b5;','&#x1f3b6;','&#x1f3b7;','&#x1f3b8;','&#x1f3b9;','&#x1f3ba;','&#x1f3bb;','&#x1f3bc;','&#x1f3bd;','&#x1f3be;','&#x1f3bf;','&#x1f3c0;','&#x1f3c1;','&#x1f3c2;','&#x1f3c3;','&#x200d;','&#x2640;','&#xfe0f;','&#x2642;','&#x1f3c4;','&#x1f3c5;','&#x1f3c6;','&#x1f3c7;','&#x1f3c8;','&#x1f3c9;','&#x1f3ca;','&#x1f3cb;','&#x1f3cc;','&#x1f3cd;','&#x1f3ce;','&#x1f3cf;','&#x1f3d0;','&#x1f3d1;','&#x1f3d2;','&#x1f3d3;','&#x1f3d4;','&#x1f3d5;','&#x1f3d6;','&#x1f3d7;','&#x1f3d8;','&#x1f3d9;','&#x1f3da;','&#x1f3db;','&#x1f3dc;','&#x1f3dd;','&#x1f3de;','&#x1f3df;','&#x1f3e0;','&#x1f3e1;','&#x1f3e2;','&#x1f3e3;','&#x1f3e4;','&#x1f3e5;','&#x1f3e6;','&#x1f3e7;','&#x1f3e8;','&#x1f3e9;','&#x1f3ea;','&#x1f3eb;','&#x1f3ec;','&#x1f3ed;','&#x1f3ee;','&#x1f3ef;','&#x1f3f0;','&#x1f3f3;','&#x1f3f4;','&#x2620;','&#xe0067;','&#xe0062;','&#xe0065;','&#xe006e;','&#xe007f;','&#xe0073;','&#xe0063;','&#xe0074;','&#xe0077;','&#xe006c;','&#x1f3f5;','&#x1f3f7;','&#x1f3f8;','&#x1f3f9;','&#x1f3fa;','&#x1f400;','&#x1f401;','&#x1f402;','&#x1f403;','&#x1f404;','&#x1f405;','&#x1f406;','&#x1f407;','&#x1f408;','&#x1f409;','&#x1f40a;','&#x1f40b;','&#x1f40c;','&#x1f40d;','&#x1f40e;','&#x1f40f;','&#x1f410;','&#x1f411;','&#x1f412;','&#x1f413;','&#x1f414;','&#x1f415;','&#x1f416;','&#x1f417;','&#x1f418;','&#x1f419;','&#x1f41a;','&#x1f41b;','&#x1f41c;','&#x1f41d;','&#x1f41e;','&#x1f41f;','&#x1f420;','&#x1f421;','&#x1f422;','&#x1f423;','&#x1f424;','&#x1f425;','&#x1f426;','&#x1f427;','&#x1f428;','&#x1f429;','&#x1f42a;','&#x1f42b;','&#x1f42c;','&#x1f42d;','&#x1f42e;','&#x1f42f;','&#x1f430;','&#x1f431;','&#x1f432;','&#x1f433;','&#x1f434;','&#x1f435;','&#x1f436;','&#x1f437;','&#x1f438;','&#x1f439;','&#x1f43a;','&#x1f43b;','&#x1f43c;','&#x1f43d;','&#x1f43e;','&#x1f43f;','&#x1f440;','&#x1f441;','&#x1f5e8;','&#x1f442;','&#x1f443;','&#x1f444;','&#x1f445;','&#x1f446;','&#x1f447;','&#x1f448;','&#x1f449;','&#x1f44a;','&#x1f44b;','&#x1f44c;','&#x1f44d;','&#x1f44e;','&#x1f44f;','&#x1f450;','&#x1f451;','&#x1f452;','&#x1f453;','&#x1f454;','&#x1f455;','&#x1f456;','&#x1f457;','&#x1f458;','&#x1f459;','&#x1f45a;','&#x1f45b;','&#x1f45c;','&#x1f45d;','&#x1f45e;','&#x1f45f;','&#x1f460;','&#x1f461;','&#x1f462;','&#x1f463;','&#x1f464;','&#x1f465;','&#x1f466;','&#x1f467;','&#x1f468;','&#x1f4bb;','&#x1f4bc;','&#x1f527;','&#x1f52c;','&#x1f680;','&#x1f692;','&#x2695;','&#x2696;','&#x2708;','&#x1f469;','&#x2764;','&#x1f48b;','&#x1f46a;','&#x1f46b;','&#x1f46c;','&#x1f46d;','&#x1f46e;','&#x1f46f;','&#x1f470;','&#x1f471;','&#x1f472;','&#x1f473;','&#x1f474;','&#x1f475;','&#x1f476;','&#x1f477;','&#x1f478;','&#x1f479;','&#x1f47a;','&#x1f47b;','&#x1f47c;','&#x1f47d;','&#x1f47e;','&#x1f47f;','&#x1f480;','&#x1f481;','&#x1f482;','&#x1f483;','&#x1f484;','&#x1f485;','&#x1f486;','&#x1f487;','&#x1f488;','&#x1f489;','&#x1f48a;','&#x1f48c;','&#x1f48d;','&#x1f48e;','&#x1f48f;','&#x1f490;','&#x1f491;','&#x1f492;','&#x1f493;','&#x1f494;','&#x1f495;','&#x1f496;','&#x1f497;','&#x1f498;','&#x1f499;','&#x1f49a;','&#x1f49b;','&#x1f49c;','&#x1f49d;','&#x1f49e;','&#x1f49f;','&#x1f4a0;','&#x1f4a1;','&#x1f4a2;','&#x1f4a3;','&#x1f4a4;','&#x1f4a5;','&#x1f4a6;','&#x1f4a7;','&#x1f4a8;','&#x1f4a9;','&#x1f4aa;','&#x1f4ab;','&#x1f4ac;','&#x1f4ad;','&#x1f4ae;','&#x1f4af;','&#x1f4b0;','&#x1f4b1;','&#x1f4b2;','&#x1f4b3;','&#x1f4b4;','&#x1f4b5;','&#x1f4b6;','&#x1f4b7;','&#x1f4b8;','&#x1f4b9;','&#x1f4ba;','&#x1f4bd;','&#x1f4be;','&#x1f4bf;','&#x1f4c0;','&#x1f4c1;','&#x1f4c2;','&#x1f4c3;','&#x1f4c4;','&#x1f4c5;','&#x1f4c6;','&#x1f4c7;','&#x1f4c8;','&#x1f4c9;','&#x1f4ca;','&#x1f4cb;','&#x1f4cc;','&#x1f4cd;','&#x1f4ce;','&#x1f4cf;','&#x1f4d0;','&#x1f4d1;','&#x1f4d2;','&#x1f4d3;','&#x1f4d4;','&#x1f4d5;','&#x1f4d6;','&#x1f4d7;','&#x1f4d8;','&#x1f4d9;','&#x1f4da;','&#x1f4db;','&#x1f4dc;','&#x1f4dd;','&#x1f4de;','&#x1f4df;','&#x1f4e0;','&#x1f4e1;','&#x1f4e2;','&#x1f4e3;','&#x1f4e4;','&#x1f4e5;','&#x1f4e6;','&#x1f4e7;','&#x1f4e8;','&#x1f4e9;','&#x1f4ea;','&#x1f4eb;','&#x1f4ec;','&#x1f4ed;','&#x1f4ee;','&#x1f4ef;','&#x1f4f0;','&#x1f4f1;','&#x1f4f2;','&#x1f4f3;','&#x1f4f4;','&#x1f4f5;','&#x1f4f6;','&#x1f4f7;','&#x1f4f8;','&#x1f4f9;','&#x1f4fa;','&#x1f4fb;','&#x1f4fc;','&#x1f4fd;','&#x1f4ff;','&#x1f500;','&#x1f501;','&#x1f502;','&#x1f503;','&#x1f504;','&#x1f505;','&#x1f506;','&#x1f507;','&#x1f508;','&#x1f509;','&#x1f50a;','&#x1f50b;','&#x1f50c;','&#x1f50d;','&#x1f50e;','&#x1f50f;','&#x1f510;','&#x1f511;','&#x1f512;','&#x1f513;','&#x1f514;','&#x1f515;','&#x1f516;','&#x1f517;','&#x1f518;','&#x1f519;','&#x1f51a;','&#x1f51b;','&#x1f51c;','&#x1f51d;','&#x1f51e;','&#x1f51f;','&#x1f520;','&#x1f521;','&#x1f522;','&#x1f523;','&#x1f524;','&#x1f525;','&#x1f526;','&#x1f528;','&#x1f529;','&#x1f52a;','&#x1f52b;','&#x1f52d;','&#x1f52e;','&#x1f52f;','&#x1f530;','&#x1f531;','&#x1f532;','&#x1f533;','&#x1f534;','&#x1f535;','&#x1f536;','&#x1f537;','&#x1f538;','&#x1f539;','&#x1f53a;','&#x1f53b;','&#x1f53c;','&#x1f53d;','&#x1f549;','&#x1f54a;','&#x1f54b;','&#x1f54c;','&#x1f54d;','&#x1f54e;','&#x1f550;','&#x1f551;','&#x1f552;','&#x1f553;','&#x1f554;','&#x1f555;','&#x1f556;','&#x1f557;','&#x1f558;','&#x1f559;','&#x1f55a;','&#x1f55b;','&#x1f55c;','&#x1f55d;','&#x1f55e;','&#x1f55f;','&#x1f560;','&#x1f561;','&#x1f562;','&#x1f563;','&#x1f564;','&#x1f565;','&#x1f566;','&#x1f567;','&#x1f56f;','&#x1f570;','&#x1f573;','&#x1f574;','&#x1f575;','&#x1f576;','&#x1f577;','&#x1f578;','&#x1f579;','&#x1f57a;','&#x1f587;','&#x1f58a;','&#x1f58b;','&#x1f58c;','&#x1f58d;','&#x1f590;','&#x1f595;','&#x1f596;','&#x1f5a4;','&#x1f5a5;','&#x1f5a8;','&#x1f5b1;','&#x1f5b2;','&#x1f5bc;','&#x1f5c2;','&#x1f5c3;','&#x1f5c4;','&#x1f5d1;','&#x1f5d2;','&#x1f5d3;','&#x1f5dc;','&#x1f5dd;','&#x1f5de;','&#x1f5e1;','&#x1f5e3;','&#x1f5ef;','&#x1f5f3;','&#x1f5fa;','&#x1f5fb;','&#x1f5fc;','&#x1f5fd;','&#x1f5fe;','&#x1f5ff;','&#x1f600;','&#x1f601;','&#x1f602;','&#x1f603;','&#x1f604;','&#x1f605;','&#x1f606;','&#x1f607;','&#x1f608;','&#x1f609;','&#x1f60a;','&#x1f60b;','&#x1f60c;','&#x1f60d;','&#x1f60e;','&#x1f60f;','&#x1f610;','&#x1f611;','&#x1f612;','&#x1f613;','&#x1f614;','&#x1f615;','&#x1f616;','&#x1f617;','&#x1f618;','&#x1f619;','&#x1f61a;','&#x1f61b;','&#x1f61c;','&#x1f61d;','&#x1f61e;','&#x1f61f;','&#x1f620;','&#x1f621;','&#x1f622;','&#x1f623;','&#x1f624;','&#x1f625;','&#x1f626;','&#x1f627;','&#x1f628;','&#x1f629;','&#x1f62a;','&#x1f62b;','&#x1f62c;','&#x1f62d;','&#x1f62e;','&#x1f62f;','&#x1f630;','&#x1f631;','&#x1f632;','&#x1f633;','&#x1f634;','&#x1f635;','&#x1f636;','&#x1f637;','&#x1f638;','&#x1f639;','&#x1f63a;','&#x1f63b;','&#x1f63c;','&#x1f63d;','&#x1f63e;','&#x1f63f;','&#x1f640;','&#x1f641;','&#x1f642;','&#x1f643;','&#x1f644;','&#x1f645;','&#x1f646;','&#x1f647;','&#x1f648;','&#x1f649;','&#x1f64a;','&#x1f64b;','&#x1f64c;','&#x1f64d;','&#x1f64e;','&#x1f64f;','&#x1f681;','&#x1f682;','&#x1f683;','&#x1f684;','&#x1f685;','&#x1f686;','&#x1f687;','&#x1f688;','&#x1f689;','&#x1f68a;','&#x1f68b;','&#x1f68c;','&#x1f68d;','&#x1f68e;','&#x1f68f;','&#x1f690;','&#x1f691;','&#x1f693;','&#x1f694;','&#x1f695;','&#x1f696;','&#x1f697;','&#x1f698;','&#x1f699;','&#x1f69a;','&#x1f69b;','&#x1f69c;','&#x1f69d;','&#x1f69e;','&#x1f69f;','&#x1f6a0;','&#x1f6a1;','&#x1f6a2;','&#x1f6a3;','&#x1f6a4;','&#x1f6a5;','&#x1f6a6;','&#x1f6a7;','&#x1f6a8;','&#x1f6a9;','&#x1f6aa;','&#x1f6ab;','&#x1f6ac;','&#x1f6ad;','&#x1f6ae;','&#x1f6af;','&#x1f6b0;','&#x1f6b1;','&#x1f6b2;','&#x1f6b3;','&#x1f6b4;','&#x1f6b5;','&#x1f6b6;','&#x1f6b7;','&#x1f6b8;','&#x1f6b9;','&#x1f6ba;','&#x1f6bb;','&#x1f6bc;','&#x1f6bd;','&#x1f6be;','&#x1f6bf;','&#x1f6c0;','&#x1f6c1;','&#x1f6c2;','&#x1f6c3;','&#x1f6c4;','&#x1f6c5;','&#x1f6cb;','&#x1f6cc;','&#x1f6cd;','&#x1f6ce;','&#x1f6cf;','&#x1f6d0;','&#x1f6d1;','&#x1f6d2;','&#x1f6e0;','&#x1f6e1;','&#x1f6e2;','&#x1f6e3;','&#x1f6e4;','&#x1f6e5;','&#x1f6e9;','&#x1f6eb;','&#x1f6ec;','&#x1f6f0;','&#x1f6f3;','&#x1f6f4;','&#x1f6f5;','&#x1f6f6;','&#x1f6f7;','&#x1f6f8;','&#x1f910;','&#x1f911;','&#x1f912;','&#x1f913;','&#x1f914;','&#x1f915;','&#x1f916;','&#x1f917;','&#x1f918;','&#x1f919;','&#x1f91a;','&#x1f91b;','&#x1f91c;','&#x1f91d;','&#x1f91e;','&#x1f91f;','&#x1f920;','&#x1f921;','&#x1f922;','&#x1f923;','&#x1f924;','&#x1f925;','&#x1f926;','&#x1f927;','&#x1f928;','&#x1f929;','&#x1f92a;','&#x1f92b;','&#x1f92c;','&#x1f92d;','&#x1f92e;','&#x1f92f;','&#x1f930;','&#x1f931;','&#x1f932;','&#x1f933;','&#x1f934;','&#x1f935;','&#x1f936;','&#x1f937;','&#x1f938;','&#x1f939;','&#x1f93a;','&#x1f93c;','&#x1f93d;','&#x1f93e;','&#x1f940;','&#x1f941;','&#x1f942;','&#x1f943;','&#x1f944;','&#x1f945;','&#x1f947;','&#x1f948;','&#x1f949;','&#x1f94a;','&#x1f94b;','&#x1f94c;','&#x1f950;','&#x1f951;','&#x1f952;','&#x1f953;','&#x1f954;','&#x1f955;','&#x1f956;','&#x1f957;','&#x1f958;','&#x1f959;','&#x1f95a;','&#x1f95b;','&#x1f95c;','&#x1f95d;','&#x1f95e;','&#x1f95f;','&#x1f960;','&#x1f961;','&#x1f962;','&#x1f963;','&#x1f964;','&#x1f965;','&#x1f966;','&#x1f967;','&#x1f968;','&#x1f969;','&#x1f96a;','&#x1f96b;','&#x1f980;','&#x1f981;','&#x1f982;','&#x1f983;','&#x1f984;','&#x1f985;','&#x1f986;','&#x1f987;','&#x1f988;','&#x1f989;','&#x1f98a;','&#x1f98b;','&#x1f98c;','&#x1f98d;','&#x1f98e;','&#x1f98f;','&#x1f990;','&#x1f991;','&#x1f992;','&#x1f993;','&#x1f994;','&#x1f995;','&#x1f996;','&#x1f997;','&#x1f9c0;','&#x1f9d0;','&#x1f9d1;','&#x1f9d2;','&#x1f9d3;','&#x1f9d4;','&#x1f9d5;','&#x1f9d6;','&#x1f9d7;','&#x1f9d8;','&#x1f9d9;','&#x1f9da;','&#x1f9db;','&#x1f9dc;','&#x1f9dd;','&#x1f9de;','&#x1f9df;','&#x1f9e0;','&#x1f9e1;','&#x1f9e2;','&#x1f9e3;','&#x1f9e4;','&#x1f9e5;','&#x1f9e6;','&#x203c;','&#x2049;','&#x2122;','&#x2139;','&#x2194;','&#x2195;','&#x2196;','&#x2197;','&#x2198;','&#x2199;','&#x21a9;','&#x21aa;','&#x20e3;','&#x231a;','&#x231b;','&#x2328;','&#x23cf;','&#x23e9;','&#x23ea;','&#x23eb;','&#x23ec;','&#x23ed;','&#x23ee;','&#x23ef;','&#x23f0;','&#x23f1;','&#x23f2;','&#x23f3;','&#x23f8;','&#x23f9;','&#x23fa;','&#x24c2;','&#x25aa;','&#x25ab;','&#x25b6;','&#x25c0;','&#x25fb;','&#x25fc;','&#x25fd;','&#x25fe;','&#x2600;','&#x2601;','&#x2602;','&#x2603;','&#x2604;','&#x260e;','&#x2611;','&#x2614;','&#x2615;','&#x2618;','&#x261d;','&#x2622;','&#x2623;','&#x2626;','&#x262a;','&#x262e;','&#x262f;','&#x2638;','&#x2639;','&#x263a;','&#x2648;','&#x2649;','&#x264a;','&#x264b;','&#x264c;','&#x264d;','&#x264e;','&#x264f;','&#x2650;','&#x2651;','&#x2652;','&#x2653;','&#x2660;','&#x2663;','&#x2665;','&#x2666;','&#x2668;','&#x267b;','&#x267f;','&#x2692;','&#x2693;','&#x2694;','&#x2697;','&#x2699;','&#x269b;','&#x269c;','&#x26a0;','&#x26a1;','&#x26aa;','&#x26ab;','&#x26b0;','&#x26b1;','&#x26bd;','&#x26be;','&#x26c4;','&#x26c5;','&#x26c8;','&#x26ce;','&#x26cf;','&#x26d1;','&#x26d3;','&#x26d4;','&#x26e9;','&#x26ea;','&#x26f0;','&#x26f1;','&#x26f2;','&#x26f3;','&#x26f4;','&#x26f5;','&#x26f7;','&#x26f8;','&#x26f9;','&#x26fa;','&#x26fd;','&#x2702;','&#x2705;','&#x2709;','&#x270a;','&#x270b;','&#x270c;','&#x270d;','&#x270f;','&#x2712;','&#x2714;','&#x2716;','&#x271d;','&#x2721;','&#x2728;','&#x2733;','&#x2734;','&#x2744;','&#x2747;','&#x274c;','&#x274e;','&#x2753;','&#x2754;','&#x2755;','&#x2757;','&#x2763;','&#x2795;','&#x2796;','&#x2797;','&#x27a1;','&#x27b0;','&#x27bf;','&#x2934;','&#x2935;','&#x2b05;','&#x2b06;','&#x2b07;','&#x2b1b;','&#x2b1c;','&#x2b50;','&#x2b55;','&#x3030;','&#x303d;','&#x3297;','&#x3299;','&#xe50a;');
+	$entities = array( '&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f48b;&#x200d;&#x1f469;', '&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f48b;&#x200d;&#x1f468;', '&#x1f468;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f48b;&#x200d;&#x1f468;', '&#x1f3f4;&#xe0067;&#xe0062;&#xe0073;&#xe0063;&#xe0074;&#xe007f;', '&#x1f3f4;&#xe0067;&#xe0062;&#xe0077;&#xe006c;&#xe0073;&#xe007f;', '&#x1f3f4;&#xe0067;&#xe0062;&#xe0065;&#xe006e;&#xe0067;&#xe007f;', '&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f466;', '&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f466;&#x200d;&#x1f466;', '&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f466;&#x200d;&#x1f466;', '&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f466;', '&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f466;&#x200d;&#x1f466;', '&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f466;', '&#x1f468;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f468;', '&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f468;', '&#x1f469;&#x200d;&#x2764;&#xfe0f;&#x200d;&#x1f469;', '&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f466;', '&#x1f469;&#x200d;&#x1f466;&#x200d;&#x1f466;', '&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f466;', '&#x1f469;&#x200d;&#x1f467;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f466;', '&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f467;&#x200d;&#x1f466;', '&#x1f469;&#x200d;&#x1f469;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f469;&#x200d;&#x1f466;', '&#x1f468;&#x200d;&#x1f468;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f466;&#x200d;&#x1f466;', '&#x1f937;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cb;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cb;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cb;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cb;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cb;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cb;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cb;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cb;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cb;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cc;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cc;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cc;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cc;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cc;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cc;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cc;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cc;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cc;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cc;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f482;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c3;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c3;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dd;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dd;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dd;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dd;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dd;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dd;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dd;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dd;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dd;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dd;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dc;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dc;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dc;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dc;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f468;&#x1f3fb;&#x200d;&#x2695;&#xfe0f;', '&#x1f468;&#x1f3fb;&#x200d;&#x2696;&#xfe0f;', '&#x1f468;&#x1f3fb;&#x200d;&#x2708;&#xfe0f;', '&#x1f9dc;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dc;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dc;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dc;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dc;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dc;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f9db;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9db;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9db;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f9db;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9db;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f9db;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9db;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f468;&#x1f3fc;&#x200d;&#x2695;&#xfe0f;', '&#x1f468;&#x1f3fc;&#x200d;&#x2696;&#xfe0f;', '&#x1f468;&#x1f3fc;&#x200d;&#x2708;&#xfe0f;', '&#x1f9db;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9db;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9db;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f9da;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9da;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9da;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f9da;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9da;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f9da;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9da;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9da;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9da;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9da;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f468;&#x1f3fd;&#x200d;&#x2695;&#xfe0f;', '&#x1f468;&#x1f3fd;&#x200d;&#x2696;&#xfe0f;', '&#x1f468;&#x1f3fd;&#x200d;&#x2708;&#xfe0f;', '&#x1f9d9;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d9;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d9;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d9;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d9;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d9;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d9;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d9;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d9;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d9;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d8;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d8;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d8;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f468;&#x1f3fe;&#x200d;&#x2695;&#xfe0f;', '&#x1f468;&#x1f3fe;&#x200d;&#x2696;&#xfe0f;', '&#x1f468;&#x1f3fe;&#x200d;&#x2708;&#xfe0f;', '&#x1f9d8;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d8;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d8;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d8;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d8;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d8;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d8;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d7;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d7;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d7;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d7;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d7;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d7;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f468;&#x1f3ff;&#x200d;&#x2695;&#xfe0f;', '&#x1f468;&#x1f3ff;&#x200d;&#x2696;&#xfe0f;', '&#x1f468;&#x1f3ff;&#x200d;&#x2708;&#xfe0f;', '&#x1f9d7;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d7;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d7;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d7;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d6;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c3;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c3;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c3;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c3;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c3;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c3;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c4;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c4;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c4;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c4;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c4;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c4;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c4;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d6;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d6;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f93e;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f93e;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f93e;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f93e;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c4;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c4;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f93e;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f93e;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f93e;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f93e;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f93e;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f93e;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f93d;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f93d;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f93d;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f93d;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f93d;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f93d;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f93d;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f469;&#x1f3fb;&#x200d;&#x2695;&#xfe0f;', '&#x1f469;&#x1f3fb;&#x200d;&#x2696;&#xfe0f;', '&#x1f469;&#x1f3fb;&#x200d;&#x2708;&#xfe0f;', '&#x1f93d;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f93d;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f93d;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f939;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f939;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f939;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f939;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f939;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f939;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f939;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f939;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f939;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f939;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f469;&#x1f3fc;&#x200d;&#x2695;&#xfe0f;', '&#x1f469;&#x1f3fc;&#x200d;&#x2696;&#xfe0f;', '&#x1f469;&#x1f3fc;&#x200d;&#x2708;&#xfe0f;', '&#x1f938;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f938;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f938;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f938;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f938;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f938;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f938;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f938;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f938;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f938;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f937;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f937;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f937;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f469;&#x1f3fd;&#x200d;&#x2695;&#xfe0f;', '&#x1f469;&#x1f3fd;&#x200d;&#x2696;&#xfe0f;', '&#x1f469;&#x1f3fd;&#x200d;&#x2708;&#xfe0f;', '&#x1f937;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f937;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f937;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f937;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f937;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c3;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f937;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f926;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f926;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f926;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f926;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f926;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f926;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f469;&#x1f3fe;&#x200d;&#x2695;&#xfe0f;', '&#x1f469;&#x1f3fe;&#x200d;&#x2696;&#xfe0f;', '&#x1f469;&#x1f3fe;&#x200d;&#x2708;&#xfe0f;', '&#x1f926;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f926;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f926;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f926;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b6;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b6;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b6;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b6;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b6;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b6;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b6;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b6;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b6;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f469;&#x1f3ff;&#x200d;&#x2695;&#xfe0f;', '&#x1f469;&#x1f3ff;&#x200d;&#x2696;&#xfe0f;', '&#x1f469;&#x1f3ff;&#x200d;&#x2708;&#xfe0f;', '&#x1f6b6;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b5;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b5;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b5;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b5;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b5;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b5;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c4;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b5;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f3ca;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f3ca;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b5;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3ca;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3ca;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f3ca;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f3ca;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f3ca;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b5;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b5;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b4;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b4;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b4;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b4;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b4;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b4;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b4;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f3ca;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f3ca;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f3ca;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cb;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f46e;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f46e;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f46e;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f46e;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f46e;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f46e;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f46e;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f46e;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f46e;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f46e;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b4;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b4;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b4;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f6a3;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f471;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f471;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f471;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f471;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f471;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f471;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f471;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f471;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f471;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f471;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6a3;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f6a3;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f473;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f473;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f473;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f473;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f473;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f473;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f473;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f473;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f473;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f473;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6a3;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f6a3;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f477;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f477;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f477;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f477;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f477;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f477;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f477;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f477;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f477;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f477;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6a3;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f6a3;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f481;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f481;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f481;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f481;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f481;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f481;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f481;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f481;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f481;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f481;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6a3;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f6a3;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c3;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f482;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f482;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f482;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f482;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f482;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f482;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f482;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f482;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f482;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f6a3;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f64e;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f486;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f486;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f486;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f486;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f486;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f486;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f486;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f486;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f486;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f486;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f64e;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f64e;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f487;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f487;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f487;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f487;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f487;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f487;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f487;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f487;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f487;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f487;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f64e;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f64e;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f575;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f575;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f575;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f575;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f575;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f575;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f575;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f575;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f575;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f575;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f645;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f645;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f645;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f645;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f645;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f645;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f645;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f645;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f645;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f645;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f64e;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f64e;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f646;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f646;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f646;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f646;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f646;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f646;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f646;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f646;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f646;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f646;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f64e;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f64e;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f647;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f647;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f647;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f647;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f647;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f647;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f647;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f647;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f647;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f647;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f64e;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f64d;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f64b;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f64b;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f64b;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f64b;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f64b;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f64b;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f64b;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f64b;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f64b;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f64b;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x1f64d;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x1f64d;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x1f64d;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x1f64d;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x1f64d;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f64d;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x1f64d;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x1f64d;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x1f64d;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cb;&#xfe0f;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#x1f3fe;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cc;&#xfe0f;&#x200d;&#x2640;&#xfe0f;', '&#x1f575;&#xfe0f;&#x200d;&#x2640;&#xfe0f;', '&#x1f575;&#xfe0f;&#x200d;&#x2642;&#xfe0f;', '&#x1f3cc;&#xfe0f;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#x1f3fb;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#x1f3fb;&#x200d;&#x2640;&#xfe0f;', '&#x26f9;&#x1f3fe;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#x1f3ff;&#x200d;&#x2640;&#xfe0f;', '&#x26f9;&#x1f3ff;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#x1f3fd;&#x200d;&#x2640;&#xfe0f;', '&#x26f9;&#x1f3fd;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#x1f3fc;&#x200d;&#x2640;&#xfe0f;', '&#x1f3cb;&#xfe0f;&#x200d;&#x2640;&#xfe0f;', '&#x26f9;&#x1f3fc;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#xfe0f;&#x200d;&#x2642;&#xfe0f;', '&#x26f9;&#xfe0f;&#x200d;&#x2640;&#xfe0f;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f33e;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f692;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f680;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f52c;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f527;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f4bc;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f4bb;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f3ed;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f3eb;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f3a8;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f3a4;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f393;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f373;', '&#x1f469;&#x1f3ff;&#x200d;&#x1f33e;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f692;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f680;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f52c;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f527;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f4bc;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f4bb;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f3ed;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f3eb;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f3a8;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f3a4;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f393;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f373;', '&#x1f469;&#x1f3fe;&#x200d;&#x1f33e;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f692;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f680;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f52c;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f527;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f4bc;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f4bb;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f3ed;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f3eb;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f3a8;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f3a4;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f393;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f373;', '&#x1f469;&#x1f3fd;&#x200d;&#x1f33e;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f692;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f680;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f52c;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f527;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f4bc;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f4bb;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f3ed;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f3eb;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f3a8;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f3a4;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f393;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f373;', '&#x1f469;&#x1f3fc;&#x200d;&#x1f33e;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f692;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f680;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f52c;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f527;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f4bc;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f4bb;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f3ed;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f3eb;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f3a8;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f3a4;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f393;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f692;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f33e;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f33e;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f373;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f393;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f3a4;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f3a8;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f3eb;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f3ed;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f4bb;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f4bc;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f527;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f52c;', '&#x1f468;&#x1f3fb;&#x200d;&#x1f680;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f692;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f680;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f52c;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f527;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f4bc;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f4bb;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f3ed;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f3eb;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f3a8;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f3a4;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f393;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f373;', '&#x1f468;&#x1f3ff;&#x200d;&#x1f33e;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f692;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f680;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f52c;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f527;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f4bc;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f4bb;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f3ed;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f3eb;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f3a8;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f3a4;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f393;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f373;', '&#x1f468;&#x1f3fe;&#x200d;&#x1f33e;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f692;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f680;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f52c;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f527;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f4bc;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f4bb;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f3ed;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f3eb;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f3a8;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f3a4;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f393;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f373;', '&#x1f468;&#x1f3fd;&#x200d;&#x1f33e;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f692;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f680;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f52c;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f527;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f4bc;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f4bb;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f3ed;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f3eb;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f3a8;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f3a4;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f393;', '&#x1f468;&#x1f3fc;&#x200d;&#x1f373;', '&#x1f469;&#x1f3fb;&#x200d;&#x1f373;', '&#x1f3f3;&#xfe0f;&#x200d;&#x1f308;', '&#x1f468;&#x200d;&#x2696;&#xfe0f;', '&#x1f468;&#x200d;&#x2695;&#xfe0f;', '&#x1f9dd;&#x200d;&#x2640;&#xfe0f;', '&#x1f93e;&#x200d;&#x2640;&#xfe0f;', '&#x1f93e;&#x200d;&#x2642;&#xfe0f;', '&#x1f482;&#x200d;&#x2640;&#xfe0f;', '&#x1f481;&#x200d;&#x2642;&#xfe0f;', '&#x1f481;&#x200d;&#x2640;&#xfe0f;', '&#x1f477;&#x200d;&#x2642;&#xfe0f;', '&#x1f477;&#x200d;&#x2640;&#xfe0f;', '&#x1f473;&#x200d;&#x2642;&#xfe0f;', '&#x1f926;&#x200d;&#x2640;&#xfe0f;', '&#x1f926;&#x200d;&#x2642;&#xfe0f;', '&#x1f473;&#x200d;&#x2640;&#xfe0f;', '&#x1f9dc;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d6;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d6;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dc;&#x200d;&#x2640;&#xfe0f;', '&#x1f471;&#x200d;&#x2642;&#xfe0f;', '&#x1f471;&#x200d;&#x2640;&#xfe0f;', '&#x1f46f;&#x200d;&#x2642;&#xfe0f;', '&#x1f6a3;&#x200d;&#x2640;&#xfe0f;', '&#x1f6a3;&#x200d;&#x2642;&#xfe0f;', '&#x1f46f;&#x200d;&#x2640;&#xfe0f;', '&#x1f46e;&#x200d;&#x2642;&#xfe0f;', '&#x1f46e;&#x200d;&#x2640;&#xfe0f;', '&#x1f469;&#x200d;&#x2708;&#xfe0f;', '&#x1f9d7;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d7;&#x200d;&#x2642;&#xfe0f;', '&#x1f937;&#x200d;&#x2640;&#xfe0f;', '&#x1f937;&#x200d;&#x2642;&#xfe0f;', '&#x1f469;&#x200d;&#x2696;&#xfe0f;', '&#x1f469;&#x200d;&#x2695;&#xfe0f;', '&#x1f3c3;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c3;&#x200d;&#x2642;&#xfe0f;', '&#x1f3c4;&#x200d;&#x2640;&#xfe0f;', '&#x1f3c4;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b4;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b4;&#x200d;&#x2642;&#xfe0f;', '&#x1f9d8;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d8;&#x200d;&#x2642;&#xfe0f;', '&#x1f3ca;&#x200d;&#x2640;&#xfe0f;', '&#x1f3ca;&#x200d;&#x2642;&#xfe0f;', '&#x1f938;&#x200d;&#x2640;&#xfe0f;', '&#x1f938;&#x200d;&#x2642;&#xfe0f;', '&#x1f64b;&#x200d;&#x2642;&#xfe0f;', '&#x1f647;&#x200d;&#x2642;&#xfe0f;', '&#x1f64d;&#x200d;&#x2640;&#xfe0f;', '&#x1f3f4;&#x200d;&#x2620;&#xfe0f;', '&#x1f9df;&#x200d;&#x2642;&#xfe0f;', '&#x1f9df;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d9;&#x200d;&#x2640;&#xfe0f;', '&#x1f9d9;&#x200d;&#x2642;&#xfe0f;', '&#x1f9de;&#x200d;&#x2642;&#xfe0f;', '&#x1f9de;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b5;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b5;&#x200d;&#x2642;&#xfe0f;', '&#x1f939;&#x200d;&#x2640;&#xfe0f;', '&#x1f939;&#x200d;&#x2642;&#xfe0f;', '&#x1f93c;&#x200d;&#x2640;&#xfe0f;', '&#x1f93c;&#x200d;&#x2642;&#xfe0f;', '&#x1f9dd;&#x200d;&#x2642;&#xfe0f;', '&#x1f64d;&#x200d;&#x2642;&#xfe0f;', '&#x1f9da;&#x200d;&#x2640;&#xfe0f;', '&#x1f9da;&#x200d;&#x2642;&#xfe0f;', '&#x1f647;&#x200d;&#x2640;&#xfe0f;', '&#x1f646;&#x200d;&#x2642;&#xfe0f;', '&#x1f646;&#x200d;&#x2640;&#xfe0f;', '&#x1f645;&#x200d;&#x2642;&#xfe0f;', '&#x1f645;&#x200d;&#x2640;&#xfe0f;', '&#x1f487;&#x200d;&#x2642;&#xfe0f;', '&#x1f487;&#x200d;&#x2640;&#xfe0f;', '&#x1f486;&#x200d;&#x2642;&#xfe0f;', '&#x1f64b;&#x200d;&#x2640;&#xfe0f;', '&#x1f93d;&#x200d;&#x2642;&#xfe0f;', '&#x1f9db;&#x200d;&#x2640;&#xfe0f;', '&#x1f9db;&#x200d;&#x2642;&#xfe0f;', '&#x1f6b6;&#x200d;&#x2640;&#xfe0f;', '&#x1f6b6;&#x200d;&#x2642;&#xfe0f;', '&#x1f486;&#x200d;&#x2640;&#xfe0f;', '&#x1f482;&#x200d;&#x2642;&#xfe0f;', '&#x1f64e;&#x200d;&#x2640;&#xfe0f;', '&#x1f64e;&#x200d;&#x2642;&#xfe0f;', '&#x1f468;&#x200d;&#x2708;&#xfe0f;', '&#x1f93d;&#x200d;&#x2640;&#xfe0f;', '&#x1f468;&#x200d;&#x1f33e;', '&#x1f468;&#x200d;&#x1f393;', '&#x1f468;&#x200d;&#x1f3a4;', '&#x1f468;&#x200d;&#x1f3a8;', '&#x1f468;&#x200d;&#x1f3eb;', '&#x1f468;&#x200d;&#x1f3ed;', '&#x1f468;&#x200d;&#x1f466;', '&#x1f468;&#x200d;&#x1f467;', '&#x1f468;&#x200d;&#x1f4bb;', '&#x1f468;&#x200d;&#x1f4bc;', '&#x1f468;&#x200d;&#x1f527;', '&#x1f468;&#x200d;&#x1f52c;', '&#x1f468;&#x200d;&#x1f680;', '&#x1f441;&#x200d;&#x1f5e8;', '&#x1f468;&#x200d;&#x1f692;', '&#x1f468;&#x200d;&#x1f373;', '&#x1f469;&#x200d;&#x1f373;', '&#x1f469;&#x200d;&#x1f393;', '&#x1f469;&#x200d;&#x1f3a4;', '&#x1f469;&#x200d;&#x1f3a8;', '&#x1f469;&#x200d;&#x1f3eb;', '&#x1f469;&#x200d;&#x1f3ed;', '&#x1f469;&#x200d;&#x1f466;', '&#x1f469;&#x200d;&#x1f467;', '&#x1f469;&#x200d;&#x1f4bb;', '&#x1f469;&#x200d;&#x1f4bc;', '&#x1f469;&#x200d;&#x1f527;', '&#x1f469;&#x200d;&#x1f52c;', '&#x1f469;&#x200d;&#x1f680;', '&#x1f469;&#x200d;&#x1f692;', '&#x1f469;&#x200d;&#x1f33e;', '&#x1f1e7;&#x1f1f2;', '&#x1f1e7;&#x1f1f3;', '&#x1f471;&#x1f3fe;', '&#x1f3ca;&#x1f3fc;', '&#x1f1e7;&#x1f1f4;', '&#x1f471;&#x1f3ff;', '&#x1f1e7;&#x1f1f6;', '&#x1f3ca;&#x1f3fd;', '&#x1f472;&#x1f3fb;', '&#x1f472;&#x1f3fc;', '&#x1f472;&#x1f3fd;', '&#x1f472;&#x1f3fe;', '&#x1f472;&#x1f3ff;', '&#x1f1e7;&#x1f1f7;', '&#x1f1e7;&#x1f1f8;', '&#x1f473;&#x1f3fb;', '&#x1f3ca;&#x1f3fe;', '&#x1f1e7;&#x1f1f9;', '&#x1f473;&#x1f3fc;', '&#x1f1e7;&#x1f1fb;', '&#x1f3ca;&#x1f3ff;', '&#x1f473;&#x1f3fd;', '&#x1f1e7;&#x1f1fc;', '&#x1f1e7;&#x1f1fe;', '&#x1f473;&#x1f3fe;', '&#x1f1e7;&#x1f1ff;', '&#x1f1e8;&#x1f1e6;', '&#x1f473;&#x1f3ff;', '&#x1f3cb;&#x1f3fb;', '&#x1f1e8;&#x1f1e8;', '&#x1f474;&#x1f3fb;', '&#x1f474;&#x1f3fc;', '&#x1f474;&#x1f3fd;', '&#x1f474;&#x1f3fe;', '&#x1f474;&#x1f3ff;', '&#x1f475;&#x1f3fb;', '&#x1f475;&#x1f3fc;', '&#x1f475;&#x1f3fd;', '&#x1f475;&#x1f3fe;', '&#x1f475;&#x1f3ff;', '&#x1f476;&#x1f3fb;', '&#x1f476;&#x1f3fc;', '&#x1f476;&#x1f3fd;', '&#x1f476;&#x1f3fe;', '&#x1f476;&#x1f3ff;', '&#x1f1e8;&#x1f1e9;', '&#x1f3cb;&#x1f3fc;', '&#x1f477;&#x1f3fb;', '&#x1f1e8;&#x1f1eb;', '&#x1f1e8;&#x1f1ec;', '&#x1f477;&#x1f3fc;', '&#x1f3cb;&#x1f3fd;', '&#x1f1e8;&#x1f1ed;', '&#x1f477;&#x1f3fd;', '&#x1f1e8;&#x1f1ee;', '&#x1f3cb;&#x1f3fe;', '&#x1f477;&#x1f3fe;', '&#x1f1e8;&#x1f1f0;', '&#x1f1e8;&#x1f1f1;', '&#x1f477;&#x1f3ff;', '&#x1f3cb;&#x1f3ff;', '&#x1f1e8;&#x1f1f2;', '&#x1f478;&#x1f3fb;', '&#x1f478;&#x1f3fc;', '&#x1f478;&#x1f3fd;', '&#x1f478;&#x1f3fe;', '&#x1f478;&#x1f3ff;', '&#x1f47c;&#x1f3fb;', '&#x1f47c;&#x1f3fc;', '&#x1f47c;&#x1f3fd;', '&#x1f47c;&#x1f3fe;', '&#x1f47c;&#x1f3ff;', '&#x1f1e8;&#x1f1f3;', '&#x1f1e8;&#x1f1f4;', '&#x1f481;&#x1f3fb;', '&#x1f1e8;&#x1f1f5;', '&#x1f3cc;&#x1f3fb;', '&#x1f481;&#x1f3fc;', '&#x1f1e8;&#x1f1f7;', '&#x1f1e8;&#x1f1fa;', '&#x1f481;&#x1f3fd;', '&#x1f3cc;&#x1f3fc;', '&#x1f1e8;&#x1f1fb;', '&#x1f481;&#x1f3fe;', '&#x1f1e8;&#x1f1fc;', '&#x1f3cc;&#x1f3fd;', '&#x1f481;&#x1f3ff;', '&#x1f1e8;&#x1f1fd;', '&#x1f1e8;&#x1f1fe;', '&#x1f3cc;&#x1f3fe;', '&#x1f1e8;&#x1f1ff;', '&#x1f482;&#x1f3fb;', '&#x1f1e9;&#x1f1ea;', '&#x1f3cc;&#x1f3ff;', '&#x1f482;&#x1f3fc;', '&#x1f1e9;&#x1f1ec;', '&#x1f1e9;&#x1f1ef;', '&#x1f482;&#x1f3fd;', '&#x1f1e9;&#x1f1f0;', '&#x1f1e9;&#x1f1f2;', '&#x1f482;&#x1f3fe;', '&#x1f1e9;&#x1f1f4;', '&#x1f1e9;&#x1f1ff;', '&#x1f482;&#x1f3ff;', '&#x1f1ea;&#x1f1e6;', '&#x1f1ea;&#x1f1e8;', '&#x1f483;&#x1f3fb;', '&#x1f483;&#x1f3fc;', '&#x1f483;&#x1f3fd;', '&#x1f483;&#x1f3fe;', '&#x1f483;&#x1f3ff;', '&#x1f485;&#x1f3fb;', '&#x1f485;&#x1f3fc;', '&#x1f485;&#x1f3fd;', '&#x1f485;&#x1f3fe;', '&#x1f485;&#x1f3ff;', '&#x1f442;&#x1f3fb;', '&#x1f442;&#x1f3fc;', '&#x1f486;&#x1f3fb;', '&#x1f442;&#x1f3fd;', '&#x1f442;&#x1f3fe;', '&#x1f486;&#x1f3fc;', '&#x1f442;&#x1f3ff;', '&#x1f443;&#x1f3fb;', '&#x1f486;&#x1f3fd;', '&#x1f443;&#x1f3fc;', '&#x1f443;&#x1f3fd;', '&#x1f486;&#x1f3fe;', '&#x1f443;&#x1f3fe;', '&#x1f443;&#x1f3ff;', '&#x1f486;&#x1f3ff;', '&#x1f446;&#x1f3fb;', '&#x1f446;&#x1f3fc;', '&#x1f446;&#x1f3fd;', '&#x1f446;&#x1f3fe;', '&#x1f487;&#x1f3fb;', '&#x1f446;&#x1f3ff;', '&#x1f447;&#x1f3fb;', '&#x1f487;&#x1f3fc;', '&#x1f447;&#x1f3fc;', '&#x1f447;&#x1f3fd;', '&#x1f487;&#x1f3fd;', '&#x1f447;&#x1f3fe;', '&#x1f447;&#x1f3ff;', '&#x1f487;&#x1f3fe;', '&#x1f448;&#x1f3fb;', '&#x1f448;&#x1f3fc;', '&#x1f487;&#x1f3ff;', '&#x1f448;&#x1f3fd;', '&#x1f448;&#x1f3fe;', '&#x1f4aa;&#x1f3fb;', '&#x1f4aa;&#x1f3fc;', '&#x1f4aa;&#x1f3fd;', '&#x1f4aa;&#x1f3fe;', '&#x1f4aa;&#x1f3ff;', '&#x1f574;&#x1f3fb;', '&#x1f574;&#x1f3fc;', '&#x1f574;&#x1f3fd;', '&#x1f574;&#x1f3fe;', '&#x1f574;&#x1f3ff;', '&#x1f448;&#x1f3ff;', '&#x1f449;&#x1f3fb;', '&#x1f575;&#x1f3fb;', '&#x1f449;&#x1f3fc;', '&#x1f449;&#x1f3fd;', '&#x1f575;&#x1f3fc;', '&#x1f449;&#x1f3fe;', '&#x1f449;&#x1f3ff;', '&#x1f575;&#x1f3fd;', '&#x1f44a;&#x1f3fb;', '&#x1f44a;&#x1f3fc;', '&#x1f575;&#x1f3fe;', '&#x1f44a;&#x1f3fd;', '&#x1f44a;&#x1f3fe;', '&#x1f575;&#x1f3ff;', '&#x1f44a;&#x1f3ff;', '&#x1f44b;&#x1f3fb;', '&#x1f57a;&#x1f3fb;', '&#x1f57a;&#x1f3fc;', '&#x1f57a;&#x1f3fd;', '&#x1f57a;&#x1f3fe;', '&#x1f57a;&#x1f3ff;', '&#x1f590;&#x1f3fb;', '&#x1f590;&#x1f3fc;', '&#x1f590;&#x1f3fd;', '&#x1f590;&#x1f3fe;', '&#x1f590;&#x1f3ff;', '&#x1f595;&#x1f3fb;', '&#x1f595;&#x1f3fc;', '&#x1f595;&#x1f3fd;', '&#x1f595;&#x1f3fe;', '&#x1f595;&#x1f3ff;', '&#x1f596;&#x1f3fb;', '&#x1f596;&#x1f3fc;', '&#x1f596;&#x1f3fd;', '&#x1f596;&#x1f3fe;', '&#x1f596;&#x1f3ff;', '&#x1f44b;&#x1f3fc;', '&#x1f44b;&#x1f3fd;', '&#x1f645;&#x1f3fb;', '&#x1f44b;&#x1f3fe;', '&#x1f44b;&#x1f3ff;', '&#x1f645;&#x1f3fc;', '&#x1f44c;&#x1f3fb;', '&#x1f44c;&#x1f3fc;', '&#x1f645;&#x1f3fd;', '&#x1f1e6;&#x1f1e8;', '&#x1f44c;&#x1f3fe;', '&#x1f645;&#x1f3fe;', '&#x1f44c;&#x1f3ff;', '&#x1f44d;&#x1f3fb;', '&#x1f645;&#x1f3ff;', '&#x1f44d;&#x1f3fc;', '&#x1f44d;&#x1f3fd;', '&#x1f44d;&#x1f3fe;', '&#x1f44d;&#x1f3ff;', '&#x1f646;&#x1f3fb;', '&#x1f44e;&#x1f3fb;', '&#x1f44e;&#x1f3fc;', '&#x1f646;&#x1f3fc;', '&#x1f44e;&#x1f3fd;', '&#x1f44e;&#x1f3fe;', '&#x1f646;&#x1f3fd;', '&#x1f44e;&#x1f3ff;', '&#x1f44f;&#x1f3fb;', '&#x1f646;&#x1f3fe;', '&#x1f44f;&#x1f3fc;', '&#x1f44f;&#x1f3fd;', '&#x1f646;&#x1f3ff;', '&#x1f44f;&#x1f3fe;', '&#x1f44f;&#x1f3ff;', '&#x1f450;&#x1f3fb;', '&#x1f450;&#x1f3fc;', '&#x1f647;&#x1f3fb;', '&#x1f450;&#x1f3fd;', '&#x1f450;&#x1f3fe;', '&#x1f647;&#x1f3fc;', '&#x1f450;&#x1f3ff;', '&#x1f466;&#x1f3fb;', '&#x1f647;&#x1f3fd;', '&#x1f466;&#x1f3fc;', '&#x1f466;&#x1f3fd;', '&#x1f647;&#x1f3fe;', '&#x1f466;&#x1f3fe;', '&#x1f466;&#x1f3ff;', '&#x1f647;&#x1f3ff;', '&#x1f467;&#x1f3fb;', '&#x1f467;&#x1f3fc;', '&#x1f467;&#x1f3fd;', '&#x1f467;&#x1f3fe;', '&#x1f64b;&#x1f3fb;', '&#x1f467;&#x1f3ff;', '&#x1f1ea;&#x1f1ea;', '&#x1f64b;&#x1f3fc;', '&#x1f1ea;&#x1f1ec;', '&#x1f1ea;&#x1f1ed;', '&#x1f64b;&#x1f3fd;', '&#x1f1ea;&#x1f1f7;', '&#x1f1ea;&#x1f1f8;', '&#x1f64b;&#x1f3fe;', '&#x1f1ea;&#x1f1f9;', '&#x1f1ea;&#x1f1fa;', '&#x1f64b;&#x1f3ff;', '&#x1f1eb;&#x1f1ee;', '&#x1f1eb;&#x1f1ef;', '&#x1f64c;&#x1f3fb;', '&#x1f64c;&#x1f3fc;', '&#x1f64c;&#x1f3fd;', '&#x1f64c;&#x1f3fe;', '&#x1f64c;&#x1f3ff;', '&#x1f1eb;&#x1f1f0;', '&#x1f1eb;&#x1f1f2;', '&#x1f64d;&#x1f3fb;', '&#x1f1eb;&#x1f1f4;', '&#x1f1eb;&#x1f1f7;', '&#x1f64d;&#x1f3fc;', '&#x1f1ec;&#x1f1e6;', '&#x1f1ec;&#x1f1e7;', '&#x1f64d;&#x1f3fd;', '&#x1f1ec;&#x1f1e9;', '&#x1f468;&#x1f3fb;', '&#x1f64d;&#x1f3fe;', '&#x1f1ec;&#x1f1ea;', '&#x1f1ec;&#x1f1eb;', '&#x1f64d;&#x1f3ff;', '&#x1f1ec;&#x1f1ec;', '&#x1f1ec;&#x1f1ed;', '&#x1f1ec;&#x1f1ee;', '&#x1f1ec;&#x1f1f1;', '&#x1f64e;&#x1f3fb;', '&#x1f1ec;&#x1f1f2;', '&#x1f1ec;&#x1f1f3;', '&#x1f64e;&#x1f3fc;', '&#x1f1ec;&#x1f1f5;', '&#x1f1ec;&#x1f1f6;', '&#x1f64e;&#x1f3fd;', '&#x1f1ec;&#x1f1f7;', '&#x1f1ec;&#x1f1f8;', '&#x1f64e;&#x1f3fe;', '&#x1f1ec;&#x1f1f9;', '&#x1f1ec;&#x1f1fa;', '&#x1f64e;&#x1f3ff;', '&#x1f1ec;&#x1f1fc;', '&#x1f1ec;&#x1f1fe;', '&#x1f64f;&#x1f3fb;', '&#x1f64f;&#x1f3fc;', '&#x1f64f;&#x1f3fd;', '&#x1f64f;&#x1f3fe;', '&#x1f64f;&#x1f3ff;', '&#x1f468;&#x1f3fc;', '&#x1f1ed;&#x1f1f0;', '&#x1f6a3;&#x1f3fb;', '&#x1f1ed;&#x1f1f2;', '&#x1f1ed;&#x1f1f3;', '&#x1f6a3;&#x1f3fc;', '&#x1f1ed;&#x1f1f7;', '&#x1f1ed;&#x1f1f9;', '&#x1f6a3;&#x1f3fd;', '&#x1f1ed;&#x1f1fa;', '&#x1f1ee;&#x1f1e8;', '&#x1f6a3;&#x1f3fe;', '&#x1f1ee;&#x1f1e9;', '&#x1f1ee;&#x1f1ea;', '&#x1f6a3;&#x1f3ff;', '&#x1f1ee;&#x1f1f1;', '&#x1f1ee;&#x1f1f2;', '&#x1f1ee;&#x1f1f3;', '&#x1f1ee;&#x1f1f4;', '&#x1f6b4;&#x1f3fb;', '&#x1f1ee;&#x1f1f6;', '&#x1f1ee;&#x1f1f7;', '&#x1f6b4;&#x1f3fc;', '&#x1f1ee;&#x1f1f8;', '&#x1f468;&#x1f3fd;', '&#x1f6b4;&#x1f3fd;', '&#x1f1ee;&#x1f1f9;', '&#x1f1ef;&#x1f1ea;', '&#x1f6b4;&#x1f3fe;', '&#x1f1ef;&#x1f1f2;', '&#x1f1ef;&#x1f1f4;', '&#x1f6b4;&#x1f3ff;', '&#x1f1ef;&#x1f1f5;', '&#x1f1f0;&#x1f1ea;', '&#x1f1f0;&#x1f1ec;', '&#x1f1f0;&#x1f1ed;', '&#x1f6b5;&#x1f3fb;', '&#x1f1f0;&#x1f1ee;', '&#x1f1f0;&#x1f1f2;', '&#x1f6b5;&#x1f3fc;', '&#x1f1f0;&#x1f1f3;', '&#x1f1f0;&#x1f1f5;', '&#x1f6b5;&#x1f3fd;', '&#x1f1f0;&#x1f1f7;', '&#x1f1f0;&#x1f1fc;', '&#x1f6b5;&#x1f3fe;', '&#x1f1f0;&#x1f1fe;', '&#x1f1f0;&#x1f1ff;', '&#x1f6b5;&#x1f3ff;', '&#x1f468;&#x1f3fe;', '&#x1f1f1;&#x1f1e6;', '&#x1f1f1;&#x1f1e7;', '&#x1f1f1;&#x1f1e8;', '&#x1f6b6;&#x1f3fb;', '&#x1f1f1;&#x1f1ee;', '&#x1f1f1;&#x1f1f0;', '&#x1f6b6;&#x1f3fc;', '&#x1f1f1;&#x1f1f7;', '&#x1f1f1;&#x1f1f8;', '&#x1f6b6;&#x1f3fd;', '&#x1f1f1;&#x1f1f9;', '&#x1f1f1;&#x1f1fa;', '&#x1f6b6;&#x1f3fe;', '&#x1f1f1;&#x1f1fb;', '&#x1f1f1;&#x1f1fe;', '&#x1f6b6;&#x1f3ff;', '&#x1f1f2;&#x1f1e6;', '&#x1f1f2;&#x1f1e8;', '&#x1f6c0;&#x1f3fb;', '&#x1f6c0;&#x1f3fc;', '&#x1f6c0;&#x1f3fd;', '&#x1f6c0;&#x1f3fe;', '&#x1f6c0;&#x1f3ff;', '&#x1f6cc;&#x1f3fb;', '&#x1f6cc;&#x1f3fc;', '&#x1f6cc;&#x1f3fd;', '&#x1f6cc;&#x1f3fe;', '&#x1f6cc;&#x1f3ff;', '&#x1f918;&#x1f3fb;', '&#x1f918;&#x1f3fc;', '&#x1f918;&#x1f3fd;', '&#x1f918;&#x1f3fe;', '&#x1f918;&#x1f3ff;', '&#x1f919;&#x1f3fb;', '&#x1f919;&#x1f3fc;', '&#x1f919;&#x1f3fd;', '&#x1f919;&#x1f3fe;', '&#x1f919;&#x1f3ff;', '&#x1f91a;&#x1f3fb;', '&#x1f91a;&#x1f3fc;', '&#x1f91a;&#x1f3fd;', '&#x1f91a;&#x1f3fe;', '&#x1f91a;&#x1f3ff;', '&#x1f91b;&#x1f3fb;', '&#x1f91b;&#x1f3fc;', '&#x1f91b;&#x1f3fd;', '&#x1f91b;&#x1f3fe;', '&#x1f91b;&#x1f3ff;', '&#x1f91c;&#x1f3fb;', '&#x1f91c;&#x1f3fc;', '&#x1f91c;&#x1f3fd;', '&#x1f91c;&#x1f3fe;', '&#x1f91c;&#x1f3ff;', '&#x1f91e;&#x1f3fb;', '&#x1f91e;&#x1f3fc;', '&#x1f91e;&#x1f3fd;', '&#x1f91e;&#x1f3fe;', '&#x1f91e;&#x1f3ff;', '&#x1f91f;&#x1f3fb;', '&#x1f91f;&#x1f3fc;', '&#x1f91f;&#x1f3fd;', '&#x1f91f;&#x1f3fe;', '&#x1f91f;&#x1f3ff;', '&#x1f1f2;&#x1f1e9;', '&#x1f1f2;&#x1f1ea;', '&#x1f926;&#x1f3fb;', '&#x1f1f2;&#x1f1eb;', '&#x1f468;&#x1f3ff;', '&#x1f926;&#x1f3fc;', '&#x1f1f2;&#x1f1ec;', '&#x1f1f2;&#x1f1ed;', '&#x1f926;&#x1f3fd;', '&#x1f1f2;&#x1f1f0;', '&#x1f1f2;&#x1f1f1;', '&#x1f926;&#x1f3fe;', '&#x1f1f2;&#x1f1f2;', '&#x1f1f2;&#x1f1f3;', '&#x1f926;&#x1f3ff;', '&#x1f1f2;&#x1f1f4;', '&#x1f1f2;&#x1f1f5;', '&#x1f930;&#x1f3fb;', '&#x1f930;&#x1f3fc;', '&#x1f930;&#x1f3fd;', '&#x1f930;&#x1f3fe;', '&#x1f930;&#x1f3ff;', '&#x1f931;&#x1f3fb;', '&#x1f931;&#x1f3fc;', '&#x1f931;&#x1f3fd;', '&#x1f931;&#x1f3fe;', '&#x1f931;&#x1f3ff;', '&#x1f932;&#x1f3fb;', '&#x1f932;&#x1f3fc;', '&#x1f932;&#x1f3fd;', '&#x1f932;&#x1f3fe;', '&#x1f932;&#x1f3ff;', '&#x1f933;&#x1f3fb;', '&#x1f933;&#x1f3fc;', '&#x1f933;&#x1f3fd;', '&#x1f933;&#x1f3fe;', '&#x1f933;&#x1f3ff;', '&#x1f934;&#x1f3fb;', '&#x1f934;&#x1f3fc;', '&#x1f934;&#x1f3fd;', '&#x1f934;&#x1f3fe;', '&#x1f934;&#x1f3ff;', '&#x1f935;&#x1f3fb;', '&#x1f935;&#x1f3fc;', '&#x1f935;&#x1f3fd;', '&#x1f935;&#x1f3fe;', '&#x1f935;&#x1f3ff;', '&#x1f936;&#x1f3fb;', '&#x1f936;&#x1f3fc;', '&#x1f936;&#x1f3fd;', '&#x1f936;&#x1f3fe;', '&#x1f936;&#x1f3ff;', '&#x1f1f2;&#x1f1f6;', '&#x1f1f2;&#x1f1f7;', '&#x1f937;&#x1f3fb;', '&#x1f1f2;&#x1f1f8;', '&#x1f1f2;&#x1f1f9;', '&#x1f937;&#x1f3fc;', '&#x1f1f2;&#x1f1fa;', '&#x1f1f2;&#x1f1fb;', '&#x1f937;&#x1f3fd;', '&#x1f1f2;&#x1f1fc;', '&#x1f1f2;&#x1f1fd;', '&#x1f937;&#x1f3fe;', '&#x1f1f2;&#x1f1fe;', '&#x1f1f2;&#x1f1ff;', '&#x1f937;&#x1f3ff;', '&#x1f1f3;&#x1f1e6;', '&#x1f1f3;&#x1f1e8;', '&#x1f1f3;&#x1f1ea;', '&#x1f1f3;&#x1f1eb;', '&#x1f938;&#x1f3fb;', '&#x1f1f3;&#x1f1ec;', '&#x1f1f3;&#x1f1ee;', '&#x1f938;&#x1f3fc;', '&#x1f1f3;&#x1f1f1;', '&#x1f1f3;&#x1f1f4;', '&#x1f938;&#x1f3fd;', '&#x1f1f3;&#x1f1f5;', '&#x1f1f3;&#x1f1f7;', '&#x1f938;&#x1f3fe;', '&#x1f1f3;&#x1f1fa;', '&#x1f1f3;&#x1f1ff;', '&#x1f938;&#x1f3ff;', '&#x1f1f4;&#x1f1f2;', '&#x1f1f5;&#x1f1e6;', '&#x1f1f5;&#x1f1ea;', '&#x1f1f5;&#x1f1eb;', '&#x1f939;&#x1f3fb;', '&#x1f1f5;&#x1f1ec;', '&#x1f1f5;&#x1f1ed;', '&#x1f939;&#x1f3fc;', '&#x1f1f5;&#x1f1f0;', '&#x1f1f5;&#x1f1f1;', '&#x1f939;&#x1f3fd;', '&#x1f1f5;&#x1f1f2;', '&#x1f1f5;&#x1f1f3;', '&#x1f939;&#x1f3fe;', '&#x1f1f5;&#x1f1f7;', '&#x1f1f5;&#x1f1f8;', '&#x1f939;&#x1f3ff;', '&#x1f1f5;&#x1f1f9;', '&#x1f1f5;&#x1f1fc;', '&#x1f1f5;&#x1f1fe;', '&#x1f1f6;&#x1f1e6;', '&#x1f1f7;&#x1f1ea;', '&#x1f1f7;&#x1f1f4;', '&#x1f93d;&#x1f3fb;', '&#x1f1f7;&#x1f1f8;', '&#x1f469;&#x1f3fb;', '&#x1f93d;&#x1f3fc;', '&#x1f1f7;&#x1f1fa;', '&#x1f1f7;&#x1f1fc;', '&#x1f93d;&#x1f3fd;', '&#x1f1f8;&#x1f1e6;', '&#x1f1f8;&#x1f1e7;', '&#x1f93d;&#x1f3fe;', '&#x1f1f8;&#x1f1e8;', '&#x1f1f8;&#x1f1e9;', '&#x1f93d;&#x1f3ff;', '&#x1f1f8;&#x1f1ea;', '&#x1f1f8;&#x1f1ec;', '&#x1f1e6;&#x1f1e9;', '&#x1f1f8;&#x1f1ee;', '&#x1f93e;&#x1f3fb;', '&#x1f1f8;&#x1f1ef;', '&#x1f1f8;&#x1f1f0;', '&#x1f93e;&#x1f3fc;', '&#x1f1f8;&#x1f1f1;', '&#x1f1f8;&#x1f1f2;', '&#x1f93e;&#x1f3fd;', '&#x1f1f8;&#x1f1f3;', '&#x1f1f8;&#x1f1f4;', '&#x1f93e;&#x1f3fe;', '&#x1f469;&#x1f3fc;', '&#x1f1f8;&#x1f1f7;', '&#x1f93e;&#x1f3ff;', '&#x1f1f8;&#x1f1f8;', '&#x1f1f8;&#x1f1f9;', '&#x1f9d1;&#x1f3fb;', '&#x1f9d1;&#x1f3fc;', '&#x1f9d1;&#x1f3fd;', '&#x1f9d1;&#x1f3fe;', '&#x1f9d1;&#x1f3ff;', '&#x1f9d2;&#x1f3fb;', '&#x1f9d2;&#x1f3fc;', '&#x1f9d2;&#x1f3fd;', '&#x1f9d2;&#x1f3fe;', '&#x1f9d2;&#x1f3ff;', '&#x1f9d3;&#x1f3fb;', '&#x1f9d3;&#x1f3fc;', '&#x1f9d3;&#x1f3fd;', '&#x1f9d3;&#x1f3fe;', '&#x1f9d3;&#x1f3ff;', '&#x1f9d4;&#x1f3fb;', '&#x1f9d4;&#x1f3fc;', '&#x1f9d4;&#x1f3fd;', '&#x1f9d4;&#x1f3fe;', '&#x1f9d4;&#x1f3ff;', '&#x1f9d5;&#x1f3fb;', '&#x1f9d5;&#x1f3fc;', '&#x1f9d5;&#x1f3fd;', '&#x1f9d5;&#x1f3fe;', '&#x1f9d5;&#x1f3ff;', '&#x1f1f8;&#x1f1fb;', '&#x1f1f8;&#x1f1fd;', '&#x1f9d6;&#x1f3fb;', '&#x1f1f8;&#x1f1fe;', '&#x1f1f8;&#x1f1ff;', '&#x1f9d6;&#x1f3fc;', '&#x1f1f9;&#x1f1e6;', '&#x1f1f9;&#x1f1e8;', '&#x1f9d6;&#x1f3fd;', '&#x1f1f9;&#x1f1e9;', '&#x1f1f9;&#x1f1eb;', '&#x1f9d6;&#x1f3fe;', '&#x1f1f9;&#x1f1ec;', '&#x1f1f9;&#x1f1ed;', '&#x1f9d6;&#x1f3ff;', '&#x1f1f9;&#x1f1ef;', '&#x1f1f9;&#x1f1f0;', '&#x1f1f9;&#x1f1f1;', '&#x1f469;&#x1f3fd;', '&#x1f9d7;&#x1f3fb;', '&#x1f1f9;&#x1f1f2;', '&#x1f1f9;&#x1f1f3;', '&#x1f9d7;&#x1f3fc;', '&#x1f1f9;&#x1f1f4;', '&#x1f1f9;&#x1f1f7;', '&#x1f9d7;&#x1f3fd;', '&#x1f1f9;&#x1f1f9;', '&#x1f1f9;&#x1f1fb;', '&#x1f9d7;&#x1f3fe;', '&#x1f1f9;&#x1f1fc;', '&#x1f1f9;&#x1f1ff;', '&#x1f9d7;&#x1f3ff;', '&#x1f1fa;&#x1f1e6;', '&#x1f1fa;&#x1f1ec;', '&#x1f1fa;&#x1f1f2;', '&#x1f1fa;&#x1f1f3;', '&#x1f9d8;&#x1f3fb;', '&#x1f1fa;&#x1f1f8;', '&#x1f1fa;&#x1f1fe;', '&#x1f9d8;&#x1f3fc;', '&#x1f1fa;&#x1f1ff;', '&#x1f1fb;&#x1f1e6;', '&#x1f9d8;&#x1f3fd;', '&#x1f469;&#x1f3fe;', '&#x1f1fb;&#x1f1e8;', '&#x1f9d8;&#x1f3fe;', '&#x1f1fb;&#x1f1ea;', '&#x1f1fb;&#x1f1ec;', '&#x1f9d8;&#x1f3ff;', '&#x1f1fb;&#x1f1ee;', '&#x1f1fb;&#x1f1f3;', '&#x1f1fb;&#x1f1fa;', '&#x1f1fc;&#x1f1eb;', '&#x1f9d9;&#x1f3fb;', '&#x1f1fc;&#x1f1f8;', '&#x1f1fd;&#x1f1f0;', '&#x1f9d9;&#x1f3fc;', '&#x1f1fe;&#x1f1ea;', '&#x1f1fe;&#x1f1f9;', '&#x1f9d9;&#x1f3fd;', '&#x1f1ff;&#x1f1e6;', '&#x1f1ff;&#x1f1f2;', '&#x1f9d9;&#x1f3fe;', '&#x1f1ff;&#x1f1fc;', '&#x1f385;&#x1f3fb;', '&#x1f9d9;&#x1f3ff;', '&#x1f385;&#x1f3fc;', '&#x1f469;&#x1f3ff;', '&#x1f385;&#x1f3fd;', '&#x1f385;&#x1f3fe;', '&#x1f9da;&#x1f3fb;', '&#x1f385;&#x1f3ff;', '&#x1f3c2;&#x1f3fb;', '&#x1f9da;&#x1f3fc;', '&#x1f3c2;&#x1f3fc;', '&#x1f3c2;&#x1f3fd;', '&#x1f9da;&#x1f3fd;', '&#x1f3c2;&#x1f3fe;', '&#x1f3c2;&#x1f3ff;', '&#x1f9da;&#x1f3fe;', '&#x1f44c;&#x1f3fd;', '&#x1f1e6;&#x1f1ea;', '&#x1f9da;&#x1f3ff;', '&#x1f3c3;&#x1f3fb;', '&#x1f1e6;&#x1f1eb;', '&#x1f1e6;&#x1f1ec;', '&#x1f3c3;&#x1f3fc;', '&#x1f9db;&#x1f3fb;', '&#x1f1e6;&#x1f1ee;', '&#x1f1e6;&#x1f1f1;', '&#x1f9db;&#x1f3fc;', '&#x1f3c3;&#x1f3fd;', '&#x1f1e6;&#x1f1f2;', '&#x1f9db;&#x1f3fd;', '&#x1f1e6;&#x1f1f4;', '&#x1f3c3;&#x1f3fe;', '&#x1f9db;&#x1f3fe;', '&#x1f1e6;&#x1f1f6;', '&#x1f1e6;&#x1f1f7;', '&#x1f9db;&#x1f3ff;', '&#x1f3c3;&#x1f3ff;', '&#x1f1e6;&#x1f1f8;', '&#x1f1e6;&#x1f1f9;', '&#x1f1e6;&#x1f1fa;', '&#x1f9dc;&#x1f3fb;', '&#x1f1e6;&#x1f1fc;', '&#x1f3c4;&#x1f3fb;', '&#x1f9dc;&#x1f3fc;', '&#x1f1e6;&#x1f1fd;', '&#x1f1e6;&#x1f1ff;', '&#x1f9dc;&#x1f3fd;', '&#x1f3c4;&#x1f3fc;', '&#x1f1e7;&#x1f1e6;', '&#x1f9dc;&#x1f3fe;', '&#x1f46e;&#x1f3fb;', '&#x1f1e7;&#x1f1e7;', '&#x1f9dc;&#x1f3ff;', '&#x1f3c4;&#x1f3fd;', '&#x1f46e;&#x1f3fc;', '&#x1f1e7;&#x1f1e9;', '&#x1f1e7;&#x1f1ea;', '&#x1f9dd;&#x1f3fb;', '&#x1f46e;&#x1f3fd;', '&#x1f3c4;&#x1f3fe;', '&#x1f9dd;&#x1f3fc;', '&#x1f1e7;&#x1f1eb;', '&#x1f46e;&#x1f3fe;', '&#x1f9dd;&#x1f3fd;', '&#x1f1e7;&#x1f1ec;', '&#x1f3c4;&#x1f3ff;', '&#x1f9dd;&#x1f3fe;', '&#x1f46e;&#x1f3ff;', '&#x1f1e7;&#x1f1ed;', '&#x1f9dd;&#x1f3ff;', '&#x1f1e7;&#x1f1ee;', '&#x1f3c7;&#x1f3fb;', '&#x1f3c7;&#x1f3fc;', '&#x1f470;&#x1f3fb;', '&#x1f470;&#x1f3fc;', '&#x1f470;&#x1f3fd;', '&#x1f470;&#x1f3fe;', '&#x1f470;&#x1f3ff;', '&#x1f3c7;&#x1f3fd;', '&#x1f3c7;&#x1f3fe;', '&#x1f471;&#x1f3fb;', '&#x1f3c7;&#x1f3ff;', '&#x1f1e7;&#x1f1ef;', '&#x1f471;&#x1f3fc;', '&#x1f1e7;&#x1f1f1;', '&#x1f3ca;&#x1f3fb;', '&#x1f471;&#x1f3fd;', '&#x1f1f8;&#x1f1ed;', '&#x270d;&#x1f3ff;', '&#x26f9;&#x1f3fb;', '&#x270d;&#x1f3fe;', '&#x270d;&#x1f3fd;', '&#x270d;&#x1f3fc;', '&#x270d;&#x1f3fb;', '&#x270c;&#x1f3ff;', '&#x270c;&#x1f3fe;', '&#x270c;&#x1f3fd;', '&#x270c;&#x1f3fc;', '&#x270c;&#x1f3fb;', '&#x270b;&#x1f3ff;', '&#x270b;&#x1f3fe;', '&#x270b;&#x1f3fd;', '&#x270b;&#x1f3fc;', '&#x270b;&#x1f3fb;', '&#x270a;&#x1f3ff;', '&#x270a;&#x1f3fe;', '&#x270a;&#x1f3fd;', '&#x270a;&#x1f3fc;', '&#x270a;&#x1f3fb;', '&#x26f7;&#x1f3fd;', '&#x26f7;&#x1f3fe;', '&#x26f9;&#x1f3ff;', '&#x261d;&#x1f3ff;', '&#x261d;&#x1f3fe;', '&#x26f9;&#x1f3fe;', '&#x261d;&#x1f3fd;', '&#x261d;&#x1f3fc;', '&#x26f9;&#x1f3fd;', '&#x261d;&#x1f3fb;', '&#x26f7;&#x1f3ff;', '&#x26f9;&#x1f3fc;', '&#x26f7;&#x1f3fb;', '&#x26f7;&#x1f3fc;', '&#x34;&#x20e3;', '&#x23;&#x20e3;', '&#x30;&#x20e3;', '&#x31;&#x20e3;', '&#x32;&#x20e3;', '&#x33;&#x20e3;', '&#x2a;&#x20e3;', '&#x35;&#x20e3;', '&#x36;&#x20e3;', '&#x37;&#x20e3;', '&#x38;&#x20e3;', '&#x39;&#x20e3;', '&#x1f1f3;', '&#x1f554;', '&#x1f555;', '&#x1f556;', '&#x1f557;', '&#x1f558;', '&#x1f559;', '&#x1f55a;', '&#x1f55b;', '&#x1f55c;', '&#x1f55d;', '&#x1f55e;', '&#x1f55f;', '&#x1f560;', '&#x1f561;', '&#x1f562;', '&#x1f563;', '&#x1f564;', '&#x1f565;', '&#x1f566;', '&#x1f567;', '&#x1f56f;', '&#x1f570;', '&#x1f573;', '&#x1f387;', '&#x1f388;', '&#x1f389;', '&#x1f38a;', '&#x1f38b;', '&#x1f574;', '&#x1f38c;', '&#x1f38d;', '&#x1f38e;', '&#x1f38f;', '&#x1f390;', '&#x1f391;', '&#x1f392;', '&#x1f393;', '&#x1f396;', '&#x1f397;', '&#x1f399;', '&#x1f39a;', '&#x1f39b;', '&#x1f39e;', '&#x1f39f;', '&#x1f3a0;', '&#x1f3a1;', '&#x1f575;', '&#x1f576;', '&#x1f577;', '&#x1f578;', '&#x1f579;', '&#x1f3a2;', '&#x1f3a3;', '&#x1f3a4;', '&#x1f3a5;', '&#x1f3a6;', '&#x1f57a;', '&#x1f587;', '&#x1f58a;', '&#x1f58b;', '&#x1f58c;', '&#x1f58d;', '&#x1f3a7;', '&#x1f3a8;', '&#x1f3a9;', '&#x1f3aa;', '&#x1f3ab;', '&#x1f590;', '&#x1f3ac;', '&#x1f3ad;', '&#x1f3ae;', '&#x1f3af;', '&#x1f3b0;', '&#x1f595;', '&#x1f3b1;', '&#x1f3b2;', '&#x1f3b3;', '&#x1f3b4;', '&#x1f3b5;', '&#x1f596;', '&#x1f5a4;', '&#x1f5a5;', '&#x1f5a8;', '&#x1f5b1;', '&#x1f5b2;', '&#x1f5bc;', '&#x1f5c2;', '&#x1f5c3;', '&#x1f5c4;', '&#x1f5d1;', '&#x1f5d2;', '&#x1f5d3;', '&#x1f5dc;', '&#x1f5dd;', '&#x1f5de;', '&#x1f5e1;', '&#x1f5e3;', '&#x1f5e8;', '&#x1f5ef;', '&#x1f5f3;', '&#x1f5fa;', '&#x1f5fb;', '&#x1f5fc;', '&#x1f5fd;', '&#x1f5fe;', '&#x1f5ff;', '&#x1f600;', '&#x1f601;', '&#x1f602;', '&#x1f603;', '&#x1f604;', '&#x1f605;', '&#x1f606;', '&#x1f607;', '&#x1f608;', '&#x1f609;', '&#x1f60a;', '&#x1f60b;', '&#x1f60c;', '&#x1f60d;', '&#x1f60e;', '&#x1f60f;', '&#x1f610;', '&#x1f611;', '&#x1f612;', '&#x1f613;', '&#x1f614;', '&#x1f615;', '&#x1f616;', '&#x1f617;', '&#x1f618;', '&#x1f619;', '&#x1f61a;', '&#x1f61b;', '&#x1f61c;', '&#x1f61d;', '&#x1f61e;', '&#x1f61f;', '&#x1f620;', '&#x1f621;', '&#x1f622;', '&#x1f623;', '&#x1f624;', '&#x1f625;', '&#x1f626;', '&#x1f627;', '&#x1f628;', '&#x1f629;', '&#x1f62a;', '&#x1f62b;', '&#x1f62c;', '&#x1f62d;', '&#x1f62e;', '&#x1f62f;', '&#x1f630;', '&#x1f631;', '&#x1f632;', '&#x1f633;', '&#x1f634;', '&#x1f635;', '&#x1f636;', '&#x1f637;', '&#x1f638;', '&#x1f639;', '&#x1f63a;', '&#x1f63b;', '&#x1f63c;', '&#x1f63d;', '&#x1f63e;', '&#x1f63f;', '&#x1f640;', '&#x1f641;', '&#x1f642;', '&#x1f643;', '&#x1f644;', '&#x1f3b6;', '&#x1f3b7;', '&#x1f3b8;', '&#x1f3b9;', '&#x1f3ba;', '&#x1f3bb;', '&#x1f3bc;', '&#x1f3bd;', '&#x1f3be;', '&#x1f3bf;', '&#x1f3c0;', '&#x1f3c1;', '&#x1f1e7;', '&#x1f1ee;', '&#x1f1ea;', '&#x1f1f7;', '&#x1f1f1;', '&#x1f645;', '&#x1f3c2;', '&#x1f18e;', '&#x1f191;', '&#x1f1e8;', '&#x1f1f9;', '&#x1f1ef;', '&#x1f192;', '&#x1f1ec;', '&#x1f193;', '&#x1f0cf;', '&#x1f194;', '&#x1f1f4;', '&#x1f1fa;', '&#x1f1eb;', '&#x1f195;', '&#x1f196;', '&#x1f197;', '&#x1f646;', '&#x1f1ed;', '&#x1f3c3;', '&#x1f198;', '&#x1f1e9;', '&#x1f1fb;', '&#x1f1f0;', '&#x1f199;', '&#x1f1fc;', '&#x1f19a;', '&#x1f1fd;', '&#x1f1f8;', '&#x1f004;', '&#x1f1fe;', '&#x1f1e6;', '&#x1f170;', '&#x1f171;', '&#x1f1ff;', '&#x1f647;', '&#x1f648;', '&#x1f649;', '&#x1f64a;', '&#x1f201;', '&#x1f202;', '&#x1f3c4;', '&#x1f3c5;', '&#x1f3c6;', '&#x1f21a;', '&#x1f22f;', '&#x1f232;', '&#x1f233;', '&#x1f234;', '&#x1f3c7;', '&#x1f468;', '&#x1f3c8;', '&#x1f3c9;', '&#x1f235;', '&#x1f236;', '&#x1f237;', '&#x1f64b;', '&#x1f238;', '&#x1f239;', '&#x1f23a;', '&#x1f250;', '&#x1f251;', '&#x1f64c;', '&#x1f300;', '&#x1f301;', '&#x1f302;', '&#x1f303;', '&#x1f304;', '&#x1f305;', '&#x1f306;', '&#x1f307;', '&#x1f308;', '&#x1f3ca;', '&#x1f309;', '&#x1f30a;', '&#x1f30b;', '&#x1f30c;', '&#x1f30d;', '&#x1f30e;', '&#x1f30f;', '&#x1f64d;', '&#x1f310;', '&#x1f311;', '&#x1f312;', '&#x1f313;', '&#x1f314;', '&#x1f315;', '&#x1f316;', '&#x1f317;', '&#x1f318;', '&#x1f319;', '&#x1f3cb;', '&#x1f31a;', '&#x1f31b;', '&#x1f31c;', '&#x1f31d;', '&#x1f31e;', '&#x1f31f;', '&#x1f64e;', '&#x1f320;', '&#x1f321;', '&#x1f324;', '&#x1f325;', '&#x1f326;', '&#x1f64f;', '&#x1f680;', '&#x1f681;', '&#x1f682;', '&#x1f683;', '&#x1f684;', '&#x1f685;', '&#x1f686;', '&#x1f687;', '&#x1f688;', '&#x1f689;', '&#x1f68a;', '&#x1f68b;', '&#x1f68c;', '&#x1f68d;', '&#x1f68e;', '&#x1f68f;', '&#x1f690;', '&#x1f691;', '&#x1f692;', '&#x1f693;', '&#x1f694;', '&#x1f695;', '&#x1f696;', '&#x1f697;', '&#x1f698;', '&#x1f699;', '&#x1f69a;', '&#x1f69b;', '&#x1f69c;', '&#x1f69d;', '&#x1f69e;', '&#x1f69f;', '&#x1f6a0;', '&#x1f6a1;', '&#x1f6a2;', '&#x1f327;', '&#x1f328;', '&#x1f329;', '&#x1f32a;', '&#x1f32b;', '&#x1f32c;', '&#x1f3cc;', '&#x1f3cd;', '&#x1f3ce;', '&#x1f3cf;', '&#x1f3d0;', '&#x1f3d1;', '&#x1f3d2;', '&#x1f3d3;', '&#x1f3d4;', '&#x1f3d5;', '&#x1f3d6;', '&#x1f6a3;', '&#x1f6a4;', '&#x1f6a5;', '&#x1f6a6;', '&#x1f6a7;', '&#x1f6a8;', '&#x1f6a9;', '&#x1f6aa;', '&#x1f6ab;', '&#x1f6ac;', '&#x1f6ad;', '&#x1f6ae;', '&#x1f6af;', '&#x1f6b0;', '&#x1f6b1;', '&#x1f6b2;', '&#x1f6b3;', '&#x1f3d7;', '&#x1f3d8;', '&#x1f3d9;', '&#x1f3da;', '&#x1f3db;', '&#x1f3dc;', '&#x1f3dd;', '&#x1f3de;', '&#x1f3df;', '&#x1f3e0;', '&#x1f3e1;', '&#x1f3e2;', '&#x1f3e3;', '&#x1f3e4;', '&#x1f3e5;', '&#x1f3e6;', '&#x1f3e7;', '&#x1f6b4;', '&#x1f3e8;', '&#x1f3e9;', '&#x1f3ea;', '&#x1f3eb;', '&#x1f3ec;', '&#x1f3ed;', '&#x1f3ee;', '&#x1f3ef;', '&#x1f3f0;', '&#x1f32d;', '&#x1f3f3;', '&#x1f32e;', '&#x1f32f;', '&#x1f330;', '&#x1f331;', '&#x1f3f4;', '&#x1f3f5;', '&#x1f6b5;', '&#x1f3f7;', '&#x1f3f8;', '&#x1f3f9;', '&#x1f3fa;', '&#x1f3fb;', '&#x1f3fc;', '&#x1f3fd;', '&#x1f3fe;', '&#x1f3ff;', '&#x1f400;', '&#x1f401;', '&#x1f402;', '&#x1f403;', '&#x1f404;', '&#x1f405;', '&#x1f469;', '&#x1f46a;', '&#x1f6b6;', '&#x1f6b7;', '&#x1f6b8;', '&#x1f6b9;', '&#x1f6ba;', '&#x1f6bb;', '&#x1f6bc;', '&#x1f6bd;', '&#x1f6be;', '&#x1f6bf;', '&#x1f46b;', '&#x1f46c;', '&#x1f46d;', '&#x1f406;', '&#x1f407;', '&#x1f6c0;', '&#x1f6c1;', '&#x1f6c2;', '&#x1f6c3;', '&#x1f6c4;', '&#x1f6c5;', '&#x1f6cb;', '&#x1f408;', '&#x1f409;', '&#x1f40a;', '&#x1f40b;', '&#x1f40c;', '&#x1f6cc;', '&#x1f6cd;', '&#x1f6ce;', '&#x1f6cf;', '&#x1f6d0;', '&#x1f6d1;', '&#x1f6d2;', '&#x1f6e0;', '&#x1f6e1;', '&#x1f6e2;', '&#x1f6e3;', '&#x1f6e4;', '&#x1f6e5;', '&#x1f6e9;', '&#x1f6eb;', '&#x1f6ec;', '&#x1f6f0;', '&#x1f6f3;', '&#x1f6f4;', '&#x1f6f5;', '&#x1f6f6;', '&#x1f6f7;', '&#x1f6f8;', '&#x1f910;', '&#x1f911;', '&#x1f912;', '&#x1f913;', '&#x1f914;', '&#x1f915;', '&#x1f916;', '&#x1f917;', '&#x1f40d;', '&#x1f40e;', '&#x1f40f;', '&#x1f410;', '&#x1f411;', '&#x1f918;', '&#x1f412;', '&#x1f413;', '&#x1f414;', '&#x1f415;', '&#x1f416;', '&#x1f919;', '&#x1f46e;', '&#x1f417;', '&#x1f418;', '&#x1f46f;', '&#x1f419;', '&#x1f91a;', '&#x1f41a;', '&#x1f41b;', '&#x1f41c;', '&#x1f41d;', '&#x1f470;', '&#x1f91b;', '&#x1f41e;', '&#x1f41f;', '&#x1f420;', '&#x1f421;', '&#x1f422;', '&#x1f91c;', '&#x1f91d;', '&#x1f423;', '&#x1f424;', '&#x1f425;', '&#x1f426;', '&#x1f427;', '&#x1f91e;', '&#x1f428;', '&#x1f429;', '&#x1f42a;', '&#x1f42b;', '&#x1f42c;', '&#x1f91f;', '&#x1f920;', '&#x1f921;', '&#x1f922;', '&#x1f923;', '&#x1f924;', '&#x1f925;', '&#x1f42d;', '&#x1f42e;', '&#x1f471;', '&#x1f42f;', '&#x1f430;', '&#x1f431;', '&#x1f432;', '&#x1f433;', '&#x1f472;', '&#x1f434;', '&#x1f435;', '&#x1f436;', '&#x1f437;', '&#x1f438;', '&#x1f439;', '&#x1f43a;', '&#x1f43b;', '&#x1f926;', '&#x1f927;', '&#x1f928;', '&#x1f929;', '&#x1f92a;', '&#x1f92b;', '&#x1f92c;', '&#x1f92d;', '&#x1f92e;', '&#x1f92f;', '&#x1f43c;', '&#x1f43d;', '&#x1f43e;', '&#x1f43f;', '&#x1f440;', '&#x1f930;', '&#x1f332;', '&#x1f441;', '&#x1f333;', '&#x1f334;', '&#x1f473;', '&#x1f931;', '&#x1f335;', '&#x1f336;', '&#x1f337;', '&#x1f442;', '&#x1f338;', '&#x1f932;', '&#x1f474;', '&#x1f339;', '&#x1f33a;', '&#x1f33b;', '&#x1f33c;', '&#x1f933;', '&#x1f443;', '&#x1f475;', '&#x1f444;', '&#x1f445;', '&#x1f33d;', '&#x1f934;', '&#x1f33e;', '&#x1f33f;', '&#x1f476;', '&#x1f340;', '&#x1f341;', '&#x1f935;', '&#x1f446;', '&#x1f342;', '&#x1f343;', '&#x1f344;', '&#x1f345;', '&#x1f936;', '&#x1f346;', '&#x1f447;', '&#x1f347;', '&#x1f348;', '&#x1f349;', '&#x1f34a;', '&#x1f34b;', '&#x1f448;', '&#x1f34c;', '&#x1f34d;', '&#x1f477;', '&#x1f34e;', '&#x1f34f;', '&#x1f350;', '&#x1f449;', '&#x1f351;', '&#x1f478;', '&#x1f937;', '&#x1f479;', '&#x1f47a;', '&#x1f47b;', '&#x1f352;', '&#x1f353;', '&#x1f354;', '&#x1f355;', '&#x1f44a;', '&#x1f47c;', '&#x1f47d;', '&#x1f47e;', '&#x1f47f;', '&#x1f480;', '&#x1f356;', '&#x1f357;', '&#x1f358;', '&#x1f359;', '&#x1f938;', '&#x1f35a;', '&#x1f44b;', '&#x1f35b;', '&#x1f35c;', '&#x1f35d;', '&#x1f35e;', '&#x1f35f;', '&#x1f44c;', '&#x1f360;', '&#x1f361;', '&#x1f362;', '&#x1f363;', '&#x1f364;', '&#x1f481;', '&#x1f44d;', '&#x1f365;', '&#x1f366;', '&#x1f939;', '&#x1f93a;', '&#x1f367;', '&#x1f368;', '&#x1f93c;', '&#x1f369;', '&#x1f44e;', '&#x1f36a;', '&#x1f36b;', '&#x1f36c;', '&#x1f36d;', '&#x1f36e;', '&#x1f44f;', '&#x1f36f;', '&#x1f370;', '&#x1f371;', '&#x1f372;', '&#x1f482;', '&#x1f373;', '&#x1f450;', '&#x1f451;', '&#x1f452;', '&#x1f93d;', '&#x1f453;', '&#x1f483;', '&#x1f484;', '&#x1f454;', '&#x1f455;', '&#x1f456;', '&#x1f457;', '&#x1f458;', '&#x1f485;', '&#x1f459;', '&#x1f45a;', '&#x1f45b;', '&#x1f45c;', '&#x1f45d;', '&#x1f45e;', '&#x1f45f;', '&#x1f460;', '&#x1f93e;', '&#x1f940;', '&#x1f941;', '&#x1f942;', '&#x1f943;', '&#x1f944;', '&#x1f945;', '&#x1f947;', '&#x1f948;', '&#x1f949;', '&#x1f94a;', '&#x1f94b;', '&#x1f94c;', '&#x1f950;', '&#x1f951;', '&#x1f952;', '&#x1f953;', '&#x1f954;', '&#x1f955;', '&#x1f956;', '&#x1f957;', '&#x1f958;', '&#x1f959;', '&#x1f95a;', '&#x1f95b;', '&#x1f95c;', '&#x1f95d;', '&#x1f95e;', '&#x1f95f;', '&#x1f960;', '&#x1f961;', '&#x1f962;', '&#x1f963;', '&#x1f964;', '&#x1f965;', '&#x1f966;', '&#x1f967;', '&#x1f968;', '&#x1f969;', '&#x1f96a;', '&#x1f96b;', '&#x1f980;', '&#x1f981;', '&#x1f982;', '&#x1f983;', '&#x1f984;', '&#x1f985;', '&#x1f986;', '&#x1f987;', '&#x1f988;', '&#x1f989;', '&#x1f98a;', '&#x1f98b;', '&#x1f98c;', '&#x1f98d;', '&#x1f98e;', '&#x1f98f;', '&#x1f990;', '&#x1f991;', '&#x1f992;', '&#x1f993;', '&#x1f994;', '&#x1f995;', '&#x1f996;', '&#x1f997;', '&#x1f9c0;', '&#x1f9d0;', '&#x1f461;', '&#x1f462;', '&#x1f463;', '&#x1f464;', '&#x1f465;', '&#x1f9d1;', '&#x1f374;', '&#x1f375;', '&#x1f376;', '&#x1f377;', '&#x1f486;', '&#x1f9d2;', '&#x1f378;', '&#x1f466;', '&#x1f379;', '&#x1f37a;', '&#x1f37b;', '&#x1f9d3;', '&#x1f37c;', '&#x1f37d;', '&#x1f467;', '&#x1f37e;', '&#x1f37f;', '&#x1f9d4;', '&#x1f380;', '&#x1f381;', '&#x1f382;', '&#x1f383;', '&#x1f384;', '&#x1f9d5;', '&#x1f1f5;', '&#x1f17e;', '&#x1f487;', '&#x1f488;', '&#x1f489;', '&#x1f48a;', '&#x1f48b;', '&#x1f48c;', '&#x1f48d;', '&#x1f48e;', '&#x1f48f;', '&#x1f490;', '&#x1f491;', '&#x1f492;', '&#x1f493;', '&#x1f494;', '&#x1f495;', '&#x1f9d6;', '&#x1f496;', '&#x1f497;', '&#x1f498;', '&#x1f499;', '&#x1f49a;', '&#x1f49b;', '&#x1f49c;', '&#x1f49d;', '&#x1f49e;', '&#x1f49f;', '&#x1f4a0;', '&#x1f4a1;', '&#x1f4a2;', '&#x1f4a3;', '&#x1f4a4;', '&#x1f4a5;', '&#x1f4a6;', '&#x1f9d7;', '&#x1f4a7;', '&#x1f4a8;', '&#x1f4a9;', '&#x1f1f6;', '&#x1f1f2;', '&#x1f17f;', '&#x1f385;', '&#x1f386;', '&#x1f4aa;', '&#x1f4ab;', '&#x1f4ac;', '&#x1f4ad;', '&#x1f4ae;', '&#x1f4af;', '&#x1f4b0;', '&#x1f4b1;', '&#x1f4b2;', '&#x1f9d8;', '&#x1f4b3;', '&#x1f4b4;', '&#x1f4b5;', '&#x1f4b6;', '&#x1f4b7;', '&#x1f4b8;', '&#x1f4b9;', '&#x1f4ba;', '&#x1f4bb;', '&#x1f4bc;', '&#x1f4bd;', '&#x1f4be;', '&#x1f4bf;', '&#x1f4c0;', '&#x1f4c1;', '&#x1f4c2;', '&#x1f4c3;', '&#x1f9d9;', '&#x1f4c4;', '&#x1f4c5;', '&#x1f4c6;', '&#x1f4c7;', '&#x1f4c8;', '&#x1f4c9;', '&#x1f4ca;', '&#x1f4cb;', '&#x1f4cc;', '&#x1f4cd;', '&#x1f4ce;', '&#x1f4cf;', '&#x1f4d0;', '&#x1f4d1;', '&#x1f4d2;', '&#x1f4d3;', '&#x1f4d4;', '&#x1f9da;', '&#x1f4d5;', '&#x1f4d6;', '&#x1f4d7;', '&#x1f4d8;', '&#x1f4d9;', '&#x1f4da;', '&#x1f4db;', '&#x1f4dc;', '&#x1f4dd;', '&#x1f4de;', '&#x1f4df;', '&#x1f4e0;', '&#x1f4e1;', '&#x1f4e2;', '&#x1f4e3;', '&#x1f4e4;', '&#x1f4e5;', '&#x1f9db;', '&#x1f4e6;', '&#x1f4e7;', '&#x1f4e8;', '&#x1f4e9;', '&#x1f4ea;', '&#x1f4eb;', '&#x1f4ec;', '&#x1f4ed;', '&#x1f4ee;', '&#x1f4ef;', '&#x1f4f0;', '&#x1f4f1;', '&#x1f4f2;', '&#x1f4f3;', '&#x1f4f4;', '&#x1f4f5;', '&#x1f4f6;', '&#x1f9dc;', '&#x1f4f7;', '&#x1f4f8;', '&#x1f4f9;', '&#x1f4fa;', '&#x1f4fb;', '&#x1f4fc;', '&#x1f4fd;', '&#x1f4ff;', '&#x1f500;', '&#x1f501;', '&#x1f502;', '&#x1f503;', '&#x1f504;', '&#x1f505;', '&#x1f506;', '&#x1f507;', '&#x1f508;', '&#x1f9dd;', '&#x1f509;', '&#x1f50a;', '&#x1f9de;', '&#x1f50b;', '&#x1f50c;', '&#x1f9df;', '&#x1f9e0;', '&#x1f9e1;', '&#x1f9e2;', '&#x1f9e3;', '&#x1f9e4;', '&#x1f9e5;', '&#x1f9e6;', '&#x1f50d;', '&#x1f50e;', '&#x1f50f;', '&#x1f510;', '&#x1f511;', '&#x1f512;', '&#x1f513;', '&#x1f514;', '&#x1f515;', '&#x1f516;', '&#x1f517;', '&#x1f518;', '&#x1f519;', '&#x1f51a;', '&#x1f51b;', '&#x1f51c;', '&#x1f51d;', '&#x1f51e;', '&#x1f51f;', '&#x1f520;', '&#x1f521;', '&#x1f522;', '&#x1f523;', '&#x1f524;', '&#x1f525;', '&#x1f526;', '&#x1f527;', '&#x1f528;', '&#x1f529;', '&#x1f52a;', '&#x1f52b;', '&#x1f52c;', '&#x1f52d;', '&#x1f52e;', '&#x1f52f;', '&#x1f530;', '&#x1f531;', '&#x1f532;', '&#x1f533;', '&#x1f534;', '&#x1f535;', '&#x1f536;', '&#x1f537;', '&#x1f538;', '&#x1f539;', '&#x1f53a;', '&#x1f53b;', '&#x1f53c;', '&#x1f53d;', '&#x1f549;', '&#x1f54a;', '&#x1f54b;', '&#x1f54c;', '&#x1f54d;', '&#x1f54e;', '&#x1f550;', '&#x1f551;', '&#x1f552;', '&#x1f553;', '&#x25aa;', '&#x2626;', '&#x262e;', '&#x262f;', '&#x2638;', '&#x2639;', '&#x263a;', '&#x2640;', '&#x2642;', '&#x2648;', '&#x2649;', '&#x264a;', '&#x264b;', '&#x264c;', '&#x264d;', '&#x264e;', '&#x264f;', '&#x2650;', '&#x2651;', '&#x2652;', '&#x2653;', '&#x2660;', '&#x2663;', '&#x2665;', '&#x2666;', '&#x2668;', '&#x267b;', '&#x267f;', '&#x2692;', '&#x2693;', '&#x2694;', '&#x2695;', '&#x2696;', '&#x2697;', '&#x2699;', '&#x269b;', '&#x269c;', '&#x26a0;', '&#x26a1;', '&#x26aa;', '&#x26ab;', '&#x26b0;', '&#x26b1;', '&#x26bd;', '&#x26be;', '&#x26c4;', '&#x26c5;', '&#x26c8;', '&#x26ce;', '&#x26cf;', '&#x26d1;', '&#x26d3;', '&#x26d4;', '&#x26e9;', '&#x26ea;', '&#x26f0;', '&#x26f1;', '&#x26f2;', '&#x26f3;', '&#x26f4;', '&#x26f5;', '&#x2623;', '&#x2622;', '&#x2620;', '&#x261d;', '&#x2618;', '&#x26f7;', '&#x26f8;', '&#x2615;', '&#x2614;', '&#x2611;', '&#x260e;', '&#x2604;', '&#x2603;', '&#x2602;', '&#x2601;', '&#x2600;', '&#x25fe;', '&#x25fd;', '&#x25fc;', '&#x25fb;', '&#x25c0;', '&#x25b6;', '&#x25ab;', '&#x262a;', '&#x26f9;', '&#x26fa;', '&#x26fd;', '&#x2702;', '&#x2705;', '&#x2708;', '&#x2709;', '&#x24c2;', '&#x23fa;', '&#x23f9;', '&#x23f8;', '&#x23f3;', '&#x270a;', '&#x23f2;', '&#x23f1;', '&#x23f0;', '&#x23ef;', '&#x23ee;', '&#x270b;', '&#x23ed;', '&#x23ec;', '&#x23eb;', '&#x23ea;', '&#x23e9;', '&#x270c;', '&#x23cf;', '&#x2328;', '&#x231b;', '&#x231a;', '&#x21aa;', '&#x270d;', '&#x270f;', '&#x2712;', '&#x2714;', '&#x2716;', '&#x271d;', '&#x2721;', '&#x2728;', '&#x2733;', '&#x2734;', '&#x2744;', '&#x2747;', '&#x274c;', '&#x274e;', '&#x2753;', '&#x2754;', '&#x2755;', '&#x2757;', '&#x2763;', '&#x2764;', '&#x2795;', '&#x2796;', '&#x2797;', '&#x27a1;', '&#x27b0;', '&#x27bf;', '&#x2934;', '&#x2935;', '&#x21a9;', '&#x2b05;', '&#x2b06;', '&#x2b07;', '&#x2b1b;', '&#x2b1c;', '&#x2b50;', '&#x2b55;', '&#x2199;', '&#x3030;', '&#x303d;', '&#x2198;', '&#x2197;', '&#x3297;', '&#x3299;', '&#x2196;', '&#x2195;', '&#x2194;', '&#x2139;', '&#x2122;', '&#x2049;', '&#x203c;', '&#xe50a;' );
+	$partials = array( '&#x1f004;', '&#x1f0cf;', '&#x1f170;', '&#x1f171;', '&#x1f17e;', '&#x1f17f;', '&#x1f18e;', '&#x1f191;', '&#x1f192;', '&#x1f193;', '&#x1f194;', '&#x1f195;', '&#x1f196;', '&#x1f197;', '&#x1f198;', '&#x1f199;', '&#x1f19a;', '&#x1f1e6;', '&#x1f1e8;', '&#x1f1e9;', '&#x1f1ea;', '&#x1f1eb;', '&#x1f1ec;', '&#x1f1ee;', '&#x1f1f1;', '&#x1f1f2;', '&#x1f1f4;', '&#x1f1f6;', '&#x1f1f7;', '&#x1f1f8;', '&#x1f1f9;', '&#x1f1fa;', '&#x1f1fc;', '&#x1f1fd;', '&#x1f1ff;', '&#x1f1e7;', '&#x1f1ed;', '&#x1f1ef;', '&#x1f1f3;', '&#x1f1fb;', '&#x1f1fe;', '&#x1f1f0;', '&#x1f1f5;', '&#x1f201;', '&#x1f202;', '&#x1f21a;', '&#x1f22f;', '&#x1f232;', '&#x1f233;', '&#x1f234;', '&#x1f235;', '&#x1f236;', '&#x1f237;', '&#x1f238;', '&#x1f239;', '&#x1f23a;', '&#x1f250;', '&#x1f251;', '&#x1f300;', '&#x1f301;', '&#x1f302;', '&#x1f303;', '&#x1f304;', '&#x1f305;', '&#x1f306;', '&#x1f307;', '&#x1f308;', '&#x1f309;', '&#x1f30a;', '&#x1f30b;', '&#x1f30c;', '&#x1f30d;', '&#x1f30e;', '&#x1f30f;', '&#x1f310;', '&#x1f311;', '&#x1f312;', '&#x1f313;', '&#x1f314;', '&#x1f315;', '&#x1f316;', '&#x1f317;', '&#x1f318;', '&#x1f319;', '&#x1f31a;', '&#x1f31b;', '&#x1f31c;', '&#x1f31d;', '&#x1f31e;', '&#x1f31f;', '&#x1f320;', '&#x1f321;', '&#x1f324;', '&#x1f325;', '&#x1f326;', '&#x1f327;', '&#x1f328;', '&#x1f329;', '&#x1f32a;', '&#x1f32b;', '&#x1f32c;', '&#x1f32d;', '&#x1f32e;', '&#x1f32f;', '&#x1f330;', '&#x1f331;', '&#x1f332;', '&#x1f333;', '&#x1f334;', '&#x1f335;', '&#x1f336;', '&#x1f337;', '&#x1f338;', '&#x1f339;', '&#x1f33a;', '&#x1f33b;', '&#x1f33c;', '&#x1f33d;', '&#x1f33e;', '&#x1f33f;', '&#x1f340;', '&#x1f341;', '&#x1f342;', '&#x1f343;', '&#x1f344;', '&#x1f345;', '&#x1f346;', '&#x1f347;', '&#x1f348;', '&#x1f349;', '&#x1f34a;', '&#x1f34b;', '&#x1f34c;', '&#x1f34d;', '&#x1f34e;', '&#x1f34f;', '&#x1f350;', '&#x1f351;', '&#x1f352;', '&#x1f353;', '&#x1f354;', '&#x1f355;', '&#x1f356;', '&#x1f357;', '&#x1f358;', '&#x1f359;', '&#x1f35a;', '&#x1f35b;', '&#x1f35c;', '&#x1f35d;', '&#x1f35e;', '&#x1f35f;', '&#x1f360;', '&#x1f361;', '&#x1f362;', '&#x1f363;', '&#x1f364;', '&#x1f365;', '&#x1f366;', '&#x1f367;', '&#x1f368;', '&#x1f369;', '&#x1f36a;', '&#x1f36b;', '&#x1f36c;', '&#x1f36d;', '&#x1f36e;', '&#x1f36f;', '&#x1f370;', '&#x1f371;', '&#x1f372;', '&#x1f373;', '&#x1f374;', '&#x1f375;', '&#x1f376;', '&#x1f377;', '&#x1f378;', '&#x1f379;', '&#x1f37a;', '&#x1f37b;', '&#x1f37c;', '&#x1f37d;', '&#x1f37e;', '&#x1f37f;', '&#x1f380;', '&#x1f381;', '&#x1f382;', '&#x1f383;', '&#x1f384;', '&#x1f385;', '&#x1f3fb;', '&#x1f3fc;', '&#x1f3fd;', '&#x1f3fe;', '&#x1f3ff;', '&#x1f386;', '&#x1f387;', '&#x1f388;', '&#x1f389;', '&#x1f38a;', '&#x1f38b;', '&#x1f38c;', '&#x1f38d;', '&#x1f38e;', '&#x1f38f;', '&#x1f390;', '&#x1f391;', '&#x1f392;', '&#x1f393;', '&#x1f396;', '&#x1f397;', '&#x1f399;', '&#x1f39a;', '&#x1f39b;', '&#x1f39e;', '&#x1f39f;', '&#x1f3a0;', '&#x1f3a1;', '&#x1f3a2;', '&#x1f3a3;', '&#x1f3a4;', '&#x1f3a5;', '&#x1f3a6;', '&#x1f3a7;', '&#x1f3a8;', '&#x1f3a9;', '&#x1f3aa;', '&#x1f3ab;', '&#x1f3ac;', '&#x1f3ad;', '&#x1f3ae;', '&#x1f3af;', '&#x1f3b0;', '&#x1f3b1;', '&#x1f3b2;', '&#x1f3b3;', '&#x1f3b4;', '&#x1f3b5;', '&#x1f3b6;', '&#x1f3b7;', '&#x1f3b8;', '&#x1f3b9;', '&#x1f3ba;', '&#x1f3bb;', '&#x1f3bc;', '&#x1f3bd;', '&#x1f3be;', '&#x1f3bf;', '&#x1f3c0;', '&#x1f3c1;', '&#x1f3c2;', '&#x1f3c3;', '&#x200d;', '&#x2640;', '&#xfe0f;', '&#x2642;', '&#x1f3c4;', '&#x1f3c5;', '&#x1f3c6;', '&#x1f3c7;', '&#x1f3c8;', '&#x1f3c9;', '&#x1f3ca;', '&#x1f3cb;', '&#x1f3cc;', '&#x1f3cd;', '&#x1f3ce;', '&#x1f3cf;', '&#x1f3d0;', '&#x1f3d1;', '&#x1f3d2;', '&#x1f3d3;', '&#x1f3d4;', '&#x1f3d5;', '&#x1f3d6;', '&#x1f3d7;', '&#x1f3d8;', '&#x1f3d9;', '&#x1f3da;', '&#x1f3db;', '&#x1f3dc;', '&#x1f3dd;', '&#x1f3de;', '&#x1f3df;', '&#x1f3e0;', '&#x1f3e1;', '&#x1f3e2;', '&#x1f3e3;', '&#x1f3e4;', '&#x1f3e5;', '&#x1f3e6;', '&#x1f3e7;', '&#x1f3e8;', '&#x1f3e9;', '&#x1f3ea;', '&#x1f3eb;', '&#x1f3ec;', '&#x1f3ed;', '&#x1f3ee;', '&#x1f3ef;', '&#x1f3f0;', '&#x1f3f3;', '&#x1f3f4;', '&#x2620;', '&#xe0067;', '&#xe0062;', '&#xe0065;', '&#xe006e;', '&#xe007f;', '&#xe0073;', '&#xe0063;', '&#xe0074;', '&#xe0077;', '&#xe006c;', '&#x1f3f5;', '&#x1f3f7;', '&#x1f3f8;', '&#x1f3f9;', '&#x1f3fa;', '&#x1f400;', '&#x1f401;', '&#x1f402;', '&#x1f403;', '&#x1f404;', '&#x1f405;', '&#x1f406;', '&#x1f407;', '&#x1f408;', '&#x1f409;', '&#x1f40a;', '&#x1f40b;', '&#x1f40c;', '&#x1f40d;', '&#x1f40e;', '&#x1f40f;', '&#x1f410;', '&#x1f411;', '&#x1f412;', '&#x1f413;', '&#x1f414;', '&#x1f415;', '&#x1f416;', '&#x1f417;', '&#x1f418;', '&#x1f419;', '&#x1f41a;', '&#x1f41b;', '&#x1f41c;', '&#x1f41d;', '&#x1f41e;', '&#x1f41f;', '&#x1f420;', '&#x1f421;', '&#x1f422;', '&#x1f423;', '&#x1f424;', '&#x1f425;', '&#x1f426;', '&#x1f427;', '&#x1f428;', '&#x1f429;', '&#x1f42a;', '&#x1f42b;', '&#x1f42c;', '&#x1f42d;', '&#x1f42e;', '&#x1f42f;', '&#x1f430;', '&#x1f431;', '&#x1f432;', '&#x1f433;', '&#x1f434;', '&#x1f435;', '&#x1f436;', '&#x1f437;', '&#x1f438;', '&#x1f439;', '&#x1f43a;', '&#x1f43b;', '&#x1f43c;', '&#x1f43d;', '&#x1f43e;', '&#x1f43f;', '&#x1f440;', '&#x1f441;', '&#x1f5e8;', '&#x1f442;', '&#x1f443;', '&#x1f444;', '&#x1f445;', '&#x1f446;', '&#x1f447;', '&#x1f448;', '&#x1f449;', '&#x1f44a;', '&#x1f44b;', '&#x1f44c;', '&#x1f44d;', '&#x1f44e;', '&#x1f44f;', '&#x1f450;', '&#x1f451;', '&#x1f452;', '&#x1f453;', '&#x1f454;', '&#x1f455;', '&#x1f456;', '&#x1f457;', '&#x1f458;', '&#x1f459;', '&#x1f45a;', '&#x1f45b;', '&#x1f45c;', '&#x1f45d;', '&#x1f45e;', '&#x1f45f;', '&#x1f460;', '&#x1f461;', '&#x1f462;', '&#x1f463;', '&#x1f464;', '&#x1f465;', '&#x1f466;', '&#x1f467;', '&#x1f468;', '&#x1f4bb;', '&#x1f4bc;', '&#x1f527;', '&#x1f52c;', '&#x1f680;', '&#x1f692;', '&#x2695;', '&#x2696;', '&#x2708;', '&#x1f469;', '&#x2764;', '&#x1f48b;', '&#x1f46a;', '&#x1f46b;', '&#x1f46c;', '&#x1f46d;', '&#x1f46e;', '&#x1f46f;', '&#x1f470;', '&#x1f471;', '&#x1f472;', '&#x1f473;', '&#x1f474;', '&#x1f475;', '&#x1f476;', '&#x1f477;', '&#x1f478;', '&#x1f479;', '&#x1f47a;', '&#x1f47b;', '&#x1f47c;', '&#x1f47d;', '&#x1f47e;', '&#x1f47f;', '&#x1f480;', '&#x1f481;', '&#x1f482;', '&#x1f483;', '&#x1f484;', '&#x1f485;', '&#x1f486;', '&#x1f487;', '&#x1f488;', '&#x1f489;', '&#x1f48a;', '&#x1f48c;', '&#x1f48d;', '&#x1f48e;', '&#x1f48f;', '&#x1f490;', '&#x1f491;', '&#x1f492;', '&#x1f493;', '&#x1f494;', '&#x1f495;', '&#x1f496;', '&#x1f497;', '&#x1f498;', '&#x1f499;', '&#x1f49a;', '&#x1f49b;', '&#x1f49c;', '&#x1f49d;', '&#x1f49e;', '&#x1f49f;', '&#x1f4a0;', '&#x1f4a1;', '&#x1f4a2;', '&#x1f4a3;', '&#x1f4a4;', '&#x1f4a5;', '&#x1f4a6;', '&#x1f4a7;', '&#x1f4a8;', '&#x1f4a9;', '&#x1f4aa;', '&#x1f4ab;', '&#x1f4ac;', '&#x1f4ad;', '&#x1f4ae;', '&#x1f4af;', '&#x1f4b0;', '&#x1f4b1;', '&#x1f4b2;', '&#x1f4b3;', '&#x1f4b4;', '&#x1f4b5;', '&#x1f4b6;', '&#x1f4b7;', '&#x1f4b8;', '&#x1f4b9;', '&#x1f4ba;', '&#x1f4bd;', '&#x1f4be;', '&#x1f4bf;', '&#x1f4c0;', '&#x1f4c1;', '&#x1f4c2;', '&#x1f4c3;', '&#x1f4c4;', '&#x1f4c5;', '&#x1f4c6;', '&#x1f4c7;', '&#x1f4c8;', '&#x1f4c9;', '&#x1f4ca;', '&#x1f4cb;', '&#x1f4cc;', '&#x1f4cd;', '&#x1f4ce;', '&#x1f4cf;', '&#x1f4d0;', '&#x1f4d1;', '&#x1f4d2;', '&#x1f4d3;', '&#x1f4d4;', '&#x1f4d5;', '&#x1f4d6;', '&#x1f4d7;', '&#x1f4d8;', '&#x1f4d9;', '&#x1f4da;', '&#x1f4db;', '&#x1f4dc;', '&#x1f4dd;', '&#x1f4de;', '&#x1f4df;', '&#x1f4e0;', '&#x1f4e1;', '&#x1f4e2;', '&#x1f4e3;', '&#x1f4e4;', '&#x1f4e5;', '&#x1f4e6;', '&#x1f4e7;', '&#x1f4e8;', '&#x1f4e9;', '&#x1f4ea;', '&#x1f4eb;', '&#x1f4ec;', '&#x1f4ed;', '&#x1f4ee;', '&#x1f4ef;', '&#x1f4f0;', '&#x1f4f1;', '&#x1f4f2;', '&#x1f4f3;', '&#x1f4f4;', '&#x1f4f5;', '&#x1f4f6;', '&#x1f4f7;', '&#x1f4f8;', '&#x1f4f9;', '&#x1f4fa;', '&#x1f4fb;', '&#x1f4fc;', '&#x1f4fd;', '&#x1f4ff;', '&#x1f500;', '&#x1f501;', '&#x1f502;', '&#x1f503;', '&#x1f504;', '&#x1f505;', '&#x1f506;', '&#x1f507;', '&#x1f508;', '&#x1f509;', '&#x1f50a;', '&#x1f50b;', '&#x1f50c;', '&#x1f50d;', '&#x1f50e;', '&#x1f50f;', '&#x1f510;', '&#x1f511;', '&#x1f512;', '&#x1f513;', '&#x1f514;', '&#x1f515;', '&#x1f516;', '&#x1f517;', '&#x1f518;', '&#x1f519;', '&#x1f51a;', '&#x1f51b;', '&#x1f51c;', '&#x1f51d;', '&#x1f51e;', '&#x1f51f;', '&#x1f520;', '&#x1f521;', '&#x1f522;', '&#x1f523;', '&#x1f524;', '&#x1f525;', '&#x1f526;', '&#x1f528;', '&#x1f529;', '&#x1f52a;', '&#x1f52b;', '&#x1f52d;', '&#x1f52e;', '&#x1f52f;', '&#x1f530;', '&#x1f531;', '&#x1f532;', '&#x1f533;', '&#x1f534;', '&#x1f535;', '&#x1f536;', '&#x1f537;', '&#x1f538;', '&#x1f539;', '&#x1f53a;', '&#x1f53b;', '&#x1f53c;', '&#x1f53d;', '&#x1f549;', '&#x1f54a;', '&#x1f54b;', '&#x1f54c;', '&#x1f54d;', '&#x1f54e;', '&#x1f550;', '&#x1f551;', '&#x1f552;', '&#x1f553;', '&#x1f554;', '&#x1f555;', '&#x1f556;', '&#x1f557;', '&#x1f558;', '&#x1f559;', '&#x1f55a;', '&#x1f55b;', '&#x1f55c;', '&#x1f55d;', '&#x1f55e;', '&#x1f55f;', '&#x1f560;', '&#x1f561;', '&#x1f562;', '&#x1f563;', '&#x1f564;', '&#x1f565;', '&#x1f566;', '&#x1f567;', '&#x1f56f;', '&#x1f570;', '&#x1f573;', '&#x1f574;', '&#x1f575;', '&#x1f576;', '&#x1f577;', '&#x1f578;', '&#x1f579;', '&#x1f57a;', '&#x1f587;', '&#x1f58a;', '&#x1f58b;', '&#x1f58c;', '&#x1f58d;', '&#x1f590;', '&#x1f595;', '&#x1f596;', '&#x1f5a4;', '&#x1f5a5;', '&#x1f5a8;', '&#x1f5b1;', '&#x1f5b2;', '&#x1f5bc;', '&#x1f5c2;', '&#x1f5c3;', '&#x1f5c4;', '&#x1f5d1;', '&#x1f5d2;', '&#x1f5d3;', '&#x1f5dc;', '&#x1f5dd;', '&#x1f5de;', '&#x1f5e1;', '&#x1f5e3;', '&#x1f5ef;', '&#x1f5f3;', '&#x1f5fa;', '&#x1f5fb;', '&#x1f5fc;', '&#x1f5fd;', '&#x1f5fe;', '&#x1f5ff;', '&#x1f600;', '&#x1f601;', '&#x1f602;', '&#x1f603;', '&#x1f604;', '&#x1f605;', '&#x1f606;', '&#x1f607;', '&#x1f608;', '&#x1f609;', '&#x1f60a;', '&#x1f60b;', '&#x1f60c;', '&#x1f60d;', '&#x1f60e;', '&#x1f60f;', '&#x1f610;', '&#x1f611;', '&#x1f612;', '&#x1f613;', '&#x1f614;', '&#x1f615;', '&#x1f616;', '&#x1f617;', '&#x1f618;', '&#x1f619;', '&#x1f61a;', '&#x1f61b;', '&#x1f61c;', '&#x1f61d;', '&#x1f61e;', '&#x1f61f;', '&#x1f620;', '&#x1f621;', '&#x1f622;', '&#x1f623;', '&#x1f624;', '&#x1f625;', '&#x1f626;', '&#x1f627;', '&#x1f628;', '&#x1f629;', '&#x1f62a;', '&#x1f62b;', '&#x1f62c;', '&#x1f62d;', '&#x1f62e;', '&#x1f62f;', '&#x1f630;', '&#x1f631;', '&#x1f632;', '&#x1f633;', '&#x1f634;', '&#x1f635;', '&#x1f636;', '&#x1f637;', '&#x1f638;', '&#x1f639;', '&#x1f63a;', '&#x1f63b;', '&#x1f63c;', '&#x1f63d;', '&#x1f63e;', '&#x1f63f;', '&#x1f640;', '&#x1f641;', '&#x1f642;', '&#x1f643;', '&#x1f644;', '&#x1f645;', '&#x1f646;', '&#x1f647;', '&#x1f648;', '&#x1f649;', '&#x1f64a;', '&#x1f64b;', '&#x1f64c;', '&#x1f64d;', '&#x1f64e;', '&#x1f64f;', '&#x1f681;', '&#x1f682;', '&#x1f683;', '&#x1f684;', '&#x1f685;', '&#x1f686;', '&#x1f687;', '&#x1f688;', '&#x1f689;', '&#x1f68a;', '&#x1f68b;', '&#x1f68c;', '&#x1f68d;', '&#x1f68e;', '&#x1f68f;', '&#x1f690;', '&#x1f691;', '&#x1f693;', '&#x1f694;', '&#x1f695;', '&#x1f696;', '&#x1f697;', '&#x1f698;', '&#x1f699;', '&#x1f69a;', '&#x1f69b;', '&#x1f69c;', '&#x1f69d;', '&#x1f69e;', '&#x1f69f;', '&#x1f6a0;', '&#x1f6a1;', '&#x1f6a2;', '&#x1f6a3;', '&#x1f6a4;', '&#x1f6a5;', '&#x1f6a6;', '&#x1f6a7;', '&#x1f6a8;', '&#x1f6a9;', '&#x1f6aa;', '&#x1f6ab;', '&#x1f6ac;', '&#x1f6ad;', '&#x1f6ae;', '&#x1f6af;', '&#x1f6b0;', '&#x1f6b1;', '&#x1f6b2;', '&#x1f6b3;', '&#x1f6b4;', '&#x1f6b5;', '&#x1f6b6;', '&#x1f6b7;', '&#x1f6b8;', '&#x1f6b9;', '&#x1f6ba;', '&#x1f6bb;', '&#x1f6bc;', '&#x1f6bd;', '&#x1f6be;', '&#x1f6bf;', '&#x1f6c0;', '&#x1f6c1;', '&#x1f6c2;', '&#x1f6c3;', '&#x1f6c4;', '&#x1f6c5;', '&#x1f6cb;', '&#x1f6cc;', '&#x1f6cd;', '&#x1f6ce;', '&#x1f6cf;', '&#x1f6d0;', '&#x1f6d1;', '&#x1f6d2;', '&#x1f6e0;', '&#x1f6e1;', '&#x1f6e2;', '&#x1f6e3;', '&#x1f6e4;', '&#x1f6e5;', '&#x1f6e9;', '&#x1f6eb;', '&#x1f6ec;', '&#x1f6f0;', '&#x1f6f3;', '&#x1f6f4;', '&#x1f6f5;', '&#x1f6f6;', '&#x1f6f7;', '&#x1f6f8;', '&#x1f910;', '&#x1f911;', '&#x1f912;', '&#x1f913;', '&#x1f914;', '&#x1f915;', '&#x1f916;', '&#x1f917;', '&#x1f918;', '&#x1f919;', '&#x1f91a;', '&#x1f91b;', '&#x1f91c;', '&#x1f91d;', '&#x1f91e;', '&#x1f91f;', '&#x1f920;', '&#x1f921;', '&#x1f922;', '&#x1f923;', '&#x1f924;', '&#x1f925;', '&#x1f926;', '&#x1f927;', '&#x1f928;', '&#x1f929;', '&#x1f92a;', '&#x1f92b;', '&#x1f92c;', '&#x1f92d;', '&#x1f92e;', '&#x1f92f;', '&#x1f930;', '&#x1f931;', '&#x1f932;', '&#x1f933;', '&#x1f934;', '&#x1f935;', '&#x1f936;', '&#x1f937;', '&#x1f938;', '&#x1f939;', '&#x1f93a;', '&#x1f93c;', '&#x1f93d;', '&#x1f93e;', '&#x1f940;', '&#x1f941;', '&#x1f942;', '&#x1f943;', '&#x1f944;', '&#x1f945;', '&#x1f947;', '&#x1f948;', '&#x1f949;', '&#x1f94a;', '&#x1f94b;', '&#x1f94c;', '&#x1f950;', '&#x1f951;', '&#x1f952;', '&#x1f953;', '&#x1f954;', '&#x1f955;', '&#x1f956;', '&#x1f957;', '&#x1f958;', '&#x1f959;', '&#x1f95a;', '&#x1f95b;', '&#x1f95c;', '&#x1f95d;', '&#x1f95e;', '&#x1f95f;', '&#x1f960;', '&#x1f961;', '&#x1f962;', '&#x1f963;', '&#x1f964;', '&#x1f965;', '&#x1f966;', '&#x1f967;', '&#x1f968;', '&#x1f969;', '&#x1f96a;', '&#x1f96b;', '&#x1f980;', '&#x1f981;', '&#x1f982;', '&#x1f983;', '&#x1f984;', '&#x1f985;', '&#x1f986;', '&#x1f987;', '&#x1f988;', '&#x1f989;', '&#x1f98a;', '&#x1f98b;', '&#x1f98c;', '&#x1f98d;', '&#x1f98e;', '&#x1f98f;', '&#x1f990;', '&#x1f991;', '&#x1f992;', '&#x1f993;', '&#x1f994;', '&#x1f995;', '&#x1f996;', '&#x1f997;', '&#x1f9c0;', '&#x1f9d0;', '&#x1f9d1;', '&#x1f9d2;', '&#x1f9d3;', '&#x1f9d4;', '&#x1f9d5;', '&#x1f9d6;', '&#x1f9d7;', '&#x1f9d8;', '&#x1f9d9;', '&#x1f9da;', '&#x1f9db;', '&#x1f9dc;', '&#x1f9dd;', '&#x1f9de;', '&#x1f9df;', '&#x1f9e0;', '&#x1f9e1;', '&#x1f9e2;', '&#x1f9e3;', '&#x1f9e4;', '&#x1f9e5;', '&#x1f9e6;', '&#x203c;', '&#x2049;', '&#x2122;', '&#x2139;', '&#x2194;', '&#x2195;', '&#x2196;', '&#x2197;', '&#x2198;', '&#x2199;', '&#x21a9;', '&#x21aa;', '&#x20e3;', '&#x231a;', '&#x231b;', '&#x2328;', '&#x23cf;', '&#x23e9;', '&#x23ea;', '&#x23eb;', '&#x23ec;', '&#x23ed;', '&#x23ee;', '&#x23ef;', '&#x23f0;', '&#x23f1;', '&#x23f2;', '&#x23f3;', '&#x23f8;', '&#x23f9;', '&#x23fa;', '&#x24c2;', '&#x25aa;', '&#x25ab;', '&#x25b6;', '&#x25c0;', '&#x25fb;', '&#x25fc;', '&#x25fd;', '&#x25fe;', '&#x2600;', '&#x2601;', '&#x2602;', '&#x2603;', '&#x2604;', '&#x260e;', '&#x2611;', '&#x2614;', '&#x2615;', '&#x2618;', '&#x261d;', '&#x2622;', '&#x2623;', '&#x2626;', '&#x262a;', '&#x262e;', '&#x262f;', '&#x2638;', '&#x2639;', '&#x263a;', '&#x2648;', '&#x2649;', '&#x264a;', '&#x264b;', '&#x264c;', '&#x264d;', '&#x264e;', '&#x264f;', '&#x2650;', '&#x2651;', '&#x2652;', '&#x2653;', '&#x2660;', '&#x2663;', '&#x2665;', '&#x2666;', '&#x2668;', '&#x267b;', '&#x267f;', '&#x2692;', '&#x2693;', '&#x2694;', '&#x2697;', '&#x2699;', '&#x269b;', '&#x269c;', '&#x26a0;', '&#x26a1;', '&#x26aa;', '&#x26ab;', '&#x26b0;', '&#x26b1;', '&#x26bd;', '&#x26be;', '&#x26c4;', '&#x26c5;', '&#x26c8;', '&#x26ce;', '&#x26cf;', '&#x26d1;', '&#x26d3;', '&#x26d4;', '&#x26e9;', '&#x26ea;', '&#x26f0;', '&#x26f1;', '&#x26f2;', '&#x26f3;', '&#x26f4;', '&#x26f5;', '&#x26f7;', '&#x26f8;', '&#x26f9;', '&#x26fa;', '&#x26fd;', '&#x2702;', '&#x2705;', '&#x2709;', '&#x270a;', '&#x270b;', '&#x270c;', '&#x270d;', '&#x270f;', '&#x2712;', '&#x2714;', '&#x2716;', '&#x271d;', '&#x2721;', '&#x2728;', '&#x2733;', '&#x2734;', '&#x2744;', '&#x2747;', '&#x274c;', '&#x274e;', '&#x2753;', '&#x2754;', '&#x2755;', '&#x2757;', '&#x2763;', '&#x2795;', '&#x2796;', '&#x2797;', '&#x27a1;', '&#x27b0;', '&#x27bf;', '&#x2934;', '&#x2935;', '&#x2b05;', '&#x2b06;', '&#x2b07;', '&#x2b1b;', '&#x2b1c;', '&#x2b50;', '&#x2b55;', '&#x3030;', '&#x303d;', '&#x3297;', '&#x3299;', '&#xe50a;' );
 	// END: emoji arrays
 
 	if ( 'entities' === $type ) {
@@ -5343,7 +5625,7 @@ function _wp_emoji_list( $type = 'entities' ) {
  * @return string Shortened URL.
  */
 function url_shorten( $url, $length = 35 ) {
-	$stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url );
+	$stripped  = str_replace( array( 'https://', 'http://', 'www.' ), '', $url );
 	$short_url = untrailingslashit( $stripped );
 
 	if ( strlen( $short_url ) > $length ) {
@@ -5369,7 +5651,7 @@ function sanitize_hex_color( $color ) {
 	}
 
 	// 3 or 6 hex digits, or the empty string.
-	if ( preg_match('|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
+	if ( preg_match( '|^#([A-Fa-f0-9]{3}){1,2}$|', $color ) ) {
 		return $color;
 	}
 }
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index c5f6feb2f0..23e04cf504 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -24,21 +24,25 @@ require( ABSPATH . WPINC . '/option.php' );
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
 function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
+	if ( empty( $date ) ) {
 		return false;
+	}
 
-	if ( 'G' == $format )
+	if ( 'G' == $format ) {
 		return strtotime( $date . ' +0000' );
+	}
 
 	$i = strtotime( $date );
 
-	if ( 'U' == $format )
+	if ( 'U' == $format ) {
 		return $i;
+	}
 
-	if ( $translate )
+	if ( $translate ) {
 		return date_i18n( $format, $i );
-	else
+	} else {
 		return date( $format, $i );
+	}
 }
 
 /**
@@ -100,36 +104,36 @@ function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
 	 */
 	$req_format = $dateformatstring;
 
-	if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-		$datemonth = $wp_locale->get_month( date( 'm', $i ) );
-		$datemonth_abbrev = $wp_locale->get_month_abbrev( $datemonth );
-		$dateweekday = $wp_locale->get_weekday( date( 'w', $i ) );
-		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev( $dateweekday );
-		$datemeridiem = $wp_locale->get_meridiem( date( 'a', $i ) );
+	if ( ( ! empty( $wp_locale->month ) ) && ( ! empty( $wp_locale->weekday ) ) ) {
+		$datemonth            = $wp_locale->get_month( date( 'm', $i ) );
+		$datemonth_abbrev     = $wp_locale->get_month_abbrev( $datemonth );
+		$dateweekday          = $wp_locale->get_weekday( date( 'w', $i ) );
+		$dateweekday_abbrev   = $wp_locale->get_weekday_abbrev( $dateweekday );
+		$datemeridiem         = $wp_locale->get_meridiem( date( 'a', $i ) );
 		$datemeridiem_capital = $wp_locale->get_meridiem( date( 'A', $i ) );
-		$dateformatstring = ' '.$dateformatstring;
-		$dateformatstring = preg_replace( "/([^\\\])D/", "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])F/", "\\1" . backslashit( $datemonth ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])l/", "\\1" . backslashit( $dateweekday ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])M/", "\\1" . backslashit( $datemonth_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])a/", "\\1" . backslashit( $datemeridiem ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])A/", "\\1" . backslashit( $datemeridiem_capital ), $dateformatstring );
+		$dateformatstring     = ' ' . $dateformatstring;
+		$dateformatstring     = preg_replace( '/([^\\\])D/', "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring );
+		$dateformatstring     = preg_replace( '/([^\\\])F/', "\\1" . backslashit( $datemonth ), $dateformatstring );
+		$dateformatstring     = preg_replace( '/([^\\\])l/', "\\1" . backslashit( $dateweekday ), $dateformatstring );
+		$dateformatstring     = preg_replace( '/([^\\\])M/', "\\1" . backslashit( $datemonth_abbrev ), $dateformatstring );
+		$dateformatstring     = preg_replace( '/([^\\\])a/', "\\1" . backslashit( $datemeridiem ), $dateformatstring );
+		$dateformatstring     = preg_replace( '/([^\\\])A/', "\\1" . backslashit( $datemeridiem_capital ), $dateformatstring );
 
-		$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+		$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) - 1 );
 	}
-	$timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
+	$timezone_formats    = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
 	$timezone_formats_re = implode( '|', $timezone_formats );
 	if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) ) {
 		$timezone_string = get_option( 'timezone_string' );
 		if ( $timezone_string ) {
 			$timezone_object = timezone_open( $timezone_string );
-			$date_object = date_create( null, $timezone_object );
+			$date_object     = date_create( null, $timezone_object );
 			foreach ( $timezone_formats as $timezone_format ) {
 				if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
-					$formatted = date_format( $date_object, $timezone_format );
-					$dateformatstring = ' '.$dateformatstring;
+					$formatted        = date_format( $date_object, $timezone_format );
+					$dateformatstring = ' ' . $dateformatstring;
 					$dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
-					$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+					$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) - 1 );
 				}
 			}
 		}
@@ -303,11 +307,13 @@ function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
 	// The day of the week from the timestamp.
 	$weekday = date( 'w', $day );
 
-	if ( !is_numeric($start_of_week) )
+	if ( ! is_numeric( $start_of_week ) ) {
 		$start_of_week = get_option( 'start_of_week' );
+	}
 
-	if ( $weekday < $start_of_week )
+	if ( $weekday < $start_of_week ) {
 		$weekday += 7;
+	}
 
 	// The most recent week start day on or before $day.
 	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
@@ -326,8 +332,9 @@ function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
  * @return mixed Unserialized data can be any type.
  */
 function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
+	if ( is_serialized( $original ) ) { // don't attempt to unserialize data that wasn't serialized going in
 		return @unserialize( $original );
+	}
 	return $original;
 }
 
@@ -349,7 +356,7 @@ function is_serialized( $data, $strict = true ) {
 		return false;
 	}
 	$data = trim( $data );
- 	if ( 'N;' == $data ) {
+	if ( 'N;' == $data ) {
 		return true;
 	}
 	if ( strlen( $data ) < 4 ) {
@@ -367,17 +374,20 @@ function is_serialized( $data, $strict = true ) {
 		$semicolon = strpos( $data, ';' );
 		$brace     = strpos( $data, '}' );
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
+		if ( false === $semicolon && false === $brace ) {
 			return false;
+		}
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
+		if ( false !== $semicolon && $semicolon < 3 ) {
 			return false;
-		if ( false !== $brace && $brace < 4 )
+		}
+		if ( false !== $brace && $brace < 4 ) {
 			return false;
+		}
 	}
 	$token = $data[0];
 	switch ( $token ) {
-		case 's' :
+		case 's':
 			if ( $strict ) {
 				if ( '"' !== substr( $data, -2, 1 ) ) {
 					return false;
@@ -386,12 +396,12 @@ function is_serialized( $data, $strict = true ) {
 				return false;
 			}
 			// or else fall through
-		case 'a' :
-		case 'O' :
+		case 'a':
+		case 'O':
 			return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
-		case 'b' :
-		case 'i' :
-		case 'd' :
+		case 'b':
+		case 'i':
+		case 'd':
 			$end = $strict ? '$' : '';
 			return (bool) preg_match( "/^{$token}:[0-9.E-]+;$end/", $data );
 	}
@@ -436,14 +446,16 @@ function is_serialized_string( $data ) {
  * @return mixed A scalar data
  */
 function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
+	if ( is_array( $data ) || is_object( $data ) ) {
 		return serialize( $data );
+	}
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
+	if ( is_serialized( $data, false ) ) {
 		return serialize( $data );
+	}
 
 	return $data;
 }
@@ -522,16 +534,16 @@ function xmlrpc_removepostdata( $content ) {
 function wp_extract_urls( $content ) {
 	preg_match_all(
 		"#([\"']?)("
-			. "(?:([\w-]+:)?//?)"
-			. "[^\s()<>]+"
-			. "[.]"
-			. "(?:"
-				. "\([\w\d]+\)|"
-				. "(?:"
+			. '(?:([\w-]+:)?//?)'
+			. '[^\s()<>]+'
+			. '[.]'
+			. '(?:'
+				. '\([\w\d]+\)|'
+				. '(?:'
 					. "[^`!()\[\]{};:'\".,<>«»“”‘’\s]|"
-					. "(?:[:]\d+)?/?"
-				. ")+"
-			. ")"
+					. '(?:[:]\d+)?/?'
+				. ')+'
+			. ')'
 		. ")\\1#",
 		$content,
 		$post_links
@@ -570,21 +582,24 @@ function do_enclose( $content, $post_ID ) {
 
 	foreach ( $pung as $link_test ) {
 		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
-			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
+			$mids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%' ) );
+			foreach ( $mids as $mid ) {
 				delete_metadata_by_mid( 'post', $mid );
+			}
 		}
 	}
 
 	foreach ( (array) $post_links_temp as $link_test ) {
-		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
+		if ( ! in_array( $link_test, $pung ) ) { // If we haven't pung it already
 			$test = @parse_url( $link_test );
-			if ( false === $test )
+			if ( false === $test ) {
 				continue;
-			if ( isset( $test['query'] ) )
+			}
+			if ( isset( $test['query'] ) ) {
 				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
+			} elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) ) {
 				$post_links[] = $link_test;
+			}
 		}
 	}
 
@@ -602,11 +617,11 @@ function do_enclose( $content, $post_ID ) {
 	$post_links = apply_filters( 'enclosure_links', $post_links, $post_ID );
 
 	foreach ( (array) $post_links as $url ) {
-		if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $url ) . '%' ) ) ) {
+		if ( $url != '' && ! $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $url ) . '%' ) ) ) {
 
-			if ( $headers = wp_get_http_headers( $url) ) {
-				$len = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
-				$type = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
+			if ( $headers = wp_get_http_headers( $url ) ) {
+				$len           = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
+				$type          = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
 				$allowed_types = array( 'video', 'audio' );
 
 				// Check to see if we can figure out the mime type from
@@ -614,7 +629,7 @@ function do_enclose( $content, $post_ID ) {
 				$url_parts = @parse_url( $url );
 				if ( false !== $url_parts ) {
 					$extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
-					if ( !empty( $extension ) ) {
+					if ( ! empty( $extension ) ) {
 						foreach ( wp_get_mime_types() as $exts => $mime ) {
 							if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
 								$type = $mime;
@@ -624,7 +639,7 @@ function do_enclose( $content, $post_ID ) {
 					}
 				}
 
-				if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
+				if ( in_array( substr( $type, 0, strpos( $type, '/' ) ), $allowed_types ) ) {
 					add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime\n" );
 				}
 			}
@@ -642,13 +657,15 @@ function do_enclose( $content, $post_ID ) {
  * @return bool|string False on failure, headers on success.
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.7.0' );
+	}
 
 	$response = wp_safe_remote_head( $url );
 
-	if ( is_wp_error( $response ) )
+	if ( is_wp_error( $response ) ) {
 		return false;
+	}
 
 	return wp_remote_retrieve_headers( $response );
 }
@@ -666,10 +683,11 @@ function wp_get_http_headers( $url, $deprecated = false ) {
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
+	if ( $currentday != $previousday ) {
 		return 1;
-	else
+	} else {
 		return 0;
+	}
 }
 
 /**
@@ -682,7 +700,7 @@ function is_new_day() {
  *
  * @see _http_build_query() Used to build the query
  * @link https://secure.php.net/manual/en/function.http-build-query.php for more on what
- *		 http_build_query() does.
+ *       http_build_query() does.
  *
  * @param array $data URL-encode key/value pairs.
  * @return string URL-encoded string.
@@ -713,29 +731,35 @@ function _http_build_query( $data, $prefix = null, $sep = null, $key = '', $urle
 	$ret = array();
 
 	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
-			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
-			$k = $prefix.$k;
-		if ( !empty($key) )
+		if ( $urlencode ) {
+			$k = urlencode( $k );
+		}
+		if ( is_int( $k ) && $prefix != null ) {
+			$k = $prefix . $k;
+		}
+		if ( ! empty( $key ) ) {
 			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
+		}
+		if ( $v === null ) {
 			continue;
-		elseif ( $v === false )
+		} elseif ( $v === false ) {
 			$v = '0';
+		}
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
-			array_push($ret, $k.'='.urlencode($v));
-		else
-			array_push($ret, $k.'='.$v);
+		if ( is_array( $v ) || is_object( $v ) ) {
+			array_push( $ret, _http_build_query( $v, '', $sep, $k, $urlencode ) );
+		} elseif ( $urlencode ) {
+			array_push( $ret, $k . '=' . urlencode( $v ) );
+		} else {
+			array_push( $ret, $k . '=' . $v );
+		}
 	}
 
-	if ( null === $sep )
-		$sep = ini_get('arg_separator.output');
+	if ( null === $sep ) {
+		$sep = ini_get( 'arg_separator.output' );
+	}
 
-	return implode($sep, $ret);
+	return implode( $sep, $ret );
 }
 
 /**
@@ -776,40 +800,43 @@ function _http_build_query( $data, $prefix = null, $sep = null, $key = '', $urle
 function add_query_arg() {
 	$args = func_get_args();
 	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
+		if ( count( $args ) < 2 || false === $args[1] ) {
 			$uri = $_SERVER['REQUEST_URI'];
-		else
+		} else {
 			$uri = $args[1];
+		}
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
+		if ( count( $args ) < 3 || false === $args[2] ) {
 			$uri = $_SERVER['REQUEST_URI'];
-		else
+		} else {
 			$uri = $args[2];
+		}
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
+	if ( $frag = strstr( $uri, '#' ) ) {
 		$uri = substr( $uri, 0, -strlen( $frag ) );
-	else
+	} else {
 		$frag = '';
+	}
 
 	if ( 0 === stripos( $uri, 'http://' ) ) {
 		$protocol = 'http://';
-		$uri = substr( $uri, 7 );
+		$uri      = substr( $uri, 7 );
 	} elseif ( 0 === stripos( $uri, 'https://' ) ) {
 		$protocol = 'https://';
-		$uri = substr( $uri, 8 );
+		$uri      = substr( $uri, 8 );
 	} else {
 		$protocol = '';
 	}
 
 	if ( strpos( $uri, '?' ) !== false ) {
 		list( $base, $query ) = explode( '?', $uri, 2 );
-		$base .= '?';
+		$base                .= '?';
 	} elseif ( $protocol || strpos( $uri, '=' ) === false ) {
-		$base = $uri . '?';
+		$base  = $uri . '?';
 		$query = '';
 	} else {
-		$base = '';
+		$base  = '';
 		$query = $uri;
 	}
 
@@ -824,8 +851,9 @@ function add_query_arg() {
 	}
 
 	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+		if ( $v === false ) {
+			unset( $qs[ $k ] );
+		}
 	}
 
 	$ret = build_query( $qs );
@@ -847,8 +875,9 @@ function add_query_arg() {
  */
 function remove_query_arg( $key, $query = false ) {
 	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
+		foreach ( $key as $k ) {
 			$query = add_query_arg( $k, false, $query );
+		}
 		return $query;
 	}
 	return add_query_arg( $key, false, $query );
@@ -909,9 +938,9 @@ function wp_removable_query_args() {
 function add_magic_quotes( $array ) {
 	foreach ( (array) $array as $k => $v ) {
 		if ( is_array( $v ) ) {
-			$array[$k] = add_magic_quotes( $v );
+			$array[ $k ] = add_magic_quotes( $v );
 		} else {
-			$array[$k] = addslashes( $v );
+			$array[ $k ] = addslashes( $v );
 		}
 	}
 	return $array;
@@ -930,16 +959,18 @@ function add_magic_quotes( $array ) {
 function wp_remote_fopen( $uri ) {
 	$parsed_url = @parse_url( $uri );
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
+	if ( ! $parsed_url || ! is_array( $parsed_url ) ) {
 		return false;
+	}
 
-	$options = array();
+	$options            = array();
 	$options['timeout'] = 10;
 
 	$response = wp_safe_remote_get( $uri, $options );
 
-	if ( is_wp_error( $response ) )
+	if ( is_wp_error( $response ) ) {
 		return false;
+	}
 
 	return wp_remote_retrieve_body( $response );
 }
@@ -959,8 +990,9 @@ function wp( $query_vars = '' ) {
 	global $wp, $wp_query, $wp_the_query;
 	$wp->main( $query_vars );
 
-	if ( !isset($wp_the_query) )
+	if ( ! isset( $wp_the_query ) ) {
 		$wp_the_query = $wp_query;
+	}
 }
 
 /**
@@ -981,7 +1013,7 @@ function get_status_header_desc( $code ) {
 
 	$code = absint( $code );
 
-	if ( !isset( $wp_header_to_desc ) ) {
+	if ( ! isset( $wp_header_to_desc ) ) {
 		$wp_header_to_desc = array(
 			100 => 'Continue',
 			101 => 'Switching Protocols',
@@ -1050,10 +1082,11 @@ function get_status_header_desc( $code ) {
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
-		return $wp_header_to_desc[$code];
-	else
+	if ( isset( $wp_header_to_desc[ $code ] ) ) {
+		return $wp_header_to_desc[ $code ];
+	} else {
 		return '';
+	}
 }
 
 /**
@@ -1076,9 +1109,9 @@ function status_header( $code, $description = '' ) {
 		return;
 	}
 
-	$protocol = wp_get_server_protocol();
+	$protocol      = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
+	if ( function_exists( 'apply_filters' ) ) {
 
 		/**
 		 * Filters an HTTP status header.
@@ -1091,6 +1124,7 @@ function status_header( $code, $description = '' ) {
 		 * @param string $protocol      Server protocol.
 		 */
 		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+	}
 
 	@header( $status_header, true, $code );
 }
@@ -1107,11 +1141,11 @@ function status_header( $code, $description = '' ) {
  */
 function wp_get_nocache_headers() {
 	$headers = array(
-		'Expires' => 'Wed, 11 Jan 1984 05:00:00 GMT',
+		'Expires'       => 'Wed, 11 Jan 1984 05:00:00 GMT',
 		'Cache-Control' => 'no-cache, must-revalidate, max-age=0',
 	);
 
-	if ( function_exists('apply_filters') ) {
+	if ( function_exists( 'apply_filters' ) ) {
 		/**
 		 * Filters the cache-controlling headers.
 		 *
@@ -1162,8 +1196,9 @@ function nocache_headers() {
 		}
 	}
 
-	foreach ( $headers as $name => $field_value )
-		@header("{$name}: {$field_value}");
+	foreach ( $headers as $name => $field_value ) {
+		@header( "{$name}: {$field_value}" );
+	}
 }
 
 /**
@@ -1174,9 +1209,9 @@ function nocache_headers() {
 function cache_javascript_headers() {
 	$expiresOffset = 10 * DAY_IN_SECONDS;
 
-	header( "Content-Type: text/javascript; charset=" . get_bloginfo( 'charset' ) );
-	header( "Vary: Accept-Encoding" ); // Handle proxies
-	header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . " GMT" );
+	header( 'Content-Type: text/javascript; charset=' . get_bloginfo( 'charset' ) );
+	header( 'Vary: Accept-Encoding' ); // Handle proxies
+	header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expiresOffset ) . ' GMT' );
 }
 
 /**
@@ -1227,8 +1262,9 @@ function do_feed() {
 	// Remove the pad, if present.
 	$feed = preg_replace( '/^_+/', '', $feed );
 
-	if ( $feed == '' || $feed == 'feed' )
+	if ( $feed == '' || $feed == 'feed' ) {
 		$feed = get_default_feed();
+	}
 
 	if ( ! has_action( "do_feed_{$feed}" ) ) {
 		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
@@ -1281,10 +1317,11 @@ function do_feed_rss() {
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
+	if ( $for_comments ) {
 		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
-	else
+	} else {
 		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+	}
 }
 
 /**
@@ -1297,10 +1334,11 @@ function do_feed_rss2( $for_comments ) {
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_atom( $for_comments ) {
-	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
-	else
+	if ( $for_comments ) {
+		load_template( ABSPATH . WPINC . '/feed-atom-comments.php' );
+	} else {
 		load_template( ABSPATH . WPINC . '/feed-atom.php' );
+	}
 }
 
 /**
@@ -1327,9 +1365,9 @@ function do_robots() {
 		$output .= "Disallow: /\n";
 	} else {
 		$site_url = parse_url( site_url() );
-		$path = ( !empty( $site_url['path'] ) ) ? $site_url['path'] : '';
-		$output .= "Disallow: $path/wp-admin/\n";
-		$output .= "Allow: $path/wp-admin/admin-ajax.php\n";
+		$path     = ( ! empty( $site_url['path'] ) ) ? $site_url['path'] : '';
+		$output  .= "Disallow: $path/wp-admin/\n";
+		$output  .= "Allow: $path/wp-admin/admin-ajax.php\n";
 	}
 
 	/**
@@ -1365,29 +1403,33 @@ function is_blog_installed() {
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
+	if ( wp_cache_get( 'is_blog_installed' ) ) {
 		return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 	if ( ! wp_installing() ) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
+	if ( ! isset( $alloptions['siteurl'] ) ) {
 		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-	else
+	} else {
 		$installed = $alloptions['siteurl'];
+	}
 	$wpdb->suppress_errors( $suppress );
 
-	$installed = !empty( $installed );
+	$installed = ! empty( $installed );
 	wp_cache_set( 'is_blog_installed', $installed );
 
-	if ( $installed )
+	if ( $installed ) {
 		return true;
+	}
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
+	if ( defined( 'WP_REPAIRING' ) ) {
 		return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 
@@ -1399,13 +1441,16 @@ function is_blog_installed() {
 	$wp_tables = $wpdb->tables();
 	foreach ( $wp_tables as $table ) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean installation.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
+		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
 			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
+		}
+		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
 			continue;
+		}
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
+		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) {
 			continue;
+		}
 
 		// One or more tables exist. We are insane.
 
@@ -1469,15 +1514,17 @@ function wp_nonce_url( $actionurl, $action = -1, $name = '_wpnonce' ) {
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
  * @return string Nonce field HTML markup.
  */
-function wp_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $echo = true ) {
-	$name = esc_attr( $name );
+function wp_nonce_field( $action = -1, $name = '_wpnonce', $referer = true, $echo = true ) {
+	$name        = esc_attr( $name );
 	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
 
-	if ( $referer )
+	if ( $referer ) {
 		$nonce_field .= wp_referer_field( false );
+	}
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $nonce_field;
+	}
 
 	return $nonce_field;
 }
@@ -1494,10 +1541,11 @@ function wp_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $ec
  * @return string Referer field HTML markup.
  */
 function wp_referer_field( $echo = true ) {
-	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
+	$referer_field = '<input type="hidden" name="_wp_http_referer" value="' . esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $referer_field;
+	}
 	return $referer_field;
 }
 
@@ -1520,8 +1568,9 @@ function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
 		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
 	}
 	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
+	if ( $echo ) {
 		echo $orig_referer_field;
+	}
 	return $orig_referer_field;
 }
 
@@ -1560,7 +1609,7 @@ function wp_get_referer() {
 function wp_get_raw_referer() {
 	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
 		return wp_unslash( $_REQUEST['_wp_http_referer'] );
-	} else if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
+	} elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
 		return wp_unslash( $_SERVER['HTTP_REFERER'] );
 	}
 
@@ -1575,8 +1624,9 @@ function wp_get_raw_referer() {
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
+	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) ) {
 		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	}
 	return false;
 }
 
@@ -1610,12 +1660,14 @@ function wp_mkdir_p( $target ) {
 	 * Safe mode fails with a trailing slash under certain PHP versions.
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
-	$target = rtrim($target, '/');
-	if ( empty($target) )
+	$target = rtrim( $target, '/' );
+	if ( empty( $target ) ) {
 		$target = '/';
+	}
 
-	if ( file_exists( $target ) )
+	if ( file_exists( $target ) ) {
 		return @is_dir( $target );
+	}
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
 	$target_parent = dirname( $target );
@@ -1664,15 +1716,18 @@ function path_is_absolute( $path ) {
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
+	if ( realpath( $path ) == $path ) {
 		return true;
+	}
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
+	if ( strlen( $path ) == 0 || $path[0] == '.' ) {
 		return false;
+	}
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
+	if ( preg_match( '#^[a-zA-Z]:\\\\#', $path ) ) {
 		return true;
+	}
 
 	// A path starting with / or \ is absolute; anything else is relative.
 	return ( $path[0] == '/' || $path[0] == '\\' );
@@ -1691,10 +1746,11 @@ function path_is_absolute( $path ) {
  * @return string The path with the base or absolute path.
  */
 function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
+	if ( path_is_absolute( $path ) ) {
 		return $path;
+	}
 
-	return rtrim($base, '/') . '/' . ltrim($path, '/');
+	return rtrim( $base, '/' ) . '/' . ltrim( $path, '/' );
 }
 
 /**
@@ -1739,25 +1795,30 @@ function wp_normalize_path( $path ) {
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
-		return trailingslashit(WP_TEMP_DIR);
-
-	if ( $temp )
-		return trailingslashit( $temp );
-
-	if ( function_exists('sys_get_temp_dir') ) {
-		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+	if ( defined( 'WP_TEMP_DIR' ) ) {
+		return trailingslashit( WP_TEMP_DIR );
 	}
 
-	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
+	if ( $temp ) {
 		return trailingslashit( $temp );
+	}
+
+	if ( function_exists( 'sys_get_temp_dir' ) ) {
+		$temp = sys_get_temp_dir();
+		if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return trailingslashit( $temp );
+		}
+	}
+
+	$temp = ini_get( 'upload_tmp_dir' );
+	if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+		return trailingslashit( $temp );
+	}
 
 	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
+	if ( is_dir( $temp ) && wp_is_writable( $temp ) ) {
 		return $temp;
+	}
 
 	return '/tmp/';
 }
@@ -1776,10 +1837,11 @@ function get_temp_dir() {
  * @return bool Whether the path is writable.
  */
 function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
+	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) ) {
 		return win_is_writable( $path );
-	else
+	} else {
 		return @is_writable( $path );
+	}
 }
 
 /**
@@ -1800,19 +1862,21 @@ function wp_is_writable( $path ) {
  */
 function win_is_writable( $path ) {
 
-	if ( $path[strlen( $path ) - 1] == '/' ) { // if it looks like a directory, check a random file within the directory
-		return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
+	if ( $path[ strlen( $path ) - 1 ] == '/' ) { // if it looks like a directory, check a random file within the directory
+		return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp' );
 	} elseif ( is_dir( $path ) ) { // If it's a directory (and not a file) check a random file within the directory
 		return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
 	}
 	// check tmp file for read/write capabilities
-	$should_delete_tmp_file = !file_exists( $path );
-	$f = @fopen( $path, 'a' );
-	if ( $f === false )
+	$should_delete_tmp_file = ! file_exists( $path );
+	$f                      = @fopen( $path, 'a' );
+	if ( $f === false ) {
 		return false;
+	}
 	fclose( $f );
-	if ( $should_delete_tmp_file )
+	if ( $should_delete_tmp_file ) {
 		unlink( $path );
+	}
 	return true;
 }
 
@@ -1928,7 +1992,7 @@ function wp_upload_dir( $time = null, $create_dir = true, $refresh_cache = false
  * @return array See wp_upload_dir()
  */
 function _wp_upload_dir( $time = null ) {
-	$siteurl = get_option( 'siteurl' );
+	$siteurl     = get_option( 'siteurl' );
 	$upload_path = trim( get_option( 'upload_path' ) );
 
 	if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
@@ -1940,11 +2004,12 @@ function _wp_upload_dir( $time = null ) {
 		$dir = $upload_path;
 	}
 
-	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
+	if ( ! $url = get_option( 'upload_url_path' ) ) {
+		if ( empty( $upload_path ) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) ) {
 			$url = WP_CONTENT_URL . '/uploads';
-		else
+		} else {
 			$url = trailingslashit( $siteurl ) . $upload_path;
+		}
 	}
 
 	/*
@@ -1969,10 +2034,11 @@ function _wp_upload_dir( $time = null ) {
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
+			if ( defined( 'MULTISITE' ) ) {
 				$ms_dir = '/sites/' . get_current_blog_id();
-			else
+			} else {
 				$ms_dir = '/' . get_current_blog_id();
+			}
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
@@ -1992,10 +2058,11 @@ function _wp_upload_dir( $time = null ) {
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
+			if ( defined( 'BLOGUPLOADDIR' ) ) {
 				$dir = untrailingslashit( BLOGUPLOADDIR );
-			else
+			} else {
 				$dir = ABSPATH . UPLOADS;
+			}
 			$url = trailingslashit( $siteurl ) . 'files';
 		}
 	}
@@ -2006,10 +2073,11 @@ function _wp_upload_dir( $time = null ) {
 	$subdir = '';
 	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
+		if ( ! $time ) {
 			$time = current_time( 'mysql' );
-		$y = substr( $time, 0, 4 );
-		$m = substr( $time, 5, 2 );
+		}
+		$y      = substr( $time, 0, 4 );
+		$m      = substr( $time, 5, 2 );
 		$subdir = "/$y/$m";
 	}
 
@@ -2045,10 +2113,10 @@ function _wp_upload_dir( $time = null ) {
  */
 function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) {
 	// Sanitize the file name before we begin processing.
-	$filename = sanitize_file_name($filename);
+	$filename = sanitize_file_name( $filename );
 
 	// Separate the filename into a name and extension.
-	$ext = pathinfo( $filename, PATHINFO_EXTENSION );
+	$ext  = pathinfo( $filename, PATHINFO_EXTENSION );
 	$name = pathinfo( $filename, PATHINFO_BASENAME );
 	if ( $ext ) {
 		$ext = '.' . $ext;
@@ -2069,16 +2137,16 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 		$number = '';
 
 		// Change '.ext' to lower case.
-		if ( $ext && strtolower($ext) != $ext ) {
-			$ext2 = strtolower($ext);
-			$filename2 = preg_replace( '|' . preg_quote($ext) . '$|', $ext2, $filename );
+		if ( $ext && strtolower( $ext ) != $ext ) {
+			$ext2      = strtolower( $ext );
+			$filename2 = preg_replace( '|' . preg_quote( $ext ) . '$|', $ext2, $filename );
 
 			// Check for both lower and upper case extension or image sub-sizes may be overwritten.
-			while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) {
+			while ( file_exists( $dir . "/$filename" ) || file_exists( $dir . "/$filename2" ) ) {
 				$new_number = (int) $number + 1;
-				$filename = str_replace( array( "-$number$ext", "$number$ext" ), "-$new_number$ext", $filename );
-				$filename2 = str_replace( array( "-$number$ext2", "$number$ext2" ), "-$new_number$ext2", $filename2 );
-				$number = $new_number;
+				$filename   = str_replace( array( "-$number$ext", "$number$ext" ), "-$new_number$ext", $filename );
+				$filename2  = str_replace( array( "-$number$ext2", "$number$ext2" ), "-$new_number$ext2", $filename2 );
+				$number     = $new_number;
 			}
 
 			/**
@@ -2099,7 +2167,7 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
 			if ( '' == "$number$ext" ) {
 				$filename = "$filename-" . $new_number;
 			} else {
-				$filename = str_replace( array( "-$number$ext", "$number$ext" ), "-" . $new_number . $ext, $filename );
+				$filename = str_replace( array( "-$number$ext", "$number$ext" ), '-' . $new_number . $ext, $filename );
 			}
 			$number = $new_number;
 		}
@@ -2133,20 +2201,24 @@ function wp_unique_filename( $dir, $filename, $unique_filename_callback = null )
  * @return array
  */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.0.0' );
+	}
 
-	if ( empty( $name ) )
+	if ( empty( $name ) ) {
 		return array( 'error' => __( 'Empty filename' ) );
+	}
 
 	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
+	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) ) {
 		return array( 'error' => __( 'Sorry, this file type is not permitted for security reasons.' ) );
+	}
 
 	$upload = wp_upload_dir( $time );
 
-	if ( $upload['error'] !== false )
+	if ( $upload['error'] !== false ) {
 		return $upload;
+	}
 
 	/**
 	 * Filters whether to treat the upload bits as an error.
@@ -2158,9 +2230,15 @@ 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( 'name' => $name, 'bits' => $bits, 'time' => $time ) );
-	if ( !is_array( $upload_bits_error ) ) {
-		$upload[ 'error' ] = $upload_bits_error;
+	$upload_bits_error = apply_filters(
+		'wp_upload_bits', array(
+			'name' => $name,
+			'bits' => $bits,
+			'time' => $time,
+		)
+	);
+	if ( ! is_array( $upload_bits_error ) ) {
+		$upload['error'] = $upload_bits_error;
 		return $upload;
 	}
 
@@ -2168,10 +2246,11 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 
 	$new_file = $upload['path'] . "/$filename";
 	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
+		if ( 0 === strpos( $upload['basedir'], ABSPATH ) ) {
 			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
-		else
+		} else {
 			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		}
 
 		$message = sprintf(
 			/* translators: %s: directory path */
@@ -2182,15 +2261,16 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 	}
 
 	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
+	if ( ! $ifp ) {
 		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	}
 
 	@fwrite( $ifp, $bits );
 	fclose( $ifp );
 	clearstatcache();
 
 	// Set correct file permissions
-	$stat = @ stat( dirname( $new_file ) );
+	$stat  = @ stat( dirname( $new_file ) );
 	$perms = $stat['mode'] & 0007777;
 	$perms = $perms & 0000666;
 	@ chmod( $new_file, $perms );
@@ -2200,7 +2280,14 @@ function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
 	$url = $upload['url'] . "/$filename";
 
 	/** This filter is documented in wp-admin/includes/file.php */
-	return apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $wp_filetype['type'], 'error' => false ), 'sideload' );
+	return apply_filters(
+		'wp_handle_upload', array(
+			'file'  => $new_file,
+			'url'   => $url,
+			'type'  => $wp_filetype['type'],
+			'error' => false,
+		), 'sideload'
+	);
 }
 
 /**
@@ -2215,9 +2302,11 @@ function wp_ext2type( $ext ) {
 	$ext = strtolower( $ext );
 
 	$ext2type = wp_get_ext_types();
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	foreach ( $ext2type as $type => $exts ) {
+		if ( in_array( $ext, $exts ) ) {
 			return $type;
+		}
+	}
 }
 
 /**
@@ -2232,16 +2321,17 @@ function wp_ext2type( $ext ) {
  * @return array Values with extension first and mime type.
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
+	if ( empty( $mimes ) ) {
 		$mimes = get_allowed_mime_types();
+	}
 	$type = false;
-	$ext = false;
+	$ext  = false;
 
 	foreach ( $mimes as $ext_preg => $mime_match ) {
 		$ext_preg = '!\.(' . $ext_preg . ')$!i';
 		if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
 			$type = $mime_match;
-			$ext = $ext_matches[1];
+			$ext  = $ext_matches[1];
 			break;
 		}
 	}
@@ -2273,8 +2363,8 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 
 	// Do basic extension validation and MIME mapping
 	$wp_filetype = wp_check_filetype( $filename, $mimes );
-	$ext = $wp_filetype['ext'];
-	$type = $wp_filetype['type'];
+	$ext         = $wp_filetype['ext'];
+	$type        = $wp_filetype['type'];
 
 	// We can't do any further validation without a file to work with
 	if ( ! file_exists( $file ) ) {
@@ -2297,28 +2387,30 @@ 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(
-				'image/jpeg' => 'jpg',
-				'image/png'  => 'png',
-				'image/gif'  => 'gif',
-				'image/bmp'  => 'bmp',
-				'image/tiff' => 'tif',
-			) );
+			$mime_to_ext = apply_filters(
+				'getimagesize_mimes_to_exts', array(
+					'image/jpeg' => 'jpg',
+					'image/png'  => 'png',
+					'image/gif'  => 'gif',
+					'image/bmp'  => 'bmp',
+					'image/tiff' => 'tif',
+				)
+			);
 
 			// Replace whatever is after the last period in the filename with the correct extension
 			if ( ! empty( $mime_to_ext[ $real_mime ] ) ) {
 				$filename_parts = explode( '.', $filename );
 				array_pop( $filename_parts );
 				$filename_parts[] = $mime_to_ext[ $real_mime ];
-				$new_filename = implode( '.', $filename_parts );
+				$new_filename     = implode( '.', $filename_parts );
 
 				if ( $new_filename != $filename ) {
 					$proper_filename = $new_filename; // Mark that it changed
 				}
 				// Redefine the extension / MIME
 				$wp_filetype = wp_check_filetype( $new_filename, $mimes );
-				$ext = $wp_filetype['ext'];
-				$type = $wp_filetype['type'];
+				$ext         = $wp_filetype['ext'];
+				$type        = $wp_filetype['type'];
 			} else {
 				// Reset $real_mime and try validating again.
 				$real_mime = false;
@@ -2328,7 +2420,7 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 
 	// Validate files that didn't get validated during previous checks.
 	if ( $type && ! $real_mime && extension_loaded( 'fileinfo' ) ) {
-		$finfo = finfo_open( FILEINFO_MIME_TYPE );
+		$finfo     = finfo_open( FILEINFO_MIME_TYPE );
 		$real_mime = finfo_file( $finfo, $file );
 		finfo_close( $finfo );
 
@@ -2380,10 +2472,10 @@ function wp_get_image_mime( $file ) {
 	try {
 		if ( is_callable( 'exif_imagetype' ) ) {
 			$imagetype = exif_imagetype( $file );
-			$mime = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
+			$mime      = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
 		} elseif ( function_exists( 'getimagesize' ) ) {
 			$imagesize = getimagesize( $file );
-			$mime = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
+			$mime      = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
 		} else {
 			$mime = false;
 		}
@@ -2414,107 +2506,109 @@ function wp_get_mime_types() {
 	 * @param array $wp_get_mime_types Mime types keyed by the file extension regex
 	 *                                 corresponding to those types.
 	 */
-	return apply_filters( 'mime_types', array(
-	// Image formats.
-	'jpg|jpeg|jpe' => 'image/jpeg',
-	'gif' => 'image/gif',
-	'png' => 'image/png',
-	'bmp' => 'image/bmp',
-	'tiff|tif' => 'image/tiff',
-	'ico' => 'image/x-icon',
-	// Video formats.
-	'asf|asx' => 'video/x-ms-asf',
-	'wmv' => 'video/x-ms-wmv',
-	'wmx' => 'video/x-ms-wmx',
-	'wm' => 'video/x-ms-wm',
-	'avi' => 'video/avi',
-	'divx' => 'video/divx',
-	'flv' => 'video/x-flv',
-	'mov|qt' => 'video/quicktime',
-	'mpeg|mpg|mpe' => 'video/mpeg',
-	'mp4|m4v' => 'video/mp4',
-	'ogv' => 'video/ogg',
-	'webm' => 'video/webm',
-	'mkv' => 'video/x-matroska',
-	'3gp|3gpp' => 'video/3gpp', // Can also be audio
-	'3g2|3gp2' => 'video/3gpp2', // Can also be audio
-	// Text formats.
-	'txt|asc|c|cc|h|srt' => 'text/plain',
-	'csv' => 'text/csv',
-	'tsv' => 'text/tab-separated-values',
-	'ics' => 'text/calendar',
-	'rtx' => 'text/richtext',
-	'css' => 'text/css',
-	'htm|html' => 'text/html',
-	'vtt' => 'text/vtt',
-	'dfxp' => 'application/ttaf+xml',
-	// Audio formats.
-	'mp3|m4a|m4b' => 'audio/mpeg',
-	'ra|ram' => 'audio/x-realaudio',
-	'wav' => 'audio/wav',
-	'ogg|oga' => 'audio/ogg',
-	'mid|midi' => 'audio/midi',
-	'wma' => 'audio/x-ms-wma',
-	'wax' => 'audio/x-ms-wax',
-	'mka' => 'audio/x-matroska',
-	// Misc application formats.
-	'rtf' => 'application/rtf',
-	'js' => 'application/javascript',
-	'pdf' => 'application/pdf',
-	'swf' => 'application/x-shockwave-flash',
-	'class' => 'application/java',
-	'tar' => 'application/x-tar',
-	'zip' => 'application/zip',
-	'gz|gzip' => 'application/x-gzip',
-	'rar' => 'application/rar',
-	'7z' => 'application/x-7z-compressed',
-	'exe' => 'application/x-msdownload',
-	'psd' => 'application/octet-stream',
-	'xcf' => 'application/octet-stream',
-	// MS Office formats.
-	'doc' => 'application/msword',
-	'pot|pps|ppt' => 'application/vnd.ms-powerpoint',
-	'wri' => 'application/vnd.ms-write',
-	'xla|xls|xlt|xlw' => 'application/vnd.ms-excel',
-	'mdb' => 'application/vnd.ms-access',
-	'mpp' => 'application/vnd.ms-project',
-	'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-	'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
-	'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-	'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
-	'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-	'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
-	'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-	'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-	'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
-	'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
-	'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-	'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
-	'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-	'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
-	'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-	'potm' => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
-	'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
-	'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-	'sldm' => 'application/vnd.ms-powerpoint.slide.macroEnabled.12',
-	'onetoc|onetoc2|onetmp|onepkg' => 'application/onenote',
-	'oxps' => 'application/oxps',
-	'xps' => 'application/vnd.ms-xpsdocument',
-	// OpenOffice formats.
-	'odt' => 'application/vnd.oasis.opendocument.text',
-	'odp' => 'application/vnd.oasis.opendocument.presentation',
-	'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-	'odg' => 'application/vnd.oasis.opendocument.graphics',
-	'odc' => 'application/vnd.oasis.opendocument.chart',
-	'odb' => 'application/vnd.oasis.opendocument.database',
-	'odf' => 'application/vnd.oasis.opendocument.formula',
-	// WordPerfect formats.
-	'wp|wpd' => 'application/wordperfect',
-	// iWork formats.
-	'key' => 'application/vnd.apple.keynote',
-	'numbers' => 'application/vnd.apple.numbers',
-	'pages' => 'application/vnd.apple.pages',
-	) );
+	return apply_filters(
+		'mime_types', array(
+			// Image formats.
+			'jpg|jpeg|jpe'                 => 'image/jpeg',
+			'gif'                          => 'image/gif',
+			'png'                          => 'image/png',
+			'bmp'                          => 'image/bmp',
+			'tiff|tif'                     => 'image/tiff',
+			'ico'                          => 'image/x-icon',
+			// Video formats.
+			'asf|asx'                      => 'video/x-ms-asf',
+			'wmv'                          => 'video/x-ms-wmv',
+			'wmx'                          => 'video/x-ms-wmx',
+			'wm'                           => 'video/x-ms-wm',
+			'avi'                          => 'video/avi',
+			'divx'                         => 'video/divx',
+			'flv'                          => 'video/x-flv',
+			'mov|qt'                       => 'video/quicktime',
+			'mpeg|mpg|mpe'                 => 'video/mpeg',
+			'mp4|m4v'                      => 'video/mp4',
+			'ogv'                          => 'video/ogg',
+			'webm'                         => 'video/webm',
+			'mkv'                          => 'video/x-matroska',
+			'3gp|3gpp'                     => 'video/3gpp', // Can also be audio
+			'3g2|3gp2'                     => 'video/3gpp2', // Can also be audio
+			// Text formats.
+			'txt|asc|c|cc|h|srt'           => 'text/plain',
+			'csv'                          => 'text/csv',
+			'tsv'                          => 'text/tab-separated-values',
+			'ics'                          => 'text/calendar',
+			'rtx'                          => 'text/richtext',
+			'css'                          => 'text/css',
+			'htm|html'                     => 'text/html',
+			'vtt'                          => 'text/vtt',
+			'dfxp'                         => 'application/ttaf+xml',
+			// Audio formats.
+			'mp3|m4a|m4b'                  => 'audio/mpeg',
+			'ra|ram'                       => 'audio/x-realaudio',
+			'wav'                          => 'audio/wav',
+			'ogg|oga'                      => 'audio/ogg',
+			'mid|midi'                     => 'audio/midi',
+			'wma'                          => 'audio/x-ms-wma',
+			'wax'                          => 'audio/x-ms-wax',
+			'mka'                          => 'audio/x-matroska',
+			// Misc application formats.
+			'rtf'                          => 'application/rtf',
+			'js'                           => 'application/javascript',
+			'pdf'                          => 'application/pdf',
+			'swf'                          => 'application/x-shockwave-flash',
+			'class'                        => 'application/java',
+			'tar'                          => 'application/x-tar',
+			'zip'                          => 'application/zip',
+			'gz|gzip'                      => 'application/x-gzip',
+			'rar'                          => 'application/rar',
+			'7z'                           => 'application/x-7z-compressed',
+			'exe'                          => 'application/x-msdownload',
+			'psd'                          => 'application/octet-stream',
+			'xcf'                          => 'application/octet-stream',
+			// MS Office formats.
+			'doc'                          => 'application/msword',
+			'pot|pps|ppt'                  => 'application/vnd.ms-powerpoint',
+			'wri'                          => 'application/vnd.ms-write',
+			'xla|xls|xlt|xlw'              => 'application/vnd.ms-excel',
+			'mdb'                          => 'application/vnd.ms-access',
+			'mpp'                          => 'application/vnd.ms-project',
+			'docx'                         => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+			'docm'                         => 'application/vnd.ms-word.document.macroEnabled.12',
+			'dotx'                         => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+			'dotm'                         => 'application/vnd.ms-word.template.macroEnabled.12',
+			'xlsx'                         => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+			'xlsm'                         => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+			'xlsb'                         => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+			'xltx'                         => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+			'xltm'                         => 'application/vnd.ms-excel.template.macroEnabled.12',
+			'xlam'                         => 'application/vnd.ms-excel.addin.macroEnabled.12',
+			'pptx'                         => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+			'pptm'                         => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+			'ppsx'                         => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+			'ppsm'                         => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+			'potx'                         => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+			'potm'                         => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
+			'ppam'                         => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+			'sldx'                         => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+			'sldm'                         => 'application/vnd.ms-powerpoint.slide.macroEnabled.12',
+			'onetoc|onetoc2|onetmp|onepkg' => 'application/onenote',
+			'oxps'                         => 'application/oxps',
+			'xps'                          => 'application/vnd.ms-xpsdocument',
+			// OpenOffice formats.
+			'odt'                          => 'application/vnd.oasis.opendocument.text',
+			'odp'                          => 'application/vnd.oasis.opendocument.presentation',
+			'ods'                          => 'application/vnd.oasis.opendocument.spreadsheet',
+			'odg'                          => 'application/vnd.oasis.opendocument.graphics',
+			'odc'                          => 'application/vnd.oasis.opendocument.chart',
+			'odb'                          => 'application/vnd.oasis.opendocument.database',
+			'odf'                          => 'application/vnd.oasis.opendocument.formula',
+			// WordPerfect formats.
+			'wp|wpd'                       => 'application/wordperfect',
+			// iWork formats.
+			'key'                          => 'application/vnd.apple.keynote',
+			'numbers'                      => 'application/vnd.apple.numbers',
+			'pages'                        => 'application/vnd.apple.pages',
+		)
+	);
 }
 
 /**
@@ -2536,17 +2630,19 @@ function wp_get_ext_types() {
 	 * @param array $ext2type Multi-dimensional array with extensions for a default set
 	 *                        of file types.
 	 */
-	return apply_filters( 'ext2type', array(
-		'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
-		'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', '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' ),
-		'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),
-		'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsm',  'xlsb' ),
-		'interactive' => array( 'swf', 'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
-		'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
-		'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip', '7z' ),
-		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
-	) );
+	return apply_filters(
+		'ext2type', array(
+			'image'       => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ),
+			'audio'       => array( 'aac', 'ac3', 'aif', 'aiff', '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' ),
+			'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt', 'pages', 'pdf', 'xps', 'oxps', 'rtf', 'wp', 'wpd', 'psd', 'xcf' ),
+			'spreadsheet' => array( 'numbers', 'ods', 'xls', 'xlsx', 'xlsm', 'xlsb' ),
+			'interactive' => array( 'swf', 'key', 'ppt', 'pptx', 'pptm', 'pps', 'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
+			'text'        => array( 'asc', 'csv', 'tsv', 'txt' ),
+			'archive'     => array( 'bz2', 'cab', 'dmg', 'gz', 'rar', 'sea', 'sit', 'sqx', 'tar', 'tgz', 'zip', '7z' ),
+			'code'        => array( 'css', 'htm', 'html', 'php', 'js' ),
+		)
+	);
 }
 
 /**
@@ -2562,8 +2658,9 @@ function get_allowed_mime_types( $user = null ) {
 	$t = wp_get_mime_types();
 
 	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
+	if ( function_exists( 'current_user_can' ) ) {
 		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	}
 
 	if ( empty( $unfiltered ) ) {
 		unset( $t['htm|html'], $t['js'] );
@@ -2599,9 +2696,9 @@ function wp_nonce_ays( $action ) {
 			__( 'You are attempting to log out of %s' ),
 			get_bloginfo( 'name' )
 		);
-		$html .= '</p><p>';
+		$html       .= '</p><p>';
 		$redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-		$html .= sprintf(
+		$html       .= sprintf(
 			/* translators: %s: logout URL */
 			__( 'Do you really want to <a href="%s">log out</a>?' ),
 			wp_logout_url( $redirect_to )
@@ -2610,7 +2707,8 @@ function wp_nonce_ays( $action ) {
 		$html = __( 'Are you sure you want to do this?' );
 		if ( wp_get_referer() ) {
 			$html .= '</p><p>';
-			$html .= sprintf( '<a href="%s">%s</a>',
+			$html .= sprintf(
+				'<a href="%s">%s</a>',
 				esc_url( remove_query_arg( 'updated', wp_get_referer() ) ),
 				__( 'Please try again.' )
 			);
@@ -2710,58 +2808,61 @@ function wp_die( $message = '', $title = '', $args = array() ) {
  */
 function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 	$defaults = array( 'response' => 500 );
-	$r = wp_parse_args($args, $defaults);
+	$r        = wp_parse_args( $args, $defaults );
 
-	$have_gettext = function_exists('__');
+	$have_gettext = function_exists( '__' );
 
 	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
 		if ( empty( $title ) ) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
+			if ( is_array( $error_data ) && isset( $error_data['title'] ) ) {
 				$title = $error_data['title'];
+			}
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
-		case 0 :
-			$message = '';
-			break;
-		case 1 :
-			$message = "<p>{$errors[0]}</p>";
-			break;
-		default :
-			$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
-			break;
+			case 0:
+				$message = '';
+				break;
+			case 1:
+				$message = "<p>{$errors[0]}</p>";
+				break;
+			default:
+				$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+				break;
 		}
 	} elseif ( is_string( $message ) ) {
 		$message = "<p>$message</p>";
 	}
 
 	if ( isset( $r['back_link'] ) && $r['back_link'] ) {
-		$back_text = $have_gettext? __('&laquo; Back') : '&laquo; Back';
-		$message .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
+		$back_text = $have_gettext ? __( '&laquo; Back' ) : '&laquo; Back';
+		$message  .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
 	}
 
 	if ( ! did_action( 'admin_head' ) ) :
-		if ( !headers_sent() ) {
+		if ( ! headers_sent() ) {
 			status_header( $r['response'] );
 			nocache_headers();
 			header( 'Content-Type: text/html; charset=utf-8' );
 		}
 
-		if ( empty($title) )
-			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		if ( empty( $title ) ) {
+			$title = $have_gettext ? __( 'WordPress &rsaquo; Error' ) : 'WordPress &rsaquo; Error';
+		}
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
+		if ( isset( $r['text_direction'] ) && 'rtl' == $r['text_direction'] ) {
 			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
+		} elseif ( function_exists( 'is_rtl' ) && is_rtl() ) {
 			$text_direction = 'rtl';
+		}
 
-			if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
-				$dir_attr = get_language_attributes();
-			} else {
-				$dir_attr = "dir='$text_direction'";
-			}
+		if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
+			$dir_attr = get_language_attributes();
+		} else {
+			$dir_attr = "dir='$text_direction'";
+		}
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" <?php echo $dir_attr; ?>>
@@ -2773,7 +2874,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 		wp_no_robots();
 	}
 	?>
-	<title><?php echo $title ?></title>
+	<title><?php echo $title; ?></title>
 	<style type="text/css">
 		html {
 			background: #f1f1f1;
@@ -2821,11 +2922,11 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 		}
 		a:focus {
 			color: #124964;
-		    -webkit-box-shadow:
-		    	0 0 0 1px #5b9dd9,
+			-webkit-box-shadow:
+				0 0 0 1px #5b9dd9,
 				0 0 2px 1px rgba(30, 140, 190, .8);
-		    box-shadow:
-		    	0 0 0 1px #5b9dd9,
+			box-shadow:
+				0 0 0 1px #5b9dd9,
 				0 0 2px 1px rgba(30, 140, 190, .8);
 			outline: none;
 		}
@@ -2851,7 +2952,7 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 
 			-webkit-box-shadow: 0 1px 0 #ccc;
 			box-shadow: 0 1px 0 #ccc;
-		 	vertical-align: top;
+			 vertical-align: top;
 		}
 
 		.button.button-large {
@@ -2877,11 +2978,11 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
 		.button:active {
 			background: #eee;
 			border-color: #999;
-		 	-webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
-		 	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
-		 	-webkit-transform: translateY(1px);
-		 	-ms-transform: translateY(1px);
-		 	transform: translateY(1px);
+			 -webkit-box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
+			 box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
+			 -webkit-transform: translateY(1px);
+			 -ms-transform: translateY(1px);
+			 transform: translateY(1px);
 		}
 
 		<?php
@@ -2918,10 +3019,10 @@ function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
 	global $wp_xmlrpc_server;
 	$defaults = array( 'response' => 500 );
 
-	$r = wp_parse_args($args, $defaults);
+	$r = wp_parse_args( $args, $defaults );
 
 	if ( $wp_xmlrpc_server ) {
-		$error = new IXR_Error( $r['response'] , $message);
+		$error = new IXR_Error( $r['response'], $message );
 		$wp_xmlrpc_server->output( $error->getXml() );
 	}
 	die();
@@ -2943,14 +3044,15 @@ function _ajax_wp_die_handler( $message, $title = '', $args = array() ) {
 	$defaults = array(
 		'response' => 200,
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r        = wp_parse_args( $args, $defaults );
 
 	if ( ! headers_sent() && null !== $r['response'] ) {
 		status_header( $r['response'] );
 	}
 
-	if ( is_scalar( $message ) )
+	if ( is_scalar( $message ) ) {
 		die( (string) $message );
+	}
 	die( '0' );
 }
 
@@ -2965,8 +3067,9 @@ function _ajax_wp_die_handler( $message, $title = '', $args = array() ) {
  * @param string $message Optional. Response to print. Default empty.
  */
 function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
+	if ( is_scalar( $message ) ) {
 		die( (string) $message );
+	}
 	die();
 }
 
@@ -3003,7 +3106,7 @@ function wp_json_encode( $data, $options = 0, $depth = 512 ) {
 	// If json_encode() was successful, no need to do more sanity checking.
 	// ... unless we're in an old version of PHP, and json_encode() returned
 	// a string containing 'null'. Then we need to do more sanity checking.
-	if ( false !== $json && ( version_compare( PHP_VERSION, '5.5', '>=' ) || false === strpos( $json, 'null' ) ) )  {
+	if ( false !== $json && ( version_compare( PHP_VERSION, '5.5', '>=' ) || false === strpos( $json, 'null' ) ) ) {
 		return $json;
 	}
 
@@ -3179,9 +3282,11 @@ function wp_send_json( $response, $status_code = null ) {
 	echo wp_json_encode( $response );
 
 	if ( wp_doing_ajax() ) {
-		wp_die( '', '', array(
-			'response' => null,
-		) );
+		wp_die(
+			'', '', array(
+				'response' => null,
+			)
+		);
 	} else {
 		die;
 	}
@@ -3199,8 +3304,9 @@ function wp_send_json( $response, $status_code = null ) {
 function wp_send_json_success( $data = null, $status_code = null ) {
 	$response = array( 'success' => true );
 
-	if ( isset( $data ) )
+	if ( isset( $data ) ) {
 		$response['data'] = $data;
+	}
 
 	wp_send_json( $response, $status_code );
 }
@@ -3228,7 +3334,10 @@ function wp_send_json_error( $data = null, $status_code = null ) {
 			$result = array();
 			foreach ( $data->errors as $code => $messages ) {
 				foreach ( $messages as $message ) {
-					$result[] = array( 'code' => $code, 'message' => $message );
+					$result[] = array(
+						'code'    => $code,
+						'message' => $message,
+					);
 				}
 			}
 
@@ -3279,8 +3388,9 @@ function wp_check_jsonp_callback( $callback ) {
  * @return string Homepage location.
  */
 function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
+	if ( defined( 'WP_HOME' ) ) {
 		return untrailingslashit( WP_HOME );
+	}
 	return $url;
 }
 
@@ -3300,8 +3410,9 @@ function _config_wp_home( $url = '' ) {
  * @return string The WordPress Site URL.
  */
 function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
+	if ( defined( 'WP_SITEURL' ) ) {
 		return untrailingslashit( WP_SITEURL );
+	}
 	return $url;
 }
 
@@ -3335,7 +3446,7 @@ function _delete_option_fresh_site() {
 function _mce_set_direction( $mce_init ) {
 	if ( is_rtl() ) {
 		$mce_init['directionality'] = 'rtl';
-		$mce_init['rtl_ui'] = true;
+		$mce_init['rtl_ui']         = true;
 
 		if ( ! empty( $mce_init['plugins'] ) && strpos( $mce_init['plugins'], 'directionality' ) === false ) {
 			$mce_init['plugins'] .= ',directionality';
@@ -3376,56 +3487,57 @@ function smilies_init() {
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
+	if ( ! get_option( 'use_smilies' ) ) {
 		return;
+	}
 
-	if ( !isset( $wpsmiliestrans ) ) {
+	if ( ! isset( $wpsmiliestrans ) ) {
 		$wpsmiliestrans = array(
-		':mrgreen:' => 'mrgreen.png',
-		':neutral:' => "\xf0\x9f\x98\x90",
-		':twisted:' => "\xf0\x9f\x98\x88",
-		':arrow:' => "\xe2\x9e\xa1",
-		':shock:' => "\xf0\x9f\x98\xaf",
-		':smile:' => "\xf0\x9f\x99\x82",
-		':???:' => "\xf0\x9f\x98\x95",
-		':cool:' => "\xf0\x9f\x98\x8e",
-		':evil:' => "\xf0\x9f\x91\xbf",
-		':grin:' => "\xf0\x9f\x98\x80",
-		':idea:' => "\xf0\x9f\x92\xa1",
-		':oops:' => "\xf0\x9f\x98\xb3",
-		':razz:' => "\xf0\x9f\x98\x9b",
-		':roll:' => "\xf0\x9f\x99\x84",
-		':wink:' => "\xf0\x9f\x98\x89",
-		':cry:' => "\xf0\x9f\x98\xa5",
-		':eek:' => "\xf0\x9f\x98\xae",
-		':lol:' => "\xf0\x9f\x98\x86",
-		':mad:' => "\xf0\x9f\x98\xa1",
-		':sad:' => "\xf0\x9f\x99\x81",
-		'8-)' => "\xf0\x9f\x98\x8e",
-		'8-O' => "\xf0\x9f\x98\xaf",
-		':-(' => "\xf0\x9f\x99\x81",
-		':-)' => "\xf0\x9f\x99\x82",
-		':-?' => "\xf0\x9f\x98\x95",
-		':-D' => "\xf0\x9f\x98\x80",
-		':-P' => "\xf0\x9f\x98\x9b",
-		':-o' => "\xf0\x9f\x98\xae",
-		':-x' => "\xf0\x9f\x98\xa1",
-		':-|' => "\xf0\x9f\x98\x90",
-		';-)' => "\xf0\x9f\x98\x89",
-		// This one transformation breaks regular text with frequency.
-		//     '8)' => "\xf0\x9f\x98\x8e",
-		'8O' => "\xf0\x9f\x98\xaf",
-		':(' => "\xf0\x9f\x99\x81",
-		':)' => "\xf0\x9f\x99\x82",
-		':?' => "\xf0\x9f\x98\x95",
-		':D' => "\xf0\x9f\x98\x80",
-		':P' => "\xf0\x9f\x98\x9b",
-		':o' => "\xf0\x9f\x98\xae",
-		':x' => "\xf0\x9f\x98\xa1",
-		':|' => "\xf0\x9f\x98\x90",
-		';)' => "\xf0\x9f\x98\x89",
-		':!:' => "\xe2\x9d\x97",
-		':?:' => "\xe2\x9d\x93",
+			':mrgreen:' => 'mrgreen.png',
+			':neutral:' => "\xf0\x9f\x98\x90",
+			':twisted:' => "\xf0\x9f\x98\x88",
+			':arrow:'   => "\xe2\x9e\xa1",
+			':shock:'   => "\xf0\x9f\x98\xaf",
+			':smile:'   => "\xf0\x9f\x99\x82",
+			':???:'     => "\xf0\x9f\x98\x95",
+			':cool:'    => "\xf0\x9f\x98\x8e",
+			':evil:'    => "\xf0\x9f\x91\xbf",
+			':grin:'    => "\xf0\x9f\x98\x80",
+			':idea:'    => "\xf0\x9f\x92\xa1",
+			':oops:'    => "\xf0\x9f\x98\xb3",
+			':razz:'    => "\xf0\x9f\x98\x9b",
+			':roll:'    => "\xf0\x9f\x99\x84",
+			':wink:'    => "\xf0\x9f\x98\x89",
+			':cry:'     => "\xf0\x9f\x98\xa5",
+			':eek:'     => "\xf0\x9f\x98\xae",
+			':lol:'     => "\xf0\x9f\x98\x86",
+			':mad:'     => "\xf0\x9f\x98\xa1",
+			':sad:'     => "\xf0\x9f\x99\x81",
+			'8-)'       => "\xf0\x9f\x98\x8e",
+			'8-O'       => "\xf0\x9f\x98\xaf",
+			':-('       => "\xf0\x9f\x99\x81",
+			':-)'       => "\xf0\x9f\x99\x82",
+			':-?'       => "\xf0\x9f\x98\x95",
+			':-D'       => "\xf0\x9f\x98\x80",
+			':-P'       => "\xf0\x9f\x98\x9b",
+			':-o'       => "\xf0\x9f\x98\xae",
+			':-x'       => "\xf0\x9f\x98\xa1",
+			':-|'       => "\xf0\x9f\x98\x90",
+			';-)'       => "\xf0\x9f\x98\x89",
+			// This one transformation breaks regular text with frequency.
+			//     '8)' => "\xf0\x9f\x98\x8e",
+			'8O'        => "\xf0\x9f\x98\xaf",
+			':('        => "\xf0\x9f\x99\x81",
+			':)'        => "\xf0\x9f\x99\x82",
+			':?'        => "\xf0\x9f\x98\x95",
+			':D'        => "\xf0\x9f\x98\x80",
+			':P'        => "\xf0\x9f\x98\x9b",
+			':o'        => "\xf0\x9f\x98\xae",
+			':x'        => "\xf0\x9f\x98\xa1",
+			':|'        => "\xf0\x9f\x98\x90",
+			';)'        => "\xf0\x9f\x98\x89",
+			':!:'       => "\xe2\x9d\x97",
+			':?:'       => "\xe2\x9d\x93",
 		);
 	}
 
@@ -3439,9 +3551,9 @@ function smilies_init() {
 	 *
 	 * @param array $wpsmiliestrans List of the smilies.
 	 */
-	$wpsmiliestrans = apply_filters('smilies', $wpsmiliestrans);
+	$wpsmiliestrans = apply_filters( 'smilies', $wpsmiliestrans );
 
-	if (count($wpsmiliestrans) == 0) {
+	if ( count( $wpsmiliestrans ) == 0 ) {
 		return;
 	}
 
@@ -3450,7 +3562,7 @@ function smilies_init() {
 	 * we match the longest possible smilie (:???: vs :?) as the regular
 	 * expression used below is first-match
 	 */
-	krsort($wpsmiliestrans);
+	krsort( $wpsmiliestrans );
 
 	$spaces = wp_spaces_regexp();
 
@@ -3459,21 +3571,21 @@ function smilies_init() {
 
 	$subchar = '';
 	foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
-		$firstchar = substr($smiley, 0, 1);
-		$rest = substr($smiley, 1);
+		$firstchar = substr( $smiley, 0, 1 );
+		$rest      = substr( $smiley, 1 );
 
 		// new subpattern?
-		if ($firstchar != $subchar) {
-			if ($subchar != '') {
+		if ( $firstchar != $subchar ) {
+			if ( $subchar != '' ) {
 				$wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern"
 				$wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"
 			}
-			$subchar = $firstchar;
-			$wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
+			$subchar           = $firstchar;
+			$wp_smiliessearch .= preg_quote( $firstchar, '/' ) . '(?:';
 		} else {
 			$wp_smiliessearch .= '|';
 		}
-		$wp_smiliessearch .= preg_quote($rest, '/');
+		$wp_smiliessearch .= preg_quote( $rest, '/' );
 	}
 
 	$wp_smiliessearch .= ')(?=' . $spaces . '|$)/m';
@@ -3494,15 +3606,17 @@ function smilies_init() {
  * @return array Merged user defined values with defaults.
  */
 function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
+	if ( is_object( $args ) ) {
 		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
+	} elseif ( is_array( $args ) ) {
 		$r =& $args;
-	else
+	} else {
 		wp_parse_str( $args, $r );
+	}
 
-	if ( is_array( $defaults ) )
+	if ( is_array( $defaults ) ) {
 		return array_merge( $defaults, $r );
+	}
 	return $r;
 }
 
@@ -3515,10 +3629,11 @@ function wp_parse_args( $args, $defaults = '' ) {
  * @return array Sanitized array of IDs.
  */
 function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
-		$list = preg_split('/[\s,]+/', $list);
+	if ( ! is_array( $list ) ) {
+		$list = preg_split( '/[\s,]+/', $list );
+	}
 
-	return array_unique(array_map('absint', $list));
+	return array_unique( array_map( 'absint', $list ) );
 }
 
 /**
@@ -3552,9 +3667,11 @@ function wp_parse_slug_list( $list ) {
  */
 function wp_array_slice_assoc( $array, $keys ) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
+	foreach ( $keys as $key ) {
+		if ( isset( $array[ $key ] ) ) {
 			$slice[ $key ] = $array[ $key ];
+		}
+	}
 
 	return $slice;
 }
@@ -3572,7 +3689,7 @@ function wp_is_numeric_array( $data ) {
 		return false;
 	}
 
-	$keys = array_keys( $data );
+	$keys        = array_keys( $data );
 	$string_keys = array_filter( $keys, 'is_string' );
 	return count( $string_keys ) === 0;
 }
@@ -3718,8 +3835,9 @@ function wp_maybe_load_widgets() {
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
+	if ( ! current_theme_supports( 'widgets' ) ) {
 		return;
+	}
 
 	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
 	ksort( $submenu['themes.php'], SORT_NUMERIC );
@@ -3734,8 +3852,9 @@ function wp_widgets_add_menu() {
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
+	for ( $i = 0; $i < $levels; $i++ ) {
 		ob_end_flush();
+	}
 }
 
 /**
@@ -3768,8 +3887,9 @@ function dead_db() {
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( wp_installing() || defined( 'WP_ADMIN' ) )
-		wp_die($wpdb->error);
+	if ( wp_installing() || defined( 'WP_ADMIN' ) ) {
+		wp_die( $wpdb->error );
+	}
 
 	// Otherwise, be terse.
 	status_header( 500 );
@@ -3850,10 +3970,10 @@ function _deprecated_function( $function, $version, $replacement = null ) {
 		if ( function_exists( '__' ) ) {
 			if ( ! is_null( $replacement ) ) {
 				/* translators: 1: PHP function name, 2: version number, 3: alternative function name */
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+				trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $function, $version, $replacement ) );
 			} else {
 				/* translators: 1: PHP function name, 2: version number */
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $function, $version ) );
 			}
 		} else {
 			if ( ! is_null( $replacement ) ) {
@@ -3912,20 +4032,36 @@ function _deprecated_constructor( $class, $version, $parent_class = '' ) {
 		if ( function_exists( '__' ) ) {
 			if ( ! empty( $parent_class ) ) {
 				/* translators: 1: PHP class name, 2: PHP parent class name, 3: version number, 4: __construct() method */
-				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>' ) );
+				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>'
+					)
+				);
 			} else {
 				/* translators: 1: PHP class name, 2: version number, 3: __construct() method */
-				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>' ) );
+				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>'
+					)
+				);
 			}
 		} else {
 			if ( ! empty( $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>' ) );
+				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>'
+					)
+				);
 			} 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>' ) );
+				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>'
+					)
+				);
 			}
 		}
 	}
@@ -3978,10 +4114,10 @@ function _deprecated_file( $file, $version, $replacement = null, $message = '' )
 		if ( function_exists( '__' ) ) {
 			if ( ! is_null( $replacement ) ) {
 				/* translators: 1: PHP file name, 2: version number, 3: alternative file name */
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+				trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $file, $version, $replacement ) . $message );
 			} else {
 				/* translators: 1: PHP file name, 2: version number */
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+				trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $file, $version ) . $message );
 			}
 		} else {
 			if ( ! is_null( $replacement ) ) {
@@ -4004,7 +4140,6 @@ function _deprecated_file( $file, $version, $replacement = null, $message = '' )
  *         _deprecated_argument( __FUNCTION__, '3.0.0' );
  *     }
  *
- *
  * There is a hook deprecated_argument_run that will be called that can be used
  * to get the backtrace up to what file and function used the deprecated
  * argument.
@@ -4042,10 +4177,10 @@ function _deprecated_argument( $function, $version, $message = null ) {
 		if ( function_exists( '__' ) ) {
 			if ( ! is_null( $message ) ) {
 				/* translators: 1: PHP function name, 2: version number, 3: optional message regarding the change */
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+				trigger_error( sprintf( __( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s' ), $function, $version, $message ) );
 			} else {
 				/* translators: 1: PHP function name, 2: version number */
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error( sprintf( __( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.' ), $function, $version ) );
 			}
 		} else {
 			if ( ! is_null( $message ) ) {
@@ -4154,7 +4289,8 @@ function _doing_it_wrong( $function, $message, $version ) {
 				$version = sprintf( __( '(This message was added in version %s.)' ), $version );
 			}
 			/* translators: %s: Codex URL */
-			$message .= ' ' . sprintf( __( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
+			$message .= ' ' . sprintf(
+				__( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
 				__( 'https://codex.wordpress.org/Debugging_in_WordPress' )
 			);
 			/* translators: Developer debugging message. 1: PHP function name, 2: Explanatory message, 3: Version information message */
@@ -4165,7 +4301,8 @@ function _doing_it_wrong( $function, $message, $version ) {
 			} else {
 				$version = sprintf( '(This message was added in version %s.)', $version );
 			}
-			$message .= sprintf( ' Please see <a href="%s">Debugging in WordPress</a> for more information.',
+			$message .= sprintf(
+				' Please see <a href="%s">Debugging in WordPress</a> for more information.',
 				'https://codex.wordpress.org/Debugging_in_WordPress'
 			);
 			trigger_error( sprintf( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version ) );
@@ -4181,8 +4318,8 @@ function _doing_it_wrong( $function, $message, $version ) {
  * @return bool Whether the server is running lighttpd < 1.5.0.
  */
 function is_lighttpd_before_150() {
-	$server_parts = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] )? $_SERVER['SERVER_SOFTWARE'] : '' );
-	$server_parts[1] = isset( $server_parts[1] )? $server_parts[1] : '';
+	$server_parts    = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '' );
+	$server_parts[1] = isset( $server_parts[1] ) ? $server_parts[1] : '';
 	return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
 }
 
@@ -4197,22 +4334,25 @@ function is_lighttpd_before_150() {
  * @param bool   $default Optional. The default return value if the module is not found. Default false.
  * @return bool Whether the specified module is loaded.
  */
-function apache_mod_loaded($mod, $default = false) {
+function apache_mod_loaded( $mod, $default = false ) {
 	global $is_apache;
 
-	if ( !$is_apache )
+	if ( ! $is_apache ) {
 		return false;
+	}
 
 	if ( function_exists( 'apache_get_modules' ) ) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
+		if ( in_array( $mod, $mods ) ) {
 			return true;
+		}
 	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
 			ob_start();
-			phpinfo(8);
+			phpinfo( 8 );
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
-				return true;
+		if ( false !== strpos( $phpinfo, $mod ) ) {
+			return true;
+		}
 	}
 	return $default;
 }
@@ -4240,7 +4380,7 @@ function iis7_supports_permalinks() {
 		 * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
 		 * via ISAPI then pretty permalinks will not work.
 		 */
-		$supports_permalinks = class_exists( 'DOMDocument', false ) && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
+		$supports_permalinks = class_exists( 'DOMDocument', false ) && isset( $_SERVER['IIS_UrlRewriteModule'] ) && ( PHP_SAPI == 'cgi-fcgi' );
 	}
 
 	/**
@@ -4285,12 +4425,14 @@ function validate_file( $file, $allowed_files = array() ) {
 	}
 
 	// Files not in the allowed file list are not allowed:
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
+	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) ) {
 		return 3;
+	}
 
 	// Absolute Windows drive paths are not allowed:
-	if (':' == substr( $file, 1, 1 ) )
+	if ( ':' == substr( $file, 1, 1 ) ) {
 		return 2;
+	}
 
 	return 0;
 }
@@ -4308,9 +4450,9 @@ function validate_file( $file, $allowed_files = array() ) {
 function force_ssl_admin( $force = null ) {
 	static $forced = false;
 
-	if ( !is_null( $force ) ) {
+	if ( ! is_null( $force ) ) {
 		$old_forced = $forced;
-		$forced = $force;
+		$forced     = $force;
 		return $old_forced;
 	}
 
@@ -4328,17 +4470,17 @@ function force_ssl_admin( $force = null ) {
  * @return string The guessed URL.
  */
 function wp_guess_url() {
-	if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+	if ( defined( 'WP_SITEURL' ) && '' != WP_SITEURL ) {
 		$url = WP_SITEURL;
 	} else {
-		$abspath_fix = str_replace( '\\', '/', ABSPATH );
+		$abspath_fix         = str_replace( '\\', '/', ABSPATH );
 		$script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] );
 
 		// The request is for the admin
 		if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
 			$path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );
 
-		// The request is for a file in ABSPATH
+			// The request is for a file in ABSPATH
 		} elseif ( $script_filename_dir . '/' == $abspath_fix ) {
 			// Strip off any file/query params in the path
 			$path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
@@ -4348,22 +4490,22 @@ function wp_guess_url() {
 				// Request is hitting a file inside ABSPATH
 				$directory = str_replace( ABSPATH, '', $script_filename_dir );
 				// Strip off the sub directory, and any file/query params
-				$path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] );
+				$path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '', $_SERVER['REQUEST_URI'] );
 			} elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
 				// Request is hitting a file above ABSPATH
 				$subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
 				// Strip off any file/query params from the path, appending the sub directory to the installation
-				$path = preg_replace( '#/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] ) . $subdirectory;
+				$path = preg_replace( '#/[^/]*$#i', '', $_SERVER['REQUEST_URI'] ) . $subdirectory;
 			} else {
 				$path = $_SERVER['REQUEST_URI'];
 			}
 		}
 
 		$schema = is_ssl() ? 'https://' : 'http://'; // set_url_scheme() is not defined yet
-		$url = $schema . $_SERVER['HTTP_HOST'] . $path;
+		$url    = $schema . $_SERVER['HTTP_HOST'] . $path;
 	}
 
-	return rtrim($url, '/');
+	return rtrim( $url, '/' );
 }
 
 /**
@@ -4386,8 +4528,9 @@ function wp_guess_url() {
 function wp_suspend_cache_addition( $suspend = null ) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
+	if ( is_bool( $suspend ) ) {
 		$_suspend = $suspend;
+	}
 
 	return $_suspend;
 }
@@ -4409,7 +4552,7 @@ function wp_suspend_cache_addition( $suspend = null ) {
 function wp_suspend_cache_invalidation( $suspend = true ) {
 	global $_wp_suspend_cache_invalidation;
 
-	$current_suspend = $_wp_suspend_cache_invalidation;
+	$current_suspend                = $_wp_suspend_cache_invalidation;
 	$_wp_suspend_cache_invalidation = $suspend;
 	return $current_suspend;
 }
@@ -4504,7 +4647,12 @@ function get_main_network_id() {
 		// If the current network has an ID of 1, assume it is the main network.
 		$main_network_id = 1;
 	} else {
-		$_networks = get_networks( array( 'fields' => 'ids', 'number' => 1 ) );
+		$_networks       = get_networks(
+			array(
+				'fields' => 'ids',
+				'number' => 1,
+			)
+		);
 		$main_network_id = array_shift( $_networks );
 	}
 
@@ -4528,8 +4676,9 @@ function get_main_network_id() {
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
+	if ( ! is_multisite() ) {
 		return false;
+	}
 
 	static $global_terms = null;
 	if ( is_null( $global_terms ) ) {
@@ -4545,10 +4694,11 @@ function global_terms_enabled() {
 		 * @param null $enabled Whether global terms are enabled.
 		 */
 		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
+		if ( ! is_null( $filter ) ) {
 			$global_terms = (bool) $filter;
-		else
+		} else {
 			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		}
 	}
 	return $global_terms;
 }
@@ -4563,7 +4713,7 @@ function global_terms_enabled() {
  * @return float|false Timezone GMT offset, false otherwise.
  */
 function wp_timezone_override_offset() {
-	if ( !$timezone_string = get_option( 'timezone_string' ) ) {
+	if ( ! $timezone_string = get_option( 'timezone_string' ) ) {
 		return false;
 	}
 
@@ -4639,12 +4789,12 @@ function _wp_timezone_choice_usort_callback( $a, $b ) {
 function wp_timezone_choice( $selected_zone, $locale = null ) {
 	static $mo_loaded = false, $locale_loaded = null;
 
-	$continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
+	$continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific' );
 
 	// Load translations for continents and cities.
 	if ( ! $mo_loaded || $locale !== $locale_loaded ) {
 		$locale_loaded = $locale ? $locale : get_locale();
-		$mofile = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
+		$mofile        = WP_LANG_DIR . '/continents-cities-' . $locale_loaded . '.mo';
 		unload_textdomain( 'continents-cities' );
 		load_textdomain( 'continents-cities', $mofile );
 		$mo_loaded = true;
@@ -4653,12 +4803,12 @@ function wp_timezone_choice( $selected_zone, $locale = null ) {
 	$zonen = array();
 	foreach ( timezone_identifiers_list() as $zone ) {
 		$zone = explode( '/', $zone );
-		if ( !in_array( $zone[0], $continents ) ) {
+		if ( ! in_array( $zone[0], $continents ) ) {
 			continue;
 		}
 
 		// This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
-		$exists = array(
+		$exists    = array(
 			0 => ( isset( $zone[0] ) && $zone[0] ),
 			1 => ( isset( $zone[1] ) && $zone[1] ),
 			2 => ( isset( $zone[2] ) && $zone[2] ),
@@ -4673,7 +4823,7 @@ function wp_timezone_choice( $selected_zone, $locale = null ) {
 			'subcity'     => ( $exists[2] ? $zone[2] : '' ),
 			't_continent' => ( $exists[3] ? translate( str_replace( '_', ' ', $zone[0] ), 'continents-cities' ) : '' ),
 			't_city'      => ( $exists[4] ? translate( str_replace( '_', ' ', $zone[1] ), 'continents-cities' ) : '' ),
-			't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' )
+			't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' ),
 		);
 	}
 	usort( $zonen, '_wp_timezone_choice_usort_callback' );
@@ -4695,62 +4845,120 @@ function wp_timezone_choice( $selected_zone, $locale = null ) {
 			// It's inside a continent group
 
 			// Continent optgroup
-			if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
-				$label = $zone['t_continent'];
-				$structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
+			if ( ! isset( $zonen[ $key - 1 ] ) || $zonen[ $key - 1 ]['continent'] !== $zone['continent'] ) {
+				$label       = $zone['t_continent'];
+				$structure[] = '<optgroup label="' . esc_attr( $label ) . '">';
 			}
 
 			// Add the city to the value
 			$value[] = $zone['city'];
 
 			$display = $zone['t_city'];
-			if ( !empty( $zone['subcity'] ) ) {
+			if ( ! empty( $zone['subcity'] ) ) {
 				// Add the subcity to the value
-				$value[] = $zone['subcity'];
+				$value[]  = $zone['subcity'];
 				$display .= ' - ' . $zone['t_subcity'];
 			}
 		}
 
 		// Build the value
-		$value = join( '/', $value );
+		$value    = join( '/', $value );
 		$selected = '';
 		if ( $value === $selected_zone ) {
 			$selected = 'selected="selected" ';
 		}
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
+		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . '</option>';
 
 		// Close continent optgroup
-		if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
+		if ( ! empty( $zone['city'] ) && ( ! isset( $zonen[ $key + 1 ] ) || ( isset( $zonen[ $key + 1 ] ) && $zonen[ $key + 1 ]['continent'] !== $zone['continent'] ) ) ) {
 			$structure[] = '</optgroup>';
 		}
 	}
 
 	// Do UTC
-	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
-	$selected = '';
-	if ( 'UTC' === $selected_zone )
+	$structure[] = '<optgroup label="' . esc_attr__( 'UTC' ) . '">';
+	$selected    = '';
+	if ( 'UTC' === $selected_zone ) {
 		$selected = 'selected="selected" ';
-	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
+	}
+	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __( 'UTC' ) . '</option>';
 	$structure[] = '</optgroup>';
 
 	// Do manual UTC offsets
-	$structure[] = '<optgroup label="'. esc_attr__( 'Manual Offsets' ) .'">';
-	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
-		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
+	$structure[]  = '<optgroup label="' . esc_attr__( 'Manual Offsets' ) . '">';
+	$offset_range = array(
+		-12,
+		-11.5,
+		-11,
+		-10.5,
+		-10,
+		-9.5,
+		-9,
+		-8.5,
+		-8,
+		-7.5,
+		-7,
+		-6.5,
+		-6,
+		-5.5,
+		-5,
+		-4.5,
+		-4,
+		-3.5,
+		-3,
+		-2.5,
+		-2,
+		-1.5,
+		-1,
+		-0.5,
+		0,
+		0.5,
+		1,
+		1.5,
+		2,
+		2.5,
+		3,
+		3.5,
+		4,
+		4.5,
+		5,
+		5.5,
+		5.75,
+		6,
+		6.5,
+		7,
+		7.5,
+		8,
+		8.5,
+		8.75,
+		9,
+		9.5,
+		10,
+		10.5,
+		11,
+		11.5,
+		12,
+		12.75,
+		13,
+		13.75,
+		14,
+	);
 	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
+		if ( 0 <= $offset ) {
 			$offset_name = '+' . $offset;
-		else
+		} else {
 			$offset_name = (string) $offset;
+		}
 
 		$offset_value = $offset_name;
-		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
-		$offset_name = 'UTC' . $offset_name;
+		$offset_name  = str_replace( array( '.25', '.5', '.75' ), array( ':15', ':30', ':45' ), $offset_name );
+		$offset_name  = 'UTC' . $offset_name;
 		$offset_value = 'UTC' . $offset_value;
-		$selected = '';
-		if ( $offset_value === $selected_zone )
+		$selected     = '';
+		if ( $offset_value === $selected_zone ) {
 			$selected = 'selected="selected" ';
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
+		}
+		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . '</option>';
 
 	}
 	$structure[] = '</optgroup>';
@@ -4770,7 +4978,7 @@ function wp_timezone_choice( $selected_zone, $locale = null ) {
  * @return string
  */
 function _cleanup_header_comment( $str ) {
-	return trim(preg_replace("/\s*(?:\*\/|\?>).*/", '', $str));
+	return trim( preg_replace( '/\s*(?:\*\/|\?>).*/', '', $str ) );
 }
 
 /**
@@ -4788,35 +4996,37 @@ function wp_scheduled_delete() {
 
 	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
 
-	$posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < %d", $delete_timestamp), ARRAY_A);
+	$posts_to_delete = $wpdb->get_results( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < %d", $delete_timestamp ), ARRAY_A );
 
 	foreach ( (array) $posts_to_delete as $post ) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
+		if ( ! $post_id ) {
 			continue;
+		}
 
-		$del_post = get_post($post_id);
+		$del_post = get_post( $post_id );
 
-		if ( !$del_post || 'trash' != $del_post->post_status ) {
-			delete_post_meta($post_id, '_wp_trash_meta_status');
-			delete_post_meta($post_id, '_wp_trash_meta_time');
+		if ( ! $del_post || 'trash' != $del_post->post_status ) {
+			delete_post_meta( $post_id, '_wp_trash_meta_status' );
+			delete_post_meta( $post_id, '_wp_trash_meta_time' );
 		} else {
-			wp_delete_post($post_id);
+			wp_delete_post( $post_id );
 		}
 	}
 
-	$comments_to_delete = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < %d", $delete_timestamp), ARRAY_A);
+	$comments_to_delete = $wpdb->get_results( $wpdb->prepare( "SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < %d", $delete_timestamp ), ARRAY_A );
 
 	foreach ( (array) $comments_to_delete as $comment ) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
+		if ( ! $comment_id ) {
 			continue;
+		}
 
-		$del_comment = get_comment($comment_id);
+		$del_comment = get_comment( $comment_id );
 
-		if ( !$del_comment || 'trash' != $del_comment->comment_approved ) {
-			delete_comment_meta($comment_id, '_wp_trash_meta_time');
-			delete_comment_meta($comment_id, '_wp_trash_meta_status');
+		if ( ! $del_comment || 'trash' != $del_comment->comment_approved ) {
+			delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
+			delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
 		} else {
 			wp_delete_comment( $del_comment );
 		}
@@ -4868,16 +5078,17 @@ function get_file_data( $file, $default_headers, $context = '' ) {
 	 */
 	if ( $context && $extra_headers = apply_filters( "extra_{$context}_headers", array() ) ) {
 		$extra_headers = array_combine( $extra_headers, $extra_headers ); // keys equal values
-		$all_headers = array_merge( $extra_headers, (array) $default_headers );
+		$all_headers   = array_merge( $extra_headers, (array) $default_headers );
 	} else {
 		$all_headers = $default_headers;
 	}
 
 	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
+		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] ) {
 			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
-		else
+		} else {
 			$all_headers[ $field ] = '';
+		}
 	}
 
 	return $all_headers;
@@ -4990,17 +5201,17 @@ function send_nosniff_header() {
  */
 function _wp_mysql_week( $column ) {
 	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
-	case 1 :
-		return "WEEK( $column, 1 )";
-	case 2 :
-	case 3 :
-	case 4 :
-	case 5 :
-	case 6 :
-		return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
-	case 0 :
-	default :
-		return "WEEK( $column, 0 )";
+		case 1:
+			return "WEEK( $column, 1 )";
+		case 2:
+		case 3:
+		case 4:
+		case 5:
+		case 6:
+			return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
+		case 0:
+		default:
+			return "WEEK( $column, 0 )";
 	}
 }
 
@@ -5020,8 +5231,9 @@ function _wp_mysql_week( $column ) {
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
 	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
+	if ( ! $arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) ) {
 		return array();
+	}
 
 	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
 }
@@ -5048,26 +5260,28 @@ function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_arg
  */
 function wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override = array(), $callback_args = array(), $_return_loop = false ) {
 	$tortoise = $hare = $evanescent_hare = $start;
-	$return = array();
+	$return   = array();
 
 	// Set evanescent_hare to one past hare
 	// Increment hare two steps
 	while (
 		$tortoise
 	&&
-		( $evanescent_hare = isset( $override[$hare] ) ? $override[$hare] : call_user_func_array( $callback, array_merge( array( $hare ), $callback_args ) ) )
+		( $evanescent_hare = isset( $override[ $hare ] ) ? $override[ $hare ] : call_user_func_array( $callback, array_merge( array( $hare ), $callback_args ) ) )
 	&&
-		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
+		( $hare = isset( $override[ $evanescent_hare ] ) ? $override[ $evanescent_hare ] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
 	) {
-		if ( $_return_loop )
-			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		if ( $_return_loop ) {
+			$return[ $tortoise ] = $return[ $evanescent_hare ] = $return[ $hare ] = true;
+		}
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
+		if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
 			return $_return_loop ? $return : $tortoise;
+		}
 
 		// Increment tortoise by one step
-		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
+		$tortoise = isset( $override[ $tortoise ] ) ? $override[ $tortoise ] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
 	}
 
 	return false;
@@ -5139,12 +5353,13 @@ function wp_allowed_protocols() {
  *                      of individual calls.
  */
 function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
+	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) ) {
 		$trace = debug_backtrace( false );
-	else
+	} else {
 		$trace = debug_backtrace();
+	}
 
-	$caller = array();
+	$caller      = array();
 	$check_class = ! is_null( $ignore_class );
 	$skip_frames++; // skip this function
 
@@ -5152,24 +5367,26 @@ function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pr
 		if ( $skip_frames > 0 ) {
 			$skip_frames--;
 		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
+			if ( $check_class && $ignore_class == $call['class'] ) {
 				continue; // Filter out calls
+			}
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
 			if ( in_array( $call['function'], array( 'do_action', 'apply_filters' ) ) ) {
 				$caller[] = "{$call['function']}('{$call['args'][0]}')";
 			} elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
-				$caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ) , '', $call['args'][0] ) . "')";
+				$caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ), '', $call['args'][0] ) . "')";
 			} else {
 				$caller[] = $call['function'];
 			}
 		}
 	}
-	if ( $pretty )
+	if ( $pretty ) {
 		return join( ', ', array_reverse( $caller ) );
-	else
+	} else {
 		return $caller;
+	}
 }
 
 /**
@@ -5187,7 +5404,7 @@ function _get_non_cached_ids( $object_ids, $cache_key ) {
 	$clean = array();
 	foreach ( $object_ids as $id ) {
 		$id = (int) $id;
-		if ( !wp_cache_get( $id, $cache_key ) ) {
+		if ( ! wp_cache_get( $id, $cache_key ) ) {
 			$clean[] = $id;
 		}
 	}
@@ -5204,14 +5421,15 @@ function _get_non_cached_ids( $object_ids, $cache_key ) {
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
+	if ( ! wp_is_mobile() ) {
 		return true;
+	}
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
-	if ( strpos($ua, 'iPhone') !== false
-		|| strpos($ua, 'iPad') !== false
-		|| strpos($ua, 'iPod') !== false ) {
+	if ( strpos( $ua, 'iPhone' ) !== false
+		|| strpos( $ua, 'iPad' ) !== false
+		|| strpos( $ua, 'iPod' ) !== false ) {
 			return preg_match( '#OS ([\d_]+) like Mac OS X#', $ua, $version ) && version_compare( $version[1], '6', '>=' );
 	}
 
@@ -5227,8 +5445,8 @@ function _device_can_upload() {
  * @return bool True if the path is a stream URL.
  */
 function wp_is_stream( $path ) {
-	$wrappers = stream_get_wrappers();
-	$wrappers_re = '(' . join('|', $wrappers) . ')';
+	$wrappers    = stream_get_wrappers();
+	$wrappers_re = '(' . join( '|', $wrappers ) . ')';
 
 	return preg_match( "!^$wrappers_re://!", $path ) === 1;
 }
@@ -5270,15 +5488,17 @@ function wp_checkdate( $month, $day, $year, $source_date ) {
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
+	if ( ! is_admin() && ! is_user_logged_in() ) {
 		return;
+	}
 
-	if ( defined( 'IFRAME_REQUEST' ) )
+	if ( defined( 'IFRAME_REQUEST' ) ) {
 		return;
+	}
 
 	$screen = get_current_screen();
 	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
-	$show = ! in_array( $screen->id, $hidden );
+	$show   = ! in_array( $screen->id, $hidden );
 
 	/**
 	 * Filters whether to load the authentication check.
@@ -5306,9 +5526,9 @@ function wp_auth_check_load() {
  * @since 3.6.0
  */
 function wp_auth_check_html() {
-	$login_url = wp_login_url();
+	$login_url      = wp_login_url();
 	$current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
-	$same_domain = ( strpos( $login_url, $current_domain ) === 0 );
+	$same_domain    = ( strpos( $login_url, $current_domain ) === 0 );
 
 	/**
 	 * Filters whether the authentication check originated at the same domain.
@@ -5318,7 +5538,7 @@ function wp_auth_check_html() {
 	 * @param bool $same_domain Whether the authentication check originated at the same domain.
 	 */
 	$same_domain = apply_filters( 'wp_auth_check_same_domain', $same_domain );
-	$wrap_class = $same_domain ? 'hidden' : 'hidden fallback';
+	$wrap_class  = $same_domain ? 'hidden' : 'hidden fallback';
 
 	?>
 	<div id="wp-auth-check-wrap" class="<?php echo $wrap_class; ?>">
@@ -5328,10 +5548,12 @@ function wp_auth_check_html() {
 	<?php
 
 	if ( $same_domain ) {
-		$login_src = add_query_arg( array(
-			'interim-login' => '1',
-			'wp_lang'       => get_user_locale(),
-		), $login_url );
+		$login_src = add_query_arg(
+			array(
+				'interim-login' => '1',
+				'wp_lang'       => get_user_locale(),
+			), $login_url
+		);
 		?>
 		<div id="wp-auth-check-form" class="loading" data-src="<?php echo esc_url( $login_src ); ?>"></div>
 		<?php
@@ -5339,9 +5561,9 @@ function wp_auth_check_html() {
 
 	?>
 	<div class="wp-auth-fallback">
-		<p><b class="wp-auth-fallback-expired" tabindex="0"><?php _e('Session expired'); ?></b></p>
-		<p><a href="<?php echo esc_url( $login_url ); ?>" target="_blank"><?php _e('Please log in again.'); ?></a>
-		<?php _e('The login page will open in a new window. After logging in you can close it and return to this page.'); ?></p>
+		<p><b class="wp-auth-fallback-expired" tabindex="0"><?php _e( 'Session expired' ); ?></b></p>
+		<p><a href="<?php echo esc_url( $login_url ); ?>" target="_blank"><?php _e( 'Please log in again.' ); ?></a>
+		<?php _e( 'The login page will open in a new window. After logging in you can close it and return to this page.' ); ?></p>
 	</div>
 	</div>
 	</div>
@@ -5383,8 +5605,9 @@ function wp_auth_check( $response ) {
  * @return string Tag RegEx.
  */
 function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
+	if ( empty( $tag ) ) {
 		return;
+	}
 	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
 }
 
@@ -5401,7 +5624,7 @@ function get_tag_regex( $tag ) {
  * @return string The canonical form of the charset.
  */
 function _canonical_charset( $charset ) {
-	if ( 'utf-8' === strtolower( $charset ) || 'utf8' === strtolower( $charset) ) {
+	if ( 'utf-8' === strtolower( $charset ) || 'utf8' === strtolower( $charset ) ) {
 
 		return 'UTF-8';
 	}
@@ -5441,14 +5664,16 @@ function _canonical_charset( $charset ) {
  *                    Default false.
  */
 function mbstring_binary_safe_encoding( $reset = false ) {
-	static $encodings = array();
+	static $encodings  = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
+	if ( is_null( $overloaded ) ) {
 		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	}
 
-	if ( false === $overloaded )
+	if ( false === $overloaded ) {
 		return;
+	}
 
 	if ( ! $reset ) {
 		$encoding = mb_internal_encoding();
@@ -5685,7 +5910,8 @@ function wp_raise_memory_limit( $context = 'admin' ) {
  * @return string UUID.
  */
 function wp_generate_uuid4() {
-	return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+	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, 0x0fff ) | 0x4000,
@@ -5768,7 +5994,8 @@ function wp_site_admin_email_change_notification( $old_email, $new_email, $optio
 	}
 
 	/* translators: Do not translate OLD_EMAIL, NEW_EMAIL, SITENAME, SITEURL: those are placeholders. */
-	$email_change_text = __( 'Hi,
+	$email_change_text = __(
+		'Hi,
 
 This notice confirms that the admin email address was changed on ###SITENAME###.
 
@@ -5778,7 +6005,8 @@ This email has been sent to ###OLD_EMAIL###
 
 Regards,
 All at ###SITENAME###
-###SITEURL###' );
+###SITEURL###'
+	);
 
 	$email_change_email = array(
 		'to'      => $old_email,
@@ -5815,11 +6043,13 @@ All at ###SITENAME###
 
 	$email_change_email['message'] = str_replace( '###OLD_EMAIL###', $old_email, $email_change_email['message'] );
 	$email_change_email['message'] = str_replace( '###NEW_EMAIL###', $new_email, $email_change_email['message'] );
-	$email_change_email['message'] = str_replace( '###SITENAME###',  $site_name, $email_change_email['message'] );
-	$email_change_email['message'] = str_replace( '###SITEURL###',   home_url(), $email_change_email['message'] );
+	$email_change_email['message'] = str_replace( '###SITENAME###', $site_name, $email_change_email['message'] );
+	$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
 
-	wp_mail( $email_change_email['to'], sprintf(
-		$email_change_email['subject'],
-		$site_name
-	), $email_change_email['message'], $email_change_email['headers'] );
+	wp_mail(
+		$email_change_email['to'], sprintf(
+			$email_change_email['subject'],
+			$site_name
+		), $email_change_email['message'], $email_change_email['headers']
+	);
 }
diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php
index dccaaf262a..d9fab991e7 100644
--- a/wp-includes/functions.wp-scripts.php
+++ b/wp-includes/functions.wp-scripts.php
@@ -38,13 +38,15 @@ function _wp_scripts_maybe_doing_it_wrong( $function ) {
 		return;
 	}
 
-	_doing_it_wrong( $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' );
+	_doing_it_wrong(
+		$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'
+	);
 }
 
 /**
@@ -108,12 +110,14 @@ function wp_add_inline_script( $handle, $data, $position = 'after' ) {
 	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
 	if ( false !== stripos( $data, '</script>' ) ) {
-		_doing_it_wrong( __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' );
+		_doing_it_wrong(
+			__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'
+		);
 		$data = trim( preg_replace( '#<script[^>]*>(.*)</script>#is', '$1', $data ) );
 	}
 
@@ -167,7 +171,6 @@ function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_f
  *         ...
  *     }
  *
- *
  * @see WP_Dependencies::localize()
  * @link https://core.trac.wordpress.org/ticket/11520
  * @global WP_Scripts $wp_scripts The WP_Scripts object for printing scripts.
@@ -216,12 +219,31 @@ function wp_deregister_script( $handle ) {
 		( 'wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter )
 	) {
 		$no = array(
-			'jquery', 'jquery-core', 'jquery-migrate', 'jquery-ui-core', 'jquery-ui-accordion',
-			'jquery-ui-autocomplete', 'jquery-ui-button', 'jquery-ui-datepicker', 'jquery-ui-dialog',
-			'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-menu', 'jquery-ui-mouse',
-			'jquery-ui-position', 'jquery-ui-progressbar', 'jquery-ui-resizable', 'jquery-ui-selectable',
-			'jquery-ui-slider', 'jquery-ui-sortable', 'jquery-ui-spinner', 'jquery-ui-tabs',
-			'jquery-ui-tooltip', 'jquery-ui-widget', 'underscore', 'backbone',
+			'jquery',
+			'jquery-core',
+			'jquery-migrate',
+			'jquery-ui-core',
+			'jquery-ui-accordion',
+			'jquery-ui-autocomplete',
+			'jquery-ui-button',
+			'jquery-ui-datepicker',
+			'jquery-ui-dialog',
+			'jquery-ui-draggable',
+			'jquery-ui-droppable',
+			'jquery-ui-menu',
+			'jquery-ui-mouse',
+			'jquery-ui-position',
+			'jquery-ui-progressbar',
+			'jquery-ui-resizable',
+			'jquery-ui-selectable',
+			'jquery-ui-slider',
+			'jquery-ui-sortable',
+			'jquery-ui-spinner',
+			'jquery-ui-tabs',
+			'jquery-ui-tooltip',
+			'jquery-ui-widget',
+			'underscore',
+			'backbone',
 		);
 
 		if ( in_array( $handle, $no ) ) {
@@ -266,7 +288,6 @@ function wp_enqueue_script( $handle, $src = '', $deps = array(), $ver = false, $
 
 	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
-
 	if ( $src || $in_footer ) {
 		$_handle = explode( '?', $handle );
 
@@ -331,6 +352,6 @@ function wp_script_is( $handle, $list = 'enqueued' ) {
  * @param mixed  $value  String containing the data to be added.
  * @return bool True on success, false on failure.
  */
-function wp_script_add_data( $handle, $key, $value ){
+function wp_script_add_data( $handle, $key, $value ) {
 	return wp_scripts()->add_data( $handle, $key, $value );
 }
diff --git a/wp-includes/functions.wp-styles.php b/wp-includes/functions.wp-styles.php
index db2603a938..3b7f20b26c 100644
--- a/wp-includes/functions.wp-styles.php
+++ b/wp-includes/functions.wp-styles.php
@@ -84,12 +84,14 @@ function wp_add_inline_style( $handle, $data ) {
 	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
 
 	if ( false !== stripos( $data, '</style>' ) ) {
-		_doing_it_wrong( __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' );
+		_doing_it_wrong(
+			__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'
+		);
 		$data = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $data ) );
 	}
 
@@ -167,7 +169,7 @@ function wp_enqueue_style( $handle, $src = '', $deps = array(), $ver = false, $m
 	$wp_styles = wp_styles();
 
 	if ( $src ) {
-		$_handle = explode('?', $handle);
+		$_handle = explode( '?', $handle );
 		$wp_styles->add( $_handle[0], $src, $deps, $ver, $media );
 	}
 	$wp_styles->enqueue( $handle );
diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index c579668615..ca2dbc02ec 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -31,7 +31,7 @@ function get_header( $name = null ) {
 	do_action( 'get_header', $name );
 
 	$templates = array();
-	$name = (string) $name;
+	$name      = (string) $name;
 	if ( '' !== $name ) {
 		$templates[] = "header-{$name}.php";
 	}
@@ -66,12 +66,12 @@ function get_footer( $name = null ) {
 	do_action( 'get_footer', $name );
 
 	$templates = array();
-	$name = (string) $name;
+	$name      = (string) $name;
 	if ( '' !== $name ) {
 		$templates[] = "footer-{$name}.php";
 	}
 
-	$templates[]    = 'footer.php';
+	$templates[] = 'footer.php';
 
 	locate_template( $templates, true );
 }
@@ -101,9 +101,10 @@ function get_sidebar( $name = null ) {
 	do_action( 'get_sidebar', $name );
 
 	$templates = array();
-	$name = (string) $name;
-	if ( '' !== $name )
+	$name      = (string) $name;
+	if ( '' !== $name ) {
 		$templates[] = "sidebar-{$name}.php";
+	}
 
 	$templates[] = 'sidebar.php';
 
@@ -146,13 +147,14 @@ function get_template_part( $slug, $name = null ) {
 	do_action( "get_template_part_{$slug}", $slug, $name );
 
 	$templates = array();
-	$name = (string) $name;
-	if ( '' !== $name )
+	$name      = (string) $name;
+	if ( '' !== $name ) {
 		$templates[] = "{$slug}-{$name}.php";
+	}
 
 	$templates[] = "{$slug}.php";
 
-	locate_template($templates, true, false);
+	locate_template( $templates, true, false );
 }
 
 /**
@@ -212,14 +214,14 @@ function get_search_form( $echo = true ) {
 					<span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
 					<input type="search" class="search-field" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" />
 				</label>
-				<input type="submit" class="search-submit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+				<input type="submit" class="search-submit" value="' . esc_attr_x( 'Search', 'submit button' ) . '" />
 			</form>';
 		} else {
 			$form = '<form role="search" method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
 				<div>
 					<label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
 					<input type="text" value="' . get_search_query() . '" name="s" id="s" />
-					<input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+					<input type="submit" id="searchsubmit" value="' . esc_attr_x( 'Search', 'submit button' ) . '" />
 				</div>
 			</form>';
 		}
@@ -234,13 +236,15 @@ function get_search_form( $echo = true ) {
 	 */
 	$result = apply_filters( 'get_search_form', $form );
 
-	if ( null === $result )
+	if ( null === $result ) {
 		$result = $form;
+	}
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $result;
-	else
+	} else {
 		return $result;
+	}
 }
 
 /**
@@ -255,11 +259,12 @@ function get_search_form( $echo = true ) {
  * @param bool   $echo     Default to echo and not return the link.
  * @return string|void String when retrieving.
  */
-function wp_loginout($redirect = '', $echo = true) {
-	if ( ! is_user_logged_in() )
-		$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
-	else
-		$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+function wp_loginout( $redirect = '', $echo = true ) {
+	if ( ! is_user_logged_in() ) {
+		$link = '<a href="' . esc_url( wp_login_url( $redirect ) ) . '">' . __( 'Log in' ) . '</a>';
+	} else {
+		$link = '<a href="' . esc_url( wp_logout_url( $redirect ) ) . '">' . __( 'Log out' ) . '</a>';
+	}
 
 	if ( $echo ) {
 		/**
@@ -286,13 +291,13 @@ function wp_loginout($redirect = '', $echo = true) {
  * @param string $redirect Path to redirect to on logout.
  * @return string The logout URL. Note: HTML-encoded via esc_html() in wp_nonce_url().
  */
-function wp_logout_url($redirect = '') {
+function wp_logout_url( $redirect = '' ) {
 	$args = array( 'action' => 'logout' );
-	if ( !empty($redirect) ) {
+	if ( ! empty( $redirect ) ) {
 		$args['redirect_to'] = urlencode( $redirect );
 	}
 
-	$logout_url = add_query_arg($args, site_url('wp-login.php', 'login'));
+	$logout_url = add_query_arg( $args, site_url( 'wp-login.php', 'login' ) );
 	$logout_url = wp_nonce_url( $logout_url, 'log-out' );
 
 	/**
@@ -316,14 +321,16 @@ function wp_logout_url($redirect = '') {
  *                             Default false.
  * @return string The login URL. Not HTML-encoded.
  */
-function wp_login_url($redirect = '', $force_reauth = false) {
-	$login_url = site_url('wp-login.php', 'login');
+function wp_login_url( $redirect = '', $force_reauth = false ) {
+	$login_url = site_url( 'wp-login.php', 'login' );
 
-	if ( !empty($redirect) )
-		$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
+	if ( ! empty( $redirect ) ) {
+		$login_url = add_query_arg( 'redirect_to', urlencode( $redirect ), $login_url );
+	}
 
-	if ( $force_reauth )
-		$login_url = add_query_arg('reauth', '1', $login_url);
+	if ( $force_reauth ) {
+		$login_url = add_query_arg( 'reauth', '1', $login_url );
+	}
 
 	/**
 	 * Filters the login URL.
@@ -389,19 +396,19 @@ function wp_registration_url() {
  */
 function wp_login_form( $args = array() ) {
 	$defaults = array(
-		'echo' => true,
+		'echo'           => true,
 		// Default 'redirect' value takes the user back to the request URI.
-		'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
-		'form_id' => 'loginform',
+		'redirect'       => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
+		'form_id'        => 'loginform',
 		'label_username' => __( 'Username or Email Address' ),
 		'label_password' => __( 'Password' ),
 		'label_remember' => __( 'Remember Me' ),
-		'label_log_in' => __( 'Log In' ),
-		'id_username' => 'user_login',
-		'id_password' => 'user_pass',
-		'id_remember' => 'rememberme',
-		'id_submit' => 'wp-submit',
-		'remember' => true,
+		'label_log_in'   => __( 'Log In' ),
+		'id_username'    => 'user_login',
+		'id_password'    => 'user_pass',
+		'id_remember'    => 'rememberme',
+		'id_submit'      => 'wp-submit',
+		'remember'       => true,
 		'value_username' => '',
 		// Set 'value_remember' to true to default the "Remember me" checkbox to checked.
 		'value_remember' => false,
@@ -475,10 +482,11 @@ function wp_login_form( $args = array() ) {
 			' . $login_form_bottom . '
 		</form>';
 
-	if ( $args['echo'] )
+	if ( $args['echo'] ) {
 		echo $form;
-	else
+	} else {
 		return $form;
+	}
 }
 
 /**
@@ -491,11 +499,11 @@ function wp_login_form( $args = array() ) {
  */
 function wp_lostpassword_url( $redirect = '' ) {
 	$args = array( 'action' => 'lostpassword' );
-	if ( !empty($redirect) ) {
+	if ( ! empty( $redirect ) ) {
 		$args['redirect_to'] = urlencode( $redirect );
 	}
 
-	$lostpassword_url = add_query_arg( $args, network_site_url('wp-login.php', 'login') );
+	$lostpassword_url = add_query_arg( $args, network_site_url( 'wp-login.php', 'login' ) );
 
 	/**
 	 * Filters the Lost Password URL.
@@ -523,12 +531,13 @@ function wp_lostpassword_url( $redirect = '' ) {
  */
 function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
 	if ( ! is_user_logged_in() ) {
-		if ( get_option('users_can_register') )
-			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
-		else
+		if ( get_option( 'users_can_register' ) ) {
+			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __( 'Register' ) . '</a>' . $after;
+		} else {
 			$link = '';
+		}
 	} elseif ( current_user_can( 'read' ) ) {
-		$link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
+		$link = $before . '<a href="' . admin_url() . '">' . __( 'Site Admin' ) . '</a>' . $after;
 	} else {
 		$link = '';
 	}
@@ -632,42 +641,44 @@ function bloginfo( $show = '' ) {
  * @return string Mostly string values, might be empty.
  */
 function get_bloginfo( $show = '', $filter = 'raw' ) {
-	switch( $show ) {
-		case 'home' : // DEPRECATED
-		case 'siteurl' : // DEPRECATED
-			_deprecated_argument( __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>',
-				'<code>bloginfo()</code>',
-				'<code>url</code>'
-			) );
-		case 'url' :
+	switch ( $show ) {
+		case 'home': // DEPRECATED
+		case 'siteurl': // DEPRECATED
+			_deprecated_argument(
+				__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>',
+					'<code>bloginfo()</code>',
+					'<code>url</code>'
+				)
+			);
+		case 'url':
 			$output = home_url();
 			break;
-		case 'wpurl' :
+		case 'wpurl':
 			$output = site_url();
 			break;
 		case 'description':
-			$output = get_option('blogdescription');
+			$output = get_option( 'blogdescription' );
 			break;
 		case 'rdf_url':
-			$output = get_feed_link('rdf');
+			$output = get_feed_link( 'rdf' );
 			break;
 		case 'rss_url':
-			$output = get_feed_link('rss');
+			$output = get_feed_link( 'rss' );
 			break;
 		case 'rss2_url':
-			$output = get_feed_link('rss2');
+			$output = get_feed_link( 'rss2' );
 			break;
 		case 'atom_url':
-			$output = get_feed_link('atom');
+			$output = get_feed_link( 'atom' );
 			break;
 		case 'comments_atom_url':
-			$output = get_feed_link('comments_atom');
+			$output = get_feed_link( 'comments_atom' );
 			break;
 		case 'comments_rss2_url':
-			$output = get_feed_link('comments_rss2');
+			$output = get_feed_link( 'comments_rss2' );
 			break;
 		case 'pingback_url':
 			$output = site_url( 'xmlrpc.php' );
@@ -683,14 +694,16 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 			$output = get_template_directory_uri();
 			break;
 		case 'admin_email':
-			$output = get_option('admin_email');
+			$output = get_option( 'admin_email' );
 			break;
 		case 'charset':
-			$output = get_option('blog_charset');
-			if ('' == $output) $output = 'UTF-8';
+			$output = get_option( 'blog_charset' );
+			if ( '' == $output ) {
+				$output = 'UTF-8';
+			}
 			break;
-		case 'html_type' :
-			$output = get_option('html_type');
+		case 'html_type':
+			$output = get_option( 'html_type' );
 			break;
 		case 'version':
 			global $wp_version;
@@ -708,13 +721,15 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 			}
 			break;
 		case 'text_direction':
-			_deprecated_argument( __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>',
-				'<code>bloginfo()</code>',
-				'<code>is_rtl()</code>'
-			) );
+			_deprecated_argument(
+				__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>',
+					'<code>bloginfo()</code>',
+					'<code>is_rtl()</code>'
+				)
+			);
 			if ( function_exists( 'is_rtl' ) ) {
 				$output = is_rtl() ? 'rtl' : 'ltr';
 			} else {
@@ -723,15 +738,16 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
 			break;
 		case 'name':
 		default:
-			$output = get_option('blogname');
+			$output = get_option( 'blogname' );
 			break;
 	}
 
 	$url = true;
-	if (strpos($show, 'url') === false &&
-		strpos($show, 'directory') === false &&
-		strpos($show, 'home') === false)
+	if ( strpos( $show, 'url' ) === false &&
+		strpos( $show, 'directory' ) === false &&
+		strpos( $show, 'home' ) === false ) {
 		$url = false;
+	}
 
 	if ( 'display' == $filter ) {
 		if ( $url ) {
@@ -864,7 +880,7 @@ function has_custom_logo( $blog_id = 0 ) {
  * @return string Custom logo markup.
  */
 function get_custom_logo( $blog_id = 0 ) {
-	$html = '';
+	$html          = '';
 	$switched_blog = false;
 
 	if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
@@ -894,15 +910,15 @@ function get_custom_logo( $blog_id = 0 ) {
 		 * If the alt attribute is not empty, there's no need to explicitly pass
 		 * it because wp_get_attachment_image() already adds the alt attribute.
 		 */
-		$html = sprintf( '<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
+		$html = sprintf(
+			'<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
 			esc_url( home_url( '/' ) ),
 			wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr )
 		);
-	}
-
-	// If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
+	} // If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
 	elseif ( is_customize_preview() ) {
-		$html = sprintf( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
+		$html = sprintf(
+			'<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
 			esc_url( home_url( '/' ) )
 		);
 	}
@@ -971,39 +987,39 @@ function wp_get_document_title() {
 	if ( is_404() ) {
 		$title['title'] = __( 'Page not found' );
 
-	// If it's a search, use a dynamic search results title.
+		// If it's a search, use a dynamic search results title.
 	} elseif ( is_search() ) {
 		/* translators: %s: search phrase */
 		$title['title'] = sprintf( __( 'Search Results for &#8220;%s&#8221;' ), get_search_query() );
 
-	// If on the front page, use the site title.
+		// If on the front page, use the site title.
 	} elseif ( is_front_page() ) {
 		$title['title'] = get_bloginfo( 'name', 'display' );
 
-	// If on a post type archive, use the post type archive title.
+		// If on a post type archive, use the post type archive title.
 	} elseif ( is_post_type_archive() ) {
 		$title['title'] = post_type_archive_title( '', false );
 
-	// If on a taxonomy archive, use the term title.
+		// If on a taxonomy archive, use the term title.
 	} elseif ( is_tax() ) {
 		$title['title'] = single_term_title( '', false );
 
-	/*
-	 * If we're on the blog page that is not the homepage or
-	 * a single post of any post type, use the post title.
-	 */
+		/*
+		* If we're on the blog page that is not the homepage or
+		* a single post of any post type, use the post title.
+		*/
 	} elseif ( is_home() || is_singular() ) {
 		$title['title'] = single_post_title( '', false );
 
-	// If on a category or tag archive, use the term title.
+		// If on a category or tag archive, use the term title.
 	} elseif ( is_category() || is_tag() ) {
 		$title['title'] = single_term_title( '', false );
 
-	// If on an author archive, use the author's display name.
+		// If on an author archive, use the author's display name.
 	} elseif ( is_author() && $author = get_queried_object() ) {
 		$title['title'] = $author->display_name;
 
-	// If it's a date archive, use the date as the title.
+		// If it's a date archive, use the date as the title.
 	} elseif ( is_year() ) {
 		$title['title'] = get_the_date( _x( 'Y', 'yearly archives date format' ) );
 
@@ -1247,8 +1263,9 @@ function wp_title( $sep = '&raquo;', $display = true, $seplocation = '' ) {
 function single_post_title( $prefix = '', $display = true ) {
 	$_post = get_queried_object();
 
-	if ( !isset($_post->post_title) )
+	if ( ! isset( $_post->post_title ) ) {
 		return;
+	}
 
 	/**
 	 * Filters the page title for a single post.
@@ -1259,10 +1276,11 @@ function single_post_title( $prefix = '', $display = true ) {
 	 * @param object $_post       The current queried object as returned by get_queried_object().
 	 */
 	$title = apply_filters( 'single_post_title', $_post->post_title, $_post );
-	if ( $display )
+	if ( $display ) {
 		echo $prefix . $title;
-	else
+	} else {
 		return $prefix . $title;
+	}
 }
 
 /**
@@ -1278,12 +1296,14 @@ function single_post_title( $prefix = '', $display = true ) {
  * @return string|void Title when retrieving, null when displaying or failure.
  */
 function post_type_archive_title( $prefix = '', $display = true ) {
-	if ( ! is_post_type_archive() )
+	if ( ! is_post_type_archive() ) {
 		return;
+	}
 
 	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
+	if ( is_array( $post_type ) ) {
 		$post_type = reset( $post_type );
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 
@@ -1297,10 +1317,11 @@ function post_type_archive_title( $prefix = '', $display = true ) {
 	 */
 	$title = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name, $post_type );
 
-	if ( $display )
+	if ( $display ) {
 		echo $prefix . $title;
-	else
+	} else {
 		return $prefix . $title;
+	}
 }
 
 /**
@@ -1353,8 +1374,9 @@ function single_tag_title( $prefix = '', $display = true ) {
 function single_term_title( $prefix = '', $display = true ) {
 	$term = get_queried_object();
 
-	if ( !$term )
+	if ( ! $term ) {
 		return;
+	}
 
 	if ( is_category() ) {
 		/**
@@ -1387,13 +1409,15 @@ function single_term_title( $prefix = '', $display = true ) {
 		return;
 	}
 
-	if ( empty( $term_name ) )
+	if ( empty( $term_name ) ) {
 		return;
+	}
 
-	if ( $display )
+	if ( $display ) {
 		echo $prefix . $term_name;
-	else
+	} else {
 		return $prefix . $term_name;
+	}
 }
 
 /**
@@ -1412,28 +1436,30 @@ function single_term_title( $prefix = '', $display = true ) {
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_month_title($prefix = '', $display = true ) {
+function single_month_title( $prefix = '', $display = true ) {
 	global $wp_locale;
 
-	$m = get_query_var('m');
-	$year = get_query_var('year');
-	$monthnum = get_query_var('monthnum');
+	$m        = get_query_var( 'm' );
+	$year     = get_query_var( 'year' );
+	$monthnum = get_query_var( 'monthnum' );
 
-	if ( !empty($monthnum) && !empty($year) ) {
-		$my_year = $year;
-		$my_month = $wp_locale->get_month($monthnum);
-	} elseif ( !empty($m) ) {
-		$my_year = substr($m, 0, 4);
-		$my_month = $wp_locale->get_month(substr($m, 4, 2));
+	if ( ! empty( $monthnum ) && ! empty( $year ) ) {
+		$my_year  = $year;
+		$my_month = $wp_locale->get_month( $monthnum );
+	} elseif ( ! empty( $m ) ) {
+		$my_year  = substr( $m, 0, 4 );
+		$my_month = $wp_locale->get_month( substr( $m, 4, 2 ) );
 	}
 
-	if ( empty($my_month) )
+	if ( empty( $my_month ) ) {
 		return false;
+	}
 
 	$result = $prefix . $my_month . $prefix . $my_year;
 
-	if ( !$display )
+	if ( ! $display ) {
 		return $result;
+	}
 	echo $result;
 }
 
@@ -1636,18 +1662,19 @@ function get_the_post_type_description() {
  * @param string $after  Optional. Content to append to the description. Default empty.
  * @return string HTML link content for archive.
  */
-function get_archives_link($url, $text, $format = 'html', $before = '', $after = '') {
-	$text = wptexturize($text);
-	$url = esc_url($url);
+function get_archives_link( $url, $text, $format = 'html', $before = '', $after = '' ) {
+	$text = wptexturize( $text );
+	$url  = esc_url( $url );
 
-	if ('link' == $format)
+	if ( 'link' == $format ) {
 		$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
-	elseif ('option' == $format)
+	} elseif ( 'option' == $format ) {
 		$link_html = "\t<option value='$url'>$before $text $after</option>\n";
-	elseif ('html' == $format)
+	} elseif ( 'html' == $format ) {
 		$link_html = "\t<li>$before<a href='$url'>$text</a>$after</li>\n";
-	else // custom
+	} else { // custom
 		$link_html = "\t$before<a href='$url'>$text</a>$after\n";
+	}
 
 	/**
 	 * Filters the archive link content.
@@ -1704,11 +1731,15 @@ function wp_get_archives( $args = '' ) {
 	global $wpdb, $wp_locale;
 
 	$defaults = array(
-		'type' => 'monthly', 'limit' => '',
-		'format' => 'html', 'before' => '',
-		'after' => '', 'show_post_count' => false,
-		'echo' => 1, 'order' => 'DESC',
-		'post_type' => 'post'
+		'type'            => 'monthly',
+		'limit'           => '',
+		'format'          => 'html',
+		'before'          => '',
+		'after'           => '',
+		'show_post_count' => false,
+		'echo'            => 1,
+		'order'           => 'DESC',
+		'post_type'       => 'post',
 	);
 
 	$r = wp_parse_args( $args, $defaults );
@@ -1766,8 +1797,8 @@ function wp_get_archives( $args = '' ) {
 
 	if ( 'monthly' == $r['type'] ) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
-		$key = "wp_get_archives:$key:$last_changed";
+		$key   = md5( $query );
+		$key   = "wp_get_archives:$key:$last_changed";
 		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
 			$results = $wpdb->get_results( $query );
 			wp_cache_set( $key, $results, 'posts' );
@@ -1789,15 +1820,15 @@ function wp_get_archives( $args = '' ) {
 		}
 	} elseif ( 'yearly' == $r['type'] ) {
 		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
-		$key = "wp_get_archives:$key:$last_changed";
+		$key   = md5( $query );
+		$key   = "wp_get_archives:$key:$last_changed";
 		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
 			$results = $wpdb->get_results( $query );
 			wp_cache_set( $key, $results, 'posts' );
 		}
 		if ( $results ) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result) {
+			foreach ( (array) $results as $result ) {
 				$url = get_year_link( $result->year );
 				if ( 'post' !== $r['post_type'] ) {
 					$url = add_query_arg( 'post_type', $r['post_type'], $url );
@@ -1811,8 +1842,8 @@ function wp_get_archives( $args = '' ) {
 		}
 	} elseif ( 'daily' == $r['type'] ) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
-		$key = "wp_get_archives:$key:$last_changed";
+		$key   = md5( $query );
+		$key   = "wp_get_archives:$key:$last_changed";
 		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
 			$results = $wpdb->get_results( $query );
 			wp_cache_set( $key, $results, 'posts' );
@@ -1820,7 +1851,7 @@ function wp_get_archives( $args = '' ) {
 		if ( $results ) {
 			$after = $r['after'];
 			foreach ( (array) $results as $result ) {
-				$url  = get_day_link( $result->year, $result->month, $result->dayofmonth );
+				$url = get_day_link( $result->year, $result->month, $result->dayofmonth );
 				if ( 'post' !== $r['post_type'] ) {
 					$url = add_query_arg( 'post_type', $r['post_type'], $url );
 				}
@@ -1833,10 +1864,10 @@ function wp_get_archives( $args = '' ) {
 			}
 		}
 	} elseif ( 'weekly' == $r['type'] ) {
-		$week = _wp_mysql_week( '`post_date`' );
+		$week  = _wp_mysql_week( '`post_date`' );
 		$query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
-		$key = md5( $query );
-		$key = "wp_get_archives:$key:$last_changed";
+		$key   = md5( $query );
+		$key   = "wp_get_archives:$key:$last_changed";
 		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
 			$results = $wpdb->get_results( $query );
 			wp_cache_set( $key, $results, 'posts' );
@@ -1851,11 +1882,16 @@ function wp_get_archives( $args = '' ) {
 					$arc_week       = get_weekstartend( $result->yyyymmdd, get_option( 'start_of_week' ) );
 					$arc_week_start = date_i18n( get_option( 'date_format' ), $arc_week['start'] );
 					$arc_week_end   = date_i18n( get_option( 'date_format' ), $arc_week['end'] );
-					$url            = add_query_arg( array( 'm' => $arc_year, 'w' => $result->week, ), home_url( '/' ) );
+					$url            = add_query_arg(
+						array(
+							'm' => $arc_year,
+							'w' => $result->week,
+						), home_url( '/' )
+					);
 					if ( 'post' !== $r['post_type'] ) {
 						$url = add_query_arg( 'post_type', $r['post_type'], $url );
 					}
-					$text           = $arc_week_start . $archive_week_separator . $arc_week_end;
+					$text = $arc_week_start . $archive_week_separator . $arc_week_end;
 					if ( $r['show_post_count'] ) {
 						$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
 					}
@@ -1863,11 +1899,11 @@ function wp_get_archives( $args = '' ) {
 				}
 			}
 		}
-	} elseif ( ( 'postbypost' == $r['type'] ) || ('alpha' == $r['type'] ) ) {
+	} elseif ( ( 'postbypost' == $r['type'] ) || ( 'alpha' == $r['type'] ) ) {
 		$orderby = ( 'alpha' == $r['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
-		$query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
-		$key = md5( $query );
-		$key = "wp_get_archives:$key:$last_changed";
+		$query   = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
+		$key     = md5( $query );
+		$key     = "wp_get_archives:$key:$last_changed";
 		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
 			$results = $wpdb->get_results( $query );
 			wp_cache_set( $key, $results, 'posts' );
@@ -1902,9 +1938,9 @@ function wp_get_archives( $args = '' ) {
  * @param int $num Number of day.
  * @return float Days since the start of the week.
  */
-function calendar_week_mod($num) {
+function calendar_week_mod( $num ) {
 	$base = 7;
-	return ($num - $base*floor($num/$base));
+	return ( $num - $base * floor( $num / $base ) );
 }
 
 /**
@@ -1929,7 +1965,7 @@ function calendar_week_mod($num) {
 function get_calendar( $initial = true, $echo = true ) {
 	global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
 
-	$key = md5( $m . $monthnum . $year );
+	$key   = md5( $m . $monthnum . $year );
 	$cache = wp_cache_get( 'get_calendar', 'calendar' );
 
 	if ( $cache && is_array( $cache ) && isset( $cache[ $key ] ) ) {
@@ -1950,7 +1986,7 @@ function get_calendar( $initial = true, $echo = true ) {
 
 	// Quick check. If we have no posts at all, abort!
 	if ( ! $posts ) {
-		$gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
+		$gotsome = $wpdb->get_var( "SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1" );
 		if ( ! $gotsome ) {
 			$cache[ $key ] = '';
 			wp_cache_set( 'get_calendar', $cache, 'calendar' );
@@ -1963,18 +1999,18 @@ function get_calendar( $initial = true, $echo = true ) {
 	}
 	// week_begins = 0 stands for Sunday
 	$week_begins = (int) get_option( 'start_of_week' );
-	$ts = current_time( 'timestamp' );
+	$ts          = current_time( 'timestamp' );
 
 	// Let's figure out when we are
 	if ( ! empty( $monthnum ) && ! empty( $year ) ) {
 		$thismonth = zeroise( intval( $monthnum ), 2 );
-		$thisyear = (int) $year;
+		$thisyear  = (int) $year;
 	} elseif ( ! empty( $w ) ) {
 		// We need to get the month from MySQL
 		$thisyear = (int) substr( $m, 0, 4 );
 		//it seems MySQL's weeks disagree with PHP's
-		$d = ( ( $w - 1 ) * 7 ) + 6;
-		$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')");
+		$d         = ( ( $w - 1 ) * 7 ) + 6;
+		$thismonth = $wpdb->get_var( "SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')" );
 	} elseif ( ! empty( $m ) ) {
 		$thisyear = (int) substr( $m, 0, 4 );
 		if ( strlen( $m ) < 6 ) {
@@ -1983,30 +2019,34 @@ function get_calendar( $initial = true, $echo = true ) {
 			$thismonth = zeroise( (int) substr( $m, 4, 2 ), 2 );
 		}
 	} else {
-		$thisyear = gmdate( 'Y', $ts );
+		$thisyear  = gmdate( 'Y', $ts );
 		$thismonth = gmdate( 'm', $ts );
 	}
 
-	$unixmonth = mktime( 0, 0 , 0, $thismonth, 1, $thisyear );
-	$last_day = date( 't', $unixmonth );
+	$unixmonth = mktime( 0, 0, 0, $thismonth, 1, $thisyear );
+	$last_day  = date( 't', $unixmonth );
 
 	// Get the next and previous month and year with at least one post
-	$previous = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
+	$previous = $wpdb->get_row(
+		"SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
 		FROM $wpdb->posts
 		WHERE post_date < '$thisyear-$thismonth-01'
 		AND post_type = 'post' AND post_status = 'publish'
 			ORDER BY post_date DESC
-			LIMIT 1");
-	$next = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
+			LIMIT 1"
+	);
+	$next     = $wpdb->get_row(
+		"SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
 		FROM $wpdb->posts
 		WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
 		AND post_type = 'post' AND post_status = 'publish'
 			ORDER BY post_date ASC
-			LIMIT 1");
+			LIMIT 1"
+	);
 
 	/* translators: Calendar caption: 1: month name, 2: 4-digit year */
-	$calendar_caption = _x('%1$s %2$s', 'calendar caption');
-	$calendar_output = '<table id="wp-calendar">
+	$calendar_caption = _x( '%1$s %2$s', 'calendar caption' );
+	$calendar_output  = '<table id="wp-calendar">
 	<caption>' . sprintf(
 		$calendar_caption,
 		$wp_locale->get_month( $thismonth ),
@@ -2022,8 +2062,8 @@ function get_calendar( $initial = true, $echo = true ) {
 	}
 
 	foreach ( $myweek as $wd ) {
-		$day_name = $initial ? $wp_locale->get_weekday_initial( $wd ) : $wp_locale->get_weekday_abbrev( $wd );
-		$wd = esc_attr( $wd );
+		$day_name         = $initial ? $wp_locale->get_weekday_initial( $wd ) : $wp_locale->get_weekday_abbrev( $wd );
+		$wd               = esc_attr( $wd );
 		$calendar_output .= "\n\t\t<th scope=\"col\" title=\"$wd\">$day_name</th>";
 	}
 
@@ -2035,21 +2075,21 @@ function get_calendar( $initial = true, $echo = true ) {
 	<tr>';
 
 	if ( $previous ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link( $previous->year, $previous->month ) . '">&laquo; ' .
+		$calendar_output .= "\n\t\t" . '<td colspan="3" id="prev"><a href="' . get_month_link( $previous->year, $previous->month ) . '">&laquo; ' .
 			$wp_locale->get_month_abbrev( $wp_locale->get_month( $previous->month ) ) .
 		'</a></td>';
 	} else {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
+		$calendar_output .= "\n\t\t" . '<td colspan="3" id="prev" class="pad">&nbsp;</td>';
 	}
 
-	$calendar_output .= "\n\t\t".'<td class="pad">&nbsp;</td>';
+	$calendar_output .= "\n\t\t" . '<td class="pad">&nbsp;</td>';
 
 	if ( $next ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link( $next->year, $next->month ) . '">' .
+		$calendar_output .= "\n\t\t" . '<td colspan="3" id="next"><a href="' . get_month_link( $next->year, $next->month ) . '">' .
 			$wp_locale->get_month_abbrev( $wp_locale->get_month( $next->month ) ) .
 		' &raquo;</a></td>';
 	} else {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
+		$calendar_output .= "\n\t\t" . '<td colspan="3" id="next" class="pad">&nbsp;</td>';
 	}
 
 	$calendar_output .= '
@@ -2062,10 +2102,12 @@ function get_calendar( $initial = true, $echo = true ) {
 	$daywithpost = array();
 
 	// Get days with posts
-	$dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
+	$dayswithposts = $wpdb->get_results(
+		"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 ) {
 			$daywithpost[] = $daywith[0];
@@ -2075,14 +2117,14 @@ function get_calendar( $initial = true, $echo = true ) {
 	// See how much we should pad in the beginning
 	$pad = calendar_week_mod( date( 'w', $unixmonth ) - $week_begins );
 	if ( 0 != $pad ) {
-		$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr( $pad ) .'" class="pad">&nbsp;</td>';
+		$calendar_output .= "\n\t\t" . '<td colspan="' . esc_attr( $pad ) . '" class="pad">&nbsp;</td>';
 	}
 
-	$newrow = false;
+	$newrow      = false;
 	$daysinmonth = (int) date( 't', $unixmonth );
 
 	for ( $day = 1; $day <= $daysinmonth; ++$day ) {
-		if ( isset($newrow) && $newrow ) {
+		if ( isset( $newrow ) && $newrow ) {
 			$calendar_output .= "\n\t</tr>\n\t<tr>\n\t\t";
 		}
 		$newrow = false;
@@ -2099,7 +2141,7 @@ function get_calendar( $initial = true, $echo = true ) {
 			// any posts today?
 			$date_format = date( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) );
 			/* translators: Post calendar label. 1: Date */
-			$label = sprintf( __( 'Posts published on %s' ), $date_format );
+			$label            = sprintf( __( 'Posts published on %s' ), $date_format );
 			$calendar_output .= sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
 				get_day_link( $thisyear, $thismonth, $day ),
@@ -2111,14 +2153,14 @@ function get_calendar( $initial = true, $echo = true ) {
 		}
 		$calendar_output .= '</td>';
 
-		if ( 6 == calendar_week_mod( date( 'w', mktime(0, 0 , 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
+		if ( 6 == calendar_week_mod( date( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
 			$newrow = true;
 		}
 	}
 
-	$pad = 7 - calendar_week_mod( date( 'w', mktime( 0, 0 , 0, $thismonth, $day, $thisyear ) ) - $week_begins );
+	$pad = 7 - calendar_week_mod( date( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins );
 	if ( $pad != 0 && $pad != 7 ) {
-		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr( $pad ) .'">&nbsp;</td>';
+		$calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '">&nbsp;</td>';
 	}
 	$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
 
@@ -2166,10 +2208,10 @@ function allowed_tags() {
 	global $allowedtags;
 	$allowed = '';
 	foreach ( (array) $allowedtags as $tag => $attributes ) {
-		$allowed .= '<'.$tag;
-		if ( 0 < count($attributes) ) {
+		$allowed .= '<' . $tag;
+		if ( 0 < count( $attributes ) ) {
 			foreach ( $attributes as $attribute => $limits ) {
-				$allowed .= ' '.$attribute.'=""';
+				$allowed .= ' ' . $attribute . '=""';
 			}
 		}
 		$allowed .= '> ';
@@ -2177,7 +2219,7 @@ function allowed_tags() {
 	return htmlentities( $allowed );
 }
 
-/***** Date/Time tags *****/
+/***** Date/Time tags */
 
 /**
  * Outputs the date in iso8601 format for xml files.
@@ -2215,7 +2257,7 @@ function the_date( $d = '', $before = '', $after = '', $echo = true ) {
 	global $currentday, $previousday;
 
 	if ( is_new_day() ) {
-		$the_date = $before . get_the_date( $d ) . $after;
+		$the_date    = $before . get_the_date( $d ) . $after;
 		$previousday = $currentday;
 
 		/**
@@ -2231,10 +2273,11 @@ function the_date( $d = '', $before = '', $after = '', $echo = true ) {
 		 */
 		$the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
 
-		if ( $echo )
+		if ( $echo ) {
 			echo $the_date;
-		else
+		} else {
 			return $the_date;
+		}
 	}
 }
 
@@ -2288,7 +2331,7 @@ function get_the_date( $d = '', $post = null ) {
  * @return string|void String if retrieving.
  */
 function the_modified_date( $d = '', $before = '', $after = '', $echo = true ) {
-	$the_modified_date = $before . get_the_modified_date($d) . $after;
+	$the_modified_date = $before . get_the_modified_date( $d ) . $after;
 
 	/**
 	 * Filters the date a post was last modified for display.
@@ -2303,10 +2346,11 @@ function the_modified_date( $d = '', $before = '', $after = '', $echo = true ) {
 	 */
 	$the_modified_date = apply_filters( 'the_modified_date', $the_modified_date, $d, $before, $after );
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $the_modified_date;
-	else
+	} else {
 		return $the_modified_date;
+	}
 
 }
 
@@ -2378,16 +2422,17 @@ function the_time( $d = '' ) {
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
 function get_the_time( $d = '', $post = null ) {
-	$post = get_post($post);
+	$post = get_post( $post );
 
 	if ( ! $post ) {
 		return false;
 	}
 
-	if ( '' == $d )
-		$the_time = get_post_time(get_option('time_format'), false, $post, true);
-	else
-		$the_time = get_post_time($d, false, $post, true);
+	if ( '' == $d ) {
+		$the_time = get_post_time( get_option( 'time_format' ), false, $post, true );
+	} else {
+		$the_time = get_post_time( $d, false, $post, true );
+	}
 
 	/**
 	 * Filters the time a post was written.
@@ -2416,18 +2461,19 @@ function get_the_time( $d = '', $post = null ) {
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
 function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
-	$post = get_post($post);
+	$post = get_post( $post );
 
 	if ( ! $post ) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ( $gmt ) {
 		$time = $post->post_date_gmt;
-	else
+	} else {
 		$time = $post->post_date;
+	}
 
-	$time = mysql2date($d, $time, $translate);
+	$time = mysql2date( $d, $time, $translate );
 
 	/**
 	 * Filters the localized time a post was written.
@@ -2449,7 +2495,7 @@ function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false
  *
  * @param string $d Optional Either 'G', 'U', or php date format defaults to the value specified in the time_format option.
  */
-function the_modified_time($d = '') {
+function the_modified_time( $d = '' ) {
 	/**
 	 * Filters the localized time a post was last modified, for display.
 	 *
@@ -2460,7 +2506,7 @@ function the_modified_time($d = '') {
 	 *                                      or php date format. Defaults to value
 	 *                                      specified in 'time_format' option.
 	 */
-	echo apply_filters( 'the_modified_time', get_the_modified_time($d), $d );
+	echo apply_filters( 'the_modified_time', get_the_modified_time( $d ), $d );
 }
 
 /**
@@ -2515,17 +2561,18 @@ function get_the_modified_time( $d = '', $post = null ) {
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
 function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
-	$post = get_post($post);
+	$post = get_post( $post );
 
 	if ( ! $post ) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ( $gmt ) {
 		$time = $post->post_modified_gmt;
-	else
+	} else {
 		$time = $post->post_modified;
-	$time = mysql2date($d, $time, $translate);
+	}
+	$time = mysql2date( $d, $time, $translate );
 
 	/**
 	 * Filters the localized time a post was last modified.
@@ -2575,14 +2622,14 @@ function the_weekday() {
  * @param string $before Optional Output before the date.
  * @param string $after Optional Output after the date.
  */
-function the_weekday_date($before='',$after='') {
+function the_weekday_date( $before = '', $after = '' ) {
 	global $wp_locale, $currentday, $previousweekday;
 	$the_weekday_date = '';
 	if ( $currentday != $previousweekday ) {
 		$the_weekday_date .= $before;
 		$the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
 		$the_weekday_date .= $after;
-		$previousweekday = $currentday;
+		$previousweekday   = $currentday;
 	}
 
 	/**
@@ -2638,16 +2685,17 @@ function wp_footer() {
  * @param array $args Optional arguments.
  */
 function feed_links( $args = array() ) {
-	if ( !current_theme_supports('automatic-feed-links') )
+	if ( ! current_theme_supports( 'automatic-feed-links' ) ) {
 		return;
+	}
 
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
-		'separator'	=> _x('&raquo;', 'feed link'),
+		'separator' => _x( '&raquo;', 'feed link' ),
 		/* translators: 1: blog title, 2: separator (raquo) */
-		'feedtitle'	=> __('%1$s %2$s Feed'),
+		'feedtitle' => __( '%1$s %2$s Feed' ),
 		/* translators: 1: blog title, 2: separator (raquo) */
-		'comstitle'	=> __('%1$s %2$s Comments Feed'),
+		'comstitle' => __( '%1$s %2$s Comments Feed' ),
 	);
 
 	$args = wp_parse_args( $args, $defaults );
@@ -2685,77 +2733,80 @@ function feed_links( $args = array() ) {
 function feed_links_extra( $args = array() ) {
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
-		'separator'   => _x('&raquo;', 'feed link'),
+		'separator'     => _x( '&raquo;', 'feed link' ),
 		/* translators: 1: blog name, 2: separator(raquo), 3: post title */
-		'singletitle' => __('%1$s %2$s %3$s Comments Feed'),
+		'singletitle'   => __( '%1$s %2$s %3$s Comments Feed' ),
 		/* translators: 1: blog name, 2: separator(raquo), 3: category name */
-		'cattitle'    => __('%1$s %2$s %3$s Category Feed'),
+		'cattitle'      => __( '%1$s %2$s %3$s Category Feed' ),
 		/* translators: 1: blog name, 2: separator(raquo), 3: tag name */
-		'tagtitle'    => __('%1$s %2$s %3$s Tag Feed'),
+		'tagtitle'      => __( '%1$s %2$s %3$s Tag Feed' ),
 		/* translators: 1: blog name, 2: separator(raquo), 3: term name, 4: taxonomy singular name */
-		'taxtitle'    => __('%1$s %2$s %3$s %4$s Feed'),
+		'taxtitle'      => __( '%1$s %2$s %3$s %4$s Feed' ),
 		/* translators: 1: blog name, 2: separator(raquo), 3: author name  */
-		'authortitle' => __('%1$s %2$s Posts by %3$s Feed'),
+		'authortitle'   => __( '%1$s %2$s Posts by %3$s Feed' ),
 		/* translators: 1: blog name, 2: separator(raquo), 3: search phrase */
-		'searchtitle' => __('%1$s %2$s Search Results for &#8220;%3$s&#8221; Feed'),
+		'searchtitle'   => __( '%1$s %2$s Search Results for &#8220;%3$s&#8221; Feed' ),
 		/* translators: 1: blog name, 2: separator(raquo), 3: post type name */
-		'posttypetitle' => __('%1$s %2$s %3$s Feed'),
+		'posttypetitle' => __( '%1$s %2$s %3$s Feed' ),
 	);
 
 	$args = wp_parse_args( $args, $defaults );
 
 	if ( is_singular() ) {
-		$id = 0;
+		$id   = 0;
 		$post = get_post( $id );
 
 		if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
-			$title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], the_title_attribute( array( 'echo' => false ) ) );
-			$href = get_post_comments_feed_link( $post->ID );
+			$title = sprintf( $args['singletitle'], get_bloginfo( 'name' ), $args['separator'], the_title_attribute( array( 'echo' => false ) ) );
+			$href  = get_post_comments_feed_link( $post->ID );
 		}
 	} elseif ( is_post_type_archive() ) {
 		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
+		if ( is_array( $post_type ) ) {
 			$post_type = reset( $post_type );
+		}
 
 		$post_type_obj = get_post_type_object( $post_type );
-		$title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
-		$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		$title         = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
+		$href          = get_post_type_archive_feed_link( $post_type_obj->name );
 	} elseif ( is_category() ) {
 		$term = get_queried_object();
 
 		if ( $term ) {
-			$title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_category_feed_link( $term->term_id );
+			$title = sprintf( $args['cattitle'], get_bloginfo( 'name' ), $args['separator'], $term->name );
+			$href  = get_category_feed_link( $term->term_id );
 		}
 	} elseif ( is_tag() ) {
 		$term = get_queried_object();
 
 		if ( $term ) {
-			$title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_tag_feed_link( $term->term_id );
+			$title = sprintf( $args['tagtitle'], get_bloginfo( 'name' ), $args['separator'], $term->name );
+			$href  = get_tag_feed_link( $term->term_id );
 		}
 	} elseif ( is_tax() ) {
- 		$term = get_queried_object();
- 		$tax = get_taxonomy( $term->taxonomy );
- 		$title = sprintf( $args['taxtitle'], get_bloginfo('name'), $args['separator'], $term->name, $tax->labels->singular_name );
- 		$href = get_term_feed_link( $term->term_id, $term->taxonomy );
+		$term  = get_queried_object();
+		$tax   = get_taxonomy( $term->taxonomy );
+		$title = sprintf( $args['taxtitle'], get_bloginfo( 'name' ), $args['separator'], $term->name, $tax->labels->singular_name );
+		$href  = get_term_feed_link( $term->term_id, $term->taxonomy );
 	} elseif ( is_author() ) {
-		$author_id = intval( get_query_var('author') );
+		$author_id = intval( get_query_var( 'author' ) );
 
-		$title = sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta( 'display_name', $author_id ) );
-		$href = get_author_feed_link( $author_id );
+		$title = sprintf( $args['authortitle'], get_bloginfo( 'name' ), $args['separator'], get_the_author_meta( 'display_name', $author_id ) );
+		$href  = get_author_feed_link( $author_id );
 	} elseif ( is_search() ) {
-		$title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
-		$href = get_search_feed_link();
+		$title = sprintf( $args['searchtitle'], get_bloginfo( 'name' ), $args['separator'], get_search_query( false ) );
+		$href  = get_search_feed_link();
 	} elseif ( is_post_type_archive() ) {
-		$title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
+		$title         = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], post_type_archive_title( '', false ) );
 		$post_type_obj = get_queried_object();
-		if ( $post_type_obj )
+		if ( $post_type_obj ) {
 			$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		}
 	}
 
-	if ( isset($title) && isset($href) )
+	if ( isset( $title ) && isset( $href ) ) {
 		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
+	}
 }
 
 /**
@@ -2796,8 +2847,9 @@ function wlwmanifest_link() {
  */
 function noindex() {
 	// If the blog is not public, tell robots to go away.
-	if ( '0' == get_option('blog_public') )
+	if ( '0' == get_option( 'blog_public' ) ) {
 		wp_no_robots();
+	}
 }
 
 /**
@@ -2825,7 +2877,7 @@ function wp_site_icon() {
 	}
 
 	$meta_tags = array();
-	$icon_32 = get_site_icon_url( 32 );
+	$icon_32   = get_site_icon_url( 32 );
 	if ( empty( $icon_32 ) && is_customize_preview() ) {
 		$icon_32 = '/favicon.ico'; // Serve default favicon URL in customizer so element can be updated for preview.
 	}
@@ -2937,7 +2989,7 @@ function wp_resource_hints() {
 				}
 			}
 
-			$atts['rel'] = $relation_type;
+			$atts['rel']  = $relation_type;
 			$atts['href'] = $url;
 
 			$unique_urls[ $url ] = $atts;
@@ -2948,7 +3000,7 @@ function wp_resource_hints() {
 
 			foreach ( $atts as $attr => $value ) {
 				if ( ! is_scalar( $value ) ||
-					( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr )) ) {
+					( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ) ) ) {
 
 					continue;
 				}
@@ -3022,7 +3074,7 @@ function wp_dependencies_unique_hosts() {
 function user_can_richedit() {
 	global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE, $is_edge;
 
-	if ( !isset($wp_rich_edit) ) {
+	if ( ! isset( $wp_rich_edit ) ) {
 		$wp_rich_edit = false;
 
 		if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
@@ -3030,7 +3082,7 @@ function user_can_richedit() {
 				$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
 			} elseif ( $is_IE ) {
 				$wp_rich_edit = ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE ' ) === false );
-			} elseif ( $is_gecko || $is_chrome || $is_edge || ( $is_opera && !wp_is_mobile() ) ) {
+			} elseif ( $is_gecko || $is_chrome || $is_edge || ( $is_opera && ! wp_is_mobile() ) ) {
 				$wp_rich_edit = true;
 			}
 		}
@@ -3059,8 +3111,8 @@ function user_can_richedit() {
 function wp_default_editor() {
 	$r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
 	if ( wp_get_current_user() ) { // look for cookie
-		$ed = get_user_setting('editor', 'tinymce');
-		$r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r;
+		$ed = get_user_setting( 'editor', 'tinymce' );
+		$r  = ( in_array( $ed, array( 'tinymce', 'html', 'test' ) ) ) ? $ed : $r;
 	}
 
 	/**
@@ -3093,9 +3145,10 @@ function wp_default_editor() {
  * @param array  $settings  See _WP_Editors::editor().
  */
 function wp_editor( $content, $editor_id, $settings = array() ) {
-	if ( ! class_exists( '_WP_Editors', false ) )
+	if ( ! class_exists( '_WP_Editors', false ) ) {
 		require( ABSPATH . WPINC . '/class-wp-editor.php' );
-	_WP_Editors::editor($content, $editor_id, $settings);
+	}
+	_WP_Editors::editor( $content, $editor_id, $settings );
 }
 
 /**
@@ -3143,70 +3196,70 @@ function wp_enqueue_code_editor( $args ) {
 
 	$settings = array(
 		'codemirror' => array(
-			'indentUnit' => 4,
-			'indentWithTabs' => true,
-			'inputStyle' => 'contenteditable',
-			'lineNumbers' => true,
-			'lineWrapping' => true,
-			'styleActiveLine' => true,
+			'indentUnit'       => 4,
+			'indentWithTabs'   => true,
+			'inputStyle'       => 'contenteditable',
+			'lineNumbers'      => true,
+			'lineWrapping'     => true,
+			'styleActiveLine'  => true,
 			'continueComments' => true,
-			'extraKeys' => array(
+			'extraKeys'        => array(
 				'Ctrl-Space' => 'autocomplete',
-				'Ctrl-/' => 'toggleComment',
-				'Cmd-/' => 'toggleComment',
-				'Alt-F' => 'findPersistent',
+				'Ctrl-/'     => 'toggleComment',
+				'Cmd-/'      => 'toggleComment',
+				'Alt-F'      => 'findPersistent',
 			),
-			'direction' => 'ltr', // Code is shown in LTR even in RTL languages.
-			'gutters' => array(),
+			'direction'        => 'ltr', // Code is shown in LTR even in RTL languages.
+			'gutters'          => array(),
 		),
-		'csslint' => array(
-			'errors' => true, // Parsing errors.
-			'box-model' => true,
+		'csslint'    => array(
+			'errors'                    => true, // Parsing errors.
+			'box-model'                 => true,
 			'display-property-grouping' => true,
-			'duplicate-properties' => true,
-			'known-properties' => true,
-			'outline-none' => true,
+			'duplicate-properties'      => true,
+			'known-properties'          => true,
+			'outline-none'              => true,
 		),
-		'jshint' => array(
+		'jshint'     => array(
 			// The following are copied from <https://github.com/WordPress/wordpress-develop/blob/4.8.1/.jshintrc>.
-			'boss' => true,
-			'curly' => true,
-			'eqeqeq' => true,
-			'eqnull' => true,
-			'es3' => true,
-			'expr' => true,
-			'immed' => true,
-			'noarg' => true,
-			'nonbsp' => true,
-			'onevar' => true,
+			'boss'     => true,
+			'curly'    => true,
+			'eqeqeq'   => true,
+			'eqnull'   => true,
+			'es3'      => true,
+			'expr'     => true,
+			'immed'    => true,
+			'noarg'    => true,
+			'nonbsp'   => true,
+			'onevar'   => true,
 			'quotmark' => 'single',
 			'trailing' => true,
-			'undef' => true,
-			'unused' => true,
+			'undef'    => true,
+			'unused'   => true,
 
-			'browser' => true,
+			'browser'  => true,
 
-			'globals' => array(
-				'_' => false,
+			'globals'  => array(
+				'_'        => false,
 				'Backbone' => false,
-				'jQuery' => false,
-				'JSON' => false,
-				'wp' => false,
+				'jQuery'   => false,
+				'JSON'     => false,
+				'wp'       => false,
 			),
 		),
-		'htmlhint' => array(
-			'tagname-lowercase' => true,
-			'attr-lowercase' => true,
+		'htmlhint'   => array(
+			'tagname-lowercase'        => true,
+			'attr-lowercase'           => true,
 			'attr-value-double-quotes' => true,
-			'doctype-first' => false,
-			'tag-pair' => true,
-			'spec-char-escape' => true,
-			'id-unique' => true,
-			'src-not-empty' => true,
-			'attr-no-duplication' => true,
-			'alt-require' => true,
+			'doctype-first'            => false,
+			'tag-pair'                 => true,
+			'spec-char-escape'         => true,
+			'id-unique'                => true,
+			'src-not-empty'            => true,
+			'attr-no-duplication'      => true,
+			'alt-require'              => true,
 			'space-tab-mixed-disabled' => 'tab',
-			'attr-unsafe-chars' => true,
+			'attr-unsafe-chars'        => true,
 		),
 	);
 
@@ -3303,107 +3356,135 @@ function wp_enqueue_code_editor( $args ) {
 	}
 
 	if ( 'text/css' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'css',
-			'lint' => true,
-			'autoCloseBrackets' => true,
-			'matchBrackets' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => 'css',
+				'lint'              => true,
+				'autoCloseBrackets' => true,
+				'matchBrackets'     => true,
+			)
+		);
 	} elseif ( 'text/x-scss' === $type || 'text/x-less' === $type || 'text/x-sass' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => $type,
-			'lint' => false,
-			'autoCloseBrackets' => true,
-			'matchBrackets' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => $type,
+				'lint'              => false,
+				'autoCloseBrackets' => true,
+				'matchBrackets'     => true,
+			)
+		);
 	} elseif ( 'text/x-diff' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'diff',
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode' => 'diff',
+			)
+		);
 	} elseif ( 'text/html' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'htmlmixed',
-			'lint' => true,
-			'autoCloseBrackets' => true,
-			'autoCloseTags' => true,
-			'matchTags' => array(
-				'bothTags' => true,
-			),
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => 'htmlmixed',
+				'lint'              => true,
+				'autoCloseBrackets' => true,
+				'autoCloseTags'     => true,
+				'matchTags'         => array(
+					'bothTags' => true,
+				),
+			)
+		);
 
 		if ( ! current_user_can( 'unfiltered_html' ) ) {
 			$settings['htmlhint']['kses'] = wp_kses_allowed_html( 'post' );
 		}
 	} elseif ( 'text/x-gfm' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'gfm',
-			'highlightFormatting' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'                => 'gfm',
+				'highlightFormatting' => true,
+			)
+		);
 	} elseif ( 'application/javascript' === $type || 'text/javascript' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'javascript',
-			'lint' => true,
-			'autoCloseBrackets' => true,
-			'matchBrackets' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => 'javascript',
+				'lint'              => true,
+				'autoCloseBrackets' => true,
+				'matchBrackets'     => true,
+			)
+		);
 	} elseif ( false !== strpos( $type, 'json' ) ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => array(
-				'name' => 'javascript',
-			),
-			'lint' => true,
-			'autoCloseBrackets' => true,
-			'matchBrackets' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => array(
+					'name' => 'javascript',
+				),
+				'lint'              => true,
+				'autoCloseBrackets' => true,
+				'matchBrackets'     => true,
+			)
+		);
 		if ( 'application/ld+json' === $type ) {
 			$settings['codemirror']['mode']['jsonld'] = true;
 		} else {
 			$settings['codemirror']['mode']['json'] = true;
 		}
 	} elseif ( false !== strpos( $type, 'jsx' ) ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'jsx',
-			'autoCloseBrackets' => true,
-			'matchBrackets' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => 'jsx',
+				'autoCloseBrackets' => true,
+				'matchBrackets'     => true,
+			)
+		);
 	} elseif ( 'text/x-markdown' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'markdown',
-			'highlightFormatting' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'                => 'markdown',
+				'highlightFormatting' => true,
+			)
+		);
 	} elseif ( 'text/nginx' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'nginx',
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode' => 'nginx',
+			)
+		);
 	} elseif ( 'application/x-httpd-php' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'php',
-			'autoCloseBrackets' => true,
-			'autoCloseTags' => true,
-			'matchBrackets' => true,
-			'matchTags' => array(
-				'bothTags' => true,
-			),
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => 'php',
+				'autoCloseBrackets' => true,
+				'autoCloseTags'     => true,
+				'matchBrackets'     => true,
+				'matchTags'         => array(
+					'bothTags' => true,
+				),
+			)
+		);
 	} elseif ( 'text/x-sql' === $type || 'text/x-mysql' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'sql',
-			'autoCloseBrackets' => true,
-			'matchBrackets' => true,
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => 'sql',
+				'autoCloseBrackets' => true,
+				'matchBrackets'     => true,
+			)
+		);
 	} elseif ( false !== strpos( $type, 'xml' ) ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'xml',
-			'autoCloseBrackets' => true,
-			'autoCloseTags' => true,
-			'matchTags' => array(
-				'bothTags' => true,
-			),
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode'              => 'xml',
+				'autoCloseBrackets' => true,
+				'autoCloseTags'     => true,
+				'matchTags'         => array(
+					'bothTags' => true,
+				),
+			)
+		);
 	} elseif ( 'text/x-yaml' === $type ) {
-		$settings['codemirror'] = array_merge( $settings['codemirror'], array(
-			'mode' => 'yaml',
-		) );
+		$settings['codemirror'] = array_merge(
+			$settings['codemirror'], array(
+				'mode' => 'yaml',
+			)
+		);
 	} else {
 		$settings['codemirror']['mode'] = $type;
 	}
@@ -3515,7 +3596,7 @@ function wp_enqueue_code_editor( $args ) {
  * @since 2.3.0
  *
  * @param bool $escaped Whether the result is escaped. Default true.
- * 	                    Only use when you are later escaping it. Do not use unescaped.
+ *                      Only use when you are later escaping it. Do not use unescaped.
  * @return string
  */
 function get_search_query( $escaped = true ) {
@@ -3528,8 +3609,9 @@ function get_search_query( $escaped = true ) {
 	 */
 	$query = apply_filters( 'get_search_query', get_query_var( 's' ) );
 
-	if ( $escaped )
+	if ( $escaped ) {
 		$query = esc_attr( $query );
+	}
 	return $query;
 }
 
@@ -3565,8 +3647,9 @@ function the_search_query() {
 function get_language_attributes( $doctype = 'html' ) {
 	$attributes = array();
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() )
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
 		$attributes[] = 'dir="rtl"';
+	}
 
 	if ( $lang = get_bloginfo( 'language' ) ) {
 		if ( get_option( 'html_type' ) == 'text/html' || $doctype == 'html' ) {
@@ -3578,7 +3661,7 @@ function get_language_attributes( $doctype = 'html' ) {
 		}
 	}
 
-	$output = implode(' ', $attributes);
+	$output = implode( ' ', $attributes );
 
 	/**
 	 * Filters the language attributes for display in the html tag.
@@ -3731,7 +3814,7 @@ function paginate_links( $args = '' ) {
 	// Merge additional query vars found in the original URL into 'add_args' array.
 	if ( isset( $url_parts[1] ) ) {
 		// Find the format argument.
-		$format = explode( '?', str_replace( '%_%', $args['format'], $args['base'] ) );
+		$format       = explode( '?', str_replace( '%_%', $args['format'], $args['base'] ) );
 		$format_query = isset( $format[1] ) ? $format[1] : '';
 		wp_parse_str( $format_query, $format_args );
 
@@ -3760,16 +3843,17 @@ function paginate_links( $args = '' ) {
 	if ( $mid_size < 0 ) {
 		$mid_size = 2;
 	}
-	$add_args = $args['add_args'];
-	$r = '';
+	$add_args   = $args['add_args'];
+	$r          = '';
 	$page_links = array();
-	$dots = false;
+	$dots       = false;
 
 	if ( $args['prev_next'] && $current && 1 < $current ) :
 		$link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
 		$link = str_replace( '%#%', $current - 1, $link );
-		if ( $add_args )
+		if ( $add_args ) {
 			$link = add_query_arg( $add_args, $link );
+		}
 		$link .= $args['add_fragment'];
 
 		/**
@@ -3783,47 +3867,49 @@ function paginate_links( $args = '' ) {
 	endif;
 	for ( $n = 1; $n <= $total; $n++ ) :
 		if ( $n == $current ) :
-			$page_links[] = "<span aria-current='" . esc_attr( $args['aria_current'] ) . "' class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
-			$dots = true;
+			$page_links[] = "<span aria-current='" . esc_attr( $args['aria_current'] ) . "' class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . '</span>';
+			$dots         = true;
 		else :
 			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
 				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
 				$link = str_replace( '%#%', $n, $link );
-				if ( $add_args )
+				if ( $add_args ) {
 					$link = add_query_arg( $add_args, $link );
+				}
 				$link .= $args['add_fragment'];
 
 				/** This filter is documented in wp-includes/general-template.php */
-				$page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
-				$dots = true;
+				$page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . '</a>';
+				$dots         = true;
 			elseif ( $dots && ! $args['show_all'] ) :
 				$page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>';
-				$dots = false;
+				$dots         = false;
 			endif;
 		endif;
 	endfor;
 	if ( $args['prev_next'] && $current && $current < $total ) :
 		$link = str_replace( '%_%', $args['format'], $args['base'] );
 		$link = str_replace( '%#%', $current + 1, $link );
-		if ( $add_args )
+		if ( $add_args ) {
 			$link = add_query_arg( $add_args, $link );
+		}
 		$link .= $args['add_fragment'];
 
 		/** This filter is documented in wp-includes/general-template.php */
 		$page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
 	endif;
 	switch ( $args['type'] ) {
-		case 'array' :
+		case 'array':
 			return $page_links;
 
-		case 'list' :
+		case 'list':
 			$r .= "<ul class='page-numbers'>\n\t<li>";
-			$r .= join("</li>\n\t<li>", $page_links);
+			$r .= join( "</li>\n\t<li>", $page_links );
 			$r .= "</li>\n</ul>\n";
 			break;
 
-		default :
-			$r = join("\n", $page_links);
+		default:
+			$r = join( "\n", $page_links );
 			break;
 	}
 	return $r;
@@ -3858,13 +3944,14 @@ function paginate_links( $args = '' ) {
 function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {
 	global $_wp_admin_css_colors;
 
-	if ( !isset($_wp_admin_css_colors) )
+	if ( ! isset( $_wp_admin_css_colors ) ) {
 		$_wp_admin_css_colors = array();
+	}
 
-	$_wp_admin_css_colors[$key] = (object) array(
-		'name' => $name,
-		'url' => $url,
-		'colors' => $colors,
+	$_wp_admin_css_colors[ $key ] = (object) array(
+		'name'        => $name,
+		'url'         => $url,
+		'colors'      => $colors,
 		'icon_colors' => $icons,
 	);
 }
@@ -3875,13 +3962,18 @@ function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = arra
  * @since 3.0.0
  */
 function register_admin_color_schemes() {
-	$suffix = is_rtl() ? '-rtl' : '';
+	$suffix  = is_rtl() ? '-rtl' : '';
 	$suffix .= SCRIPT_DEBUG ? '' : '.min';
 
-	wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
+	wp_admin_css_color(
+		'fresh', _x( 'Default', 'admin color scheme' ),
 		false,
 		array( '#222', '#333', '#0073aa', '#00a0d2' ),
-		array( 'base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff' )
+		array(
+			'base'    => '#82878c',
+			'focus'   => '#00a0d2',
+			'current' => '#fff',
+		)
 	);
 
 	// Other color schemes are not available when running out of src
@@ -3889,46 +3981,81 @@ function register_admin_color_schemes() {
 		return;
 	}
 
-	wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
+	wp_admin_css_color(
+		'light', _x( 'Light', 'admin color scheme' ),
 		admin_url( "css/colors/light/colors$suffix.css" ),
 		array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
-		array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' )
+		array(
+			'base'    => '#999',
+			'focus'   => '#ccc',
+			'current' => '#ccc',
+		)
 	);
 
-	wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ),
+	wp_admin_css_color(
+		'blue', _x( 'Blue', 'admin color scheme' ),
 		admin_url( "css/colors/blue/colors$suffix.css" ),
 		array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
-		array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' )
+		array(
+			'base'    => '#e5f8ff',
+			'focus'   => '#fff',
+			'current' => '#fff',
+		)
 	);
 
-	wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ),
+	wp_admin_css_color(
+		'midnight', _x( 'Midnight', 'admin color scheme' ),
 		admin_url( "css/colors/midnight/colors$suffix.css" ),
 		array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
-		array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
+		array(
+			'base'    => '#f1f2f3',
+			'focus'   => '#fff',
+			'current' => '#fff',
+		)
 	);
 
-	wp_admin_css_color( 'sunrise', _x( 'Sunrise', 'admin color scheme' ),
+	wp_admin_css_color(
+		'sunrise', _x( 'Sunrise', 'admin color scheme' ),
 		admin_url( "css/colors/sunrise/colors$suffix.css" ),
 		array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
-		array( 'base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff' )
+		array(
+			'base'    => '#f3f1f1',
+			'focus'   => '#fff',
+			'current' => '#fff',
+		)
 	);
 
-	wp_admin_css_color( 'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
+	wp_admin_css_color(
+		'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
 		admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
 		array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
-		array( 'base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff' )
+		array(
+			'base'    => '#ece6f6',
+			'focus'   => '#fff',
+			'current' => '#fff',
+		)
 	);
 
-	wp_admin_css_color( 'ocean', _x( 'Ocean', 'admin color scheme' ),
+	wp_admin_css_color(
+		'ocean', _x( 'Ocean', 'admin color scheme' ),
 		admin_url( "css/colors/ocean/colors$suffix.css" ),
 		array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
-		array( 'base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff' )
+		array(
+			'base'    => '#f2fcff',
+			'focus'   => '#fff',
+			'current' => '#fff',
+		)
 	);
 
-	wp_admin_css_color( 'coffee', _x( 'Coffee', 'admin color scheme' ),
+	wp_admin_css_color(
+		'coffee', _x( 'Coffee', 'admin color scheme' ),
 		admin_url( "css/colors/coffee/colors$suffix.css" ),
 		array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
-		array( 'base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff' )
+		array(
+			'base'    => '#f3f2f1',
+			'focus'   => '#fff',
+			'current' => '#fff',
+		)
 	);
 
 }
@@ -3944,12 +4071,12 @@ function register_admin_color_schemes() {
  * @return string
  */
 function wp_admin_css_uri( $file = 'wp-admin' ) {
-	if ( defined('WP_INSTALLING') ) {
+	if ( defined( 'WP_INSTALLING' ) ) {
 		$_file = "./$file.css";
 	} else {
-		$_file = admin_url("$file.css");
+		$_file = admin_url( "$file.css" );
 	}
-	$_file = add_query_arg( 'version', get_bloginfo( 'version' ),  $_file );
+	$_file = add_query_arg( 'version', get_bloginfo( 'version' ), $_file );
 
 	/**
 	 * Filters the URI of a WordPress admin CSS file.
@@ -3979,7 +4106,7 @@ function wp_admin_css_uri( $file = 'wp-admin' ) {
  * @since 2.3.0
  *
  * @param string $file       Optional. Style handle name or file name (without ".css" extension) relative
- * 	                         to wp-admin/. Defaults to 'wp-admin'.
+ *                           to wp-admin/. Defaults to 'wp-admin'.
  * @param bool   $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
  */
 function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
@@ -3987,10 +4114,11 @@ function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
 	$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
 
 	if ( wp_styles()->query( $handle ) ) {
-		if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
+		if ( $force_echo || did_action( 'wp_print_styles' ) ) { // we already printed the style queue. Print this one immediately
 			wp_print_styles( $handle );
-		else // Add to style queue
+		} else { // Add to style queue
 			wp_enqueue_style( $handle );
+		}
 		return;
 	}
 
@@ -4026,8 +4154,9 @@ function add_thickbox() {
 	wp_enqueue_script( 'thickbox' );
 	wp_enqueue_style( 'thickbox' );
 
-	if ( is_network_admin() )
+	if ( is_network_admin() ) {
 		add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
+	}
 }
 
 /**
@@ -4068,7 +4197,7 @@ function the_generator( $type ) {
 	 * @param string $type           The type of generator to output. Accepts 'html',
 	 *                               'xhtml', 'atom', 'rss2', 'rdf', 'comment', 'export'.
 	 */
-	echo apply_filters( 'the_generator', get_the_generator($type), $type ) . "\n";
+	echo apply_filters( 'the_generator', get_the_generator( $type ), $type ) . "\n";
 }
 
 /**
@@ -4087,24 +4216,25 @@ function get_the_generator( $type = '' ) {
 	if ( empty( $type ) ) {
 
 		$current_filter = current_filter();
-		if ( empty( $current_filter ) )
+		if ( empty( $current_filter ) ) {
 			return;
+		}
 
 		switch ( $current_filter ) {
-			case 'rss2_head' :
-			case 'commentsrss2_head' :
+			case 'rss2_head':
+			case 'commentsrss2_head':
 				$type = 'rss2';
 				break;
-			case 'rss_head' :
-			case 'opml_head' :
+			case 'rss_head':
+			case 'opml_head':
 				$type = 'comment';
 				break;
-			case 'rdf_header' :
+			case 'rdf_header':
 				$type = 'rdf';
 				break;
-			case 'atom_head' :
-			case 'comments_atom_head' :
-			case 'app_head' :
+			case 'atom_head':
+			case 'comments_atom_head':
+			case 'app_head':
 				$type = 'atom';
 				break;
 		}
@@ -4130,7 +4260,7 @@ function get_the_generator( $type = '' ) {
 			$gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
 			break;
 		case 'export':
-			$gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
+			$gen = '<!-- generator="WordPress/' . get_bloginfo_rss( 'version' ) . '" created="' . date( 'Y-m-d H:i' ) . '" -->';
 			break;
 	}
 
@@ -4227,13 +4357,15 @@ function readonly( $readonly, $current = true, $echo = true ) {
  * @return string html attribute or empty string
  */
 function __checked_selected_helper( $helper, $current, $echo, $type ) {
-	if ( (string) $helper === (string) $current )
+	if ( (string) $helper === (string) $current ) {
 		$result = " $type='$type'";
-	else
+	} else {
 		$result = '';
+	}
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $result;
+	}
 
 	return $result;
 }
@@ -4249,11 +4381,13 @@ function __checked_selected_helper( $helper, $current, $echo, $type ) {
  * @return array $settings
  */
 function wp_heartbeat_settings( $settings ) {
-	if ( ! is_admin() )
+	if ( ! is_admin() ) {
 		$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+	}
 
-	if ( is_user_logged_in() )
+	if ( is_user_logged_in() ) {
 		$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	}
 
 	return $settings;
 }
diff --git a/wp-includes/http.php b/wp-includes/http.php
index 9fa31d5156..e73f1e686e 100644
--- a/wp-includes/http.php
+++ b/wp-includes/http.php
@@ -45,7 +45,7 @@ function _wp_http_get_object() {
  */
 function wp_safe_remote_request( $url, $args = array() ) {
 	$args['reject_unsafe_urls'] = true;
-	$http = _wp_http_get_object();
+	$http                       = _wp_http_get_object();
 	return $http->request( $url, $args );
 }
 
@@ -66,7 +66,7 @@ function wp_safe_remote_request( $url, $args = array() ) {
  */
 function wp_safe_remote_get( $url, $args = array() ) {
 	$args['reject_unsafe_urls'] = true;
-	$http = _wp_http_get_object();
+	$http                       = _wp_http_get_object();
 	return $http->get( $url, $args );
 }
 
@@ -87,7 +87,7 @@ function wp_safe_remote_get( $url, $args = array() ) {
  */
 function wp_safe_remote_post( $url, $args = array() ) {
 	$args['reject_unsafe_urls'] = true;
-	$http = _wp_http_get_object();
+	$http                       = _wp_http_get_object();
 	return $http->post( $url, $args );
 }
 
@@ -108,7 +108,7 @@ function wp_safe_remote_post( $url, $args = array() ) {
  */
 function wp_safe_remote_head( $url, $args = array() ) {
 	$args['reject_unsafe_urls'] = true;
-	$http = _wp_http_get_object();
+	$http                       = _wp_http_get_object();
 	return $http->head( $url, $args );
 }
 
@@ -148,7 +148,7 @@ function wp_safe_remote_head( $url, $args = array() ) {
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_remote_request($url, $args = array()) {
+function wp_remote_request( $url, $args = array() ) {
 	$http = _wp_http_get_object();
 	return $http->request( $url, $args );
 }
@@ -165,7 +165,7 @@ function wp_remote_request($url, $args = array()) {
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_remote_get($url, $args = array()) {
+function wp_remote_get( $url, $args = array() ) {
 	$http = _wp_http_get_object();
 	return $http->get( $url, $args );
 }
@@ -182,7 +182,7 @@ function wp_remote_get($url, $args = array()) {
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_remote_post($url, $args = array()) {
+function wp_remote_post( $url, $args = array() ) {
 	$http = _wp_http_get_object();
 	return $http->post( $url, $args );
 }
@@ -199,7 +199,7 @@ function wp_remote_post($url, $args = array()) {
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_remote_head($url, $args = array()) {
+function wp_remote_head( $url, $args = array() ) {
 	$http = _wp_http_get_object();
 	return $http->head( $url, $args );
 }
@@ -238,7 +238,7 @@ function wp_remote_retrieve_header( $response, $header ) {
 	}
 
 	if ( isset( $response['headers'][ $header ] ) ) {
-		return $response['headers'][$header];
+		return $response['headers'][ $header ];
 	}
 
 	return '';
@@ -255,8 +255,9 @@ function wp_remote_retrieve_header( $response, $header ) {
  * @return int|string The response code as an integer. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_code( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
+	if ( is_wp_error( $response ) || ! isset( $response['response'] ) || ! is_array( $response['response'] ) ) {
 		return '';
+	}
 
 	return $response['response']['code'];
 }
@@ -272,8 +273,9 @@ function wp_remote_retrieve_response_code( $response ) {
  * @return string The response message. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_message( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
+	if ( is_wp_error( $response ) || ! isset( $response['response'] ) || ! is_array( $response['response'] ) ) {
 		return '';
+	}
 
 	return $response['response']['message'];
 }
@@ -287,8 +289,9 @@ function wp_remote_retrieve_response_message( $response ) {
  * @return string The body of the response. Empty string if no body or incorrect parameter given.
  */
 function wp_remote_retrieve_body( $response ) {
-	if ( is_wp_error($response) || ! isset($response['body']) )
+	if ( is_wp_error( $response ) || ! isset( $response['body'] ) ) {
 		return '';
+	}
 
 	return $response['body'];
 }
@@ -376,7 +379,7 @@ function wp_http_supports( $capabilities = array(), $url = null ) {
 		$capabilities = array_combine( array_values( $capabilities ), array_fill( 0, $count, true ) );
 	}
 
-	if ( $url && !isset( $capabilities['ssl'] ) ) {
+	if ( $url && ! isset( $capabilities['ssl'] ) ) {
 		$scheme = parse_url( $url, PHP_URL_SCHEME );
 		if ( 'https' == $scheme || 'ssl' == $scheme ) {
 			$capabilities['ssl'] = true;
@@ -395,8 +398,9 @@ function wp_http_supports( $capabilities = array(), $url = null ) {
  */
 function get_http_origin() {
 	$origin = '';
-	if ( ! empty ( $_SERVER[ 'HTTP_ORIGIN' ] ) )
-		$origin = $_SERVER[ 'HTTP_ORIGIN' ];
+	if ( ! empty( $_SERVER['HTTP_ORIGIN'] ) ) {
+		$origin = $_SERVER['HTTP_ORIGIN'];
+	}
 
 	/**
 	 * Change the origin of an HTTP request.
@@ -417,15 +421,17 @@ function get_http_origin() {
  */
 function get_allowed_http_origins() {
 	$admin_origin = parse_url( admin_url() );
-	$home_origin = parse_url( home_url() );
+	$home_origin  = parse_url( home_url() );
 
 	// @todo preserve port?
-	$allowed_origins = array_unique( array(
-		'http://' . $admin_origin[ 'host' ],
-		'https://' . $admin_origin[ 'host' ],
-		'http://' . $home_origin[ 'host' ],
-		'https://' . $home_origin[ 'host' ],
-	) );
+	$allowed_origins = array_unique(
+		array(
+			'http://' . $admin_origin['host'],
+			'https://' . $admin_origin['host'],
+			'http://' . $home_origin['host'],
+			'https://' . $home_origin['host'],
+		)
+	);
 
 	/**
 	 * Change the origin types allowed for HTTP requests.
@@ -440,7 +446,7 @@ function get_allowed_http_origins() {
 	 *     @type string Secure URL for home origin.
 	 * }
 	 */
-	return apply_filters( 'allowed_http_origins' , $allowed_origins );
+	return apply_filters( 'allowed_http_origins', $allowed_origins );
 }
 
 /**
@@ -454,11 +460,13 @@ function get_allowed_http_origins() {
 function is_allowed_http_origin( $origin = null ) {
 	$origin_arg = $origin;
 
-	if ( null === $origin )
+	if ( null === $origin ) {
 		$origin = get_http_origin();
+	}
 
-	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) )
+	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) ) {
 		$origin = '';
+	}
 
 	/**
 	 * Change the allowed HTTP origin result.
@@ -488,10 +496,11 @@ function send_origin_headers() {
 	$origin = get_http_origin();
 
 	if ( is_allowed_http_origin( $origin ) ) {
-		@header( 'Access-Control-Allow-Origin: ' .  $origin );
+		@header( 'Access-Control-Allow-Origin: ' . $origin );
 		@header( 'Access-Control-Allow-Credentials: true' );
-		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] )
+		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] ) {
 			exit;
+		}
 		return $origin;
 	}
 
@@ -513,19 +522,23 @@ function send_origin_headers() {
  */
 function wp_http_validate_url( $url ) {
 	$original_url = $url;
-	$url = wp_kses_bad_protocol( $url, array( 'http', 'https' ) );
-	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) )
+	$url          = wp_kses_bad_protocol( $url, array( 'http', 'https' ) );
+	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) ) {
 		return false;
+	}
 
 	$parsed_url = @parse_url( $url );
-	if ( ! $parsed_url || empty( $parsed_url['host'] ) )
+	if ( ! $parsed_url || empty( $parsed_url['host'] ) ) {
 		return false;
+	}
 
-	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) )
+	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) ) {
 		return false;
+	}
 
-	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) )
+	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) ) {
 		return false;
+	}
 
 	$parsed_home = @parse_url( get_option( 'home' ) );
 
@@ -541,8 +554,9 @@ function wp_http_validate_url( $url ) {
 			$ip = $host;
 		} else {
 			$ip = gethostbyname( $host );
-			if ( $ip === $host ) // Error condition for gethostbyname()
+			if ( $ip === $host ) { // Error condition for gethostbyname()
 				$ip = false;
+			}
 		}
 		if ( $ip ) {
 			$parts = array_map( 'intval', explode( '.', $ip ) );
@@ -562,21 +576,25 @@ function wp_http_validate_url( $url ) {
 				 * @param string $host IP of the requested host.
 				 * @param string $url  URL of the requested host.
 				 */
-				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) )
+				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) ) {
 					return false;
+				}
 			}
 		}
 	}
 
-	if ( empty( $parsed_url['port'] ) )
+	if ( empty( $parsed_url['port'] ) ) {
 		return $url;
+	}
 
 	$port = $parsed_url['port'];
-	if ( 80 === $port || 443 === $port || 8080 === $port )
+	if ( 80 === $port || 443 === $port || 8080 === $port ) {
 		return $url;
+	}
 
-	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port )
+	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port ) {
 		return $url;
+	}
 
 	return false;
 }
@@ -593,8 +611,9 @@ function wp_http_validate_url( $url ) {
  * @return bool
  */
 function allowed_http_request_hosts( $is_external, $host ) {
-	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) )
+	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) ) {
 		$is_external = true;
+	}
 	return $is_external;
 }
 
@@ -615,12 +634,15 @@ function allowed_http_request_hosts( $is_external, $host ) {
 function ms_allowed_http_request_hosts( $is_external, $host ) {
 	global $wpdb;
 	static $queried = array();
-	if ( $is_external )
+	if ( $is_external ) {
 		return $is_external;
-	if ( $host === get_network()->domain )
+	}
+	if ( $host === get_network()->domain ) {
 		return true;
-	if ( isset( $queried[ $host ] ) )
+	}
+	if ( isset( $queried[ $host ] ) ) {
 		return $queried[ $host ];
+	}
 	$queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
 	return $queried[ $host ];
 }
@@ -656,15 +678,15 @@ function ms_allowed_http_request_hosts( $is_external, $host ) {
  */
 function wp_parse_url( $url, $component = -1 ) {
 	$to_unset = array();
-	$url = strval( $url );
+	$url      = strval( $url );
 
 	if ( '//' === substr( $url, 0, 2 ) ) {
 		$to_unset[] = 'scheme';
-		$url = 'placeholder:' . $url;
+		$url        = 'placeholder:' . $url;
 	} elseif ( '/' === substr( $url, 0, 1 ) ) {
 		$to_unset[] = 'scheme';
 		$to_unset[] = 'host';
-		$url = 'placeholder://placeholder' . $url;
+		$url        = 'placeholder://placeholder' . $url;
 	}
 
 	$parts = @parse_url( $url );
diff --git a/wp-includes/js/tinymce/wp-tinymce.php b/wp-includes/js/tinymce/wp-tinymce.php
index ea58e682d0..12d1c1c450 100644
--- a/wp-includes/js/tinymce/wp-tinymce.php
+++ b/wp-includes/js/tinymce/wp-tinymce.php
@@ -4,32 +4,34 @@
  *
  * Set this to error_reporting( -1 ) for debugging.
  */
-error_reporting(0);
+error_reporting( 0 );
 
-$basepath = dirname(__FILE__);
+$basepath = dirname( __FILE__ );
 
-function get_file($path) {
+function get_file( $path ) {
 
-	if ( function_exists('realpath') )
-		$path = realpath($path);
+	if ( function_exists( 'realpath' ) ) {
+		$path = realpath( $path );
+	}
 
-	if ( ! $path || ! @is_file($path) )
+	if ( ! $path || ! @is_file( $path ) ) {
 		return false;
+	}
 
-	return @file_get_contents($path);
+	return @file_get_contents( $path );
 }
 
 $expires_offset = 31536000; // 1 year
 
-header('Content-Type: application/javascript; charset=UTF-8');
-header('Vary: Accept-Encoding'); // Handle proxies
-header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
-header("Cache-Control: public, max-age=$expires_offset");
+header( 'Content-Type: application/javascript; charset=UTF-8' );
+header( 'Vary: Accept-Encoding' ); // Handle proxies
+header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + $expires_offset ) . ' GMT' );
+header( "Cache-Control: public, max-age=$expires_offset" );
 
-if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+if ( isset( $_GET['c'] ) && 1 == $_GET['c'] && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
+	&& false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ( $file = get_file( $basepath . '/wp-tinymce.js.gz' ) ) ) {
 
-	header('Content-Encoding: gzip');
+	header( 'Content-Encoding: gzip' );
 	echo $file;
 } else {
 	// Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index f5d0ef5ef9..bf963abe67 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -28,7 +28,6 @@
  *
  * @package External
  * @subpackage KSES
- *
  */
 
 /**
@@ -42,8 +41,9 @@
  *
  * @since 1.2.0
  */
-if ( ! defined( 'CUSTOM_TAGS' ) )
+if ( ! defined( 'CUSTOM_TAGS' ) ) {
 	define( 'CUSTOM_TAGS', false );
+}
 
 // Ensure that these variables are added to the global namespace
 // (e.g. if using namespaces / autoload in the current PHP environment).
@@ -59,359 +59,359 @@ if ( ! CUSTOM_TAGS ) {
 	 * @since 2.0.0
 	 */
 	$allowedposttags = array(
-		'address' => array(),
-		'a' => array(
-			'href' => true,
-			'rel' => true,
-			'rev' => true,
-			'name' => true,
+		'address'    => array(),
+		'a'          => array(
+			'href'   => true,
+			'rel'    => true,
+			'rev'    => true,
+			'name'   => true,
 			'target' => true,
 		),
-		'abbr' => array(),
-		'acronym' => array(),
-		'area' => array(
-			'alt' => true,
+		'abbr'       => array(),
+		'acronym'    => array(),
+		'area'       => array(
+			'alt'    => true,
 			'coords' => true,
-			'href' => true,
+			'href'   => true,
 			'nohref' => true,
-			'shape' => true,
+			'shape'  => true,
 			'target' => true,
 		),
-		'article' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'article'    => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'aside' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'aside'      => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'audio' => array(
+		'audio'      => array(
 			'autoplay' => true,
 			'controls' => true,
-			'loop' => true,
-			'muted' => true,
-			'preload' => true,
-			'src' => true,
+			'loop'     => true,
+			'muted'    => true,
+			'preload'  => true,
+			'src'      => true,
 		),
-		'b' => array(),
-		'bdo' => array(
+		'b'          => array(),
+		'bdo'        => array(
 			'dir' => true,
 		),
-		'big' => array(),
+		'big'        => array(),
 		'blockquote' => array(
-			'cite' => true,
-			'lang' => true,
+			'cite'     => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'br' => array(),
-		'button' => array(
+		'br'         => array(),
+		'button'     => array(
 			'disabled' => true,
-			'name' => true,
-			'type' => true,
-			'value' => true,
+			'name'     => true,
+			'type'     => true,
+			'value'    => true,
 		),
-		'caption' => array(
+		'caption'    => array(
 			'align' => true,
 		),
-		'cite' => array(
-			'dir' => true,
+		'cite'       => array(
+			'dir'  => true,
 			'lang' => true,
 		),
-		'code' => array(),
-		'col' => array(
-			'align' => true,
-			'char' => true,
+		'code'       => array(),
+		'col'        => array(
+			'align'   => true,
+			'char'    => true,
 			'charoff' => true,
-			'span' => true,
-			'dir' => true,
-			'valign' => true,
-			'width' => true,
+			'span'    => true,
+			'dir'     => true,
+			'valign'  => true,
+			'width'   => true,
 		),
-		'colgroup' => array(
-			'align' => true,
-			'char' => true,
+		'colgroup'   => array(
+			'align'   => true,
+			'char'    => true,
 			'charoff' => true,
-			'span' => true,
-			'valign' => true,
-			'width' => true,
+			'span'    => true,
+			'valign'  => true,
+			'width'   => true,
 		),
-		'del' => array(
+		'del'        => array(
 			'datetime' => true,
 		),
-		'dd' => array(),
-		'dfn' => array(),
-		'details' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
-			'open' => true,
+		'dd'         => array(),
+		'dfn'        => array(),
+		'details'    => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
+			'open'     => true,
 			'xml:lang' => true,
 		),
-		'div' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'div'        => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'dl' => array(),
-		'dt' => array(),
-		'em' => array(),
-		'fieldset' => array(),
-		'figure' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'dl'         => array(),
+		'dt'         => array(),
+		'em'         => array(),
+		'fieldset'   => array(),
+		'figure'     => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
 		'figcaption' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'font' => array(
+		'font'       => array(
 			'color' => true,
-			'face' => true,
-			'size' => true,
+			'face'  => true,
+			'size'  => true,
 		),
-		'footer' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'footer'     => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'form' => array(
-			'action' => true,
-			'accept' => true,
+		'form'       => array(
+			'action'         => true,
+			'accept'         => true,
 			'accept-charset' => true,
-			'enctype' => true,
-			'method' => true,
-			'name' => true,
-			'target' => true,
+			'enctype'        => true,
+			'method'         => true,
+			'name'           => true,
+			'target'         => true,
 		),
-		'h1' => array(
+		'h1'         => array(
 			'align' => true,
 		),
-		'h2' => array(
+		'h2'         => array(
 			'align' => true,
 		),
-		'h3' => array(
+		'h3'         => array(
 			'align' => true,
 		),
-		'h4' => array(
+		'h4'         => array(
 			'align' => true,
 		),
-		'h5' => array(
+		'h5'         => array(
 			'align' => true,
 		),
-		'h6' => array(
+		'h6'         => array(
 			'align' => true,
 		),
-		'header' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'header'     => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'hgroup' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'hgroup'     => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'hr' => array(
-			'align' => true,
+		'hr'         => array(
+			'align'   => true,
 			'noshade' => true,
-			'size' => true,
-			'width' => true,
+			'size'    => true,
+			'width'   => true,
 		),
-		'i' => array(),
-		'img' => array(
-			'alt' => true,
-			'align' => true,
-			'border' => true,
-			'height' => true,
-			'hspace' => true,
+		'i'          => array(),
+		'img'        => array(
+			'alt'      => true,
+			'align'    => true,
+			'border'   => true,
+			'height'   => true,
+			'hspace'   => true,
 			'longdesc' => true,
-			'vspace' => true,
-			'src' => true,
-			'usemap' => true,
-			'width' => true,
+			'vspace'   => true,
+			'src'      => true,
+			'usemap'   => true,
+			'width'    => true,
 		),
-		'ins' => array(
+		'ins'        => array(
 			'datetime' => true,
-			'cite' => true,
+			'cite'     => true,
 		),
-		'kbd' => array(),
-		'label' => array(
+		'kbd'        => array(),
+		'label'      => array(
 			'for' => true,
 		),
-		'legend' => array(
+		'legend'     => array(
 			'align' => true,
 		),
-		'li' => array(
+		'li'         => array(
 			'align' => true,
 			'value' => true,
 		),
-		'map' => array(
+		'map'        => array(
 			'name' => true,
 		),
-		'mark' => array(),
-		'menu' => array(
+		'mark'       => array(),
+		'menu'       => array(
 			'type' => true,
 		),
-		'nav' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'nav'        => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'p' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'p'          => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'pre' => array(
+		'pre'        => array(
 			'width' => true,
 		),
-		'q' => array(
+		'q'          => array(
 			'cite' => true,
 		),
-		's' => array(),
-		'samp' => array(),
-		'span' => array(
-			'dir' => true,
-			'align' => true,
-			'lang' => true,
+		's'          => array(),
+		'samp'       => array(),
+		'span'       => array(
+			'dir'      => true,
+			'align'    => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'section' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'section'    => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'small' => array(),
-		'strike' => array(),
-		'strong' => array(),
-		'sub' => array(),
-		'summary' => array(
-			'align' => true,
-			'dir' => true,
-			'lang' => true,
+		'small'      => array(),
+		'strike'     => array(),
+		'strong'     => array(),
+		'sub'        => array(),
+		'summary'    => array(
+			'align'    => true,
+			'dir'      => true,
+			'lang'     => true,
 			'xml:lang' => true,
 		),
-		'sup' => array(),
-		'table' => array(
-			'align' => true,
-			'bgcolor' => true,
-			'border' => true,
+		'sup'        => array(),
+		'table'      => array(
+			'align'       => true,
+			'bgcolor'     => true,
+			'border'      => true,
 			'cellpadding' => true,
 			'cellspacing' => true,
-			'dir' => true,
-			'rules' => true,
-			'summary' => true,
-			'width' => true,
+			'dir'         => true,
+			'rules'       => true,
+			'summary'     => true,
+			'width'       => true,
 		),
-		'tbody' => array(
-			'align' => true,
-			'char' => true,
+		'tbody'      => array(
+			'align'   => true,
+			'char'    => true,
 			'charoff' => true,
-			'valign' => true,
+			'valign'  => true,
 		),
-		'td' => array(
-			'abbr' => true,
-			'align' => true,
-			'axis' => true,
+		'td'         => array(
+			'abbr'    => true,
+			'align'   => true,
+			'axis'    => true,
 			'bgcolor' => true,
-			'char' => true,
+			'char'    => true,
 			'charoff' => true,
 			'colspan' => true,
-			'dir' => true,
+			'dir'     => true,
 			'headers' => true,
-			'height' => true,
-			'nowrap' => true,
+			'height'  => true,
+			'nowrap'  => true,
 			'rowspan' => true,
-			'scope' => true,
-			'valign' => true,
-			'width' => true,
+			'scope'   => true,
+			'valign'  => true,
+			'width'   => true,
 		),
-		'textarea' => array(
-			'cols' => true,
-			'rows' => true,
+		'textarea'   => array(
+			'cols'     => true,
+			'rows'     => true,
 			'disabled' => true,
-			'name' => true,
+			'name'     => true,
 			'readonly' => true,
 		),
-		'tfoot' => array(
-			'align' => true,
-			'char' => true,
+		'tfoot'      => array(
+			'align'   => true,
+			'char'    => true,
 			'charoff' => true,
-			'valign' => true,
+			'valign'  => true,
 		),
-		'th' => array(
-			'abbr' => true,
-			'align' => true,
-			'axis' => true,
+		'th'         => array(
+			'abbr'    => true,
+			'align'   => true,
+			'axis'    => true,
 			'bgcolor' => true,
-			'char' => true,
+			'char'    => true,
 			'charoff' => true,
 			'colspan' => true,
 			'headers' => true,
-			'height' => true,
-			'nowrap' => true,
+			'height'  => true,
+			'nowrap'  => true,
 			'rowspan' => true,
-			'scope' => true,
-			'valign' => true,
-			'width' => true,
+			'scope'   => true,
+			'valign'  => true,
+			'width'   => true,
 		),
-		'thead' => array(
-			'align' => true,
-			'char' => true,
+		'thead'      => array(
+			'align'   => true,
+			'char'    => true,
 			'charoff' => true,
-			'valign' => true,
+			'valign'  => true,
 		),
-		'title' => array(),
-		'tr' => array(
-			'align' => true,
+		'title'      => array(),
+		'tr'         => array(
+			'align'   => true,
 			'bgcolor' => true,
-			'char' => true,
+			'char'    => true,
 			'charoff' => true,
-			'valign' => true,
+			'valign'  => true,
 		),
-		'track' => array(
+		'track'      => array(
 			'default' => true,
-			'kind' => true,
-			'label' => true,
-			'src' => true,
+			'kind'    => true,
+			'label'   => true,
+			'src'     => true,
 			'srclang' => true,
 		),
-		'tt' => array(),
-		'u' => array(),
-		'ul' => array(
+		'tt'         => array(),
+		'u'          => array(),
+		'ul'         => array(
 			'type' => true,
 		),
-		'ol' => array(
-			'start' => true,
-			'type' => true,
+		'ol'         => array(
+			'start'    => true,
+			'type'     => true,
 			'reversed' => true,
 		),
-		'var' => array(),
-		'video' => array(
+		'var'        => array(),
+		'video'      => array(
 			'autoplay' => true,
 			'controls' => true,
-			'height' => true,
-			'loop' => true,
-			'muted' => true,
-			'poster' => true,
-			'preload' => true,
-			'src' => true,
-			'width' => true,
+			'height'   => true,
+			'loop'     => true,
+			'muted'    => true,
+			'poster'   => true,
+			'preload'  => true,
+			'src'      => true,
+			'width'    => true,
 		),
 	);
 
@@ -422,84 +422,294 @@ if ( ! CUSTOM_TAGS ) {
 	 * @since 1.0.0
 	 */
 	$allowedtags = array(
-		'a' => array(
-			'href' => true,
+		'a'          => array(
+			'href'  => true,
 			'title' => true,
 		),
-		'abbr' => array(
+		'abbr'       => array(
 			'title' => true,
 		),
-		'acronym' => array(
+		'acronym'    => array(
 			'title' => true,
 		),
-		'b' => array(),
+		'b'          => array(),
 		'blockquote' => array(
 			'cite' => true,
 		),
-		'cite' => array(),
-		'code' => array(),
-		'del' => array(
+		'cite'       => array(),
+		'code'       => array(),
+		'del'        => array(
 			'datetime' => true,
 		),
-		'em' => array(),
-		'i' => array(),
-		'q' => array(
+		'em'         => array(),
+		'i'          => array(),
+		'q'          => array(
 			'cite' => true,
 		),
-		's' => array(),
-		'strike' => array(),
-		'strong' => array(),
+		's'          => array(),
+		'strike'     => array(),
+		'strong'     => array(),
 	);
 
 	$allowedentitynames = array(
-		'nbsp',    'iexcl',  'cent',    'pound',  'curren', 'yen',
-		'brvbar',  'sect',   'uml',     'copy',   'ordf',   'laquo',
-		'not',     'shy',    'reg',     'macr',   'deg',    'plusmn',
-		'acute',   'micro',  'para',    'middot', 'cedil',  'ordm',
-		'raquo',   'iquest', 'Agrave',  'Aacute', 'Acirc',  'Atilde',
-		'Auml',    'Aring',  'AElig',   'Ccedil', 'Egrave', 'Eacute',
-		'Ecirc',   'Euml',   'Igrave',  'Iacute', 'Icirc',  'Iuml',
-		'ETH',     'Ntilde', 'Ograve',  'Oacute', 'Ocirc',  'Otilde',
-		'Ouml',    'times',  'Oslash',  'Ugrave', 'Uacute', 'Ucirc',
-		'Uuml',    'Yacute', 'THORN',   'szlig',  'agrave', 'aacute',
-		'acirc',   'atilde', 'auml',    'aring',  'aelig',  'ccedil',
-		'egrave',  'eacute', 'ecirc',   'euml',   'igrave', 'iacute',
-		'icirc',   'iuml',   'eth',     'ntilde', 'ograve', 'oacute',
-		'ocirc',   'otilde', 'ouml',    'divide', 'oslash', 'ugrave',
-		'uacute',  'ucirc',  'uuml',    'yacute', 'thorn',  'yuml',
-		'quot',    'amp',    'lt',      'gt',     'apos',   'OElig',
-		'oelig',   'Scaron', 'scaron',  'Yuml',   'circ',   'tilde',
-		'ensp',    'emsp',   'thinsp',  'zwnj',   'zwj',    'lrm',
-		'rlm',     'ndash',  'mdash',   'lsquo',  'rsquo',  'sbquo',
-		'ldquo',   'rdquo',  'bdquo',   'dagger', 'Dagger', 'permil',
-		'lsaquo',  'rsaquo', 'euro',    'fnof',   'Alpha',  'Beta',
-		'Gamma',   'Delta',  'Epsilon', 'Zeta',   'Eta',    'Theta',
-		'Iota',    'Kappa',  'Lambda',  'Mu',     'Nu',     'Xi',
-		'Omicron', 'Pi',     'Rho',     'Sigma',  'Tau',    'Upsilon',
-		'Phi',     'Chi',    'Psi',     'Omega',  'alpha',  'beta',
-		'gamma',   'delta',  'epsilon', 'zeta',   'eta',    'theta',
-		'iota',    'kappa',  'lambda',  'mu',     'nu',     'xi',
-		'omicron', 'pi',     'rho',     'sigmaf', 'sigma',  'tau',
-		'upsilon', 'phi',    'chi',     'psi',    'omega',  'thetasym',
-		'upsih',   'piv',    'bull',    'hellip', 'prime',  'Prime',
-		'oline',   'frasl',  'weierp',  'image',  'real',   'trade',
-		'alefsym', 'larr',   'uarr',    'rarr',   'darr',   'harr',
-		'crarr',   'lArr',   'uArr',    'rArr',   'dArr',   'hArr',
-		'forall',  'part',   'exist',   'empty',  'nabla',  'isin',
-		'notin',   'ni',     'prod',    'sum',    'minus',  'lowast',
-		'radic',   'prop',   'infin',   'ang',    'and',    'or',
-		'cap',     'cup',    'int',     'sim',    'cong',   'asymp',
-		'ne',      'equiv',  'le',      'ge',     'sub',    'sup',
-		'nsub',    'sube',   'supe',    'oplus',  'otimes', 'perp',
-		'sdot',    'lceil',  'rceil',   'lfloor', 'rfloor', 'lang',
-		'rang',    'loz',    'spades',  'clubs',  'hearts', 'diams',
-		'sup1',    'sup2',   'sup3',    'frac14', 'frac12', 'frac34',
+		'nbsp',
+		'iexcl',
+		'cent',
+		'pound',
+		'curren',
+		'yen',
+		'brvbar',
+		'sect',
+		'uml',
+		'copy',
+		'ordf',
+		'laquo',
+		'not',
+		'shy',
+		'reg',
+		'macr',
+		'deg',
+		'plusmn',
+		'acute',
+		'micro',
+		'para',
+		'middot',
+		'cedil',
+		'ordm',
+		'raquo',
+		'iquest',
+		'Agrave',
+		'Aacute',
+		'Acirc',
+		'Atilde',
+		'Auml',
+		'Aring',
+		'AElig',
+		'Ccedil',
+		'Egrave',
+		'Eacute',
+		'Ecirc',
+		'Euml',
+		'Igrave',
+		'Iacute',
+		'Icirc',
+		'Iuml',
+		'ETH',
+		'Ntilde',
+		'Ograve',
+		'Oacute',
+		'Ocirc',
+		'Otilde',
+		'Ouml',
+		'times',
+		'Oslash',
+		'Ugrave',
+		'Uacute',
+		'Ucirc',
+		'Uuml',
+		'Yacute',
+		'THORN',
+		'szlig',
+		'agrave',
+		'aacute',
+		'acirc',
+		'atilde',
+		'auml',
+		'aring',
+		'aelig',
+		'ccedil',
+		'egrave',
+		'eacute',
+		'ecirc',
+		'euml',
+		'igrave',
+		'iacute',
+		'icirc',
+		'iuml',
+		'eth',
+		'ntilde',
+		'ograve',
+		'oacute',
+		'ocirc',
+		'otilde',
+		'ouml',
+		'divide',
+		'oslash',
+		'ugrave',
+		'uacute',
+		'ucirc',
+		'uuml',
+		'yacute',
+		'thorn',
+		'yuml',
+		'quot',
+		'amp',
+		'lt',
+		'gt',
+		'apos',
+		'OElig',
+		'oelig',
+		'Scaron',
+		'scaron',
+		'Yuml',
+		'circ',
+		'tilde',
+		'ensp',
+		'emsp',
+		'thinsp',
+		'zwnj',
+		'zwj',
+		'lrm',
+		'rlm',
+		'ndash',
+		'mdash',
+		'lsquo',
+		'rsquo',
+		'sbquo',
+		'ldquo',
+		'rdquo',
+		'bdquo',
+		'dagger',
+		'Dagger',
+		'permil',
+		'lsaquo',
+		'rsaquo',
+		'euro',
+		'fnof',
+		'Alpha',
+		'Beta',
+		'Gamma',
+		'Delta',
+		'Epsilon',
+		'Zeta',
+		'Eta',
+		'Theta',
+		'Iota',
+		'Kappa',
+		'Lambda',
+		'Mu',
+		'Nu',
+		'Xi',
+		'Omicron',
+		'Pi',
+		'Rho',
+		'Sigma',
+		'Tau',
+		'Upsilon',
+		'Phi',
+		'Chi',
+		'Psi',
+		'Omega',
+		'alpha',
+		'beta',
+		'gamma',
+		'delta',
+		'epsilon',
+		'zeta',
+		'eta',
+		'theta',
+		'iota',
+		'kappa',
+		'lambda',
+		'mu',
+		'nu',
+		'xi',
+		'omicron',
+		'pi',
+		'rho',
+		'sigmaf',
+		'sigma',
+		'tau',
+		'upsilon',
+		'phi',
+		'chi',
+		'psi',
+		'omega',
+		'thetasym',
+		'upsih',
+		'piv',
+		'bull',
+		'hellip',
+		'prime',
+		'Prime',
+		'oline',
+		'frasl',
+		'weierp',
+		'image',
+		'real',
+		'trade',
+		'alefsym',
+		'larr',
+		'uarr',
+		'rarr',
+		'darr',
+		'harr',
+		'crarr',
+		'lArr',
+		'uArr',
+		'rArr',
+		'dArr',
+		'hArr',
+		'forall',
+		'part',
+		'exist',
+		'empty',
+		'nabla',
+		'isin',
+		'notin',
+		'ni',
+		'prod',
+		'sum',
+		'minus',
+		'lowast',
+		'radic',
+		'prop',
+		'infin',
+		'ang',
+		'and',
+		'or',
+		'cap',
+		'cup',
+		'int',
+		'sim',
+		'cong',
+		'asymp',
+		'ne',
+		'equiv',
+		'le',
+		'ge',
+		'sub',
+		'sup',
+		'nsub',
+		'sube',
+		'supe',
+		'oplus',
+		'otimes',
+		'perp',
+		'sdot',
+		'lceil',
+		'rceil',
+		'lfloor',
+		'rfloor',
+		'lang',
+		'rang',
+		'loz',
+		'spades',
+		'clubs',
+		'hearts',
+		'diams',
+		'sup1',
+		'sup2',
+		'sup3',
+		'frac14',
+		'frac12',
+		'frac34',
 		'there4',
 	);
 
 	$allowedposttags = array_map( '_wp_add_global_attributes', $allowedposttags );
 } else {
-	$allowedtags = wp_kses_array_lc( $allowedtags );
+	$allowedtags     = wp_kses_array_lc( $allowedtags );
 	$allowedposttags = wp_kses_array_lc( $allowedposttags );
 }
 
@@ -524,12 +734,13 @@ if ( ! CUSTOM_TAGS ) {
  * @return string Filtered content with only allowed HTML elements
  */
 function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
-	if ( empty( $allowed_protocols ) )
+	if ( empty( $allowed_protocols ) ) {
 		$allowed_protocols = wp_allowed_protocols();
+	}
 	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
-	$string = wp_kses_normalize_entities($string);
-	$string = wp_kses_hook($string, $allowed_html, $allowed_protocols); // WP changed the order of these funcs and added args to wp_kses_hook
-	return wp_kses_split($string, $allowed_html, $allowed_protocols);
+	$string = wp_kses_normalize_entities( $string );
+	$string = wp_kses_hook( $string, $allowed_html, $allowed_protocols ); // WP changed the order of these funcs and added args to wp_kses_hook
+	return wp_kses_split( $string, $allowed_html, $allowed_protocols );
 }
 
 /**
@@ -545,26 +756,26 @@ function wp_kses( $string, $allowed_html, $allowed_protocols = array() ) {
  * @return string Filtered attribute.
  */
 function wp_kses_one_attr( $string, $element ) {
-	$uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action');
-	$allowed_html = wp_kses_allowed_html( 'post' );
+	$uris              = array( 'xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action' );
+	$allowed_html      = wp_kses_allowed_html( 'post' );
 	$allowed_protocols = wp_allowed_protocols();
-	$string = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
-	
+	$string            = wp_kses_no_null( $string, array( 'slash_zero' => 'keep' ) );
+
 	// Preserve leading and trailing whitespace.
 	$matches = array();
-	preg_match('/^\s*/', $string, $matches);
+	preg_match( '/^\s*/', $string, $matches );
 	$lead = $matches[0];
-	preg_match('/\s*$/', $string, $matches);
+	preg_match( '/\s*$/', $string, $matches );
 	$trail = $matches[0];
 	if ( empty( $trail ) ) {
 		$string = substr( $string, strlen( $lead ) );
 	} else {
 		$string = substr( $string, strlen( $lead ), -strlen( $trail ) );
 	}
-	
+
 	// Parse attribute name and value from input.
 	$split = preg_split( '/\s*=\s*/', $string, 2 );
-	$name = $split[0];
+	$name  = $split[0];
 	if ( count( $split ) == 2 ) {
 		$value = $split[1];
 
@@ -593,12 +804,12 @@ function wp_kses_one_attr( $string, $element ) {
 		}
 
 		$string = "$name=$quote$value$quote";
-		$vless = 'n';
+		$vless  = 'n';
 	} else {
 		$value = '';
 		$vless = 'y';
 	}
-	
+
 	// Sanitize attribute by name.
 	wp_kses_attr_check( $name, $value, $string, $vless, $element, $allowed_html );
 
@@ -642,7 +853,7 @@ function wp_kses_allowed_html( $context = '' ) {
 
 		case 'user_description':
 		case 'pre_user_description':
-			$tags = $allowedtags;
+			$tags             = $allowedtags;
 			$tags['a']['rel'] = true;
 			/** This filter is documented in wp-includes/kses.php */
 			return apply_filters( 'wp_kses_allowed_html', $tags, $context );
@@ -653,7 +864,7 @@ function wp_kses_allowed_html( $context = '' ) {
 
 		case 'entities':
 			/** This filter is documented in wp-includes/kses.php */
-			return apply_filters( 'wp_kses_allowed_html', $allowedentitynames, $context);
+			return apply_filters( 'wp_kses_allowed_html', $allowedentitynames, $context );
 
 		case 'data':
 		default:
@@ -716,7 +927,7 @@ function wp_kses_version() {
  */
 function wp_kses_split( $string, $allowed_html, $allowed_protocols ) {
 	global $pass_allowed_html, $pass_allowed_protocols;
-	$pass_allowed_html = $allowed_html;
+	$pass_allowed_html      = $allowed_html;
 	$pass_allowed_protocols = $allowed_protocols;
 	return preg_replace_callback( '%(<!--.*?(-->|$))|(<[^>]*(>|$)|>)%', '_wp_kses_split_callback', $string );
 }
@@ -757,44 +968,51 @@ function _wp_kses_split_callback( $match ) {
  * @param array  $allowed_protocols Allowed protocols to keep
  * @return string Fixed HTML element
  */
-function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
-	$string = wp_kses_stripslashes($string);
+function wp_kses_split2( $string, $allowed_html, $allowed_protocols ) {
+	$string = wp_kses_stripslashes( $string );
 
-	if (substr($string, 0, 1) != '<')
+	if ( substr( $string, 0, 1 ) != '<' ) {
 		return '&gt;';
+	}
 	// It matched a ">" character
 
 	if ( '<!--' == substr( $string, 0, 4 ) ) {
-		$string = str_replace( array('<!--', '-->'), '', $string );
-		while ( $string != ($newstring = wp_kses($string, $allowed_html, $allowed_protocols)) )
+		$string = str_replace( array( '<!--', '-->' ), '', $string );
+		while ( $string != ( $newstring = wp_kses( $string, $allowed_html, $allowed_protocols ) ) ) {
 			$string = $newstring;
-		if ( $string == '' )
+		}
+		if ( $string == '' ) {
 			return '';
+		}
 		// prevent multiple dashes in comments
-		$string = preg_replace('/--+/', '-', $string);
+		$string = preg_replace( '/--+/', '-', $string );
 		// prevent three dashes closing a comment
-		$string = preg_replace('/-$/', '', $string);
+		$string = preg_replace( '/-$/', '', $string );
 		return "<!--{$string}-->";
 	}
 	// Allow HTML comments
 
-	if (!preg_match('%^<\s*(/\s*)?([a-zA-Z0-9-]+)([^>]*)>?$%', $string, $matches))
+	if ( ! preg_match( '%^<\s*(/\s*)?([a-zA-Z0-9-]+)([^>]*)>?$%', $string, $matches ) ) {
 		return '';
+	}
 	// It's seriously malformed
 
-	$slash = trim($matches[1]);
-	$elem = $matches[2];
+	$slash    = trim( $matches[1] );
+	$elem     = $matches[2];
 	$attrlist = $matches[3];
 
-	if ( ! is_array( $allowed_html ) )
+	if ( ! is_array( $allowed_html ) ) {
 		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	}
 
-	if ( ! isset($allowed_html[strtolower($elem)]) )
+	if ( ! isset( $allowed_html[ strtolower( $elem ) ] ) ) {
 		return '';
+	}
 	// They are using a not allowed HTML element
 
-	if ($slash != '')
+	if ( $slash != '' ) {
 		return "</$elem>";
+	}
 	// No attributes are allowed for closing elements
 
 	return wp_kses_attr( $elem, $attrlist, $allowed_html, $allowed_protocols );
@@ -817,14 +1035,16 @@ function wp_kses_split2($string, $allowed_html, $allowed_protocols) {
  * @param array  $allowed_protocols Allowed protocols to keep
  * @return string Sanitized HTML element
  */
-function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
-	if ( ! is_array( $allowed_html ) )
+function wp_kses_attr( $element, $attr, $allowed_html, $allowed_protocols ) {
+	if ( ! is_array( $allowed_html ) ) {
 		$allowed_html = wp_kses_allowed_html( $allowed_html );
+	}
 
 	// Is there a closing XHTML slash at the end of the attributes?
 	$xhtml_slash = '';
-	if (preg_match('%\s*/\s*$%', $attr))
+	if ( preg_match( '%\s*/\s*$%', $attr ) ) {
 		$xhtml_slash = ' /';
+	}
 
 	// Are any attributes allowed at all for this element?
 	if ( ! isset( $allowed_html[ strtolower( $element ) ] ) || true === $allowed_html[ strtolower( $element ) ] || count( $allowed_html[ strtolower( $element ) ] ) == 0 ) {
@@ -832,19 +1052,19 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
 	}
 
 	// Split it
-	$attrarr = wp_kses_hair($attr, $allowed_protocols);
+	$attrarr = wp_kses_hair( $attr, $allowed_protocols );
 
 	// Go through $attrarr, and save the allowed attributes for this element
 	// in $attr2
 	$attr2 = '';
 	foreach ( $attrarr as $arreach ) {
 		if ( wp_kses_attr_check( $arreach['name'], $arreach['value'], $arreach['whole'], $arreach['vless'], $element, $allowed_html ) ) {
-			$attr2 .= ' '.$arreach['whole'];
+			$attr2 .= ' ' . $arreach['whole'];
 		}
 	}
 
 	// Remove any "<" or ">" characters
-	$attr2 = preg_replace('/[<>]/', '', $attr2);
+	$attr2 = preg_replace( '/[<>]/', '', $attr2 );
 
 	return "<$element$attr2$xhtml_slash>";
 }
@@ -863,10 +1083,10 @@ function wp_kses_attr($element, $attr, $allowed_html, $allowed_protocols) {
  * @return bool Is the attribute allowed?
  */
 function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowed_html ) {
-	$allowed_attr = $allowed_html[strtolower( $element )];
+	$allowed_attr = $allowed_html[ strtolower( $element ) ];
 
 	$name_low = strtolower( $name );
-	if ( ! isset( $allowed_attr[$name_low] ) || '' == $allowed_attr[$name_low] ) {
+	if ( ! isset( $allowed_attr[ $name_low ] ) || '' == $allowed_attr[ $name_low ] ) {
 		$name = $value = $whole = '';
 		return false;
 	}
@@ -883,9 +1103,9 @@ function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowe
 		$value = $new_value;
 	}
 
-	if ( is_array( $allowed_attr[$name_low] ) ) {
+	if ( is_array( $allowed_attr[ $name_low ] ) ) {
 		// there are some checks
-		foreach ( $allowed_attr[$name_low] as $currkey => $currval ) {
+		foreach ( $allowed_attr[ $name_low ] as $currkey => $currval ) {
 			if ( ! wp_kses_check_attr_val( $value, $vless, $currkey, $currval ) ) {
 				$name = $value = $whole = '';
 				return false;
@@ -913,114 +1133,134 @@ function wp_kses_attr_check( &$name, &$value, &$whole, $vless, $element, $allowe
  * @param array  $allowed_protocols Allowed protocols to keep
  * @return array List of attributes after parsing
  */
-function wp_kses_hair($attr, $allowed_protocols) {
-	$attrarr = array();
-	$mode = 0;
+function wp_kses_hair( $attr, $allowed_protocols ) {
+	$attrarr  = array();
+	$mode     = 0;
 	$attrname = '';
-	$uris = array('xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action');
+	$uris     = array( 'xmlns', 'profile', 'href', 'src', 'cite', 'classid', 'codebase', 'data', 'usemap', 'longdesc', 'action' );
 
 	// Loop through the whole attribute list
 
-	while (strlen($attr) != 0) {
+	while ( strlen( $attr ) != 0 ) {
 		$working = 0; // Was the last operation successful?
 
-		switch ($mode) {
-			case 0 : // attribute name, href for instance
-
-				if ( preg_match('/^([-a-zA-Z:]+)/', $attr, $match ) ) {
+		switch ( $mode ) {
+			case 0:
+				if ( preg_match( '/^([-a-zA-Z:]+)/', $attr, $match ) ) {
 					$attrname = $match[1];
-					$working = $mode = 1;
-					$attr = preg_replace( '/^[-a-zA-Z:]+/', '', $attr );
+					$working  = $mode = 1;
+					$attr     = preg_replace( '/^[-a-zA-Z:]+/', '', $attr );
 				}
 
 				break;
 
-			case 1 : // equals sign or valueless ("selected")
-
-				if (preg_match('/^\s*=\s*/', $attr)) // equals sign
-					{
+			case 1:
+				if ( preg_match( '/^\s*=\s*/', $attr ) ) { // equals sign
 					$working = 1;
-					$mode = 2;
-					$attr = preg_replace('/^\s*=\s*/', '', $attr);
+					$mode    = 2;
+					$attr    = preg_replace( '/^\s*=\s*/', '', $attr );
 					break;
 				}
 
-				if (preg_match('/^\s+/', $attr)) // valueless
-					{
+				if ( preg_match( '/^\s+/', $attr ) ) { // valueless
 					$working = 1;
-					$mode = 0;
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+					$mode    = 0;
+					if ( false === array_key_exists( $attrname, $attrarr ) ) {
+						$attrarr[ $attrname ] = array(
+							'name'  => $attrname,
+							'value' => '',
+							'whole' => $attrname,
+							'vless' => 'y',
+						);
 					}
-					$attr = preg_replace('/^\s+/', '', $attr);
+					$attr = preg_replace( '/^\s+/', '', $attr );
 				}
 
 				break;
 
-			case 2 : // attribute value, a URL after href= for instance
-
-				if (preg_match('%^"([^"]*)"(\s+|/?$)%', $attr, $match))
+			case 2:
+				if ( preg_match( '%^"([^"]*)"(\s+|/?$)%', $attr, $match ) ) {
 					// "value"
-					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					if ( in_array( strtolower( $attrname ), $uris ) ) {
+						$thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
+					}
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+					if ( false === array_key_exists( $attrname, $attrarr ) ) {
+						$attrarr[ $attrname ] = array(
+							'name'  => $attrname,
+							'value' => $thisval,
+							'whole' => "$attrname=\"$thisval\"",
+							'vless' => 'n',
+						);
 					}
 					$working = 1;
-					$mode = 0;
-					$attr = preg_replace('/^"[^"]*"(\s+|$)/', '', $attr);
+					$mode    = 0;
+					$attr    = preg_replace( '/^"[^"]*"(\s+|$)/', '', $attr );
 					break;
 				}
 
-				if (preg_match("%^'([^']*)'(\s+|/?$)%", $attr, $match))
+				if ( preg_match( "%^'([^']*)'(\s+|/?$)%", $attr, $match ) ) {
 					// 'value'
-					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					if ( in_array( strtolower( $attrname ), $uris ) ) {
+						$thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
+					}
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname='$thisval'", 'vless' => 'n');
+					if ( false === array_key_exists( $attrname, $attrarr ) ) {
+						$attrarr[ $attrname ] = array(
+							'name'  => $attrname,
+							'value' => $thisval,
+							'whole' => "$attrname='$thisval'",
+							'vless' => 'n',
+						);
 					}
 					$working = 1;
-					$mode = 0;
-					$attr = preg_replace("/^'[^']*'(\s+|$)/", '', $attr);
+					$mode    = 0;
+					$attr    = preg_replace( "/^'[^']*'(\s+|$)/", '', $attr );
 					break;
 				}
 
-				if (preg_match("%^([^\s\"']+)(\s+|/?$)%", $attr, $match))
+				if ( preg_match( "%^([^\s\"']+)(\s+|/?$)%", $attr, $match ) ) {
 					// value
-					{
 					$thisval = $match[1];
-					if ( in_array(strtolower($attrname), $uris) )
-						$thisval = wp_kses_bad_protocol($thisval, $allowed_protocols);
+					if ( in_array( strtolower( $attrname ), $uris ) ) {
+						$thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
+					}
 
-					if(false === array_key_exists($attrname, $attrarr)) {
-						$attrarr[$attrname] = array ('name' => $attrname, 'value' => $thisval, 'whole' => "$attrname=\"$thisval\"", 'vless' => 'n');
+					if ( false === array_key_exists( $attrname, $attrarr ) ) {
+						$attrarr[ $attrname ] = array(
+							'name'  => $attrname,
+							'value' => $thisval,
+							'whole' => "$attrname=\"$thisval\"",
+							'vless' => 'n',
+						);
 					}
 					// We add quotes to conform to W3C's HTML spec.
 					$working = 1;
-					$mode = 0;
-					$attr = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attr);
+					$mode    = 0;
+					$attr    = preg_replace( "%^[^\s\"']+(\s+|$)%", '', $attr );
 				}
 
 				break;
 		} // switch
 
-		if ($working == 0) // not well formed, remove and try again
-		{
-			$attr = wp_kses_html_error($attr);
+		if ( $working == 0 ) { // not well formed, remove and try again
+			$attr = wp_kses_html_error( $attr );
 			$mode = 0;
 		}
 	} // while
 
-	if ($mode == 1 && false === array_key_exists($attrname, $attrarr))
+	if ( $mode == 1 && false === array_key_exists( $attrname, $attrarr ) ) {
 		// special case, for when the attribute list ends with a valueless
 		// attribute like "selected"
-		$attrarr[$attrname] = array ('name' => $attrname, 'value' => '', 'whole' => $attrname, 'vless' => 'y');
+		$attrarr[ $attrname ] = array(
+			'name'  => $attrname,
+			'value' => '',
+			'whole' => $attrname,
+			'vless' => 'y',
+		);
+	}
 
 	return $attrarr;
 }
@@ -1038,16 +1278,16 @@ function wp_kses_hair($attr, $allowed_protocols) {
  * @return array|bool List of attributes found in $element. Returns false on failure.
  */
 function wp_kses_attr_parse( $element ) {
-	$valid = preg_match('%^(<\s*)(/\s*)?([a-zA-Z0-9]+\s*)([^>]*)(>?)$%', $element, $matches);
+	$valid = preg_match( '%^(<\s*)(/\s*)?([a-zA-Z0-9]+\s*)([^>]*)(>?)$%', $element, $matches );
 	if ( 1 !== $valid ) {
 		return false;
 	}
 
-	$begin =  $matches[1];
-	$slash =  $matches[2];
+	$begin  = $matches[1];
+	$slash  = $matches[2];
 	$elname = $matches[3];
-	$attr =   $matches[4];
-	$end =    $matches[5];
+	$attr   = $matches[4];
+	$end    = $matches[5];
 
 	if ( '' !== $slash ) {
 		// Closing elements do not get parsed.
@@ -1057,11 +1297,11 @@ function wp_kses_attr_parse( $element ) {
 	// Is there a closing XHTML slash at the end of the attributes?
 	if ( 1 === preg_match( '%\s*/\s*$%', $attr, $matches ) ) {
 		$xhtml_slash = $matches[0];
-		$attr = substr( $attr, 0, -strlen( $xhtml_slash ) );
+		$attr        = substr( $attr, 0, -strlen( $xhtml_slash ) );
 	} else {
 		$xhtml_slash = '';
 	}
-	
+
 	// Split it
 	$attrarr = wp_kses_hair_parse( $attr );
 	if ( false === $attrarr ) {
@@ -1071,7 +1311,7 @@ function wp_kses_attr_parse( $element ) {
 	// Make sure all input is returned by adding front and back matter.
 	array_unshift( $attrarr, $begin . $slash . $elname );
 	array_push( $attrarr, $xhtml_slash . $end );
-	
+
 	return $attrarr;
 }
 
@@ -1144,58 +1384,65 @@ function wp_kses_hair_parse( $attr ) {
  * @param mixed  $checkvalue What constraint the value should pass
  * @return bool Whether check passes
  */
-function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
+function wp_kses_check_attr_val( $value, $vless, $checkname, $checkvalue ) {
 	$ok = true;
 
-	switch (strtolower($checkname)) {
-		case 'maxlen' :
+	switch ( strtolower( $checkname ) ) {
+		case 'maxlen':
 			// The maxlen check makes sure that the attribute value has a length not
 			// greater than the given value. This can be used to avoid Buffer Overflows
 			// in WWW clients and various Internet servers.
 
-			if (strlen($value) > $checkvalue)
+			if ( strlen( $value ) > $checkvalue ) {
 				$ok = false;
+			}
 			break;
 
-		case 'minlen' :
+		case 'minlen':
 			// The minlen check makes sure that the attribute value has a length not
 			// smaller than the given value.
 
-			if (strlen($value) < $checkvalue)
+			if ( strlen( $value ) < $checkvalue ) {
 				$ok = false;
+			}
 			break;
 
-		case 'maxval' :
+		case 'maxval':
 			// The maxval check does two things: it checks that the attribute value is
 			// an integer from 0 and up, without an excessive amount of zeroes or
 			// whitespace (to avoid Buffer Overflows). It also checks that the attribute
 			// value is not greater than the given value.
 			// This check can be used to avoid Denial of Service attacks.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+			if ( ! preg_match( '/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value ) ) {
 				$ok = false;
-			if ($value > $checkvalue)
+			}
+			if ( $value > $checkvalue ) {
 				$ok = false;
+			}
 			break;
 
-		case 'minval' :
+		case 'minval':
 			// The minval check makes sure that the attribute value is a positive integer,
 			// and that it is not smaller than the given value.
 
-			if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
+			if ( ! preg_match( '/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value ) ) {
 				$ok = false;
-			if ($value < $checkvalue)
+			}
+			if ( $value < $checkvalue ) {
 				$ok = false;
+			}
 			break;
 
-		case 'valueless' :
+		case 'valueless':
 			// The valueless check makes sure if the attribute has a value
 			// (like <a href="blah">) or not (<option selected>). If the given value
 			// is a "y" or a "Y", the attribute must not have a value.
 			// If the given value is an "n" or an "N", the attribute must have one.
 
-			if (strtolower($checkvalue) != $vless)
+			if ( strtolower( $checkvalue ) != $vless ) {
 				$ok = false;
+			}
 			break;
 	} // switch
 
@@ -1216,17 +1463,18 @@ function wp_kses_check_attr_val($value, $vless, $checkname, $checkvalue) {
  * @param array  $allowed_protocols Allowed protocols to keep
  * @return string Filtered content
  */
-function wp_kses_bad_protocol($string, $allowed_protocols) {
-	$string = wp_kses_no_null($string);
+function wp_kses_bad_protocol( $string, $allowed_protocols ) {
+	$string     = wp_kses_no_null( $string );
 	$iterations = 0;
 
 	do {
 		$original_string = $string;
-		$string = wp_kses_bad_protocol_once($string, $allowed_protocols);
+		$string          = wp_kses_bad_protocol_once( $string, $allowed_protocols );
 	} while ( $original_string != $string && ++$iterations < 6 );
 
-	if ( $original_string != $string )
+	if ( $original_string != $string ) {
 		return '';
+	}
 
 	return $string;
 }
@@ -1267,8 +1515,8 @@ function wp_kses_no_null( $string, $options = null ) {
  * @param string $string String to strip slashes
  * @return string Fixed string with quoted slashes
  */
-function wp_kses_stripslashes($string) {
-	return preg_replace('%\\\\"%', '"', $string);
+function wp_kses_stripslashes( $string ) {
+	return preg_replace( '%\\\\"%', '"', $string );
 }
 
 /**
@@ -1279,16 +1527,16 @@ function wp_kses_stripslashes($string) {
  * @param array $inarray Unfiltered array
  * @return array Fixed array with all lowercase keys
  */
-function wp_kses_array_lc($inarray) {
-	$outarray = array ();
+function wp_kses_array_lc( $inarray ) {
+	$outarray = array();
 
-	foreach ( (array) $inarray as $inkey => $inval) {
-		$outkey = strtolower($inkey);
-		$outarray[$outkey] = array ();
+	foreach ( (array) $inarray as $inkey => $inval ) {
+		$outkey              = strtolower( $inkey );
+		$outarray[ $outkey ] = array();
 
-		foreach ( (array) $inval as $inkey2 => $inval2) {
-			$outkey2 = strtolower($inkey2);
-			$outarray[$outkey][$outkey2] = $inval2;
+		foreach ( (array) $inval as $inkey2 => $inval2 ) {
+			$outkey2                         = strtolower( $inkey2 );
+			$outarray[ $outkey ][ $outkey2 ] = $inval2;
 		} // foreach $inval
 	} // foreach $inarray
 
@@ -1306,8 +1554,8 @@ function wp_kses_array_lc($inarray) {
  * @param string $string
  * @return string
  */
-function wp_kses_html_error($string) {
-	return preg_replace('/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string);
+function wp_kses_html_error( $string ) {
+	return preg_replace( '/^("[^"]*("|$)|\'[^\']*(\'|$)|\S)*\s*/', '', $string );
 }
 
 /**
@@ -1322,17 +1570,19 @@ function wp_kses_html_error($string) {
  * @param string $allowed_protocols Allowed protocols
  * @return string Sanitized content
  */
-function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) {
+function wp_kses_bad_protocol_once( $string, $allowed_protocols, $count = 1 ) {
 	$string2 = preg_split( '/:|&#0*58;|&#x0*3a;/i', $string, 2 );
-	if ( isset($string2[1]) && ! preg_match('%/\?%', $string2[0]) ) {
-		$string = trim( $string2[1] );
+	if ( isset( $string2[1] ) && ! preg_match( '%/\?%', $string2[0] ) ) {
+		$string   = trim( $string2[1] );
 		$protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
 		if ( 'feed:' == $protocol ) {
-			if ( $count > 2 )
+			if ( $count > 2 ) {
 				return '';
+			}
 			$string = wp_kses_bad_protocol_once( $string, $allowed_protocols, ++$count );
-			if ( empty( $string ) )
+			if ( empty( $string ) ) {
 				return $string;
+			}
 		}
 		$string = $protocol . $string;
 	}
@@ -1354,22 +1604,24 @@ function wp_kses_bad_protocol_once($string, $allowed_protocols, $count = 1 ) {
  * @return string Sanitized content
  */
 function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
-	$string2 = wp_kses_decode_entities($string);
-	$string2 = preg_replace('/\s/', '', $string2);
-	$string2 = wp_kses_no_null($string2);
-	$string2 = strtolower($string2);
+	$string2 = wp_kses_decode_entities( $string );
+	$string2 = preg_replace( '/\s/', '', $string2 );
+	$string2 = wp_kses_no_null( $string2 );
+	$string2 = strtolower( $string2 );
 
 	$allowed = false;
-	foreach ( (array) $allowed_protocols as $one_protocol )
-		if ( strtolower($one_protocol) == $string2 ) {
+	foreach ( (array) $allowed_protocols as $one_protocol ) {
+		if ( strtolower( $one_protocol ) == $string2 ) {
 			$allowed = true;
 			break;
 		}
+	}
 
-	if ($allowed)
+	if ( $allowed ) {
 		return "$string2:";
-	else
+	} else {
 		return '';
+	}
 }
 
 /**
@@ -1383,14 +1635,14 @@ function wp_kses_bad_protocol_once2( $string, $allowed_protocols ) {
  * @param string $string Content to normalize entities
  * @return string Content with normalized entities
  */
-function wp_kses_normalize_entities($string) {
+function wp_kses_normalize_entities( $string ) {
 	// Disarm all entities by converting & to &amp;
-	$string = str_replace('&', '&amp;', $string);
+	$string = str_replace( '&', '&amp;', $string );
 
 	// Change back the allowed entities in our entity whitelist
-	$string = preg_replace_callback('/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string);
-	$string = preg_replace_callback('/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string);
-	$string = preg_replace_callback('/&amp;#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string);
+	$string = preg_replace_callback( '/&amp;([A-Za-z]{2,8}[0-9]{0,2});/', 'wp_kses_named_entities', $string );
+	$string = preg_replace_callback( '/&amp;#(0*[0-9]{1,7});/', 'wp_kses_normalize_entities2', $string );
+	$string = preg_replace_callback( '/&amp;#[Xx](0*[0-9A-Fa-f]{1,6});/', 'wp_kses_normalize_entities3', $string );
 
 	return $string;
 }
@@ -1408,11 +1660,12 @@ function wp_kses_normalize_entities($string) {
  * @param array $matches preg_replace_callback() matches array
  * @return string Correctly encoded entity
  */
-function wp_kses_named_entities($matches) {
+function wp_kses_named_entities( $matches ) {
 	global $allowedentitynames;
 
-	if ( empty($matches[1]) )
+	if ( empty( $matches[1] ) ) {
 		return '';
+	}
 
 	$i = $matches[1];
 	return ( ! in_array( $i, $allowedentitynames ) ) ? "&amp;$i;" : "&$i;";
@@ -1430,13 +1683,14 @@ function wp_kses_named_entities($matches) {
  * @param array $matches preg_replace_callback() matches array
  * @return string Correctly encoded entity
  */
-function wp_kses_normalize_entities2($matches) {
-	if ( empty($matches[1]) )
+function wp_kses_normalize_entities2( $matches ) {
+	if ( empty( $matches[1] ) ) {
 		return '';
+	}
 
 	$i = $matches[1];
-	if (valid_unicode($i)) {
-		$i = str_pad(ltrim($i,'0'), 3, '0', STR_PAD_LEFT);
+	if ( valid_unicode( $i ) ) {
+		$i = str_pad( ltrim( $i, '0' ), 3, '0', STR_PAD_LEFT );
 		$i = "&#$i;";
 	} else {
 		$i = "&amp;#$i;";
@@ -1457,12 +1711,13 @@ function wp_kses_normalize_entities2($matches) {
  * @param array $matches preg_replace_callback() matches array
  * @return string Correctly encoded entity
  */
-function wp_kses_normalize_entities3($matches) {
-	if ( empty($matches[1]) )
+function wp_kses_normalize_entities3( $matches ) {
+	if ( empty( $matches[1] ) ) {
 		return '';
+	}
 
 	$hexchars = $matches[1];
-	return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x'.ltrim($hexchars,'0').';';
+	return ( ! valid_unicode( hexdec( $hexchars ) ) ) ? "&amp;#x$hexchars;" : '&#x' . ltrim( $hexchars, '0' ) . ';';
 }
 
 /**
@@ -1473,11 +1728,11 @@ function wp_kses_normalize_entities3($matches) {
  * @param int $i Unicode value
  * @return bool True if the value was a valid Unicode number
  */
-function valid_unicode($i) {
+function valid_unicode( $i ) {
 	return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
-			($i >= 0x20 && $i <= 0xd7ff) ||
-			($i >= 0xe000 && $i <= 0xfffd) ||
-			($i >= 0x10000 && $i <= 0x10ffff) );
+			( $i >= 0x20 && $i <= 0xd7ff ) ||
+			( $i >= 0xe000 && $i <= 0xfffd ) ||
+			( $i >= 0x10000 && $i <= 0x10ffff ) );
 }
 
 /**
@@ -1492,9 +1747,9 @@ function valid_unicode($i) {
  * @param string $string Content to change entities
  * @return string Content after decoded entities
  */
-function wp_kses_decode_entities($string) {
-	$string = preg_replace_callback('/&#([0-9]+);/', '_wp_kses_decode_entities_chr', $string);
-	$string = preg_replace_callback('/&#[Xx]([0-9A-Fa-f]+);/', '_wp_kses_decode_entities_chr_hexdec', $string);
+function wp_kses_decode_entities( $string ) {
+	$string = preg_replace_callback( '/&#([0-9]+);/', '_wp_kses_decode_entities_chr', $string );
+	$string = preg_replace_callback( '/&#[Xx]([0-9A-Fa-f]+);/', '_wp_kses_decode_entities_chr_hexdec', $string );
 
 	return $string;
 }
@@ -1617,18 +1872,19 @@ function wp_filter_nohtml_kses( $data ) {
  */
 function kses_init_filters() {
 	// Normal filtering
-	add_filter('title_save_pre', 'wp_filter_kses');
+	add_filter( 'title_save_pre', 'wp_filter_kses' );
 
 	// Comment filtering
-	if ( current_user_can( 'unfiltered_html' ) )
+	if ( current_user_can( 'unfiltered_html' ) ) {
 		add_filter( 'pre_comment_content', 'wp_filter_post_kses' );
-	else
+	} else {
 		add_filter( 'pre_comment_content', 'wp_filter_kses' );
+	}
 
 	// Post filtering
-	add_filter('content_save_pre', 'wp_filter_post_kses');
-	add_filter('excerpt_save_pre', 'wp_filter_post_kses');
-	add_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+	add_filter( 'content_save_pre', 'wp_filter_post_kses' );
+	add_filter( 'excerpt_save_pre', 'wp_filter_post_kses' );
+	add_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );
 }
 
 /**
@@ -1645,16 +1901,16 @@ function kses_init_filters() {
  */
 function kses_remove_filters() {
 	// Normal filtering
-	remove_filter('title_save_pre', 'wp_filter_kses');
+	remove_filter( 'title_save_pre', 'wp_filter_kses' );
 
 	// Comment filtering
 	remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
 	remove_filter( 'pre_comment_content', 'wp_filter_kses' );
 
 	// Post filtering
-	remove_filter('content_save_pre', 'wp_filter_post_kses');
-	remove_filter('excerpt_save_pre', 'wp_filter_post_kses');
-	remove_filter('content_filtered_save_pre', 'wp_filter_post_kses');
+	remove_filter( 'content_save_pre', 'wp_filter_post_kses' );
+	remove_filter( 'excerpt_save_pre', 'wp_filter_post_kses' );
+	remove_filter( 'content_filtered_save_pre', 'wp_filter_post_kses' );
 }
 
 /**
@@ -1688,14 +1944,16 @@ function kses_init() {
  * @return string            Filtered string of CSS rules.
  */
 function safecss_filter_attr( $css, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.8.1' ); // Never implemented
+	}
 
-	$css = wp_kses_no_null($css);
-	$css = str_replace(array("\n","\r","\t"), '', $css);
+	$css = wp_kses_no_null( $css );
+	$css = str_replace( array( "\n", "\r", "\t" ), '', $css );
 
-	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) // remove any inline css containing \ ( & } = or comments
+	if ( preg_match( '%[\\\\(&=}]|/\*%', $css ) ) { // remove any inline css containing \ ( & } = or comments
 		return '';
+	}
 
 	$css_array = explode( ';', trim( $css ) );
 
@@ -1708,96 +1966,102 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 	 *
 	 * @param array $attr List of allowed CSS attributes.
 	 */
-	$allowed_attr = apply_filters( 'safe_style_css', array(
-		'background',
-		'background-color',
+	$allowed_attr = apply_filters(
+		'safe_style_css', array(
+			'background',
+			'background-color',
 
-		'border',
-		'border-width',
-		'border-color',
-		'border-style',
-		'border-right',
-		'border-right-color',
-		'border-right-style',
-		'border-right-width',
-		'border-bottom',
-		'border-bottom-color',
-		'border-bottom-style',
-		'border-bottom-width',
-		'border-left',
-		'border-left-color',
-		'border-left-style',
-		'border-left-width',
-		'border-top',
-		'border-top-color',
-		'border-top-style',
-		'border-top-width',
+			'border',
+			'border-width',
+			'border-color',
+			'border-style',
+			'border-right',
+			'border-right-color',
+			'border-right-style',
+			'border-right-width',
+			'border-bottom',
+			'border-bottom-color',
+			'border-bottom-style',
+			'border-bottom-width',
+			'border-left',
+			'border-left-color',
+			'border-left-style',
+			'border-left-width',
+			'border-top',
+			'border-top-color',
+			'border-top-style',
+			'border-top-width',
 
-		'border-spacing',
-		'border-collapse',
-		'caption-side',
+			'border-spacing',
+			'border-collapse',
+			'caption-side',
 
-		'color',
-		'font',
-		'font-family',
-		'font-size',
-		'font-style',
-		'font-variant',
-		'font-weight',
-		'letter-spacing',
-		'line-height',
-		'text-decoration',
-		'text-indent',
-		'text-align',
+			'color',
+			'font',
+			'font-family',
+			'font-size',
+			'font-style',
+			'font-variant',
+			'font-weight',
+			'letter-spacing',
+			'line-height',
+			'text-decoration',
+			'text-indent',
+			'text-align',
 
-		'height',
-		'min-height',
-		'max-height',
+			'height',
+			'min-height',
+			'max-height',
 
-		'width',
-		'min-width',
-		'max-width',
+			'width',
+			'min-width',
+			'max-width',
 
-		'margin',
-		'margin-right',
-		'margin-bottom',
-		'margin-left',
-		'margin-top',
+			'margin',
+			'margin-right',
+			'margin-bottom',
+			'margin-left',
+			'margin-top',
 
-		'padding',
-		'padding-right',
-		'padding-bottom',
-		'padding-left',
-		'padding-top',
+			'padding',
+			'padding-right',
+			'padding-bottom',
+			'padding-left',
+			'padding-top',
 
-		'clear',
-		'cursor',
-		'direction',
-		'float',
-		'overflow',
-		'vertical-align',
-		'list-style-type',
-	) );
+			'clear',
+			'cursor',
+			'direction',
+			'float',
+			'overflow',
+			'vertical-align',
+			'list-style-type',
+		)
+	);
 
-	if ( empty($allowed_attr) )
+	if ( empty( $allowed_attr ) ) {
 		return $css;
+	}
 
 	$css = '';
 	foreach ( $css_array as $css_item ) {
-		if ( $css_item == '' )
+		if ( $css_item == '' ) {
 			continue;
+		}
 		$css_item = trim( $css_item );
-		$found = false;
+		$found    = false;
 		if ( strpos( $css_item, ':' ) === false ) {
 			$found = true;
 		} else {
 			$parts = explode( ':', $css_item );
-			if ( in_array( trim( $parts[0] ), $allowed_attr ) )
+			if ( in_array( trim( $parts[0] ), $allowed_attr ) ) {
 				$found = true;
+			}
 		}
 		if ( $found ) {
-			if( $css != '' )
+			if ( $css != '' ) {
 				$css .= ';';
+			}
 			$css .= $css_item;
 		}
 	}
@@ -1817,17 +2081,19 @@ function safecss_filter_attr( $css, $deprecated = '' ) {
 function _wp_add_global_attributes( $value ) {
 	$global_attributes = array(
 		'class' => true,
-		'id' => true,
+		'id'    => true,
 		'style' => true,
 		'title' => true,
-		'role' => true,
+		'role'  => true,
 	);
 
-	if ( true === $value )
+	if ( true === $value ) {
 		$value = array();
+	}
 
-	if ( is_array( $value ) )
+	if ( is_array( $value ) ) {
 		return array_merge( $value, $global_attributes );
+	}
 
 	return $value;
 }
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index a273b0c6dd..5f4ba59ec3 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -400,7 +400,7 @@ function _n( $single, $plural, $number, $domain = 'default' ) {
  *                        Default 'default'.
  * @return string The translated singular or plural form.
  */
-function _nx($single, $plural, $number, $context, $domain = 'default') {
+function _nx( $single, $plural, $number, $context, $domain = 'default' ) {
 	$translations = get_translations_for_domain( $domain );
 	$translation  = $translations->translate_plural( $single, $plural, $number, $context );
 
@@ -449,7 +449,14 @@ function _nx($single, $plural, $number, $context, $domain = 'default') {
  * }
  */
 function _n_noop( $singular, $plural, $domain = null ) {
-	return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null, 'domain' => $domain );
+	return array(
+		0          => $singular,
+		1          => $plural,
+		'singular' => $singular,
+		'plural'   => $plural,
+		'context'  => null,
+		'domain'   => $domain,
+	);
 }
 
 /**
@@ -461,8 +468,8 @@ function _n_noop( $singular, $plural, $domain = null ) {
  * Example of a generic phrase which is disambiguated via the context parameter:
  *
  *     $messages = array(
- *      	'people'  => _nx_noop( '%s group', '%s groups', 'people', 'text-domain' ),
- *      	'animals' => _nx_noop( '%s group', '%s groups', 'animals', 'text-domain' ),
+ *          'people'  => _nx_noop( '%s group', '%s groups', 'people', 'text-domain' ),
+ *          'animals' => _nx_noop( '%s group', '%s groups', 'animals', 'text-domain' ),
  *     );
  *     ...
  *     $message = $messages[ $type ];
@@ -488,7 +495,15 @@ function _n_noop( $singular, $plural, $domain = null ) {
  * }
  */
 function _nx_noop( $singular, $plural, $context, $domain = null ) {
-	return array( 0 => $singular, 1 => $plural, 2 => $context, 'singular' => $singular, 'plural' => $plural, 'context' => $context, 'domain' => $domain );
+	return array(
+		0          => $singular,
+		1          => $plural,
+		2          => $context,
+		'singular' => $singular,
+		'plural'   => $plural,
+		'context'  => $context,
+		'domain'   => $domain,
+	);
 }
 
 /**
@@ -512,13 +527,15 @@ function _nx_noop( $singular, $plural, $context, $domain = null ) {
  * @return string Either $single or $plural translated text.
  */
 function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) {
-	if ( $nooped_plural['domain'] )
+	if ( $nooped_plural['domain'] ) {
 		$domain = $nooped_plural['domain'];
+	}
 
-	if ( $nooped_plural['context'] )
+	if ( $nooped_plural['context'] ) {
 		return _nx( $nooped_plural['singular'], $nooped_plural['plural'], $count, $nooped_plural['context'], $domain );
-	else
+	} else {
 		return _n( $nooped_plural['singular'], $nooped_plural['plural'], $count, $domain );
+	}
 }
 
 /**
@@ -581,17 +598,22 @@ function load_textdomain( $domain, $mofile ) {
 	 */
 	$mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
 
-	if ( !is_readable( $mofile ) ) return false;
+	if ( ! is_readable( $mofile ) ) {
+		return false;
+	}
 
 	$mo = new MO();
-	if ( !$mo->import_from_file( $mofile ) ) return false;
+	if ( ! $mo->import_from_file( $mofile ) ) {
+		return false;
+	}
 
-	if ( isset( $l10n[$domain] ) )
-		$mo->merge_with( $l10n[$domain] );
+	if ( isset( $l10n[ $domain ] ) ) {
+		$mo->merge_with( $l10n[ $domain ] );
+	}
 
 	unset( $l10n_unloaded[ $domain ] );
 
-	$l10n[$domain] = &$mo;
+	$l10n[ $domain ] = &$mo;
 
 	return true;
 }
@@ -637,8 +659,8 @@ function unload_textdomain( $domain ) {
 	 */
 	do_action( 'unload_textdomain', $domain );
 
-	if ( isset( $l10n[$domain] ) ) {
-		unset( $l10n[$domain] );
+	if ( isset( $l10n[ $domain ] ) ) {
+		unset( $l10n[ $domain ] );
 
 		$l10n_unloaded[ $domain ] = true;
 
@@ -671,7 +693,7 @@ function load_default_textdomain( $locale = null ) {
 
 	$return = load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
 
-	if ( ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) && ! file_exists(  WP_LANG_DIR . "/admin-$locale.mo" ) ) {
+	if ( ( is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) && ! file_exists( WP_LANG_DIR . "/admin-$locale.mo" ) ) {
 		load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
 		return $return;
 	}
@@ -680,8 +702,9 @@ function load_default_textdomain( $locale = null ) {
 		load_textdomain( 'default', WP_LANG_DIR . "/admin-$locale.mo" );
 	}
 
-	if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) )
+	if ( is_network_admin() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK ) ) {
 		load_textdomain( 'default', WP_LANG_DIR . "/admin-network-$locale.mo" );
+	}
 
 	return $return;
 }
@@ -816,8 +839,9 @@ function load_theme_textdomain( $domain, $path = false ) {
  * @return bool True when the theme textdomain is successfully loaded, false otherwise.
  */
 function load_child_theme_textdomain( $domain, $path = false ) {
-	if ( ! $path )
+	if ( ! $path ) {
 		$path = get_stylesheet_directory();
+	}
 	return load_theme_textdomain( $domain, $path );
 }
 
@@ -990,7 +1014,7 @@ function is_textdomain_loaded( $domain ) {
  * @return string Translated role name on success, original name on failure.
  */
 function translate_user_role( $name ) {
-	return translate_with_gettext_context( before_last_bar($name), 'User role' );
+	return translate_with_gettext_context( before_last_bar( $name ), 'User role' );
 }
 
 /**
@@ -1042,20 +1066,24 @@ function get_available_languages( $dir = null ) {
  * @return array Array of language data.
  */
 function wp_get_installed_translations( $type ) {
-	if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' )
+	if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' ) {
 		return array();
+	}
 
 	$dir = 'core' === $type ? '' : "/$type";
 
-	if ( ! is_dir( WP_LANG_DIR ) )
+	if ( ! is_dir( WP_LANG_DIR ) ) {
 		return array();
+	}
 
-	if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) )
+	if ( $dir && ! is_dir( WP_LANG_DIR . $dir ) ) {
 		return array();
+	}
 
 	$files = scandir( WP_LANG_DIR . $dir );
-	if ( ! $files )
+	if ( ! $files ) {
 		return array();
+	}
 
 	$language_data = array();
 
@@ -1069,7 +1097,7 @@ function wp_get_installed_translations( $type ) {
 		if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) {
 			continue;
 		}
-		if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) )  {
+		if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) ) {
 			continue;
 		}
 
@@ -1091,12 +1119,14 @@ function wp_get_installed_translations( $type ) {
  * @return array PO file headers.
  */
 function wp_get_pomo_file_data( $po_file ) {
-	$headers = get_file_data( $po_file, array(
-		'POT-Creation-Date'  => '"POT-Creation-Date',
-		'PO-Revision-Date'   => '"PO-Revision-Date',
-		'Project-Id-Version' => '"Project-Id-Version',
-		'X-Generator'        => '"X-Generator',
-	) );
+	$headers = get_file_data(
+		$po_file, array(
+			'POT-Creation-Date'  => '"POT-Creation-Date',
+			'PO-Revision-Date'   => '"PO-Revision-Date',
+			'Project-Id-Version' => '"Project-Id-Version',
+			'X-Generator'        => '"X-Generator',
+		)
+	);
 	foreach ( $headers as $header => $value ) {
 		// Remove possible contextual '\n' and closing double quote.
 		$headers[ $header ] = preg_replace( '~(\\\n)?"$~', '', $value );
@@ -1133,16 +1163,18 @@ function wp_get_pomo_file_data( $po_file ) {
  */
 function wp_dropdown_languages( $args = array() ) {
 
-	$parsed_args = wp_parse_args( $args, array(
-		'id'           => 'locale',
-		'name'         => 'locale',
-		'languages'    => array(),
-		'translations' => array(),
-		'selected'     => '',
-		'echo'         => 1,
-		'show_available_translations' => true,
-		'show_option_site_default'    => false,
-	) );
+	$parsed_args = wp_parse_args(
+		$args, array(
+			'id'                          => 'locale',
+			'name'                        => 'locale',
+			'languages'                   => array(),
+			'translations'                => array(),
+			'selected'                    => '',
+			'echo'                        => 1,
+			'show_available_translations' => true,
+			'show_option_site_default'    => false,
+		)
+	);
 
 	// Bail if no ID or no name.
 	if ( ! $parsed_args['id'] || ! $parsed_args['name'] ) {
@@ -1210,7 +1242,7 @@ function wp_dropdown_languages( $args = array() ) {
 		selected( '', $parsed_args['selected'], false )
 	);
 
-	// List installed languages. 
+	// List installed languages.
 	foreach ( $languages as $language ) {
 		$structure[] = sprintf(
 			'<option value="%s" lang="%s"%s data-installed="1">%s</option>',
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 50aff6089f..416b1243fa 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -44,12 +44,13 @@ function the_permalink( $post = 0 ) {
  *                            for use in the filter. Default empty string.
  * @return string The URL with the trailing slash appended or stripped.
  */
-function user_trailingslashit($string, $type_of_url = '') {
+function user_trailingslashit( $string, $type_of_url = '' ) {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
-		$string = trailingslashit($string);
-	else
-		$string = untrailingslashit($string);
+	if ( $wp_rewrite->use_trailing_slashes ) {
+		$string = trailingslashit( $string );
+	} else {
+		$string = untrailingslashit( $string );
+	}
 
 	/**
 	 * Filters the trailing-slashed string, depending on whether the site is set to use trailing slashes.
@@ -79,7 +80,7 @@ function permalink_anchor( $mode = 'id' ) {
 	switch ( strtolower( $mode ) ) {
 		case 'title':
 			$title = sanitize_title( $post->post_title ) . '-' . $post->ID;
-			echo '<a id="'.$title.'"></a>';
+			echo '<a id="' . $title . '"></a>';
 			break;
 		case 'id':
 		default:
@@ -123,31 +124,33 @@ function get_permalink( $post = 0, $leavename = false ) {
 		'%hour%',
 		'%minute%',
 		'%second%',
-		$leavename? '' : '%postname%',
+		$leavename ? '' : '%postname%',
 		'%post_id%',
 		'%category%',
 		'%author%',
-		$leavename? '' : '%pagename%',
+		$leavename ? '' : '%pagename%',
 	);
 
 	if ( is_object( $post ) && isset( $post->filter ) && 'sample' == $post->filter ) {
 		$sample = true;
 	} else {
-		$post = get_post( $post );
+		$post   = get_post( $post );
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
+	if ( empty( $post->ID ) ) {
 		return false;
+	}
 
-	if ( $post->post_type == 'page' )
-		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
+	if ( $post->post_type == 'page' ) {
+		return get_page_link( $post, $leavename, $sample );
+	} elseif ( $post->post_type == 'attachment' ) {
 		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
-		return get_post_permalink($post, $leavename, $sample);
+	} elseif ( in_array( $post->post_type, get_post_types( array( '_builtin' => false ) ) ) ) {
+		return get_post_permalink( $post, $leavename, $sample );
+	}
 
-	$permalink = get_option('permalink_structure');
+	$permalink = get_option( 'permalink_structure' );
 
 	/**
 	 * Filters the permalink structure for a post before token replacement occurs.
@@ -162,16 +165,18 @@ function get_permalink( $post = 0, $leavename = false ) {
 	 */
 	$permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
 
-	if ( '' != $permalink && !in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) {
-		$unixtime = strtotime($post->post_date);
+	if ( '' != $permalink && ! in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) {
+		$unixtime = strtotime( $post->post_date );
 
 		$category = '';
-		if ( strpos($permalink, '%category%') !== false ) {
-			$cats = get_the_category($post->ID);
+		if ( strpos( $permalink, '%category%' ) !== false ) {
+			$cats = get_the_category( $post->ID );
 			if ( $cats ) {
-				$cats = wp_list_sort( $cats, array(
-					'term_id' => 'ASC',
-				) );
+				$cats = wp_list_sort(
+					$cats, array(
+						'term_id' => 'ASC',
+					)
+				);
 
 				/**
 				 * Filters the category that gets used in the %category% permalink token.
@@ -185,13 +190,14 @@ function get_permalink( $post = 0, $leavename = false ) {
 				$category_object = apply_filters( 'post_link_category', $cats[0], $cats, $post );
 
 				$category_object = get_term( $category_object, 'category' );
-				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				$category        = $category_object->slug;
+				if ( $parent = $category_object->parent ) {
+					$category = get_category_parents( $parent, false, '/', true ) . $category;
+				}
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
-			if ( empty($category) ) {
+			if ( empty( $category ) ) {
 				$default_category = get_term( get_option( 'default_category' ), 'category' );
 				if ( $default_category && ! is_wp_error( $default_category ) ) {
 					$category = $default_category->slug;
@@ -200,12 +206,12 @@ function get_permalink( $post = 0, $leavename = false ) {
 		}
 
 		$author = '';
-		if ( strpos($permalink, '%author%') !== false ) {
-			$authordata = get_userdata($post->post_author);
-			$author = $authordata->user_nicename;
+		if ( strpos( $permalink, '%author%' ) !== false ) {
+			$authordata = get_userdata( $post->post_author );
+			$author     = $authordata->user_nicename;
 		}
 
-		$date = explode(" ",date('Y m d H i s', $unixtime));
+		$date           = explode( ' ', date( 'Y m d H i s', $unixtime ) );
 		$rewritereplace =
 		array(
 			$date[0],
@@ -220,10 +226,10 @@ function get_permalink( $post = 0, $leavename = false ) {
 			$author,
 			$post->post_name,
 		);
-		$permalink = home_url( str_replace($rewritecode, $rewritereplace, $permalink) );
-		$permalink = user_trailingslashit($permalink, 'single');
+		$permalink      = home_url( str_replace( $rewritecode, $rewritereplace, $permalink ) );
+		$permalink      = user_trailingslashit( $permalink, 'single' );
 	} else { // if they're not using the fancy permalink option
-		$permalink = home_url('?p=' . $post->ID);
+		$permalink = home_url( '?p=' . $post->ID );
 	}
 
 	/**
@@ -255,34 +261,41 @@ function get_permalink( $post = 0, $leavename = false ) {
 function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
 	global $wp_rewrite;
 
-	$post = get_post($id);
+	$post = get_post( $id );
 
-	if ( is_wp_error( $post ) )
+	if ( is_wp_error( $post ) ) {
 		return $post;
+	}
 
-	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
+	$post_link = $wp_rewrite->get_extra_permastruct( $post->post_type );
 
 	$slug = $post->post_name;
 
 	$draft_or_pending = get_post_status( $post ) && in_array( get_post_status( $post ), array( 'draft', 'pending', 'auto-draft', 'future' ) );
 
-	$post_type = get_post_type_object($post->post_type);
+	$post_type = get_post_type_object( $post->post_type );
 
 	if ( $post_type->hierarchical ) {
 		$slug = get_page_uri( $post );
 	}
 
-	if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
+	if ( ! empty( $post_link ) && ( ! $draft_or_pending || $sample ) ) {
 		if ( ! $leavename ) {
-			$post_link = str_replace("%$post->post_type%", $slug, $post_link);
+			$post_link = str_replace( "%$post->post_type%", $slug, $post_link );
 		}
-		$post_link = home_url( user_trailingslashit($post_link) );
+		$post_link = home_url( user_trailingslashit( $post_link ) );
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
-			$post_link = add_query_arg($post_type->query_var, $slug, '');
-		else
-			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
-		$post_link = home_url($post_link);
+		if ( $post_type->query_var && ( isset( $post->post_status ) && ! $draft_or_pending ) ) {
+			$post_link = add_query_arg( $post_type->query_var, $slug, '' );
+		} else {
+			$post_link = add_query_arg(
+				array(
+					'post_type' => $post->post_type,
+					'p'         => $post->ID,
+				), ''
+			);
+		}
+		$post_link = home_url( $post_link );
 	}
 
 	/**
@@ -314,10 +327,11 @@ function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
 function get_page_link( $post = false, $leavename = false, $sample = false ) {
 	$post = get_post( $post );
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
-		$link = home_url('/');
-	else
+	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) ) {
+		$link = home_url( '/' );
+	} else {
 		$link = _get_page_link( $post, $leavename, $sample );
+	}
 
 	/**
 	 * Filters the permalink for a page.
@@ -356,13 +370,13 @@ function _get_page_link( $post = false, $leavename = false, $sample = false ) {
 
 	$link = $wp_rewrite->get_page_permastruct();
 
-	if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
+	if ( ! empty( $link ) && ( ( isset( $post->post_status ) && ! $draft_or_pending ) || $sample ) ) {
 		if ( ! $leavename ) {
-			$link = str_replace('%pagename%', get_page_uri( $post ), $link);
+			$link = str_replace( '%pagename%', get_page_uri( $post ), $link );
 		}
 
-		$link = home_url($link);
-		$link = user_trailingslashit($link, 'page');
+		$link = home_url( $link );
+		$link = user_trailingslashit( $link, 'page' );
 	} else {
 		$link = home_url( '?page_id=' . $post->ID );
 	}
@@ -396,34 +410,39 @@ function get_attachment_link( $post = null, $leavename = false ) {
 
 	$link = false;
 
-	$post = get_post( $post );
+	$post   = get_post( $post );
 	$parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
 	if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) {
 		$parent = false;
 	}
 
 	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
+		if ( 'page' == $parent->post_type ) {
 			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
-		else
+		} else {
 			$parentlink = get_permalink( $post->post_parent );
+		}
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
+		if ( is_numeric( $post->post_name ) || false !== strpos( get_option( 'permalink_structure' ), '%category%' ) ) {
 			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
-		else
+		} else {
 			$name = $post->post_name;
+		}
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if ( strpos( $parentlink, '?' ) === false ) {
+			$link = user_trailingslashit( trailingslashit( $parentlink ) . '%postname%' );
+		}
 
-		if ( ! $leavename )
+		if ( ! $leavename ) {
 			$link = str_replace( '%postname%', $name, $link );
+		}
 	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
 		$link = home_url( user_trailingslashit( $post->post_name ) );
 	}
 
-	if ( ! $link )
+	if ( ! $link ) {
 		$link = home_url( '/?attachment_id=' . $post->ID );
+	}
 
 	/**
 	 * Filters the permalink for an attachment.
@@ -448,11 +467,12 @@ function get_attachment_link( $post = null, $leavename = false ) {
  */
 function get_year_link( $year ) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
+	if ( ! $year ) {
+		$year = gmdate( 'Y', current_time( 'timestamp' ) );
+	}
 	$yearlink = $wp_rewrite->get_year_permastruct();
-	if ( !empty($yearlink) ) {
-		$yearlink = str_replace('%year%', $year, $yearlink);
+	if ( ! empty( $yearlink ) ) {
+		$yearlink = str_replace( '%year%', $year, $yearlink );
 		$yearlink = home_url( user_trailingslashit( $yearlink, 'year' ) );
 	} else {
 		$yearlink = home_url( '?m=' . $year );
@@ -480,16 +500,18 @@ function get_year_link( $year ) {
  * @param bool|int $month False for current month. Integer of month.
  * @return string The permalink for the specified month and year archive.
  */
-function get_month_link($year, $month) {
+function get_month_link( $year, $month ) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
+	if ( ! $year ) {
+		$year = gmdate( 'Y', current_time( 'timestamp' ) );
+	}
+	if ( ! $month ) {
+		$month = gmdate( 'm', current_time( 'timestamp' ) );
+	}
 	$monthlink = $wp_rewrite->get_month_permastruct();
-	if ( !empty($monthlink) ) {
-		$monthlink = str_replace('%year%', $year, $monthlink);
-		$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
+	if ( ! empty( $monthlink ) ) {
+		$monthlink = str_replace( '%year%', $year, $monthlink );
+		$monthlink = str_replace( '%monthnum%', zeroise( intval( $month ), 2 ), $monthlink );
 		$monthlink = home_url( user_trailingslashit( $monthlink, 'month' ) );
 	} else {
 		$monthlink = home_url( '?m=' . $year . zeroise( $month, 2 ) );
@@ -519,20 +541,23 @@ function get_month_link($year, $month) {
  * @param bool|int $day   False for current day. Integer of day.
  * @return string The permalink for the specified day, month, and year archive.
  */
-function get_day_link($year, $month, $day) {
+function get_day_link( $year, $month, $day ) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
-		$day = gmdate('j', current_time('timestamp'));
+	if ( ! $year ) {
+		$year = gmdate( 'Y', current_time( 'timestamp' ) );
+	}
+	if ( ! $month ) {
+		$month = gmdate( 'm', current_time( 'timestamp' ) );
+	}
+	if ( ! $day ) {
+		$day = gmdate( 'j', current_time( 'timestamp' ) );
+	}
 
 	$daylink = $wp_rewrite->get_day_permastruct();
-	if ( !empty($daylink) ) {
-		$daylink = str_replace('%year%', $year, $daylink);
-		$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
-		$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
+	if ( ! empty( $daylink ) ) {
+		$daylink = str_replace( '%year%', $year, $daylink );
+		$daylink = str_replace( '%monthnum%', zeroise( intval( $month ), 2 ), $daylink );
+		$daylink = str_replace( '%day%', zeroise( intval( $day ), 2 ), $daylink );
 		$daylink = home_url( user_trailingslashit( $daylink, 'day' ) );
 	} else {
 		$daylink = home_url( '?m=' . $year . zeroise( $month, 2 ) . zeroise( $day, 2 ) );
@@ -589,25 +614,28 @@ function get_feed_link( $feed = '' ) {
 
 	$permalink = $wp_rewrite->get_feed_permastruct();
 	if ( '' != $permalink ) {
-		if ( false !== strpos($feed, 'comments_') ) {
-			$feed = str_replace('comments_', '', $feed);
+		if ( false !== strpos( $feed, 'comments_' ) ) {
+			$feed      = str_replace( 'comments_', '', $feed );
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
+		if ( get_default_feed() == $feed ) {
 			$feed = '';
+		}
 
-		$permalink = str_replace('%feed%', $feed, $permalink);
-		$permalink = preg_replace('#/+#', '/', "/$permalink");
-		$output =  home_url( user_trailingslashit($permalink, 'feed') );
+		$permalink = str_replace( '%feed%', $feed, $permalink );
+		$permalink = preg_replace( '#/+#', '/', "/$permalink" );
+		$output    = home_url( user_trailingslashit( $permalink, 'feed' ) );
 	} else {
-		if ( empty($feed) )
+		if ( empty( $feed ) ) {
 			$feed = get_default_feed();
+		}
 
-		if ( false !== strpos($feed, 'comments_') )
-			$feed = str_replace('comments_', 'comments-', $feed);
+		if ( false !== strpos( $feed, 'comments_' ) ) {
+			$feed = str_replace( 'comments_', 'comments-', $feed );
+		}
 
-		$output = home_url("?feed={$feed}");
+		$output = home_url( "?feed={$feed}" );
 	}
 
 	/**
@@ -633,40 +661,59 @@ function get_feed_link( $feed = '' ) {
 function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
+	if ( ! $post_id ) {
 		$post_id = get_the_ID();
+	}
 
-	if ( empty( $feed ) )
+	if ( empty( $feed ) ) {
 		$feed = get_default_feed();
+	}
 
-	$post = get_post( $post_id );
+	$post       = get_post( $post_id );
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
-	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
+	if ( '' != get_option( 'permalink_structure' ) ) {
+		if ( 'page' == get_option( 'show_on_front' ) && $post_id == get_option( 'page_on_front' ) ) {
 			$url = _get_page_link( $post_id );
-		else
-			$url = get_permalink($post_id);
+		} else {
+			$url = get_permalink( $post_id );
+		}
 
 		if ( $unattached ) {
-			$url =  home_url( '/feed/' );
+			$url = home_url( '/feed/' );
 			if ( $feed !== get_default_feed() ) {
 				$url .= "$feed/";
 			}
 			$url = add_query_arg( 'attachment_id', $post_id, $url );
 		} else {
-			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
+			$url = trailingslashit( $url ) . 'feed';
+			if ( $feed != get_default_feed() ) {
 				$url .= "/$feed";
-			$url = user_trailingslashit($url, 'single_feed');
+			}
+			$url = user_trailingslashit( $url, 'single_feed' );
 		}
 	} else {
 		if ( $unattached ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(
+				array(
+					'feed'          => $feed,
+					'attachment_id' => $post_id,
+				), home_url( '/' )
+			);
 		} elseif ( 'page' == $post->post_type ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(
+				array(
+					'feed'    => $feed,
+					'page_id' => $post_id,
+				), home_url( '/' )
+			);
 		} else {
-			$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(
+				array(
+					'feed' => $feed,
+					'p'    => $post_id,
+				), home_url( '/' )
+			);
 		}
 	}
 
@@ -696,7 +743,7 @@ function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
 function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
 	$url = get_post_comments_feed_link( $post_id, $feed );
 	if ( empty( $link_text ) ) {
-		$link_text = __('Comments Feed');
+		$link_text = __( 'Comments Feed' );
 	}
 
 	$link = '<a href="' . esc_url( $url ) . '">' . $link_text . '</a>';
@@ -725,22 +772,24 @@ function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
  * @return string Link to the feed for the author specified by $author_id.
  */
 function get_author_feed_link( $author_id, $feed = '' ) {
-	$author_id = (int) $author_id;
-	$permalink_structure = get_option('permalink_structure');
+	$author_id           = (int) $author_id;
+	$permalink_structure = get_option( 'permalink_structure' );
 
-	if ( empty($feed) )
+	if ( empty( $feed ) ) {
 		$feed = get_default_feed();
+	}
 
 	if ( '' == $permalink_structure ) {
-		$link = home_url("?feed=$feed&amp;author=" . $author_id);
+		$link = home_url( "?feed=$feed&amp;author=" . $author_id );
 	} else {
-		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
+		$link = get_author_posts_url( $author_id );
+		if ( $feed == get_default_feed() ) {
 			$feed_link = 'feed';
-		else
+		} else {
 			$feed_link = "feed/$feed";
+		}
 
-		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
+		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
 	}
 
 	/**
@@ -786,34 +835,36 @@ function get_category_feed_link( $cat_id, $feed = '' ) {
  * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
  */
 function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
-	$term_id = ( int ) $term_id;
+	$term_id = (int) $term_id;
 
-	$term = get_term( $term_id, $taxonomy  );
+	$term = get_term( $term_id, $taxonomy );
 
-	if ( empty( $term ) || is_wp_error( $term ) )
+	if ( empty( $term ) || is_wp_error( $term ) ) {
 		return false;
+	}
 
-	if ( empty( $feed ) )
+	if ( empty( $feed ) ) {
 		$feed = get_default_feed();
+	}
 
 	$permalink_structure = get_option( 'permalink_structure' );
 
 	if ( '' == $permalink_structure ) {
 		if ( 'category' == $taxonomy ) {
-			$link = home_url("?feed=$feed&amp;cat=$term_id");
-		}
-		elseif ( 'post_tag' == $taxonomy ) {
-			$link = home_url("?feed=$feed&amp;tag=$term->slug");
+			$link = home_url( "?feed=$feed&amp;cat=$term_id" );
+		} elseif ( 'post_tag' == $taxonomy ) {
+			$link = home_url( "?feed=$feed&amp;tag=$term->slug" );
 		} else {
-			$t = get_taxonomy( $taxonomy );
-			$link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
+			$t    = get_taxonomy( $taxonomy );
+			$link = home_url( "?feed=$feed&amp;$t->query_var=$term->slug" );
 		}
 	} else {
 		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
+		if ( $feed == get_default_feed() ) {
 			$feed_link = 'feed';
-		else
+		} else {
 			$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
 	}
@@ -979,19 +1030,22 @@ function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
  * @return string|void HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
+	if ( is_null( $term ) ) {
 		$term = get_queried_object();
+	}
 
-	if ( ! $term )
+	if ( ! $term ) {
 		return;
+	}
 
 	$tax = get_taxonomy( $term->taxonomy );
 	if ( ! current_user_can( 'edit_term', $term->term_id ) ) {
 		return;
 	}
 
-	if ( empty( $link ) )
-		$link = __('Edit This');
+	if ( empty( $link ) ) {
+		$link = __( 'Edit This' );
+	}
 
 	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
 
@@ -1005,10 +1059,11 @@ function edit_term_link( $link = '', $before = '', $after = '', $term = null, $e
 	 */
 	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $link;
-	else
+	} else {
 		return $link;
+	}
 }
 
 /**
@@ -1024,20 +1079,21 @@ function edit_term_link( $link = '', $before = '', $after = '', $term = null, $e
 function get_search_link( $query = '' ) {
 	global $wp_rewrite;
 
-	if ( empty($query) )
+	if ( empty( $query ) ) {
 		$search = get_search_query( false );
-	else
-		$search = stripslashes($query);
+	} else {
+		$search = stripslashes( $query );
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
 	if ( empty( $permastruct ) ) {
-		$link = home_url('?s=' . urlencode($search) );
+		$link = home_url( '?s=' . urlencode( $search ) );
 	} else {
-		$search = urlencode($search);
-		$search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it un-encoded.
-		$link = str_replace( '%search%', $search, $permastruct );
-		$link = home_url( user_trailingslashit( $link, 'search' ) );
+		$search = urlencode( $search );
+		$search = str_replace( '%2F', '/', $search ); // %2F(/) is not valid within a URL, send it un-encoded.
+		$link   = str_replace( '%search%', $search, $permastruct );
+		$link   = home_url( user_trailingslashit( $link, 'search' ) );
 	}
 
 	/**
@@ -1062,19 +1118,20 @@ function get_search_link( $query = '' ) {
  * @param string $feed         Optional. Feed type. Default empty.
  * @return string The search results feed permalink.
  */
-function get_search_feed_link($search_query = '', $feed = '') {
+function get_search_feed_link( $search_query = '', $feed = '' ) {
 	global $wp_rewrite;
-	$link = get_search_link($search_query);
+	$link = get_search_link( $search_query );
 
-	if ( empty($feed) )
+	if ( empty( $feed ) ) {
 		$feed = get_default_feed();
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) ) {
-		$link = add_query_arg('feed', $feed, $link);
+	if ( empty( $permastruct ) ) {
+		$link = add_query_arg( 'feed', $feed, $link );
 	} else {
-		$link = trailingslashit($link);
+		$link  = trailingslashit( $link );
 		$link .= "feed/$feed/";
 	}
 
@@ -1101,20 +1158,22 @@ function get_search_feed_link($search_query = '', $feed = '') {
  * @param string $feed         Optional. Feed type. Default empty.
  * @return string The comments feed search results permalink.
  */
-function get_search_comments_feed_link($search_query = '', $feed = '') {
+function get_search_comments_feed_link( $search_query = '', $feed = '' ) {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
+	if ( empty( $feed ) ) {
 		$feed = get_default_feed();
+	}
 
-	$link = get_search_feed_link($search_query, $feed);
+	$link = get_search_feed_link( $search_query, $feed );
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
-	else
-		$link = add_query_arg('withcomments', 1, $link);
+	if ( empty( $permastruct ) ) {
+		$link = add_query_arg( 'feed', 'comments-' . $feed, $link );
+	} else {
+		$link = add_query_arg( 'withcomments', 1, $link );
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
@@ -1133,12 +1192,13 @@ function get_search_comments_feed_link($search_query = '', $feed = '') {
  */
 function get_post_type_archive_link( $post_type ) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
+	if ( ! $post_type_obj = get_post_type_object( $post_type ) ) {
 		return false;
+	}
 
 	if ( 'post' === $post_type ) {
-		$show_on_front = get_option( 'show_on_front' );
-		$page_for_posts  = get_option( 'page_for_posts' );
+		$show_on_front  = get_option( 'show_on_front' );
+		$page_for_posts = get_option( 'page_for_posts' );
 
 		if ( 'page' == $show_on_front && $page_for_posts ) {
 			$link = get_permalink( $page_for_posts );
@@ -1149,15 +1209,17 @@ function get_post_type_archive_link( $post_type ) {
 		return apply_filters( 'post_type_archive_link', $link, $post_type );
 	}
 
-	if ( ! $post_type_obj->has_archive )
+	if ( ! $post_type_obj->has_archive ) {
 		return false;
+	}
 
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
 		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
+		if ( $post_type_obj->rewrite['with_front'] ) {
 			$struct = $wp_rewrite->front . $struct;
-		else
+		} else {
 			$struct = $wp_rewrite->root . $struct;
+		}
 		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
 	} else {
 		$link = home_url( '?post_type=' . $post_type );
@@ -1185,18 +1247,21 @@ function get_post_type_archive_link( $post_type ) {
  */
 function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
+	if ( empty( $feed ) ) {
 		$feed = $default_feed;
+	}
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
+	if ( ! $link = get_post_type_archive_link( $post_type ) ) {
 		return false;
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
-		$link = trailingslashit( $link );
+		$link  = trailingslashit( $link );
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
+		if ( $feed != $default_feed ) {
 			$link .= "$feed/";
+		}
 	} else {
 		$link = add_query_arg( 'feed', $feed, $link );
 	}
@@ -1239,7 +1304,7 @@ function get_preview_post_link( $post = null, $query_args = array(), $preview_li
 		}
 
 		$query_args['preview'] = 'true';
-		$preview_link = add_query_arg( $query_args, $preview_link );
+		$preview_link          = add_query_arg( $query_args, $preview_link );
 	}
 
 	/**
@@ -1268,22 +1333,26 @@ function get_preview_post_link( $post = null, $query_args = array(), $preview_li
  *                     not allow an editing UI.
  */
 function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
+	if ( ! $post = get_post( $id ) ) {
 		return;
+	}
 
-	if ( 'revision' === $post->post_type )
+	if ( 'revision' === $post->post_type ) {
 		$action = '';
-	elseif ( 'display' == $context )
+	} elseif ( 'display' == $context ) {
 		$action = '&amp;action=edit';
-	else
+	} else {
 		$action = '&action=edit';
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	if ( ! $post_type_object ) {
 		return;
+	}
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
 		return;
+	}
 
 	if ( $post_type_object->_edit_link ) {
 		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
@@ -1356,20 +1425,24 @@ function edit_post_link( $text = null, $before = '', $after = '', $id = 0, $clas
  * @return string|void The delete post link URL for the given post.
  */
 function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
-	if ( !$post = get_post( $id ) )
+	if ( ! $post = get_post( $id ) ) {
 		return;
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	if ( ! $post_type_object ) {
 		return;
+	}
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
+	if ( ! current_user_can( 'delete_post', $post->ID ) ) {
 		return;
+	}
 
-	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
+	$action = ( $force_delete || ! EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
 
 	$delete_link = add_query_arg( 'action', $action, admin_url( sprintf( $post_type_object->_edit_link, $post->ID ) ) );
 
@@ -1396,10 +1469,11 @@ function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false
 function get_edit_comment_link( $comment_id = 0 ) {
 	$comment = get_comment( $comment_id );
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
 		return;
+	}
 
-	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
+	$location = admin_url( 'comment.php?action=editcomment&amp;c=' ) . $comment->comment_ID;
 
 	/**
 	 * Filters the comment edit link.
@@ -1456,10 +1530,11 @@ function edit_comment_link( $text = null, $before = '', $after = '' ) {
 function get_edit_bookmark_link( $link = 0 ) {
 	$link = get_bookmark( $link );
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can( 'manage_links' ) ) {
 		return;
+	}
 
-	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
+	$location = admin_url( 'link.php?action=edit&amp;link_id=' ) . $link->link_id;
 
 	/**
 	 * Filters the bookmark edit link.
@@ -1483,13 +1558,15 @@ function get_edit_bookmark_link( $link = 0 ) {
  * @param int    $bookmark Optional. Bookmark ID. Default is the current bookmark.
  */
 function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
-	$bookmark = get_bookmark($bookmark);
+	$bookmark = get_bookmark( $bookmark );
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can( 'manage_links' ) ) {
 		return;
+	}
 
-	if ( empty($link) )
-		$link = __('Edit This');
+	if ( empty( $link ) ) {
+		$link = __( 'Edit This' );
+	}
 
 	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
 
@@ -1513,21 +1590,25 @@ function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark =
  * @return string URL to edit user page or empty string.
  */
 function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
+	if ( ! $user_id ) {
 		$user_id = get_current_user_id();
+	}
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
+	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) ) {
 		return '';
+	}
 
 	$user = get_userdata( $user_id );
 
-	if ( ! $user )
+	if ( ! $user ) {
 		return '';
+	}
 
-	if ( get_current_user_id() == $user->ID )
+	if ( get_current_user_id() == $user->ID ) {
 		$link = get_edit_profile_url( $user->ID );
-	else
+	} else {
 		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	}
 
 	/**
 	 * Filters the user edit link.
@@ -1591,13 +1672,14 @@ function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy =
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
+	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) ) {
 		return null;
+	}
 
 	$current_post_date = $post->post_date;
 
-	$join = '';
-	$where = '';
+	$join     = '';
+	$where    = '';
 	$adjacent = $previous ? 'previous' : 'next';
 
 	if ( $in_same_term || ! empty( $excluded_terms ) ) {
@@ -1614,21 +1696,23 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 		}
 
 		if ( $in_same_term ) {
-			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
-			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+			$join  .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
+			$where .= $wpdb->prepare( 'AND tt.taxonomy = %s', $taxonomy );
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
+			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
 				return '';
+			}
 			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
 
 			// Remove any exclusions from the term array to include.
 			$term_array = array_diff( $term_array, (array) $excluded_terms );
 			$term_array = array_map( 'intval', $term_array );
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
+			if ( ! $term_array || is_wp_error( $term_array ) ) {
 				return '';
+			}
 
-			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
+			$where .= ' AND tt.term_id IN (' . implode( ',', $term_array ) . ')';
 		}
 
 		/**
@@ -1665,20 +1749,20 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 		 * current user has the 'read_private_posts' cap.
 		 */
 		$private_states = get_post_stati( array( 'private' => true ) );
-		$where .= " AND ( p.post_status = 'publish'";
+		$where         .= " AND ( p.post_status = 'publish'";
 		foreach ( (array) $private_states as $state ) {
 			if ( current_user_can( $read_private_cap ) ) {
-				$where .= $wpdb->prepare( " OR p.post_status = %s", $state );
+				$where .= $wpdb->prepare( ' OR p.post_status = %s', $state );
 			} else {
-				$where .= $wpdb->prepare( " OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state );
+				$where .= $wpdb->prepare( ' OR (p.post_author = %d AND p.post_status = %s)', $user_id, $state );
 			}
 		}
-		$where .= " )";
+		$where .= ' )';
 	} else {
 		$where .= " AND p.post_status = 'publish'";
 	}
 
-	$op = $previous ? '<' : '>';
+	$op    = $previous ? '<' : '>';
 	$order = $previous ? 'DESC' : 'ASC';
 
 	/**
@@ -1729,25 +1813,28 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
 	 * @param WP_Post $post    WP_Post object.
 	 * @param string  $order   Sort order. 'DESC' for previous post, 'ASC' for next.
 	 */
-	$sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post, $order );
+	$sort = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post, $order );
 
-	$query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
+	$query     = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
 	$query_key = 'adjacent_post_' . md5( $query );
-	$result = wp_cache_get( $query_key, 'counts' );
+	$result    = wp_cache_get( $query_key, 'counts' );
 	if ( false !== $result ) {
-		if ( $result )
+		if ( $result ) {
 			$result = get_post( $result );
+		}
 		return $result;
 	}
 
 	$result = $wpdb->get_var( $query );
-	if ( null === $result )
+	if ( null === $result ) {
 		$result = '';
+	}
 
 	wp_cache_set( $query_key, $result, 'counts' );
 
-	if ( $result )
+	if ( $result ) {
 		$result = get_post( $result );
+	}
 
 	return $result;
 }
@@ -1767,25 +1854,33 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
  * @return string|void The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
+	if ( $previous && is_attachment() && $post = get_post() ) {
 		$post = get_post( $post->post_parent );
-	else
+	} else {
 		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
-	if ( empty( $post ) )
+	if ( empty( $post ) ) {
 		return;
+	}
 
-	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
+	$post_title = the_title_attribute(
+		array(
+			'echo' => false,
+			'post' => $post,
+		)
+	);
 
-	if ( empty( $post_title ) )
+	if ( empty( $post_title ) ) {
 		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	}
 
 	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
 
 	$title = str_replace( '%title', $post_title, $title );
 	$title = str_replace( '%date', $date, $title );
 
-	$link = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
+	$link  = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
 	$link .= esc_attr( $title );
 	$link .= "' href='" . get_permalink( $post ) . "' />\n";
 
@@ -1886,43 +1981,49 @@ function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded
  */
 function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) ) {
 		return null;
+	}
 
 	$query_args = array(
-		'posts_per_page' => 1,
-		'order' => $start ? 'ASC' : 'DESC',
+		'posts_per_page'         => 1,
+		'order'                  => $start ? 'ASC' : 'DESC',
 		'update_post_term_cache' => false,
-		'update_post_meta_cache' => false
+		'update_post_meta_cache' => false,
 	);
 
 	$term_array = array();
 
 	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
+		if ( ! empty( $excluded_terms ) ) {
 			$excluded_terms = explode( ',', $excluded_terms );
-		else
+		} else {
 			$excluded_terms = array();
+		}
 	}
 
 	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
+		if ( $in_same_term ) {
 			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		}
 
 		if ( ! empty( $excluded_terms ) ) {
 			$excluded_terms = array_map( 'intval', $excluded_terms );
 			$excluded_terms = array_diff( $excluded_terms, $term_array );
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
+			foreach ( $excluded_terms as $excluded_term ) {
 				$inverse_terms[] = $excluded_term * -1;
+			}
 			$excluded_terms = $inverse_terms;
 		}
 
-		$query_args[ 'tax_query' ] = array( array(
-			'taxonomy' => $taxonomy,
-			'terms' => array_merge( $term_array, $excluded_terms )
-		) );
+		$query_args['tax_query'] = array(
+			array(
+				'taxonomy' => $taxonomy,
+				'terms'    => array_merge( $term_array, $excluded_terms ),
+			),
+		);
 	}
 
 	return get_posts( $query_args );
@@ -2009,26 +2110,28 @@ function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_t
  * @return string The link URL of the previous or next post in relation to the current post.
  */
 function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
+	if ( $previous && is_attachment() ) {
 		$post = get_post( get_post()->post_parent );
-	else
+	} else {
 		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
 	if ( ! $post ) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
+		if ( empty( $post->post_title ) ) {
 			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		}
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$title = apply_filters( 'the_title', $title, $post->ID );
 
 		$date = mysql2date( get_option( 'date_format' ), $post->post_date );
-		$rel = $previous ? 'prev' : 'next';
+		$rel  = $previous ? 'prev' : 'next';
 
-		$string = '<a href="' . get_permalink( $post ) . '" rel="'.$rel.'">';
+		$string = '<a href="' . get_permalink( $post ) . '" rel="' . $rel . '">';
 		$inlink = str_replace( '%title', $title, $link );
 		$inlink = str_replace( '%date', $date, $inlink );
 		$inlink = $string . $inlink . '</a>';
@@ -2083,24 +2186,24 @@ function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_te
  *
  * @param int  $pagenum Optional. Page ID. Default 1.
  * @param bool $escape  Optional. Whether to escape the URL for display, with esc_url(). Defaults to true.
- * 	                    Otherwise, prepares the URL with esc_url_raw().
+ *                      Otherwise, prepares the URL with esc_url_raw().
  * @return string The link URL for the given page number.
  */
-function get_pagenum_link($pagenum = 1, $escape = true ) {
+function get_pagenum_link( $pagenum = 1, $escape = true ) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
 	$request = remove_query_arg( 'paged' );
 
-	$home_root = parse_url(home_url());
-	$home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
+	$home_root = parse_url( home_url() );
+	$home_root = ( isset( $home_root['path'] ) ) ? $home_root['path'] : '';
 	$home_root = preg_quote( $home_root, '|' );
 
-	$request = preg_replace('|^'. $home_root . '|i', '', $request);
-	$request = preg_replace('|^/+|', '', $request);
+	$request = preg_replace( '|^' . $home_root . '|i', '', $request );
+	$request = preg_replace( '|^/+|', '', $request );
 
-	if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
+	if ( ! $wp_rewrite->using_permalinks() || is_admin() ) {
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
 		if ( $pagenum > 1 ) {
@@ -2112,24 +2215,25 @@ function get_pagenum_link($pagenum = 1, $escape = true ) {
 		$qs_regex = '|\?.*?$|';
 		preg_match( $qs_regex, $request, $qs_match );
 
-		if ( !empty( $qs_match[0] ) ) {
+		if ( ! empty( $qs_match[0] ) ) {
 			$query_string = $qs_match[0];
-			$request = preg_replace( $qs_regex, '', $request );
+			$request      = preg_replace( $qs_regex, '', $request );
 		} else {
 			$query_string = '';
 		}
 
-		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
-		$request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
-		$request = ltrim($request, '/');
+		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request );
+		$request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request );
+		$request = ltrim( $request, '/' );
 
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
+		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) ) {
 			$base .= $wp_rewrite->index . '/';
+		}
 
 		if ( $pagenum > 1 ) {
-			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
+			$request = ( ( ! empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . '/' . $pagenum, 'paged' );
 		}
 
 		$result = $base . $request . $query_string;
@@ -2144,10 +2248,11 @@ function get_pagenum_link($pagenum = 1, $escape = true ) {
 	 */
 	$result = apply_filters( 'get_pagenum_link', $result );
 
-	if ( $escape )
+	if ( $escape ) {
 		return esc_url( $result );
-	else
+	} else {
 		return esc_url_raw( $result );
+	}
 }
 
 /**
@@ -2162,15 +2267,17 @@ function get_pagenum_link($pagenum = 1, $escape = true ) {
  * @param int $max_page Optional. Max pages. Default 0.
  * @return string|void The link URL for next posts page.
  */
-function get_next_posts_page_link($max_page = 0) {
+function get_next_posts_page_link( $max_page = 0 ) {
 	global $paged;
 
-	if ( !is_single() ) {
-		if ( !$paged )
+	if ( ! is_single() ) {
+		if ( ! $paged ) {
 			$paged = 1;
-		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
-			return get_pagenum_link($nextpage);
+		}
+		$nextpage = intval( $paged ) + 1;
+		if ( ! $max_page || $max_page >= $nextpage ) {
+			return get_pagenum_link( $nextpage );
+		}
 	}
 }
 
@@ -2186,10 +2293,11 @@ function get_next_posts_page_link($max_page = 0) {
 function next_posts( $max_page = 0, $echo = true ) {
 	$output = esc_url( get_next_posts_page_link( $max_page ) );
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $output;
-	else
+	} else {
 		return $output;
+	}
 }
 
 /**
@@ -2207,18 +2315,21 @@ function next_posts( $max_page = 0, $echo = true ) {
 function get_next_posts_link( $label = null, $max_page = 0 ) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
+	if ( ! $max_page ) {
 		$max_page = $wp_query->max_num_pages;
+	}
 
-	if ( !$paged )
+	if ( ! $paged ) {
 		$paged = 1;
+	}
 
-	$nextpage = intval($paged) + 1;
+	$nextpage = intval( $paged ) + 1;
 
-	if ( null === $label )
+	if ( null === $label ) {
 		$label = __( 'Next Page &raquo;' );
+	}
 
-	if ( !is_single() && ( $nextpage <= $max_page ) ) {
+	if ( ! is_single() && ( $nextpage <= $max_page ) ) {
 		/**
 		 * Filters the anchor tag attributes for the next posts page link.
 		 *
@@ -2228,7 +2339,7 @@ function get_next_posts_link( $label = null, $max_page = 0 ) {
 		 */
 		$attr = apply_filters( 'next_posts_link_attributes', '' );
 
-		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
+		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
 	}
 }
 
@@ -2260,11 +2371,12 @@ function next_posts_link( $label = null, $max_page = 0 ) {
 function get_previous_posts_page_link() {
 	global $paged;
 
-	if ( !is_single() ) {
-		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
+	if ( ! is_single() ) {
+		$nextpage = intval( $paged ) - 1;
+		if ( $nextpage < 1 ) {
 			$nextpage = 1;
-		return get_pagenum_link($nextpage);
+		}
+		return get_pagenum_link( $nextpage );
 	}
 }
 
@@ -2279,10 +2391,11 @@ function get_previous_posts_page_link() {
 function previous_posts( $echo = true ) {
 	$output = esc_url( get_previous_posts_page_link() );
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $output;
-	else
+	} else {
 		return $output;
+	}
 }
 
 /**
@@ -2298,10 +2411,11 @@ function previous_posts( $echo = true ) {
 function get_previous_posts_link( $label = null ) {
 	global $paged;
 
-	if ( null === $label )
+	if ( null === $label ) {
 		$label = __( '&laquo; Previous Page' );
+	}
 
-	if ( !is_single() && $paged > 1 ) {
+	if ( ! is_single() && $paged > 1 ) {
 		/**
 		 * Filters the anchor tag attributes for the previous posts page link.
 		 *
@@ -2310,7 +2424,7 @@ function get_previous_posts_link( $label = null ) {
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
 		$attr = apply_filters( 'previous_posts_link_attributes', '' );
-		return '<a href="' . previous_posts( false ) . "\" $attr>". preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) .'</a>';
+		return '<a href="' . previous_posts( false ) . "\" $attr>" . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
 	}
 }
 
@@ -2348,26 +2462,26 @@ function get_posts_nav_link( $args = array() ) {
 
 	$return = '';
 
-	if ( !is_singular() ) {
+	if ( ! is_singular() ) {
 		$defaults = array(
-			'sep' => ' &#8212; ',
-			'prelabel' => __('&laquo; Previous Page'),
-			'nxtlabel' => __('Next Page &raquo;'),
+			'sep'      => ' &#8212; ',
+			'prelabel' => __( '&laquo; Previous Page' ),
+			'nxtlabel' => __( 'Next Page &raquo;' ),
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args     = wp_parse_args( $args, $defaults );
 
 		$max_num_pages = $wp_query->max_num_pages;
-		$paged = get_query_var('paged');
+		$paged         = get_query_var( 'paged' );
 
 		//only have sep if there's both prev and next results
-		if ($paged < 2 || $paged >= $max_num_pages) {
+		if ( $paged < 2 || $paged >= $max_num_pages ) {
 			$args['sep'] = '';
 		}
 
 		if ( $max_num_pages > 1 ) {
-			$return = get_previous_posts_link($args['prelabel']);
-			$return .= preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep']);
-			$return .= get_next_posts_link($args['nxtlabel']);
+			$return  = get_previous_posts_link( $args['prelabel'] );
+			$return .= preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep'] );
+			$return .= get_next_posts_link( $args['nxtlabel'] );
 		}
 	}
 	return $return;
@@ -2384,8 +2498,8 @@ function get_posts_nav_link( $args = array() ) {
  * @param string $nxtlabel Optional Label for next pages. Default empty.
  */
 function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
-	$args = array_filter( compact('sep', 'prelabel', 'nxtlabel') );
-	echo get_posts_nav_link($args);
+	$args = array_filter( compact( 'sep', 'prelabel', 'nxtlabel' ) );
+	echo get_posts_nav_link( $args );
 }
 
 /**
@@ -2407,14 +2521,16 @@ function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
  * @return string Markup for post links.
  */
 function get_the_post_navigation( $args = array() ) {
-	$args = wp_parse_args( $args, array(
-		'prev_text'          => '%title',
-		'next_text'          => '%title',
-		'in_same_term'       => false,
-		'excluded_terms'     => '',
-		'taxonomy'           => 'category',
-		'screen_reader_text' => __( 'Post navigation' ),
-	) );
+	$args = wp_parse_args(
+		$args, array(
+			'prev_text'          => '%title',
+			'next_text'          => '%title',
+			'in_same_term'       => false,
+			'excluded_terms'     => '',
+			'taxonomy'           => 'category',
+			'screen_reader_text' => __( 'Post navigation' ),
+		)
+	);
 
 	$navigation = '';
 
@@ -2478,11 +2594,13 @@ 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(
-			'prev_text'          => __( 'Older posts' ),
-			'next_text'          => __( 'Newer posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
+		$args = wp_parse_args(
+			$args, array(
+				'prev_text'          => __( 'Older posts' ),
+				'next_text'          => __( 'Newer posts' ),
+				'screen_reader_text' => __( 'Posts navigation' ),
+			)
+		);
 
 		$next_link = get_previous_posts_link( $args['next_text'] );
 		$prev_link = get_next_posts_link( $args['prev_text'] );
@@ -2531,12 +2649,14 @@ 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(
-			'mid_size'           => 1,
-			'prev_text'          => _x( 'Previous', 'previous set of posts' ),
-			'next_text'          => _x( 'Next', 'next set of posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
+		$args = wp_parse_args(
+			$args, array(
+				'mid_size'           => 1,
+				'prev_text'          => _x( 'Previous', 'previous set of posts' ),
+				'next_text'          => _x( 'Next', 'next set of posts' ),
+				'screen_reader_text' => __( 'Posts navigation' ),
+			)
+		);
 
 		// Make sure we get a string back. Plain is the next best thing.
 		if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
@@ -2629,18 +2749,20 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
 
 	$result = get_permalink();
 
-	if ( 'newest' == get_option('default_comments_page') ) {
+	if ( 'newest' == get_option( 'default_comments_page' ) ) {
 		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-			else
+			if ( $wp_rewrite->using_permalinks() ) {
+				$result = user_trailingslashit( trailingslashit( $result ) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged' );
+			} else {
 				$result = add_query_arg( 'cpage', $pagenum, $result );
+			}
 		}
 	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-		else
+		if ( $wp_rewrite->using_permalinks() ) {
+			$result = user_trailingslashit( trailingslashit( $result ) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged' );
+		} else {
 			$result = add_query_arg( 'cpage', $pagenum, $result );
+		}
 	}
 
 	$result .= '#comments';
@@ -2669,28 +2791,33 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
 function get_next_comments_link( $label = '', $max_page = 0 ) {
 	global $wp_query;
 
-	if ( ! is_singular() )
+	if ( ! is_singular() ) {
 		return;
+	}
 
-	$page = get_query_var('cpage');
+	$page = get_query_var( 'cpage' );
 
 	if ( ! $page ) {
 		$page = 1;
 	}
 
-	$nextpage = intval($page) + 1;
+	$nextpage = intval( $page ) + 1;
 
-	if ( empty($max_page) )
+	if ( empty( $max_page ) ) {
 		$max_page = $wp_query->max_num_comment_pages;
+	}
 
-	if ( empty($max_page) )
+	if ( empty( $max_page ) ) {
 		$max_page = get_comment_pages_count();
+	}
 
-	if ( $nextpage > $max_page )
+	if ( $nextpage > $max_page ) {
 		return;
+	}
 
-	if ( empty($label) )
-		$label = __('Newer Comments &raquo;');
+	if ( empty( $label ) ) {
+		$label = __( 'Newer Comments &raquo;' );
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the next comments page link.
@@ -2699,7 +2826,7 @@ function get_next_comments_link( $label = '', $max_page = 0 ) {
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>' . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
 }
 
 /**
@@ -2723,18 +2850,21 @@ function next_comments_link( $label = '', $max_page = 0 ) {
  * @return string|void HTML-formatted link for the previous page of comments.
  */
 function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
+	if ( ! is_singular() ) {
 		return;
+	}
 
-	$page = get_query_var('cpage');
+	$page = get_query_var( 'cpage' );
 
-	if ( intval($page) <= 1 )
+	if ( intval( $page ) <= 1 ) {
 		return;
+	}
 
-	$prevpage = intval($page) - 1;
+	$prevpage = intval( $page ) - 1;
 
-	if ( empty($label) )
-		$label = __('&laquo; Older Comments');
+	if ( empty( $label ) ) {
+		$label = __( '&laquo; Older Comments' );
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the previous comments page link.
@@ -2743,7 +2873,7 @@ function get_previous_comments_link( $label = '' ) {
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) . '</a>';
 }
 
 /**
@@ -2771,31 +2901,35 @@ function previous_comments_link( $label = '' ) {
 function paginate_comments_links( $args = array() ) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
+	if ( ! is_singular() ) {
 		return;
+	}
 
-	$page = get_query_var('cpage');
-	if ( !$page )
+	$page = get_query_var( 'cpage' );
+	if ( ! $page ) {
 		$page = 1;
+	}
 	$max_page = get_comment_pages_count();
 	$defaults = array(
-		'base' => add_query_arg( 'cpage', '%#%' ),
-		'format' => '',
-		'total' => $max_page,
-		'current' => $page,
-		'echo' => true,
-		'add_fragment' => '#comments'
+		'base'         => add_query_arg( 'cpage', '%#%' ),
+		'format'       => '',
+		'total'        => $max_page,
+		'current'      => $page,
+		'echo'         => true,
+		'add_fragment' => '#comments',
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ( $wp_rewrite->using_permalinks() ) {
+		$defaults['base'] = user_trailingslashit( trailingslashit( get_permalink() ) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged' );
+	}
 
-	$args = wp_parse_args( $args, $defaults );
+	$args       = wp_parse_args( $args, $defaults );
 	$page_links = paginate_links( $args );
 
-	if ( $args['echo'] )
+	if ( $args['echo'] ) {
 		echo $page_links;
-	else
+	} else {
 		return $page_links;
+	}
 }
 
 /**
@@ -2819,11 +2953,13 @@ 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(
-			'prev_text'          => __( 'Older comments' ),
-			'next_text'          => __( 'Newer comments' ),
-			'screen_reader_text' => __( 'Comments navigation' ),
-		) );
+		$args = wp_parse_args(
+			$args, array(
+				'prev_text'          => __( 'Older comments' ),
+				'next_text'          => __( 'Newer comments' ),
+				'screen_reader_text' => __( 'Comments navigation' ),
+			)
+		);
 
 		$prev_link = get_previous_comments_link( $args['prev_text'] );
 		$next_link = get_next_comments_link( $args['next_text'] );
@@ -2868,10 +3004,12 @@ function the_comments_navigation( $args = array() ) {
  * @return string Markup for pagination links.
  */
 function get_the_comments_pagination( $args = array() ) {
-	$navigation = '';
-	$args       = wp_parse_args( $args, array(
-		'screen_reader_text' => __( 'Comments navigation' ),
-	) );
+	$navigation   = '';
+	$args         = wp_parse_args(
+		$args, array(
+			'screen_reader_text' => __( 'Comments navigation' ),
+		)
+	);
 	$args['echo'] = false;
 
 	// Make sure we get a string back. Plain is the next best thing.
@@ -2939,7 +3077,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
 
 	$orig_scheme = $scheme;
 
-	if ( empty( $blog_id ) || !is_multisite() ) {
+	if ( empty( $blog_id ) || ! is_multisite() ) {
 		$url = get_option( 'home' );
 	} else {
 		switch_to_blog( $blog_id );
@@ -2948,16 +3086,18 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
 	}
 
 	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
+		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
 			$scheme = 'https';
-		else
+		} else {
 			$scheme = parse_url( $url, PHP_URL_SCHEME );
+		}
 	}
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
+	if ( $path && is_string( $path ) ) {
 		$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the home URL.
@@ -3009,7 +3149,7 @@ function site_url( $path = '', $scheme = null ) {
  * @return string Site URL link with optional path appended.
  */
 function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
-	if ( empty( $blog_id ) || !is_multisite() ) {
+	if ( empty( $blog_id ) || ! is_multisite() ) {
 		$url = get_option( 'siteurl' );
 	} else {
 		switch_to_blog( $blog_id );
@@ -3019,8 +3159,9 @@ function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
+	if ( $path && is_string( $path ) ) {
 		$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the site URL.
@@ -3063,10 +3204,11 @@ function admin_url( $path = '', $scheme = 'admin' ) {
  * @return string Admin URL link with optional path appended.
  */
 function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
-	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
+	$url = get_site_url( $blog_id, 'wp-admin/', $scheme );
 
-	if ( $path && is_string( $path ) )
+	if ( $path && is_string( $path ) ) {
 		$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the admin area URL.
@@ -3093,8 +3235,9 @@ function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
 function includes_url( $path = '', $scheme = null ) {
 	$url = site_url( '/' . WPINC . '/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+		$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the URL to the includes directory.
@@ -3119,8 +3262,9 @@ function includes_url( $path = '', $scheme = null ) {
 function content_url( $path = '' ) {
 	$url = set_url_scheme( WP_CONTENT_URL );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+		$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the URL to the content directory.
@@ -3131,7 +3275,7 @@ function content_url( $path = '' ) {
 	 * @param string $path Path relative to the URL to the content directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'content_url', $url, $path);
+	return apply_filters( 'content_url', $url, $path );
 }
 
 /**
@@ -3150,26 +3294,28 @@ function content_url( $path = '' ) {
  */
 function plugins_url( $path = '', $plugin = '' ) {
 
-	$path = wp_normalize_path( $path );
-	$plugin = wp_normalize_path( $plugin );
+	$path          = wp_normalize_path( $path );
+	$plugin        = wp_normalize_path( $plugin );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
+	if ( ! empty( $plugin ) && 0 === strpos( $plugin, $mu_plugin_dir ) ) {
 		$url = WPMU_PLUGIN_URL;
-	else
+	} else {
 		$url = WP_PLUGIN_URL;
-
+	}
 
 	$url = set_url_scheme( $url );
 
-	if ( !empty($plugin) && is_string($plugin) ) {
-		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+	if ( ! empty( $plugin ) && is_string( $plugin ) ) {
+		$folder = dirname( plugin_basename( $plugin ) );
+		if ( '.' != $folder ) {
+			$url .= '/' . ltrim( $folder, '/' );
+		}
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+		$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the URL to the plugins directory.
@@ -3202,18 +3348,21 @@ function plugins_url( $path = '', $plugin = '' ) {
  * @return string Site URL link with optional path appended.
  */
 function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return site_url($path, $scheme);
+	if ( ! is_multisite() ) {
+		return site_url( $path, $scheme );
+	}
 
 	$current_network = get_network();
 
-	if ( 'relative' == $scheme )
+	if ( 'relative' == $scheme ) {
 		$url = $current_network->path;
-	else
+	} else {
 		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
+	if ( $path && is_string( $path ) ) {
 		$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network site URL.
@@ -3244,22 +3393,26 @@ function network_site_url( $path = '', $scheme = null ) {
  * @return string Home URL link with optional path appended.
  */
 function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return home_url($path, $scheme);
+	if ( ! is_multisite() ) {
+		return home_url( $path, $scheme );
+	}
 
 	$current_network = get_network();
-	$orig_scheme = $scheme;
+	$orig_scheme     = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
 		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	}
 
-	if ( 'relative' == $scheme )
+	if ( 'relative' == $scheme ) {
 		$url = $current_network->path;
-	else
+	} else {
 		$url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
+	if ( $path && is_string( $path ) ) {
 		$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network home URL.
@@ -3272,7 +3425,7 @@ function network_home_url( $path = '', $scheme = null ) {
 	 * @param string|null $orig_scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                                 'relative' or null.
 	 */
-	return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+	return apply_filters( 'network_home_url', $url, $path, $orig_scheme );
 }
 
 /**
@@ -3286,13 +3439,15 @@ function network_home_url( $path = '', $scheme = null ) {
  * @return string Admin URL link with optional path appended.
  */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
+	if ( ! is_multisite() ) {
 		return admin_url( $path, $scheme );
+	}
 
-	$url = network_site_url('wp-admin/network/', $scheme);
+	$url = network_site_url( 'wp-admin/network/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+		$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network admin URL.
@@ -3317,10 +3472,11 @@ function network_admin_url( $path = '', $scheme = 'admin' ) {
  * @return string Admin URL link with optional path appended.
  */
 function user_admin_url( $path = '', $scheme = 'admin' ) {
-	$url = network_site_url('wp-admin/user/', $scheme);
+	$url = network_site_url( 'wp-admin/user/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+		$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the user admin URL for the current user.
@@ -3388,13 +3544,15 @@ function set_url_scheme( $url, $scheme = null ) {
 	}
 
 	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
+	if ( substr( $url, 0, 2 ) === '//' ) {
 		$url = 'http:' . $url;
+	}
 
 	if ( 'relative' == $scheme ) {
 		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		if ( $url !== '' && $url[0] === '/' ) {
+			$url = '/' . ltrim( $url, "/ \t\n\r\0\x0B" );
+		}
 	} else {
 		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
 	}
@@ -3432,20 +3590,21 @@ function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
 	$blogs = get_blogs_of_user( $user_id );
-	if ( is_multisite() && ! user_can( $user_id, 'manage_network' ) && empty($blogs) ) {
+	if ( is_multisite() && ! user_can( $user_id, 'manage_network' ) && empty( $blogs ) ) {
 		$url = user_admin_url( $path, $scheme );
 	} elseif ( ! is_multisite() ) {
 		$url = admin_url( $path, $scheme );
 	} else {
 		$current_blog = get_current_blog_id();
-		if ( $current_blog  && ( user_can( $user_id, 'manage_network' ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
+		if ( $current_blog && ( user_can( $user_id, 'manage_network' ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
 			$url = admin_url( $path, $scheme );
 		} else {
 			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
+			if ( $active ) {
 				$url = get_admin_url( $active->blog_id, $path, $scheme );
-			else
+			} else {
 				$url = user_admin_url( $path, $scheme );
+			}
 		}
 	}
 
@@ -3460,7 +3619,7 @@ function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'user_dashboard_url', $url, $user_id, $path, $scheme);
+	return apply_filters( 'user_dashboard_url', $url, $user_id, $path, $scheme );
 }
 
 /**
@@ -3476,12 +3635,13 @@ function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
 function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
+	if ( is_user_admin() ) {
 		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
+	} elseif ( is_network_admin() ) {
 		$url = network_admin_url( 'profile.php', $scheme );
-	else
+	} else {
 		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	}
 
 	/**
 	 * Filters the URL for a user's profile editor.
@@ -3493,7 +3653,7 @@ function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'edit_profile_url', $url, $user_id, $scheme);
+	return apply_filters( 'edit_profile_url', $url, $user_id, $scheme );
 }
 
 /**
@@ -3616,11 +3776,12 @@ function wp_get_shortlink( $id = 0, $context = 'post', $allow_slugs = true ) {
 	$post_id = 0;
 	if ( 'query' == $context && is_singular() ) {
 		$post_id = get_queried_object_id();
-		$post = get_post( $post_id );
+		$post    = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
+		if ( ! empty( $post->ID ) ) {
 			$post_id = $post->ID;
+		}
 	}
 
 	$shortlink = '';
@@ -3659,8 +3820,9 @@ function wp_get_shortlink( $id = 0, $context = 'post', $allow_slugs = true ) {
 function wp_shortlink_wp_head() {
 	$shortlink = wp_get_shortlink( 0, 'query' );
 
-	if ( empty( $shortlink ) )
+	if ( empty( $shortlink ) ) {
 		return;
+	}
 
 	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
@@ -3673,15 +3835,17 @@ function wp_shortlink_wp_head() {
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
+	if ( headers_sent() ) {
 		return;
+	}
 
-	$shortlink = wp_get_shortlink(0, 'query');
+	$shortlink = wp_get_shortlink( 0, 'query' );
 
-	if ( empty($shortlink) )
+	if ( empty( $shortlink ) ) {
 		return;
+	}
 
-	header('Link: <' . $shortlink . '>; rel=shortlink', false);
+	header( 'Link: <' . $shortlink . '>; rel=shortlink', false );
 }
 
 /**
@@ -3701,15 +3865,17 @@ function wp_shortlink_header() {
 function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
 	$post = get_post();
 
-	if ( empty( $text ) )
-		$text = __('This is the short link.');
+	if ( empty( $text ) ) {
+		$text = __( 'This is the short link.' );
+	}
 
-	if ( empty( $title ) )
+	if ( empty( $title ) ) {
 		$title = the_title_attribute( array( 'echo' => false ) );
+	}
 
 	$shortlink = wp_get_shortlink( $post->ID );
 
-	if ( !empty( $shortlink ) ) {
+	if ( ! empty( $shortlink ) ) {
 		$link = '<a rel="shortlink" href="' . esc_url( $shortlink ) . '" title="' . $title . '">' . $text . '</a>';
 
 		/**
@@ -3797,17 +3963,19 @@ function get_avatar_url( $id_or_email, $args = null ) {
  * }
  */
 function get_avatar_data( $id_or_email, $args = null ) {
-	$args = wp_parse_args( $args, array(
-		'size'           => 96,
-		'height'         => null,
-		'width'          => null,
-		'default'        => get_option( 'avatar_default', 'mystery' ),
-		'force_default'  => false,
-		'rating'         => get_option( 'avatar_rating' ),
-		'scheme'         => null,
-		'processed_args' => null, // if used, should be a reference
-		'extra_attr'     => '',
-	) );
+	$args = wp_parse_args(
+		$args, array(
+			'size'           => 96,
+			'height'         => null,
+			'width'          => null,
+			'default'        => get_option( 'avatar_default', 'mystery' ),
+			'force_default'  => false,
+			'rating'         => get_option( 'avatar_rating' ),
+			'scheme'         => null,
+			'processed_args' => null, // if used, should be a reference
+			'extra_attr'     => '',
+		)
+	);
 
 	if ( is_numeric( $args['size'] ) ) {
 		$args['size'] = absint( $args['size'] );
@@ -3841,12 +4009,12 @@ function get_avatar_data( $id_or_email, $args = null ) {
 	}
 
 	switch ( $args['default'] ) {
-		case 'mm' :
-		case 'mystery' :
-		case 'mysteryman' :
+		case 'mm':
+		case 'mystery':
+		case 'mysteryman':
 			$args['default'] = 'mm';
 			break;
-		case 'gravatar_default' :
+		case 'gravatar_default':
 			$args['default'] = false;
 			break;
 	}
@@ -3878,7 +4046,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
 	}
 
 	$email_hash = '';
-	$user = $email = false;
+	$user       = $email = false;
 
 	if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
 		$id_or_email = get_comment( $id_or_email );
@@ -3936,7 +4104,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
 
 	if ( $email_hash ) {
 		$args['found_avatar'] = true;
-		$gravatar_server = hexdec( $email_hash[0] ) % 3;
+		$gravatar_server      = hexdec( $email_hash[0] ) % 3;
 	} else {
 		$gravatar_server = rand( 0, 2 );
 	}
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 5ecd2f492f..a29eed1002 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -27,20 +27,23 @@ function wp_get_server_protocol() {
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
+	if ( ! ini_get( 'register_globals' ) ) {
 		return;
+	}
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
+	if ( isset( $_REQUEST['GLOBALS'] ) ) {
 		die( 'GLOBALS overwrite attempt detected' );
+	}
 
 	// Variables that shouldn't be unset
 	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
 
 	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
-			unset( $GLOBALS[$k] );
+	foreach ( $input as $k => $v ) {
+		if ( ! in_array( $k, $no_unset ) && isset( $GLOBALS[ $k ] ) ) {
+			unset( $GLOBALS[ $k ] );
 		}
+	}
 }
 
 /**
@@ -57,7 +60,7 @@ function wp_fix_server_vars() {
 
 	$default_server_values = array(
 		'SERVER_SOFTWARE' => '',
-		'REQUEST_URI' => '',
+		'REQUEST_URI'     => '',
 	);
 
 	$_SERVER = array_merge( $default_server_values, $_SERVER );
@@ -68,21 +71,22 @@ function wp_fix_server_vars() {
 		// IIS Mod-Rewrite
 		if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
-		}
-		// IIS Isapi_Rewrite
+		} // IIS Isapi_Rewrite
 		elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
+			if ( ! isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) ) {
 				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
+			}
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
 			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] ) {
 					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
-				else
+				} else {
 					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+				}
 			}
 
 			// Append the query string if it exists and isn't null
@@ -93,17 +97,20 @@ function wp_fix_server_vars() {
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
+	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) ) {
 		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
+	}
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
+	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false ) {
 		unset( $_SERVER['PATH_INFO'] );
+	}
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	if ( empty( $PHP_SELF ) ) {
+		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER['REQUEST_URI'] );
+	}
 }
 
 /**
@@ -151,7 +158,7 @@ function wp_check_php_mysql_versions() {
  */
 function wp_favicon_request() {
 	if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
-		header('Content-Type: image/vnd.microsoft.icon');
+		header( 'Content-Type: image/vnd.microsoft.icon' );
 		exit;
 	}
 }
@@ -173,15 +180,17 @@ function wp_favicon_request() {
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
+	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() ) {
 		return;
+	}
 
 	global $upgrading;
 
 	include( ABSPATH . '.maintenance' );
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
+	if ( ( time() - $upgrading ) >= 600 ) {
 		return;
+	}
 
 	/**
 	 * Filters whether to enable maintenance mode.
@@ -266,11 +275,12 @@ function timer_start() {
  */
 function timer_stop( $display = 0, $precision = 3 ) {
 	global $timestart, $timeend;
-	$timeend = microtime( true );
+	$timeend   = microtime( true );
 	$timetotal = $timeend - $timestart;
-	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
+	$r         = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
+	if ( $display ) {
 		echo $r;
+	}
 	return $r;
 }
 
@@ -318,17 +328,18 @@ function wp_debug_mode() {
 	 *
 	 * @param bool $enable_debug_mode Whether to enable debug mode checks to occur. Default true.
 	 */
-	if ( ! apply_filters( 'enable_wp_debug_mode_checks', true ) ){
+	if ( ! apply_filters( 'enable_wp_debug_mode_checks', true ) ) {
 		return;
 	}
 
 	if ( WP_DEBUG ) {
 		error_reporting( E_ALL );
 
-		if ( WP_DEBUG_DISPLAY )
+		if ( WP_DEBUG_DISPLAY ) {
 			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
+		} elseif ( null !== WP_DEBUG_DISPLAY ) {
 			ini_set( 'display_errors', 0 );
+		}
 
 		if ( WP_DEBUG_LOG ) {
 			ini_set( 'log_errors', 1 );
@@ -357,8 +368,8 @@ function wp_debug_mode() {
  * @access private
  */
 function wp_set_lang_dir() {
-	if ( !defined( 'WP_LANG_DIR' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || !@is_dir(ABSPATH . WPINC . '/languages') ) {
+	if ( ! defined( 'WP_LANG_DIR' ) ) {
+		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || ! @is_dir( ABSPATH . WPINC . '/languages' ) ) {
 			/**
 			 * Server path of the language directory.
 			 *
@@ -367,7 +378,7 @@ function wp_set_lang_dir() {
 			 * @since 2.1.0
 			 */
 			define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			if ( ! defined( 'LANGDIR' ) ) {
 				// Old static relative path maintained for limited backward compatibility - won't work in some cases.
 				define( 'LANGDIR', 'wp-content/languages' );
 			}
@@ -380,7 +391,7 @@ function wp_set_lang_dir() {
 			 * @since 2.1.0
 			 */
 			define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			if ( ! defined( 'LANGDIR' ) ) {
 				// Old relative path maintained for backward compatibility.
 				define( 'LANGDIR', WPINC . '/languages' );
 			}
@@ -399,8 +410,9 @@ function require_wp_db() {
 	global $wpdb;
 
 	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
+	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
 		require_once( WP_CONTENT_DIR . '/db.php' );
+	}
 
 	if ( isset( $wpdb ) ) {
 		return;
@@ -423,15 +435,46 @@ function require_wp_db() {
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
+	if ( ! empty( $wpdb->error ) ) {
 		dead_db();
+	}
 
-	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
-		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
-		'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
-		'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d',
+	$wpdb->field_types = array(
+		'post_author'      => '%d',
+		'post_parent'      => '%d',
+		'menu_order'       => '%d',
+		'term_id'          => '%d',
+		'term_group'       => '%d',
+		'term_taxonomy_id' => '%d',
+		'parent'           => '%d',
+		'count'            => '%d',
+		'object_id'        => '%d',
+		'term_order'       => '%d',
+		'ID'               => '%d',
+		'comment_ID'       => '%d',
+		'comment_post_ID'  => '%d',
+		'comment_parent'   => '%d',
+		'user_id'          => '%d',
+		'link_id'          => '%d',
+		'link_owner'       => '%d',
+		'link_rating'      => '%d',
+		'option_id'        => '%d',
+		'blog_id'          => '%d',
+		'meta_id'          => '%d',
+		'post_id'          => '%d',
+		'user_status'      => '%d',
+		'umeta_id'         => '%d',
+		'comment_karma'    => '%d',
+		'comment_count'    => '%d',
 		// multisite:
-		'active' => '%d', 'cat_id' => '%d', 'deleted' => '%d', 'lang_id' => '%d', 'mature' => '%d', 'public' => '%d', 'site_id' => '%d', 'spam' => '%d',
+		'active'           => '%d',
+		'cat_id'           => '%d',
+		'deleted'          => '%d',
+		'lang_id'          => '%d',
+		'mature'           => '%d',
+		'public'           => '%d',
+		'site_id'          => '%d',
+		'spam'             => '%d',
 	);
 
 	$prefix = $wpdb->set_prefix( $table_prefix );
@@ -440,7 +483,8 @@ function wp_set_wpdb_vars() {
 		wp_load_translations_early();
 		wp_die(
 			/* translators: 1: $table_prefix 2: wp-config.php */
-			sprintf( __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
+			sprintf(
+				__( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
 				'<code>$table_prefix</code>',
 				'<code>wp-config.php</code>'
 			)
@@ -462,8 +506,9 @@ function wp_set_wpdb_vars() {
 function wp_using_ext_object_cache( $using = null ) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
+	if ( null !== $using ) {
 		$_wp_using_ext_object_cache = $using;
+	}
 	return $current_using;
 }
 
@@ -482,9 +527,9 @@ function wp_start_object_cache() {
 	global $wp_filter;
 
 	$first_init = false;
- 	if ( ! function_exists( 'wp_cache_init' ) ) {
+	if ( ! function_exists( 'wp_cache_init' ) ) {
 		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
-			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
+			require_once( WP_CONTENT_DIR . '/object-cache.php' );
 			if ( function_exists( 'wp_cache_init' ) ) {
 				wp_using_ext_object_cache( true );
 			}
@@ -507,7 +552,7 @@ function wp_start_object_cache() {
 	}
 
 	if ( ! wp_using_ext_object_cache() ) {
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+		require_once( ABSPATH . WPINC . '/cache.php' );
 	}
 
 	/*
@@ -570,13 +615,16 @@ function wp_not_installed() {
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir( WPMU_PLUGIN_DIR ) ) {
 		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
+	}
+	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) ) {
 		return $mu_plugins;
+	}
 	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
+		if ( substr( $plugin, -4 ) == '.php' ) {
 			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	closedir( $dh );
 	sort( $mu_plugins );
@@ -599,7 +647,7 @@ function wp_get_mu_plugins() {
  * @return array Files.
  */
 function wp_get_active_and_valid_plugins() {
-	$plugins = array();
+	$plugins        = array();
 	$active_plugins = (array) get_option( 'active_plugins', array() );
 
 	// Check for hacks file if the option is enabled
@@ -608,8 +656,9 @@ function wp_get_active_and_valid_plugins() {
 		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
+	if ( empty( $active_plugins ) || wp_installing() ) {
 		return $plugins;
+	}
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
@@ -619,8 +668,9 @@ function wp_get_active_and_valid_plugins() {
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
 			// not already included as a network plugin
 			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+			$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -637,8 +687,9 @@ function wp_get_active_and_valid_plugins() {
 function wp_set_internal_encoding() {
 	if ( function_exists( 'mb_internal_encoding' ) ) {
 		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
+		if ( ! $charset || ! @mb_internal_encoding( $charset ) ) {
 			mb_internal_encoding( 'UTF-8' );
+		}
 	}
 }
 
@@ -654,14 +705,14 @@ function wp_set_internal_encoding() {
 function wp_magic_quotes() {
 	// If already slashed, strip.
 	if ( get_magic_quotes_gpc() ) {
-		$_GET    = stripslashes_deep( $_GET    );
-		$_POST   = stripslashes_deep( $_POST   );
+		$_GET    = stripslashes_deep( $_GET );
+		$_POST   = stripslashes_deep( $_POST );
 		$_COOKIE = stripslashes_deep( $_COOKIE );
 	}
 
 	// Escape with wpdb.
-	$_GET    = add_magic_quotes( $_GET    );
-	$_POST   = add_magic_quotes( $_POST   );
+	$_GET    = add_magic_quotes( $_GET );
+	$_POST   = add_magic_quotes( $_POST );
 	$_COOKIE = add_magic_quotes( $_COOKIE );
 	$_SERVER = add_magic_quotes( $_SERVER );
 
@@ -713,10 +764,11 @@ function wp_clone( $object ) {
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if ( isset( $GLOBALS['current_screen'] ) ) {
 		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
+	} elseif ( defined( 'WP_ADMIN' ) ) {
 		return WP_ADMIN;
+	}
 
 	return false;
 }
@@ -736,10 +788,11 @@ function is_admin() {
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if ( isset( $GLOBALS['current_screen'] ) ) {
 		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
+	} elseif ( defined( 'WP_BLOG_ADMIN' ) ) {
 		return WP_BLOG_ADMIN;
+	}
 
 	return false;
 }
@@ -759,10 +812,11 @@ function is_blog_admin() {
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if ( isset( $GLOBALS['current_screen'] ) ) {
 		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
+	} elseif ( defined( 'WP_NETWORK_ADMIN' ) ) {
 		return WP_NETWORK_ADMIN;
+	}
 
 	return false;
 }
@@ -783,10 +837,11 @@ function is_network_admin() {
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if ( isset( $GLOBALS['current_screen'] ) ) {
 		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
+	} elseif ( defined( 'WP_USER_ADMIN' ) ) {
 		return WP_USER_ADMIN;
+	}
 
 	return false;
 }
@@ -799,11 +854,13 @@ function is_user_admin() {
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
+	if ( defined( 'MULTISITE' ) ) {
 		return MULTISITE;
+	}
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) ) {
 		return true;
+	}
 
 	return false;
 }
@@ -819,7 +876,7 @@ function is_multisite() {
  */
 function get_current_blog_id() {
 	global $blog_id;
-	return absint($blog_id);
+	return absint( $blog_id );
 }
 
 /**
@@ -864,12 +921,14 @@ function wp_load_translations_early() {
 	global $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
+	if ( $loaded ) {
 		return;
+	}
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
+	if ( function_exists( 'did_action' ) && did_action( 'init' ) ) {
 		return;
+	}
 
 	// We need $wp_local_package
 	require ABSPATH . WPINC . '/version.php';
@@ -887,31 +946,39 @@ function wp_load_translations_early() {
 
 	while ( true ) {
 		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
+			if ( '' == WPLANG ) {
 				break;
+			}
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
+		if ( isset( $wp_local_package ) ) {
 			$locales[] = $wp_local_package;
+		}
 
-		if ( ! $locales )
+		if ( ! $locales ) {
 			break;
+		}
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
+		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) ) {
 			$locations[] = WP_LANG_DIR;
+		}
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
+		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) ) {
 			$locations[] = WP_CONTENT_DIR . '/languages';
+		}
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
+		if ( @is_dir( ABSPATH . 'wp-content/languages' ) ) {
 			$locations[] = ABSPATH . 'wp-content/languages';
+		}
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
+		if ( @is_dir( ABSPATH . WPINC . '/languages' ) ) {
 			$locations[] = ABSPATH . WPINC . '/languages';
+		}
 
-		if ( ! $locations )
+		if ( ! $locations ) {
 			break;
+		}
 
 		$locations = array_unique( $locations );
 
@@ -919,8 +986,9 @@ function wp_load_translations_early() {
 			foreach ( $locations as $location ) {
 				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
 					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
+					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) ) {
 						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+					}
 					break 2;
 				}
 			}
@@ -956,7 +1024,7 @@ function wp_installing( $is_installing = null ) {
 
 	if ( ! is_null( $is_installing ) ) {
 		$old_installing = $installing;
-		$installing = $is_installing;
+		$installing     = $is_installing;
 		return (bool) $old_installing;
 	}
 
@@ -980,7 +1048,7 @@ function is_ssl() {
 		if ( '1' == $_SERVER['HTTPS'] ) {
 			return true;
 		}
-	} elseif ( isset($_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif ( isset( $_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
 		return true;
 	}
 	return false;
@@ -1035,7 +1103,7 @@ function wp_is_ini_value_changeable( $setting ) {
 		if ( function_exists( 'ini_get_all' ) ) {
 			$ini_all = ini_get_all();
 		}
- 	}
+	}
 
 	// Bit operator to workaround https://bugs.php.net/bug.php?id=44936 which changes access level to 63 in PHP 5.2.6 - 5.2.17.
 	if ( isset( $ini_all[ $setting ]['access'] ) && ( INI_ALL === ( $ini_all[ $setting ]['access'] & 7 ) || INI_USER === ( $ini_all[ $setting ]['access'] & 7 ) ) ) {
@@ -1129,15 +1197,17 @@ function wp_start_scraping_edited_file_errors() {
 	if ( ! isset( $_REQUEST['wp_scrape_key'] ) || ! isset( $_REQUEST['wp_scrape_nonce'] ) ) {
 		return;
 	}
-	$key = substr( sanitize_key( wp_unslash( $_REQUEST['wp_scrape_key'] ) ), 0, 32 );
+	$key   = substr( sanitize_key( wp_unslash( $_REQUEST['wp_scrape_key'] ) ), 0, 32 );
 	$nonce = wp_unslash( $_REQUEST['wp_scrape_nonce'] );
 
 	if ( get_transient( 'scrape_key_' . $key ) !== $nonce ) {
 		echo "###### wp_scraping_result_start:$key ######";
-		echo wp_json_encode( array(
-			'code' => 'scrape_nonce_failure',
-			'message' => __( 'Scrape nonce check failed. Please try again.' ),
-		) );
+		echo wp_json_encode(
+			array(
+				'code'    => 'scrape_nonce_failure',
+				'message' => __( 'Scrape nonce check failed. Please try again.' ),
+			)
+		);
 		echo "###### wp_scraping_result_end:$key ######";
 		die();
 	}
diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php
index bd0e31f2a0..1fa77282bc 100644
--- a/wp-includes/media-template.php
+++ b/wp-includes/media-template.php
@@ -22,9 +22,11 @@ function wp_underscore_audio_template() {
 	width="{{ _.isUndefined( data.model.width ) ? 400 : data.model.width }}"
 	preload="{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}"
 	<#
-	<?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
-	?>if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
-		#> <?php echo $attr ?><#
+	<?php
+	foreach ( array( 'autoplay', 'loop' ) as $attr ) :
+	?>
+	if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
+		#> <?php echo $attr; ?><#
 	}
 	<?php endforeach ?>#>
 >
@@ -32,12 +34,16 @@ function wp_underscore_audio_template() {
 	<source src="{{ data.model.src }}" type="{{ wp.media.view.settings.embedMimes[ data.model.src.split('.').pop() ] }}" />
 	<# } #>
 
-	<?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
+	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 endforeach;
-?></audio>
+	<?php
+	endforeach;
+?>
+</audio>
 <?php
 }
 
@@ -69,7 +75,7 @@ function wp_underscore_video_template() {
 		h = Math.ceil( ( data.model.height * w ) / data.model.width );
 	} else {
 		h = data.model.height;
- 	}
+	 }
 
 	if ( w ) {
 		w_rule = 'width: ' + w + 'px; ';
@@ -90,21 +96,32 @@ function wp_underscore_video_template() {
 	<# if ( w ) { #>width="{{ w }}"<# } #>
 	<# if ( h ) { #>height="{{ h }}"<# } #>
 	<?php
-	$props = array( 'poster' => '', 'preload' => 'metadata' );
-	foreach ( $props as $key => $value ):
+	$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 ?> }}"<#
+		?>
+		<#
+		if ( ! _.isUndefined( data.model.<?php echo $key; ?> ) && data.model.<?php echo $key; ?> ) {
+			#> <?php echo $key; ?>="{{ data.model.<?php echo $key; ?> }}"<#
 		} #>
-		<?php } else {
-			echo $key ?>="{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}"<?php
+		<?php
+		} else {
+			echo $key
+			?>
+			="{{ _.isUndefined( data.model.<?php echo $key; ?> ) ? '<?php echo $value; ?>' : data.model.<?php echo $key; ?> }}"
+			<?php
 		}
 	endforeach;
-	?><#
-	<?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
-	?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
-		#> <?php echo $attr ?><#
+	?>
+	<#
+	<?php
+	foreach ( array( 'autoplay', 'loop' ) as $attr ) :
+	?>
+	 if ( ! _.isUndefined( data.model.<?php echo $attr; ?> ) && data.model.<?php echo $attr; ?> ) {
+		#> <?php echo $attr; ?><#
 	}
 	<?php endforeach ?>#>
 >
@@ -118,9 +135,11 @@ 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 ?>' ] }}" />
+	<?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; ?>' ] }}" />
 	<# } #>
 	<?php endforeach; ?>
 	{{{ data.model.content }}}
@@ -139,8 +158,9 @@ function wp_underscore_video_template() {
 function wp_print_media_templates() {
 	global $is_IE;
 	$class = 'media-modal wp-core-ui';
-	if ( $is_IE && strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 7') !== false )
+	if ( $is_IE && strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE 7' ) !== false ) {
 		$class .= ' ie7';
+	}
 	?>
 	<!--[if lte IE 8]>
 	<style>
@@ -196,7 +216,8 @@ function wp_print_media_templates() {
 			<h2 class="upload-instructions"><?php _e( 'Upload Limit Exceeded' ); ?></h2>
 			<?php
 			/** This action is documented in wp-admin/includes/media.php */
-			do_action( 'upload_ui_over_quota' ); ?>
+			do_action( 'upload_ui_over_quota' );
+			?>
 
 		<?php else : ?>
 			<div class="upload-ui">
@@ -229,9 +250,11 @@ function wp_print_media_templates() {
 				}
 				?>
 
-				<p class="max-upload-size"><?php
+				<p class="max-upload-size">
+				<?php
 					printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
-				?></p>
+				?>
+				</p>
 
 				<# if ( data.suggestedWidth && data.suggestedHeight ) { #>
 					<p class="suggested-dimensions">
@@ -244,17 +267,18 @@ function wp_print_media_templates() {
 
 				<?php
 				/** This action is documented in wp-admin/includes/media.php */
-				do_action( 'post-upload-ui' ); ?>
+				do_action( 'post-upload-ui' );
+				?>
 			</div>
 		<?php endif; ?>
 		</div>
 	</script>
 
 	<script type="text/html" id="tmpl-media-library-view-switcher">
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-list">
+		<a href="<?php echo esc_url( add_query_arg( 'mode', 'list', $_SERVER['REQUEST_URI'] ) ); ?>" class="view-list">
 			<span class="screen-reader-text"><?php _e( 'List View' ); ?></span>
 		</a>
-		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ) ?>" class="view-grid current">
+		<a href="<?php echo esc_url( add_query_arg( 'mode', 'grid', $_SERVER['REQUEST_URI'] ) ); ?>" class="view-grid current">
 			<span class="screen-reader-text"><?php _e( 'Grid View' ); ?></span>
 		</a>
 	</script>
@@ -337,7 +361,7 @@ function wp_print_media_templates() {
 		<div class="attachment-info">
 			<span class="settings-save-status">
 				<span class="spinner"></span>
-				<span class="saved"><?php esc_html_e('Saved.'); ?></span>
+				<span class="saved"><?php esc_html_e( 'Saved.' ); ?></span>
 			</span>
 			<div class="details">
 				<div class="filename"><strong><?php _e( 'File name:' ); ?></strong> {{ data.filename }}</div>
@@ -373,24 +397,26 @@ function wp_print_media_templates() {
 
 			<div class="settings">
 				<label class="setting" data-setting="url">
-					<span class="name"><?php _e('URL'); ?></span>
+					<span class="name"><?php _e( 'URL' ); ?></span>
 					<input type="text" value="{{ data.url }}" readonly />
 				</label>
 				<# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
 				<?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
 				<label class="setting" data-setting="title">
-					<span class="name"><?php _e('Title'); ?></span>
+					<span class="name"><?php _e( 'Title' ); ?></span>
 					<input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
 				</label>
 				<?php endif; ?>
 				<# if ( 'audio' === data.type ) { #>
-				<?php foreach ( array(
+				<?php
+				foreach ( array(
 					'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 ?> || '' }}" />
+					'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; ?> || '' }}" />
 				</label>
 				<?php endforeach; ?>
 				<# } #>
@@ -405,7 +431,7 @@ function wp_print_media_templates() {
 					</label>
 				<# } #>
 				<label class="setting" data-setting="description">
-					<span class="name"><?php _e('Description'); ?></span>
+					<span class="name"><?php _e( 'Description' ); ?></span>
 					<textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
 				</label>
 				<label class="setting">
@@ -431,13 +457,13 @@ function wp_print_media_templates() {
 					<a href="post.php?post={{ data.id }}&action=edit"><?php _e( 'Edit more details' ); ?></a>
 				<# } #>
 				<# if ( ! data.uploading && data.can.remove ) { #> |
-					<?php if ( MEDIA_TRASH ): ?>
+					<?php if ( MEDIA_TRASH ) : ?>
 						<# if ( 'trash' === data.status ) { #>
 							<button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
 						<# } else { #>
 							<button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
 						<# } #>
-					<?php else: ?>
+					<?php else : ?>
 						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
 					<?php endif; ?>
 				<# } #>
@@ -482,15 +508,15 @@ function wp_print_media_templates() {
 		if ( data.describe ) {
 			if ( 'image' === data.type ) { #>
 				<input type="text" value="{{ data.caption }}" class="describe" data-setting="caption"
-					placeholder="<?php esc_attr_e('Caption this image&hellip;'); ?>" {{ maybeReadOnly }} />
+					placeholder="<?php esc_attr_e( 'Caption this image&hellip;' ); ?>" {{ maybeReadOnly }} />
 			<# } else { #>
 				<input type="text" value="{{ data.title }}" class="describe" data-setting="title"
 					<# if ( 'video' === data.type ) { #>
-						placeholder="<?php esc_attr_e('Describe this video&hellip;'); ?>"
+						placeholder="<?php esc_attr_e( 'Describe this video&hellip;' ); ?>"
 					<# } else if ( 'audio' === data.type ) { #>
-						placeholder="<?php esc_attr_e('Describe this audio file&hellip;'); ?>"
+						placeholder="<?php esc_attr_e( 'Describe this audio file&hellip;' ); ?>"
 					<# } else { #>
-						placeholder="<?php esc_attr_e('Describe this media file&hellip;'); ?>"
+						placeholder="<?php esc_attr_e( 'Describe this media file&hellip;' ); ?>"
 					<# } #> {{ maybeReadOnly }} />
 			<# }
 		} #>
@@ -501,7 +527,7 @@ function wp_print_media_templates() {
 			<?php _e( 'Attachment Details' ); ?>
 			<span class="settings-save-status">
 				<span class="spinner"></span>
-				<span class="saved"><?php esc_html_e('Saved.'); ?></span>
+				<span class="saved"><?php esc_html_e( 'Saved.' ); ?></span>
 			</span>
 		</h2>
 		<div class="attachment-info">
@@ -534,13 +560,13 @@ function wp_print_media_templates() {
 				<# } #>
 
 				<# if ( ! data.uploading && data.can.remove ) { #>
-					<?php if ( MEDIA_TRASH ): ?>
+					<?php if ( MEDIA_TRASH ) : ?>
 					<# if ( 'trash' === data.status ) { #>
 						<button type="button" class="button-link untrash-attachment"><?php _e( 'Untrash' ); ?></button>
 					<# } else { #>
 						<button type="button" class="button-link trash-attachment"><?php _ex( 'Trash', 'verb' ); ?></button>
 					<# } #>
-					<?php else: ?>
+					<?php else : ?>
 						<button type="button" class="button-link delete-attachment"><?php _e( 'Delete Permanently' ); ?></button>
 					<?php endif; ?>
 				<# } #>
@@ -554,39 +580,41 @@ function wp_print_media_templates() {
 		</div>
 
 		<label class="setting" data-setting="url">
-			<span class="name"><?php _e('URL'); ?></span>
+			<span class="name"><?php _e( 'URL' ); ?></span>
 			<input type="text" value="{{ data.url }}" readonly />
 		</label>
 		<# var maybeReadOnly = data.can.save || data.allowLocalEdits ? '' : 'readonly'; #>
 		<?php if ( post_type_supports( 'attachment', 'title' ) ) : ?>
 		<label class="setting" data-setting="title">
-			<span class="name"><?php _e('Title'); ?></span>
+			<span class="name"><?php _e( 'Title' ); ?></span>
 			<input type="text" value="{{ data.title }}" {{ maybeReadOnly }} />
 		</label>
 		<?php endif; ?>
 		<# if ( 'audio' === data.type ) { #>
-		<?php foreach ( array(
+		<?php
+		foreach ( array(
 			'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 ?> || '' }}" />
+			'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; ?> || '' }}" />
 		</label>
 		<?php endforeach; ?>
 		<# } #>
 		<label class="setting" data-setting="caption">
-			<span class="name"><?php _e('Caption'); ?></span>
+			<span class="name"><?php _e( 'Caption' ); ?></span>
 			<textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
 		</label>
 		<# if ( 'image' === data.type ) { #>
 			<label class="setting" data-setting="alt">
-				<span class="name"><?php _e('Alt Text'); ?></span>
+				<span class="name"><?php _e( 'Alt Text' ); ?></span>
 				<input type="text" value="{{ data.alt }}" {{ maybeReadOnly }} />
 			</label>
 		<# } #>
 		<label class="setting" data-setting="description">
-			<span class="name"><?php _e('Description'); ?></span>
+			<span class="name"><?php _e( 'Description' ); ?></span>
 			<textarea {{ maybeReadOnly }}>{{ data.description }}</textarea>
 		</label>
 	</script>
@@ -609,7 +637,7 @@ function wp_print_media_templates() {
 
 		<# if ( 'image' === data.type ) { #>
 			<label class="setting align">
-				<span><?php _e('Alignment'); ?></span>
+				<span><?php _e( 'Alignment' ); ?></span>
 				<select class="alignment"
 					data-setting="align"
 					<# if ( data.userSettings ) { #>
@@ -635,9 +663,9 @@ function wp_print_media_templates() {
 		<div class="setting">
 			<label>
 				<# if ( data.model.canEmbed ) { #>
-					<span><?php _e('Embed or Link'); ?></span>
+					<span><?php _e( 'Embed or Link' ); ?></span>
 				<# } else { #>
-					<span><?php _e('Link To'); ?></span>
+					<span><?php _e( 'Link To' ); ?></span>
 				<# } #>
 
 				<select class="link-to"
@@ -682,7 +710,7 @@ function wp_print_media_templates() {
 
 		<# if ( 'undefined' !== typeof data.sizes ) { #>
 			<label class="setting">
-				<span><?php _e('Size'); ?></span>
+				<span><?php _e( 'Size' ); ?></span>
 				<select class="size" name="size"
 					data-setting="size"
 					<# if ( data.userSettings ) { #>
@@ -690,14 +718,17 @@ function wp_print_media_templates() {
 					<# } #>>
 					<?php
 					/** This filter is documented in wp-admin/includes/media.php */
-					$sizes = apply_filters( 'image_size_names_choose', array(
-						'thumbnail' => __('Thumbnail'),
-						'medium'    => __('Medium'),
-						'large'     => __('Large'),
-						'full'      => __('Full Size'),
-					) );
+					$sizes = apply_filters(
+						'image_size_names_choose', array(
+							'thumbnail' => __( 'Thumbnail' ),
+							'medium'    => __( 'Medium' ),
+							'large'     => __( 'Large' ),
+							'full'      => __( 'Full Size' ),
+						)
+					);
 
-					foreach ( $sizes as $value => $name ) : ?>
+					foreach ( $sizes as $value => $name ) :
+					?>
 						<#
 						var size = data.sizes['<?php echo esc_js( $value ); ?>'];
 						if ( size ) { #>
@@ -715,7 +746,7 @@ function wp_print_media_templates() {
 		<h2><?php _e( 'Gallery Settings' ); ?></h2>
 
 		<label class="setting">
-			<span><?php _e('Link To'); ?></span>
+			<span><?php _e( 'Link To' ); ?></span>
 			<select class="link-to"
 				data-setting="link"
 				<# if ( data.userSettings ) { #>
@@ -737,12 +768,12 @@ function wp_print_media_templates() {
 		</label>
 
 		<label class="setting">
-			<span><?php _e('Columns'); ?></span>
+			<span><?php _e( 'Columns' ); ?></span>
 			<select class="columns" name="columns"
 				data-setting="columns">
 				<?php for ( $i = 1; $i <= 9; $i++ ) : ?>
 					<option value="<?php echo esc_attr( $i ); ?>" <#
-						if ( <?php echo $i ?> == wp.media.galleryDefaults.columns ) { #>selected="selected"<# }
+						if ( <?php echo $i; ?> == wp.media.galleryDefaults.columns ) { #>selected="selected"<# }
 					#>>
 						<?php echo esc_html( $i ); ?>
 					</option>
@@ -765,14 +796,17 @@ 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(
-					'thumbnail' => __( 'Thumbnail' ),
-					'medium'    => __( 'Medium' ),
-					'large'     => __( 'Large' ),
-					'full'      => __( 'Full Size' ),
-				) );
+				$size_names = apply_filters(
+					'image_size_names_choose', array(
+						'thumbnail' => __( 'Thumbnail' ),
+						'medium'    => __( 'Medium' ),
+						'large'     => __( 'Large' ),
+						'full'      => __( 'Full Size' ),
+					)
+				);
 
-				foreach ( $size_names as $size => $label ) : ?>
+				foreach ( $size_names as $size => $label ) :
+				?>
 					<option value="<?php echo esc_attr( $size ); ?>">
 						<?php echo esc_html( $label ); ?>
 					</option>
@@ -832,20 +866,21 @@ function wp_print_media_templates() {
 
 		<?php
 		/** This filter is documented in wp-admin/includes/media.php */
-		if ( ! apply_filters( 'disable_captions', '' ) ) : ?>
+		if ( ! apply_filters( 'disable_captions', '' ) ) :
+		?>
 			<label class="setting caption">
-				<span><?php _e('Caption'); ?></span>
+				<span><?php _e( 'Caption' ); ?></span>
 				<textarea data-setting="caption" />
 			</label>
 		<?php endif; ?>
 
 		<label class="setting alt-text">
-			<span><?php _e('Alt Text'); ?></span>
+			<span><?php _e( 'Alt Text' ); ?></span>
 			<input type="text" data-setting="alt" />
 		</label>
 
 		<div class="setting align">
-			<span><?php _e('Align'); ?></span>
+			<span><?php _e( 'Align' ); ?></span>
 			<div class="button-group button-large" data-setting="align">
 				<button class="button" value="left">
 					<?php esc_html_e( 'Left' ); ?>
@@ -863,7 +898,7 @@ function wp_print_media_templates() {
 		</div>
 
 		<div class="setting link-to">
-			<span><?php _e('Link To'); ?></span>
+			<span><?php _e( 'Link To' ); ?></span>
 			<div class="button-group button-large" data-setting="link">
 				<button class="button" value="file">
 					<?php esc_html_e( 'Image URL' ); ?>
@@ -897,21 +932,22 @@ function wp_print_media_templates() {
 				<div class="column-settings">
 					<?php
 					/** This filter is documented in wp-admin/includes/media.php */
-					if ( ! apply_filters( 'disable_captions', '' ) ) : ?>
+					if ( ! apply_filters( 'disable_captions', '' ) ) :
+					?>
 						<label class="setting caption">
-							<span><?php _e('Caption'); ?></span>
+							<span><?php _e( 'Caption' ); ?></span>
 							<textarea data-setting="caption">{{ data.model.caption }}</textarea>
 						</label>
 					<?php endif; ?>
 
 					<label class="setting alt-text">
-						<span><?php _e('Alternative Text'); ?></span>
+						<span><?php _e( 'Alternative Text' ); ?></span>
 						<input type="text" data-setting="alt" value="{{ data.model.alt }}" />
 					</label>
 
 					<h2><?php _e( 'Display Settings' ); ?></h2>
 					<div class="setting align">
-						<span><?php _e('Align'); ?></span>
+						<span><?php _e( 'Align' ); ?></span>
 						<div class="button-group button-large" data-setting="align">
 							<button class="button" value="left">
 								<?php esc_html_e( 'Left' ); ?>
@@ -931,7 +967,7 @@ function wp_print_media_templates() {
 					<# if ( data.attachment ) { #>
 						<# if ( 'undefined' !== typeof data.attachment.sizes ) { #>
 							<label class="setting size">
-								<span><?php _e('Size'); ?></span>
+								<span><?php _e( 'Size' ); ?></span>
 								<select class="size" name="size"
 									data-setting="size"
 									<# if ( data.userSettings ) { #>
@@ -939,14 +975,17 @@ function wp_print_media_templates() {
 									<# } #>>
 									<?php
 									/** This filter is documented in wp-admin/includes/media.php */
-									$sizes = apply_filters( 'image_size_names_choose', array(
-										'thumbnail' => __('Thumbnail'),
-										'medium'    => __('Medium'),
-										'large'     => __('Large'),
-										'full'      => __('Full Size'),
-									) );
+									$sizes = apply_filters(
+										'image_size_names_choose', array(
+											'thumbnail' => __( 'Thumbnail' ),
+											'medium'    => __( 'Medium' ),
+											'large'     => __( 'Large' ),
+											'full'      => __( 'Full Size' ),
+										)
+									);
 
-									foreach ( $sizes as $value => $name ) : ?>
+									foreach ( $sizes as $value => $name ) :
+									?>
 										<#
 										var size = data.sizes['<?php echo esc_js( $value ); ?>'];
 										if ( size ) { #>
@@ -967,7 +1006,7 @@ function wp_print_media_templates() {
 					<# } #>
 
 					<div class="setting link-to">
-						<span><?php _e('Link To'); ?></span>
+						<span><?php _e( 'Link To' ); ?></span>
 						<select data-setting="link">
 						<# if ( data.attachment ) { #>
 							<option value="file">
@@ -995,11 +1034,11 @@ function wp_print_media_templates() {
 						<div class="advanced-settings hidden">
 							<div class="advanced-image">
 								<label class="setting title-text">
-									<span><?php _e('Image Title Attribute'); ?></span>
+									<span><?php _e( 'Image Title Attribute' ); ?></span>
 									<input type="text" data-setting="title" value="{{ data.model.title }}" />
 								</label>
 								<label class="setting extra-classes">
-									<span><?php _e('Image CSS Class'); ?></span>
+									<span><?php _e( 'Image CSS Class' ); ?></span>
 									<input type="text" data-setting="extraClasses" value="{{ data.model.extraClasses }}" />
 								</label>
 							</div>
@@ -1008,11 +1047,11 @@ function wp_print_media_templates() {
 									<label><input type="checkbox" data-setting="linkTargetBlank" value="_blank" <# if ( data.model.linkTargetBlank ) { #>checked="checked"<# } #>><?php _e( 'Open link in a new tab' ); ?></label>
 								</div>
 								<label class="setting link-rel">
-									<span><?php _e('Link Rel'); ?></span>
+									<span><?php _e( 'Link Rel' ); ?></span>
 									<input type="text" data-setting="linkRel" value="{{ data.model.linkRel }}" />
 								</label>
 								<label class="setting link-class-name">
-									<span><?php _e('Link CSS Class'); ?></span>
+									<span><?php _e( 'Link CSS Class' ); ?></span>
 									<input type="text" data-setting="linkClassName" value="{{ data.model.linkClassName }}" />
 								</label>
 							</div>
@@ -1037,7 +1076,7 @@ function wp_print_media_templates() {
 		<?php $audio_types = wp_get_audio_extensions(); ?>
 		<div class="media-embed media-embed-details">
 			<div class="embed-media-settings embed-audio-settings">
-				<?php wp_underscore_audio_template() ?>
+				<?php wp_underscore_audio_template(); ?>
 
 				<# if ( ! _.isEmpty( data.model.src ) ) {
 					ext = data.model.src.split('.').pop();
@@ -1053,15 +1092,16 @@ 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 ?>;
+				foreach ( $audio_types as $type ) :
+				?>
+				<# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) {
+					if ( ! _.isUndefined( html5types.<?php echo $type; ?> ) ) {
+						delete html5types.<?php echo $type; ?>;
 					}
 				#>
 				<label class="setting">
-					<span><?php echo strtoupper( $type ) ?></span>
-					<input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
+					<span><?php echo strtoupper( $type ); ?></span>
+					<input type="text" disabled="disabled" data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove audio source' ); ?></button>
 				</label>
 				<# } #>
@@ -1069,7 +1109,7 @@ function wp_print_media_templates() {
 
 				<# if ( ! _.isEmpty( html5types ) ) { #>
 				<div class="setting">
-					<span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ) ?></span>
+					<span><?php _e( 'Add alternate sources for maximum HTML5 playback:' ); ?></span>
 					<div class="button-large">
 					<# _.each( html5types, function (mime, type) { #>
 					<button class="button add-media-source" data-mime="{{ mime }}">{{ type }}</button>
@@ -1120,7 +1160,7 @@ function wp_print_media_templates() {
 				}
 				#>
 
-				<?php wp_underscore_video_template() ?>
+				<?php wp_underscore_video_template(); ?>
 
 				<# if ( ! _.isEmpty( data.model.src ) ) {
 					ext = data.model.src.split('.').pop();
@@ -1134,15 +1174,17 @@ function wp_print_media_templates() {
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
 				</label>
 				<# } #>
-				<?php foreach ( $video_types as $type ):
-				?><# if ( ! _.isEmpty( data.model.<?php echo $type ?> ) ) {
-					if ( ! _.isUndefined( html5types.<?php echo $type ?> ) ) {
-						delete html5types.<?php echo $type ?>;
+				<?php
+				foreach ( $video_types as $type ) :
+				?>
+				<# if ( ! _.isEmpty( data.model.<?php echo $type; ?> ) ) {
+					if ( ! _.isUndefined( html5types.<?php echo $type; ?> ) ) {
+						delete html5types.<?php echo $type; ?>;
 					}
 				#>
 				<label class="setting">
-					<span><?php echo strtoupper( $type ) ?></span>
-					<input type="text" disabled="disabled" data-setting="<?php echo $type ?>" value="{{ data.model.<?php echo $type ?> }}" />
+					<span><?php echo strtoupper( $type ); ?></span>
+					<input type="text" disabled="disabled" data-setting="<?php echo $type; ?>" value="{{ data.model.<?php echo $type; ?> }}" />
 					<button type="button" class="button-link remove-setting"><?php _e( 'Remove video source' ); ?></button>
 				</label>
 				<# } #>
diff --git a/wp-includes/media.php b/wp-includes/media.php
index fa84b39d1b..6bc414f873 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -59,58 +59,54 @@ function image_constrain_size_for_editor( $width, $height, $size = 'medium', $co
 
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
-	if ( ! $context )
+	if ( ! $context ) {
 		$context = is_admin() ? 'edit' : 'display';
-
-	if ( is_array($size) ) {
-		$max_width = $size[0];
-		$max_height = $size[1];
 	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
-		$max_width = intval(get_option('thumbnail_size_w'));
-		$max_height = intval(get_option('thumbnail_size_h'));
+
+	if ( is_array( $size ) ) {
+		$max_width  = $size[0];
+		$max_height = $size[1];
+	} elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+		$max_width  = intval( get_option( 'thumbnail_size_w' ) );
+		$max_height = intval( get_option( 'thumbnail_size_h' ) );
 		// last chance thumbnail size defaults
-		if ( !$max_width && !$max_height ) {
-			$max_width = 128;
+		if ( ! $max_width && ! $max_height ) {
+			$max_width  = 128;
 			$max_height = 96;
 		}
-	}
-	elseif ( $size == 'medium' ) {
-		$max_width = intval(get_option('medium_size_w'));
-		$max_height = intval(get_option('medium_size_h'));
+	} elseif ( $size == 'medium' ) {
+		$max_width  = intval( get_option( 'medium_size_w' ) );
+		$max_height = intval( get_option( 'medium_size_h' ) );
 
-	}
-	elseif ( $size == 'medium_large' ) {
-		$max_width = intval( get_option( 'medium_large_size_w' ) );
+	} elseif ( $size == 'medium_large' ) {
+		$max_width  = intval( get_option( 'medium_large_size_w' ) );
 		$max_height = intval( get_option( 'medium_large_size_h' ) );
 
 		if ( intval( $content_width ) > 0 ) {
 			$max_width = min( intval( $content_width ), $max_width );
 		}
-	}
-	elseif ( $size == 'large' ) {
+	} elseif ( $size == 'large' ) {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
 		 * itself, and within the theme's content width if it's known. The user
 		 * can resize it in the editor if they wish.
 		 */
-		$max_width = intval(get_option('large_size_w'));
-		$max_height = intval(get_option('large_size_h'));
-		if ( intval($content_width) > 0 ) {
-			$max_width = min( intval($content_width), $max_width );
+		$max_width  = intval( get_option( 'large_size_w' ) );
+		$max_height = intval( get_option( 'large_size_h' ) );
+		if ( intval( $content_width ) > 0 ) {
+			$max_width = min( intval( $content_width ), $max_width );
 		}
 	} elseif ( ! empty( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
-		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
-		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
+		$max_width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
+		$max_height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
 		// Only in admin. Assume that theme authors know what they're doing.
 		if ( intval( $content_width ) > 0 && 'edit' === $context ) {
 			$max_width = min( intval( $content_width ), $max_width );
 		}
-	}
-	// $size == 'full' has no constraint
+	} // $size == 'full' has no constraint
 	else {
-		$max_width = $width;
+		$max_width  = $width;
 		$max_height = $height;
 	}
 
@@ -150,10 +146,12 @@ function image_constrain_size_for_editor( $width, $height, $size = 'medium', $co
  */
 function image_hwstring( $width, $height ) {
 	$out = '';
-	if ($width)
-		$out .= 'width="'.intval($width).'" ';
-	if ($height)
-		$out .= 'height="'.intval($height).'" ';
+	if ( $width ) {
+		$out .= 'width="' . intval( $width ) . '" ';
+	}
+	if ( $height ) {
+		$out .= 'height="' . intval( $height ) . '" ';
+	}
 	return $out;
 }
 
@@ -202,48 +200,47 @@ function image_downsize( $id, $size = 'medium' ) {
 		return $out;
 	}
 
-	$img_url = wp_get_attachment_url($id);
-	$meta = wp_get_attachment_metadata($id);
-	$width = $height = 0;
-	$is_intermediate = false;
-	$img_url_basename = wp_basename($img_url);
+	$img_url          = wp_get_attachment_url( $id );
+	$meta             = wp_get_attachment_metadata( $id );
+	$width            = $height = 0;
+	$is_intermediate  = false;
+	$img_url_basename = wp_basename( $img_url );
 
 	// If the file isn't an image, attempt to replace its URL with a rendered image from its meta.
 	// Otherwise, a non-image type could be returned.
 	if ( ! $is_image ) {
 		if ( ! empty( $meta['sizes'] ) ) {
-			$img_url = str_replace( $img_url_basename, $meta['sizes']['full']['file'], $img_url );
+			$img_url          = str_replace( $img_url_basename, $meta['sizes']['full']['file'], $img_url );
 			$img_url_basename = $meta['sizes']['full']['file'];
-			$width = $meta['sizes']['full']['width'];
-			$height = $meta['sizes']['full']['height'];
+			$width            = $meta['sizes']['full']['width'];
+			$height           = $meta['sizes']['full']['height'];
 		} else {
 			return false;
 		}
 	}
 
 	// try for a new style intermediate size
-	if ( $intermediate = image_get_intermediate_size($id, $size) ) {
-		$img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
-		$width = $intermediate['width'];
-		$height = $intermediate['height'];
+	if ( $intermediate = image_get_intermediate_size( $id, $size ) ) {
+		$img_url         = str_replace( $img_url_basename, $intermediate['file'], $img_url );
+		$width           = $intermediate['width'];
+		$height          = $intermediate['height'];
 		$is_intermediate = true;
-	}
-	elseif ( $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumbnail' ) {
 		// fall back to the old thumbnail
-		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
-			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
-			$width = $info[0];
-			$height = $info[1];
+		if ( ( $thumb_file = wp_get_attachment_thumb_file( $id ) ) && $info = getimagesize( $thumb_file ) ) {
+			$img_url         = str_replace( $img_url_basename, wp_basename( $thumb_file ), $img_url );
+			$width           = $info[0];
+			$height          = $info[1];
 			$is_intermediate = true;
 		}
 	}
-	if ( !$width && !$height && isset( $meta['width'], $meta['height'] ) ) {
+	if ( ! $width && ! $height && isset( $meta['width'], $meta['height'] ) ) {
 		// any other type: use the real image
-		$width = $meta['width'];
+		$width  = $meta['width'];
 		$height = $meta['height'];
 	}
 
-	if ( $img_url) {
+	if ( $img_url ) {
 		// we have the actual image size, but might need to further constrain it if content_width is narrower
 		list( $width, $height ) = image_constrain_size_for_editor( $width, $height, $size );
 
@@ -359,12 +356,12 @@ function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
  */
 function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) {
 
-	list( $img_src, $width, $height ) = image_downsize($id, $size);
-	$hwstring = image_hwstring($width, $height);
+	list( $img_src, $width, $height ) = image_downsize( $id, $size );
+	$hwstring                         = image_hwstring( $width, $height );
 
 	$title = $title ? 'title="' . esc_attr( $title ) . '" ' : '';
 
-	$class = 'align' . esc_attr($align) .' size-' . esc_attr($size) . ' wp-image-' . $id;
+	$class = 'align' . esc_attr( $align ) . ' size-' . esc_attr( $size ) . ' wp-image-' . $id;
 
 	/**
 	 * Filters the value of the attachment's image tag class attribute.
@@ -379,7 +376,7 @@ function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) {
 	 */
 	$class = apply_filters( 'get_image_tag_class', $class, $id, $align, $size );
 
-	$html = '<img src="' . esc_attr($img_src) . '" alt="' . esc_attr($alt) . '" ' . $title . $hwstring . 'class="' . $class . '" />';
+	$html = '<img src="' . esc_attr( $img_src ) . '" alt="' . esc_attr( $alt ) . '" ' . $title . $hwstring . 'class="' . $class . '" />';
 
 	/**
 	 * Filters the HTML content for the image tag.
@@ -412,20 +409,21 @@ function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) {
  * @return array First item is the width, the second item is the height.
  */
 function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
+	if ( ! $max_width && ! $max_height ) {
 		return array( $current_width, $current_height );
+	}
 
 	$width_ratio = $height_ratio = 1.0;
-	$did_width = $did_height = false;
+	$did_width   = $did_height = false;
 
 	if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width ) {
 		$width_ratio = $max_width / $current_width;
-		$did_width = true;
+		$did_width   = true;
 	}
 
 	if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height ) {
 		$height_ratio = $max_height / $current_height;
-		$did_height = true;
+		$did_height   = true;
 	}
 
 	// Calculate the larger/smaller ratios
@@ -433,7 +431,7 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width =
 	$larger_ratio  = max( $width_ratio, $height_ratio );
 
 	if ( (int) round( $current_width * $larger_ratio ) > $max_width || (int) round( $current_height * $larger_ratio ) > $max_height ) {
- 		// The larger ratio is too big. It would result in an overflow.
+		// The larger ratio is too big. It would result in an overflow.
 		$ratio = $smaller_ratio;
 	} else {
 		// The larger ratio fits, and is likely to be a more "snug" fit.
@@ -441,8 +439,8 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width =
 	}
 
 	// Very small dimensions may result in 0, 1 should be the minimum.
-	$w = max ( 1, (int) round( $current_width  * $ratio ) );
-	$h = max ( 1, (int) round( $current_height * $ratio ) );
+	$w = max( 1, (int) round( $current_width * $ratio ) );
+	$h = max( 1, (int) round( $current_height * $ratio ) );
 
 	// Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
 	// We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result.
@@ -464,10 +462,10 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width =
 	 * @since 4.1.0
 	 *
 	 * @param array $dimensions     The image width and height.
-	 * @param int 	$current_width  The current width of the image.
-	 * @param int 	$current_height The current height of the image.
-	 * @param int 	$max_width      The maximum width permitted.
-	 * @param int 	$max_height     The maximum height permitted.
+	 * @param int   $current_width  The current width of the image.
+	 * @param int   $current_height The current height of the image.
+	 * @param int   $max_width      The maximum width permitted.
+	 * @param int   $max_height     The maximum height permitted.
 	 */
 	return apply_filters( 'wp_constrain_dimensions', array( $w, $h ), $current_width, $current_height, $max_width, $max_height );
 }
@@ -498,11 +496,13 @@ function wp_constrain_dimensions( $current_width, $current_height, $max_width =
  */
 function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
 
-	if ($orig_w <= 0 || $orig_h <= 0)
+	if ( $orig_w <= 0 || $orig_h <= 0 ) {
 		return false;
+	}
 	// at least one of dest_w or dest_h must be specific
-	if ($dest_w <= 0 && $dest_h <= 0)
+	if ( $dest_w <= 0 && $dest_h <= 0 ) {
 		return false;
+	}
 
 	/**
 	 * Filters whether to preempt calculating the image resize dimensions.
@@ -521,14 +521,15 @@ function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = fa
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
 	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
+	if ( null !== $output ) {
 		return $output;
+	}
 
 	if ( $crop ) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
 		$aspect_ratio = $orig_w / $orig_h;
-		$new_w = min($dest_w, $orig_w);
-		$new_h = min($dest_h, $orig_h);
+		$new_w        = min( $dest_w, $orig_w );
+		$new_h        = min( $dest_h, $orig_h );
 
 		if ( ! $new_w ) {
 			$new_w = (int) round( $new_h * $aspect_ratio );
@@ -538,10 +539,10 @@ function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = fa
 			$new_h = (int) round( $new_w / $aspect_ratio );
 		}
 
-		$size_ratio = max($new_w / $orig_w, $new_h / $orig_h);
+		$size_ratio = max( $new_w / $orig_w, $new_h / $orig_h );
 
-		$crop_w = round($new_w / $size_ratio);
-		$crop_h = round($new_h / $size_ratio);
+		$crop_w = round( $new_w / $size_ratio );
+		$crop_h = round( $new_h / $size_ratio );
 
 		if ( ! is_array( $crop ) || count( $crop ) !== 2 ) {
 			$crop = array( 'center', 'center' );
@@ -606,8 +607,9 @@ function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
 	if ( $width || $height ) {
 		$editor = wp_get_image_editor( $file );
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
+		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) ) {
 			return false;
+		}
 
 		$resized_file = $editor->save();
 
@@ -637,10 +639,10 @@ function wp_image_matches_ratio( $source_width, $source_height, $target_width, $
 	 */
 	if ( $source_width > $target_width ) {
 		$constrained_size = wp_constrain_dimensions( $source_width, $source_height, $target_width );
-		$expected_size = array( $target_width, $target_height );
+		$expected_size    = array( $target_width, $target_height );
 	} else {
 		$constrained_size = wp_constrain_dimensions( $target_width, $target_height, $source_width );
-		$expected_size = array( $source_width, $source_height );
+		$expected_size    = array( $source_width, $source_height );
 	}
 
 	// If the image dimensions are within 1px of the expected size, we consider it a match.
@@ -686,7 +688,7 @@ function wp_image_matches_ratio( $source_width, $source_height, $target_width, $
  * }
  */
 function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
-	if ( ! $size || ! is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) || empty( $imagedata['sizes'] )  ) {
+	if ( ! $size || ! is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) || empty( $imagedata['sizes'] ) ) {
 		return false;
 	}
 
@@ -730,11 +732,11 @@ function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
 			}
 
 			$data = array_shift( $candidates );
-		/*
-		 * When the size requested is smaller than the thumbnail dimensions, we
-		 * fall back to the thumbnail size to maintain backwards compatibility with
-		 * pre 4.6 versions of WordPress.
-		 */
+			/*
+			* When the size requested is smaller than the thumbnail dimensions, we
+			* fall back to the thumbnail size to maintain backwards compatibility with
+			* pre 4.6 versions of WordPress.
+			*/
 		} elseif ( ! empty( $imagedata['sizes']['thumbnail'] ) && $imagedata['sizes']['thumbnail']['width'] >= $size[0] && $imagedata['sizes']['thumbnail']['width'] >= $size[1] ) {
 			$data = $imagedata['sizes']['thumbnail'];
 		} else {
@@ -755,9 +757,9 @@ function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
 
 	// include the full filesystem path of the intermediate file
 	if ( empty( $data['path'] ) && ! empty( $data['file'] ) && ! empty( $imagedata['file'] ) ) {
-		$file_url = wp_get_attachment_url($post_id);
-		$data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
-		$data['url'] = path_join( dirname($file_url), $data['file'] );
+		$file_url     = wp_get_attachment_url( $post_id );
+		$data['path'] = path_join( dirname( $imagedata['file'] ), $data['file'] );
+		$data['url']  = path_join( dirname( $file_url ), $data['file'] );
 	}
 
 	/**
@@ -785,7 +787,7 @@ function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
  */
 function get_intermediate_image_sizes() {
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
-	$image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
+	$image_sizes                = array( 'thumbnail', 'medium', 'medium_large', 'large' ); // Standard sizes
 	if ( ! empty( $_wp_additional_image_sizes ) ) {
 		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
 	}
@@ -829,7 +831,7 @@ function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon
 			/** This filter is documented in wp-includes/post.php */
 			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
 
-			$src_file = $icon_dir . '/' . wp_basename( $src );
+			$src_file                = $icon_dir . '/' . wp_basename( $src );
 			@list( $width, $height ) = getimagesize( $src_file );
 		}
 
@@ -868,21 +870,21 @@ function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon
  * @param string|array $attr          Optional. Attributes for the image markup. Default empty.
  * @return string HTML img element or empty string on failure.
  */
-function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') {
-	$html = '';
-	$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
+function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = false, $attr = '' ) {
+	$html  = '';
+	$image = wp_get_attachment_image_src( $attachment_id, $size, $icon );
 	if ( $image ) {
 		list($src, $width, $height) = $image;
-		$hwstring = image_hwstring($width, $height);
-		$size_class = $size;
+		$hwstring                   = image_hwstring( $width, $height );
+		$size_class                 = $size;
 		if ( is_array( $size_class ) ) {
 			$size_class = join( 'x', $size_class );
 		}
-		$attachment = get_post($attachment_id);
+		$attachment   = get_post( $attachment_id );
 		$default_attr = array(
-			'src'	=> $src,
-			'class'	=> "attachment-$size_class size-$size_class",
-			'alt'	=> trim( strip_tags( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) ),
+			'src'   => $src,
+			'class' => "attachment-$size_class size-$size_class",
+			'alt'   => trim( strip_tags( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) ),
 		);
 
 		$attr = wp_parse_args( $attr, $default_attr );
@@ -893,8 +895,8 @@ function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = fa
 
 			if ( is_array( $image_meta ) ) {
 				$size_array = array( absint( $width ), absint( $height ) );
-				$srcset = wp_calculate_image_srcset( $size_array, $src, $image_meta, $attachment_id );
-				$sizes = wp_calculate_image_sizes( $size_array, $src, $image_meta, $attachment_id );
+				$srcset     = wp_calculate_image_srcset( $size_array, $src, $image_meta, $attachment_id );
+				$sizes      = wp_calculate_image_sizes( $size_array, $src, $image_meta, $attachment_id );
 
 				if ( $srcset && ( $sizes || ! empty( $attr['sizes'] ) ) ) {
 					$attr['srcset'] = $srcset;
@@ -918,7 +920,7 @@ function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = fa
 		 */
 		$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
 		$attr = array_map( 'esc_attr', $attr );
-		$html = rtrim("<img $hwstring");
+		$html = rtrim( "<img $hwstring" );
 		foreach ( $attr as $name => $value ) {
 			$html .= " $name=" . '"' . $value . '"';
 		}
@@ -988,10 +990,10 @@ function _wp_get_image_size_from_meta( $size_name, $image_meta ) {
 			absint( $image_meta['width'] ),
 			absint( $image_meta['height'] ),
 		);
-	} elseif ( ! empty( $image_meta['sizes'][$size_name] ) ) {
+	} elseif ( ! empty( $image_meta['sizes'][ $size_name ] ) ) {
 		return array(
-			absint( $image_meta['sizes'][$size_name]['width'] ),
-			absint( $image_meta['sizes'][$size_name]['height'] ),
+			absint( $image_meta['sizes'][ $size_name ]['width'] ),
+			absint( $image_meta['sizes'][ $size_name ]['height'] ),
 		);
 	}
 
@@ -1021,10 +1023,10 @@ function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium', $imag
 		$image_meta = wp_get_attachment_metadata( $attachment_id );
 	}
 
-	$image_src = $image[0];
+	$image_src  = $image[0];
 	$size_array = array(
 		absint( $image[1] ),
-		absint( $image[2] )
+		absint( $image[2] ),
 	);
 
 	return wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
@@ -1061,7 +1063,7 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
 	$image_sizes = $image_meta['sizes'];
 
 	// Get the width and height of the image.
-	$image_width = (int) $size_array[0];
+	$image_width  = (int) $size_array[0];
 	$image_height = (int) $size_array[1];
 
 	// Bail early if error/no width.
@@ -1093,7 +1095,7 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
 		$dirname = trailingslashit( $dirname );
 	}
 
-	$upload_dir = wp_get_upload_dir();
+	$upload_dir    = wp_get_upload_dir();
 	$image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname;
 
 	/*
@@ -1239,10 +1241,10 @@ function wp_get_attachment_image_sizes( $attachment_id, $size = 'medium', $image
 		$image_meta = wp_get_attachment_metadata( $attachment_id );
 	}
 
-	$image_src = $image[0];
+	$image_src  = $image[0];
 	$size_array = array(
 		absint( $image[1] ),
-		absint( $image[2] )
+		absint( $image[2] ),
 	);
 
 	return wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
@@ -1319,7 +1321,7 @@ function wp_make_content_images_responsive( $content ) {
 
 	$selected_images = $attachment_ids = array();
 
-	foreach( $matches[0] as $image ) {
+	foreach ( $matches[0] as $image ) {
 		if ( false === strpos( $image, ' srcset=' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) &&
 			( $attachment_id = absint( $class_id[1] ) ) ) {
 
@@ -1343,7 +1345,7 @@ function wp_make_content_images_responsive( $content ) {
 
 	foreach ( $selected_images as $image => $attachment_id ) {
 		$image_meta = wp_get_attachment_metadata( $attachment_id );
-		$content = str_replace( $image, wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ), $content );
+		$content    = str_replace( $image, wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ), $content );
 	}
 
 	return $content;
@@ -1368,7 +1370,7 @@ function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
 		return $image;
 	}
 
-	$image_src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : '';
+	$image_src         = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : '';
 	list( $image_src ) = explode( '?', $image_src );
 
 	// Return early if we couldn't get the image source.
@@ -1383,7 +1385,7 @@ function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
 		return $image;
 	}
 
-	$width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : 0;
+	$width  = preg_match( '/ width="([0-9]+)"/', $image, $match_width ) ? (int) $match_width[1] : 0;
 	$height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;
 
 	if ( ! $width || ! $height ) {
@@ -1394,12 +1396,12 @@ function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
 		$image_filename = wp_basename( $image_src );
 
 		if ( $image_filename === wp_basename( $image_meta['file'] ) ) {
-			$width = (int) $image_meta['width'];
+			$width  = (int) $image_meta['width'];
 			$height = (int) $image_meta['height'];
 		} else {
-			foreach( $image_meta['sizes'] as $image_size_data ) {
+			foreach ( $image_meta['sizes'] as $image_size_data ) {
 				if ( $image_filename === $image_size_data['file'] ) {
-					$width = (int) $image_size_data['width'];
+					$width  = (int) $image_size_data['width'];
 					$height = (int) $image_size_data['height'];
 					break;
 				}
@@ -1412,7 +1414,7 @@ function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
 	}
 
 	$size_array = array( $width, $height );
-	$srcset = wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
+	$srcset     = wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
 
 	if ( $srcset ) {
 		// Check if there is already a 'sizes' attribute.
@@ -1481,8 +1483,8 @@ function _wp_post_thumbnail_class_filter_remove( $attr ) {
 	remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
 }
 
-add_shortcode('wp_caption', 'img_caption_shortcode');
-add_shortcode('caption', 'img_caption_shortcode');
+add_shortcode( 'wp_caption', 'img_caption_shortcode' );
+add_shortcode( 'caption', 'img_caption_shortcode' );
 
 /**
  * Builds the Caption shortcode output.
@@ -1513,7 +1515,7 @@ function img_caption_shortcode( $attr, $content = null ) {
 	// New-style shortcode with the caption inside the shortcode with the link and image tags.
 	if ( ! isset( $attr['caption'] ) ) {
 		if ( preg_match( '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches ) ) {
-			$content = $matches[1];
+			$content         = $matches[1];
 			$attr['caption'] = trim( $matches[2] );
 		}
 	} elseif ( strpos( $attr['caption'], '<' ) !== false ) {
@@ -1535,23 +1537,28 @@ function img_caption_shortcode( $attr, $content = null ) {
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
 	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
+	if ( $output != '' ) {
 		return $output;
+	}
 
-	$atts = shortcode_atts( array(
-		'id'	  => '',
-		'align'	  => 'alignnone',
-		'width'	  => '',
-		'caption' => '',
-		'class'   => '',
-	), $attr, 'caption' );
+	$atts = shortcode_atts(
+		array(
+			'id'      => '',
+			'align'   => 'alignnone',
+			'width'   => '',
+			'caption' => '',
+			'class'   => '',
+		), $attr, 'caption'
+	);
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
+	if ( $atts['width'] < 1 || empty( $atts['caption'] ) ) {
 		return $content;
+	}
 
-	if ( ! empty( $atts['id'] ) )
+	if ( ! empty( $atts['id'] ) ) {
 		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	}
 
 	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
@@ -1592,7 +1599,7 @@ function img_caption_shortcode( $attr, $content = null ) {
 	return $html;
 }
 
-add_shortcode('gallery', 'gallery_shortcode');
+add_shortcode( 'gallery', 'gallery_shortcode' );
 
 /**
  * Builds the Gallery shortcode output.
@@ -1663,33 +1670,63 @@ function gallery_shortcode( $attr ) {
 	}
 
 	$html5 = current_theme_supports( 'html5', 'gallery' );
-	$atts = shortcode_atts( array(
-		'order'      => 'ASC',
-		'orderby'    => 'menu_order ID',
-		'id'         => $post ? $post->ID : 0,
-		'itemtag'    => $html5 ? 'figure'     : 'dl',
-		'icontag'    => $html5 ? 'div'        : 'dt',
-		'captiontag' => $html5 ? 'figcaption' : 'dd',
-		'columns'    => 3,
-		'size'       => 'thumbnail',
-		'include'    => '',
-		'exclude'    => '',
-		'link'       => ''
-	), $attr, 'gallery' );
+	$atts  = shortcode_atts(
+		array(
+			'order'      => 'ASC',
+			'orderby'    => 'menu_order ID',
+			'id'         => $post ? $post->ID : 0,
+			'itemtag'    => $html5 ? 'figure' : 'dl',
+			'icontag'    => $html5 ? 'div' : 'dt',
+			'captiontag' => $html5 ? 'figcaption' : 'dd',
+			'columns'    => 3,
+			'size'       => 'thumbnail',
+			'include'    => '',
+			'exclude'    => '',
+			'link'       => '',
+		), $attr, 'gallery'
+	);
 
 	$id = intval( $atts['id'] );
 
 	if ( ! empty( $atts['include'] ) ) {
-		$_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+		$_attachments = get_posts(
+			array(
+				'include'        => $atts['include'],
+				'post_status'    => 'inherit',
+				'post_type'      => 'attachment',
+				'post_mime_type' => 'image',
+				'order'          => $atts['order'],
+				'orderby'        => $atts['orderby'],
+			)
+		);
 
 		$attachments = array();
 		foreach ( $_attachments as $key => $val ) {
-			$attachments[$val->ID] = $_attachments[$key];
+			$attachments[ $val->ID ] = $_attachments[ $key ];
 		}
 	} elseif ( ! empty( $atts['exclude'] ) ) {
-		$attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+		$attachments = get_children(
+			array(
+				'post_parent'    => $id,
+				'exclude'        => $atts['exclude'],
+				'post_status'    => 'inherit',
+				'post_type'      => 'attachment',
+				'post_mime_type' => 'image',
+				'order'          => $atts['order'],
+				'orderby'        => $atts['orderby'],
+			)
+		);
 	} else {
-		$attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+		$attachments = get_children(
+			array(
+				'post_parent'    => $id,
+				'post_status'    => 'inherit',
+				'post_type'      => 'attachment',
+				'post_mime_type' => 'image',
+				'order'          => $atts['order'],
+				'orderby'        => $atts['orderby'],
+			)
+		);
 	}
 
 	if ( empty( $attachments ) ) {
@@ -1704,9 +1741,9 @@ function gallery_shortcode( $attr ) {
 		return $output;
 	}
 
-	$itemtag = tag_escape( $atts['itemtag'] );
+	$itemtag    = tag_escape( $atts['itemtag'] );
 	$captiontag = tag_escape( $atts['captiontag'] );
-	$icontag = tag_escape( $atts['icontag'] );
+	$icontag    = tag_escape( $atts['icontag'] );
 	$valid_tags = wp_kses_allowed_html( 'post' );
 	if ( ! isset( $valid_tags[ $itemtag ] ) ) {
 		$itemtag = 'dl';
@@ -1718,9 +1755,9 @@ function gallery_shortcode( $attr ) {
 		$icontag = 'dt';
 	}
 
-	$columns = intval( $atts['columns'] );
-	$itemwidth = $columns > 0 ? floor(100/$columns) : 100;
-	$float = is_rtl() ? 'right' : 'left';
+	$columns   = intval( $atts['columns'] );
+	$itemwidth = $columns > 0 ? floor( 100 / $columns ) : 100;
+	$float     = is_rtl() ? 'right' : 'left';
 
 	$selector = "gallery-{$instance}";
 
@@ -1757,7 +1794,7 @@ function gallery_shortcode( $attr ) {
 		</style>\n\t\t";
 	}
 
-	$size_class = sanitize_html_class( $atts['size'] );
+	$size_class  = sanitize_html_class( $atts['size'] );
 	$gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
 
 	/**
@@ -1781,7 +1818,7 @@ function gallery_shortcode( $attr ) {
 		} else {
 			$image_output = wp_get_attachment_link( $id, $atts['size'], true, false, false, $attr );
 		}
-		$image_meta  = wp_get_attachment_metadata( $id );
+		$image_meta = wp_get_attachment_metadata( $id );
 
 		$orientation = '';
 		if ( isset( $image_meta['height'], $image_meta['width'] ) ) {
@@ -1792,10 +1829,10 @@ function gallery_shortcode( $attr ) {
 			<{$icontag} class='gallery-icon {$orientation}'>
 				$image_output
 			</{$icontag}>";
-		if ( $captiontag && trim($attachment->post_excerpt) ) {
+		if ( $captiontag && trim( $attachment->post_excerpt ) ) {
 			$output .= "
 				<{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'>
-				" . wptexturize($attachment->post_excerpt) . "
+				" . wptexturize( $attachment->post_excerpt ) . "
 				</{$captiontag}>";
 		}
 		$output .= "</{$itemtag}>";
@@ -1827,10 +1864,12 @@ function wp_underscore_playlist_templates() {
 	<img src="{{ data.thumb.src }}" alt="" />
 	<# } #>
 	<div class="wp-playlist-caption">
-		<span class="wp-playlist-item-meta wp-playlist-item-title"><?php
+		<span class="wp-playlist-item-meta wp-playlist-item-title">
+		<?php
 			/* translators: playlist item title */
 			printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{ data.title }}' );
-		?></span>
+		?>
+		</span>
 		<# if ( data.meta.album ) { #><span class="wp-playlist-item-meta wp-playlist-item-album">{{ data.meta.album }}</span><# } #>
 		<# if ( data.meta.artist ) { #><span class="wp-playlist-item-meta wp-playlist-item-artist">{{ data.meta.artist }}</span><# } #>
 	</div>
@@ -1842,10 +1881,12 @@ function wp_underscore_playlist_templates() {
 			<# if ( data.caption ) { #>
 				{{ data.caption }}
 			<# } else { #>
-				<span class="wp-playlist-item-title"><?php
+				<span class="wp-playlist-item-title">
+				<?php
 					/* translators: playlist item title */
 					printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{{ data.title }}}' );
-				?></span>
+				?>
+				</span>
 				<# if ( data.artists && data.meta.artist ) { #>
 				<span class="wp-playlist-item-artist"> &mdash; {{ data.meta.artist }}</span>
 				<# } #>
@@ -1870,7 +1911,7 @@ 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]-->
+<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ); ?>');</script><![endif]-->
 <?php
 	add_action( 'wp_footer', 'wp_underscore_playlist_templates', 0 );
 	add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
@@ -1946,19 +1987,21 @@ function wp_playlist_shortcode( $attr ) {
 		return $output;
 	}
 
-	$atts = shortcode_atts( array(
-		'type'		=> 'audio',
-		'order'		=> 'ASC',
-		'orderby'	=> 'menu_order ID',
-		'id'		=> $post ? $post->ID : 0,
-		'include'	=> '',
-		'exclude'   => '',
-		'style'		=> 'light',
-		'tracklist' => true,
-		'tracknumbers' => true,
-		'images'	=> true,
-		'artists'	=> true
-	), $attr, 'playlist' );
+	$atts = shortcode_atts(
+		array(
+			'type'         => 'audio',
+			'order'        => 'ASC',
+			'orderby'      => 'menu_order ID',
+			'id'           => $post ? $post->ID : 0,
+			'include'      => '',
+			'exclude'      => '',
+			'style'        => 'light',
+			'tracklist'    => true,
+			'tracknumbers' => true,
+			'images'       => true,
+			'artists'      => true,
+		), $attr, 'playlist'
+	);
 
 	$id = intval( $atts['id'] );
 
@@ -1967,28 +2010,28 @@ function wp_playlist_shortcode( $attr ) {
 	}
 
 	$args = array(
-		'post_status' => 'inherit',
-		'post_type' => 'attachment',
+		'post_status'    => 'inherit',
+		'post_type'      => 'attachment',
 		'post_mime_type' => $atts['type'],
-		'order' => $atts['order'],
-		'orderby' => $atts['orderby']
+		'order'          => $atts['order'],
+		'orderby'        => $atts['orderby'],
 	);
 
 	if ( ! empty( $atts['include'] ) ) {
 		$args['include'] = $atts['include'];
-		$_attachments = get_posts( $args );
+		$_attachments    = get_posts( $args );
 
 		$attachments = array();
 		foreach ( $_attachments as $key => $val ) {
-			$attachments[$val->ID] = $_attachments[$key];
+			$attachments[ $val->ID ] = $_attachments[ $key ];
 		}
 	} elseif ( ! empty( $atts['exclude'] ) ) {
 		$args['post_parent'] = $id;
-		$args['exclude'] = $atts['exclude'];
-		$attachments = get_children( $args );
+		$args['exclude']     = $atts['exclude'];
+		$attachments         = get_children( $args );
 	} else {
 		$args['post_parent'] = $id;
-		$attachments = get_children( $args );
+		$attachments         = get_children( $args );
 	}
 
 	if ( empty( $attachments ) ) {
@@ -2005,35 +2048,35 @@ function wp_playlist_shortcode( $attr ) {
 
 	$outer = 22; // default padding and border of wrapper
 
-	$default_width = 640;
+	$default_width  = 640;
 	$default_height = 360;
 
-	$theme_width = empty( $content_width ) ? $default_width : ( $content_width - $outer );
+	$theme_width  = empty( $content_width ) ? $default_width : ( $content_width - $outer );
 	$theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width );
 
 	$data = array(
-		'type' => $atts['type'],
+		'type'         => $atts['type'],
 		// don't pass strings to JSON, will be truthy in JS
-		'tracklist' => wp_validate_boolean( $atts['tracklist'] ),
+		'tracklist'    => wp_validate_boolean( $atts['tracklist'] ),
 		'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ),
-		'images' => wp_validate_boolean( $atts['images'] ),
-		'artists' => wp_validate_boolean( $atts['artists'] ),
+		'images'       => wp_validate_boolean( $atts['images'] ),
+		'artists'      => wp_validate_boolean( $atts['artists'] ),
 	);
 
 	$tracks = array();
 	foreach ( $attachments as $attachment ) {
-		$url = wp_get_attachment_url( $attachment->ID );
+		$url   = wp_get_attachment_url( $attachment->ID );
 		$ftype = wp_check_filetype( $url, wp_get_mime_types() );
 		$track = array(
-			'src' => $url,
-			'type' => $ftype['type'],
-			'title' => $attachment->post_title,
-			'caption' => $attachment->post_excerpt,
-			'description' => $attachment->post_content
+			'src'         => $url,
+			'type'        => $ftype['type'],
+			'title'       => $attachment->post_title,
+			'caption'     => $attachment->post_excerpt,
+			'description' => $attachment->post_content,
 		);
 
 		$track['meta'] = array();
-		$meta = wp_get_attachment_metadata( $attachment->ID );
+		$meta          = wp_get_attachment_metadata( $attachment->ID );
 		if ( ! empty( $meta ) ) {
 
 			foreach ( wp_get_attachment_id3_keys( $attachment ) as $key => $label ) {
@@ -2044,20 +2087,20 @@ function wp_playlist_shortcode( $attr ) {
 
 			if ( 'video' === $atts['type'] ) {
 				if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
-					$width = $meta['width'];
-					$height = $meta['height'];
+					$width        = $meta['width'];
+					$height       = $meta['height'];
 					$theme_height = round( ( $height * $theme_width ) / $width );
 				} else {
-					$width = $default_width;
+					$width  = $default_width;
 					$height = $default_height;
 				}
 
 				$track['dimensions'] = array(
 					'original' => compact( 'width', 'height' ),
-					'resized' => array(
-						'width' => $theme_width,
-						'height' => $theme_height
-					)
+					'resized'  => array(
+						'width'  => $theme_width,
+						'height' => $theme_height,
+					),
 				);
 			}
 		}
@@ -2066,13 +2109,13 @@ function wp_playlist_shortcode( $attr ) {
 			$thumb_id = get_post_thumbnail_id( $attachment->ID );
 			if ( ! empty( $thumb_id ) ) {
 				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'full' );
-				$track['image'] = compact( 'src', 'width', 'height' );
+				$track['image']               = compact( 'src', 'width', 'height' );
 				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'thumbnail' );
-				$track['thumb'] = compact( 'src', 'width', 'height' );
+				$track['thumb']               = compact( 'src', 'width', 'height' );
 			} else {
-				$src = wp_mime_type_icon( $attachment->ID );
-				$width = 48;
-				$height = 64;
+				$src            = wp_mime_type_icon( $attachment->ID );
+				$width          = 48;
+				$height         = 64;
 				$track['image'] = compact( 'src', 'width', 'height' );
 				$track['thumb'] = compact( 'src', 'width', 'height' );
 			}
@@ -2082,7 +2125,7 @@ function wp_playlist_shortcode( $attr ) {
 	}
 	$data['tracks'] = $tracks;
 
-	$safe_type = esc_attr( $atts['type'] );
+	$safe_type  = esc_attr( $atts['type'] );
 	$safe_style = esc_attr( $atts['style'] );
 
 	ob_start();
@@ -2097,26 +2140,35 @@ function wp_playlist_shortcode( $attr ) {
 		 * @param string $style The 'theme' for the playlist. Core provides 'light' and 'dark'.
 		 */
 		do_action( 'wp_playlist_scripts', $atts['type'], $atts['style'] );
-	} ?>
-<div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?>">
-	<?php if ( 'audio' === $atts['type'] ): ?>
+	}
+	?>
+<div class="wp-playlist wp-<?php echo $safe_type; ?>-playlist wp-playlist-<?php echo $safe_style; ?>">
+	<?php if ( 'audio' === $atts['type'] ) : ?>
 	<div class="wp-playlist-current-item"></div>
 	<?php endif ?>
-	<<?php echo $safe_type ?> controls="controls" preload="none" width="<?php
-		echo (int) $theme_width;
-	?>"<?php if ( 'video' === $safe_type ):
+	<<?php echo $safe_type; ?> controls="controls" preload="none" width="
+				<?php
+				echo (int) $theme_width;
+	?>
+	"
+	<?php
+	if ( 'video' === $safe_type ) :
 		echo ' height="', (int) $theme_height, '"';
-	endif; ?>></<?php echo $safe_type ?>>
+	endif;
+	?>
+	></<?php echo $safe_type; ?>>
 	<div class="wp-playlist-next"></div>
 	<div class="wp-playlist-prev"></div>
 	<noscript>
-	<ol><?php
+	<ol>
+	<?php
 	foreach ( $attachments as $att_id => $attachment ) {
 		printf( '<li>%s</li>', wp_get_attachment_link( $att_id ) );
 	}
-	?></ol>
+	?>
+	</ol>
 	</noscript>
-	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode( $data ) ?></script>
+	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode( $data ); ?></script>
 </div>
 	<?php
 	return ob_get_clean();
@@ -2174,7 +2226,7 @@ function wp_get_audio_extensions() {
 function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) {
 	$fields = array(
 		'artist' => __( 'Artist' ),
-		'album' => __( 'Album' ),
+		'album'  => __( 'Album' ),
 	);
 
 	if ( 'display' === $context ) {
@@ -2182,8 +2234,8 @@ function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) {
 		$fields['year']             = __( 'Year' );
 		$fields['length_formatted'] = _x( 'Length', 'video or audio' );
 	} elseif ( 'js' === $context ) {
-		$fields['bitrate']          = __( 'Bitrate' );
-		$fields['bitrate_mode']     = __( 'Bitrate Mode' );
+		$fields['bitrate']      = __( 'Bitrate' );
+		$fields['bitrate_mode'] = __( 'Bitrate Mode' );
 	}
 
 	/**
@@ -2252,10 +2304,10 @@ function wp_audio_shortcode( $attr, $content = '' ) {
 		'autoplay' => '',
 		'preload'  => 'none',
 		'class'    => 'wp-audio-shortcode',
-		'style'    => 'width: 100%;'
+		'style'    => 'width: 100%;',
 	);
 	foreach ( $default_types as $type ) {
-		$defaults_atts[$type] = '';
+		$defaults_atts[ $type ] = '';
 	}
 
 	$atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
@@ -2285,7 +2337,7 @@ function wp_audio_shortcode( $attr, $content = '' ) {
 			return;
 		}
 
-		$audio = reset( $audios );
+		$audio       = reset( $audios );
 		$atts['src'] = wp_get_attachment_url( $audio->ID );
 		if ( empty( $atts['src'] ) ) {
 			return;
@@ -2329,8 +2381,8 @@ function wp_audio_shortcode( $attr, $content = '' ) {
 
 	// These ones should just be omitted altogether if they are blank
 	foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+		if ( empty( $html_atts[ $a ] ) ) {
+			unset( $html_atts[ $a ] );
 		}
 	}
 
@@ -2346,14 +2398,14 @@ function wp_audio_shortcode( $attr, $content = '' ) {
 	$html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
 
 	$fileurl = '';
-	$source = '<source type="%s" src="%s" />';
+	$source  = '<source type="%s" src="%s" />';
 	foreach ( $default_types as $fallback ) {
 		if ( ! empty( $atts[ $fallback ] ) ) {
 			if ( empty( $fileurl ) ) {
 				$fileurl = $atts[ $fallback ];
 			}
-			$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
+			$type  = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
+			$url   = add_query_arg( '_', $instance, $atts[ $fallback ] );
 			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
 		}
 	}
@@ -2467,7 +2519,7 @@ function wp_video_shortcode( $attr, $content = '' ) {
 	);
 
 	foreach ( $default_types as $type ) {
-		$defaults_atts[$type] = '';
+		$defaults_atts[ $type ] = '';
 	}
 
 	$atts = shortcode_atts( $defaults_atts, $attr, 'video' );
@@ -2476,24 +2528,24 @@ function wp_video_shortcode( $attr, $content = '' ) {
 		// shrink the video so it isn't huge in the admin
 		if ( $atts['width'] > $defaults_atts['width'] ) {
 			$atts['height'] = round( ( $atts['height'] * $defaults_atts['width'] ) / $atts['width'] );
-			$atts['width'] = $defaults_atts['width'];
+			$atts['width']  = $defaults_atts['width'];
 		}
 	} else {
 		// if the video is bigger than the theme
 		if ( ! empty( $content_width ) && $atts['width'] > $content_width ) {
 			$atts['height'] = round( ( $atts['height'] * $content_width ) / $atts['width'] );
-			$atts['width'] = $content_width;
+			$atts['width']  = $content_width;
 		}
 	}
 
-	$is_vimeo = $is_youtube = false;
-	$yt_pattern = '#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#';
+	$is_vimeo      = $is_youtube = false;
+	$yt_pattern    = '#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#';
 	$vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#';
 
 	$primary = false;
 	if ( ! empty( $atts['src'] ) ) {
-		$is_vimeo = ( preg_match( $vimeo_pattern, $atts['src'] ) );
-		$is_youtube = (  preg_match( $yt_pattern, $atts['src'] ) );
+		$is_vimeo   = ( preg_match( $vimeo_pattern, $atts['src'] ) );
+		$is_youtube = ( preg_match( $yt_pattern, $atts['src'] ) );
 		if ( ! $is_youtube && ! $is_vimeo ) {
 			$type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
 			if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
@@ -2502,7 +2554,7 @@ function wp_video_shortcode( $attr, $content = '' ) {
 		}
 
 		if ( $is_vimeo ) {
-		    wp_enqueue_script( 'mediaelement-vimeo' );
+			wp_enqueue_script( 'mediaelement-vimeo' );
 		}
 
 		$primary = true;
@@ -2524,7 +2576,7 @@ function wp_video_shortcode( $attr, $content = '' ) {
 			return;
 		}
 
-		$video = reset( $videos );
+		$video       = reset( $videos );
 		$atts['src'] = wp_get_attachment_url( $video->ID );
 		if ( empty( $atts['src'] ) ) {
 			return;
@@ -2557,10 +2609,10 @@ function wp_video_shortcode( $attr, $content = '' ) {
 		} elseif ( $is_vimeo ) {
 			// Remove all query arguments and force SSL - see #40866.
 			$parsed_vimeo_url = wp_parse_url( $atts['src'] );
-			$vimeo_src = 'https://' . $parsed_vimeo_url['host'] . $parsed_vimeo_url['path'];
+			$vimeo_src        = 'https://' . $parsed_vimeo_url['host'] . $parsed_vimeo_url['path'];
 
 			// Add loop param for mejs bug - see #40977, not needed after #39686.
-			$loop = $atts['loop'] ? '1' : '0';
+			$loop        = $atts['loop'] ? '1' : '0';
 			$atts['src'] = add_query_arg( 'loop', $loop, $vimeo_src );
 		}
 	}
@@ -2589,8 +2641,8 @@ function wp_video_shortcode( $attr, $content = '' ) {
 
 	// These ones should just be omitted altogether if they are blank
 	foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+		if ( empty( $html_atts[ $a ] ) ) {
+			unset( $html_atts[ $a ] );
 		}
 	}
 
@@ -2606,7 +2658,7 @@ function wp_video_shortcode( $attr, $content = '' ) {
 	$html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
 
 	$fileurl = '';
-	$source = '<source type="%s" src="%s" />';
+	$source  = '<source type="%s" src="%s" />';
 	foreach ( $default_types as $fallback ) {
 		if ( ! empty( $atts[ $fallback ] ) ) {
 			if ( empty( $fileurl ) ) {
@@ -2619,7 +2671,7 @@ function wp_video_shortcode( $attr, $content = '' ) {
 			} else {
 				$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
 			}
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
+			$url   = add_query_arg( '_', $instance, $atts[ $fallback ] );
 			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
 		}
 	}
@@ -2670,7 +2722,7 @@ add_shortcode( 'video', 'wp_video_shortcode' );
  * @param string       $text Optional. Link text. Default false.
  */
 function previous_image_link( $size = 'thumbnail', $text = false ) {
-	adjacent_image_link(true, $size, $text);
+	adjacent_image_link( true, $size, $text );
 }
 
 /**
@@ -2686,7 +2738,7 @@ function previous_image_link( $size = 'thumbnail', $text = false ) {
  * @param string       $text Optional. Link text. Default false.
  */
 function next_image_link( $size = 'thumbnail', $text = false ) {
-	adjacent_image_link(false, $size, $text);
+	adjacent_image_link( false, $size, $text );
 }
 
 /**
@@ -2702,8 +2754,19 @@ function next_image_link( $size = 'thumbnail', $text = false ) {
  * @param bool         $text Optional. Link text. Default false.
  */
 function adjacent_image_link( $prev = true, $size = 'thumbnail', $text = false ) {
-	$post = get_post();
-	$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' ) ) );
+	$post        = get_post();
+	$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 ) {
@@ -2711,7 +2774,7 @@ function adjacent_image_link( $prev = true, $size = 'thumbnail', $text = false )
 		}
 	}
 
-	$output = '';
+	$output        = '';
 	$attachment_id = 0;
 
 	if ( $attachments ) {
@@ -2719,7 +2782,7 @@ function adjacent_image_link( $prev = true, $size = 'thumbnail', $text = false )
 
 		if ( isset( $attachments[ $k ] ) ) {
 			$attachment_id = $attachments[ $k ]->ID;
-			$output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+			$output        = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
 		}
 	}
 
@@ -2759,22 +2822,27 @@ function get_attachment_taxonomies( $attachment, $output = 'names' ) {
 	} elseif ( is_array( $attachment ) ) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
+	if ( ! is_object( $attachment ) ) {
 		return array();
+	}
 
-	$file = get_attached_file( $attachment->ID );
+	$file     = get_attached_file( $attachment->ID );
 	$filename = basename( $file );
 
-	$objects = array('attachment');
+	$objects = array( 'attachment' );
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
-	if ( !empty($attachment->post_mime_type) ) {
+	if ( false !== strpos( $filename, '.' ) ) {
+		$objects[] = 'attachment:' . substr( $filename, strrpos( $filename, '.' ) + 1 );
+	}
+	if ( ! empty( $attachment->post_mime_type ) ) {
 		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
-				if ( !empty($token) )
+		if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+			foreach ( explode( '/', $attachment->post_mime_type ) as $token ) {
+				if ( ! empty( $token ) ) {
 					$objects[] = "attachment:$token";
+				}
+			}
+		}
 	}
 
 	$taxonomies = array();
@@ -2809,10 +2877,11 @@ function get_taxonomies_for_attachments( $output = 'names' ) {
 	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
 		foreach ( $taxonomy->object_type as $object_type ) {
 			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
+				if ( 'names' == $output ) {
 					$taxonomies[] = $taxonomy->name;
-				else
+				} else {
 					$taxonomies[ $taxonomy->name ] = $taxonomy;
+				}
 				break;
 			}
 		}
@@ -2832,11 +2901,11 @@ function get_taxonomies_for_attachments( $output = 'names' ) {
  * @param int $height Image height in pixels..
  * @return resource The GD image resource.
  */
-function wp_imagecreatetruecolor($width, $height) {
-	$img = imagecreatetruecolor($width, $height);
-	if ( is_resource($img) && function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
-		imagealphablending($img, false);
-		imagesavealpha($img, true);
+function wp_imagecreatetruecolor( $width, $height ) {
+	$img = imagecreatetruecolor( $width, $height );
+	if ( is_resource( $img ) && function_exists( 'imagealphablending' ) && function_exists( 'imagesavealpha' ) ) {
+		imagealphablending( $img, false );
+		imagesavealpha( $img, true );
 	}
 	return $img;
 }
@@ -2905,8 +2974,9 @@ function wp_get_image_editor( $path, $args = array() ) {
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
+		if ( isset( $file_info ) && $file_info['type'] ) {
 			$args['mime_type'] = $file_info['type'];
+		}
 	}
 
 	$implementation = _wp_image_editor_choose( $args );
@@ -2915,13 +2985,14 @@ function wp_get_image_editor( $path, $args = array() ) {
 		$editor = new $implementation( $path );
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
+		if ( is_wp_error( $loaded ) ) {
 			return $loaded;
+		}
 
 		return $editor;
 	}
 
-	return new WP_Error( 'image_no_editor', __('No editor could be selected.') );
+	return new WP_Error( 'image_no_editor', __( 'No editor could be selected.' ) );
 }
 
 /**
@@ -2962,13 +3033,15 @@ function _wp_image_editor_choose( $args = array() ) {
 	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
 
 	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
+		if ( ! call_user_func( array( $implementation, 'test' ), $args ) ) {
 			continue;
+		}
 
 		if ( isset( $args['mime_type'] ) &&
 			! call_user_func(
 				array( $implementation, 'supports_mime_type' ),
-				$args['mime_type'] ) ) {
+				$args['mime_type']
+			) ) {
 			continue;
 		}
 
@@ -2993,12 +3066,13 @@ function wp_plupload_default_settings() {
 	$wp_scripts = wp_scripts();
 
 	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
+	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) {
 		return;
+	}
 
-	$max_upload_size = wp_max_upload_size();
+	$max_upload_size    = wp_max_upload_size();
 	$allowed_extensions = array_keys( get_allowed_mime_types() );
-	$extensions = array();
+	$extensions         = array();
 	foreach ( $allowed_extensions as $extension ) {
 		$extensions = array_merge( $extensions, explode( '|', $extension ) );
 	}
@@ -3008,11 +3082,11 @@ function wp_plupload_default_settings() {
 	 * and the `flash_swf_url` and `silverlight_xap_url` are not used.
 	 */
 	$defaults = array(
-		'file_data_name'      => 'async-upload', // key passed to $_FILE.
-		'url'                 => admin_url( 'async-upload.php', 'relative' ),
-		'filters' => array(
-			'max_file_size'   => $max_upload_size . 'b',
-			'mime_types'      => array( array( 'extensions' => implode( ',', $extensions ) ) ),
+		'file_data_name' => 'async-upload', // key passed to $_FILE.
+		'url'            => admin_url( 'async-upload.php', 'relative' ),
+		'filters'        => array(
+			'max_file_size' => $max_upload_size . 'b',
+			'mime_types'    => array( array( 'extensions' => implode( ',', $extensions ) ) ),
 		),
 	);
 
@@ -3044,23 +3118,24 @@ function wp_plupload_default_settings() {
 	 *
 	 * @param array $params Default Plupload parameters array.
 	 */
-	$params = apply_filters( 'plupload_default_params', $params );
-	$params['_wpnonce'] = wp_create_nonce( 'media-form' );
+	$params                       = apply_filters( 'plupload_default_params', $params );
+	$params['_wpnonce']           = wp_create_nonce( 'media-form' );
 	$defaults['multipart_params'] = $params;
 
 	$settings = array(
-		'defaults' => $defaults,
-		'browser'  => array(
+		'defaults'      => $defaults,
+		'browser'       => array(
 			'mobile'    => wp_is_mobile(),
 			'supported' => _device_can_upload(),
 		),
-		'limitExceeded' => is_multisite() && ! is_upload_space_available()
+		'limitExceeded' => is_multisite() && ! is_upload_space_available(),
 	);
 
 	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
 
-	if ( $data )
+	if ( $data ) {
 		$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
 }
@@ -3075,49 +3150,52 @@ function wp_plupload_default_settings() {
  * @return array|void Array of attachment details.
  */
 function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
+	if ( ! $attachment = get_post( $attachment ) ) {
 		return;
+	}
 
-	if ( 'attachment' != $attachment->post_type )
+	if ( 'attachment' != $attachment->post_type ) {
 		return;
+	}
 
 	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
+	if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
 		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
-	else
+	} else {
 		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	}
 
 	$attachment_url = wp_get_attachment_url( $attachment->ID );
-	$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+	$base_url       = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
 
 	$response = array(
-		'id'          => $attachment->ID,
-		'title'       => $attachment->post_title,
-		'filename'    => wp_basename( get_attached_file( $attachment->ID ) ),
-		'url'         => $attachment_url,
-		'link'        => get_attachment_link( $attachment->ID ),
-		'alt'         => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
-		'author'      => $attachment->post_author,
-		'description' => $attachment->post_content,
-		'caption'     => $attachment->post_excerpt,
-		'name'        => $attachment->post_name,
-		'status'      => $attachment->post_status,
-		'uploadedTo'  => $attachment->post_parent,
-		'date'        => strtotime( $attachment->post_date_gmt ) * 1000,
-		'modified'    => strtotime( $attachment->post_modified_gmt ) * 1000,
-		'menuOrder'   => $attachment->menu_order,
-		'mime'        => $attachment->post_mime_type,
-		'type'        => $type,
-		'subtype'     => $subtype,
-		'icon'        => wp_mime_type_icon( $attachment->ID ),
+		'id'            => $attachment->ID,
+		'title'         => $attachment->post_title,
+		'filename'      => wp_basename( get_attached_file( $attachment->ID ) ),
+		'url'           => $attachment_url,
+		'link'          => get_attachment_link( $attachment->ID ),
+		'alt'           => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
+		'author'        => $attachment->post_author,
+		'description'   => $attachment->post_content,
+		'caption'       => $attachment->post_excerpt,
+		'name'          => $attachment->post_name,
+		'status'        => $attachment->post_status,
+		'uploadedTo'    => $attachment->post_parent,
+		'date'          => strtotime( $attachment->post_date_gmt ) * 1000,
+		'modified'      => strtotime( $attachment->post_modified_gmt ) * 1000,
+		'menuOrder'     => $attachment->menu_order,
+		'mime'          => $attachment->post_mime_type,
+		'type'          => $type,
+		'subtype'       => $subtype,
+		'icon'          => wp_mime_type_icon( $attachment->ID ),
 		'dateFormatted' => mysql2date( __( 'F j, Y' ), $attachment->post_date ),
-		'nonces'      => array(
+		'nonces'        => array(
 			'update' => false,
 			'delete' => false,
-			'edit'   => false
+			'edit'   => false,
 		),
-		'editLink'   => false,
-		'meta'       => false,
+		'editLink'      => false,
+		'meta'          => false,
 	);
 
 	$author = new WP_User( $attachment->post_author );
@@ -3156,32 +3234,35 @@ function wp_prepare_attachment_for_js( $attachment ) {
 	}
 
 	if ( $bytes ) {
-		$response['filesizeInBytes'] = $bytes;
+		$response['filesizeInBytes']       = $bytes;
 		$response['filesizeHumanReadable'] = size_format( $bytes );
 	}
 
-	$context = get_post_meta( $attachment->ID, '_wp_attachment_context', true );
+	$context             = get_post_meta( $attachment->ID, '_wp_attachment_context', true );
 	$response['context'] = ( $context ) ? $context : '';
 
 	if ( current_user_can( 'edit_post', $attachment->ID ) ) {
 		$response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );
-		$response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );
-		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
+		$response['nonces']['edit']   = wp_create_nonce( 'image_editor-' . $attachment->ID );
+		$response['editLink']         = get_edit_post_link( $attachment->ID, 'raw' );
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
+	if ( current_user_can( 'delete_post', $attachment->ID ) ) {
 		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	}
 
 	if ( $meta && ( 'image' === $type || ! empty( $meta['sizes'] ) ) ) {
 		$sizes = array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$possible_sizes = apply_filters( 'image_size_names_choose', array(
-			'thumbnail' => __('Thumbnail'),
-			'medium'    => __('Medium'),
-			'large'     => __('Large'),
-			'full'      => __('Full Size'),
-		) );
+		$possible_sizes = apply_filters(
+			'image_size_names_choose', array(
+				'thumbnail' => __( 'Thumbnail' ),
+				'medium'    => __( 'Medium' ),
+				'large'     => __( 'Large' ),
+				'full'      => __( 'Full Size' ),
+			)
+		);
 		unset( $possible_sizes['full'] );
 
 		// Loop through all potential sizes that may be chosen. Try to do this with some efficiency.
@@ -3223,8 +3304,8 @@ function wp_prepare_attachment_for_js( $attachment ) {
 			$sizes['full'] = array( 'url' => $attachment_url );
 
 			if ( isset( $meta['height'], $meta['width'] ) ) {
-				$sizes['full']['height'] = $meta['height'];
-				$sizes['full']['width'] = $meta['width'];
+				$sizes['full']['height']      = $meta['height'];
+				$sizes['full']['width']       = $meta['width'];
 				$sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
 			}
 
@@ -3234,7 +3315,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
 				'url'         => $base_url . $meta['sizes']['full']['file'],
 				'height'      => $meta['sizes']['full']['height'],
 				'width'       => $meta['sizes']['full']['width'],
-				'orientation' => $meta['sizes']['full']['height'] > $meta['sizes']['full']['width'] ? 'portrait' : 'landscape'
+				'orientation' => $meta['sizes']['full']['height'] > $meta['sizes']['full']['width'] ? 'portrait' : 'landscape',
 			);
 		}
 
@@ -3242,15 +3323,18 @@ function wp_prepare_attachment_for_js( $attachment ) {
 	}
 
 	if ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
+		if ( isset( $meta['width'] ) ) {
 			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
+		}
+		if ( isset( $meta['height'] ) ) {
 			$response['height'] = (int) $meta['height'];
+		}
 	}
 
 	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
+		if ( isset( $meta['length_formatted'] ) ) {
 			$response['fileLength'] = $meta['length_formatted'];
+		}
 
 		$response['meta'] = array();
 		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
@@ -3264,20 +3348,21 @@ function wp_prepare_attachment_for_js( $attachment ) {
 		$id = get_post_thumbnail_id( $attachment->ID );
 		if ( ! empty( $id ) ) {
 			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'full' );
-			$response['image'] = compact( 'src', 'width', 'height' );
+			$response['image']            = compact( 'src', 'width', 'height' );
 			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'thumbnail' );
-			$response['thumb'] = compact( 'src', 'width', 'height' );
+			$response['thumb']            = compact( 'src', 'width', 'height' );
 		} else {
-			$src = wp_mime_type_icon( $attachment->ID );
-			$width = 48;
-			$height = 64;
+			$src               = wp_mime_type_icon( $attachment->ID );
+			$width             = 48;
+			$height            = 64;
 			$response['image'] = compact( 'src', 'width', 'height' );
 			$response['thumb'] = compact( 'src', 'width', 'height' );
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
+	if ( function_exists( 'get_compat_media_markup' ) ) {
 		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	}
 
 	/**
 	 * Filters the attachment data prepared for JavaScript.
@@ -3309,15 +3394,16 @@ function wp_prepare_attachment_for_js( $attachment ) {
  */
 function wp_enqueue_media( $args = array() ) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
+	if ( did_action( 'wp_enqueue_media' ) ) {
 		return;
+	}
 
 	global $content_width, $wpdb, $wp_locale;
 
 	$defaults = array(
 		'post' => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 
 	// We're going to pass the old thickbox media tabs to `media_upload_tabs`
 	// to ensure plugins will work. We will then unset those tabs.
@@ -3339,8 +3425,8 @@ function wp_enqueue_media( $args = array() ) {
 		'size'  => get_option( 'image_default_size' ),  // empty default
 	);
 
-	$exts = array_merge( wp_get_audio_extensions(), wp_get_video_extensions() );
-	$mimes = get_allowed_mime_types();
+	$exts      = array_merge( wp_get_audio_extensions(), wp_get_video_extensions() );
+	$mimes     = get_allowed_mime_types();
 	$ext_mimes = array();
 	foreach ( $exts as $ext ) {
 		foreach ( $mimes as $ext_preg => $mime_match ) {
@@ -3370,13 +3456,15 @@ function wp_enqueue_media( $args = array() ) {
 	 */
 	$show_audio_playlist = apply_filters( 'media_library_show_audio_playlist', true );
 	if ( null === $show_audio_playlist ) {
-		$show_audio_playlist = $wpdb->get_var( "
+		$show_audio_playlist = $wpdb->get_var(
+			"
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_type = 'attachment'
 			AND post_mime_type LIKE 'audio%'
 			LIMIT 1
-		" );
+		"
+		);
 	}
 
 	/**
@@ -3398,13 +3486,15 @@ function wp_enqueue_media( $args = array() ) {
 	 */
 	$show_video_playlist = apply_filters( 'media_library_show_video_playlist', true );
 	if ( null === $show_video_playlist ) {
-		$show_video_playlist = $wpdb->get_var( "
+		$show_video_playlist = $wpdb->get_var(
+			"
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_type = 'attachment'
 			AND post_mime_type LIKE 'video%'
 			LIMIT 1
-		" );
+		"
+		);
 	}
 
 	/**
@@ -3425,47 +3515,51 @@ function wp_enqueue_media( $args = array() ) {
 	 */
 	$months = apply_filters( 'media_library_months_with_files', null );
 	if ( ! is_array( $months ) ) {
-		$months = $wpdb->get_results( $wpdb->prepare( "
+		$months = $wpdb->get_results(
+			$wpdb->prepare(
+				"
 			SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 			FROM $wpdb->posts
 			WHERE post_type = %s
 			ORDER BY post_date DESC
-		", 'attachment' ) );
+		", 'attachment'
+			)
+		);
 	}
 	foreach ( $months as $month_year ) {
 		$month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
 	}
 
 	$settings = array(
-		'tabs'      => $tabs,
-		'tabUrl'    => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
-		'mimeTypes' => wp_list_pluck( get_post_mime_types(), 0 ),
+		'tabs'             => $tabs,
+		'tabUrl'           => add_query_arg( array( 'chromeless' => true ), admin_url( 'media-upload.php' ) ),
+		'mimeTypes'        => wp_list_pluck( get_post_mime_types(), 0 ),
 		/** This filter is documented in wp-admin/includes/media.php */
-		'captions'  => ! apply_filters( 'disable_captions', '' ),
-		'nonce'     => array(
+		'captions'         => ! apply_filters( 'disable_captions', '' ),
+		'nonce'            => array(
 			'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
 		),
-		'post'    => array(
+		'post'             => array(
 			'id' => 0,
 		),
-		'defaultProps' => $props,
+		'defaultProps'     => $props,
 		'attachmentCounts' => array(
 			'audio' => ( $show_audio_playlist ) ? 1 : 0,
 			'video' => ( $show_video_playlist ) ? 1 : 0,
 		),
-		'oEmbedProxyUrl' => rest_url( 'oembed/1.0/proxy' ),
-		'embedExts'    => $exts,
-		'embedMimes'   => $ext_mimes,
-		'contentWidth' => $content_width,
-		'months'       => $months,
-		'mediaTrash'   => MEDIA_TRASH ? 1 : 0,
+		'oEmbedProxyUrl'   => rest_url( 'oembed/1.0/proxy' ),
+		'embedExts'        => $exts,
+		'embedMimes'       => $ext_mimes,
+		'contentWidth'     => $content_width,
+		'months'           => $months,
+		'mediaTrash'       => MEDIA_TRASH ? 1 : 0,
 	);
 
 	$post = null;
 	if ( isset( $args['post'] ) ) {
-		$post = get_post( $args['post'] );
+		$post             = get_post( $args['post'] );
 		$settings['post'] = array(
-			'id' => $post->ID,
+			'id'    => $post->ID,
 			'nonce' => wp_create_nonce( 'update-post_' . $post->ID ),
 		);
 
@@ -3479,7 +3573,7 @@ function wp_enqueue_media( $args = array() ) {
 		}
 
 		if ( $thumbnail_support ) {
-			$featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
+			$featured_image_id                   = get_post_meta( $post->ID, '_thumbnail_id', true );
 			$settings['post']['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
 		}
 	}
@@ -3492,127 +3586,127 @@ function wp_enqueue_media( $args = array() ) {
 
 	$strings = array(
 		// Generic
-		'url'         => __( 'URL' ),
-		'addMedia'    => __( 'Add Media' ),
-		'search'      => __( 'Search' ),
-		'select'      => __( 'Select' ),
-		'cancel'      => __( 'Cancel' ),
-		'update'      => __( 'Update' ),
-		'replace'     => __( 'Replace' ),
-		'remove'      => __( 'Remove' ),
-		'back'        => __( 'Back' ),
+		'url'                         => __( 'URL' ),
+		'addMedia'                    => __( 'Add Media' ),
+		'search'                      => __( 'Search' ),
+		'select'                      => __( 'Select' ),
+		'cancel'                      => __( 'Cancel' ),
+		'update'                      => __( 'Update' ),
+		'replace'                     => __( 'Replace' ),
+		'remove'                      => __( 'Remove' ),
+		'back'                        => __( 'Back' ),
 		/*
 		 * translators: This is a would-be plural string used in the media manager.
 		 * If there is not a word you can use in your language to avoid issues with the
 		 * lack of plural support here, turn it into "selected: %d" then translate it.
 		 */
-		'selected'    => __( '%d selected' ),
-		'dragInfo'    => __( 'Drag and drop to reorder media files.' ),
+		'selected'                    => __( '%d selected' ),
+		'dragInfo'                    => __( 'Drag and drop to reorder media files.' ),
 
 		// Upload
-		'uploadFilesTitle'  => __( 'Upload Files' ),
-		'uploadImagesTitle' => __( 'Upload Images' ),
+		'uploadFilesTitle'            => __( 'Upload Files' ),
+		'uploadImagesTitle'           => __( 'Upload Images' ),
 
 		// Library
-		'mediaLibraryTitle'      => __( 'Media Library' ),
-		'insertMediaTitle'       => __( 'Add Media' ),
-		'createNewGallery'       => __( 'Create a new gallery' ),
-		'createNewPlaylist'      => __( 'Create a new playlist' ),
-		'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
-		'returnToLibrary'        => __( '&#8592; Return to library' ),
-		'allMediaItems'          => __( 'All media items' ),
-		'allDates'               => __( 'All dates' ),
-		'noItemsFound'           => __( 'No items found.' ),
-		'insertIntoPost'         => $post_type_object->labels->insert_into_item,
-		'unattached'             => __( 'Unattached' ),
-		'trash'                  => _x( 'Trash', 'noun' ),
-		'uploadedToThisPost'     => $post_type_object->labels->uploaded_to_this_item,
-		'warnDelete'             => __( "You are about to permanently delete this item from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkDelete'         => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkTrash'          => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'bulkSelect'             => __( 'Bulk Select' ),
-		'cancelSelection'        => __( 'Cancel Selection' ),
-		'trashSelected'          => __( 'Trash Selected' ),
-		'untrashSelected'        => __( 'Untrash Selected' ),
-		'deleteSelected'         => __( 'Delete Selected' ),
-		'deletePermanently'      => __( 'Delete Permanently' ),
-		'apply'                  => __( 'Apply' ),
-		'filterByDate'           => __( 'Filter by date' ),
-		'filterByType'           => __( 'Filter by type' ),
-		'searchMediaLabel'       => __( 'Search Media' ),
-		'searchMediaPlaceholder' => __( 'Search media items...' ), // placeholder (no ellipsis)
-		'noMedia'                => __( 'No media files found.' ),
+		'mediaLibraryTitle'           => __( 'Media Library' ),
+		'insertMediaTitle'            => __( 'Add Media' ),
+		'createNewGallery'            => __( 'Create a new gallery' ),
+		'createNewPlaylist'           => __( 'Create a new playlist' ),
+		'createNewVideoPlaylist'      => __( 'Create a new video playlist' ),
+		'returnToLibrary'             => __( '&#8592; Return to library' ),
+		'allMediaItems'               => __( 'All media items' ),
+		'allDates'                    => __( 'All dates' ),
+		'noItemsFound'                => __( 'No items found.' ),
+		'insertIntoPost'              => $post_type_object->labels->insert_into_item,
+		'unattached'                  => __( 'Unattached' ),
+		'trash'                       => _x( 'Trash', 'noun' ),
+		'uploadedToThisPost'          => $post_type_object->labels->uploaded_to_this_item,
+		'warnDelete'                  => __( "You are about to permanently delete this item from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
+		'warnBulkDelete'              => __( "You are about to permanently delete these items from your site.\nThis action cannot be undone.\n 'Cancel' to stop, 'OK' to delete." ),
+		'warnBulkTrash'               => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
+		'bulkSelect'                  => __( 'Bulk Select' ),
+		'cancelSelection'             => __( 'Cancel Selection' ),
+		'trashSelected'               => __( 'Trash Selected' ),
+		'untrashSelected'             => __( 'Untrash Selected' ),
+		'deleteSelected'              => __( 'Delete Selected' ),
+		'deletePermanently'           => __( 'Delete Permanently' ),
+		'apply'                       => __( 'Apply' ),
+		'filterByDate'                => __( 'Filter by date' ),
+		'filterByType'                => __( 'Filter by type' ),
+		'searchMediaLabel'            => __( 'Search Media' ),
+		'searchMediaPlaceholder'      => __( 'Search media items...' ), // placeholder (no ellipsis)
+		'noMedia'                     => __( 'No media files found.' ),
 
 		// Library Details
-		'attachmentDetails'  => __( 'Attachment Details' ),
+		'attachmentDetails'           => __( 'Attachment Details' ),
 
 		// From URL
-		'insertFromUrlTitle' => __( 'Insert from URL' ),
+		'insertFromUrlTitle'          => __( 'Insert from URL' ),
 
 		// Featured Images
-		'setFeaturedImageTitle' => $post_type_object->labels->featured_image,
-		'setFeaturedImage'      => $post_type_object->labels->set_featured_image,
+		'setFeaturedImageTitle'       => $post_type_object->labels->featured_image,
+		'setFeaturedImage'            => $post_type_object->labels->set_featured_image,
 
 		// Gallery
-		'createGalleryTitle' => __( 'Create Gallery' ),
-		'editGalleryTitle'   => __( 'Edit Gallery' ),
-		'cancelGalleryTitle' => __( '&#8592; Cancel Gallery' ),
-		'insertGallery'      => __( 'Insert gallery' ),
-		'updateGallery'      => __( 'Update gallery' ),
-		'addToGallery'       => __( 'Add to gallery' ),
-		'addToGalleryTitle'  => __( 'Add to Gallery' ),
-		'reverseOrder'       => __( 'Reverse order' ),
+		'createGalleryTitle'          => __( 'Create Gallery' ),
+		'editGalleryTitle'            => __( 'Edit Gallery' ),
+		'cancelGalleryTitle'          => __( '&#8592; Cancel Gallery' ),
+		'insertGallery'               => __( 'Insert gallery' ),
+		'updateGallery'               => __( 'Update gallery' ),
+		'addToGallery'                => __( 'Add to gallery' ),
+		'addToGalleryTitle'           => __( 'Add to Gallery' ),
+		'reverseOrder'                => __( 'Reverse order' ),
 
 		// Edit Image
-		'imageDetailsTitle'     => __( 'Image Details' ),
-		'imageReplaceTitle'     => __( 'Replace Image' ),
-		'imageDetailsCancel'    => __( 'Cancel Edit' ),
-		'editImage'             => __( 'Edit Image' ),
+		'imageDetailsTitle'           => __( 'Image Details' ),
+		'imageReplaceTitle'           => __( 'Replace Image' ),
+		'imageDetailsCancel'          => __( 'Cancel Edit' ),
+		'editImage'                   => __( 'Edit Image' ),
 
 		// Crop Image
-		'chooseImage' => __( 'Choose Image' ),
-		'selectAndCrop' => __( 'Select and Crop' ),
-		'skipCropping' => __( 'Skip Cropping' ),
-		'cropImage' => __( 'Crop Image' ),
-		'cropYourImage' => __( 'Crop your image' ),
-		'cropping' => __( 'Cropping&hellip;' ),
+		'chooseImage'                 => __( 'Choose Image' ),
+		'selectAndCrop'               => __( 'Select and Crop' ),
+		'skipCropping'                => __( 'Skip Cropping' ),
+		'cropImage'                   => __( 'Crop Image' ),
+		'cropYourImage'               => __( 'Crop your image' ),
+		'cropping'                    => __( 'Cropping&hellip;' ),
 		/* translators: 1: suggested width number, 2: suggested height number. */
-		'suggestedDimensions' => __( 'Suggested image dimensions: %1$s by %2$s pixels.' ),
-		'cropError' => __( 'There has been an error cropping your image.' ),
+		'suggestedDimensions'         => __( 'Suggested image dimensions: %1$s by %2$s pixels.' ),
+		'cropError'                   => __( 'There has been an error cropping your image.' ),
 
 		// Edit Audio
-		'audioDetailsTitle'     => __( 'Audio Details' ),
-		'audioReplaceTitle'     => __( 'Replace Audio' ),
-		'audioAddSourceTitle'   => __( 'Add Audio Source' ),
-		'audioDetailsCancel'    => __( 'Cancel Edit' ),
+		'audioDetailsTitle'           => __( 'Audio Details' ),
+		'audioReplaceTitle'           => __( 'Replace Audio' ),
+		'audioAddSourceTitle'         => __( 'Add Audio Source' ),
+		'audioDetailsCancel'          => __( 'Cancel Edit' ),
 
 		// Edit Video
-		'videoDetailsTitle'     => __( 'Video Details' ),
-		'videoReplaceTitle'     => __( 'Replace Video' ),
-		'videoAddSourceTitle'   => __( 'Add Video Source' ),
-		'videoDetailsCancel'    => __( 'Cancel Edit' ),
+		'videoDetailsTitle'           => __( 'Video Details' ),
+		'videoReplaceTitle'           => __( 'Replace Video' ),
+		'videoAddSourceTitle'         => __( 'Add Video Source' ),
+		'videoDetailsCancel'          => __( 'Cancel Edit' ),
 		'videoSelectPosterImageTitle' => __( 'Select Poster Image' ),
-		'videoAddTrackTitle'	=> __( 'Add Subtitles' ),
+		'videoAddTrackTitle'          => __( 'Add Subtitles' ),
 
- 		// Playlist
- 		'playlistDragInfo'    => __( 'Drag and drop to reorder tracks.' ),
- 		'createPlaylistTitle' => __( 'Create Audio Playlist' ),
- 		'editPlaylistTitle'   => __( 'Edit Audio Playlist' ),
- 		'cancelPlaylistTitle' => __( '&#8592; Cancel Audio Playlist' ),
- 		'insertPlaylist'      => __( 'Insert audio playlist' ),
- 		'updatePlaylist'      => __( 'Update audio playlist' ),
- 		'addToPlaylist'       => __( 'Add to audio playlist' ),
- 		'addToPlaylistTitle'  => __( 'Add to Audio Playlist' ),
+		// Playlist
+		'playlistDragInfo'            => __( 'Drag and drop to reorder tracks.' ),
+		'createPlaylistTitle'         => __( 'Create Audio Playlist' ),
+		'editPlaylistTitle'           => __( 'Edit Audio Playlist' ),
+		'cancelPlaylistTitle'         => __( '&#8592; Cancel Audio Playlist' ),
+		'insertPlaylist'              => __( 'Insert audio playlist' ),
+		'updatePlaylist'              => __( 'Update audio playlist' ),
+		'addToPlaylist'               => __( 'Add to audio playlist' ),
+		'addToPlaylistTitle'          => __( 'Add to Audio Playlist' ),
 
- 		// Video Playlist
- 		'videoPlaylistDragInfo'    => __( 'Drag and drop to reorder videos.' ),
- 		'createVideoPlaylistTitle' => __( 'Create Video Playlist' ),
- 		'editVideoPlaylistTitle'   => __( 'Edit Video Playlist' ),
- 		'cancelVideoPlaylistTitle' => __( '&#8592; Cancel Video Playlist' ),
- 		'insertVideoPlaylist'      => __( 'Insert video playlist' ),
- 		'updateVideoPlaylist'      => __( 'Update video playlist' ),
- 		'addToVideoPlaylist'       => __( 'Add to video playlist' ),
- 		'addToVideoPlaylistTitle'  => __( 'Add to Video Playlist' ),
+		// Video Playlist
+		'videoPlaylistDragInfo'       => __( 'Drag and drop to reorder videos.' ),
+		'createVideoPlaylistTitle'    => __( 'Create Video Playlist' ),
+		'editVideoPlaylistTitle'      => __( 'Edit Video Playlist' ),
+		'cancelVideoPlaylistTitle'    => __( '&#8592; Cancel Video Playlist' ),
+		'insertVideoPlaylist'         => __( 'Insert video playlist' ),
+		'updateVideoPlaylist'         => __( 'Update video playlist' ),
+		'addToVideoPlaylist'          => __( 'Add to video playlist' ),
+		'addToVideoPlaylistTitle'     => __( 'Add to Video Playlist' ),
 	);
 
 	/**
@@ -3633,7 +3727,7 @@ function wp_enqueue_media( $args = array() ) {
 	 * @param array   $strings List of media view strings.
 	 * @param WP_Post $post    Post object.
 	 */
-	$strings = apply_filters( 'media_view_strings', $strings,  $post );
+	$strings = apply_filters( 'media_view_strings', $strings, $post );
 
 	$strings['settings'] = $settings;
 
@@ -3674,16 +3768,17 @@ function wp_enqueue_media( $args = array() ) {
  * @return array Found attachments.
  */
 function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post( $post ) ) {
 		return array();
+	}
 
 	$args = array(
-		'post_parent' => $post->ID,
-		'post_type' => 'attachment',
+		'post_parent'    => $post->ID,
+		'post_type'      => 'attachment',
 		'post_mime_type' => $type,
 		'posts_per_page' => -1,
-		'orderby' => 'menu_order',
-		'order' => 'ASC',
+		'orderby'        => 'menu_order',
+		'order'          => 'ASC',
 	);
 
 	/**
@@ -3763,11 +3858,13 @@ function get_media_embedded_in_content( $content, $types = null ) {
  *               from the expanded shortcode.
  */
 function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post( $post ) ) {
 		return array();
+	}
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
+	if ( ! has_shortcode( $post->post_content, 'gallery' ) ) {
 		return array();
+	}
 
 	$galleries = array();
 	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
@@ -3799,7 +3896,7 @@ function get_post_galleries( $post, $html = true ) {
 					$galleries[] = array_merge(
 						$shortcode_attrs,
 						array(
-							'src' => array_values( array_unique( $srcs ) )
+							'src' => array_values( array_unique( $srcs ) ),
 						)
 					);
 				}
@@ -3829,7 +3926,7 @@ function get_post_galleries( $post, $html = true ) {
  */
 function get_post_gallery( $post = 0, $html = true ) {
 	$galleries = get_post_galleries( $post, $html );
-	$gallery = reset( $galleries );
+	$gallery   = reset( $galleries );
 
 	/**
 	 * Filters the first-found post gallery.
@@ -3889,7 +3986,7 @@ function wp_maybe_generate_attachment_metadata( $attachment ) {
 	$file = get_attached_file( $attachment_id );
 	$meta = wp_get_attachment_metadata( $attachment_id );
 	if ( empty( $meta ) && file_exists( $file ) ) {
-		$_meta = get_post_meta( $attachment_id );
+		$_meta             = get_post_meta( $attachment_id );
 		$regeneration_lock = 'wp_generating_att_' . $attachment_id;
 		if ( ! array_key_exists( '_wp_attachment_metadata', $_meta ) && ! get_transient( $regeneration_lock ) ) {
 			set_transient( $regeneration_lock, $file );
@@ -3912,10 +4009,10 @@ function wp_maybe_generate_attachment_metadata( $attachment ) {
 function attachment_url_to_postid( $url ) {
 	global $wpdb;
 
-	$dir = wp_get_upload_dir();
+	$dir  = wp_get_upload_dir();
 	$path = $url;
 
-	$site_url = parse_url( $dir['url'] );
+	$site_url   = parse_url( $dir['url'] );
 	$image_path = parse_url( $path );
 
 	//force the protocols to match if needed
@@ -3927,7 +4024,7 @@ function attachment_url_to_postid( $url ) {
 		$path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
 	}
 
-	$sql = $wpdb->prepare(
+	$sql     = $wpdb->prepare(
 		"SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
 		$path
 	);
@@ -3952,9 +4049,9 @@ function attachment_url_to_postid( $url ) {
  * @return array The relevant CSS file URLs.
  */
 function wpview_media_sandbox_styles() {
- 	$version = 'ver=' . get_bloginfo( 'version' );
- 	$mediaelement = includes_url( "js/mediaelement/mediaelementplayer-legacy.min.css?$version" );
- 	$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
+	$version        = 'ver=' . get_bloginfo( 'version' );
+	$mediaelement   = includes_url( "js/mediaelement/mediaelementplayer-legacy.min.css?$version" );
+	$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
 
 	return array( $mediaelement, $wpmediaelement );
 }
diff --git a/wp-includes/meta.php b/wp-includes/meta.php
index 1aca31a62c..010822fdc8 100644
--- a/wp-includes/meta.php
+++ b/wp-includes/meta.php
@@ -27,7 +27,7 @@
  *                           no change will be made.
  * @return int|false The meta ID on success, false on failure.
  */
-function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique = false) {
+function add_metadata( $meta_type, $object_id, $meta_key, $meta_value, $unique = false ) {
 	global $wpdb;
 
 	if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) {
@@ -44,11 +44,11 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique =
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column = sanitize_key( $meta_type . '_id' );
 
 	// expected_slashed ($meta_key)
-	$meta_key = wp_unslash($meta_key);
-	$meta_value = wp_unslash($meta_value);
+	$meta_key   = wp_unslash( $meta_key );
+	$meta_value = wp_unslash( $meta_value );
 	$meta_value = sanitize_meta( $meta_key, $meta_value, $meta_type );
 
 	/**
@@ -68,16 +68,21 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique =
 	 *                              for the object. Optional. Default false.
 	 */
 	$check = apply_filters( "add_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $unique );
-	if ( null !== $check )
+	if ( null !== $check ) {
 		return $check;
+	}
 
-	if ( $unique && $wpdb->get_var( $wpdb->prepare(
-		"SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
-		$meta_key, $object_id ) ) )
+	if ( $unique && $wpdb->get_var(
+		$wpdb->prepare(
+			"SELECT COUNT(*) FROM $table WHERE meta_key = %s AND $column = %d",
+			$meta_key, $object_id
+		)
+	) ) {
 		return false;
+	}
 
 	$_meta_value = $meta_value;
-	$meta_value = maybe_serialize( $meta_value );
+	$meta_value  = maybe_serialize( $meta_value );
 
 	/**
 	 * Fires immediately before meta of a specific type is added.
@@ -93,18 +98,21 @@ 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(
-		$column => $object_id,
-		'meta_key' => $meta_key,
-		'meta_value' => $meta_value
-	) );
+	$result = $wpdb->insert(
+		$table, array(
+			$column      => $object_id,
+			'meta_key'   => $meta_key,
+			'meta_value' => $meta_value,
+		)
+	);
 
-	if ( ! $result )
+	if ( ! $result ) {
 		return false;
+	}
 
 	$mid = (int) $wpdb->insert_id;
 
-	wp_cache_delete($object_id, $meta_type . '_meta');
+	wp_cache_delete( $object_id, $meta_type . '_meta' );
 
 	/**
 	 * Fires immediately after meta of a specific type is added.
@@ -137,10 +145,10 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique =
  * @param string $meta_key   Metadata key
  * @param mixed  $meta_value Metadata value. Must be serializable if non-scalar.
  * @param mixed  $prev_value Optional. If specified, only update existing metadata entries with
- * 		                     the specified value. Otherwise, update all entries.
+ *                           the specified value. Otherwise, update all entries.
  * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
  */
-function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') {
+function update_metadata( $meta_type, $object_id, $meta_key, $meta_value, $prev_value = '' ) {
 	global $wpdb;
 
 	if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) ) {
@@ -157,15 +165,15 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column    = sanitize_key( $meta_type . '_id' );
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
 	// expected_slashed ($meta_key)
 	$raw_meta_key = $meta_key;
-	$meta_key = wp_unslash($meta_key);
+	$meta_key     = wp_unslash( $meta_key );
 	$passed_value = $meta_value;
-	$meta_value = wp_unslash($meta_value);
-	$meta_value = sanitize_meta( $meta_key, $meta_value, $meta_type );
+	$meta_value   = wp_unslash( $meta_value );
+	$meta_value   = sanitize_meta( $meta_key, $meta_value, $meta_type );
 
 	/**
 	 * Filters whether to update metadata of a specific type.
@@ -185,15 +193,17 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v
 	 *                              Otherwise, update all entries.
 	 */
 	$check = apply_filters( "update_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $prev_value );
-	if ( null !== $check )
+	if ( null !== $check ) {
 		return (bool) $check;
+	}
 
 	// Compare existing value to new value if no prev value given and the key exists only once.
-	if ( empty($prev_value) ) {
-		$old_value = get_metadata($meta_type, $object_id, $meta_key);
-		if ( count($old_value) == 1 ) {
-			if ( $old_value[0] === $meta_value )
+	if ( empty( $prev_value ) ) {
+		$old_value = get_metadata( $meta_type, $object_id, $meta_key );
+		if ( count( $old_value ) == 1 ) {
+			if ( $old_value[0] === $meta_value ) {
 				return false;
+			}
 		}
 	}
 
@@ -203,13 +213,16 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v
 	}
 
 	$_meta_value = $meta_value;
-	$meta_value = maybe_serialize( $meta_value );
+	$meta_value  = maybe_serialize( $meta_value );
 
 	$data  = compact( 'meta_value' );
-	$where = array( $column => $object_id, 'meta_key' => $meta_key );
+	$where = array(
+		$column    => $object_id,
+		'meta_key' => $meta_key,
+	);
 
-	if ( !empty( $prev_value ) ) {
-		$prev_value = maybe_serialize($prev_value);
+	if ( ! empty( $prev_value ) ) {
+		$prev_value          = maybe_serialize( $prev_value );
 		$where['meta_value'] = $prev_value;
 	}
 
@@ -245,10 +258,11 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v
 	}
 
 	$result = $wpdb->update( $table, $data, $where );
-	if ( ! $result )
+	if ( ! $result ) {
 		return false;
+	}
 
-	wp_cache_delete($object_id, $meta_type . '_meta');
+	wp_cache_delete( $object_id, $meta_type . '_meta' );
 
 	foreach ( $meta_ids as $meta_id ) {
 		/**
@@ -304,7 +318,7 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v
  *                           the specified object_id.
  * @return bool True on successful delete, false on failure.
  */
-function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false) {
+function delete_metadata( $meta_type, $object_id, $meta_key, $meta_value = '', $delete_all = false ) {
 	global $wpdb;
 
 	if ( ! $meta_type || ! $meta_key || ! is_numeric( $object_id ) && ! $delete_all ) {
@@ -321,11 +335,11 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d
 		return false;
 	}
 
-	$type_column = sanitize_key($meta_type . '_id');
-	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
+	$type_column = sanitize_key( $meta_type . '_id' );
+	$id_column   = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 	// expected_slashed ($meta_key)
-	$meta_key = wp_unslash($meta_key);
-	$meta_value = wp_unslash($meta_value);
+	$meta_key   = wp_unslash( $meta_key );
+	$meta_value = wp_unslash( $meta_value );
 
 	/**
 	 * Filters whether to delete metadata of a specific type.
@@ -345,23 +359,27 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d
 	 *                              Default false.
 	 */
 	$check = apply_filters( "delete_{$meta_type}_metadata", null, $object_id, $meta_key, $meta_value, $delete_all );
-	if ( null !== $check )
+	if ( null !== $check ) {
 		return (bool) $check;
+	}
 
 	$_meta_value = $meta_value;
-	$meta_value = maybe_serialize( $meta_value );
+	$meta_value  = maybe_serialize( $meta_value );
 
 	$query = $wpdb->prepare( "SELECT $id_column FROM $table WHERE meta_key = %s", $meta_key );
 
-	if ( !$delete_all )
-		$query .= $wpdb->prepare(" AND $type_column = %d", $object_id );
+	if ( ! $delete_all ) {
+		$query .= $wpdb->prepare( " AND $type_column = %d", $object_id );
+	}
 
-	if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value )
-		$query .= $wpdb->prepare(" AND meta_value = %s", $meta_value );
+	if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value ) {
+		$query .= $wpdb->prepare( ' AND meta_value = %s', $meta_value );
+	}
 
 	$meta_ids = $wpdb->get_col( $query );
-	if ( !count( $meta_ids ) )
+	if ( ! count( $meta_ids ) ) {
 		return false;
+	}
 
 	if ( $delete_all ) {
 		if ( '' !== $meta_value && null !== $meta_value && false !== $meta_value ) {
@@ -398,19 +416,20 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d
 		do_action( 'delete_postmeta', $meta_ids );
 	}
 
-	$query = "DELETE FROM $table WHERE $id_column IN( " . implode( ',', $meta_ids ) . " )";
+	$query = "DELETE FROM $table WHERE $id_column IN( " . implode( ',', $meta_ids ) . ' )';
 
-	$count = $wpdb->query($query);
+	$count = $wpdb->query( $query );
 
-	if ( !$count )
+	if ( ! $count ) {
 		return false;
+	}
 
 	if ( $delete_all ) {
 		foreach ( (array) $object_ids as $o_id ) {
-			wp_cache_delete($o_id, $meta_type . '_meta');
+			wp_cache_delete( $o_id, $meta_type . '_meta' );
 		}
 	} else {
-		wp_cache_delete($object_id, $meta_type . '_meta');
+		wp_cache_delete( $object_id, $meta_type . '_meta' );
 	}
 
 	/**
@@ -451,13 +470,13 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int    $object_id ID of the object metadata is for
  * @param string $meta_key  Optional. Metadata key. If not specified, retrieve all metadata for
- * 		                    the specified object.
+ *                          the specified object.
  * @param bool   $single    Optional, default is false.
  *                          If true, return only the first value of the specified meta_key.
  *                          This parameter has no effect if meta_key is not specified.
  * @return mixed Single metadata value, or array of values
  */
-function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
+function get_metadata( $meta_type, $object_id, $meta_key = '', $single = false ) {
 	if ( ! $meta_type || ! is_numeric( $object_id ) ) {
 		return false;
 	}
@@ -484,34 +503,37 @@ function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
 	 */
 	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, $single );
 	if ( null !== $check ) {
-		if ( $single && is_array( $check ) )
+		if ( $single && is_array( $check ) ) {
 			return $check[0];
-		else
+		} else {
 			return $check;
+		}
 	}
 
-	$meta_cache = wp_cache_get($object_id, $meta_type . '_meta');
+	$meta_cache = wp_cache_get( $object_id, $meta_type . '_meta' );
 
-	if ( !$meta_cache ) {
+	if ( ! $meta_cache ) {
 		$meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
-		$meta_cache = $meta_cache[$object_id];
+		$meta_cache = $meta_cache[ $object_id ];
 	}
 
 	if ( ! $meta_key ) {
 		return $meta_cache;
 	}
 
-	if ( isset($meta_cache[$meta_key]) ) {
-		if ( $single )
-			return maybe_unserialize( $meta_cache[$meta_key][0] );
-		else
-			return array_map('maybe_unserialize', $meta_cache[$meta_key]);
+	if ( isset( $meta_cache[ $meta_key ] ) ) {
+		if ( $single ) {
+			return maybe_unserialize( $meta_cache[ $meta_key ][0] );
+		} else {
+			return array_map( 'maybe_unserialize', $meta_cache[ $meta_key ] );
+		}
 	}
 
-	if ($single)
+	if ( $single ) {
 		return '';
-	else
+	} else {
 		return array();
+	}
 }
 
 /**
@@ -536,18 +558,20 @@ function metadata_exists( $meta_type, $object_id, $meta_key ) {
 
 	/** This filter is documented in wp-includes/meta.php */
 	$check = apply_filters( "get_{$meta_type}_metadata", null, $object_id, $meta_key, true );
-	if ( null !== $check )
+	if ( null !== $check ) {
 		return (bool) $check;
+	}
 
 	$meta_cache = wp_cache_get( $object_id, $meta_type . '_meta' );
 
-	if ( !$meta_cache ) {
+	if ( ! $meta_cache ) {
 		$meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
-		$meta_cache = $meta_cache[$object_id];
+		$meta_cache = $meta_cache[ $object_id ];
 	}
 
-	if ( isset( $meta_cache[ $meta_key ] ) )
+	if ( isset( $meta_cache[ $meta_key ] ) ) {
 		return true;
+	}
 
 	return false;
 }
@@ -584,11 +608,13 @@ function get_metadata_by_mid( $meta_type, $meta_id ) {
 
 	$meta = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $table WHERE $id_column = %d", $meta_id ) );
 
-	if ( empty( $meta ) )
+	if ( empty( $meta ) ) {
 		return false;
+	}
 
-	if ( isset( $meta->meta_value ) )
+	if ( isset( $meta->meta_value ) ) {
 		$meta->meta_value = maybe_unserialize( $meta->meta_value );
+	}
 
 	return $meta;
 }
@@ -624,13 +650,13 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key =
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column    = sanitize_key( $meta_type . '_id' );
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
 	// Fetch the meta and go on if it's found.
 	if ( $meta = get_metadata_by_mid( $meta_type, $meta_id ) ) {
 		$original_key = $meta->meta_key;
-		$object_id = $meta->{$column};
+		$object_id    = $meta->{$column};
 
 		// If a new meta_key (last parameter) was specified, change the meta key,
 		// otherwise use the original key in the update statement.
@@ -642,18 +668,18 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key =
 
 		// Sanitize the meta
 		$_meta_value = $meta_value;
-		$meta_value = sanitize_meta( $meta_key, $meta_value, $meta_type );
-		$meta_value = maybe_serialize( $meta_value );
+		$meta_value  = sanitize_meta( $meta_key, $meta_value, $meta_type );
+		$meta_value  = maybe_serialize( $meta_value );
 
 		// Format the data query arguments.
 		$data = array(
-			'meta_key' => $meta_key,
-			'meta_value' => $meta_value
+			'meta_key'   => $meta_key,
+			'meta_value' => $meta_value,
 		);
 
 		// Format the where query arguments.
-		$where = array();
-		$where[$id_column] = $meta_id;
+		$where               = array();
+		$where[ $id_column ] = $meta_id;
 
 		/** This action is documented in wp-includes/meta.php */
 		do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
@@ -665,11 +691,12 @@ function update_metadata_by_mid( $meta_type, $meta_id, $meta_value, $meta_key =
 
 		// Run the update query, all fields in $data are %s, $where is a %d.
 		$result = $wpdb->update( $table, $data, $where, '%s', '%d' );
-		if ( ! $result )
+		if ( ! $result ) {
 			return false;
+		}
 
 		// Clear the caches.
-		wp_cache_delete($object_id, $meta_type . '_meta');
+		wp_cache_delete( $object_id, $meta_type . '_meta' );
 
 		/** This action is documented in wp-includes/meta.php */
 		do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
@@ -716,7 +743,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
 	}
 
 	// object and id columns
-	$column = sanitize_key($meta_type . '_id');
+	$column    = sanitize_key( $meta_type . '_id' );
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 
 	// Fetch the meta and go on if it's found.
@@ -745,7 +772,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
 		$result = (bool) $wpdb->delete( $table, array( $id_column => $meta_id ) );
 
 		// Clear the caches.
-		wp_cache_delete($object_id, $meta_type . '_meta');
+		wp_cache_delete( $object_id, $meta_type . '_meta' );
 
 		/** This action is documented in wp-includes/meta.php */
 		do_action( "deleted_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
@@ -784,7 +811,7 @@ function delete_metadata_by_mid( $meta_type, $meta_id ) {
  * @param int|array $object_ids Array or comma delimited list of object IDs to update cache for
  * @return array|false Metadata cache for the specified objects, or false on failure.
  */
-function update_meta_cache($meta_type, $object_ids) {
+function update_meta_cache( $meta_type, $object_ids ) {
 	global $wpdb;
 
 	if ( ! $meta_type || ! $object_ids ) {
@@ -796,55 +823,60 @@ function update_meta_cache($meta_type, $object_ids) {
 		return false;
 	}
 
-	$column = sanitize_key($meta_type . '_id');
+	$column = sanitize_key( $meta_type . '_id' );
 
-	if ( !is_array($object_ids) ) {
-		$object_ids = preg_replace('|[^0-9,]|', '', $object_ids);
-		$object_ids = explode(',', $object_ids);
+	if ( ! is_array( $object_ids ) ) {
+		$object_ids = preg_replace( '|[^0-9,]|', '', $object_ids );
+		$object_ids = explode( ',', $object_ids );
 	}
 
-	$object_ids = array_map('intval', $object_ids);
+	$object_ids = array_map( 'intval', $object_ids );
 
 	$cache_key = $meta_type . '_meta';
-	$ids = array();
-	$cache = array();
+	$ids       = array();
+	$cache     = array();
 	foreach ( $object_ids as $id ) {
 		$cached_object = wp_cache_get( $id, $cache_key );
-		if ( false === $cached_object )
+		if ( false === $cached_object ) {
 			$ids[] = $id;
-		else
-			$cache[$id] = $cached_object;
+		} else {
+			$cache[ $id ] = $cached_object;
+		}
 	}
 
-	if ( empty( $ids ) )
+	if ( empty( $ids ) ) {
 		return $cache;
+	}
 
 	// Get meta info
-	$id_list = join( ',', $ids );
+	$id_list   = join( ',', $ids );
 	$id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
 	$meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
 
-	if ( !empty($meta_list) ) {
-		foreach ( $meta_list as $metarow) {
-			$mpid = intval($metarow[$column]);
+	if ( ! empty( $meta_list ) ) {
+		foreach ( $meta_list as $metarow ) {
+			$mpid = intval( $metarow[ $column ] );
 			$mkey = $metarow['meta_key'];
 			$mval = $metarow['meta_value'];
 
 			// Force subkeys to be array type:
-			if ( !isset($cache[$mpid]) || !is_array($cache[$mpid]) )
-				$cache[$mpid] = array();
-			if ( !isset($cache[$mpid][$mkey]) || !is_array($cache[$mpid][$mkey]) )
-				$cache[$mpid][$mkey] = array();
+			if ( ! isset( $cache[ $mpid ] ) || ! is_array( $cache[ $mpid ] ) ) {
+				$cache[ $mpid ] = array();
+			}
+			if ( ! isset( $cache[ $mpid ][ $mkey ] ) || ! is_array( $cache[ $mpid ][ $mkey ] ) ) {
+				$cache[ $mpid ][ $mkey ] = array();
+			}
 
 			// Add a value to the current pid/key:
-			$cache[$mpid][$mkey][] = $mval;
+			$cache[ $mpid ][ $mkey ][] = $mval;
 		}
 	}
 
 	foreach ( $ids as $id ) {
-		if ( ! isset($cache[$id]) )
-			$cache[$id] = array();
-		wp_cache_add( $id, $cache[$id], $cache_key );
+		if ( ! isset( $cache[ $id ] ) ) {
+			$cache[ $id ] = array();
+		}
+		wp_cache_add( $id, $cache[ $id ], $cache_key );
 	}
 
 	return $cache;
@@ -896,13 +928,14 @@ function get_meta_sql( $meta_query, $type, $primary_table, $primary_id_column, $
  * @param string $type Type of object to get metadata table for (e.g., comment, post, or user)
  * @return string|false Metadata table name, or false if no metadata table exists
  */
-function _get_meta_table($type) {
+function _get_meta_table( $type ) {
 	global $wpdb;
 
 	$table_name = $type . 'meta';
 
-	if ( empty($wpdb->$table_name) )
+	if ( empty( $wpdb->$table_name ) ) {
 		return false;
+	}
 
 	return $wpdb->$table_name;
 }
@@ -1004,7 +1037,7 @@ function register_meta( $object_type, $meta_key, $args, $deprecated = null ) {
 
 	// There used to be individual args for sanitize and auth callbacks
 	$has_old_sanitize_cb = false;
-	$has_old_auth_cb = false;
+	$has_old_auth_cb     = false;
 
 	if ( is_callable( $args ) ) {
 		$args = array(
@@ -1018,7 +1051,7 @@ function register_meta( $object_type, $meta_key, $args, $deprecated = null ) {
 
 	if ( is_callable( $deprecated ) ) {
 		$args['auth_callback'] = $deprecated;
-		$has_old_auth_cb = true;
+		$has_old_auth_cb       = true;
 	}
 
 	/**
@@ -1161,7 +1194,7 @@ function get_registered_metadata( $object_type, $object_id, $meta_key = '' ) {
 		if ( ! registered_meta_key_exists( $object_type, $meta_key ) ) {
 			return false;
 		}
-		$meta_keys = get_registered_meta_keys( $object_type );
+		$meta_keys     = get_registered_meta_keys( $object_type );
 		$meta_key_data = $meta_keys[ $meta_key ];
 
 		$data = get_metadata( $object_type, $object_id, $meta_key, $meta_key_data['single'] );
@@ -1171,7 +1204,7 @@ function get_registered_metadata( $object_type, $object_id, $meta_key = '' ) {
 
 	$data = get_metadata( $object_type, $object_id );
 
-	$meta_keys = get_registered_meta_keys( $object_type );
+	$meta_keys       = get_registered_meta_keys( $object_type );
 	$registered_data = array();
 
 	// Someday, array_filter()
diff --git a/wp-includes/ms-blogs.php b/wp-includes/ms-blogs.php
index 3d63bc5743..b862037a0a 100644
--- a/wp-includes/ms-blogs.php
+++ b/wp-includes/ms-blogs.php
@@ -58,11 +58,13 @@ function get_blogaddress_by_id( $blog_id ) {
  */
 function get_blogaddress_by_name( $blogname ) {
 	if ( is_subdomain_install() ) {
-		if ( $blogname == 'main' )
+		if ( $blogname == 'main' ) {
 			$blogname = 'www';
+		}
 		$url = rtrim( network_home_url(), '/' );
-		if ( !empty( $blogname ) )
-			$url = preg_replace( '|^([^\.]+://)|', "\${1}" . $blogname . '.', $url );
+		if ( ! empty( $blogname ) ) {
+			$url = preg_replace( '|^([^\.]+://)|', '${1}' . $blogname . '.', $url );
+		}
 	} else {
 		$url = network_home_url( $blogname );
 	}
@@ -80,22 +82,24 @@ function get_blogaddress_by_name( $blogname ) {
  */
 function get_id_from_blogname( $slug ) {
 	$current_network = get_network();
-	$slug = trim( $slug, '/' );
+	$slug            = trim( $slug, '/' );
 
 	if ( is_subdomain_install() ) {
 		$domain = $slug . '.' . preg_replace( '|^www\.|', '', $current_network->domain );
-		$path = $current_network->path;
+		$path   = $current_network->path;
 	} else {
 		$domain = $current_network->domain;
-		$path = $current_network->path . $slug . '/';
+		$path   = $current_network->path . $slug . '/';
 	}
 
-	$site_ids = get_sites( array(
-		'number' => 1,
-		'fields' => 'ids',
-		'domain' => $domain,
-		'path' => $path,
-	) );
+	$site_ids = get_sites(
+		array(
+			'number' => 1,
+			'fields' => 'ids',
+			'domain' => $domain,
+			'path'   => $path,
+		)
+	);
 
 	if ( empty( $site_ids ) ) {
 		return null;
@@ -120,39 +124,41 @@ function get_id_from_blogname( $slug ) {
 function get_blog_details( $fields = null, $get_all = true ) {
 	global $wpdb;
 
-	if ( is_array($fields ) ) {
-		if ( isset($fields['blog_id']) ) {
+	if ( is_array( $fields ) ) {
+		if ( isset( $fields['blog_id'] ) ) {
 			$blog_id = $fields['blog_id'];
-		} elseif ( isset($fields['domain']) && isset($fields['path']) ) {
-			$key = md5( $fields['domain'] . $fields['path'] );
-			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+		} elseif ( isset( $fields['domain'] ) && isset( $fields['path'] ) ) {
+			$key  = md5( $fields['domain'] . $fields['path'] );
+			$blog = wp_cache_get( $key, 'blog-lookup' );
+			if ( false !== $blog ) {
 				return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
+				$blog  = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
 			} else {
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $fields['domain'], $fields['path'] ) );
 			}
 			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+				wp_cache_set( $blog->blog_id . 'short', $blog, 'blog-details' );
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
 			}
-		} elseif ( isset($fields['domain']) && is_subdomain_install() ) {
-			$key = md5( $fields['domain'] );
-			$blog = wp_cache_get($key, 'blog-lookup');
-			if ( false !== $blog )
+		} elseif ( isset( $fields['domain'] ) && is_subdomain_install() ) {
+			$key  = md5( $fields['domain'] );
+			$blog = wp_cache_get( $key, 'blog-lookup' );
+			if ( false !== $blog ) {
 				return $blog;
+			}
 			if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
 				$nowww = substr( $fields['domain'], 4 );
-				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
+				$blog  = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
 			} else {
 				$blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain = %s", $fields['domain'] ) );
 			}
 			if ( $blog ) {
-				wp_cache_set($blog->blog_id . 'short', $blog, 'blog-details');
+				wp_cache_set( $blog->blog_id . 'short', $blog, 'blog-details' );
 				$blog_id = $blog->blog_id;
 			} else {
 				return false;
@@ -161,17 +167,18 @@ function get_blog_details( $fields = null, $get_all = true ) {
 			return false;
 		}
 	} else {
-		if ( ! $fields )
+		if ( ! $fields ) {
 			$blog_id = get_current_blog_id();
-		elseif ( ! is_numeric( $fields ) )
+		} elseif ( ! is_numeric( $fields ) ) {
 			$blog_id = get_id_from_blogname( $fields );
-		else
+		} else {
 			$blog_id = $fields;
+		}
 	}
 
 	$blog_id = (int) $blog_id;
 
-	$all = $get_all == true ? '' : 'short';
+	$all     = $get_all == true ? '' : 'short';
 	$details = wp_cache_get( $blog_id . $all, 'blog-details' );
 
 	if ( $details ) {
@@ -181,7 +188,7 @@ function get_blog_details( $fields = null, $get_all = true ) {
 			} else {
 				// Clear old pre-serialized objects. Cache clients do better with that.
 				wp_cache_delete( $blog_id . $all, 'blog-details' );
-				unset($details);
+				unset( $details );
 			}
 		} else {
 			return $details;
@@ -201,7 +208,7 @@ function get_blog_details( $fields = null, $get_all = true ) {
 				} else {
 					// Clear old pre-serialized objects. Cache clients do better with that.
 					wp_cache_delete( $blog_id, 'blog-details' );
-					unset($details);
+					unset( $details );
 				}
 			} else {
 				return $details;
@@ -209,7 +216,7 @@ function get_blog_details( $fields = null, $get_all = true ) {
 		}
 	}
 
-	if ( empty($details) ) {
+	if ( empty( $details ) ) {
 		$details = WP_Site::get_instance( $blog_id );
 		if ( ! $details ) {
 			// Set the full cache.
@@ -282,23 +289,26 @@ function refresh_blog_details( $blog_id = 0 ) {
 function update_blog_details( $blog_id, $details = array() ) {
 	global $wpdb;
 
-	if ( empty($details) )
+	if ( empty( $details ) ) {
 		return false;
+	}
 
-	if ( is_object($details) )
-		$details = get_object_vars($details);
+	if ( is_object( $details ) ) {
+		$details = get_object_vars( $details );
+	}
 
 	$current_details = get_site( $blog_id );
-	if ( empty($current_details) )
+	if ( empty( $current_details ) ) {
 		return false;
+	}
 
-	$current_details = get_object_vars($current_details);
+	$current_details = get_object_vars( $current_details );
 
-	$details = array_merge($current_details, $details);
-	$details['last_updated'] = current_time('mysql', true);
+	$details                 = array_merge( $current_details, $details );
+	$details['last_updated'] = current_time( 'mysql', true );
 
 	$update_details = array();
-	$fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
+	$fields         = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
 	foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
 		if ( 'path' === $field ) {
 			$details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) );
@@ -307,10 +317,11 @@ function update_blog_details( $blog_id, $details = array() ) {
 		$update_details[ $field ] = $details[ $field ];
 	}
 
-	$result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );
+	$result = $wpdb->update( $wpdb->blogs, $update_details, array( 'blog_id' => $blog_id ) );
 
-	if ( false === $result )
+	if ( false === $result ) {
 		return false;
+	}
 
 	// If spam status changed, issue actions.
 	if ( $details['spam'] != $current_details['spam'] ) {
@@ -436,27 +447,29 @@ function clean_blog_cache( $blog ) {
 	}
 
 	$blog_id = $blog;
-	$blog = get_site( $blog_id );
+	$blog    = get_site( $blog_id );
 	if ( ! $blog ) {
 		if ( ! is_numeric( $blog_id ) ) {
 			return;
 		}
 
 		// Make sure a WP_Site object exists even when the site has been deleted.
-		$blog = new WP_Site( (object) array(
-			'blog_id' => $blog_id,
-			'domain'  => null,
-			'path'    => null,
-		) );
+		$blog = new WP_Site(
+			(object) array(
+				'blog_id' => $blog_id,
+				'domain'  => null,
+				'path'    => null,
+			)
+		);
 	}
 
-	$blog_id = $blog->blog_id;
+	$blog_id         = $blog->blog_id;
 	$domain_path_key = md5( $blog->domain . $blog->path );
 
 	wp_cache_delete( $blog_id, 'sites' );
 	wp_cache_delete( $blog_id, 'site-details' );
 	wp_cache_delete( $blog_id, 'blog-details' );
-	wp_cache_delete( $blog_id . 'short' , 'blog-details' );
+	wp_cache_delete( $blog_id . 'short', 'blog-details' );
 	wp_cache_delete( $domain_path_key, 'blog-lookup' );
 	wp_cache_delete( $domain_path_key, 'blog-id-cache' );
 	wp_cache_delete( 'current_blog_' . $blog->domain, 'site-options' );
@@ -559,7 +572,7 @@ function _prime_site_caches( $ids ) {
 
 	$non_cached_ids = _get_non_cached_ids( $ids, 'sites' );
 	if ( ! empty( $non_cached_ids ) ) {
-		$fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+		$fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) );
 
 		update_site_cache( $fresh_sites );
 	}
@@ -665,11 +678,13 @@ function get_sites( $args = array() ) {
 function get_blog_option( $id, $option, $default = false ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if ( empty( $id ) ) {
 		$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
+	if ( get_current_blog_id() == $id ) {
 		return get_option( $option, $default );
+	}
 
 	switch_to_blog( $id );
 	$value = get_option( $option, $default );
@@ -710,11 +725,13 @@ function get_blog_option( $id, $option, $default = false ) {
 function add_blog_option( $id, $option, $value ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if ( empty( $id ) ) {
 		$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
+	if ( get_current_blog_id() == $id ) {
 		return add_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = add_option( $option, $value );
@@ -735,11 +752,13 @@ function add_blog_option( $id, $option, $value ) {
 function delete_blog_option( $id, $option ) {
 	$id = (int) $id;
 
-	if ( empty( $id ) )
+	if ( empty( $id ) ) {
 		$id = get_current_blog_id();
+	}
 
-	if ( get_current_blog_id() == $id )
+	if ( get_current_blog_id() == $id ) {
 		return delete_option( $option );
+	}
 
 	switch_to_blog( $id );
 	$return = delete_option( $option );
@@ -762,11 +781,13 @@ function delete_blog_option( $id, $option ) {
 function update_blog_option( $id, $option, $value, $deprecated = null ) {
 	$id = (int) $id;
 
-	if ( null !== $deprecated  )
+	if ( null !== $deprecated ) {
 		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	}
 
-	if ( get_current_blog_id() == $id )
+	if ( get_current_blog_id() == $id ) {
 		return update_option( $option, $value );
+	}
 
 	switch_to_blog( $id );
 	$return = update_option( $option, $value );
@@ -829,8 +850,8 @@ function switch_to_blog( $new_blog, $deprecated = null ) {
 
 	$wpdb->set_blog_id( $new_blog );
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
-	$prev_blog_id = $blog_id;
-	$GLOBALS['blog_id'] = $new_blog;
+	$prev_blog_id            = $blog_id;
+	$GLOBALS['blog_id']      = $new_blog;
 
 	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
 		wp_cache_switch_to_blog( $new_blog );
@@ -883,7 +904,7 @@ function restore_current_blog() {
 		return false;
 	}
 
-	$blog = array_pop( $GLOBALS['_wp_switched_stack'] );
+	$blog    = array_pop( $GLOBALS['_wp_switched_stack'] );
 	$blog_id = get_current_blog_id();
 
 	if ( $blog_id == $blog ) {
@@ -895,8 +916,8 @@ function restore_current_blog() {
 	}
 
 	$wpdb->set_blog_id( $blog );
-	$prev_blog_id = $blog_id;
-	$GLOBALS['blog_id'] = $blog;
+	$prev_blog_id            = $blog_id;
+	$GLOBALS['blog_id']      = $blog;
 	$GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
 
 	if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
@@ -974,7 +995,7 @@ function ms_is_switched() {
  * @return string Whether the blog is archived or not
  */
 function is_archived( $id ) {
-	return get_blog_status($id, 'archived');
+	return get_blog_status( $id, 'archived' );
 }
 
 /**
@@ -987,7 +1008,7 @@ function is_archived( $id ) {
  * @return string $archived
  */
 function update_archived( $id, $archived ) {
-	update_blog_status($id, 'archived', $archived);
+	update_blog_status( $id, 'archived', $archived );
 	return $archived;
 }
 
@@ -1007,16 +1028,24 @@ function update_archived( $id, $archived ) {
 function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 	global $wpdb;
 
-	if ( null !== $deprecated  )
+	if ( null !== $deprecated ) {
 		_deprecated_argument( __FUNCTION__, '3.1.0' );
+	}
 
-	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id') ) )
+	if ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
 		return $value;
+	}
 
-	$result = $wpdb->update( $wpdb->blogs, array($pref => $value, 'last_updated' => current_time('mysql', true)), array('blog_id' => $blog_id) );
+	$result = $wpdb->update(
+		$wpdb->blogs, array(
+			$pref          => $value,
+			'last_updated' => current_time( 'mysql', true ),
+		), array( 'blog_id' => $blog_id )
+	);
 
-	if ( false === $result )
+	if ( false === $result ) {
 		return false;
+	}
 
 	clean_blog_cache( $blog_id );
 
@@ -1060,7 +1089,7 @@ function update_blog_status( $blog_id, $pref, $value, $deprecated = null ) {
 		 *
 		 * @param int    $blog_id Blog ID.
 		 * @param string $value   The value of blog status.
- 		 */
+		 */
 		do_action( 'update_blog_public', $blog_id, $value ); // Moved here from update_blog_public().
 	}
 
@@ -1082,10 +1111,11 @@ function get_blog_status( $id, $pref ) {
 	global $wpdb;
 
 	$details = get_site( $id );
-	if ( $details )
+	if ( $details ) {
 		return $details->$pref;
+	}
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id) );
+	return $wpdb->get_var( $wpdb->prepare( "SELECT %s FROM {$wpdb->blogs} WHERE blog_id = %d", $pref, $id ) );
 }
 
 /**
@@ -1103,8 +1133,9 @@ function get_blog_status( $id, $pref ) {
 function get_last_updated( $deprecated = '', $start = 0, $quantity = 40 ) {
 	global $wpdb;
 
-	if ( ! empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, 'MU' ); // never used
+	}
 
 	return $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' AND last_updated != '0000-00-00 00:00:00' ORDER BY last_updated DESC limit %d, %d", get_current_network_id(), $start, $quantity ), ARRAY_A );
 }
@@ -1232,8 +1263,8 @@ function _prime_network_caches( $network_ids ) {
 	global $wpdb;
 
 	$non_cached_ids = _get_non_cached_ids( $network_ids, 'networks' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	if ( ! empty( $non_cached_ids ) ) {
+		$fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) );
 
 		update_network_cache( $fresh_networks );
 	}
diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index f126d8eedf..5caa0479bf 100644
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -19,12 +19,14 @@ function ms_upload_constants() {
 	// This filter is attached in ms-default-filters.php but that file is not included during SHORTINIT.
 	add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
 
-	if ( ! get_site_option( 'ms_files_rewriting' ) )
+	if ( ! get_site_option( 'ms_files_rewriting' ) ) {
 		return;
+	}
 
 	// Base uploads dir relative to ABSPATH
-	if ( !defined( 'UPLOADBLOGSDIR' ) )
+	if ( ! defined( 'UPLOADBLOGSDIR' ) ) {
 		define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+	}
 
 	// Note, the main site in a post-MU network uses wp-content/uploads.
 	// This is handled in wp_upload_dir() by ignoring UPLOADS for this case.
@@ -34,8 +36,9 @@ function ms_upload_constants() {
 		define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' );
 
 		// Uploads dir relative to ABSPATH
-		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
+		if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) {
 			define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . '/blogs.dir/' . $site_id . '/files/' );
+		}
 	}
 }
 
@@ -44,25 +47,27 @@ function ms_upload_constants() {
  *
  * @since 3.0.0
  */
-function ms_cookie_constants(  ) {
+function ms_cookie_constants() {
 	$current_network = get_network();
 
 	/**
 	 * @since 1.2.0
 	 */
-	if ( !defined( 'COOKIEPATH' ) )
+	if ( ! defined( 'COOKIEPATH' ) ) {
 		define( 'COOKIEPATH', $current_network->path );
+	}
 
 	/**
 	 * @since 1.5.0
 	 */
-	if ( !defined( 'SITECOOKIEPATH' ) )
+	if ( ! defined( 'SITECOOKIEPATH' ) ) {
 		define( 'SITECOOKIEPATH', $current_network->path );
+	}
 
 	/**
 	 * @since 2.6.0
 	 */
-	if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
+	if ( ! defined( 'ADMIN_COOKIE_PATH' ) ) {
 		if ( ! is_subdomain_install() || trim( parse_url( get_option( 'siteurl' ), PHP_URL_PATH ), '/' ) ) {
 			define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
 		} else {
@@ -73,11 +78,12 @@ function ms_cookie_constants(  ) {
 	/**
 	 * @since 2.0.0
 	 */
-	if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-		if ( !empty( $current_network->cookie_domain ) )
-			define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
-		else
-			define('COOKIE_DOMAIN', '.' . $current_network->domain);
+	if ( ! defined( 'COOKIE_DOMAIN' ) && is_subdomain_install() ) {
+		if ( ! empty( $current_network->cookie_domain ) ) {
+			define( 'COOKIE_DOMAIN', '.' . $current_network->cookie_domain );
+		} else {
+			define( 'COOKIE_DOMAIN', '.' . $current_network->domain );
+		}
 	}
 }
 
@@ -92,17 +98,21 @@ function ms_cookie_constants(  ) {
 function ms_file_constants() {
 	/**
 	 * Optional support for X-Sendfile header
+	 *
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_SENDFILE' ) )
+	if ( ! defined( 'WPMU_SENDFILE' ) ) {
 		define( 'WPMU_SENDFILE', false );
+	}
 
 	/**
 	 * Optional support for X-Accel-Redirect header
+	 *
 	 * @since 3.0.0
 	 */
-	if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
+	if ( ! defined( 'WPMU_ACCEL_REDIRECT' ) ) {
 		define( 'WPMU_ACCEL_REDIRECT', false );
+	}
 }
 
 /**
@@ -119,7 +129,7 @@ function ms_file_constants() {
  * @staticvar bool $subdomain_error_warn
  */
 function ms_subdomain_constants() {
-	static $subdomain_error = null;
+	static $subdomain_error      = null;
 	static $subdomain_error_warn = null;
 
 	if ( false === $subdomain_error ) {
@@ -138,7 +148,7 @@ function ms_subdomain_constants() {
 		if ( $subdomain_error_warn ) {
 			trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
 		} else {
-	 		_deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
+			_deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
 		}
 		return;
 	}
diff --git a/wp-includes/ms-default-filters.php b/wp-includes/ms-default-filters.php
index fe66f0aa77..d0e2866252 100644
--- a/wp-includes/ms-default-filters.php
+++ b/wp-includes/ms-default-filters.php
@@ -27,9 +27,9 @@ add_action( 'wpmu_new_user', 'newuser_notify_siteadmin' );
 add_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
 add_action( 'wpmu_activate_user', 'wpmu_welcome_user_notification', 10, 3 );
 add_action( 'after_signup_user', 'wpmu_signup_user_notification', 10, 4 );
-add_action( 'network_site_new_created_user',   'wp_send_new_user_notifications' );
+add_action( 'network_site_new_created_user', 'wp_send_new_user_notifications' );
 add_action( 'network_site_users_created_user', 'wp_send_new_user_notifications' );
-add_action( 'network_user_new_created_user',   'wp_send_new_user_notifications' );
+add_action( 'network_user_new_created_user', 'wp_send_new_user_notifications' );
 add_filter( 'sanitize_user', 'strtolower' );
 
 // Roles
@@ -57,12 +57,14 @@ add_action( 'transition_post_status', '_update_blog_date_on_post_publish', 10, 3
 add_action( 'transition_post_status', '_update_posts_count_on_transition_post_status', 10, 3 );
 
 // Counts
-add_action( 'admin_init', 'wp_schedule_update_network_counts');
+add_action( 'admin_init', 'wp_schedule_update_network_counts' );
 add_action( 'update_network_counts', 'wp_update_network_counts', 10, 0 );
-foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action )
+foreach ( array( 'user_register', 'deleted_user', 'wpmu_new_user', 'make_spam_user', 'make_ham_user' ) as $action ) {
 	add_action( $action, 'wp_maybe_update_network_user_counts', 10, 0 );
-foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action )
+}
+foreach ( array( 'make_spam_blog', 'make_ham_blog', 'archive_blog', 'unarchive_blog', 'make_delete_blog', 'make_undelete_blog' ) as $action ) {
 	add_action( $action, 'wp_maybe_update_network_site_counts', 10, 0 );
+}
 unset( $action );
 
 // Files
@@ -77,21 +79,23 @@ add_action( 'phpmailer_init', 'fix_phpmailer_messageid' );
 
 // Disable somethings by default for multisite
 add_filter( 'enable_update_services_configuration', '__return_false' );
-if ( ! defined('POST_BY_EMAIL') || ! POST_BY_EMAIL ) // back compat constant.
+if ( ! defined( 'POST_BY_EMAIL' ) || ! POST_BY_EMAIL ) { // back compat constant.
 	add_filter( 'enable_post_by_email_configuration', '__return_false' );
-if ( ! defined('EDIT_ANY_USER') || ! EDIT_ANY_USER ) // back compat constant.
+}
+if ( ! defined( 'EDIT_ANY_USER' ) || ! EDIT_ANY_USER ) { // back compat constant.
 	add_filter( 'enable_edit_any_user_configuration', '__return_false' );
+}
 add_filter( 'force_filtered_html_on_import', '__return_true' );
 
 // WP_HOME and WP_SITEURL should not have any effect in MS
 remove_filter( 'option_siteurl', '_config_wp_siteurl' );
-remove_filter( 'option_home',    '_config_wp_home'    );
+remove_filter( 'option_home', '_config_wp_home' );
 
 // Some options changes should trigger site details refresh.
-add_action( 'update_option_blogname',   'clean_site_details_cache', 10, 0 );
-add_action( 'update_option_siteurl',    'clean_site_details_cache', 10, 0 );
+add_action( 'update_option_blogname', 'clean_site_details_cache', 10, 0 );
+add_action( 'update_option_siteurl', 'clean_site_details_cache', 10, 0 );
 add_action( 'update_option_post_count', 'clean_site_details_cache', 10, 0 );
-add_action( 'update_option_home',       'clean_site_details_cache', 10, 0 );
+add_action( 'update_option_home', 'clean_site_details_cache', 10, 0 );
 
 // If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.
 add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );
diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php
index e5c1db3f89..0f2c0798c8 100644
--- a/wp-includes/ms-files.php
+++ b/wp-includes/ms-files.php
@@ -11,8 +11,9 @@
 define( 'SHORTINIT', true );
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-if ( !is_multisite() )
+if ( ! is_multisite() ) {
 	die( 'Multisite support not enabled' );
+}
 
 ms_file_constants();
 
@@ -23,24 +24,27 @@ if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_bl
 	die( '404 &#8212; File not found.' );
 }
 
-$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );
-if ( !is_file( $file ) ) {
+$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET['file'] );
+if ( ! is_file( $file ) ) {
 	status_header( 404 );
 	die( '404 &#8212; File not found.' );
 }
 
 $mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
-	$mime[ 'type' ] = mime_content_type( $file );
+if ( false === $mime['type'] && function_exists( 'mime_content_type' ) ) {
+	$mime['type'] = mime_content_type( $file );
+}
 
-if ( $mime[ 'type' ] )
-	$mimetype = $mime[ 'type' ];
-else
+if ( $mime['type'] ) {
+	$mimetype = $mime['type'];
+} else {
 	$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+}
 
 header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
+if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
 	header( 'Content-Length: ' . filesize( $file ) );
+}
 
 // Optional support for X-Sendfile and X-Accel-Redirect
 if ( WPMU_ACCEL_REDIRECT ) {
@@ -52,7 +56,7 @@ if ( WPMU_ACCEL_REDIRECT ) {
 }
 
 $last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-$etag = '"' . md5( $last_modified ) . '"';
+$etag          = '"' . md5( $last_modified ) . '"';
 header( "Last-Modified: $last_modified GMT" );
 header( 'ETag: ' . $etag );
 header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
@@ -60,19 +64,20 @@ header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
 // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
 	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+}
 
 $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 // If string is empty, return 0. If not, attempt to parse into a timestamp
 $client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
 
 // Make a timestamp for our most recent modification...
-$modified_timestamp = strtotime($last_modified);
+$modified_timestamp = strtotime( $last_modified );
 
 if ( ( $client_last_modified && $client_etag )
-	? ( ( $client_modified_timestamp >= $modified_timestamp) && ( $client_etag == $etag ) )
-	: ( ( $client_modified_timestamp >= $modified_timestamp) || ( $client_etag == $etag ) )
+	? ( ( $client_modified_timestamp >= $modified_timestamp ) && ( $client_etag == $etag ) )
+	: ( ( $client_modified_timestamp >= $modified_timestamp ) || ( $client_etag == $etag ) )
 	) {
 	status_header( 304 );
 	exit;
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 4a6f0ed0ae..984a69ce6f 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -39,15 +39,16 @@ function get_sitestats() {
  */
 function get_active_blog_for_user( $user_id ) {
 	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
+	if ( empty( $blogs ) ) {
 		return;
+	}
 
 	if ( ! is_multisite() ) {
 		return $blogs[ get_current_blog_id() ];
 	}
 
 	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
-	$first_blog = current($blogs);
+	$first_blog   = current( $blogs );
 	if ( false !== $primary_blog ) {
 		if ( ! isset( $blogs[ $primary_blog ] ) ) {
 			update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
@@ -67,18 +68,21 @@ function get_active_blog_for_user( $user_id ) {
 
 	if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
 		$blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.
-		$ret = false;
+		$ret   = false;
 		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
 			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != get_current_network_id() )
+				if ( $blog->site_id != get_current_network_id() ) {
 					continue;
+				}
 				$details = get_site( $blog_id );
 				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
+					if ( get_user_meta( $user_id, 'primary_blog', true ) != $blog_id ) {
 						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
+					}
+					if ( ! get_user_meta( $user_id, 'source_domain', true ) ) {
 						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					}
 					break;
 				}
 			}
@@ -152,7 +156,7 @@ function get_blog_post( $blog_id, $post_id ) {
  * @return true|WP_Error
  */
 function add_user_to_blog( $blog_id, $user_id, $role ) {
-	switch_to_blog($blog_id);
+	switch_to_blog( $blog_id );
 
 	$user = get_userdata( $user_id );
 
@@ -184,13 +188,13 @@ function add_user_to_blog( $blog_id, $user_id, $role ) {
 		return new WP_Error( 'user_cannot_be_added', __( 'User cannot be added to this site.' ) );
 	}
 
-	if ( !get_user_meta($user_id, 'primary_blog', true) ) {
-		update_user_meta($user_id, 'primary_blog', $blog_id);
+	if ( ! get_user_meta( $user_id, 'primary_blog', true ) ) {
+		update_user_meta( $user_id, 'primary_blog', $blog_id );
 		$site = get_site( $blog_id );
 		update_user_meta( $user_id, 'source_domain', $site->domain );
 	}
 
-	$user->set_role($role);
+	$user->set_role( $role );
 
 	/**
 	 * Fires immediately after a user is added to a site.
@@ -226,9 +230,9 @@ function add_user_to_blog( $blog_id, $user_id, $role ) {
  * @param string $reassign Optional. A user to whom to reassign posts.
  * @return true|WP_Error
  */
-function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
+function remove_user_from_blog( $user_id, $blog_id = '', $reassign = '' ) {
 	global $wpdb;
-	switch_to_blog($blog_id);
+	switch_to_blog( $blog_id );
 	$user_id = (int) $user_id;
 	/**
 	 * Fires before a user is removed from a site.
@@ -242,36 +246,37 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
 
 	// If being removed from the primary blog, set a new primary if the user is assigned
 	// to multiple blogs.
-	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
+	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
 	if ( $primary_blog == $blog_id ) {
-		$new_id = '';
+		$new_id     = '';
 		$new_domain = '';
-		$blogs = get_blogs_of_user($user_id);
+		$blogs      = get_blogs_of_user( $user_id );
 		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
+			if ( $blog->userblog_id == $blog_id ) {
 				continue;
-			$new_id = $blog->userblog_id;
+			}
+			$new_id     = $blog->userblog_id;
 			$new_domain = $blog->domain;
 			break;
 		}
 
-		update_user_meta($user_id, 'primary_blog', $new_id);
-		update_user_meta($user_id, 'source_domain', $new_domain);
+		update_user_meta( $user_id, 'primary_blog', $new_id );
+		update_user_meta( $user_id, 'source_domain', $new_domain );
 	}
 
 	// wp_revoke_user($user_id);
 	$user = get_userdata( $user_id );
 	if ( ! $user ) {
 		restore_current_blog();
-		return new WP_Error('user_does_not_exist', __('That user does not exist.'));
+		return new WP_Error( 'user_does_not_exist', __( 'That user does not exist.' ) );
 	}
 
 	$user->remove_all_caps();
 
-	$blogs = get_blogs_of_user($user_id);
-	if ( count($blogs) == 0 ) {
-		update_user_meta($user_id, 'primary_blog', '');
-		update_user_meta($user_id, 'source_domain', '');
+	$blogs = get_blogs_of_user( $user_id );
+	if ( count( $blogs ) == 0 ) {
+		update_user_meta( $user_id, 'primary_blog', '' );
+		update_user_meta( $user_id, 'source_domain', '' );
 	}
 
 	if ( $reassign != '' ) {
@@ -330,22 +335,23 @@ function get_blog_permalink( $blog_id, $post_id ) {
  */
 function get_blog_id_from_url( $domain, $path = '/' ) {
 	$domain = strtolower( $domain );
-	$path = strtolower( $path );
-	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
+	$path   = strtolower( $path );
+	$id     = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-	if ( $id == -1 ) // blog does not exist
+	if ( $id == -1 ) { // blog does not exist
 		return 0;
-	elseif ( $id )
+	} elseif ( $id ) {
 		return (int) $id;
+	}
 
-	$args = array(
+	$args   = array(
 		'domain' => $domain,
-		'path' => $path,
+		'path'   => $path,
 		'fields' => 'ids',
 		'number' => 1,
 	);
 	$result = get_sites( $args );
-	$id = array_shift( $result );
+	$id     = array_shift( $result );
 
 	if ( ! $id ) {
 		wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
@@ -374,20 +380,22 @@ function get_blog_id_from_url( $domain, $path = '/' ) {
  */
 function is_email_address_unsafe( $user_email ) {
 	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
+	if ( $banned_names && ! is_array( $banned_names ) ) {
 		$banned_names = explode( "\n", $banned_names );
+	}
 
 	$is_email_address_unsafe = false;
 
 	if ( $banned_names && is_array( $banned_names ) && false !== strpos( $user_email, '@', 1 ) ) {
-		$banned_names = array_map( 'strtolower', $banned_names );
+		$banned_names     = array_map( 'strtolower', $banned_names );
 		$normalized_email = strtolower( $user_email );
 
 		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
 
 		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
+			if ( ! $banned_domain ) {
 				continue;
+			}
 
 			if ( $email_domain == $banned_domain ) {
 				$is_email_address_unsafe = true;
@@ -433,13 +441,13 @@ function is_email_address_unsafe( $user_email ) {
  * @param string $user_email The email provided by the user.
  * @return array Contains username, email, and error messages.
  */
-function wpmu_validate_user_signup($user_name, $user_email) {
+function wpmu_validate_user_signup( $user_name, $user_email ) {
 	global $wpdb;
 
 	$errors = new WP_Error();
 
 	$orig_username = $user_name;
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+	$user_name     = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
 	if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) {
 		$errors->add( 'user_name', __( 'Usernames can only contain lowercase letters (a-z) and numbers.' ) );
@@ -448,23 +456,24 @@ function wpmu_validate_user_signup($user_name, $user_email) {
 
 	$user_email = sanitize_email( $user_email );
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if ( empty( $user_name ) ) {
+		$errors->add( 'user_name', __( 'Please enter a username.' ) );
+	}
 
 	$illegal_names = get_site_option( 'illegal_names' );
 	if ( ! is_array( $illegal_names ) ) {
-		$illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
+		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
 		add_site_option( 'illegal_names', $illegal_names );
 	}
 	if ( in_array( $user_name, $illegal_names ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+		$errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
 	}
 
 	/** This filter is documented in wp-includes/user.php */
 	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
 
 	if ( in_array( strtolower( $user_name ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+		$errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
 	}
 
 	if ( ! is_email( $user_email ) ) {
@@ -473,57 +482,68 @@ function wpmu_validate_user_signup($user_name, $user_email) {
 		$errors->add( 'user_email', __( 'You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.' ) );
 	}
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if ( strlen( $user_name ) < 4 ) {
+		$errors->add( 'user_name', __( 'Username must be at least 4 characters.' ) );
+	}
 
 	if ( strlen( $user_name ) > 60 ) {
 		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
-		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $user_name ) ) {
+		$errors->add( 'user_name', __( 'Sorry, usernames must have letters too!' ) );
+	}
 
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
 		$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
 		if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
-			$errors->add('user_email', __('Sorry, that email address is not allowed!'));
+			$errors->add( 'user_email', __( 'Sorry, that email address is not allowed!' ) );
 		}
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
+	if ( username_exists( $user_name ) ) {
 		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	}
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
+	if ( email_exists( $user_email ) ) {
 		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	}
 
 	// Has someone already signed up for this username?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
+	$signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name ) );
 	if ( $signup != null ) {
-		$registered_at =  mysql2date('U', $signup->registered);
-		$now = current_time( 'timestamp', true );
-		$diff = $now - $registered_at;
+		$registered_at = mysql2date( 'U', $signup->registered );
+		$now           = current_time( 'timestamp', true );
+		$diff          = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
 			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
-		else
-			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		} else {
+			$errors->add( 'user_name', __( 'That username is currently reserved but may be available in a couple of days.' ) );
+		}
 	}
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
+	$signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email ) );
 	if ( $signup != null ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+		$diff = current_time( 'timestamp', true ) - mysql2date( 'U', $signup->registered );
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
 			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
-		else
-			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		} else {
+			$errors->add( 'user_email', __( 'That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.' ) );
+		}
 	}
 
-	$result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
+	$result = array(
+		'user_name'     => $user_name,
+		'orig_username' => $orig_username,
+		'user_email'    => $user_email,
+		'errors'        => $errors,
+	);
 
 	/**
 	 * Filters the validated user registration details.
@@ -573,11 +593,11 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 	global $wpdb, $domain;
 
 	$current_network = get_network();
-	$base = $current_network->path;
+	$base            = $current_network->path;
 
 	$blog_title = strip_tags( $blog_title );
 
-	$errors = new WP_Error();
+	$errors        = new WP_Error();
 	$illegal_names = get_site_option( 'illegal_names' );
 	if ( $illegal_names == false ) {
 		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
@@ -592,15 +612,17 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if ( empty( $blogname ) ) {
+		$errors->add( 'blogname', __( 'Please enter a site name.' ) );
+	}
 
 	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
 		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if ( in_array( $blogname, $illegal_names ) ) {
+		$errors->add( 'blogname', __( 'That name is not allowed.' ) );
+	}
 
 	/**
 	 * Filters the minimum site name length required when validating a site signup.
@@ -617,12 +639,14 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 	}
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
+	if ( ! is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( 'SELECT post_name FROM ' . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
 		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
-		$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $blogname ) ) {
+		$errors->add( 'blogname', __( 'Sorry, site names must have letters too!' ) );
+	}
 
 	/**
 	 * Filters the new site name during registration.
@@ -636,39 +660,55 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
 	 */
 	$blogname = apply_filters( 'newblogname', $blogname );
 
-	$blog_title = wp_unslash(  $blog_title );
+	$blog_title = wp_unslash( $blog_title );
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if ( empty( $blog_title ) ) {
+		$errors->add( 'blog_title', __( 'Please enter a site title.' ) );
+	}
 
 	// Check if the domain/path has been used already.
 	if ( is_subdomain_install() ) {
 		$mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
-		$path = $base;
+		$path     = $base;
 	} else {
 		$mydomain = "$domain";
-		$path = $base.$blogname.'/';
+		$path     = $base . $blogname . '/';
 	}
-	if ( domain_exists($mydomain, $path, $current_network->id) )
+	if ( domain_exists( $mydomain, $path, $current_network->id ) ) {
 		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
+		if ( ! is_object( $user ) || ( is_object( $user ) && ( $user->user_login != $blogname ) ) ) {
 			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		}
 	}
 
 	// Has someone already signed up for this domain?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check email too?
-	if ( ! empty($signup) ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path ) ); // TODO: Check email too?
+	if ( ! empty( $signup ) ) {
+		$diff = current_time( 'timestamp', true ) - mysql2date( 'U', $signup->registered );
 		// 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( 'domain' => $mydomain , 'path' => $path ) );
-		else
-			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+			$wpdb->delete(
+				$wpdb->signups, array(
+					'domain' => $mydomain,
+					'path'   => $path,
+				)
+			);
+		} else {
+			$errors->add( 'blogname', __( 'That site is currently reserved but may be available in a couple days.' ) );
+		}
 	}
 
-	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
+	$result = array(
+		'domain'     => $mydomain,
+		'path'       => $path,
+		'blogname'   => $blogname,
+		'blog_title' => $blog_title,
+		'user'       => $user,
+		'errors'     => $errors,
+	);
 
 	/**
 	 * Filters site details and error messages following registration.
@@ -703,7 +743,7 @@ function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
  * @param string $user_email The user's email address.
  * @param array  $meta       Optional. Signup meta data. By default, contains the requested privacy setting and lang_id.
  */
-function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
+function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() ) {
 	global $wpdb;
 
 	$key = substr( md5( time() . wp_rand() . $domain ), 0, 16 );
@@ -725,16 +765,18 @@ 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(
-		'domain' => $domain,
-		'path' => $path,
-		'title' => $title,
-		'user_login' => $user,
-		'user_email' => $user_email,
-		'registered' => current_time('mysql', true),
-		'activation_key' => $key,
-		'meta' => serialize( $meta )
-	) );
+	$wpdb->insert(
+		$wpdb->signups, array(
+			'domain'         => $domain,
+			'path'           => $path,
+			'title'          => $title,
+			'user_login'     => $user,
+			'user_email'     => $user_email,
+			'registered'     => current_time( 'mysql', true ),
+			'activation_key' => $key,
+			'meta'           => serialize( $meta ),
+		)
+	);
 
 	/**
 	 * Fires after site signup information has been written to the database.
@@ -770,9 +812,9 @@ function wpmu_signup_user( $user, $user_email, $meta = array() ) {
 	global $wpdb;
 
 	// Format data
-	$user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
+	$user       = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
 	$user_email = sanitize_email( $user_email );
-	$key = substr( md5( time() . wp_rand() . $user_email ), 0, 16 );
+	$key        = substr( md5( time() . wp_rand() . $user_email ), 0, 16 );
 
 	/**
 	 * Filters the metadata for a user signup.
@@ -788,16 +830,18 @@ 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(
-		'domain' => '',
-		'path' => '',
-		'title' => '',
-		'user_login' => $user,
-		'user_email' => $user_email,
-		'registered' => current_time('mysql', true),
-		'activation_key' => $key,
-		'meta' => serialize( $meta )
-	) );
+	$wpdb->insert(
+		$wpdb->signups, array(
+			'domain'         => '',
+			'path'           => '',
+			'title'          => '',
+			'user_login'     => $user,
+			'user_email'     => $user_email,
+			'registered'     => current_time( 'mysql', true ),
+			'activation_key' => $key,
+			'meta'           => serialize( $meta ),
+		)
+	);
 
 	/**
 	 * Fires after a user's signup information has been written to the database.
@@ -856,19 +900,21 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $us
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_network_id() != 1 )
-		$activate_url = network_site_url("wp-activate.php?key=$key");
-	else
+	if ( ! is_subdomain_install() || get_current_network_id() != 1 ) {
+		$activate_url = network_site_url( "wp-activate.php?key=$key" );
+	} else {
 		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
+	}
 
-	$activate_url = esc_url($activate_url);
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
+	$activate_url = esc_url( $activate_url );
+	$admin_email  = get_site_option( 'admin_email' );
+	if ( $admin_email == '' ) {
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	}
+	$from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
 
-	$user = get_user_by( 'login', $user_login );
+	$user            = get_user_by( 'login', $user_login );
 	$switched_locale = switch_to_locale( get_user_locale( $user ) );
 
 	$message = sprintf(
@@ -888,8 +934,9 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $us
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       Signup meta data. By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_email',
-			__( "To activate your blog, please click the following link:\n\n%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%s" ),
+		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
 		),
 		$activate_url,
@@ -912,7 +959,8 @@ function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $us
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       Signup meta data. By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_subject',
+		apply_filters(
+			'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
@@ -962,19 +1010,21 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data. Default empty array.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) )
+	if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) ) {
 		return false;
+	}
 
-	$user = get_user_by( 'login', $user_login );
+	$user            = get_user_by( 'login', $user_login );
 	$switched_locale = switch_to_locale( get_user_locale( $user ) );
 
 	// Send email with activation link.
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
+	if ( $admin_email == '' ) {
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-	$message = sprintf(
+	}
+	$from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
+	$message         = sprintf(
 		/**
 		 * Filters the content of the notification email for new user sign-up.
 		 *
@@ -988,7 +1038,8 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data. Default empty array.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_email',
+		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
 		),
@@ -1007,7 +1058,8 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data. Default empty array.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_subject',
+		apply_filters(
+			'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
@@ -1039,41 +1091,51 @@ function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta =
  * @param string $key The activation key provided to the user.
  * @return array|WP_Error An array containing information about the activated user and/or blog
  */
-function wpmu_activate_signup($key) {
+function wpmu_activate_signup( $key ) {
 	global $wpdb;
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
+	$signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key ) );
 
-	if ( empty( $signup ) )
+	if ( empty( $signup ) ) {
 		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
-
-	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
-		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
 	}
 
-	$meta = maybe_unserialize($signup->meta);
+	if ( $signup->active ) {
+		if ( empty( $signup->domain ) ) {
+			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+		} else {
+			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		}
+	}
+
+	$meta     = maybe_unserialize( $signup->meta );
 	$password = wp_generate_password( 12, false );
 
-	$user_id = username_exists($signup->user_login);
+	$user_id = username_exists( $signup->user_login );
 
-	if ( ! $user_id )
-		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
-	else
+	if ( ! $user_id ) {
+		$user_id = wpmu_create_user( $signup->user_login, $password, $signup->user_email );
+	} else {
 		$user_already_exists = true;
+	}
 
-	if ( ! $user_id )
-		return new WP_Error('create_user', __('Could not create user'), $signup);
+	if ( ! $user_id ) {
+		return new WP_Error( 'create_user', __( 'Could not create user' ), $signup );
+	}
 
-	$now = current_time('mysql', true);
+	$now = current_time( 'mysql', true );
 
-	if ( empty($signup->domain) ) {
-		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	if ( empty( $signup->domain ) ) {
+		$wpdb->update(
+			$wpdb->signups, array(
+				'active'    => 1,
+				'activated' => $now,
+			), array( 'activation_key' => $key )
+		);
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if ( isset( $user_already_exists ) ) {
+			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup );
+		}
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -1085,23 +1147,37 @@ function wpmu_activate_signup($key) {
 		 * @param array $meta     Signup meta data.
 		 */
 		do_action( 'wpmu_activate_user', $user_id, $password, $meta );
-		return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta );
+		return array(
+			'user_id'  => $user_id,
+			'password' => $password,
+			'meta'     => $meta,
+		);
 	}
 
 	$blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, get_current_network_id() );
 
 	// TODO: What to do if we create a user but cannot create a blog?
-	if ( is_wp_error($blog_id) ) {
+	if ( is_wp_error( $blog_id ) ) {
 		// If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
 		// setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
 		if ( 'blog_taken' == $blog_id->get_error_code() ) {
 			$blog_id->add_data( $signup );
-			$wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );
+			$wpdb->update(
+				$wpdb->signups, array(
+					'active'    => 1,
+					'activated' => $now,
+				), array( 'activation_key' => $key )
+			);
 		}
 		return $blog_id;
 	}
 
-	$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	$wpdb->update(
+		$wpdb->signups, array(
+			'active'    => 1,
+			'activated' => $now,
+		), array( 'activation_key' => $key )
+	);
 	/**
 	 * Fires immediately after a site is activated.
 	 *
@@ -1115,7 +1191,13 @@ function wpmu_activate_signup($key) {
 	 */
 	do_action( 'wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta );
 
-	return array('blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta);
+	return array(
+		'blog_id'  => $blog_id,
+		'user_id'  => $user_id,
+		'password' => $password,
+		'title'    => $signup->title,
+		'meta'     => $meta,
+	);
 }
 
 /**
@@ -1137,8 +1219,9 @@ function wpmu_create_user( $user_name, $password, $email ) {
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
 	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
+	if ( is_wp_error( $user_id ) ) {
 		return false;
+	}
 
 	// Newly created users have no roles or caps until they are added to a blog.
 	delete_user_option( $user_id, 'capabilities' );
@@ -1187,47 +1270,53 @@ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $n
 		'public' => 0,
 		'WPLANG' => get_network_option( $network_id, 'WPLANG' ),
 	);
-	$meta = wp_parse_args( $meta, $defaults );
+	$meta     = wp_parse_args( $meta, $defaults );
 
 	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
 
-	if ( is_subdomain_install() )
+	if ( is_subdomain_install() ) {
 		$domain = str_replace( '@', '', $domain );
+	}
 
-	$title = strip_tags( $title );
+	$title   = strip_tags( $title );
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
+	if ( empty( $path ) ) {
 		$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $network_id) )
+	if ( domain_exists( $domain, $path, $network_id ) ) {
 		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( ! wp_installing() ) {
 		wp_installing( true );
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $network_id) )
-		return new WP_Error('insert_blog', __('Could not create site.'));
+	if ( ! $blog_id = insert_blog( $domain, $path, $network_id ) ) {
+		return new WP_Error( 'insert_blog', __( 'Could not create site.' ) );
+	}
 
-	switch_to_blog($blog_id);
-	install_blog($blog_id, $title);
-	wp_install_defaults($user_id);
+	switch_to_blog( $blog_id );
+	install_blog( $blog_id, $title );
+	wp_install_defaults( $user_id );
 
-	add_user_to_blog($blog_id, $user_id, 'administrator');
+	add_user_to_blog( $blog_id, $user_id, 'administrator' );
 
 	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
+		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
 			update_blog_status( $blog_id, $key, $value );
-		else
+		} else {
 			update_option( $key, $value );
+		}
 	}
 
 	update_option( 'blog_public', (int) $meta['public'] );
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
+	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) ) {
 		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	}
 
 	restore_current_blog();
 	/**
@@ -1262,26 +1351,32 @@ function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $n
  * @return bool
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
 		return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
+	if ( is_email( $email ) == false ) {
 		return false;
+	}
 
-	$options_site_url = esc_url(network_admin_url('settings.php'));
+	$options_site_url = esc_url( network_admin_url( 'settings.php' ) );
 
 	switch_to_blog( $blog_id );
 	$blogname = get_option( 'blogname' );
-	$siteurl = site_url();
+	$siteurl  = site_url();
 	restore_current_blog();
 
 	/* translators: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */
-	$msg = sprintf( __( 'New Site: %1$s
+	$msg = sprintf(
+		__(
+			'New Site: %1$s
 URL: %2$s
 Remote IP address: %3$s
 
-Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %4$s'
+		), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url
+	);
 	/**
 	 * Filters the message body of the new site activation email sent
 	 * to the network administrator.
@@ -1308,22 +1403,28 @@ Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER[
  * @return bool
  */
 function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
 		return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
 
-	if ( is_email($email) == false )
+	if ( is_email( $email ) == false ) {
 		return false;
+	}
 
 	$user = get_userdata( $user_id );
 
-	$options_site_url = esc_url(network_admin_url('settings.php'));
+	$options_site_url = esc_url( network_admin_url( 'settings.php' ) );
 	/* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
-	$msg = sprintf(__('New User: %1$s
+	$msg = sprintf(
+		__(
+			'New User: %1$s
 Remote IP address: %2$s
 
-Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %3$s'
+		), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url
+	);
 
 	/**
 	 * Filters the message body of the new user activation email sent
@@ -1335,7 +1436,7 @@ Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['RE
 	 * @param WP_User $user WP_User instance of the new user.
 	 */
 	$msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
-	wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg );
+	wp_mail( $email, sprintf( __( 'New User Registration: %s' ), $user->user_login ), $msg );
 	return true;
 }
 
@@ -1356,8 +1457,8 @@ Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['RE
  * @return int|null The site ID if the site name exists, null otherwise.
  */
 function domain_exists( $domain, $path, $network_id = 1 ) {
-	$path = trailingslashit( $path );
-	$args = array(
+	$path   = trailingslashit( $path );
+	$args   = array(
 		'network_id' => $network_id,
 		'domain'     => $domain,
 		'path'       => $path,
@@ -1398,15 +1499,23 @@ function domain_exists( $domain, $path, $network_id = 1 ) {
  * @param int    $network_id Unless you're running a multi-network installation, be sure to set this value to 1.
  * @return int|false The ID of the new row
  */
-function insert_blog($domain, $path, $network_id) {
+function insert_blog( $domain, $path, $network_id ) {
 	global $wpdb;
 
-	$path = trailingslashit($path);
+	$path       = trailingslashit( $path );
 	$network_id = (int) $network_id;
 
-	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $network_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
+	$result = $wpdb->insert(
+		$wpdb->blogs, array(
+			'site_id'    => $network_id,
+			'domain'     => $domain,
+			'path'       => $path,
+			'registered' => current_time( 'mysql' ),
+		)
+	);
+	if ( ! $result ) {
 		return false;
+	}
 
 	$blog_id = $wpdb->insert_id;
 	clean_blog_cache( $blog_id );
@@ -1440,8 +1549,9 @@ function install_blog( $blog_id, $blog_title = '' ) {
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
+	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) {
 		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$url = get_blogaddress_by_id( $blog_id );
@@ -1458,29 +1568,29 @@ function install_blog( $blog_id, $blog_title = '' ) {
 
 	if ( ! is_subdomain_install() ) {
 
- 		if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
- 			$siteurl = set_url_scheme( $siteurl, 'https' );
- 		}
- 		if ( 'https' === parse_url( get_home_url( get_network()->site_id ), PHP_URL_SCHEME ) ) {
- 			$home = set_url_scheme( $home, 'https' );
- 		}
-
+		if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
+			$siteurl = set_url_scheme( $siteurl, 'https' );
+		}
+		if ( 'https' === parse_url( get_home_url( get_network()->site_id ), PHP_URL_SCHEME ) ) {
+			$home = set_url_scheme( $home, 'https' );
+		}
 	}
 
 	update_option( 'siteurl', $siteurl );
 	update_option( 'home', $home );
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
+	if ( get_site_option( 'ms_files_rewriting' ) ) {
 		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
-	else
+	} else {
 		update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
+	}
 
 	update_option( 'blogname', wp_unslash( $blog_title ) );
 	update_option( 'admin_email', '' );
 
 	// remove all perms
 	$table_prefix = $wpdb->get_blog_prefix();
-	delete_metadata( 'user', 0, $table_prefix . 'user_level',   null, true ); // delete all
+	delete_metadata( 'user', 0, $table_prefix . 'user_level', null, true ); // delete all
 	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
 }
 
@@ -1498,14 +1608,14 @@ function install_blog( $blog_id, $blog_title = '' ) {
  * @param int $blog_id Ignored in this function.
  * @param int $user_id
  */
-function install_blog_defaults($blog_id, $user_id) {
+function install_blog_defaults( $blog_id, $user_id ) {
 	global $wpdb;
 
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 	$suppress = $wpdb->suppress_errors();
 
-	wp_install_defaults($user_id);
+	wp_install_defaults( $user_id );
 
 	$wpdb->suppress_errors( $suppress );
 }
@@ -1543,8 +1653,9 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
+	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) ) {
 		return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1553,7 +1664,8 @@ function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta
 	$welcome_email = get_site_option( 'welcome_email' );
 	if ( $welcome_email == false ) {
 		/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-		$welcome_email = __( 'Howdy USERNAME,
+		$welcome_email = __(
+			'Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -1566,10 +1678,11 @@ Log in here: BLOG_URLwp-login.php
 
 We hope you enjoy your new site. Thanks!
 
---The Team @ SITE_NAME' );
+--The Team @ SITE_NAME'
+		);
 	}
 
-	$url = get_blogaddress_by_id($blog_id);
+	$url = get_blogaddress_by_id( $blog_id );
 
 	$welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email );
 	$welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
@@ -1592,17 +1705,19 @@ We hope you enjoy your new site. Thanks!
 	 * @param array  $meta          Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
 	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-	$admin_email = get_site_option( 'admin_email' );
+	$admin_email   = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
+	if ( $admin_email == '' ) {
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-	$message = $welcome_email;
+	$from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
+	$message         = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
+	if ( empty( $current_network->site_name ) ) {
 		$current_network->site_name = 'WordPress';
+	}
 
 	/* translators: New site notification email subject. 1: Network name, 2: New site name */
 	$subject = __( 'New %1$s Site: %2$s' );
@@ -1643,7 +1758,7 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
 	$current_network = get_network();
 
 	/**
- 	 * Filters whether to bypass the welcome email after user activation.
+	 * Filters whether to bypass the welcome email after user activation.
 	 *
 	 * Returning false disables the welcome email.
 	 *
@@ -1653,8 +1768,9 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data. Default empty array.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
+	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) ) {
 		return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_user_email' );
 
@@ -1682,15 +1798,17 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
 
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
+	if ( $admin_email == '' ) {
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-	$message = $welcome_email;
+	$from_name       = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
+	$message         = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
+	if ( empty( $current_network->site_name ) ) {
 		$current_network->site_name = 'WordPress';
+	}
 
 	/* translators: New user notification email subject. 1: Network name, 2: New user login */
 	$subject = __( 'New %1$s User: %2$s' );
@@ -1702,7 +1820,7 @@ function wpmu_welcome_user_notification( $user_id, $password, $meta = array() )
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_user_subject', sprintf( $subject, $current_network->site_name, $user->user_login) );
+	$subject = apply_filters( 'update_welcome_user_subject', sprintf( $subject, $current_network->site_name, $user->user_login ) );
 	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
 
 	if ( $switched_locale ) {
@@ -1747,28 +1865,28 @@ function get_current_site() {
 function get_most_recent_post_of_user( $user_id ) {
 	global $wpdb;
 
-	$user_blogs = get_blogs_of_user( (int) $user_id );
+	$user_blogs       = get_blogs_of_user( (int) $user_id );
 	$most_recent_post = array();
 
 	// Walk through each blog and get the most recent post
 	// published by $user_id
 	foreach ( (array) $user_blogs as $blog ) {
-		$prefix = $wpdb->get_blog_prefix( $blog->userblog_id );
-		$recent_post = $wpdb->get_row( $wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A);
+		$prefix      = $wpdb->get_blog_prefix( $blog->userblog_id );
+		$recent_post = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A );
 
 		// Make sure we found a post
-		if ( isset($recent_post['ID']) ) {
-			$post_gmt_ts = strtotime($recent_post['post_date_gmt']);
+		if ( isset( $recent_post['ID'] ) ) {
+			$post_gmt_ts = strtotime( $recent_post['post_date_gmt'] );
 
 			// If this is the first post checked or if this post is
 			// newer than the current recent post, make it the new
 			// most recent post.
-			if ( !isset($most_recent_post['post_gmt_ts']) || ( $post_gmt_ts > $most_recent_post['post_gmt_ts'] ) ) {
+			if ( ! isset( $most_recent_post['post_gmt_ts'] ) || ( $post_gmt_ts > $most_recent_post['post_gmt_ts'] ) ) {
 				$most_recent_post = array(
-					'blog_id'		=> $blog->userblog_id,
-					'post_id'		=> $recent_post['ID'],
-					'post_date_gmt'	=> $recent_post['post_date_gmt'],
-					'post_gmt_ts'	=> $post_gmt_ts
+					'blog_id'       => $blog->userblog_id,
+					'post_id'       => $recent_post['ID'],
+					'post_date_gmt' => $recent_post['post_date_gmt'],
+					'post_gmt_ts'   => $post_gmt_ts,
 				);
 			}
 		}
@@ -1792,22 +1910,24 @@ function get_most_recent_post_of_user( $user_id ) {
  */
 function get_dirsize( $directory ) {
 	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ]['size'] ) ) {
+		return $dirsize[ $directory ]['size'];
+	}
 
-	if ( ! is_array( $dirsize ) )
+	if ( ! is_array( $dirsize ) ) {
 		$dirsize = array();
+	}
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
 	if ( is_main_site() ) {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' );
+		$dirsize[ $directory ]['size'] = recurse_dirsize( $directory, $directory . '/sites' );
 	} else {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+		$dirsize[ $directory ]['size'] = recurse_dirsize( $directory );
 	}
 
 	set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
-	return $dirsize[ $directory ][ 'size' ];
+	return $dirsize[ $directory ]['size'];
 }
 
 /**
@@ -1832,20 +1952,21 @@ function recurse_dirsize( $directory, $exclude = null ) {
 		return false;
 	}
 
-	if ($handle = opendir($directory)) {
-		while(($file = readdir($handle)) !== false) {
-			$path = $directory.'/'.$file;
-			if ($file != '.' && $file != '..') {
-				if (is_file($path)) {
-					$size += filesize($path);
-				} elseif (is_dir($path)) {
+	if ( $handle = opendir( $directory ) ) {
+		while ( ( $file = readdir( $handle ) ) !== false ) {
+			$path = $directory . '/' . $file;
+			if ( $file != '.' && $file != '..' ) {
+				if ( is_file( $path ) ) {
+					$size += filesize( $path );
+				} elseif ( is_dir( $path ) ) {
 					$handlesize = recurse_dirsize( $path, $exclude );
-					if ($handlesize > 0)
+					if ( $handlesize > 0 ) {
 						$size += $handlesize;
+					}
 				}
 			}
 		}
-		closedir($handle);
+		closedir( $handle );
 	}
 	return $size;
 }
@@ -1865,12 +1986,13 @@ function recurse_dirsize( $directory, $exclude = null ) {
  * @return array
  */
 function check_upload_mimes( $mimes ) {
-	$site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+	$site_exts  = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
 	$site_mimes = array();
 	foreach ( $site_exts as $ext ) {
 		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
-				$site_mimes[$ext_pattern] = $mime;
+			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
+				$site_mimes[ $ext_pattern ] = $mime;
+			}
 		}
 	}
 	return $site_mimes;
@@ -1908,8 +2030,16 @@ function update_posts_count( $deprecated = '' ) {
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	global $wpdb;
 	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	if ( $user ) {
+		$wpdb->insert(
+			$wpdb->registration_log, array(
+				'email'           => $user->user_email,
+				'IP'              => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ),
+				'blog_id'         => $blog_id,
+				'date_registered' => current_time( 'mysql' ),
+			)
+		);
+	}
 }
 
 /**
@@ -1930,34 +2060,48 @@ function global_terms( $term_id, $deprecated = '' ) {
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
+	if ( ! global_terms_enabled() ) {
 		return $term_id;
+	}
 
 	// prevent a race condition
 	$recurse_start = false;
 	if ( $global_terms_recurse === null ) {
-		$recurse_start = true;
+		$recurse_start        = true;
 		$global_terms_recurse = 1;
 	} elseif ( 10 < $global_terms_recurse++ ) {
 		return $term_id;
 	}
 
 	$term_id = intval( $term_id );
-	$c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
+	$c       = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
 
 	$global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
 	if ( $global_id == null ) {
 		$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( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+			$wpdb->insert(
+				$wpdb->sitecategories, array(
+					'cat_ID'            => $term_id,
+					'cat_name'          => $c->name,
+					'category_nicename' => $c->slug,
+				)
+			);
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
+			if ( empty( $global_id ) ) {
 				return $term_id;
+			}
 		} else {
 			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
-			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
+			$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( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+			$wpdb->insert(
+				$wpdb->sitecategories, array(
+					'cat_ID'            => $new_global_id,
+					'cat_name'          => $c->name,
+					'category_nicename' => $c->slug,
+				)
+			);
 			$global_id = $wpdb->insert_id;
 		}
 	} elseif ( $global_id != $term_id ) {
@@ -1971,17 +2115,19 @@ function global_terms( $term_id, $deprecated = '' ) {
 	}
 
 	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
+		if ( get_option( 'default_category' ) == $term_id ) {
 			update_option( 'default_category', $global_id );
+		}
 
-		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id) );
+		$wpdb->update( $wpdb->terms, array( 'term_id' => $global_id ), array( 'term_id' => $term_id ) );
+		$wpdb->update( $wpdb->term_taxonomy, array( 'term_id' => $global_id ), array( 'term_id' => $term_id ) );
+		$wpdb->update( $wpdb->term_taxonomy, array( 'parent' => $global_id ), array( 'parent' => $term_id ) );
 
-		clean_term_cache($term_id);
+		clean_term_cache( $term_id );
 	}
-	if ( $recurse_start )
+	if ( $recurse_start ) {
 		$global_terms_recurse = null;
+	}
 
 	return $global_id;
 }
@@ -2010,10 +2156,11 @@ function redirect_this_site( $deprecated = '' ) {
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
+	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) {
 		return $upload;
+	}
 
-	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+	if ( strlen( $upload['bits'] ) > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
 		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
 	}
 
@@ -2028,7 +2175,7 @@ function upload_is_file_too_big( $upload ) {
 function signup_nonce_fields() {
 	$id = mt_rand();
 	echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
-	wp_nonce_field('signup_form_' . $id, '_signup_form', false);
+	wp_nonce_field( 'signup_form_' . $id, '_signup_form', false );
 }
 
 /**
@@ -2040,11 +2187,13 @@ function signup_nonce_fields() {
  * @return array
  */
 function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
+	if ( ! strpos( $_SERVER['PHP_SELF'], 'wp-signup.php' ) ) {
 		return $result;
+	}
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
+	if ( wp_create_nonce( 'signup_form_' . $_POST['signup_form_id'] ) != $_POST['_signup_form'] ) {
 		wp_die( __( 'Please try again.' ) );
+	}
 
 	return $result;
 }
@@ -2065,8 +2214,9 @@ function maybe_redirect_404() {
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
 	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
+		if ( $destination == '%siteurl%' ) {
 			$destination = network_home_url();
+		}
 		wp_redirect( $destination );
 		exit();
 	}
@@ -2082,23 +2232,27 @@ function maybe_redirect_404() {
  * @since MU (3.0.0)
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
+	if ( false === strpos( $_SERVER['REQUEST_URI'], '/newbloguser/' ) ) {
 		return;
+	}
 
-	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
-	$key = array_pop( $parts );
+	$parts = explode( '/', $_SERVER['REQUEST_URI'] );
+	$key   = array_pop( $parts );
 
-	if ( $key == '' )
+	if ( $key == '' ) {
 		$key = array_pop( $parts );
+	}
 
 	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
+	if ( ! empty( $details ) ) {
 		delete_option( 'new_user_' . $key );
+	}
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
+		wp_die( sprintf( __( 'An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.' ), home_url() ) );
+	}
 
-	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
+	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%1$s">homepage</a> or <a href="%2$s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
 }
 
 /**
@@ -2112,7 +2266,7 @@ function maybe_add_existing_user_to_blog() {
 function add_existing_user_to_blog( $details = false ) {
 	if ( is_array( $details ) ) {
 		$blog_id = get_current_blog_id();
-		$result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
+		$result  = add_user_to_blog( $blog_id, $details['user_id'], $details['role'] );
 
 		/**
 		 * Fires immediately after an existing user is added to a site.
@@ -2143,9 +2297,9 @@ function add_existing_user_to_blog( $details = false ) {
  * @param array $meta
  */
 function add_new_user_to_blog( $user_id, $password, $meta ) {
-	if ( !empty( $meta[ 'add_to_blog' ] ) ) {
-		$blog_id = $meta[ 'add_to_blog' ];
-		$role = $meta[ 'new_role' ];
+	if ( ! empty( $meta['add_to_blog'] ) ) {
+		$blog_id = $meta['add_to_blog'];
+		$role    = $meta['new_role'];
 		remove_user_from_blog( $user_id, get_network()->site_id ); // remove user from main blog.
 
 		$result = add_user_to_blog( $blog_id, $user_id, $role );
@@ -2173,11 +2327,11 @@ function fix_phpmailer_messageid( $phpmailer ) {
  * @since MU (3.0.0)
  *
  * @param string|WP_User $user Optional. Defaults to current user. WP_User object,
- * 	                           or user login name as a string.
+ *                             or user login name as a string.
  * @return bool
  */
 function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
+	if ( ! ( $user instanceof WP_User ) ) {
 		if ( $user ) {
 			$user = get_user_by( 'login', $user );
 		} else {
@@ -2210,7 +2364,7 @@ function update_blog_public( $old_value, $value ) {
  * @return bool
  */
 function users_can_register_signup_filter() {
-	$registration = get_site_option('registration');
+	$registration = get_site_option( 'registration' );
 	return ( $registration == 'all' || $registration == 'user' );
 }
 
@@ -2223,11 +2377,12 @@ function users_can_register_signup_filter() {
  * @return string
  */
 function welcome_user_msg_filter( $text ) {
-	if ( !$text ) {
+	if ( ! $text ) {
 		remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
 
 		/* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */
-		$text = __( 'Howdy USERNAME,
+		$text = __(
+			'Howdy USERNAME,
 
 Your new account is set up.
 
@@ -2238,7 +2393,8 @@ LOGINLINK
 
 Thanks!
 
---The Team @ SITE_NAME' );
+--The Team @ SITE_NAME'
+		);
 		update_site_option( 'welcome_user_email', $text );
 	}
 	return $text;
@@ -2258,7 +2414,7 @@ function force_ssl_content( $force = '' ) {
 	static $forced_content = false;
 
 	if ( '' != $force ) {
-		$old_forced = $forced_content;
+		$old_forced     = $forced_content;
 		$forced_content = $force;
 		return $old_forced;
 	}
@@ -2277,11 +2433,13 @@ function force_ssl_content( $force = '' ) {
  * @return string URL with https as the scheme
  */
 function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
+	if ( ! is_string( $url ) ) {
 		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+	}
 
-	if ( force_ssl_content() && is_ssl() )
+	if ( force_ssl_content() && is_ssl() ) {
 		$url = set_url_scheme( $url, 'https' );
+	}
 
 	return $url;
 }
@@ -2292,11 +2450,13 @@ function filter_SSL( $url ) {
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
+	if ( ! is_main_site() ) {
 		return;
+	}
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
+	if ( ! wp_next_scheduled( 'update_network_counts' ) && ! wp_installing() ) {
+		wp_schedule_event( time(), 'twicedaily', 'update_network_counts' );
+	}
 }
 
 /**
@@ -2336,8 +2496,9 @@ function wp_maybe_update_network_site_counts( $network_id = null ) {
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) ) {
 		return;
+	}
 
 	wp_update_network_site_counts( $network_id );
 }
@@ -2357,8 +2518,9 @@ function wp_maybe_update_network_user_counts( $network_id = null ) {
 	$is_small_network = ! wp_is_large_network( 'users', $network_id );
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) ) {
 		return;
+	}
 
 	wp_update_network_user_counts( $network_id );
 }
@@ -2377,13 +2539,15 @@ function wp_update_network_site_counts( $network_id = null ) {
 		$network_id = get_current_network_id();
 	}
 
-	$count = get_sites( array(
-		'network_id' => $network_id,
-		'spam'       => 0,
-		'deleted'    => 0,
-		'archived'   => 0,
-		'count'      => true,
-	) );
+	$count = get_sites(
+		array(
+			'network_id' => $network_id,
+			'spam'       => 0,
+			'deleted'    => 0,
+			'archived'   => 0,
+			'count'      => true,
+		)
+	);
 
 	update_network_option( $network_id, 'blog_count', $count );
 }
@@ -2439,11 +2603,13 @@ function get_space_used() {
 function get_space_allowed() {
 	$space_allowed = get_option( 'blog_upload_space' );
 
-	if ( ! is_numeric( $space_allowed ) )
+	if ( ! is_numeric( $space_allowed ) ) {
 		$space_allowed = get_site_option( 'blog_upload_space' );
+	}
 
-	if ( ! is_numeric( $space_allowed ) )
+	if ( ! is_numeric( $space_allowed ) ) {
 		$space_allowed = 100;
+	}
 
 	/**
 	 * Filters the upload quota for the current site.
@@ -2468,13 +2634,15 @@ function get_upload_space_available() {
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
 		return $space_allowed;
+	}
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
+	if ( ( $space_allowed - $space_used ) <= 0 ) {
 		return 0;
+	}
 
 	return $space_allowed - $space_used;
 }
@@ -2486,8 +2654,9 @@ function get_upload_space_available() {
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
 		return true;
+	}
 
 	return (bool) get_upload_space_available();
 }
@@ -2502,8 +2671,9 @@ function is_upload_space_available() {
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
 		return min( $size, $fileupload_maxk );
+	}
 
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }
@@ -2557,8 +2727,16 @@ function wp_is_large_network( $using = 'sites', $network_id = null ) {
  */
 function get_subdirectory_reserved_names() {
 	$names = array(
-		'page', 'comments', 'blog', 'files', 'feed', 'wp-admin',
-		'wp-content', 'wp-includes', 'wp-json', 'embed'
+		'page',
+		'comments',
+		'blog',
+		'files',
+		'feed',
+		'wp-admin',
+		'wp-content',
+		'wp-includes',
+		'wp-json',
+		'embed',
 	);
 
 	/**
@@ -2588,7 +2766,7 @@ function update_network_option_new_admin_email( $old_value, $value ) {
 		return;
 	}
 
-	$hash = md5( $value . time() . mt_rand() );
+	$hash            = md5( $value . time() . mt_rand() );
 	$new_admin_email = array(
 		'hash'     => $hash,
 		'newemail' => $value,
@@ -2598,7 +2776,8 @@ function update_network_option_new_admin_email( $old_value, $value ) {
 	$switched_locale = switch_to_locale( get_user_locale() );
 
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-	$email_text = __( 'Howdy ###USERNAME###,
+	$email_text = __(
+		'Howdy ###USERNAME###,
 
 You recently requested to have the network admin email address on
 your network changed.
@@ -2613,7 +2792,8 @@ This email has been sent to ###EMAIL###
 
 Regards,
 All at ###SITENAME###
-###SITEURL###' );
+###SITEURL###'
+	);
 
 	/**
 	 * Filters the text of the email sent when a change of network admin email address is attempted.
@@ -2638,11 +2818,11 @@ All at ###SITENAME###
 	$content = apply_filters( 'new_network_admin_email_content', $email_text, $new_admin_email );
 
 	$current_user = wp_get_current_user();
-	$content = str_replace( '###USERNAME###', $current_user->user_login, $content );
-	$content = str_replace( '###ADMIN_URL###', esc_url( network_admin_url( 'settings.php?network_admin_hash=' . $hash ) ), $content );
-	$content = str_replace( '###EMAIL###', $value, $content );
-	$content = str_replace( '###SITENAME###', wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ), $content );
-	$content = str_replace( '###SITEURL###', network_home_url(), $content );
+	$content      = str_replace( '###USERNAME###', $current_user->user_login, $content );
+	$content      = str_replace( '###ADMIN_URL###', esc_url( network_admin_url( 'settings.php?network_admin_hash=' . $hash ) ), $content );
+	$content      = str_replace( '###EMAIL###', $value, $content );
+	$content      = str_replace( '###SITENAME###', wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ), $content );
+	$content      = str_replace( '###SITEURL###', network_home_url(), $content );
 
 	wp_mail( $value, sprintf( __( '[%s] New Network Admin Email Address' ), wp_specialchars_decode( get_site_option( 'site_name' ), ENT_QUOTES ) ), $content );
 
@@ -2679,7 +2859,8 @@ function wp_network_admin_email_change_notification( $option_name, $new_email, $
 	}
 
 	/* translators: Do not translate OLD_EMAIL, NEW_EMAIL, SITENAME, SITEURL: those are placeholders. */
-	$email_change_text = __( 'Hi,
+	$email_change_text = __(
+		'Hi,
 
 This notice confirms that the network admin email address was changed on ###SITENAME###.
 
@@ -2689,7 +2870,8 @@ This email has been sent to ###OLD_EMAIL###
 
 Regards,
 All at ###SITENAME###
-###SITEURL###' );
+###SITEURL###'
+	);
 
 	$email_change_email = array(
 		'to'      => $old_email,
@@ -2725,13 +2907,15 @@ All at ###SITENAME###
 	 */
 	$email_change_email = apply_filters( 'network_admin_email_change_email', $email_change_email, $old_email, $new_email, $network_id );
 
-	$email_change_email['message'] = str_replace( '###OLD_EMAIL###', $old_email,    $email_change_email['message'] );
-	$email_change_email['message'] = str_replace( '###NEW_EMAIL###', $new_email,    $email_change_email['message'] );
-	$email_change_email['message'] = str_replace( '###SITENAME###',  $network_name, $email_change_email['message'] );
-	$email_change_email['message'] = str_replace( '###SITEURL###',   home_url(),    $email_change_email['message'] );
+	$email_change_email['message'] = str_replace( '###OLD_EMAIL###', $old_email, $email_change_email['message'] );
+	$email_change_email['message'] = str_replace( '###NEW_EMAIL###', $new_email, $email_change_email['message'] );
+	$email_change_email['message'] = str_replace( '###SITENAME###', $network_name, $email_change_email['message'] );
+	$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
 
-	wp_mail( $email_change_email['to'], sprintf(
-		$email_change_email['subject'],
-		$network_name
-	), $email_change_email['message'], $email_change_email['headers'] );
+	wp_mail(
+		$email_change_email['to'], sprintf(
+			$email_change_email['subject'],
+			$network_name
+		), $email_change_email['message'], $email_change_email['headers']
+	);
 }
diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index dc4df88869..f2f53203ea 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -16,8 +16,9 @@
  * @return bool True if subdomain configuration is enabled, false otherwise.
  */
 function is_subdomain_install() {
-	if ( defined('SUBDOMAIN_INSTALL') )
+	if ( defined( 'SUBDOMAIN_INSTALL' ) ) {
 		return SUBDOMAIN_INSTALL;
+	}
 
 	return ( defined( 'VHOST' ) && VHOST == 'yes' );
 }
@@ -35,10 +36,11 @@ function is_subdomain_install() {
  */
 function wp_get_active_network_plugins() {
 	$active_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-	if ( empty( $active_plugins ) )
+	if ( empty( $active_plugins ) ) {
 		return array();
+	}
 
-	$plugins = array();
+	$plugins        = array();
 	$active_plugins = array_keys( $active_plugins );
 	sort( $active_plugins );
 
@@ -46,8 +48,9 @@ function wp_get_active_network_plugins() {
 		if ( ! validate_file( $plugin ) // $plugin must validate as file
 			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
 			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
-			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+			) {
+			$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		}
 	}
 	return $plugins;
 }
@@ -75,22 +78,25 @@ function ms_site_check() {
 	 * @since 3.0.0
 	 *
 	 * @param bool null Whether to skip the blog status check. Default null.
-	*/
+	 */
 	$check = apply_filters( 'ms_site_check', null );
-	if ( null !== $check )
+	if ( null !== $check ) {
 		return true;
+	}
 
 	// Allow super admins to see blocked sites
-	if ( is_super_admin() )
+	if ( is_super_admin() ) {
 		return true;
+	}
 
 	$blog = get_site();
 
 	if ( '1' == $blog->deleted ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) )
+		if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
 			return WP_CONTENT_DIR . '/blog-deleted.php';
-		else
+		} else {
 			wp_die( __( 'This site is no longer available.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	if ( '2' == $blog->deleted ) {
@@ -100,7 +106,8 @@ function ms_site_check() {
 			$admin_email = str_replace( '@', ' AT ', get_site_option( 'admin_email', 'support@' . get_network()->domain ) );
 			wp_die(
 				/* translators: %s: admin email link */
-				sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
+				sprintf(
+					__( 'This site has not been activated yet. If you are having problems activating your site, please contact %s.' ),
 					sprintf( '<a href="mailto:%s">%s</a>', $admin_email )
 				)
 			);
@@ -108,10 +115,11 @@ function ms_site_check() {
 	}
 
 	if ( $blog->archived == '1' || $blog->spam == '1' ) {
-		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) )
+		if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
 			return WP_CONTENT_DIR . '/blog-suspended.php';
-		else
+		} else {
 			wp_die( __( 'This site has been archived or suspended.' ), '', array( 'response' => 410 ) );
+		}
 	}
 
 	return true;
@@ -227,8 +235,8 @@ function get_site_by_path( $domain, $path, $segments = null ) {
 
 	$args = array(
 		'domain__in' => $domains,
-		'path__in' => $paths,
-		'number' => 1,
+		'path__in'   => $paths,
+		'number'     => 1,
 	);
 
 	if ( count( $domains ) > 1 ) {
@@ -240,7 +248,7 @@ function get_site_by_path( $domain, $path, $segments = null ) {
 	}
 
 	$result = get_sites( $args );
-	$site = array_shift( $result );
+	$site   = array_shift( $result );
 
 	if ( $site ) {
 		return $site;
@@ -284,10 +292,10 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
 
 	// If the network is defined in wp-config.php, we can simply use that.
 	if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
-		$current_site = new stdClass;
-		$current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
+		$current_site         = new stdClass;
+		$current_site->id     = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
 		$current_site->domain = DOMAIN_CURRENT_SITE;
-		$current_site->path = PATH_CURRENT_SITE;
+		$current_site->path   = PATH_CURRENT_SITE;
 		if ( defined( 'BLOG_ID_CURRENT_SITE' ) ) {
 			$current_site->blog_id = BLOG_ID_CURRENT_SITE;
 		} elseif ( defined( 'BLOGID_CURRENT_SITE' ) ) { // deprecated.
@@ -304,7 +312,6 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
 			// Otherwise, use the first path segment (as usual).
 			$current_blog = get_site_by_path( $domain, $path, 1 );
 		}
-
 	} elseif ( ! $subdomain ) {
 		/*
 		 * A "subdomain" installation can be re-interpreted to mean "can support any domain".
@@ -374,15 +381,15 @@ function ms_load_current_site_and_network( $domain, $path, $subdomain = false )
 
 	// During activation of a new subdomain, the requested site does not yet exist.
 	if ( empty( $current_blog ) && wp_installing() ) {
-		$current_blog = new stdClass;
+		$current_blog          = new stdClass;
 		$current_blog->blog_id = $blog_id = 1;
-		$current_blog->public = 1;
+		$current_blog->public  = 1;
 	}
 
 	// No site has been found, bail.
 	if ( empty( $current_blog ) ) {
 		// We're going to redirect to the network URL, with some possible modifications.
-		$scheme = is_ssl() ? 'https' : 'http';
+		$scheme      = is_ssl() ? 'https' : 'http';
 		$destination = "$scheme://{$current_site->domain}{$current_site->path}";
 
 		/**
@@ -454,10 +461,10 @@ function ms_not_installed( $domain, $path ) {
 
 	$title = __( 'Error establishing a database connection' );
 
-	$msg  = '<h1>' . $title . '</h1>';
-	$msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
-	$msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->site ) );
+	$msg   = '<h1>' . $title . '</h1>';
+	$msg  .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
+	$msg  .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
+	$query = $wpdb->prepare( 'SHOW TABLES LIKE %s', $wpdb->esc_like( $wpdb->site ) );
 	if ( ! $wpdb->get_var( $query ) ) {
 		$msg .= '<p>' . sprintf(
 			/* translators: %s: table name */
@@ -475,13 +482,15 @@ function ms_not_installed( $domain, $path ) {
 	}
 	$msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
 	/* translators: %s: Codex URL */
-	$msg .= sprintf( __( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ),
+	$msg .= sprintf(
+		__( 'Read the <a href="%s" target="_blank">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ),
 		__( 'https://codex.wordpress.org/Debugging_a_WordPress_Network' )
 	);
 	$msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
-	foreach ( $wpdb->tables('global') as $t => $table ) {
-		if ( 'sitecategories' == $t )
+	foreach ( $wpdb->tables( 'global' ) as $t => $table ) {
+		if ( 'sitecategories' == $t ) {
 			continue;
+		}
 		$msg .= '<li>' . $table . '</li>';
 	}
 	$msg .= '</ul>';
diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index 2e4c3a4205..1ebfb8bfb1 100644
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -52,14 +52,14 @@ ms_subdomain_constants();
 
 // This block will process a request if the current network or current site objects
 // have not been populated in the global scope through something like `sunrise.php`.
-if ( !isset( $current_site ) || !isset( $current_blog ) ) {
+if ( ! isset( $current_site ) || ! isset( $current_blog ) ) {
 
 	$domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
 	if ( substr( $domain, -3 ) == ':80' ) {
-		$domain = substr( $domain, 0, -3 );
+		$domain               = substr( $domain, 0, -3 );
 		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
 	} elseif ( substr( $domain, -4 ) == ':443' ) {
-		$domain = substr( $domain, 0, -4 );
+		$domain               = substr( $domain, 0, -4 );
 		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
 	}
 
@@ -96,9 +96,9 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
 
 $wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
 $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
-$table_prefix = $wpdb->get_blog_prefix();
+$table_prefix       = $wpdb->get_blog_prefix();
 $_wp_switched_stack = array();
-$switched = false;
+$switched           = false;
 
 // need to init cache again after blog_id is set
 wp_start_object_cache();
diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index 5b49937890..25b320e564 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -48,9 +48,25 @@ require_once ABSPATH . WPINC . '/class-walker-nav-menu.php';
 function wp_nav_menu( $args = array() ) {
 	static $menu_id_slugs = array();
 
-	$defaults = array( 'menu' => '', 'container' => 'div', 'container_class' => '', 'container_id' => '', 'menu_class' => 'menu', 'menu_id' => '',
-	'echo' => true, 'fallback_cb' => 'wp_page_menu', 'before' => '', 'after' => '', 'link_before' => '', 'link_after' => '', 'items_wrap' => '<ul id="%1$s" class="%2$s">%3$s</ul>', 'item_spacing' => 'preserve',
-	'depth' => 0, 'walker' => '', 'theme_location' => '' );
+	$defaults = array(
+		'menu'            => '',
+		'container'       => 'div',
+		'container_class' => '',
+		'container_id'    => '',
+		'menu_class'      => 'menu',
+		'menu_id'         => '',
+		'echo'            => true,
+		'fallback_cb'     => 'wp_page_menu',
+		'before'          => '',
+		'after'           => '',
+		'link_before'     => '',
+		'link_after'      => '',
+		'items_wrap'      => '<ul id="%1$s" class="%2$s">%3$s</ul>',
+		'item_spacing'    => 'preserve',
+		'depth'           => 0,
+		'walker'          => '',
+		'theme_location'  => '',
+	);
 
 	$args = wp_parse_args( $args, $defaults );
 
@@ -100,11 +116,12 @@ function wp_nav_menu( $args = array() ) {
 	$menu = wp_get_nav_menu_object( $args->menu );
 
 	// Get the nav menu based on the theme_location
-	if ( ! $menu && $args->theme_location && ( $locations = get_nav_menu_locations() ) && isset( $locations[ $args->theme_location ] ) )
+	if ( ! $menu && $args->theme_location && ( $locations = get_nav_menu_locations() ) && isset( $locations[ $args->theme_location ] ) ) {
 		$menu = wp_get_nav_menu_object( $locations[ $args->theme_location ] );
+	}
 
 	// get the first menu that has items if we still can't find a menu
-	if ( ! $menu && !$args->theme_location ) {
+	if ( ! $menu && ! $args->theme_location ) {
 		$menus = wp_get_nav_menus();
 		foreach ( $menus as $menu_maybe ) {
 			if ( $menu_items = wp_get_nav_menu_items( $menu_maybe->term_id, array( 'update_post_term_cache' => false ) ) ) {
@@ -119,8 +136,9 @@ function wp_nav_menu( $args = array() ) {
 	}
 
 	// If the menu exists, get its items.
-	if ( $menu && ! is_wp_error($menu) && !isset($menu_items) )
+	if ( $menu && ! is_wp_error( $menu ) && ! isset( $menu_items ) ) {
 		$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'update_post_term_cache' => false ) );
+	}
 
 	/*
 	 * If no menu was found:
@@ -130,12 +148,14 @@ function wp_nav_menu( $args = array() ) {
 	 *  - Fall back, but only if no theme location was specified.
 	 *  - Otherwise, bail.
 	 */
-	if ( ( !$menu || is_wp_error($menu) || ( isset($menu_items) && empty($menu_items) && !$args->theme_location ) )
-		&& isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) )
+	if ( ( ! $menu || is_wp_error( $menu ) || ( isset( $menu_items ) && empty( $menu_items ) && ! $args->theme_location ) )
+		&& isset( $args->fallback_cb ) && $args->fallback_cb && is_callable( $args->fallback_cb ) ) {
 			return call_user_func( $args->fallback_cb, (array) $args );
+	}
 
-	if ( ! $menu || is_wp_error( $menu ) )
+	if ( ! $menu || is_wp_error( $menu ) ) {
 		return false;
+	}
 
 	$nav_menu = $items = '';
 
@@ -152,9 +172,9 @@ function wp_nav_menu( $args = array() ) {
 		$allowed_tags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'nav' ) );
 		if ( is_string( $args->container ) && in_array( $args->container, $allowed_tags ) ) {
 			$show_container = true;
-			$class = $args->container_class ? ' class="' . esc_attr( $args->container_class ) . '"' : ' class="menu-'. $menu->slug .'-container"';
-			$id = $args->container_id ? ' id="' . esc_attr( $args->container_id ) . '"' : '';
-			$nav_menu .= '<'. $args->container . $id . $class . '>';
+			$class          = $args->container_class ? ' class="' . esc_attr( $args->container_class ) . '"' : ' class="menu-' . $menu->slug . '-container"';
+			$id             = $args->container_id ? ' id="' . esc_attr( $args->container_id ) . '"' : '';
+			$nav_menu      .= '<' . $args->container . $id . $class . '>';
 		}
 	}
 
@@ -164,15 +184,17 @@ function wp_nav_menu( $args = array() ) {
 	$sorted_menu_items = $menu_items_with_children = array();
 	foreach ( (array) $menu_items as $menu_item ) {
 		$sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
-		if ( $menu_item->menu_item_parent )
+		if ( $menu_item->menu_item_parent ) {
 			$menu_items_with_children[ $menu_item->menu_item_parent ] = true;
+		}
 	}
 
 	// Add the menu-item-has-children class where applicable
 	if ( $menu_items_with_children ) {
 		foreach ( $sorted_menu_items as &$menu_item ) {
-			if ( isset( $menu_items_with_children[ $menu_item->ID ] ) )
+			if ( isset( $menu_items_with_children[ $menu_item->ID ] ) ) {
 				$menu_item->classes[] = 'menu-item-has-children';
+			}
 		}
 	}
 
@@ -189,7 +211,7 @@ function wp_nav_menu( $args = array() ) {
 	$sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args );
 
 	$items .= walk_nav_menu_tree( $sorted_menu_items, $args->depth, $args );
-	unset($sorted_menu_items);
+	unset( $sorted_menu_items );
 
 	// Attributes
 	if ( ! empty( $args->menu_id ) ) {
@@ -197,10 +219,11 @@ function wp_nav_menu( $args = array() ) {
 	} else {
 		$wrap_id = 'menu-' . $menu->slug;
 		while ( in_array( $wrap_id, $menu_id_slugs ) ) {
-			if ( preg_match( '#-(\d+)$#', $wrap_id, $matches ) )
-				$wrap_id = preg_replace('#-(\d+)$#', '-' . ++$matches[1], $wrap_id );
-			else
+			if ( preg_match( '#-(\d+)$#', $wrap_id, $matches ) ) {
+				$wrap_id = preg_replace( '#-(\d+)$#', '-' . ++$matches[1], $wrap_id );
+			} else {
 				$wrap_id = $wrap_id . '-1';
+			}
 		}
 	}
 	$menu_id_slugs[] = $wrap_id;
@@ -231,14 +254,16 @@ function wp_nav_menu( $args = array() ) {
 	$items = apply_filters( "wp_nav_menu_{$menu->slug}_items", $items, $args );
 
 	// Don't print any markup if there are no items at this point.
-	if ( empty( $items ) )
+	if ( empty( $items ) ) {
 		return false;
+	}
 
 	$nav_menu .= sprintf( $args->items_wrap, esc_attr( $wrap_id ), esc_attr( $wrap_class ), $items );
 	unset( $items );
 
-	if ( $show_container )
+	if ( $show_container ) {
 		$nav_menu .= '</' . $args->container . '>';
+	}
 
 	/**
 	 * Filters the HTML content for navigation menus.
@@ -252,10 +277,11 @@ function wp_nav_menu( $args = array() ) {
 	 */
 	$nav_menu = apply_filters( 'wp_nav_menu', $nav_menu, $args );
 
-	if ( $args->echo )
+	if ( $args->echo ) {
 		echo $nav_menu;
-	else
+	} else {
 		return $nav_menu;
+	}
 }
 
 /**
@@ -272,28 +298,29 @@ function wp_nav_menu( $args = array() ) {
 function _wp_menu_item_classes_by_context( &$menu_items ) {
 	global $wp_query, $wp_rewrite;
 
-	$queried_object = $wp_query->get_queried_object();
+	$queried_object    = $wp_query->get_queried_object();
 	$queried_object_id = (int) $wp_query->queried_object_id;
 
-	$active_object = '';
-	$active_ancestor_item_ids = array();
-	$active_parent_item_ids = array();
-	$active_parent_object_ids = array();
+	$active_object               = '';
+	$active_ancestor_item_ids    = array();
+	$active_parent_item_ids      = array();
+	$active_parent_object_ids    = array();
 	$possible_taxonomy_ancestors = array();
-	$possible_object_parents = array();
-	$home_page_id = (int) get_option( 'page_for_posts' );
+	$possible_object_parents     = array();
+	$home_page_id                = (int) get_option( 'page_for_posts' );
 
 	if ( $wp_query->is_singular && ! empty( $queried_object->post_type ) && ! is_post_type_hierarchical( $queried_object->post_type ) ) {
 		foreach ( (array) get_object_taxonomies( $queried_object->post_type ) as $taxonomy ) {
 			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
 				$term_hierarchy = _get_term_hierarchy( $taxonomy );
-				$terms = wp_get_object_terms( $queried_object_id, $taxonomy, array( 'fields' => 'ids' ) );
+				$terms          = wp_get_object_terms( $queried_object_id, $taxonomy, array( 'fields' => 'ids' ) );
 				if ( is_array( $terms ) ) {
 					$possible_object_parents = array_merge( $possible_object_parents, $terms );
-					$term_to_ancestor = array();
+					$term_to_ancestor        = array();
 					foreach ( (array) $term_hierarchy as $anc => $descs ) {
-						foreach ( (array) $descs as $desc )
+						foreach ( (array) $descs as $desc ) {
 							$term_to_ancestor[ $desc ] = $anc;
+						}
 					}
 
 					foreach ( $terms as $desc ) {
@@ -312,11 +339,12 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			}
 		}
 	} elseif ( ! empty( $queried_object->taxonomy ) && is_taxonomy_hierarchical( $queried_object->taxonomy ) ) {
-		$term_hierarchy = _get_term_hierarchy( $queried_object->taxonomy );
+		$term_hierarchy   = _get_term_hierarchy( $queried_object->taxonomy );
 		$term_to_ancestor = array();
 		foreach ( (array) $term_hierarchy as $anc => $descs ) {
-			foreach ( (array) $descs as $desc )
+			foreach ( (array) $descs as $desc ) {
 				$term_to_ancestor[ $desc ] = $anc;
+			}
 		}
 		$desc = $queried_object->term_id;
 		do {
@@ -338,9 +366,9 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 
 	foreach ( (array) $menu_items as $key => $menu_item ) {
 
-		$menu_items[$key]->current = false;
+		$menu_items[ $key ]->current = false;
 
-		$classes = (array) $menu_item->classes;
+		$classes   = (array) $menu_item->classes;
 		$classes[] = 'menu-item';
 		$classes[] = 'menu-item-type-' . $menu_item->type;
 		$classes[] = 'menu-item-object-' . $menu_item->object;
@@ -353,10 +381,10 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 		// if the menu item corresponds to a taxonomy term for the currently-queried non-hierarchical post object
 		if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type && in_array( $menu_item->object_id, $possible_object_parents ) ) {
 			$active_parent_object_ids[] = (int) $menu_item->object_id;
-			$active_parent_item_ids[] = (int) $menu_item->db_id;
-			$active_object = $queried_object->post_type;
+			$active_parent_item_ids[]   = (int) $menu_item->db_id;
+			$active_object              = $queried_object->post_type;
 
-		// if the menu item corresponds to the currently-queried post or taxonomy object
+			// if the menu item corresponds to the currently-queried post or taxonomy object
 		} elseif (
 			$menu_item->object_id == $queried_object_id &&
 			(
@@ -365,11 +393,11 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 				( 'taxonomy' == $menu_item->type && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) && $queried_object->taxonomy == $menu_item->object )
 			)
 		) {
-			$classes[] = 'current-menu-item';
-			$menu_items[$key]->current = true;
-			$_anc_id = (int) $menu_item->db_id;
+			$classes[]                   = 'current-menu-item';
+			$menu_items[ $key ]->current = true;
+			$_anc_id                     = (int) $menu_item->db_id;
 
-			while(
+			while (
 				( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
 				! in_array( $_anc_id, $active_ancestor_item_ids )
 			) {
@@ -383,20 +411,20 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 				$classes[] = 'current_page_item';
 			}
 
-			$active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
+			$active_parent_item_ids[]   = (int) $menu_item->menu_item_parent;
 			$active_parent_object_ids[] = (int) $menu_item->post_parent;
-			$active_object = $menu_item->object;
+			$active_object              = $menu_item->object;
 
-		// if the menu item corresponds to the currently-queried post type archive
+			// if the menu item corresponds to the currently-queried post type archive
 		} elseif (
 			'post_type_archive' == $menu_item->type &&
 			is_post_type_archive( array( $menu_item->object ) )
 		) {
-			$classes[] = 'current-menu-item';
-			$menu_items[$key]->current = true;
-			$_anc_id = (int) $menu_item->db_id;
+			$classes[]                   = 'current-menu-item';
+			$menu_items[ $key ]->current = true;
+			$_anc_id                     = (int) $menu_item->db_id;
 
-			while(
+			while (
 				( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
 				! in_array( $_anc_id, $active_ancestor_item_ids )
 			) {
@@ -405,7 +433,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 
 			$active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
 
-		// if the menu item corresponds to the currently-requested URL
+			// if the menu item corresponds to the currently-requested URL
 		} elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {
 			$_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
 
@@ -413,17 +441,17 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			if ( is_customize_preview() ) {
 				$_root_relative_current = strtok( untrailingslashit( $_SERVER['REQUEST_URI'] ), '?' );
 			}
-			$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
-			$raw_item_url = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
-			$item_url = set_url_scheme( untrailingslashit( $raw_item_url ) );
+			$current_url        = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_root_relative_current );
+			$raw_item_url       = strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url;
+			$item_url           = set_url_scheme( untrailingslashit( $raw_item_url ) );
 			$_indexless_current = untrailingslashit( preg_replace( '/' . preg_quote( $wp_rewrite->index, '/' ) . '$/', '', $current_url ) );
 
 			if ( $raw_item_url && in_array( $item_url, array( $current_url, $_indexless_current, $_root_relative_current ) ) ) {
-				$classes[] = 'current-menu-item';
-				$menu_items[$key]->current = true;
-				$_anc_id = (int) $menu_item->db_id;
+				$classes[]                   = 'current-menu-item';
+				$menu_items[ $key ]->current = true;
+				$_anc_id                     = (int) $menu_item->db_id;
 
-				while(
+				while (
 					( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
 					! in_array( $_anc_id, $active_ancestor_item_ids )
 				) {
@@ -434,34 +462,36 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 					// Back compat for home link to match wp_page_menu()
 					$classes[] = 'current_page_item';
 				}
-				$active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
+				$active_parent_item_ids[]   = (int) $menu_item->menu_item_parent;
 				$active_parent_object_ids[] = (int) $menu_item->post_parent;
-				$active_object = $menu_item->object;
+				$active_object              = $menu_item->object;
 
-			// give front page item current-menu-item class when extra query arguments involved
+				// give front page item current-menu-item class when extra query arguments involved
 			} elseif ( $item_url == $front_page_url && is_front_page() ) {
 				$classes[] = 'current-menu-item';
 			}
 
-			if ( untrailingslashit($item_url) == home_url() )
+			if ( untrailingslashit( $item_url ) == home_url() ) {
 				$classes[] = 'menu-item-home';
+			}
 		}
 
 		// back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
-		if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
+		if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id ) {
 			$classes[] = 'current_page_parent';
+		}
 
-		$menu_items[$key]->classes = array_unique( $classes );
+		$menu_items[ $key ]->classes = array_unique( $classes );
 	}
 	$active_ancestor_item_ids = array_filter( array_unique( $active_ancestor_item_ids ) );
-	$active_parent_item_ids = array_filter( array_unique( $active_parent_item_ids ) );
+	$active_parent_item_ids   = array_filter( array_unique( $active_parent_item_ids ) );
 	$active_parent_object_ids = array_filter( array_unique( $active_parent_object_ids ) );
 
 	// set parent's class
 	foreach ( (array) $menu_items as $key => $parent_item ) {
-		$classes = (array) $parent_item->classes;
-		$menu_items[$key]->current_item_ancestor = false;
-		$menu_items[$key]->current_item_parent = false;
+		$classes                                   = (array) $parent_item->classes;
+		$menu_items[ $key ]->current_item_ancestor = false;
+		$menu_items[ $key ]->current_item_parent   = false;
 
 		if (
 			isset( $parent_item->type ) &&
@@ -490,26 +520,29 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			$classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
 		}
 
-		if ( in_array(  intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
-			$classes[] = 'current-menu-ancestor';
-			$menu_items[$key]->current_item_ancestor = true;
+		if ( in_array( intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
+			$classes[]                                 = 'current-menu-ancestor';
+			$menu_items[ $key ]->current_item_ancestor = true;
 		}
 		if ( in_array( $parent_item->db_id, $active_parent_item_ids ) ) {
-			$classes[] = 'current-menu-parent';
-			$menu_items[$key]->current_item_parent = true;
+			$classes[]                               = 'current-menu-parent';
+			$menu_items[ $key ]->current_item_parent = true;
 		}
-		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
+		if ( in_array( $parent_item->object_id, $active_parent_object_ids ) ) {
 			$classes[] = 'current-' . $active_object . '-parent';
+		}
 
 		if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
 			// Back compat classes for pages to match wp_page_menu()
-			if ( in_array('current-menu-parent', $classes) )
+			if ( in_array( 'current-menu-parent', $classes ) ) {
 				$classes[] = 'current_page_parent';
-			if ( in_array('current-menu-ancestor', $classes) )
+			}
+			if ( in_array( 'current-menu-ancestor', $classes ) ) {
 				$classes[] = 'current_page_ancestor';
+			}
 		}
 
-		$menu_items[$key]->classes = array_unique( $classes );
+		$menu_items[ $key ]->classes = array_unique( $classes );
 	}
 }
 
@@ -525,8 +558,8 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
  * @return string The HTML list content for the menu items.
  */
 function walk_nav_menu_tree( $items, $depth, $r ) {
-	$walker = ( empty($r->walker) ) ? new Walker_Nav_Menu : $r->walker;
-	$args = array( $items, $depth, $r );
+	$walker = ( empty( $r->walker ) ) ? new Walker_Nav_Menu : $r->walker;
+	$args   = array( $items, $depth, $r );
 
 	return call_user_func_array( array( $walker, 'walk' ), $args );
 }
diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 00c97f0f93..1e42e38ecc 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -60,8 +60,9 @@ function wp_get_nav_menu_object( $menu ) {
  * @return bool Whether the menu exists.
  */
 function is_nav_menu( $menu ) {
-	if ( ! $menu )
+	if ( ! $menu ) {
 		return false;
+	}
 
 	$menu_obj = wp_get_nav_menu_object( $menu );
 
@@ -70,8 +71,9 @@ function is_nav_menu( $menu ) {
 		! is_wp_error( $menu_obj ) &&
 		! empty( $menu_obj->taxonomy ) &&
 		'nav_menu' == $menu_obj->taxonomy
-	)
+	) {
 		return true;
+	}
 
 	return false;
 }
@@ -105,8 +107,8 @@ function register_nav_menus( $locations = array() ) {
 function unregister_nav_menu( $location ) {
 	global $_wp_registered_nav_menus;
 
-	if ( is_array( $_wp_registered_nav_menus ) && isset( $_wp_registered_nav_menus[$location] ) ) {
-		unset( $_wp_registered_nav_menus[$location] );
+	if ( is_array( $_wp_registered_nav_menus ) && isset( $_wp_registered_nav_menus[ $location ] ) ) {
+		unset( $_wp_registered_nav_menus[ $location ] );
 		if ( empty( $_wp_registered_nav_menus ) ) {
 			_remove_theme_support( 'menus' );
 		}
@@ -137,8 +139,9 @@ function register_nav_menu( $location, $description ) {
  */
 function get_registered_nav_menus() {
 	global $_wp_registered_nav_menus;
-	if ( isset( $_wp_registered_nav_menus ) )
+	if ( isset( $_wp_registered_nav_menus ) ) {
 		return $_wp_registered_nav_menus;
+	}
 	return array();
 }
 
@@ -169,7 +172,7 @@ function has_nav_menu( $location ) {
 
 	$registered_nav_menus = get_registered_nav_menus();
 	if ( isset( $registered_nav_menus[ $location ] ) ) {
-		$locations = get_nav_menu_locations();
+		$locations    = get_nav_menu_locations();
 		$has_nav_menu = ! empty( $locations[ $location ] );
 	}
 
@@ -253,8 +256,9 @@ function wp_create_nav_menu( $menu_name ) {
  */
 function wp_delete_nav_menu( $menu ) {
 	$menu = wp_get_nav_menu_object( $menu );
-	if ( ! $menu )
+	if ( ! $menu ) {
 		return false;
+	}
 
 	$menu_objects = get_objects_in_term( $menu->term_id, 'nav_menu' );
 	if ( ! empty( $menu_objects ) ) {
@@ -268,12 +272,13 @@ function wp_delete_nav_menu( $menu ) {
 	// Remove this menu from any locations.
 	$locations = get_nav_menu_locations();
 	foreach ( $locations as $location => $menu_id ) {
-		if ( $menu_id == $menu->term_id )
+		if ( $menu_id == $menu->term_id ) {
 			$locations[ $location ] = 0;
+		}
 	}
 	set_theme_mod( 'nav_menu_locations', $locations );
 
-	if ( $result && !is_wp_error($result) )
+	if ( $result && ! is_wp_error( $result ) ) {
 
 		/**
 		 * Fires after a navigation menu has been successfully deleted.
@@ -283,6 +288,7 @@ function wp_delete_nav_menu( $menu ) {
 		 * @param int $term_id ID of the deleted menu.
 		 */
 		do_action( 'wp_delete_nav_menu', $menu->term_id );
+	}
 
 	return $result;
 }
@@ -305,9 +311,9 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
 	$_menu = wp_get_nav_menu_object( $menu_id );
 
 	$args = array(
-		'description' => ( isset( $menu_data['description'] ) ? $menu_data['description']  : '' ),
-		'name'        => ( isset( $menu_data['menu-name']   ) ? $menu_data['menu-name']    : '' ),
-		'parent'      => ( isset( $menu_data['parent']      ) ? (int) $menu_data['parent'] : 0  ),
+		'description' => ( isset( $menu_data['description'] ) ? $menu_data['description'] : '' ),
+		'name'        => ( isset( $menu_data['menu-name'] ) ? $menu_data['menu-name'] : '' ),
+		'parent'      => ( isset( $menu_data['parent'] ) ? (int) $menu_data['parent'] : 0 ),
 		'slug'        => null,
 	);
 
@@ -319,9 +325,11 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
 		isset( $_possible_existing->term_id ) &&
 		$_possible_existing->term_id != $menu_id
 	) {
-		return new WP_Error( 'menu_exists',
+		return new WP_Error(
+			'menu_exists',
 			/* translators: %s: menu name */
-			sprintf( __( 'The menu name %s conflicts with another menu name. Please try another.' ),
+			sprintf(
+				__( 'The menu name %s conflicts with another menu name. Please try another.' ),
 				'<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>'
 			)
 		);
@@ -332,9 +340,11 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
 		$menu_exists = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );
 
 		if ( $menu_exists ) {
-			return new WP_Error( 'menu_exists',
+			return new WP_Error(
+				'menu_exists',
 				/* translators: %s: menu name */
-				sprintf( __( 'The menu name %s conflicts with another menu name. Please try another.' ),
+				sprintf(
+					__( 'The menu name %s conflicts with another menu name. Please try another.' ),
 					'<strong>' . esc_html( $menu_data['menu-name'] ) . '</strong>'
 				)
 			);
@@ -342,8 +352,9 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
 
 		$_menu = wp_insert_term( $menu_data['menu-name'], 'nav_menu', $args );
 
-		if ( is_wp_error( $_menu ) )
+		if ( is_wp_error( $_menu ) ) {
 			return $_menu;
+		}
 
 		/**
 		 * Fires after a navigation menu is successfully created.
@@ -358,15 +369,17 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
 		return (int) $_menu['term_id'];
 	}
 
-	if ( ! $_menu || ! isset( $_menu->term_id ) )
+	if ( ! $_menu || ! isset( $_menu->term_id ) ) {
 		return 0;
+	}
 
 	$menu_id = (int) $_menu->term_id;
 
 	$update_response = wp_update_term( $menu_id, 'nav_menu', $args );
 
-	if ( is_wp_error( $update_response ) )
+	if ( is_wp_error( $update_response ) ) {
 		return $update_response;
+	}
 
 	$menu_id = (int) $update_response['term_id'];
 
@@ -396,12 +409,13 @@ function wp_update_nav_menu_object( $menu_id = 0, $menu_data = array() ) {
  * @return int|WP_Error The menu item's database ID or WP_Error object on failure.
  */
 function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item_data = array() ) {
-	$menu_id = (int) $menu_id;
+	$menu_id         = (int) $menu_id;
 	$menu_item_db_id = (int) $menu_item_db_id;
 
 	// make sure that we don't convert non-nav_menu_item objects into nav_menu_item objects
-	if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) )
+	if ( ! empty( $menu_item_db_id ) && ! is_nav_menu_item( $menu_item_db_id ) ) {
 		return new WP_Error( 'update_nav_menu_item_failed', __( 'The given object ID is not that of a menu item.' ) );
+	}
 
 	$menu = wp_get_nav_menu_object( $menu_id );
 
@@ -414,20 +428,20 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 	}
 
 	$defaults = array(
-		'menu-item-db-id' => $menu_item_db_id,
-		'menu-item-object-id' => 0,
-		'menu-item-object' => '',
-		'menu-item-parent-id' => 0,
-		'menu-item-position' => 0,
-		'menu-item-type' => 'custom',
-		'menu-item-title' => '',
-		'menu-item-url' => '',
+		'menu-item-db-id'       => $menu_item_db_id,
+		'menu-item-object-id'   => 0,
+		'menu-item-object'      => '',
+		'menu-item-parent-id'   => 0,
+		'menu-item-position'    => 0,
+		'menu-item-type'        => 'custom',
+		'menu-item-title'       => '',
+		'menu-item-url'         => '',
 		'menu-item-description' => '',
-		'menu-item-attr-title' => '',
-		'menu-item-target' => '',
-		'menu-item-classes' => '',
-		'menu-item-xfn' => '',
-		'menu-item-status' => '',
+		'menu-item-attr-title'  => '',
+		'menu-item-target'      => '',
+		'menu-item-classes'     => '',
+		'menu-item-xfn'         => '',
+		'menu-item-status'      => '',
 	);
 
 	$args = wp_parse_args( $menu_item_data, $defaults );
@@ -435,8 +449,8 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 	if ( 0 == $menu_id ) {
 		$args['menu-item-position'] = 1;
 	} elseif ( 0 == (int) $args['menu-item-position'] ) {
-		$menu_items = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-		$last_item = array_pop( $menu_items );
+		$menu_items                 = 0 == $menu_id ? array() : (array) wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
+		$last_item                  = array_pop( $menu_items );
 		$args['menu-item-position'] = ( $last_item && isset( $last_item->menu_order ) ) ? 1 + $last_item->menu_order : count( $menu_items );
 	}
 
@@ -453,12 +467,12 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 		$original_title = '';
 		if ( 'taxonomy' == $args['menu-item-type'] ) {
 			$original_parent = get_term_field( 'parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
-			$original_title = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
+			$original_title  = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
 		} elseif ( 'post_type' == $args['menu-item-type'] ) {
 
 			$original_object = get_post( $args['menu-item-object-id'] );
 			$original_parent = (int) $original_object->post_parent;
-			$original_title = $original_object->post_title;
+			$original_title  = $original_object->post_title;
 		} elseif ( 'post_type_archive' == $args['menu-item-type'] ) {
 			$original_object = get_post_type_object( $args['menu-item-object'] );
 			if ( $original_object ) {
@@ -466,34 +480,37 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 			}
 		}
 
-		if ( $args['menu-item-title'] == $original_title )
+		if ( $args['menu-item-title'] == $original_title ) {
 			$args['menu-item-title'] = '';
+		}
 
 		// hack to get wp to create a post object when too many properties are empty
-		if ( '' ==  $args['menu-item-title'] && '' == $args['menu-item-description'] )
+		if ( '' == $args['menu-item-title'] && '' == $args['menu-item-description'] ) {
 			$args['menu-item-description'] = ' ';
+		}
 	}
 
 	// Populate the menu item object
 	$post = array(
-		'menu_order' => $args['menu-item-position'],
-		'ping_status' => 0,
+		'menu_order'   => $args['menu-item-position'],
+		'ping_status'  => 0,
 		'post_content' => $args['menu-item-description'],
 		'post_excerpt' => $args['menu-item-attr-title'],
-		'post_parent' => $original_parent,
-		'post_title' => $args['menu-item-title'],
-		'post_type' => 'nav_menu_item',
+		'post_parent'  => $original_parent,
+		'post_title'   => $args['menu-item-title'],
+		'post_type'    => 'nav_menu_item',
 	);
 
 	$update = 0 != $menu_item_db_id;
 
 	// New menu item. Default is draft status
 	if ( ! $update ) {
-		$post['ID'] = 0;
+		$post['ID']          = 0;
 		$post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
-		$menu_item_db_id = wp_insert_post( $post );
-		if ( ! $menu_item_db_id	|| is_wp_error( $menu_item_db_id ) )
+		$menu_item_db_id     = wp_insert_post( $post );
+		if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) ) {
 			return $menu_item_db_id;
+		}
 
 		/**
 		 * Fires immediately after a new navigation menu item has been added.
@@ -517,31 +534,32 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
 
 	if ( 'custom' == $args['menu-item-type'] ) {
 		$args['menu-item-object-id'] = $menu_item_db_id;
-		$args['menu-item-object'] = 'custom';
+		$args['menu-item-object']    = 'custom';
 	}
 
 	$menu_item_db_id = (int) $menu_item_db_id;
 
-	update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key($args['menu-item-type']) );
+	update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key( $args['menu-item-type'] ) );
 	update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', strval( (int) $args['menu-item-parent-id'] ) );
 	update_post_meta( $menu_item_db_id, '_menu_item_object_id', strval( (int) $args['menu-item-object-id'] ) );
-	update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) );
-	update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) );
+	update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key( $args['menu-item-object'] ) );
+	update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key( $args['menu-item-target'] ) );
 
 	$args['menu-item-classes'] = array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-classes'] ) );
-	$args['menu-item-xfn'] = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-xfn'] ) ) );
+	$args['menu-item-xfn']     = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-xfn'] ) ) );
 	update_post_meta( $menu_item_db_id, '_menu_item_classes', $args['menu-item-classes'] );
 	update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
-	update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) );
+	update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw( $args['menu-item-url'] ) );
 
-	if ( 0 == $menu_id )
+	if ( 0 == $menu_id ) {
 		update_post_meta( $menu_item_db_id, '_menu_item_orphaned', (string) time() );
-	elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) )
+	} elseif ( get_post_meta( $menu_item_db_id, '_menu_item_orphaned' ) ) {
 		delete_post_meta( $menu_item_db_id, '_menu_item_orphaned' );
+	}
 
 	// Update existing menu item. Default is publish status
 	if ( $update ) {
-		$post['ID'] = $menu_item_db_id;
+		$post['ID']          = $menu_item_db_id;
 		$post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
 		wp_update_post( $post );
 	}
@@ -574,8 +592,11 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
  * @return array Menu objects.
  */
 function wp_get_nav_menus( $args = array() ) {
-	$defaults = array( 'hide_empty' => false, 'orderby' => 'name' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array(
+		'hide_empty' => false,
+		'orderby'    => 'name',
+	);
+	$args     = wp_parse_args( $args, $defaults );
 
 	/**
 	 * Filters the navigation menu objects being returned.
@@ -587,7 +608,7 @@ function wp_get_nav_menus( $args = array() ) {
 	 * @param array $menus An array of menu objects.
 	 * @param array $args  An array of arguments used to retrieve menu objects.
 	 */
-	return apply_filters( 'wp_get_nav_menus', get_terms( 'nav_menu',  $args), $args );
+	return apply_filters( 'wp_get_nav_menus', get_terms( 'nav_menu', $args ), $args );
 }
 
 /**
@@ -651,9 +672,16 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 		return false;
 	}
 
-	$defaults = array( 'order' => 'ASC', 'orderby' => 'menu_order', 'post_type' => 'nav_menu_item',
-		'post_status' => 'publish', 'output' => ARRAY_A, 'output_key' => 'menu_order', 'nopaging' => true );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults        = array(
+		'order'       => 'ASC',
+		'orderby'     => 'menu_order',
+		'post_type'   => 'nav_menu_item',
+		'post_status' => 'publish',
+		'output'      => ARRAY_A,
+		'output_key'  => 'menu_order',
+		'nopaging'    => true,
+	);
+	$args            = wp_parse_args( $args, $defaults );
 	$args['include'] = $items;
 
 	if ( ! empty( $items ) ) {
@@ -664,36 +692,46 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 
 	// Get all posts and terms at once to prime the caches
 	if ( empty( $fetched[ $menu->term_id ] ) && ! wp_using_ext_object_cache() ) {
-		$fetched[$menu->term_id] = true;
-		$posts = array();
-		$terms = array();
+		$fetched[ $menu->term_id ] = true;
+		$posts                     = array();
+		$terms                     = array();
 		foreach ( $items as $item ) {
 			$object_id = get_post_meta( $item->ID, '_menu_item_object_id', true );
-			$object    = get_post_meta( $item->ID, '_menu_item_object',    true );
-			$type      = get_post_meta( $item->ID, '_menu_item_type',      true );
+			$object    = get_post_meta( $item->ID, '_menu_item_object', true );
+			$type      = get_post_meta( $item->ID, '_menu_item_type', true );
 
-			if ( 'post_type' == $type )
-				$posts[$object][] = $object_id;
-			elseif ( 'taxonomy' == $type)
-				$terms[$object][] = $object_id;
+			if ( 'post_type' == $type ) {
+				$posts[ $object ][] = $object_id;
+			} elseif ( 'taxonomy' == $type ) {
+				$terms[ $object ][] = $object_id;
+			}
 		}
 
 		if ( ! empty( $posts ) ) {
-			foreach ( array_keys($posts) as $post_type ) {
-				get_posts( array('post__in' => $posts[$post_type], 'post_type' => $post_type, 'nopaging' => true, 'update_post_term_cache' => false) );
+			foreach ( array_keys( $posts ) as $post_type ) {
+				get_posts(
+					array(
+						'post__in'               => $posts[ $post_type ],
+						'post_type'              => $post_type,
+						'nopaging'               => true,
+						'update_post_term_cache' => false,
+					)
+				);
 			}
 		}
-		unset($posts);
+		unset( $posts );
 
 		if ( ! empty( $terms ) ) {
-			foreach ( array_keys($terms) as $taxonomy ) {
-				get_terms( $taxonomy, array(
-					'include' => $terms[ $taxonomy ],
-					'hierarchical' => false,
-				) );
+			foreach ( array_keys( $terms ) as $taxonomy ) {
+				get_terms(
+					$taxonomy, array(
+						'include'      => $terms[ $taxonomy ],
+						'hierarchical' => false,
+					)
+				);
 			}
 		}
-		unset($terms);
+		unset( $terms );
 	}
 
 	$items = array_map( 'wp_setup_nav_menu_item', $items );
@@ -703,12 +741,14 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 	}
 
 	if ( ARRAY_A == $args['output'] ) {
-		$items = wp_list_sort( $items, array(
-			$args['output_key'] => 'ASC',
-		) );
-		$i = 1;
+		$items = wp_list_sort(
+			$items, array(
+				$args['output_key'] => 'ASC',
+			)
+		);
+		$i     = 1;
 		foreach ( $items as $k => $item ) {
-			$items[$k]->{$args['output_key']} = $i++;
+			$items[ $k ]->{$args['output_key']} = $i++;
 		}
 	}
 
@@ -754,11 +794,11 @@ function wp_get_nav_menu_items( $menu, $args = array() ) {
 function wp_setup_nav_menu_item( $menu_item ) {
 	if ( isset( $menu_item->post_type ) ) {
 		if ( 'nav_menu_item' == $menu_item->post_type ) {
-			$menu_item->db_id = (int) $menu_item->ID;
+			$menu_item->db_id            = (int) $menu_item->ID;
 			$menu_item->menu_item_parent = ! isset( $menu_item->menu_item_parent ) ? get_post_meta( $menu_item->ID, '_menu_item_menu_item_parent', true ) : $menu_item->menu_item_parent;
-			$menu_item->object_id = ! isset( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id;
-			$menu_item->object = ! isset( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object;
-			$menu_item->type = ! isset( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type;
+			$menu_item->object_id        = ! isset( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id;
+			$menu_item->object           = ! isset( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object;
+			$menu_item->type             = ! isset( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->type;
 
 			if ( 'post_type' == $menu_item->type ) {
 				$object = get_post_type_object( $menu_item->object );
@@ -766,7 +806,7 @@ function wp_setup_nav_menu_item( $menu_item ) {
 					$menu_item->type_label = $object->labels->singular_name;
 				} else {
 					$menu_item->type_label = $menu_item->object;
-					$menu_item->_invalid = true;
+					$menu_item->_invalid   = true;
 				}
 
 				if ( 'trash' === get_post_status( $menu_item->object_id ) ) {
@@ -787,40 +827,41 @@ function wp_setup_nav_menu_item( $menu_item ) {
 				$menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
 			} elseif ( 'post_type_archive' == $menu_item->type ) {
-				$object =  get_post_type_object( $menu_item->object );
+				$object = get_post_type_object( $menu_item->object );
 				if ( $object ) {
-					$menu_item->title = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title;
+					$menu_item->title      = '' == $menu_item->post_title ? $object->labels->archives : $menu_item->post_title;
 					$post_type_description = $object->description;
 				} else {
-					$menu_item->_invalid = true;
+					$menu_item->_invalid   = true;
 					$post_type_description = '';
 				}
 
 				$menu_item->type_label = __( 'Post Type Archive' );
-				$post_content = wp_trim_words( $menu_item->post_content, 200 );
+				$post_content          = wp_trim_words( $menu_item->post_content, 200 );
 				$post_type_description = '' == $post_content ? $post_type_description : $post_content;
-				$menu_item->url = get_post_type_archive_link( $menu_item->object );
+				$menu_item->url        = get_post_type_archive_link( $menu_item->object );
 			} elseif ( 'taxonomy' == $menu_item->type ) {
 				$object = get_taxonomy( $menu_item->object );
 				if ( $object ) {
 					$menu_item->type_label = $object->labels->singular_name;
 				} else {
 					$menu_item->type_label = $menu_item->object;
-					$menu_item->_invalid = true;
+					$menu_item->_invalid   = true;
 				}
 
-				$term_url = get_term_link( (int) $menu_item->object_id, $menu_item->object );
-				$menu_item->url = !is_wp_error( $term_url ) ? $term_url : '';
+				$term_url       = get_term_link( (int) $menu_item->object_id, $menu_item->object );
+				$menu_item->url = ! is_wp_error( $term_url ) ? $term_url : '';
 
 				$original_title = get_term_field( 'name', $menu_item->object_id, $menu_item->object, 'raw' );
-				if ( is_wp_error( $original_title ) )
+				if ( is_wp_error( $original_title ) ) {
 					$original_title = false;
+				}
 				$menu_item->title = '' == $menu_item->post_title ? $original_title : $menu_item->post_title;
 
 			} else {
-				$menu_item->type_label = __('Custom Link');
-				$menu_item->title = $menu_item->post_title;
-				$menu_item->url = ! isset( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
+				$menu_item->type_label = __( 'Custom Link' );
+				$menu_item->title      = $menu_item->post_title;
+				$menu_item->url        = ! isset( $menu_item->url ) ? get_post_meta( $menu_item->ID, '_menu_item_url', true ) : $menu_item->url;
 			}
 
 			$menu_item->target = ! isset( $menu_item->target ) ? get_post_meta( $menu_item->ID, '_menu_item_target', true ) : $menu_item->target;
@@ -846,15 +887,15 @@ function wp_setup_nav_menu_item( $menu_item ) {
 			}
 
 			$menu_item->classes = ! isset( $menu_item->classes ) ? (array) get_post_meta( $menu_item->ID, '_menu_item_classes', true ) : $menu_item->classes;
-			$menu_item->xfn = ! isset( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn;
+			$menu_item->xfn     = ! isset( $menu_item->xfn ) ? get_post_meta( $menu_item->ID, '_menu_item_xfn', true ) : $menu_item->xfn;
 		} else {
-			$menu_item->db_id = 0;
+			$menu_item->db_id            = 0;
 			$menu_item->menu_item_parent = 0;
-			$menu_item->object_id = (int) $menu_item->ID;
-			$menu_item->type = 'post_type';
+			$menu_item->object_id        = (int) $menu_item->ID;
+			$menu_item->type             = 'post_type';
 
-			$object = get_post_type_object( $menu_item->post_type );
-			$menu_item->object = $object->name;
+			$object                = get_post_type_object( $menu_item->post_type );
+			$menu_item->object     = $object->name;
 			$menu_item->type_label = $object->labels->singular_name;
 
 			if ( '' === $menu_item->post_title ) {
@@ -862,8 +903,8 @@ function wp_setup_nav_menu_item( $menu_item ) {
 				$menu_item->post_title = sprintf( __( '#%d (no title)' ), $menu_item->ID );
 			}
 
-			$menu_item->title = $menu_item->post_title;
-			$menu_item->url = get_permalink( $menu_item->ID );
+			$menu_item->title  = $menu_item->post_title;
+			$menu_item->url    = get_permalink( $menu_item->ID );
 			$menu_item->target = '';
 
 			/** This filter is documented in wp-includes/nav-menu.php */
@@ -871,28 +912,28 @@ function wp_setup_nav_menu_item( $menu_item ) {
 
 			/** This filter is documented in wp-includes/nav-menu.php */
 			$menu_item->description = apply_filters( 'nav_menu_description', '' );
-			$menu_item->classes = array();
-			$menu_item->xfn = '';
+			$menu_item->classes     = array();
+			$menu_item->xfn         = '';
 		}
 	} elseif ( isset( $menu_item->taxonomy ) ) {
-		$menu_item->ID = $menu_item->term_id;
-		$menu_item->db_id = 0;
+		$menu_item->ID               = $menu_item->term_id;
+		$menu_item->db_id            = 0;
 		$menu_item->menu_item_parent = 0;
-		$menu_item->object_id = (int) $menu_item->term_id;
-		$menu_item->post_parent = (int) $menu_item->parent;
-		$menu_item->type = 'taxonomy';
+		$menu_item->object_id        = (int) $menu_item->term_id;
+		$menu_item->post_parent      = (int) $menu_item->parent;
+		$menu_item->type             = 'taxonomy';
 
-		$object = get_taxonomy( $menu_item->taxonomy );
-		$menu_item->object = $object->name;
+		$object                = get_taxonomy( $menu_item->taxonomy );
+		$menu_item->object     = $object->name;
 		$menu_item->type_label = $object->labels->singular_name;
 
-		$menu_item->title = $menu_item->name;
-		$menu_item->url = get_term_link( $menu_item, $menu_item->taxonomy );
-		$menu_item->target = '';
-		$menu_item->attr_title = '';
+		$menu_item->title       = $menu_item->name;
+		$menu_item->url         = get_term_link( $menu_item, $menu_item->taxonomy );
+		$menu_item->target      = '';
+		$menu_item->attr_title  = '';
 		$menu_item->description = get_term_field( 'description', $menu_item->term_id, $menu_item->taxonomy );
-		$menu_item->classes = array();
-		$menu_item->xfn = '';
+		$menu_item->classes     = array();
+		$menu_item->xfn         = '';
 
 	}
 
@@ -917,16 +958,16 @@ function wp_setup_nav_menu_item( $menu_item ) {
  * @return array The array of menu item IDs; empty array if none;
  */
 function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_type', $taxonomy = '' ) {
-	$object_id = (int) $object_id;
+	$object_id     = (int) $object_id;
 	$menu_item_ids = array();
 
-	$query = new WP_Query;
+	$query      = new WP_Query;
 	$menu_items = $query->query(
 		array(
-			'meta_key' => '_menu_item_object_id',
-			'meta_value' => $object_id,
-			'post_status' => 'any',
-			'post_type' => 'nav_menu_item',
+			'meta_key'       => '_menu_item_object_id',
+			'meta_value'     => $object_id,
+			'post_status'    => 'any',
+			'post_type'      => 'nav_menu_item',
 			'posts_per_page' => -1,
 		)
 	);
@@ -958,7 +999,6 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_
  * @access private
  *
  * @param int $object_id The ID of the original object being trashed.
- *
  */
 function _wp_delete_post_menu_item( $object_id = 0 ) {
 	$object_id = (int) $object_id;
@@ -1001,31 +1041,37 @@ function _wp_delete_tax_menu_item( $object_id = 0, $tt_id, $taxonomy ) {
  * @param object $post       The post object being transitioned from one status to another.
  */
 function _wp_auto_add_pages_to_menu( $new_status, $old_status, $post ) {
-	if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type )
+	if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type ) {
 		return;
-	if ( ! empty( $post->post_parent ) )
+	}
+	if ( ! empty( $post->post_parent ) ) {
 		return;
+	}
 	$auto_add = get_option( 'nav_menu_options' );
-	if ( empty( $auto_add ) || ! is_array( $auto_add ) || ! isset( $auto_add['auto_add'] ) )
+	if ( empty( $auto_add ) || ! is_array( $auto_add ) || ! isset( $auto_add['auto_add'] ) ) {
 		return;
+	}
 	$auto_add = $auto_add['auto_add'];
-	if ( empty( $auto_add ) || ! is_array( $auto_add ) )
+	if ( empty( $auto_add ) || ! is_array( $auto_add ) ) {
 		return;
+	}
 
 	$args = array(
 		'menu-item-object-id' => $post->ID,
-		'menu-item-object' => $post->post_type,
-		'menu-item-type' => 'post_type',
-		'menu-item-status' => 'publish',
+		'menu-item-object'    => $post->post_type,
+		'menu-item-type'      => 'post_type',
+		'menu-item-status'    => 'publish',
 	);
 
 	foreach ( $auto_add as $menu_id ) {
 		$items = wp_get_nav_menu_items( $menu_id, array( 'post_status' => 'publish,draft' ) );
-		if ( ! is_array( $items ) )
+		if ( ! is_array( $items ) ) {
 			continue;
+		}
 		foreach ( $items as $item ) {
-			if ( $post->ID == $item->object_id )
+			if ( $post->ID == $item->object_id ) {
 				continue 2;
+			}
 		}
 		wp_update_nav_menu_item( $menu_id, 0, $args );
 	}
diff --git a/wp-includes/option.php b/wp-includes/option.php
index 4576e8f66b..265b0bdbe0 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -31,8 +31,9 @@ function get_option( $option, $default = false ) {
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
+	if ( empty( $option ) ) {
 		return false;
+	}
 
 	/**
 	 * Filters the value of an existing option before it is retrieved.
@@ -46,7 +47,6 @@ function get_option( $option, $default = false ) {
 	 * @since 4.4.0 The `$option` parameter was added.
 	 * @since 4.9.0 The `$default` parameter was added.
 	 *
-	 *
 	 * @param bool|mixed $pre_option The value to return instead of the option value. This differs from
 	 *                               `$default`, which is used as the fallback value in the event the option
 	 *                               doesn't exist elsewhere in get_option(). Default false (to skip past the
@@ -57,11 +57,13 @@ function get_option( $option, $default = false ) {
 	 */
 	$pre = apply_filters( "pre_option_{$option}", false, $option, $default );
 
-	if ( false !== $pre )
+	if ( false !== $pre ) {
 		return $pre;
+	}
 
-	if ( defined( 'WP_SETUP_CONFIG' ) )
+	if ( defined( 'WP_SETUP_CONFIG' ) ) {
 		return false;
+	}
 
 	// Distinguish between `false` as a default, and not passing one.
 	$passed_default = func_num_args() > 1;
@@ -89,8 +91,8 @@ function get_option( $option, $default = false ) {
 
 		$alloptions = wp_load_alloptions();
 
-		if ( isset( $alloptions[$option] ) ) {
-			$value = $alloptions[$option];
+		if ( isset( $alloptions[ $option ] ) ) {
+			$value = $alloptions[ $option ];
 		} else {
 			$value = wp_cache_get( $option, 'options' );
 
@@ -105,7 +107,7 @@ function get_option( $option, $default = false ) {
 					if ( ! is_array( $notoptions ) ) {
 						$notoptions = array();
 					}
-					$notoptions[$option] = true;
+					$notoptions[ $option ] = true;
 					wp_cache_set( 'notoptions', $notoptions, 'options' );
 
 					/** This filter is documented in wp-includes/option.php */
@@ -115,7 +117,7 @@ function get_option( $option, $default = false ) {
 		}
 	} else {
 		$suppress = $wpdb->suppress_errors();
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
+		$row      = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
 		$wpdb->suppress_errors( $suppress );
 		if ( is_object( $row ) ) {
 			$value = $row->option_value;
@@ -126,11 +128,13 @@ function get_option( $option, $default = false ) {
 	}
 
 	// If home is not set use siteurl.
-	if ( 'home' == $option && '' == $value )
+	if ( 'home' == $option && '' == $value ) {
 		return get_option( 'siteurl' );
+	}
 
-	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
+	if ( in_array( $option, array( 'siteurl', 'home', 'category_base', 'tag_base' ) ) ) {
 		$value = untrailingslashit( $value );
+	}
 
 	/**
 	 * Filters the value of an existing option.
@@ -159,8 +163,9 @@ function get_option( $option, $default = false ) {
  * @param string $option Option name.
  */
 function wp_protect_special_option( $option ) {
-	if ( 'alloptions' === $option || 'notoptions' === $option )
+	if ( 'alloptions' === $option || 'notoptions' === $option ) {
 		wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
+	}
 }
 
 /**
@@ -201,7 +206,7 @@ function wp_load_alloptions() {
 
 		$alloptions = array();
 		foreach ( (array) $alloptions_db as $o ) {
-			$alloptions[$o->option_name] = $o->option_value;
+			$alloptions[ $o->option_name ] = $o->option_value;
 		}
 
 		if ( ! wp_installing() || ! is_multisite() ) {
@@ -239,20 +244,22 @@ function wp_load_alloptions() {
 function wp_load_core_site_options( $network_id = null ) {
 	global $wpdb;
 
-	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
+	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() ) {
 		return;
+	}
 
-	if ( empty($network_id) )
+	if ( empty( $network_id ) ) {
 		$network_id = get_current_network_id();
+	}
 
-	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
+	$core_options = array( 'site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
 
-	$core_options_in = "'" . implode("', '", $core_options) . "'";
-	$options = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $network_id ) );
+	$core_options_in = "'" . implode( "', '", $core_options ) . "'";
+	$options         = $wpdb->get_results( $wpdb->prepare( "SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $network_id ) );
 
 	foreach ( $options as $option ) {
-		$key = $option->meta_key;
-		$cache_key = "{$network_id}:$key";
+		$key                = $option->meta_key;
+		$cache_key          = "{$network_id}:$key";
 		$option->meta_value = maybe_unserialize( $option->meta_value );
 
 		wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
@@ -285,16 +292,18 @@ function wp_load_core_site_options( $network_id = null ) {
 function update_option( $option, $value, $autoload = null ) {
 	global $wpdb;
 
-	$option = trim($option);
-	if ( empty($option) )
+	$option = trim( $option );
+	if ( empty( $option ) ) {
 		return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object( $value ) )
+	if ( is_object( $value ) ) {
 		$value = clone $value;
+	}
 
-	$value = sanitize_option( $option, $value );
+	$value     = sanitize_option( $option, $value );
 	$old_value = get_option( $option );
 
 	/**
@@ -367,18 +376,19 @@ function update_option( $option, $value, $autoload = null ) {
 	}
 
 	$result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-	if ( ! $result )
+	if ( ! $result ) {
 		return false;
+	}
 
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
+	if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
+		unset( $notoptions[ $option ] );
 		wp_cache_set( 'notoptions', $notoptions, 'options' );
 	}
 
 	if ( ! wp_installing() ) {
 		$alloptions = wp_load_alloptions();
-		if ( isset( $alloptions[$option] ) ) {
+		if ( isset( $alloptions[ $option ] ) ) {
 			$alloptions[ $option ] = $serialized_value;
 			wp_cache_set( 'alloptions', $alloptions, 'options' );
 		} else {
@@ -439,29 +449,34 @@ function update_option( $option, $value, $autoload = null ) {
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.3.0' );
+	}
 
-	$option = trim($option);
-	if ( empty($option) )
+	$option = trim( $option );
+	if ( empty( $option ) ) {
 		return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object($value) )
+	if ( is_object( $value ) ) {
 		$value = clone $value;
+	}
 
 	$value = sanitize_option( $option, $value );
 
 	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
+	if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {
 		/** This filter is documented in wp-includes/option.php */
-		if ( apply_filters( "default_option_{$option}", false, $option, false ) !== get_option( $option ) )
+		if ( apply_filters( "default_option_{$option}", false, $option, false ) !== get_option( $option ) ) {
 			return false;
+		}
+	}
 
 	$serialized_value = maybe_serialize( $value );
-	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
+	$autoload         = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
 
 	/**
 	 * Fires before an option is added.
@@ -474,12 +489,13 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
 	do_action( 'add_option', $option, $value );
 
 	$result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
-	if ( ! $result )
+	if ( ! $result ) {
 		return false;
+	}
 
 	if ( ! wp_installing() ) {
 		if ( 'yes' == $autoload ) {
-			$alloptions = wp_load_alloptions();
+			$alloptions            = wp_load_alloptions();
 			$alloptions[ $option ] = $serialized_value;
 			wp_cache_set( 'alloptions', $alloptions, 'options' );
 		} else {
@@ -489,8 +505,8 @@ function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' )
 
 	// This option exists now
 	$notoptions = wp_cache_get( 'notoptions', 'options' ); // yes, again... we need it to be fresh
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
+	if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
+		unset( $notoptions[ $option ] );
 		wp_cache_set( 'notoptions', $notoptions, 'options' );
 	}
 
@@ -533,15 +549,17 @@ function delete_option( $option ) {
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
+	if ( empty( $option ) ) {
 		return false;
+	}
 
 	wp_protect_special_option( $option );
 
 	// Get the ID, if no ID then return
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
-	if ( is_null( $row ) )
+	if ( is_null( $row ) ) {
 		return false;
+	}
 
 	/**
 	 * Fires immediately before an option is deleted.
@@ -556,8 +574,8 @@ function delete_option( $option ) {
 	if ( ! wp_installing() ) {
 		if ( 'yes' == $row->autoload ) {
 			$alloptions = wp_load_alloptions();
-			if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) {
-				unset( $alloptions[$option] );
+			if ( is_array( $alloptions ) && isset( $alloptions[ $option ] ) ) {
+				unset( $alloptions[ $option ] );
 				wp_cache_set( 'alloptions', $alloptions, 'options' );
 			}
 		} else {
@@ -615,10 +633,11 @@ function delete_transient( $transient ) {
 		$result = wp_cache_delete( $transient, 'transient' );
 	} else {
 		$option_timeout = '_transient_timeout_' . $transient;
-		$option = '_transient_' . $transient;
-		$result = delete_option( $option );
-		if ( $result )
+		$option         = '_transient_' . $transient;
+		$result         = delete_option( $option );
+		if ( $result ) {
 			delete_option( $option_timeout );
+		}
 	}
 
 	if ( $result ) {
@@ -666,8 +685,9 @@ function get_transient( $transient ) {
 	 * @param string $transient     Transient name.
 	 */
 	$pre = apply_filters( "pre_transient_{$transient}", false, $transient );
-	if ( false !== $pre )
+	if ( false !== $pre ) {
 		return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'transient' );
@@ -676,19 +696,20 @@ function get_transient( $transient ) {
 		if ( ! wp_installing() ) {
 			// If option is not in alloptions, it is not autoloaded and thus has a timeout
 			$alloptions = wp_load_alloptions();
-			if ( !isset( $alloptions[$transient_option] ) ) {
+			if ( ! isset( $alloptions[ $transient_option ] ) ) {
 				$transient_timeout = '_transient_timeout_' . $transient;
-				$timeout = get_option( $transient_timeout );
+				$timeout           = get_option( $transient_timeout );
 				if ( false !== $timeout && $timeout < time() ) {
-					delete_option( $transient_option  );
+					delete_option( $transient_option );
 					delete_option( $transient_timeout );
 					$value = false;
 				}
 			}
 		}
 
-		if ( ! isset( $value ) )
+		if ( ! isset( $value ) ) {
 			$value = get_option( $transient_option );
+		}
 	}
 
 	/**
@@ -756,7 +777,7 @@ function set_transient( $transient, $value, $expiration = 0 ) {
 		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
 	} else {
 		$transient_timeout = '_transient_timeout_' . $transient;
-		$transient_option = '_transient_' . $transient;
+		$transient_option  = '_transient_' . $transient;
 		if ( false === get_option( $transient_option ) ) {
 			$autoload = 'yes';
 			if ( $expiration ) {
@@ -833,41 +854,47 @@ function delete_expired_transients( $force_db = false ) {
 		return;
 	}
 
-	$wpdb->query( $wpdb->prepare(
-		"DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
+	$wpdb->query(
+		$wpdb->prepare(
+			"DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
 			WHERE a.option_name LIKE %s
 			AND a.option_name NOT LIKE %s
 			AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
 			AND b.option_value < %d",
-		$wpdb->esc_like( '_transient_' ) . '%',
-		$wpdb->esc_like( '_transient_timeout_' ) . '%',
-		time()
-	) );
+			$wpdb->esc_like( '_transient_' ) . '%',
+			$wpdb->esc_like( '_transient_timeout_' ) . '%',
+			time()
+		)
+	);
 
 	if ( ! is_multisite() ) {
 		// non-Multisite stores site transients in the options table.
-		$wpdb->query( $wpdb->prepare(
-			"DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
+		$wpdb->query(
+			$wpdb->prepare(
+				"DELETE a, b FROM {$wpdb->options} a, {$wpdb->options} b
 				WHERE a.option_name LIKE %s
 				AND a.option_name NOT LIKE %s
 				AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
 				AND b.option_value < %d",
-			$wpdb->esc_like( '_site_transient_' ) . '%',
-			$wpdb->esc_like( '_site_transient_timeout_' ) . '%',
-			time()
-		) );
+				$wpdb->esc_like( '_site_transient_' ) . '%',
+				$wpdb->esc_like( '_site_transient_timeout_' ) . '%',
+				time()
+			)
+		);
 	} elseif ( is_multisite() && is_main_site() && is_main_network() ) {
 		// Multisite stores site transients in the sitemeta table.
-		$wpdb->query( $wpdb->prepare(
-			"DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
+		$wpdb->query(
+			$wpdb->prepare(
+				"DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
 				WHERE a.meta_key LIKE %s
 				AND a.meta_key NOT LIKE %s
 				AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
 				AND b.meta_value < %d",
-			$wpdb->esc_like( '_site_transient_' ) . '%',
-			$wpdb->esc_like( '_site_transient_timeout_' ) . '%',
-			time()
-		) );
+				$wpdb->esc_like( '_site_transient_' ) . '%',
+				$wpdb->esc_like( '_site_transient_timeout_' ) . '%',
+				time()
+			)
+		);
 	}
 }
 
@@ -896,15 +923,16 @@ function wp_user_settings() {
 
 	$settings = (string) get_user_option( 'user-settings', $user_id );
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if ( isset( $_COOKIE[ 'wp-settings-' . $user_id ] ) ) {
+		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE[ 'wp-settings-' . $user_id ] );
 
 		// No change or both empty
-		if ( $cookie == $settings )
+		if ( $cookie == $settings ) {
 			return;
+		}
 
 		$last_saved = (int) get_user_option( 'user-settings-time', $user_id );
-		$current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
+		$current    = isset( $_COOKIE[ 'wp-settings-time-' . $user_id ] ) ? preg_replace( '/[^0-9]/', '', $_COOKIE[ 'wp-settings-time-' . $user_id ] ) : 0;
 
 		// The cookie is newer than the saved value. Update the user_option and leave the cookie as-is
 		if ( $current > $last_saved ) {
@@ -918,7 +946,7 @@ function wp_user_settings() {
 	$secure = ( 'https' === parse_url( admin_url(), PHP_URL_SCHEME ) );
 	setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
 	setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
-	$_COOKIE['wp-settings-' . $user_id] = $settings;
+	$_COOKIE[ 'wp-settings-' . $user_id ] = $settings;
 }
 
 /**
@@ -933,7 +961,7 @@ function wp_user_settings() {
 function get_user_setting( $name, $default = false ) {
 	$all_user_settings = get_all_user_settings();
 
-	return isset( $all_user_settings[$name] ) ? $all_user_settings[$name] : $default;
+	return isset( $all_user_settings[ $name ] ) ? $all_user_settings[ $name ] : $default;
 }
 
 /**
@@ -954,8 +982,8 @@ function set_user_setting( $name, $value ) {
 		return false;
 	}
 
-	$all_user_settings = get_all_user_settings();
-	$all_user_settings[$name] = $value;
+	$all_user_settings          = get_all_user_settings();
+	$all_user_settings[ $name ] = $value;
 
 	return wp_set_all_user_settings( $all_user_settings );
 }
@@ -978,12 +1006,12 @@ function delete_user_setting( $names ) {
 	}
 
 	$all_user_settings = get_all_user_settings();
-	$names = (array) $names;
-	$deleted = false;
+	$names             = (array) $names;
+	$deleted           = false;
 
 	foreach ( $names as $name ) {
-		if ( isset( $all_user_settings[$name] ) ) {
-			unset( $all_user_settings[$name] );
+		if ( isset( $all_user_settings[ $name ] ) ) {
+			unset( $all_user_settings[ $name ] );
 			$deleted = true;
 		}
 	}
@@ -1017,8 +1045,8 @@ function get_all_user_settings() {
 
 	$user_settings = array();
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_-]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if ( isset( $_COOKIE[ 'wp-settings-' . $user_id ] ) ) {
+		$cookie = preg_replace( '/[^A-Za-z0-9=&_-]/', '', $_COOKIE[ 'wp-settings-' . $user_id ] );
 
 		if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char
 			parse_str( $cookie, $user_settings );
@@ -1060,7 +1088,7 @@ function wp_set_all_user_settings( $user_settings ) {
 
 	$settings = '';
 	foreach ( $user_settings as $name => $value ) {
-		$_name = preg_replace( '/[^A-Za-z0-9_-]+/', '', $name );
+		$_name  = preg_replace( '/[^A-Za-z0-9_-]+/', '', $name );
 		$_value = preg_replace( '/[^A-Za-z0-9_-]+/', '', $value );
 
 		if ( ! empty( $_name ) ) {
@@ -1217,7 +1245,7 @@ function get_network_option( $network_id, $option, $default = false ) {
 
 	// prevent non-existent options from triggering multiple queries
 	$notoptions_key = "$network_id:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
+	$notoptions     = wp_cache_get( $notoptions_key, 'site-options' );
 
 	if ( isset( $notoptions[ $option ] ) ) {
 
@@ -1241,10 +1269,10 @@ function get_network_option( $network_id, $option, $default = false ) {
 	if ( ! is_multisite() ) {
 		/** This filter is documented in wp-includes/option.php */
 		$default = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
-		$value = get_option( $option, $default );
+		$value   = get_option( $option, $default );
 	} else {
 		$cache_key = "$network_id:$option";
-		$value = wp_cache_get( $cache_key, 'site-options' );
+		$value     = wp_cache_get( $cache_key, 'site-options' );
 
 		if ( ! isset( $value ) || false === $value ) {
 			$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
@@ -1350,7 +1378,13 @@ function add_network_option( $network_id, $option, $value ) {
 		$value = sanitize_option( $option, $value );
 
 		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->insert( $wpdb->sitemeta, array( 'site_id'    => $network_id, 'meta_key'   => $option, 'meta_value' => $serialized_value ) );
+		$result           = $wpdb->insert(
+			$wpdb->sitemeta, array(
+				'site_id'    => $network_id,
+				'meta_key'   => $option,
+				'meta_value' => $serialized_value,
+			)
+		);
 
 		if ( ! $result ) {
 			return false;
@@ -1452,7 +1486,12 @@ function delete_network_option( $network_id, $option ) {
 		$cache_key = "$network_id:$option";
 		wp_cache_delete( $cache_key, 'site-options' );
 
-		$result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $network_id ) );
+		$result = $wpdb->delete(
+			$wpdb->sitemeta, array(
+				'meta_key' => $option,
+				'site_id'  => $network_id,
+			)
+		);
 	}
 
 	if ( $result ) {
@@ -1546,7 +1585,7 @@ function update_network_option( $network_id, $option, $value ) {
 	}
 
 	$notoptions_key = "$network_id:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
+	$notoptions     = wp_cache_get( $notoptions_key, 'site-options' );
 	if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
 		unset( $notoptions[ $option ] );
 		wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
@@ -1558,7 +1597,12 @@ function update_network_option( $network_id, $option, $value ) {
 		$value = sanitize_option( $option, $value );
 
 		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) );
+		$result           = $wpdb->update(
+			$wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array(
+				'site_id'  => $network_id,
+				'meta_key' => $option,
+			)
+		);
 
 		if ( $result ) {
 			$cache_key = "$network_id:$option";
@@ -1628,10 +1672,11 @@ function delete_site_transient( $transient ) {
 		$result = wp_cache_delete( $transient, 'site-transient' );
 	} else {
 		$option_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
-		$result = delete_site_option( $option );
-		if ( $result )
+		$option         = '_site_transient_' . $transient;
+		$result         = delete_site_option( $option );
+		if ( $result ) {
 			delete_site_option( $option_timeout );
+		}
 	}
 	if ( $result ) {
 
@@ -1681,27 +1726,29 @@ function get_site_transient( $transient ) {
 	 */
 	$pre = apply_filters( "pre_site_transient_{$transient}", false, $transient );
 
-	if ( false !== $pre )
+	if ( false !== $pre ) {
 		return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'site-transient' );
 	} else {
 		// Core transients that do not have a timeout. Listed here so querying timeouts can be avoided.
-		$no_timeout = array('update_core', 'update_plugins', 'update_themes');
+		$no_timeout       = array( 'update_core', 'update_plugins', 'update_themes' );
 		$transient_option = '_site_transient_' . $transient;
 		if ( ! in_array( $transient, $no_timeout ) ) {
 			$transient_timeout = '_site_transient_timeout_' . $transient;
-			$timeout = get_site_option( $transient_timeout );
+			$timeout           = get_site_option( $transient_timeout );
 			if ( false !== $timeout && $timeout < time() ) {
-				delete_site_option( $transient_option  );
+				delete_site_option( $transient_option );
 				delete_site_option( $transient_timeout );
 				$value = false;
 			}
 		}
 
-		if ( ! isset( $value ) )
+		if ( ! isset( $value ) ) {
 			$value = get_site_option( $transient_option );
+		}
 	}
 
 	/**
@@ -1768,14 +1815,16 @@ function set_site_transient( $transient, $value, $expiration = 0 ) {
 		$result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
 	} else {
 		$transient_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
+		$option            = '_site_transient_' . $transient;
 		if ( false === get_site_option( $option ) ) {
-			if ( $expiration )
+			if ( $expiration ) {
 				add_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = add_site_option( $option, $value );
 		} else {
-			if ( $expiration )
+			if ( $expiration ) {
 				update_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = update_site_option( $option, $value );
 		}
 	}
@@ -1818,128 +1867,158 @@ function set_site_transient( $transient, $value, $expiration = 0 ) {
  * @since 4.7.0
  */
 function register_initial_settings() {
-	register_setting( 'general', 'blogname', array(
-		'show_in_rest' => array(
-			'name' => 'title',
-		),
-		'type'         => 'string',
-		'description'  => __( 'Site title.' ),
-	) );
-
-	register_setting( 'general', 'blogdescription', array(
-		'show_in_rest' => array(
-			'name' => 'description',
-		),
-		'type'         => 'string',
-		'description'  => __( 'Site tagline.' ),
-	) );
-
-	if ( ! is_multisite() ) {
-		register_setting( 'general', 'siteurl', array(
+	register_setting(
+		'general', 'blogname', array(
 			'show_in_rest' => array(
-				'name'    => 'url',
-				'schema'  => array(
-					'format' => 'uri',
-				),
+				'name' => 'title',
 			),
 			'type'         => 'string',
-			'description'  => __( 'Site URL.' ),
-		) );
+			'description'  => __( 'Site title.' ),
+		)
+	);
+
+	register_setting(
+		'general', 'blogdescription', array(
+			'show_in_rest' => array(
+				'name' => 'description',
+			),
+			'type'         => 'string',
+			'description'  => __( 'Site tagline.' ),
+		)
+	);
+
+	if ( ! is_multisite() ) {
+		register_setting(
+			'general', 'siteurl', array(
+				'show_in_rest' => array(
+					'name'   => 'url',
+					'schema' => array(
+						'format' => 'uri',
+					),
+				),
+				'type'         => 'string',
+				'description'  => __( 'Site URL.' ),
+			)
+		);
 	}
 
 	if ( ! is_multisite() ) {
-		register_setting( 'general', 'admin_email', array(
+		register_setting(
+			'general', 'admin_email', array(
+				'show_in_rest' => array(
+					'name'   => 'email',
+					'schema' => array(
+						'format' => 'email',
+					),
+				),
+				'type'         => 'string',
+				'description'  => __( 'This address is used for admin purposes, like new user notification.' ),
+			)
+		);
+	}
+
+	register_setting(
+		'general', 'timezone_string', array(
 			'show_in_rest' => array(
-				'name'    => 'email',
-				'schema'  => array(
-					'format' => 'email',
+				'name' => 'timezone',
+			),
+			'type'         => 'string',
+			'description'  => __( 'A city in the same timezone as you.' ),
+		)
+	);
+
+	register_setting(
+		'general', 'date_format', array(
+			'show_in_rest' => true,
+			'type'         => 'string',
+			'description'  => __( 'A date format for all date strings.' ),
+		)
+	);
+
+	register_setting(
+		'general', 'time_format', array(
+			'show_in_rest' => true,
+			'type'         => 'string',
+			'description'  => __( 'A time format for all time strings.' ),
+		)
+	);
+
+	register_setting(
+		'general', 'start_of_week', array(
+			'show_in_rest' => true,
+			'type'         => 'integer',
+			'description'  => __( 'A day number of the week that the week should start on.' ),
+		)
+	);
+
+	register_setting(
+		'general', 'WPLANG', array(
+			'show_in_rest' => array(
+				'name' => 'language',
+			),
+			'type'         => 'string',
+			'description'  => __( 'WordPress locale code.' ),
+			'default'      => 'en_US',
+		)
+	);
+
+	register_setting(
+		'writing', 'use_smilies', array(
+			'show_in_rest' => true,
+			'type'         => 'boolean',
+			'description'  => __( 'Convert emoticons like :-) and :-P to graphics on display.' ),
+			'default'      => true,
+		)
+	);
+
+	register_setting(
+		'writing', 'default_category', array(
+			'show_in_rest' => true,
+			'type'         => 'integer',
+			'description'  => __( 'Default post category.' ),
+		)
+	);
+
+	register_setting(
+		'writing', 'default_post_format', array(
+			'show_in_rest' => true,
+			'type'         => 'string',
+			'description'  => __( 'Default post format.' ),
+		)
+	);
+
+	register_setting(
+		'reading', 'posts_per_page', array(
+			'show_in_rest' => true,
+			'type'         => 'integer',
+			'description'  => __( 'Blog pages show at most.' ),
+			'default'      => 10,
+		)
+	);
+
+	register_setting(
+		'discussion', 'default_ping_status', array(
+			'show_in_rest' => array(
+				'schema' => array(
+					'enum' => array( 'open', 'closed' ),
 				),
 			),
 			'type'         => 'string',
-			'description'  => __( 'This address is used for admin purposes, like new user notification.' ),
-		) );
-	}
+			'description'  => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles.' ),
+		)
+	);
 
-	register_setting( 'general', 'timezone_string', array(
-		'show_in_rest' => array(
-			'name' => 'timezone',
-		),
-		'type'         => 'string',
-		'description'  => __( 'A city in the same timezone as you.' ),
-	) );
-
-	register_setting( 'general', 'date_format', array(
-		'show_in_rest' => true,
-		'type'         => 'string',
-		'description'  => __( 'A date format for all date strings.' ),
-	) );
-
-	register_setting( 'general', 'time_format', array(
-		'show_in_rest' => true,
-		'type'         => 'string',
-		'description'  => __( 'A time format for all time strings.' ),
-	) );
-
-	register_setting( 'general', 'start_of_week', array(
-		'show_in_rest' => true,
-		'type'         => 'integer',
-		'description'  => __( 'A day number of the week that the week should start on.' ),
-	) );
-
-	register_setting( 'general', 'WPLANG', array(
-		'show_in_rest' => array(
-			'name' => 'language',
-		),
-		'type'         => 'string',
-		'description'  => __( 'WordPress locale code.' ),
-		'default'      => 'en_US',
-	) );
-
-	register_setting( 'writing', 'use_smilies', array(
-		'show_in_rest' => true,
-		'type'         => 'boolean',
-		'description'  => __( 'Convert emoticons like :-) and :-P to graphics on display.' ),
-		'default'      => true,
-	) );
-
-	register_setting( 'writing', 'default_category', array(
-		'show_in_rest' => true,
-		'type'         => 'integer',
-		'description'  => __( 'Default post category.' ),
-	) );
-
-	register_setting( 'writing', 'default_post_format', array(
-		'show_in_rest' => true,
-		'type'         => 'string',
-		'description'  => __( 'Default post format.' ),
-	) );
-
-	register_setting( 'reading', 'posts_per_page', array(
-		'show_in_rest' => true,
-		'type'         => 'integer',
-		'description'  => __( 'Blog pages show at most.' ),
-		'default'      => 10,
-	) );
-
-	register_setting( 'discussion', 'default_ping_status', array(
-		'show_in_rest' => array(
-			'schema'   => array(
-				'enum' => array( 'open', 'closed' ),
+	register_setting(
+		'discussion', 'default_comment_status', array(
+			'show_in_rest' => array(
+				'schema' => array(
+					'enum' => array( 'open', 'closed' ),
+				),
 			),
-		),
-		'type'         => 'string',
-		'description'  => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles.' ),
-	) );
-
-	register_setting( 'discussion', 'default_comment_status', array(
-		'show_in_rest' => array(
-			'schema'   => array(
-				'enum' => array( 'open', 'closed' ),
-			),
-		),
-		'type'         => 'string',
-		'description'  => __( 'Allow people to post comments on new articles.' ),
-	) );
+			'type'         => 'string',
+			'description'  => __( 'Allow people to post comments on new articles.' ),
+		)
+	);
 
 }
 
@@ -1953,7 +2032,7 @@ function register_initial_settings() {
  * @global array $wp_registered_settings
  *
  * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
- * 	Default whitelisted option key names include "general," "discussion," and "reading," among others.
+ *  Default whitelisted option key names include "general," "discussion," and "reading," among others.
  * @param string $option_name The name of an option to sanitize and save.
  * @param array  $args {
  *     Data used to describe the setting when registered.
@@ -2002,9 +2081,11 @@ function register_setting( $option_group, $option_name, $args = array() ) {
 	}
 
 	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'misc'
 			)
 		);
@@ -2012,9 +2093,11 @@ function register_setting( $option_group, $option_name, $args = array() ) {
 	}
 
 	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'privacy'
 			)
 		);
@@ -2048,9 +2131,11 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
 	global $new_whitelist_options, $wp_registered_settings;
 
 	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'misc'
 			)
 		);
@@ -2058,9 +2143,11 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
 	}
 
 	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+		_deprecated_argument(
+			__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(
+				__( 'The "%s" options group has been removed. Use another settings group.' ),
 				'privacy'
 			)
 		);
@@ -2072,9 +2159,11 @@ function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
 		unset( $new_whitelist_options[ $option_group ][ $pos ] );
 	}
 	if ( '' !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '4.7.0',
+		_deprecated_argument(
+			__FUNCTION__, '4.7.0',
 			/* translators: 1: $sanitize_callback, 2: register_setting() */
-			sprintf( __( '%1$s is deprecated. The callback from %2$s is used instead.' ),
+			sprintf(
+				__( '%1$s is deprecated. The callback from %2$s is used instead.' ),
 				'<code>$sanitize_callback</code>',
 				'<code>register_setting()</code>'
 			)
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 294b3e4763..28c3e43a46 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -6,1037 +6,1016 @@
  * @package WordPress
  */
 
-if ( !function_exists('wp_set_current_user') ) :
-/**
- * Changes the current user by ID or name.
- *
- * Set $id to null and specify a name if you do not know a user's ID.
- *
- * Some WordPress functionality is based on the current user and not based on
- * the signed in user. Therefore, it opens the ability to edit and perform
- * actions on users who aren't signed in.
- *
- * @since 2.0.3
- * @global WP_User $current_user The current user object which holds the user data.
- *
- * @param int    $id   User ID
- * @param string $name User's username
- * @return WP_User Current user User object
- */
-function wp_set_current_user($id, $name = '') {
-	global $current_user;
+if ( ! function_exists( 'wp_set_current_user' ) ) :
+	/**
+	 * Changes the current user by ID or name.
+	 *
+	 * Set $id to null and specify a name if you do not know a user's ID.
+	 *
+	 * Some WordPress functionality is based on the current user and not based on
+	 * the signed in user. Therefore, it opens the ability to edit and perform
+	 * actions on users who aren't signed in.
+	 *
+	 * @since 2.0.3
+	 * @global WP_User $current_user The current user object which holds the user data.
+	 *
+	 * @param int    $id   User ID
+	 * @param string $name User's username
+	 * @return WP_User Current user User object
+	 */
+	function wp_set_current_user( $id, $name = '' ) {
+		global $current_user;
 
-	// If `$id` matches the user who's already current, there's nothing to do.
-	if ( isset( $current_user )
+		// If `$id` matches the user who's already current, there's nothing to do.
+		if ( isset( $current_user )
 		&& ( $current_user instanceof WP_User )
 		&& ( $id == $current_user->ID )
 		&& ( null !== $id )
-	) {
+		) {
+			return $current_user;
+		}
+
+		$current_user = new WP_User( $id, $name );
+
+		setup_userdata( $current_user->ID );
+
+		/**
+		 * Fires after the current user is set.
+		 *
+		 * @since 2.0.1
+		 */
+		do_action( 'set_current_user' );
+
 		return $current_user;
 	}
-
-	$current_user = new WP_User( $id, $name );
-
-	setup_userdata( $current_user->ID );
-
-	/**
-	 * Fires after the current user is set.
-	 *
-	 * @since 2.0.1
-	 */
-	do_action( 'set_current_user' );
-
-	return $current_user;
-}
 endif;
 
-if ( !function_exists('wp_get_current_user') ) :
-/**
- * Retrieve the current user object.
- *
- * Will set the current user, if the current user is not set. The current user
- * will be set to the logged-in person. If no user is logged-in, then it will
- * set the current user to 0, which is invalid and won't have any permissions.
- *
- * @since 2.0.3
- *
- * @see _wp_get_current_user()
- * @global WP_User $current_user Checks if the current user is set.
- *
- * @return WP_User Current WP_User instance.
- */
-function wp_get_current_user() {
-	return _wp_get_current_user();
-}
+if ( ! function_exists( 'wp_get_current_user' ) ) :
+	/**
+	 * Retrieve the current user object.
+	 *
+	 * Will set the current user, if the current user is not set. The current user
+	 * will be set to the logged-in person. If no user is logged-in, then it will
+	 * set the current user to 0, which is invalid and won't have any permissions.
+	 *
+	 * @since 2.0.3
+	 *
+	 * @see _wp_get_current_user()
+	 * @global WP_User $current_user Checks if the current user is set.
+	 *
+	 * @return WP_User Current WP_User instance.
+	 */
+	function wp_get_current_user() {
+		return _wp_get_current_user();
+	}
 endif;
 
-if ( !function_exists('get_userdata') ) :
-/**
- * Retrieve user info by user ID.
- *
- * @since 0.71
- *
- * @param int $user_id User ID
- * @return WP_User|false WP_User object on success, false on failure.
- */
-function get_userdata( $user_id ) {
-	return get_user_by( 'id', $user_id );
-}
+if ( ! function_exists( 'get_userdata' ) ) :
+	/**
+	 * Retrieve user info by user ID.
+	 *
+	 * @since 0.71
+	 *
+	 * @param int $user_id User ID
+	 * @return WP_User|false WP_User object on success, false on failure.
+	 */
+	function get_userdata( $user_id ) {
+		return get_user_by( 'id', $user_id );
+	}
 endif;
 
-if ( !function_exists('get_user_by') ) :
-/**
- * Retrieve user info by a given field
- *
- * @since 2.8.0
- * @since 4.4.0 Added 'ID' as an alias of 'id' for the `$field` parameter.
- *
- * @param string     $field The field to retrieve the user with. id | ID | slug | email | login.
- * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
- * @return WP_User|false WP_User object on success, false on failure.
- */
-function get_user_by( $field, $value ) {
-	$userdata = WP_User::get_data_by( $field, $value );
-
-	if ( !$userdata )
-		return false;
-
-	$user = new WP_User;
-	$user->init( $userdata );
-
-	return $user;
-}
-endif;
-
-if ( !function_exists('cache_users') ) :
-/**
- * Retrieve info for user lists to prevent multiple queries by get_userdata()
- *
- * @since 3.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param array $user_ids User ID numbers list
- */
-function cache_users( $user_ids ) {
-	global $wpdb;
-
-	$clean = _get_non_cached_ids( $user_ids, 'users' );
-
-	if ( empty( $clean ) )
-		return;
-
-	$list = implode( ',', $clean );
-
-	$users = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($list)" );
-
-	$ids = array();
-	foreach ( $users as $user ) {
-		update_user_caches( $user );
-		$ids[] = $user->ID;
-	}
-	update_meta_cache( 'user', $ids );
-}
-endif;
-
-if ( !function_exists( 'wp_mail' ) ) :
-/**
- * Send mail, similar to PHP's mail
- *
- * A true return value does not automatically mean that the user received the
- * email successfully. It just only means that the method used was able to
- * process the request without any errors.
- *
- * Using the two 'wp_mail_from' and 'wp_mail_from_name' hooks allow from
- * creating a from address like 'Name <email@address.com>' when both are set. If
- * just 'wp_mail_from' is set, then just the email address will be used with no
- * name.
- *
- * The default content type is 'text/plain' which does not allow using HTML.
- * However, you can set the content type of the email by using the
- * {@see 'wp_mail_content_type'} filter.
- *
- * The default charset is based on the charset used on the blog. The charset can
- * be set using the {@see 'wp_mail_charset'} filter.
- *
- * @since 1.2.1
- *
- * @global PHPMailer $phpmailer
- *
- * @param string|array $to          Array or comma-separated list of email addresses to send message.
- * @param string       $subject     Email subject
- * @param string       $message     Message contents
- * @param string|array $headers     Optional. Additional headers.
- * @param string|array $attachments Optional. Files to attach.
- * @return bool Whether the email contents were sent successfully.
- */
-function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) {
-	// Compact the input, apply the filters, and extract them back out
-
+if ( ! function_exists( 'get_user_by' ) ) :
 	/**
-	 * Filters the wp_mail() arguments.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param array $args A compacted array of wp_mail() arguments, including the "to" email,
-	 *                    subject, message, headers, and attachments values.
-	 */
-	$atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
-
-	if ( isset( $atts['to'] ) ) {
-		$to = $atts['to'];
-	}
-
-	if ( !is_array( $to ) ) {
-		$to = explode( ',', $to );
-	}
-
-	if ( isset( $atts['subject'] ) ) {
-		$subject = $atts['subject'];
-	}
-
-	if ( isset( $atts['message'] ) ) {
-		$message = $atts['message'];
-	}
-
-	if ( isset( $atts['headers'] ) ) {
-		$headers = $atts['headers'];
-	}
-
-	if ( isset( $atts['attachments'] ) ) {
-		$attachments = $atts['attachments'];
-	}
-
-	if ( ! is_array( $attachments ) ) {
-		$attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) );
-	}
-	global $phpmailer;
-
-	// (Re)create it, if it's gone missing
-	if ( ! ( $phpmailer instanceof PHPMailer ) ) {
-		require_once ABSPATH . WPINC . '/class-phpmailer.php';
-		require_once ABSPATH . WPINC . '/class-smtp.php';
-		$phpmailer = new PHPMailer( true );
-	}
-
-	// Headers
-	$cc = $bcc = $reply_to = array();
-
-	if ( empty( $headers ) ) {
-		$headers = array();
-	} else {
-		if ( !is_array( $headers ) ) {
-			// Explode the headers out, so this function can take both
-			// string headers and an array of headers.
-			$tempheaders = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
-		} else {
-			$tempheaders = $headers;
-		}
-		$headers = array();
-
-		// If it's actually got contents
-		if ( !empty( $tempheaders ) ) {
-			// Iterate through the raw headers
-			foreach ( (array) $tempheaders as $header ) {
-				if ( strpos($header, ':') === false ) {
-					if ( false !== stripos( $header, 'boundary=' ) ) {
-						$parts = preg_split('/boundary=/i', trim( $header ) );
-						$boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
-					}
-					continue;
-				}
-				// Explode them out
-				list( $name, $content ) = explode( ':', trim( $header ), 2 );
-
-				// Cleanup crew
-				$name    = trim( $name    );
-				$content = trim( $content );
-
-				switch ( strtolower( $name ) ) {
-					// Mainly for legacy -- process a From: header if it's there
-					case 'from':
-						$bracket_pos = strpos( $content, '<' );
-						if ( $bracket_pos !== false ) {
-							// Text before the bracketed email is the "From" name.
-							if ( $bracket_pos > 0 ) {
-								$from_name = substr( $content, 0, $bracket_pos - 1 );
-								$from_name = str_replace( '"', '', $from_name );
-								$from_name = trim( $from_name );
-							}
-
-							$from_email = substr( $content, $bracket_pos + 1 );
-							$from_email = str_replace( '>', '', $from_email );
-							$from_email = trim( $from_email );
-
-						// Avoid setting an empty $from_email.
-						} elseif ( '' !== trim( $content ) ) {
-							$from_email = trim( $content );
-						}
-						break;
-					case 'content-type':
-						if ( strpos( $content, ';' ) !== false ) {
-							list( $type, $charset_content ) = explode( ';', $content );
-							$content_type = trim( $type );
-							if ( false !== stripos( $charset_content, 'charset=' ) ) {
-								$charset = trim( str_replace( array( 'charset=', '"' ), '', $charset_content ) );
-							} elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {
-								$boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );
-								$charset = '';
-							}
-
-						// Avoid setting an empty $content_type.
-						} elseif ( '' !== trim( $content ) ) {
-							$content_type = trim( $content );
-						}
-						break;
-					case 'cc':
-						$cc = array_merge( (array) $cc, explode( ',', $content ) );
-						break;
-					case 'bcc':
-						$bcc = array_merge( (array) $bcc, explode( ',', $content ) );
-						break;
-					case 'reply-to':
-						$reply_to = array_merge( (array) $reply_to, explode( ',', $content ) );
-						break;
-					default:
-						// Add it to our grand headers array
-						$headers[trim( $name )] = trim( $content );
-						break;
-				}
-			}
-		}
-	}
-
-	// Empty out the values that may be set
-	$phpmailer->clearAllRecipients();
-	$phpmailer->clearAttachments();
-	$phpmailer->clearCustomHeaders();
-	$phpmailer->clearReplyTos();
-
-	// From email and name
-	// If we don't have a name from the input headers
-	if ( !isset( $from_name ) )
-		$from_name = 'WordPress';
-
-	/* If we don't have an email from the input headers default to wordpress@$sitename
-	 * Some hosts will block outgoing mail from this address if it doesn't exist but
-	 * there's no easy alternative. Defaulting to admin_email might appear to be another
-	 * option but some hosts may refuse to relay mail from an unknown domain. See
-	 * https://core.trac.wordpress.org/ticket/5007.
-	 */
-
-	if ( !isset( $from_email ) ) {
-		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
-		}
-
-		$from_email = 'wordpress@' . $sitename;
-	}
-
-	/**
-	 * Filters the email address to send from.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param string $from_email Email address to send from.
-	 */
-	$from_email = apply_filters( 'wp_mail_from', $from_email );
-
-	/**
-	 * Filters the name to associate with the "from" email address.
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param string $from_name Name associated with the "from" email address.
-	 */
-	$from_name = apply_filters( 'wp_mail_from_name', $from_name );
-
-	try {
-		$phpmailer->setFrom( $from_email, $from_name, false );
-	} catch ( phpmailerException $e ) {
-		$mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
-		$mail_error_data['phpmailer_exception_code'] = $e->getCode();
-
-		/** This filter is documented in wp-includes/pluggable.php */
-		do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
-
-		return false;
-	}
-
-	// Set mail's subject and body
-	$phpmailer->Subject = $subject;
-	$phpmailer->Body    = $message;
-
-	// Set destination addresses, using appropriate methods for handling addresses
-	$address_headers = compact( 'to', 'cc', 'bcc', 'reply_to' );
-
-	foreach ( $address_headers as $address_header => $addresses ) {
-		if ( empty( $addresses ) ) {
-			continue;
-		}
-
-		foreach ( (array) $addresses as $address ) {
-			try {
-				// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
-				$recipient_name = '';
-
-				if ( preg_match( '/(.*)<(.+)>/', $address, $matches ) ) {
-					if ( count( $matches ) == 3 ) {
-						$recipient_name = $matches[1];
-						$address        = $matches[2];
-					}
-				}
-
-				switch ( $address_header ) {
-					case 'to':
-						$phpmailer->addAddress( $address, $recipient_name );
-						break;
-					case 'cc':
-						$phpmailer->addCc( $address, $recipient_name );
-						break;
-					case 'bcc':
-						$phpmailer->addBcc( $address, $recipient_name );
-						break;
-					case 'reply_to':
-						$phpmailer->addReplyTo( $address, $recipient_name );
-						break;
-				}
-			} catch ( phpmailerException $e ) {
-				continue;
-			}
-		}
-	}
-
-	// Set to use PHP's mail()
-	$phpmailer->isMail();
-
-	// Set Content-Type and charset
-	// If we don't have a content-type from the input headers
-	if ( !isset( $content_type ) )
-		$content_type = 'text/plain';
-
-	/**
-	 * Filters the wp_mail() content type.
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param string $content_type Default wp_mail() content type.
-	 */
-	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
-
-	$phpmailer->ContentType = $content_type;
-
-	// Set whether it's plaintext, depending on $content_type
-	if ( 'text/html' == $content_type )
-		$phpmailer->isHTML( true );
-
-	// If we don't have a charset from the input headers
-	if ( !isset( $charset ) )
-		$charset = get_bloginfo( 'charset' );
-
-	// Set the content-type and charset
-
-	/**
-	 * Filters the default wp_mail() charset.
-	 *
-	 * @since 2.3.0
-	 *
-	 * @param string $charset Default email charset.
-	 */
-	$phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
-
-	// Set custom headers
-	if ( !empty( $headers ) ) {
-		foreach ( (array) $headers as $name => $content ) {
-			$phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
-		}
-
-		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) )
-			$phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
-	}
-
-	if ( !empty( $attachments ) ) {
-		foreach ( $attachments as $attachment ) {
-			try {
-				$phpmailer->addAttachment($attachment);
-			} catch ( phpmailerException $e ) {
-				continue;
-			}
-		}
-	}
-
-	/**
-	 * Fires after PHPMailer is initialized.
-	 *
-	 * @since 2.2.0
-	 *
-	 * @param PHPMailer $phpmailer The PHPMailer instance (passed by reference).
-	 */
-	do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
-
-	// Send!
-	try {
-		return $phpmailer->send();
-	} catch ( phpmailerException $e ) {
-
-		$mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
-		$mail_error_data['phpmailer_exception_code'] = $e->getCode();
-
-		/**
-		 * Fires after a phpmailerException is caught.
-		 *
-		 * @since 4.4.0
-		 *
-		 * @param WP_Error $error A WP_Error object with the phpmailerException message, and an array
-		 *                        containing the mail recipient, subject, message, headers, and attachments.
-		 */
-		do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
-
-		return false;
-	}
-}
-endif;
-
-if ( !function_exists('wp_authenticate') ) :
-/**
- * Authenticate a user, confirming the login credentials are valid.
- *
- * @since 2.5.0
- * @since 4.5.0 `$username` now accepts an email address.
- *
- * @param string $username User's username or email address.
- * @param string $password User's password.
- * @return WP_User|WP_Error WP_User object if the credentials are valid,
- *                          otherwise WP_Error.
- */
-function wp_authenticate($username, $password) {
-	$username = sanitize_user($username);
-	$password = trim($password);
-
-	/**
-	 * Filters whether a set of user login credentials are valid.
-	 *
-	 * A WP_User object is returned if the credentials authenticate a user.
-	 * WP_Error or null otherwise.
+	 * Retrieve user info by a given field
 	 *
 	 * @since 2.8.0
+	 * @since 4.4.0 Added 'ID' as an alias of 'id' for the `$field` parameter.
+	 *
+	 * @param string     $field The field to retrieve the user with. id | ID | slug | email | login.
+	 * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
+	 * @return WP_User|false WP_User object on success, false on failure.
+	 */
+	function get_user_by( $field, $value ) {
+		$userdata = WP_User::get_data_by( $field, $value );
+
+		if ( ! $userdata ) {
+			return false;
+		}
+
+		$user = new WP_User;
+		$user->init( $userdata );
+
+		return $user;
+	}
+endif;
+
+if ( ! function_exists( 'cache_users' ) ) :
+	/**
+	 * Retrieve info for user lists to prevent multiple queries by get_userdata()
+	 *
+	 * @since 3.0.0
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param array $user_ids User ID numbers list
+	 */
+	function cache_users( $user_ids ) {
+		global $wpdb;
+
+		$clean = _get_non_cached_ids( $user_ids, 'users' );
+
+		if ( empty( $clean ) ) {
+			return;
+		}
+
+		$list = implode( ',', $clean );
+
+		$users = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($list)" );
+
+		$ids = array();
+		foreach ( $users as $user ) {
+			update_user_caches( $user );
+			$ids[] = $user->ID;
+		}
+		update_meta_cache( 'user', $ids );
+	}
+endif;
+
+if ( ! function_exists( 'wp_mail' ) ) :
+	/**
+	 * Send mail, similar to PHP's mail
+	 *
+	 * A true return value does not automatically mean that the user received the
+	 * email successfully. It just only means that the method used was able to
+	 * process the request without any errors.
+	 *
+	 * Using the two 'wp_mail_from' and 'wp_mail_from_name' hooks allow from
+	 * creating a from address like 'Name <email@address.com>' when both are set. If
+	 * just 'wp_mail_from' is set, then just the email address will be used with no
+	 * name.
+	 *
+	 * The default content type is 'text/plain' which does not allow using HTML.
+	 * However, you can set the content type of the email by using the
+	 * {@see 'wp_mail_content_type'} filter.
+	 *
+	 * The default charset is based on the charset used on the blog. The charset can
+	 * be set using the {@see 'wp_mail_charset'} filter.
+	 *
+	 * @since 1.2.1
+	 *
+	 * @global PHPMailer $phpmailer
+	 *
+	 * @param string|array $to          Array or comma-separated list of email addresses to send message.
+	 * @param string       $subject     Email subject
+	 * @param string       $message     Message contents
+	 * @param string|array $headers     Optional. Additional headers.
+	 * @param string|array $attachments Optional. Files to attach.
+	 * @return bool Whether the email contents were sent successfully.
+	 */
+	function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) {
+		// Compact the input, apply the filters, and extract them back out
+
+		/**
+		 * Filters the wp_mail() arguments.
+		 *
+		 * @since 2.2.0
+		 *
+		 * @param array $args A compacted array of wp_mail() arguments, including the "to" email,
+		 *                    subject, message, headers, and attachments values.
+		 */
+		$atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
+
+		if ( isset( $atts['to'] ) ) {
+			$to = $atts['to'];
+		}
+
+		if ( ! is_array( $to ) ) {
+			$to = explode( ',', $to );
+		}
+
+		if ( isset( $atts['subject'] ) ) {
+			$subject = $atts['subject'];
+		}
+
+		if ( isset( $atts['message'] ) ) {
+			$message = $atts['message'];
+		}
+
+		if ( isset( $atts['headers'] ) ) {
+			$headers = $atts['headers'];
+		}
+
+		if ( isset( $atts['attachments'] ) ) {
+			$attachments = $atts['attachments'];
+		}
+
+		if ( ! is_array( $attachments ) ) {
+			$attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) );
+		}
+		global $phpmailer;
+
+		// (Re)create it, if it's gone missing
+		if ( ! ( $phpmailer instanceof PHPMailer ) ) {
+			require_once ABSPATH . WPINC . '/class-phpmailer.php';
+			require_once ABSPATH . WPINC . '/class-smtp.php';
+			$phpmailer = new PHPMailer( true );
+		}
+
+		// Headers
+		$cc = $bcc = $reply_to = array();
+
+		if ( empty( $headers ) ) {
+			$headers = array();
+		} else {
+			if ( ! is_array( $headers ) ) {
+				// Explode the headers out, so this function can take both
+				// string headers and an array of headers.
+				$tempheaders = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
+			} else {
+				$tempheaders = $headers;
+			}
+			$headers = array();
+
+			// If it's actually got contents
+			if ( ! empty( $tempheaders ) ) {
+				// Iterate through the raw headers
+				foreach ( (array) $tempheaders as $header ) {
+					if ( strpos( $header, ':' ) === false ) {
+						if ( false !== stripos( $header, 'boundary=' ) ) {
+							$parts    = preg_split( '/boundary=/i', trim( $header ) );
+							$boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
+						}
+						continue;
+					}
+					// Explode them out
+					list( $name, $content ) = explode( ':', trim( $header ), 2 );
+
+					// Cleanup crew
+					$name    = trim( $name );
+					$content = trim( $content );
+
+					switch ( strtolower( $name ) ) {
+						// Mainly for legacy -- process a From: header if it's there
+						case 'from':
+							$bracket_pos = strpos( $content, '<' );
+							if ( $bracket_pos !== false ) {
+								// Text before the bracketed email is the "From" name.
+								if ( $bracket_pos > 0 ) {
+									$from_name = substr( $content, 0, $bracket_pos - 1 );
+									$from_name = str_replace( '"', '', $from_name );
+									$from_name = trim( $from_name );
+								}
+
+								$from_email = substr( $content, $bracket_pos + 1 );
+								$from_email = str_replace( '>', '', $from_email );
+								$from_email = trim( $from_email );
+
+								// Avoid setting an empty $from_email.
+							} elseif ( '' !== trim( $content ) ) {
+								$from_email = trim( $content );
+							}
+							break;
+						case 'content-type':
+							if ( strpos( $content, ';' ) !== false ) {
+								list( $type, $charset_content ) = explode( ';', $content );
+								$content_type                   = trim( $type );
+								if ( false !== stripos( $charset_content, 'charset=' ) ) {
+									$charset = trim( str_replace( array( 'charset=', '"' ), '', $charset_content ) );
+								} elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {
+									$boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );
+									$charset  = '';
+								}
+
+								// Avoid setting an empty $content_type.
+							} elseif ( '' !== trim( $content ) ) {
+								$content_type = trim( $content );
+							}
+							break;
+						case 'cc':
+							$cc = array_merge( (array) $cc, explode( ',', $content ) );
+							break;
+						case 'bcc':
+							$bcc = array_merge( (array) $bcc, explode( ',', $content ) );
+							break;
+						case 'reply-to':
+							$reply_to = array_merge( (array) $reply_to, explode( ',', $content ) );
+							break;
+						default:
+							// Add it to our grand headers array
+							$headers[ trim( $name ) ] = trim( $content );
+							break;
+					}
+				}
+			}
+		}
+
+		// Empty out the values that may be set
+		$phpmailer->clearAllRecipients();
+		$phpmailer->clearAttachments();
+		$phpmailer->clearCustomHeaders();
+		$phpmailer->clearReplyTos();
+
+		// From email and name
+		// If we don't have a name from the input headers
+		if ( ! isset( $from_name ) ) {
+			$from_name = 'WordPress';
+		}
+
+		/* If we don't have an email from the input headers default to wordpress@$sitename
+		 * Some hosts will block outgoing mail from this address if it doesn't exist but
+		 * there's no easy alternative. Defaulting to admin_email might appear to be another
+		 * option but some hosts may refuse to relay mail from an unknown domain. See
+		 * https://core.trac.wordpress.org/ticket/5007.
+		 */
+
+		if ( ! isset( $from_email ) ) {
+			// Get the site domain and get rid of www.
+			$sitename = strtolower( $_SERVER['SERVER_NAME'] );
+			if ( substr( $sitename, 0, 4 ) == 'www.' ) {
+				$sitename = substr( $sitename, 4 );
+			}
+
+			$from_email = 'wordpress@' . $sitename;
+		}
+
+		/**
+		 * Filters the email address to send from.
+		 *
+		 * @since 2.2.0
+		 *
+		 * @param string $from_email Email address to send from.
+		 */
+		$from_email = apply_filters( 'wp_mail_from', $from_email );
+
+		/**
+		 * Filters the name to associate with the "from" email address.
+		 *
+		 * @since 2.3.0
+		 *
+		 * @param string $from_name Name associated with the "from" email address.
+		 */
+		$from_name = apply_filters( 'wp_mail_from_name', $from_name );
+
+		try {
+			$phpmailer->setFrom( $from_email, $from_name, false );
+		} catch ( phpmailerException $e ) {
+			$mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+			$mail_error_data['phpmailer_exception_code'] = $e->getCode();
+
+			/** This filter is documented in wp-includes/pluggable.php */
+			do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+
+			return false;
+		}
+
+		// Set mail's subject and body
+		$phpmailer->Subject = $subject;
+		$phpmailer->Body    = $message;
+
+		// Set destination addresses, using appropriate methods for handling addresses
+		$address_headers = compact( 'to', 'cc', 'bcc', 'reply_to' );
+
+		foreach ( $address_headers as $address_header => $addresses ) {
+			if ( empty( $addresses ) ) {
+				continue;
+			}
+
+			foreach ( (array) $addresses as $address ) {
+				try {
+					// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
+					$recipient_name = '';
+
+					if ( preg_match( '/(.*)<(.+)>/', $address, $matches ) ) {
+						if ( count( $matches ) == 3 ) {
+							$recipient_name = $matches[1];
+							$address        = $matches[2];
+						}
+					}
+
+					switch ( $address_header ) {
+						case 'to':
+							$phpmailer->addAddress( $address, $recipient_name );
+							break;
+						case 'cc':
+							$phpmailer->addCc( $address, $recipient_name );
+							break;
+						case 'bcc':
+							$phpmailer->addBcc( $address, $recipient_name );
+							break;
+						case 'reply_to':
+							$phpmailer->addReplyTo( $address, $recipient_name );
+							break;
+					}
+				} catch ( phpmailerException $e ) {
+					continue;
+				}
+			}
+		}
+
+		// Set to use PHP's mail()
+		$phpmailer->isMail();
+
+		// Set Content-Type and charset
+		// If we don't have a content-type from the input headers
+		if ( ! isset( $content_type ) ) {
+			$content_type = 'text/plain';
+		}
+
+		/**
+		 * Filters the wp_mail() content type.
+		 *
+		 * @since 2.3.0
+		 *
+		 * @param string $content_type Default wp_mail() content type.
+		 */
+		$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+
+		$phpmailer->ContentType = $content_type;
+
+		// Set whether it's plaintext, depending on $content_type
+		if ( 'text/html' == $content_type ) {
+			$phpmailer->isHTML( true );
+		}
+
+		// If we don't have a charset from the input headers
+		if ( ! isset( $charset ) ) {
+			$charset = get_bloginfo( 'charset' );
+		}
+
+		// Set the content-type and charset
+
+		/**
+		 * Filters the default wp_mail() charset.
+		 *
+		 * @since 2.3.0
+		 *
+		 * @param string $charset Default email charset.
+		 */
+		$phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
+
+		// Set custom headers
+		if ( ! empty( $headers ) ) {
+			foreach ( (array) $headers as $name => $content ) {
+				$phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+			}
+
+			if ( false !== stripos( $content_type, 'multipart' ) && ! empty( $boundary ) ) {
+				$phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+			}
+		}
+
+		if ( ! empty( $attachments ) ) {
+			foreach ( $attachments as $attachment ) {
+				try {
+					$phpmailer->addAttachment( $attachment );
+				} catch ( phpmailerException $e ) {
+					continue;
+				}
+			}
+		}
+
+		/**
+		 * Fires after PHPMailer is initialized.
+		 *
+		 * @since 2.2.0
+		 *
+		 * @param PHPMailer $phpmailer The PHPMailer instance (passed by reference).
+		 */
+		do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
+
+		// Send!
+		try {
+			return $phpmailer->send();
+		} catch ( phpmailerException $e ) {
+
+			$mail_error_data                             = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+			$mail_error_data['phpmailer_exception_code'] = $e->getCode();
+
+			/**
+			 * Fires after a phpmailerException is caught.
+			 *
+			 * @since 4.4.0
+			 *
+			 * @param WP_Error $error A WP_Error object with the phpmailerException message, and an array
+			 *                        containing the mail recipient, subject, message, headers, and attachments.
+			 */
+			do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+
+			return false;
+		}
+	}
+endif;
+
+if ( ! function_exists( 'wp_authenticate' ) ) :
+	/**
+	 * Authenticate a user, confirming the login credentials are valid.
+	 *
+	 * @since 2.5.0
 	 * @since 4.5.0 `$username` now accepts an email address.
 	 *
-	 * @param null|WP_User|WP_Error $user     WP_User if the user is authenticated.
-	 *                                        WP_Error or null otherwise.
-	 * @param string                $username Username or email address.
-	 * @param string                $password User password
+	 * @param string $username User's username or email address.
+	 * @param string $password User's password.
+	 * @return WP_User|WP_Error WP_User object if the credentials are valid,
+	 *                          otherwise WP_Error.
 	 */
-	$user = apply_filters( 'authenticate', null, $username, $password );
+	function wp_authenticate( $username, $password ) {
+		$username = sanitize_user( $username );
+		$password = trim( $password );
 
-	if ( $user == null ) {
-		// TODO what should the error message be? (Or would these even happen?)
-		// Only needed if all authentication handlers fail to return anything.
-		$user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );
-	}
-
-	$ignore_codes = array('empty_username', 'empty_password');
-
-	if (is_wp_error($user) && !in_array($user->get_error_code(), $ignore_codes) ) {
 		/**
-		 * Fires after a user login has failed.
+		 * Filters whether a set of user login credentials are valid.
 		 *
-		 * @since 2.5.0
-		 * @since 4.5.0 The value of `$username` can now be an email address.
+		 * A WP_User object is returned if the credentials authenticate a user.
+		 * WP_Error or null otherwise.
 		 *
-		 * @param string $username Username or email address.
+		 * @since 2.8.0
+		 * @since 4.5.0 `$username` now accepts an email address.
+		 *
+		 * @param null|WP_User|WP_Error $user     WP_User if the user is authenticated.
+		 *                                        WP_Error or null otherwise.
+		 * @param string                $username Username or email address.
+		 * @param string                $password User password
 		 */
-		do_action( 'wp_login_failed', $username );
-	}
+		$user = apply_filters( 'authenticate', null, $username, $password );
 
-	return $user;
-}
+		if ( $user == null ) {
+			// TODO what should the error message be? (Or would these even happen?)
+			// Only needed if all authentication handlers fail to return anything.
+			$user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );
+		}
+
+		$ignore_codes = array( 'empty_username', 'empty_password' );
+
+		if ( is_wp_error( $user ) && ! in_array( $user->get_error_code(), $ignore_codes ) ) {
+			/**
+			 * Fires after a user login has failed.
+			 *
+			 * @since 2.5.0
+			 * @since 4.5.0 The value of `$username` can now be an email address.
+			 *
+			 * @param string $username Username or email address.
+			 */
+			do_action( 'wp_login_failed', $username );
+		}
+
+		return $user;
+	}
 endif;
 
-if ( !function_exists('wp_logout') ) :
-/**
- * Log the current user out.
- *
- * @since 2.5.0
- */
-function wp_logout() {
-	wp_destroy_current_session();
-	wp_clear_auth_cookie();
-
+if ( ! function_exists( 'wp_logout' ) ) :
 	/**
-	 * Fires after a user is logged-out.
+	 * Log the current user out.
 	 *
-	 * @since 1.5.0
+	 * @since 2.5.0
 	 */
-	do_action( 'wp_logout' );
-}
+	function wp_logout() {
+		wp_destroy_current_session();
+		wp_clear_auth_cookie();
+
+		/**
+		 * Fires after a user is logged-out.
+		 *
+		 * @since 1.5.0
+		 */
+		do_action( 'wp_logout' );
+	}
 endif;
 
-if ( !function_exists('wp_validate_auth_cookie') ) :
-/**
- * Validates authentication cookie.
- *
- * The checks include making sure that the authentication cookie is set and
- * pulling in the contents (if $cookie is not used).
- *
- * Makes sure the cookie is not expired. Verifies the hash in cookie is what is
- * should be and compares the two.
- *
- * @since 2.5.0
- *
- * @global int $login_grace_period
- *
- * @param string $cookie Optional. If used, will validate contents instead of cookie's
- * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
- * @return false|int False if invalid cookie, User ID if valid.
- */
-function wp_validate_auth_cookie($cookie = '', $scheme = '') {
-	if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme) ) {
-		/**
-		 * Fires if an authentication cookie is malformed.
-		 *
-		 * @since 2.7.0
-		 *
-		 * @param string $cookie Malformed auth cookie.
-		 * @param string $scheme Authentication scheme. Values include 'auth', 'secure_auth',
-		 *                       or 'logged_in'.
-		 */
-		do_action( 'auth_cookie_malformed', $cookie, $scheme );
-		return false;
-	}
-
-	$scheme = $cookie_elements['scheme'];
-	$username = $cookie_elements['username'];
-	$hmac = $cookie_elements['hmac'];
-	$token = $cookie_elements['token'];
-	$expired = $expiration = $cookie_elements['expiration'];
-
-	// Allow a grace period for POST and Ajax requests
-	if ( wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
-		$expired += HOUR_IN_SECONDS;
-	}
-
-	// Quick check to see if an honest cookie has expired
-	if ( $expired < time() ) {
-		/**
-		 * Fires once an authentication cookie has expired.
-		 *
-		 * @since 2.7.0
-		 *
-		 * @param array $cookie_elements An array of data for the authentication cookie.
-		 */
-		do_action( 'auth_cookie_expired', $cookie_elements );
-		return false;
-	}
-
-	$user = get_user_by('login', $username);
-	if ( ! $user ) {
-		/**
-		 * Fires if a bad username is entered in the user authentication process.
-		 *
-		 * @since 2.7.0
-		 *
-		 * @param array $cookie_elements An array of data for the authentication cookie.
-		 */
-		do_action( 'auth_cookie_bad_username', $cookie_elements );
-		return false;
-	}
-
-	$pass_frag = substr($user->user_pass, 8, 4);
-
-	$key = wp_hash( $username . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
-
-	// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
-	$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
-	$hash = hash_hmac( $algo, $username . '|' . $expiration . '|' . $token, $key );
-
-	if ( ! hash_equals( $hash, $hmac ) ) {
-		/**
-		 * Fires if a bad authentication cookie hash is encountered.
-		 *
-		 * @since 2.7.0
-		 *
-		 * @param array $cookie_elements An array of data for the authentication cookie.
-		 */
-		do_action( 'auth_cookie_bad_hash', $cookie_elements );
-		return false;
-	}
-
-	$manager = WP_Session_Tokens::get_instance( $user->ID );
-	if ( ! $manager->verify( $token ) ) {
-		do_action( 'auth_cookie_bad_session_token', $cookie_elements );
-		return false;
-	}
-
-	// Ajax/POST grace period set above
-	if ( $expiration < time() ) {
-		$GLOBALS['login_grace_period'] = 1;
-	}
-
+if ( ! function_exists( 'wp_validate_auth_cookie' ) ) :
 	/**
-	 * Fires once an authentication cookie has been validated.
+	 * Validates authentication cookie.
 	 *
-	 * @since 2.7.0
+	 * The checks include making sure that the authentication cookie is set and
+	 * pulling in the contents (if $cookie is not used).
 	 *
-	 * @param array   $cookie_elements An array of data for the authentication cookie.
-	 * @param WP_User $user            User object.
+	 * Makes sure the cookie is not expired. Verifies the hash in cookie is what is
+	 * should be and compares the two.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @global int $login_grace_period
+	 *
+	 * @param string $cookie Optional. If used, will validate contents instead of cookie's
+	 * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
+	 * @return false|int False if invalid cookie, User ID if valid.
 	 */
-	do_action( 'auth_cookie_valid', $cookie_elements, $user );
+	function wp_validate_auth_cookie( $cookie = '', $scheme = '' ) {
+		if ( ! $cookie_elements = wp_parse_auth_cookie( $cookie, $scheme ) ) {
+			/**
+			 * Fires if an authentication cookie is malformed.
+			 *
+			 * @since 2.7.0
+			 *
+			 * @param string $cookie Malformed auth cookie.
+			 * @param string $scheme Authentication scheme. Values include 'auth', 'secure_auth',
+			 *                       or 'logged_in'.
+			 */
+			do_action( 'auth_cookie_malformed', $cookie, $scheme );
+			return false;
+		}
 
-	return $user->ID;
-}
+		$scheme   = $cookie_elements['scheme'];
+		$username = $cookie_elements['username'];
+		$hmac     = $cookie_elements['hmac'];
+		$token    = $cookie_elements['token'];
+		$expired  = $expiration = $cookie_elements['expiration'];
+
+		// Allow a grace period for POST and Ajax requests
+		if ( wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
+			$expired += HOUR_IN_SECONDS;
+		}
+
+		// Quick check to see if an honest cookie has expired
+		if ( $expired < time() ) {
+			/**
+			 * Fires once an authentication cookie has expired.
+			 *
+			 * @since 2.7.0
+			 *
+			 * @param array $cookie_elements An array of data for the authentication cookie.
+			 */
+			do_action( 'auth_cookie_expired', $cookie_elements );
+			return false;
+		}
+
+		$user = get_user_by( 'login', $username );
+		if ( ! $user ) {
+			/**
+			 * Fires if a bad username is entered in the user authentication process.
+			 *
+			 * @since 2.7.0
+			 *
+			 * @param array $cookie_elements An array of data for the authentication cookie.
+			 */
+			do_action( 'auth_cookie_bad_username', $cookie_elements );
+			return false;
+		}
+
+		$pass_frag = substr( $user->user_pass, 8, 4 );
+
+		$key = wp_hash( $username . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
+
+		// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
+		$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
+		$hash = hash_hmac( $algo, $username . '|' . $expiration . '|' . $token, $key );
+
+		if ( ! hash_equals( $hash, $hmac ) ) {
+			/**
+			 * Fires if a bad authentication cookie hash is encountered.
+			 *
+			 * @since 2.7.0
+			 *
+			 * @param array $cookie_elements An array of data for the authentication cookie.
+			 */
+			do_action( 'auth_cookie_bad_hash', $cookie_elements );
+			return false;
+		}
+
+		$manager = WP_Session_Tokens::get_instance( $user->ID );
+		if ( ! $manager->verify( $token ) ) {
+			do_action( 'auth_cookie_bad_session_token', $cookie_elements );
+			return false;
+		}
+
+		// Ajax/POST grace period set above
+		if ( $expiration < time() ) {
+			$GLOBALS['login_grace_period'] = 1;
+		}
+
+		/**
+		 * Fires once an authentication cookie has been validated.
+		 *
+		 * @since 2.7.0
+		 *
+		 * @param array   $cookie_elements An array of data for the authentication cookie.
+		 * @param WP_User $user            User object.
+		 */
+		do_action( 'auth_cookie_valid', $cookie_elements, $user );
+
+		return $user->ID;
+	}
 endif;
 
-if ( !function_exists('wp_generate_auth_cookie') ) :
-/**
- * Generate authentication cookie contents.
- *
- * @since 2.5.0
- * @since 4.0.0 The `$token` parameter was added.
- *
- * @param int    $user_id    User ID
- * @param int    $expiration The time the cookie expires as a UNIX timestamp.
- * @param string $scheme     Optional. The cookie scheme to use: auth, secure_auth, or logged_in
- * @param string $token      User's session token to use for this cookie
- * @return string Authentication cookie contents. Empty string if user does not exist.
- */
-function wp_generate_auth_cookie( $user_id, $expiration, $scheme = 'auth', $token = '' ) {
-	$user = get_userdata($user_id);
-	if ( ! $user ) {
-		return '';
-	}
-
-	if ( ! $token ) {
-		$manager = WP_Session_Tokens::get_instance( $user_id );
-		$token = $manager->create( $expiration );
-	}
-
-	$pass_frag = substr($user->user_pass, 8, 4);
-
-	$key = wp_hash( $user->user_login . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
-
-	// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
-	$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
-	$hash = hash_hmac( $algo, $user->user_login . '|' . $expiration . '|' . $token, $key );
-
-	$cookie = $user->user_login . '|' . $expiration . '|' . $token . '|' . $hash;
-
+if ( ! function_exists( 'wp_generate_auth_cookie' ) ) :
 	/**
-	 * Filters the authentication cookie.
+	 * Generate authentication cookie contents.
 	 *
 	 * @since 2.5.0
 	 * @since 4.0.0 The `$token` parameter was added.
 	 *
-	 * @param string $cookie     Authentication cookie.
-	 * @param int    $user_id    User ID.
+	 * @param int    $user_id    User ID
 	 * @param int    $expiration The time the cookie expires as a UNIX timestamp.
-	 * @param string $scheme     Cookie scheme used. Accepts 'auth', 'secure_auth', or 'logged_in'.
-	 * @param string $token      User's session token used.
+	 * @param string $scheme     Optional. The cookie scheme to use: auth, secure_auth, or logged_in
+	 * @param string $token      User's session token to use for this cookie
+	 * @return string Authentication cookie contents. Empty string if user does not exist.
 	 */
-	return apply_filters( 'auth_cookie', $cookie, $user_id, $expiration, $scheme, $token );
-}
-endif;
+	function wp_generate_auth_cookie( $user_id, $expiration, $scheme = 'auth', $token = '' ) {
+		$user = get_userdata( $user_id );
+		if ( ! $user ) {
+			return '';
+		}
 
-if ( !function_exists('wp_parse_auth_cookie') ) :
-/**
- * Parse a cookie into its components
- *
- * @since 2.7.0
- *
- * @param string $cookie
- * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
- * @return array|false Authentication cookie components
- */
-function wp_parse_auth_cookie($cookie = '', $scheme = '') {
-	if ( empty($cookie) ) {
-		switch ($scheme){
-			case 'auth':
-				$cookie_name = AUTH_COOKIE;
-				break;
-			case 'secure_auth':
-				$cookie_name = SECURE_AUTH_COOKIE;
-				break;
-			case "logged_in":
-				$cookie_name = LOGGED_IN_COOKIE;
-				break;
-			default:
-				if ( is_ssl() ) {
-					$cookie_name = SECURE_AUTH_COOKIE;
-					$scheme = 'secure_auth';
-				} else {
-					$cookie_name = AUTH_COOKIE;
-					$scheme = 'auth';
-				}
-	    }
+		if ( ! $token ) {
+			$manager = WP_Session_Tokens::get_instance( $user_id );
+			$token   = $manager->create( $expiration );
+		}
 
-		if ( empty($_COOKIE[$cookie_name]) )
-			return false;
-		$cookie = $_COOKIE[$cookie_name];
-	}
+		$pass_frag = substr( $user->user_pass, 8, 4 );
 
-	$cookie_elements = explode('|', $cookie);
-	if ( count( $cookie_elements ) !== 4 ) {
-		return false;
-	}
+		$key = wp_hash( $user->user_login . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
 
-	list( $username, $expiration, $token, $hmac ) = $cookie_elements;
+		// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
+		$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
+		$hash = hash_hmac( $algo, $user->user_login . '|' . $expiration . '|' . $token, $key );
 
-	return compact( 'username', 'expiration', 'token', 'hmac', 'scheme' );
-}
-endif;
+		$cookie = $user->user_login . '|' . $expiration . '|' . $token . '|' . $hash;
 
-if ( !function_exists('wp_set_auth_cookie') ) :
-/**
- * Log in a user by setting authentication cookies.
- *
- * The $remember parameter increases the time that the cookie will be kept. The
- * default the cookie is kept without remembering is two days. When $remember is
- * set, the cookies will be kept for 14 days or two weeks.
- *
- * @since 2.5.0
- * @since 4.3.0 Added the `$token` parameter.
- *
- * @param int    $user_id  User ID
- * @param bool   $remember Whether to remember the user
- * @param mixed  $secure   Whether the admin cookies should only be sent over HTTPS.
- *                         Default is_ssl().
- * @param string $token    Optional. User's session token to use for this cookie.
- */
-function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
-	if ( $remember ) {
 		/**
-		 * Filters the duration of the authentication cookie expiration period.
+		 * Filters the authentication cookie.
 		 *
-		 * @since 2.8.0
+		 * @since 2.5.0
+		 * @since 4.0.0 The `$token` parameter was added.
 		 *
-		 * @param int  $length   Duration of the expiration period in seconds.
-		 * @param int  $user_id  User ID.
-		 * @param bool $remember Whether to remember the user login. Default false.
+		 * @param string $cookie     Authentication cookie.
+		 * @param int    $user_id    User ID.
+		 * @param int    $expiration The time the cookie expires as a UNIX timestamp.
+		 * @param string $scheme     Cookie scheme used. Accepts 'auth', 'secure_auth', or 'logged_in'.
+		 * @param string $token      User's session token used.
 		 */
-		$expiration = time() + apply_filters( 'auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember );
-
-		/*
-		 * Ensure the browser will continue to send the cookie after the expiration time is reached.
-		 * Needed for the login grace period in wp_validate_auth_cookie().
-		 */
-		$expire = $expiration + ( 12 * HOUR_IN_SECONDS );
-	} else {
-		/** This filter is documented in wp-includes/pluggable.php */
-		$expiration = time() + apply_filters( 'auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember );
-		$expire = 0;
+		return apply_filters( 'auth_cookie', $cookie, $user_id, $expiration, $scheme, $token );
 	}
-
-	if ( '' === $secure ) {
-		$secure = is_ssl();
-	}
-
-	// Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
-	$secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME );
-
-	/**
-	 * Filters whether the connection is secure.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param bool $secure  Whether the connection is secure.
-	 * @param int  $user_id User ID.
-	 */
-	$secure = apply_filters( 'secure_auth_cookie', $secure, $user_id );
-
-	/**
-	 * Filters whether to use a secure cookie when logged-in.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param bool $secure_logged_in_cookie Whether to use a secure cookie when logged-in.
-	 * @param int  $user_id                 User ID.
-	 * @param bool $secure                  Whether the connection is secure.
-	 */
-	$secure_logged_in_cookie = apply_filters( 'secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure );
-
-	if ( $secure ) {
-		$auth_cookie_name = SECURE_AUTH_COOKIE;
-		$scheme = 'secure_auth';
-	} else {
-		$auth_cookie_name = AUTH_COOKIE;
-		$scheme = 'auth';
-	}
-
-	if ( '' === $token ) {
-		$manager = WP_Session_Tokens::get_instance( $user_id );
-		$token   = $manager->create( $expiration );
-	}
-
-	$auth_cookie = wp_generate_auth_cookie( $user_id, $expiration, $scheme, $token );
-	$logged_in_cookie = wp_generate_auth_cookie( $user_id, $expiration, 'logged_in', $token );
-
-	/**
-	 * Fires immediately before the authentication cookie is set.
-	 *
-	 * @since 2.5.0
-	 * @since 4.9.0 The `$token` parameter was added.
-	 *
-	 * @param string $auth_cookie Authentication cookie.
-	 * @param int    $expire      The time the login grace period expires as a UNIX timestamp.
-	 *                            Default is 12 hours past the cookie's expiration time.
-	 * @param int    $expiration  The time when the authentication cookie expires as a UNIX timestamp.
-	 *                            Default is 14 days from now.
-	 * @param int    $user_id     User ID.
-	 * @param string $scheme      Authentication scheme. Values include 'auth', 'secure_auth', or 'logged_in'.
-	 * @param string $token       User's session token to use for this cookie.
-	 */
-	do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme, $token );
-
-	/**
-	 * Fires immediately before the logged-in authentication cookie is set.
-	 *
-	 * @since 2.6.0
-	 * @since 4.9.0 The `$token` parameter was added.
-	 *
-	 * @param string $logged_in_cookie The logged-in cookie.
-	 * @param int    $expire           The time the login grace period expires as a UNIX timestamp.
-	 *                                 Default is 12 hours past the cookie's expiration time.
-	 * @param int    $expiration       The time when the logged-in authentication cookie expires as a UNIX timestamp.
-	 *                                 Default is 14 days from now.
-	 * @param int    $user_id          User ID.
-	 * @param string $scheme           Authentication scheme. Default 'logged_in'.
-	 * @param string $token            User's session token to use for this cookie.
-	 */
-	do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in', $token );
-
-	/**
-	 * Allows preventing auth cookies from actually being sent to the client.
-	 *
-	 * @since 4.7.4
-	 *
-	 * @param bool $send Whether to send auth cookies to the client.
-	 */
-	if ( ! apply_filters( 'send_auth_cookies', true ) ) {
-		return;
-	}
-
-	setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
-	setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
-	setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-	if ( COOKIEPATH != SITECOOKIEPATH )
-		setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-}
 endif;
 
-if ( !function_exists('wp_clear_auth_cookie') ) :
-/**
- * Removes all of the cookies associated with authentication.
- *
- * @since 2.5.0
- */
-function wp_clear_auth_cookie() {
+if ( ! function_exists( 'wp_parse_auth_cookie' ) ) :
 	/**
-	 * Fires just before the authentication cookies are cleared.
+	 * Parse a cookie into its components
 	 *
 	 * @since 2.7.0
+	 *
+	 * @param string $cookie
+	 * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
+	 * @return array|false Authentication cookie components
 	 */
-	do_action( 'clear_auth_cookie' );
+	function wp_parse_auth_cookie( $cookie = '', $scheme = '' ) {
+		if ( empty( $cookie ) ) {
+			switch ( $scheme ) {
+				case 'auth':
+					$cookie_name = AUTH_COOKIE;
+					break;
+				case 'secure_auth':
+					$cookie_name = SECURE_AUTH_COOKIE;
+					break;
+				case 'logged_in':
+					$cookie_name = LOGGED_IN_COOKIE;
+					break;
+				default:
+					if ( is_ssl() ) {
+						$cookie_name = SECURE_AUTH_COOKIE;
+						$scheme      = 'secure_auth';
+					} else {
+						$cookie_name = AUTH_COOKIE;
+						$scheme      = 'auth';
+					}
+			}
 
-	/** This filter is documented in wp-includes/pluggable.php */
-	if ( ! apply_filters( 'send_auth_cookies', true ) ) {
-		return;
+			if ( empty( $_COOKIE[ $cookie_name ] ) ) {
+				return false;
+			}
+			$cookie = $_COOKIE[ $cookie_name ];
+		}
+
+		$cookie_elements = explode( '|', $cookie );
+		if ( count( $cookie_elements ) !== 4 ) {
+			return false;
+		}
+
+		list( $username, $expiration, $token, $hmac ) = $cookie_elements;
+
+		return compact( 'username', 'expiration', 'token', 'hmac', 'scheme' );
 	}
-
-	// Auth cookies
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH,   COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH,   COOKIE_DOMAIN );
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
-	setcookie( LOGGED_IN_COOKIE,   ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,          COOKIE_DOMAIN );
-	setcookie( LOGGED_IN_COOKIE,   ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH,      COOKIE_DOMAIN );
-
-	// Settings cookies
-	setcookie( 'wp-settings-' . get_current_user_id(),      ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
-	setcookie( 'wp-settings-time-' . get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
-
-	// Old cookies
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-
-	// Even older cookies
-	setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-	setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-}
 endif;
 
-if ( !function_exists('is_user_logged_in') ) :
-/**
- * Checks if the current visitor is a logged in user.
- *
- * @since 2.0.0
- *
- * @return bool True if user is logged in, false if not logged in.
- */
-function is_user_logged_in() {
-	$user = wp_get_current_user();
-
-	return $user->exists();
-}
-endif;
-
-if ( !function_exists('auth_redirect') ) :
-/**
- * Checks if a user is logged in, if not it redirects them to the login page.
- *
- * @since 1.5.0
- */
-function auth_redirect() {
-	// Checks if a user is logged in, if not redirects them to the login page
-
-	$secure = ( is_ssl() || force_ssl_admin() );
-
+if ( ! function_exists( 'wp_set_auth_cookie' ) ) :
 	/**
-	 * Filters whether to use a secure authentication redirect.
+	 * Log in a user by setting authentication cookies.
 	 *
-	 * @since 3.1.0
+	 * The $remember parameter increases the time that the cookie will be kept. The
+	 * default the cookie is kept without remembering is two days. When $remember is
+	 * set, the cookies will be kept for 14 days or two weeks.
 	 *
-	 * @param bool $secure Whether to use a secure authentication redirect. Default false.
+	 * @since 2.5.0
+	 * @since 4.3.0 Added the `$token` parameter.
+	 *
+	 * @param int    $user_id  User ID
+	 * @param bool   $remember Whether to remember the user
+	 * @param mixed  $secure   Whether the admin cookies should only be sent over HTTPS.
+	 *                         Default is_ssl().
+	 * @param string $token    Optional. User's session token to use for this cookie.
 	 */
-	$secure = apply_filters( 'secure_auth_redirect', $secure );
+	function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
+		if ( $remember ) {
+			/**
+			 * Filters the duration of the authentication cookie expiration period.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @param int  $length   Duration of the expiration period in seconds.
+			 * @param int  $user_id  User ID.
+			 * @param bool $remember Whether to remember the user login. Default false.
+			 */
+			$expiration = time() + apply_filters( 'auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember );
 
-	// If https is required and request is http, redirect
-	if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
-		if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
-			wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
-			exit();
+			/*
+			 * Ensure the browser will continue to send the cookie after the expiration time is reached.
+			 * Needed for the login grace period in wp_validate_auth_cookie().
+			 */
+			$expire = $expiration + ( 12 * HOUR_IN_SECONDS );
 		} else {
-			wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-			exit();
+			/** This filter is documented in wp-includes/pluggable.php */
+			$expiration = time() + apply_filters( 'auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember );
+			$expire     = 0;
+		}
+
+		if ( '' === $secure ) {
+			$secure = is_ssl();
+		}
+
+		// Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
+		$secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME );
+
+		/**
+		 * Filters whether the connection is secure.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param bool $secure  Whether the connection is secure.
+		 * @param int  $user_id User ID.
+		 */
+		$secure = apply_filters( 'secure_auth_cookie', $secure, $user_id );
+
+		/**
+		 * Filters whether to use a secure cookie when logged-in.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param bool $secure_logged_in_cookie Whether to use a secure cookie when logged-in.
+		 * @param int  $user_id                 User ID.
+		 * @param bool $secure                  Whether the connection is secure.
+		 */
+		$secure_logged_in_cookie = apply_filters( 'secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure );
+
+		if ( $secure ) {
+			$auth_cookie_name = SECURE_AUTH_COOKIE;
+			$scheme           = 'secure_auth';
+		} else {
+			$auth_cookie_name = AUTH_COOKIE;
+			$scheme           = 'auth';
+		}
+
+		if ( '' === $token ) {
+			$manager = WP_Session_Tokens::get_instance( $user_id );
+			$token   = $manager->create( $expiration );
+		}
+
+		$auth_cookie      = wp_generate_auth_cookie( $user_id, $expiration, $scheme, $token );
+		$logged_in_cookie = wp_generate_auth_cookie( $user_id, $expiration, 'logged_in', $token );
+
+		/**
+		 * Fires immediately before the authentication cookie is set.
+		 *
+		 * @since 2.5.0
+		 * @since 4.9.0 The `$token` parameter was added.
+		 *
+		 * @param string $auth_cookie Authentication cookie.
+		 * @param int    $expire      The time the login grace period expires as a UNIX timestamp.
+		 *                            Default is 12 hours past the cookie's expiration time.
+		 * @param int    $expiration  The time when the authentication cookie expires as a UNIX timestamp.
+		 *                            Default is 14 days from now.
+		 * @param int    $user_id     User ID.
+		 * @param string $scheme      Authentication scheme. Values include 'auth', 'secure_auth', or 'logged_in'.
+		 * @param string $token       User's session token to use for this cookie.
+		 */
+		do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme, $token );
+
+		/**
+		 * Fires immediately before the logged-in authentication cookie is set.
+		 *
+		 * @since 2.6.0
+		 * @since 4.9.0 The `$token` parameter was added.
+		 *
+		 * @param string $logged_in_cookie The logged-in cookie.
+		 * @param int    $expire           The time the login grace period expires as a UNIX timestamp.
+		 *                                 Default is 12 hours past the cookie's expiration time.
+		 * @param int    $expiration       The time when the logged-in authentication cookie expires as a UNIX timestamp.
+		 *                                 Default is 14 days from now.
+		 * @param int    $user_id          User ID.
+		 * @param string $scheme           Authentication scheme. Default 'logged_in'.
+		 * @param string $token            User's session token to use for this cookie.
+		 */
+		do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in', $token );
+
+		/**
+		 * Allows preventing auth cookies from actually being sent to the client.
+		 *
+		 * @since 4.7.4
+		 *
+		 * @param bool $send Whether to send auth cookies to the client.
+		 */
+		if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+			return;
+		}
+
+		setcookie( $auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true );
+		setcookie( $auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true );
+		setcookie( LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true );
+		if ( COOKIEPATH != SITECOOKIEPATH ) {
+			setcookie( LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true );
 		}
 	}
+endif;
 
+if ( ! function_exists( 'wp_clear_auth_cookie' ) ) :
 	/**
-	 * Filters the authentication redirect scheme.
+	 * Removes all of the cookies associated with authentication.
 	 *
-	 * @since 2.9.0
-	 *
-	 * @param string $scheme Authentication redirect scheme. Default empty.
+	 * @since 2.5.0
 	 */
-	$scheme = apply_filters( 'auth_redirect_scheme', '' );
-
-	if ( $user_id = wp_validate_auth_cookie( '',  $scheme) ) {
+	function wp_clear_auth_cookie() {
 		/**
-		 * Fires before the authentication redirect.
+		 * Fires just before the authentication cookies are cleared.
 		 *
-		 * @since 2.8.0
-		 *
-		 * @param int $user_id User ID.
+		 * @since 2.7.0
 		 */
-		do_action( 'auth_redirect', $user_id );
+		do_action( 'clear_auth_cookie' );
 
-		// If the user wants ssl but the session is not ssl, redirect.
-		if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
+		/** This filter is documented in wp-includes/pluggable.php */
+		if ( ! apply_filters( 'send_auth_cookies', true ) ) {
+			return;
+		}
+
+		// Auth cookies
+		setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN );
+		setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN );
+		setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
+		setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
+		setcookie( LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
+		setcookie( LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+
+		// Settings cookies
+		setcookie( 'wp-settings-' . get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
+		setcookie( 'wp-settings-time-' . get_current_user_id(), ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
+
+		// Old cookies
+		setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
+		setcookie( AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+		setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
+		setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+
+		// Even older cookies
+		setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
+		setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
+		setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+		setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+	}
+endif;
+
+if ( ! function_exists( 'is_user_logged_in' ) ) :
+	/**
+	 * Checks if the current visitor is a logged in user.
+	 *
+	 * @since 2.0.0
+	 *
+	 * @return bool True if user is logged in, false if not logged in.
+	 */
+	function is_user_logged_in() {
+		$user = wp_get_current_user();
+
+		return $user->exists();
+	}
+endif;
+
+if ( ! function_exists( 'auth_redirect' ) ) :
+	/**
+	 * Checks if a user is logged in, if not it redirects them to the login page.
+	 *
+	 * @since 1.5.0
+	 */
+	function auth_redirect() {
+		// Checks if a user is logged in, if not redirects them to the login page
+
+		$secure = ( is_ssl() || force_ssl_admin() );
+
+		/**
+		 * Filters whether to use a secure authentication redirect.
+		 *
+		 * @since 3.1.0
+		 *
+		 * @param bool $secure Whether to use a secure authentication redirect. Default false.
+		 */
+		$secure = apply_filters( 'secure_auth_redirect', $secure );
+
+		// If https is required and request is http, redirect
+		if ( $secure && ! is_ssl() && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
 			if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
 				wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
 				exit();
@@ -1046,190 +1025,224 @@ function auth_redirect() {
 			}
 		}
 
-		return;  // The cookie is good so we're done
+		/**
+		 * Filters the authentication redirect scheme.
+		 *
+		 * @since 2.9.0
+		 *
+		 * @param string $scheme Authentication redirect scheme. Default empty.
+		 */
+		$scheme = apply_filters( 'auth_redirect_scheme', '' );
+
+		if ( $user_id = wp_validate_auth_cookie( '', $scheme ) ) {
+			/**
+			 * Fires before the authentication redirect.
+			 *
+			 * @since 2.8.0
+			 *
+			 * @param int $user_id User ID.
+			 */
+			do_action( 'auth_redirect', $user_id );
+
+			// If the user wants ssl but the session is not ssl, redirect.
+			if ( ! $secure && get_user_option( 'use_ssl', $user_id ) && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
+				if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
+					wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
+					exit();
+				} else {
+					wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+					exit();
+				}
+			}
+
+			return;  // The cookie is good so we're done
+		}
+
+		// The cookie is no good so force login
+		nocache_headers();
+
+		$redirect = ( strpos( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) ? wp_get_referer() : set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+
+		$login_url = wp_login_url( $redirect, true );
+
+		wp_redirect( $login_url );
+		exit();
 	}
-
-	// The cookie is no good so force login
-	nocache_headers();
-
-	$redirect = ( strpos( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) ? wp_get_referer() : set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-
-	$login_url = wp_login_url($redirect, true);
-
-	wp_redirect($login_url);
-	exit();
-}
 endif;
 
-if ( !function_exists('check_admin_referer') ) :
-/**
- * Makes sure that a user was referred from another admin page.
- *
- * To avoid security exploits.
- *
- * @since 1.2.0
- *
- * @param int|string $action    Action nonce.
- * @param string     $query_arg Optional. Key to check for nonce in `$_REQUEST` (since 2.5).
- *                              Default '_wpnonce'.
- * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
- *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
- */
-function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
-	if ( -1 == $action )
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
-
-	$adminurl = strtolower(admin_url());
-	$referer = strtolower(wp_get_referer());
-	$result = isset($_REQUEST[$query_arg]) ? wp_verify_nonce($_REQUEST[$query_arg], $action) : false;
-
+if ( ! function_exists( 'check_admin_referer' ) ) :
 	/**
-	 * Fires once the admin request has been validated or not.
+	 * Makes sure that a user was referred from another admin page.
+	 *
+	 * To avoid security exploits.
+	 *
+	 * @since 1.2.0
+	 *
+	 * @param int|string $action    Action nonce.
+	 * @param string     $query_arg Optional. Key to check for nonce in `$_REQUEST` (since 2.5).
+	 *                              Default '_wpnonce'.
+	 * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
+	 *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
+	 */
+	function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
+		if ( -1 == $action ) {
+			_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+		}
+
+		$adminurl = strtolower( admin_url() );
+		$referer  = strtolower( wp_get_referer() );
+		$result   = isset( $_REQUEST[ $query_arg ] ) ? wp_verify_nonce( $_REQUEST[ $query_arg ], $action ) : false;
+
+		/**
+		 * Fires once the admin request has been validated or not.
+		 *
+		 * @since 1.5.1
+		 *
+		 * @param string    $action The nonce action.
+		 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
+		 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
+		 */
+		do_action( 'check_admin_referer', $action, $result );
+
+		if ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) {
+			wp_nonce_ays( $action );
+			die();
+		}
+
+		return $result;
+	}
+endif;
+
+if ( ! function_exists( 'check_ajax_referer' ) ) :
+	/**
+	 * Verifies the Ajax request to prevent processing requests external of the blog.
+	 *
+	 * @since 2.0.3
+	 *
+	 * @param int|string   $action    Action nonce.
+	 * @param false|string $query_arg Optional. Key to check for the nonce in `$_REQUEST` (since 2.5). If false,
+	 *                                `$_REQUEST` values will be evaluated for '_ajax_nonce', and '_wpnonce'
+	 *                                (in that order). Default false.
+	 * @param bool         $die       Optional. Whether to die early when the nonce cannot be verified.
+	 *                                Default true.
+	 * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
+	 *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
+	 */
+	function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
+		if ( -1 == $action ) {
+			_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '4.7' );
+		}
+
+		$nonce = '';
+
+		if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) ) {
+			$nonce = $_REQUEST[ $query_arg ];
+		} elseif ( isset( $_REQUEST['_ajax_nonce'] ) ) {
+			$nonce = $_REQUEST['_ajax_nonce'];
+		} elseif ( isset( $_REQUEST['_wpnonce'] ) ) {
+			$nonce = $_REQUEST['_wpnonce'];
+		}
+
+		$result = wp_verify_nonce( $nonce, $action );
+
+		/**
+		 * Fires once the Ajax request has been validated or not.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string    $action The Ajax nonce action.
+		 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
+		 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
+		 */
+		do_action( 'check_ajax_referer', $action, $result );
+
+		if ( $die && false === $result ) {
+			if ( wp_doing_ajax() ) {
+				wp_die( -1, 403 );
+			} else {
+				die( '-1' );
+			}
+		}
+
+		return $result;
+	}
+endif;
+
+if ( ! function_exists( 'wp_redirect' ) ) :
+	/**
+	 * Redirects to another page.
+	 *
+	 * Note: wp_redirect() does not exit automatically, and should almost always be
+	 * followed by a call to `exit;`:
+	 *
+	 *     wp_redirect( $url );
+	 *     exit;
+	 *
+	 * Exiting can also be selectively manipulated by using wp_redirect() as a conditional
+	 * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} filters:
+	 *
+	 *     if ( wp_redirect( $url ) ) {
+	 *         exit;
+	 *     }
 	 *
 	 * @since 1.5.1
 	 *
-	 * @param string    $action The nonce action.
-	 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
-	 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
-	 */
-	do_action( 'check_admin_referer', $action, $result );
-
-	if ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) {
-		wp_nonce_ays( $action );
-		die();
-	}
-
-	return $result;
-}
-endif;
-
-if ( !function_exists('check_ajax_referer') ) :
-/**
- * Verifies the Ajax request to prevent processing requests external of the blog.
- *
- * @since 2.0.3
- *
- * @param int|string   $action    Action nonce.
- * @param false|string $query_arg Optional. Key to check for the nonce in `$_REQUEST` (since 2.5). If false,
- *                                `$_REQUEST` values will be evaluated for '_ajax_nonce', and '_wpnonce'
- *                                (in that order). Default false.
- * @param bool         $die       Optional. Whether to die early when the nonce cannot be verified.
- *                                Default true.
- * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
- *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
- */
-function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
-	if ( -1 == $action ) {
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '4.7' );
-	}
-
-	$nonce = '';
-
-	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) )
-		$nonce = $_REQUEST[ $query_arg ];
-	elseif ( isset( $_REQUEST['_ajax_nonce'] ) )
-		$nonce = $_REQUEST['_ajax_nonce'];
-	elseif ( isset( $_REQUEST['_wpnonce'] ) )
-		$nonce = $_REQUEST['_wpnonce'];
-
-	$result = wp_verify_nonce( $nonce, $action );
-
-	/**
-	 * Fires once the Ajax request has been validated or not.
-	 *
-	 * @since 2.1.0
-	 *
-	 * @param string    $action The Ajax nonce action.
-	 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
-	 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
-	 */
-	do_action( 'check_ajax_referer', $action, $result );
-
-	if ( $die && false === $result ) {
-		if ( wp_doing_ajax() ) {
-			wp_die( -1, 403 );
-		} else {
-			die( '-1' );
-		}
-	}
-
-	return $result;
-}
-endif;
-
-if ( !function_exists('wp_redirect') ) :
-/**
- * Redirects to another page.
- *
- * Note: wp_redirect() does not exit automatically, and should almost always be
- * followed by a call to `exit;`:
- *
- *     wp_redirect( $url );
- *     exit;
- *
- * Exiting can also be selectively manipulated by using wp_redirect() as a conditional
- * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} filters:
- *
- *     if ( wp_redirect( $url ) ) {
- *         exit;
- *     }
- *
- * @since 1.5.1
- *
- * @global bool $is_IIS
- *
- * @param string $location The path or URL to redirect to.
- * @param int    $status   Optional. HTTP response status code to use. Default '302' (Moved Temporarily).
- * @return bool False if the redirect was cancelled, true otherwise.
- */
-function wp_redirect($location, $status = 302) {
-	global $is_IIS;
-
-	/**
-	 * Filters the redirect location.
-	 *
-	 * @since 2.1.0
+	 * @global bool $is_IIS
 	 *
 	 * @param string $location The path or URL to redirect to.
-	 * @param int    $status   The HTTP response status code to use.
+	 * @param int    $status   Optional. HTTP response status code to use. Default '302' (Moved Temporarily).
+	 * @return bool False if the redirect was cancelled, true otherwise.
 	 */
-	$location = apply_filters( 'wp_redirect', $location, $status );
+	function wp_redirect( $location, $status = 302 ) {
+		global $is_IIS;
 
+		/**
+		 * Filters the redirect location.
+		 *
+		 * @since 2.1.0
+		 *
+		 * @param string $location The path or URL to redirect to.
+		 * @param int    $status   The HTTP response status code to use.
+		 */
+		$location = apply_filters( 'wp_redirect', $location, $status );
+
+		/**
+		 * Filters the redirect HTTP response status code to use.
+		 *
+		 * @since 2.3.0
+		 *
+		 * @param int    $status   The HTTP response status code to use.
+		 * @param string $location The path or URL to redirect to.
+		 */
+		$status = apply_filters( 'wp_redirect_status', $status, $location );
+
+		if ( ! $location ) {
+			return false;
+		}
+
+		$location = wp_sanitize_redirect( $location );
+
+		if ( ! $is_IIS && PHP_SAPI != 'cgi-fcgi' ) {
+			status_header( $status ); // This causes problems on IIS and some FastCGI setups
+		}
+
+		header( "Location: $location", true, $status );
+
+		return true;
+	}
+endif;
+
+if ( ! function_exists( 'wp_sanitize_redirect' ) ) :
 	/**
-	 * Filters the redirect HTTP response status code to use.
+	 * Sanitizes a URL for use in a redirect.
 	 *
 	 * @since 2.3.0
 	 *
-	 * @param int    $status   The HTTP response status code to use.
-	 * @param string $location The path or URL to redirect to.
+	 * @param string $location The path to redirect to.
+	 * @return string Redirect-sanitized URL.
 	 */
-	$status = apply_filters( 'wp_redirect_status', $status, $location );
-
-	if ( ! $location )
-		return false;
-
-	$location = wp_sanitize_redirect($location);
-
-	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
-		status_header($status); // This causes problems on IIS and some FastCGI setups
-
-	header("Location: $location", true, $status);
-
-	return true;
-}
-endif;
-
-if ( !function_exists('wp_sanitize_redirect') ) :
-/**
- * Sanitizes a URL for use in a redirect.
- *
- * @since 2.3.0
- *
- * @param string $location The path to redirect to.
- * @return string Redirect-sanitized URL.
- **/
-function wp_sanitize_redirect($location) {
-	$regex = '/
+	function wp_sanitize_redirect( $location ) {
+		$regex    = '/
 		(
 			(?: [\xC2-\xDF][\x80-\xBF]        # double-byte sequences   110xxxxx 10xxxxxx
 			|   \xE0[\xA0-\xBF][\x80-\xBF]    # triple-byte sequences   1110xxxx 10xxxxxx * 2
@@ -1241,628 +1254,707 @@ function wp_sanitize_redirect($location) {
 			|   \xF4[\x80-\x8F][\x80-\xBF]{2}
 		){1,40}                              # ...one or more times
 		)/x';
-	$location = preg_replace_callback( $regex, '_wp_sanitize_utf8_in_redirect', $location );
-	$location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!*\[\]()@]|i', '', $location);
-	$location = wp_kses_no_null($location);
+		$location = preg_replace_callback( $regex, '_wp_sanitize_utf8_in_redirect', $location );
+		$location = preg_replace( '|[^a-z0-9-~+_.?#=&;,/:%!*\[\]()@]|i', '', $location );
+		$location = wp_kses_no_null( $location );
 
-	// remove %0d and %0a from location
-	$strip = array('%0d', '%0a', '%0D', '%0A');
-	return _deep_replace( $strip, $location );
-}
-
-/**
- * URL encode UTF-8 characters in a URL.
- *
- * @ignore
- * @since 4.2.0
- * @access private
- *
- * @see wp_sanitize_redirect()
- *
- * @param array $matches RegEx matches against the redirect location.
- * @return string URL-encoded version of the first RegEx match.
- */
-function _wp_sanitize_utf8_in_redirect( $matches ) {
-	return urlencode( $matches[0] );
-}
-endif;
-
-if ( !function_exists('wp_safe_redirect') ) :
-/**
- * Performs a safe (local) redirect, using wp_redirect().
- *
- * Checks whether the $location is using an allowed host, if it has an absolute
- * path. A plugin can therefore set or remove allowed host(s) to or from the
- * list.
- *
- * If the host is not allowed, then the redirect defaults to wp-admin on the siteurl
- * instead. This prevents malicious redirects which redirect to another host,
- * but only used in a few places.
- *
- * Note: wp_safe_redirect() does not exit automatically, and should almost always be
- * followed by a call to `exit;`:
- *
- *     wp_safe_redirect( $url );
- *     exit;
- *
- * Exiting can also be selectively manipulated by using wp_safe_redirect() as a conditional
- * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} filters:
- *
- *     if ( wp_safe_redirect( $url ) ) {
- *         exit;
- *     }
- *
- * @since 2.3.0
- * @since 5.0.0 The return value from wp_redirect() is now passed on.
- *
- * @param string $location The path or URL to redirect to.
- * @param int    $status   Optional. HTTP response status code to use. Default '302' (Moved Temporarily).
- * @return bool  $redirect False if the redirect was cancelled, true otherwise.
- */
-function wp_safe_redirect($location, $status = 302) {
-
-	// Need to look at the URL the way it will end up in wp_redirect()
-	$location = wp_sanitize_redirect($location);
+		// remove %0d and %0a from location
+		$strip = array( '%0d', '%0a', '%0D', '%0A' );
+		return _deep_replace( $strip, $location );
+	}
 
 	/**
-	 * Filters the redirect fallback URL for when the provided redirect is not safe (local).
+	 * URL encode UTF-8 characters in a URL.
 	 *
-	 * @since 4.3.0
+	 * @ignore
+	 * @since 4.2.0
+	 * @access private
 	 *
-	 * @param string $fallback_url The fallback URL to use by default.
-	 * @param int    $status       The HTTP response status code to use.
+	 * @see wp_sanitize_redirect()
+	 *
+	 * @param array $matches RegEx matches against the redirect location.
+	 * @return string URL-encoded version of the first RegEx match.
 	 */
-	$location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) );
-
-	return wp_redirect( $location, $status );
-}
+	function _wp_sanitize_utf8_in_redirect( $matches ) {
+		return urlencode( $matches[0] );
+	}
 endif;
 
-if ( !function_exists('wp_validate_redirect') ) :
-/**
- * Validates a URL for use in a redirect.
- *
- * Checks whether the $location is using an allowed host, if it has an absolute
- * path. A plugin can therefore set or remove allowed host(s) to or from the
- * list.
- *
- * If the host is not allowed, then the redirect is to $default supplied
- *
- * @since 2.8.1
- *
- * @param string $location The redirect to validate
- * @param string $default  The value to return if $location is not allowed
- * @return string redirect-sanitized URL
- **/
-function wp_validate_redirect($location, $default = '') {
-	$location = trim( $location, " \t\n\r\0\x08\x0B" );
-	// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
-	if ( substr($location, 0, 2) == '//' )
-		$location = 'http:' . $location;
-
-	// In php 5 parse_url may fail if the URL query part contains http://, bug #38143
-	$test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
-
-	// @-operator is used to prevent possible warnings in PHP < 5.3.3.
-	$lp = @parse_url($test);
-
-	// Give up if malformed URL
-	if ( false === $lp )
-		return $default;
-
-	// Allow only http and https schemes. No data:, etc.
-	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
-		return $default;
-
-	// Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
-	if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
-		return $default;
-	}
-
-	// Reject malformed components parse_url() can return on odd inputs.
-	foreach ( array( 'user', 'pass', 'host' ) as $component ) {
-		if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
-			return $default;
-		}
-	}
-
-	$wpp = parse_url(home_url());
-
+if ( ! function_exists( 'wp_safe_redirect' ) ) :
 	/**
-	 * Filters the whitelist of hosts to redirect to.
+	 * Performs a safe (local) redirect, using wp_redirect().
+	 *
+	 * Checks whether the $location is using an allowed host, if it has an absolute
+	 * path. A plugin can therefore set or remove allowed host(s) to or from the
+	 * list.
+	 *
+	 * If the host is not allowed, then the redirect defaults to wp-admin on the siteurl
+	 * instead. This prevents malicious redirects which redirect to another host,
+	 * but only used in a few places.
+	 *
+	 * Note: wp_safe_redirect() does not exit automatically, and should almost always be
+	 * followed by a call to `exit;`:
+	 *
+	 *     wp_safe_redirect( $url );
+	 *     exit;
+	 *
+	 * Exiting can also be selectively manipulated by using wp_safe_redirect() as a conditional
+	 * in conjunction with the {@see 'wp_redirect'} and {@see 'wp_redirect_location'} filters:
+	 *
+	 *     if ( wp_safe_redirect( $url ) ) {
+	 *         exit;
+	 *     }
 	 *
 	 * @since 2.3.0
+	 * @since 5.0.0 The return value from wp_redirect() is now passed on.
 	 *
-	 * @param array       $hosts An array of allowed hosts.
-	 * @param bool|string $host  The parsed host; empty if not isset.
+	 * @param string $location The path or URL to redirect to.
+	 * @param int    $status   Optional. HTTP response status code to use. Default '302' (Moved Temporarily).
+	 * @return bool  $redirect False if the redirect was cancelled, true otherwise.
 	 */
-	$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '' );
+	function wp_safe_redirect( $location, $status = 302 ) {
 
-	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
-		$location = $default;
-
-	return $location;
-}
-endif;
-
-if ( ! function_exists('wp_notify_postauthor') ) :
-/**
- * Notify an author (and/or others) of a comment/trackback/pingback on a post.
- *
- * @since 1.0.0
- *
- * @param int|WP_Comment  $comment_id Comment ID or WP_Comment object.
- * @param string          $deprecated Not used
- * @return bool True on completion. False if no email addresses were specified.
- */
-function wp_notify_postauthor( $comment_id, $deprecated = null ) {
-	if ( null !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '3.8.0' );
-	}
-
-	$comment = get_comment( $comment_id );
-	if ( empty( $comment ) || empty( $comment->comment_post_ID ) )
-		return false;
-
-	$post    = get_post( $comment->comment_post_ID );
-	$author  = get_userdata( $post->post_author );
-
-	// Who to notify? By default, just the post author, but others can be added.
-	$emails = array();
-	if ( $author ) {
-		$emails[] = $author->user_email;
-	}
-
-	/**
-	 * Filters the list of email addresses to receive a comment notification.
-	 *
-	 * By default, only post authors are notified of comments. This filter allows
-	 * others to be added.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param array $emails     An array of email addresses to receive a comment notification.
-	 * @param int   $comment_id The comment ID.
-	 */
-	$emails = apply_filters( 'comment_notification_recipients', $emails, $comment->comment_ID );
-	$emails = array_filter( $emails );
-
-	// If there are no addresses to send the comment to, bail.
-	if ( ! count( $emails ) ) {
-		return false;
-	}
-
-	// Facilitate unsetting below without knowing the keys.
-	$emails = array_flip( $emails );
-
-	/**
-	 * Filters whether to notify comment authors of their comments on their own posts.
-	 *
-	 * By default, comment authors aren't notified of their comments on their own
-	 * posts. This filter allows you to override that.
-	 *
-	 * @since 3.8.0
-	 *
-	 * @param bool $notify     Whether to notify the post author of their own comment.
-	 *                         Default false.
-	 * @param int  $comment_id The comment ID.
-	 */
-	$notify_author = apply_filters( 'comment_notification_notify_author', false, $comment->comment_ID );
-
-	// The comment was left by the author
-	if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {
-		unset( $emails[ $author->user_email ] );
-	}
-
-	// The author moderated a comment on their own post
-	if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
-		unset( $emails[ $author->user_email ] );
-	}
-
-	// The post author is no longer a member of the blog
-	if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {
-		unset( $emails[ $author->user_email ] );
-	}
-
-	// If there's no email to send the comment to, bail, otherwise flip array back around for use below
-	if ( ! count( $emails ) ) {
-		return false;
-	} else {
-		$emails = array_flip( $emails );
-	}
-
-	$switched_locale = switch_to_locale( get_locale() );
-
-	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
-
-	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
-	// we want to reverse this for the plain text arena of emails.
-	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-	$comment_content = wp_specialchars_decode( $comment->comment_content );
-
-	switch ( $comment->comment_type ) {
-		case 'trackback':
-			/* translators: 1: Post title */
-			$notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
-			/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
-			$notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
-			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
-			break;
-		case 'pingback':
-			/* translators: 1: Post title */
-			$notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
-			/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
-			$notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
-			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
-			break;
-		default: // Comments
-			$notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
-			/* translators: 1: comment author, 2: comment author's IP address, 3: comment author's hostname */
-			$notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
-			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
-			break;
-	}
-	$notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-	$notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment ) ) . "\r\n";
-
-	if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
-		if ( EMPTY_TRASH_DAYS ) {
-			$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
-		} else {
-			$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
-		}
-		$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
-	}
-
-	$wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
-
-	if ( '' == $comment->comment_author ) {
-		$from = "From: \"$blogname\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: $comment->comment_author_email";
-	} else {
-		$from = "From: \"$comment->comment_author\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
-	}
-
-	$message_headers = "$from\n"
-		. "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-
-	if ( isset($reply_to) )
-		$message_headers .= $reply_to . "\n";
-
-	/**
-	 * Filters the comment notification email text.
-	 *
-	 * @since 1.5.2
-	 *
-	 * @param string $notify_message The comment notification email text.
-	 * @param int    $comment_id     Comment ID.
-	 */
-	$notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID );
-
-	/**
-	 * Filters the comment notification email subject.
-	 *
-	 * @since 1.5.2
-	 *
-	 * @param string $subject    The comment notification email subject.
-	 * @param int    $comment_id Comment ID.
-	 */
-	$subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID );
-
-	/**
-	 * Filters the comment notification email headers.
-	 *
-	 * @since 1.5.2
-	 *
-	 * @param string $message_headers Headers for the comment notification email.
-	 * @param int    $comment_id      Comment ID.
-	 */
-	$message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment->comment_ID );
-
-	foreach ( $emails as $email ) {
-		@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
-	}
-
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
-
-	return true;
-}
-endif;
-
-if ( !function_exists('wp_notify_moderator') ) :
-/**
- * Notifies the moderator of the site about a new comment that is awaiting approval.
- *
- * @since 1.0.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * Uses the {@see 'notify_moderator'} filter to determine whether the site moderator
- * should be notified, overriding the site setting.
- *
- * @param int $comment_id Comment ID.
- * @return true Always returns true.
- */
-function wp_notify_moderator($comment_id) {
-	global $wpdb;
-
-	$maybe_notify = get_option( 'moderation_notify' );
-
-	/**
-	 * Filters whether to send the site moderator email notifications, overriding the site setting.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @param bool $maybe_notify Whether to notify blog moderator.
-	 * @param int  $comment_ID   The id of the comment for the notification.
-	 */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id );
-
-	if ( ! $maybe_notify ) {
-		return true;
-	}
-
-	$comment = get_comment($comment_id);
-	$post = get_post($comment->comment_post_ID);
-	$user = get_userdata( $post->post_author );
-	// Send to the administration and to the post author if the author can modify the comment.
-	$emails = array( get_option( 'admin_email' ) );
-	if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
-		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
-			$emails[] = $user->user_email;
-	}
-
-	$switched_locale = switch_to_locale( get_locale() );
-
-	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
-	$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
-
-	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
-	// we want to reverse this for the plain text arena of emails.
-	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-	$comment_content = wp_specialchars_decode( $comment->comment_content );
-
-	switch ( $comment->comment_type ) {
-		case 'trackback':
-			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-			/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
-			$notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
-			break;
-		case 'pingback':
-			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-			/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
-			$notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
-			break;
-		default: // Comments
-			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-			/* translators: 1: Comment author name, 2: comment author's IP address, 3: comment author's hostname */
-			$notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			/* translators: 1: Comment author URL */
-			$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
-			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			/* translators: 1: Comment text */
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			break;
-	}
-
-	/* translators: Comment moderation. 1: Comment action URL */
-	$notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
-
-	if ( EMPTY_TRASH_DAYS ) {
-		/* translators: Comment moderation. 1: Comment action URL */
-		$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
-	} else {
-		/* translators: Comment moderation. 1: Comment action URL */
-		$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
-	}
-
-	/* translators: Comment moderation. 1: Comment action URL */
-	$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
-
-	/* translators: Comment moderation. 1: Number of comments awaiting approval */
-	$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) ) . "\r\n";
-	$notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n";
-
-	/* translators: Comment moderation notification email subject. 1: Site name, 2: Post title */
-	$subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
-	$message_headers = '';
-
-	/**
-	 * Filters the list of recipients for comment moderation emails.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param array $emails     List of email addresses to notify for comment moderation.
-	 * @param int   $comment_id Comment ID.
-	 */
-	$emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
-
-	/**
-	 * Filters the comment moderation email text.
-	 *
-	 * @since 1.5.2
-	 *
-	 * @param string $notify_message Text of the comment moderation email.
-	 * @param int    $comment_id     Comment ID.
-	 */
-	$notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
-
-	/**
-	 * Filters the comment moderation email subject.
-	 *
-	 * @since 1.5.2
-	 *
-	 * @param string $subject    Subject of the comment moderation email.
-	 * @param int    $comment_id Comment ID.
-	 */
-	$subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
-
-	/**
-	 * Filters the comment moderation email headers.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param string $message_headers Headers for the comment moderation email.
-	 * @param int    $comment_id      Comment ID.
-	 */
-	$message_headers = apply_filters( 'comment_moderation_headers', $message_headers, $comment_id );
-
-	foreach ( $emails as $email ) {
-		@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
-	}
-
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
-
-	return true;
-}
-endif;
-
-if ( !function_exists('wp_password_change_notification') ) :
-/**
- * Notify the blog admin of a user changing password, normally via email.
- *
- * @since 2.7.0
- *
- * @param WP_User $user User object.
- */
-function wp_password_change_notification( $user ) {
-	// send a copy of password change notification to the admin
-	// but check to see if it's the admin whose password we're changing, and skip this
-	if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
-		/* translators: %s: user name */
-		$message = sprintf( __( 'Password changed for user: %s' ), $user->user_login ) . "\r\n";
-		// The blogname option is escaped with esc_html on the way into the database in sanitize_option
-		// we want to reverse this for the plain text arena of emails.
-		$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-
-		$wp_password_change_notification_email = array(
-			'to'      => get_option( 'admin_email' ),
-			/* translators: Password change notification email subject. %s: Site title */
-			'subject' => __( '[%s] Password Changed' ),
-			'message' => $message,
-			'headers' => '',
-		);
+		// Need to look at the URL the way it will end up in wp_redirect()
+		$location = wp_sanitize_redirect( $location );
 
 		/**
-		 * Filters the contents of the password change notification email sent to the site admin.
+		 * Filters the redirect fallback URL for when the provided redirect is not safe (local).
 		 *
-		 * @since 4.9.0
+		 * @since 4.3.0
 		 *
-		 * @param array   $wp_password_change_notification_email {
-		 *     Used to build wp_mail().
-		 *
-		 *     @type string $to      The intended recipient - site admin email address.
-		 *     @type string $subject The subject of the email.
-		 *     @type string $message The body of the email.
-		 *     @type string $headers The headers of the email.
-		 * }
-		 * @param WP_User $user     User object for user whose password was changed.
-		 * @param string  $blogname The site title.
+		 * @param string $fallback_url The fallback URL to use by default.
+		 * @param int    $status       The HTTP response status code to use.
 		 */
-		$wp_password_change_notification_email = apply_filters( 'wp_password_change_notification_email', $wp_password_change_notification_email, $user, $blogname );
+		$location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) );
 
-		wp_mail(
-			$wp_password_change_notification_email['to'],
-			wp_specialchars_decode( sprintf( $wp_password_change_notification_email['subject'], $blogname ) ),
-			$wp_password_change_notification_email['message'],
-			$wp_password_change_notification_email['headers']
-		);
+		return wp_redirect( $location, $status );
 	}
-}
 endif;
 
-if ( !function_exists('wp_new_user_notification') ) :
-/**
- * Email login credentials to a newly-registered user.
- *
- * A new user registration notification is also sent to admin email.
- *
- * @since 2.0.0
- * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
- * @since 4.3.1 The `$plaintext_pass` parameter was deprecated. `$notify` added as a third parameter.
- * @since 4.6.0 The `$notify` parameter accepts 'user' for sending notification only to the user created.
- *
- * @global wpdb         $wpdb      WordPress database object for queries.
- * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.
- *
- * @param int    $user_id    User ID.
- * @param null   $deprecated Not used (argument deprecated).
- * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
- *                           string (admin only), 'user', or 'both' (admin and user). Default empty.
- */
-function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
-	if ( $deprecated !== null ) {
-		_deprecated_argument( __FUNCTION__, '4.3.1' );
+if ( ! function_exists( 'wp_validate_redirect' ) ) :
+	/**
+	 * Validates a URL for use in a redirect.
+	 *
+	 * Checks whether the $location is using an allowed host, if it has an absolute
+	 * path. A plugin can therefore set or remove allowed host(s) to or from the
+	 * list.
+	 *
+	 * If the host is not allowed, then the redirect is to $default supplied
+	 *
+	 * @since 2.8.1
+	 *
+	 * @param string $location The redirect to validate
+	 * @param string $default  The value to return if $location is not allowed
+	 * @return string redirect-sanitized URL
+	 */
+	function wp_validate_redirect( $location, $default = '' ) {
+		$location = trim( $location, " \t\n\r\0\x08\x0B" );
+		// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
+		if ( substr( $location, 0, 2 ) == '//' ) {
+			$location = 'http:' . $location;
+		}
+
+		// In php 5 parse_url may fail if the URL query part contains http://, bug #38143
+		$test = ( $cut = strpos( $location, '?' ) ) ? substr( $location, 0, $cut ) : $location;
+
+		// @-operator is used to prevent possible warnings in PHP < 5.3.3.
+		$lp = @parse_url( $test );
+
+		// Give up if malformed URL
+		if ( false === $lp ) {
+			return $default;
+		}
+
+		// Allow only http and https schemes. No data:, etc.
+		if ( isset( $lp['scheme'] ) && ! ( 'http' == $lp['scheme'] || 'https' == $lp['scheme'] ) ) {
+			return $default;
+		}
+
+		// Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
+		if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
+			return $default;
+		}
+
+		// Reject malformed components parse_url() can return on odd inputs.
+		foreach ( array( 'user', 'pass', 'host' ) as $component ) {
+			if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
+				return $default;
+			}
+		}
+
+		$wpp = parse_url( home_url() );
+
+		/**
+		 * Filters the whitelist of hosts to redirect to.
+		 *
+		 * @since 2.3.0
+		 *
+		 * @param array       $hosts An array of allowed hosts.
+		 * @param bool|string $host  The parsed host; empty if not isset.
+		 */
+		$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array( $wpp['host'] ), isset( $lp['host'] ) ? $lp['host'] : '' );
+
+		if ( isset( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts ) && $lp['host'] != strtolower( $wpp['host'] ) ) ) {
+			$location = $default;
+		}
+
+		return $location;
 	}
+endif;
 
-	global $wpdb, $wp_hasher;
-	$user = get_userdata( $user_id );
+if ( ! function_exists( 'wp_notify_postauthor' ) ) :
+	/**
+	 * Notify an author (and/or others) of a comment/trackback/pingback on a post.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @param int|WP_Comment  $comment_id Comment ID or WP_Comment object.
+	 * @param string          $deprecated Not used
+	 * @return bool True on completion. False if no email addresses were specified.
+	 */
+	function wp_notify_postauthor( $comment_id, $deprecated = null ) {
+		if ( null !== $deprecated ) {
+			_deprecated_argument( __FUNCTION__, '3.8.0' );
+		}
 
-	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
-	// we want to reverse this for the plain text arena of emails.
-	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+		$comment = get_comment( $comment_id );
+		if ( empty( $comment ) || empty( $comment->comment_post_ID ) ) {
+			return false;
+		}
+
+		$post   = get_post( $comment->comment_post_ID );
+		$author = get_userdata( $post->post_author );
+
+		// Who to notify? By default, just the post author, but others can be added.
+		$emails = array();
+		if ( $author ) {
+			$emails[] = $author->user_email;
+		}
+
+		/**
+		 * Filters the list of email addresses to receive a comment notification.
+		 *
+		 * By default, only post authors are notified of comments. This filter allows
+		 * others to be added.
+		 *
+		 * @since 3.7.0
+		 *
+		 * @param array $emails     An array of email addresses to receive a comment notification.
+		 * @param int   $comment_id The comment ID.
+		 */
+		$emails = apply_filters( 'comment_notification_recipients', $emails, $comment->comment_ID );
+		$emails = array_filter( $emails );
+
+		// If there are no addresses to send the comment to, bail.
+		if ( ! count( $emails ) ) {
+			return false;
+		}
+
+		// Facilitate unsetting below without knowing the keys.
+		$emails = array_flip( $emails );
+
+		/**
+		 * Filters whether to notify comment authors of their comments on their own posts.
+		 *
+		 * By default, comment authors aren't notified of their comments on their own
+		 * posts. This filter allows you to override that.
+		 *
+		 * @since 3.8.0
+		 *
+		 * @param bool $notify     Whether to notify the post author of their own comment.
+		 *                         Default false.
+		 * @param int  $comment_id The comment ID.
+		 */
+		$notify_author = apply_filters( 'comment_notification_notify_author', false, $comment->comment_ID );
+
+		// The comment was left by the author
+		if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {
+			unset( $emails[ $author->user_email ] );
+		}
+
+		// The author moderated a comment on their own post
+		if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
+			unset( $emails[ $author->user_email ] );
+		}
+
+		// The post author is no longer a member of the blog
+		if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {
+			unset( $emails[ $author->user_email ] );
+		}
+
+		// If there's no email to send the comment to, bail, otherwise flip array back around for use below
+		if ( ! count( $emails ) ) {
+			return false;
+		} else {
+			$emails = array_flip( $emails );
+		}
 
-	if ( 'user' !== $notify ) {
 		$switched_locale = switch_to_locale( get_locale() );
 
-		/* translators: %s: site title */
-		$message  = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
-		/* translators: %s: user login */
-		$message .= sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
-		/* translators: %s: user email address */
-		$message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n";
+		$comment_author_domain = @gethostbyaddr( $comment->comment_author_IP );
 
-		$wp_new_user_notification_email_admin = array(
-			'to'      => get_option( 'admin_email' ),
+		// The blogname option is escaped with esc_html on the way into the database in sanitize_option
+		// we want to reverse this for the plain text arena of emails.
+		$blogname        = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+		$comment_content = wp_specialchars_decode( $comment->comment_content );
+
+		switch ( $comment->comment_type ) {
+			case 'trackback':
+				/* translators: 1: Post title */
+				$notify_message = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
+				/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+				$notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+				$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+				$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
+				$notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
+				/* translators: 1: blog name, 2: post title */
+				$subject = sprintf( __( '[%1$s] Trackback: "%2$s"' ), $blogname, $post->post_title );
+				break;
+			case 'pingback':
+				/* translators: 1: Post title */
+				$notify_message = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
+				/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+				$notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+				$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+				$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
+				$notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
+				/* translators: 1: blog name, 2: post title */
+				$subject = sprintf( __( '[%1$s] Pingback: "%2$s"' ), $blogname, $post->post_title );
+				break;
+			default: // Comments
+				$notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
+				/* translators: 1: comment author, 2: comment author's IP address, 3: comment author's hostname */
+				$notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+				$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
+				$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+				$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
+				$notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
+				/* translators: 1: blog name, 2: post title */
+				$subject = sprintf( __( '[%1$s] Comment: "%2$s"' ), $blogname, $post->post_title );
+				break;
+		}
+		$notify_message .= get_permalink( $comment->comment_post_ID ) . "#comments\r\n\r\n";
+		$notify_message .= sprintf( __( 'Permalink: %s' ), get_comment_link( $comment ) ) . "\r\n";
+
+		if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
+			if ( EMPTY_TRASH_DAYS ) {
+				$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+			} else {
+				$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+			}
+			$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+		}
+
+		$wp_email = 'wordpress@' . preg_replace( '#^www\.#', '', strtolower( $_SERVER['SERVER_NAME'] ) );
+
+		if ( '' == $comment->comment_author ) {
+			$from = "From: \"$blogname\" <$wp_email>";
+			if ( '' != $comment->comment_author_email ) {
+				$reply_to = "Reply-To: $comment->comment_author_email";
+			}
+		} else {
+			$from = "From: \"$comment->comment_author\" <$wp_email>";
+			if ( '' != $comment->comment_author_email ) {
+				$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+			}
+		}
+
+		$message_headers = "$from\n"
+		. 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
+
+		if ( isset( $reply_to ) ) {
+			$message_headers .= $reply_to . "\n";
+		}
+
+		/**
+		 * Filters the comment notification email text.
+		 *
+		 * @since 1.5.2
+		 *
+		 * @param string $notify_message The comment notification email text.
+		 * @param int    $comment_id     Comment ID.
+		 */
+		$notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID );
+
+		/**
+		 * Filters the comment notification email subject.
+		 *
+		 * @since 1.5.2
+		 *
+		 * @param string $subject    The comment notification email subject.
+		 * @param int    $comment_id Comment ID.
+		 */
+		$subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID );
+
+		/**
+		 * Filters the comment notification email headers.
+		 *
+		 * @since 1.5.2
+		 *
+		 * @param string $message_headers Headers for the comment notification email.
+		 * @param int    $comment_id      Comment ID.
+		 */
+		$message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment->comment_ID );
+
+		foreach ( $emails as $email ) {
+			@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+		}
+
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
+
+		return true;
+	}
+endif;
+
+if ( ! function_exists( 'wp_notify_moderator' ) ) :
+	/**
+	 * Notifies the moderator of the site about a new comment that is awaiting approval.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * Uses the {@see 'notify_moderator'} filter to determine whether the site moderator
+	 * should be notified, overriding the site setting.
+	 *
+	 * @param int $comment_id Comment ID.
+	 * @return true Always returns true.
+	 */
+	function wp_notify_moderator( $comment_id ) {
+		global $wpdb;
+
+		$maybe_notify = get_option( 'moderation_notify' );
+
+		/**
+		 * Filters whether to send the site moderator email notifications, overriding the site setting.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param bool $maybe_notify Whether to notify blog moderator.
+		 * @param int  $comment_ID   The id of the comment for the notification.
+		 */
+		$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id );
+
+		if ( ! $maybe_notify ) {
+			return true;
+		}
+
+		$comment = get_comment( $comment_id );
+		$post    = get_post( $comment->comment_post_ID );
+		$user    = get_userdata( $post->post_author );
+		// Send to the administration and to the post author if the author can modify the comment.
+		$emails = array( get_option( 'admin_email' ) );
+		if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
+			if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
+				$emails[] = $user->user_email;
+			}
+		}
+
+		$switched_locale = switch_to_locale( get_locale() );
+
+		$comment_author_domain = @gethostbyaddr( $comment->comment_author_IP );
+		$comments_waiting      = $wpdb->get_var( "SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'" );
+
+		// The blogname option is escaped with esc_html on the way into the database in sanitize_option
+		// we want to reverse this for the plain text arena of emails.
+		$blogname        = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+		$comment_content = wp_specialchars_decode( $comment->comment_content );
+
+		switch ( $comment->comment_type ) {
+			case 'trackback':
+				/* translators: 1: Post title */
+				$notify_message  = sprintf( __( 'A new trackback on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
+				$notify_message .= get_permalink( $comment->comment_post_ID ) . "\r\n\r\n";
+				/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+				$notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+				/* translators: 1: Trackback/pingback/comment author URL */
+				$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+				$notify_message .= __( 'Trackback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
+				break;
+			case 'pingback':
+				/* translators: 1: Post title */
+				$notify_message  = sprintf( __( 'A new pingback on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
+				$notify_message .= get_permalink( $comment->comment_post_ID ) . "\r\n\r\n";
+				/* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
+				$notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+				/* translators: 1: Trackback/pingback/comment author URL */
+				$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+				$notify_message .= __( 'Pingback excerpt: ' ) . "\r\n" . $comment_content . "\r\n\r\n";
+				break;
+			default: // Comments
+				/* translators: 1: Post title */
+				$notify_message  = sprintf( __( 'A new comment on the post "%s" is waiting for your approval' ), $post->post_title ) . "\r\n";
+				$notify_message .= get_permalink( $comment->comment_post_ID ) . "\r\n\r\n";
+				/* translators: 1: Comment author name, 2: comment author's IP address, 3: comment author's hostname */
+				$notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+				/* translators: 1: Comment author URL */
+				$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
+				/* translators: 1: Trackback/pingback/comment author URL */
+				$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+				/* translators: 1: Comment text */
+				$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
+				break;
+		}
+
+		/* translators: Comment moderation. 1: Comment action URL */
+		$notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+
+		if ( EMPTY_TRASH_DAYS ) {
+			/* translators: Comment moderation. 1: Comment action URL */
+			$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+		} else {
+			/* translators: Comment moderation. 1: Comment action URL */
+			$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+		}
+
+		/* translators: Comment moderation. 1: Comment action URL */
+		$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+
+		/* translators: Comment moderation. 1: Number of comments awaiting approval */
+		$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 )
+		) . "\r\n";
+		$notify_message .= admin_url( 'edit-comments.php?comment_status=moderated#wpbody-content' ) . "\r\n";
+
+		/* translators: Comment moderation notification email subject. 1: Site name, 2: Post title */
+		$subject         = sprintf( __( '[%1$s] Please moderate: "%2$s"' ), $blogname, $post->post_title );
+		$message_headers = '';
+
+		/**
+		 * Filters the list of recipients for comment moderation emails.
+		 *
+		 * @since 3.7.0
+		 *
+		 * @param array $emails     List of email addresses to notify for comment moderation.
+		 * @param int   $comment_id Comment ID.
+		 */
+		$emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
+
+		/**
+		 * Filters the comment moderation email text.
+		 *
+		 * @since 1.5.2
+		 *
+		 * @param string $notify_message Text of the comment moderation email.
+		 * @param int    $comment_id     Comment ID.
+		 */
+		$notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
+
+		/**
+		 * Filters the comment moderation email subject.
+		 *
+		 * @since 1.5.2
+		 *
+		 * @param string $subject    Subject of the comment moderation email.
+		 * @param int    $comment_id Comment ID.
+		 */
+		$subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
+
+		/**
+		 * Filters the comment moderation email headers.
+		 *
+		 * @since 2.8.0
+		 *
+		 * @param string $message_headers Headers for the comment moderation email.
+		 * @param int    $comment_id      Comment ID.
+		 */
+		$message_headers = apply_filters( 'comment_moderation_headers', $message_headers, $comment_id );
+
+		foreach ( $emails as $email ) {
+			@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+		}
+
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
+
+		return true;
+	}
+endif;
+
+if ( ! function_exists( 'wp_password_change_notification' ) ) :
+	/**
+	 * Notify the blog admin of a user changing password, normally via email.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param WP_User $user User object.
+	 */
+	function wp_password_change_notification( $user ) {
+		// send a copy of password change notification to the admin
+		// but check to see if it's the admin whose password we're changing, and skip this
+		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
+			/* translators: %s: user name */
+			$message = sprintf( __( 'Password changed for user: %s' ), $user->user_login ) . "\r\n";
+			// The blogname option is escaped with esc_html on the way into the database in sanitize_option
+			// we want to reverse this for the plain text arena of emails.
+			$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+
+			$wp_password_change_notification_email = array(
+				'to'      => get_option( 'admin_email' ),
+				/* translators: Password change notification email subject. %s: Site title */
+				'subject' => __( '[%s] Password Changed' ),
+				'message' => $message,
+				'headers' => '',
+			);
+
+			/**
+			 * Filters the contents of the password change notification email sent to the site admin.
+			 *
+			 * @since 4.9.0
+			 *
+			 * @param array   $wp_password_change_notification_email {
+			 *     Used to build wp_mail().
+			 *
+			 *     @type string $to      The intended recipient - site admin email address.
+			 *     @type string $subject The subject of the email.
+			 *     @type string $message The body of the email.
+			 *     @type string $headers The headers of the email.
+			 * }
+			 * @param WP_User $user     User object for user whose password was changed.
+			 * @param string  $blogname The site title.
+			 */
+			$wp_password_change_notification_email = apply_filters( 'wp_password_change_notification_email', $wp_password_change_notification_email, $user, $blogname );
+
+			wp_mail(
+				$wp_password_change_notification_email['to'],
+				wp_specialchars_decode( sprintf( $wp_password_change_notification_email['subject'], $blogname ) ),
+				$wp_password_change_notification_email['message'],
+				$wp_password_change_notification_email['headers']
+			);
+		}
+	}
+endif;
+
+if ( ! function_exists( 'wp_new_user_notification' ) ) :
+	/**
+	 * Email login credentials to a newly-registered user.
+	 *
+	 * A new user registration notification is also sent to admin email.
+	 *
+	 * @since 2.0.0
+	 * @since 4.3.0 The `$plaintext_pass` parameter was changed to `$notify`.
+	 * @since 4.3.1 The `$plaintext_pass` parameter was deprecated. `$notify` added as a third parameter.
+	 * @since 4.6.0 The `$notify` parameter accepts 'user' for sending notification only to the user created.
+	 *
+	 * @global wpdb         $wpdb      WordPress database object for queries.
+	 * @global PasswordHash $wp_hasher Portable PHP password hashing framework instance.
+	 *
+	 * @param int    $user_id    User ID.
+	 * @param null   $deprecated Not used (argument deprecated).
+	 * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
+	 *                           string (admin only), 'user', or 'both' (admin and user). Default empty.
+	 */
+	function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
+		if ( $deprecated !== null ) {
+			_deprecated_argument( __FUNCTION__, '4.3.1' );
+		}
+
+		global $wpdb, $wp_hasher;
+		$user = get_userdata( $user_id );
+
+		// The blogname option is escaped with esc_html on the way into the database in sanitize_option
+		// we want to reverse this for the plain text arena of emails.
+		$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+
+		if ( 'user' !== $notify ) {
+			$switched_locale = switch_to_locale( get_locale() );
+
+			/* translators: %s: site title */
+			$message = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
+			/* translators: %s: user login */
+			$message .= sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
+			/* translators: %s: user email address */
+			$message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n";
+
+			$wp_new_user_notification_email_admin = array(
+				'to'      => get_option( 'admin_email' ),
+				/* translators: Password change notification email subject. %s: Site title */
+				'subject' => __( '[%s] New User Registration' ),
+				'message' => $message,
+				'headers' => '',
+			);
+
+			/**
+			 * Filters the contents of the new user notification email sent to the site admin.
+			 *
+			 * @since 4.9.0
+			 *
+			 * @param array   $wp_new_user_notification_email {
+			 *     Used to build wp_mail().
+			 *
+			 *     @type string $to      The intended recipient - site admin email address.
+			 *     @type string $subject The subject of the email.
+			 *     @type string $message The body of the email.
+			 *     @type string $headers The headers of the email.
+			 * }
+			 * @param WP_User $user     User object for new user.
+			 * @param string  $blogname The site title.
+			 */
+			$wp_new_user_notification_email_admin = apply_filters( 'wp_new_user_notification_email_admin', $wp_new_user_notification_email_admin, $user, $blogname );
+
+			@wp_mail(
+				$wp_new_user_notification_email_admin['to'],
+				wp_specialchars_decode( sprintf( $wp_new_user_notification_email_admin['subject'], $blogname ) ),
+				$wp_new_user_notification_email_admin['message'],
+				$wp_new_user_notification_email_admin['headers']
+			);
+
+			if ( $switched_locale ) {
+				restore_previous_locale();
+			}
+		}
+
+		// `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notification.
+		if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {
+			return;
+		}
+
+		// Generate something random for a password reset key.
+		$key = wp_generate_password( 20, false );
+
+		/** This action is documented in wp-login.php */
+		do_action( 'retrieve_password_key', $user->user_login, $key );
+
+		// Now insert the key, hashed, into the DB.
+		if ( empty( $wp_hasher ) ) {
+			require_once ABSPATH . WPINC . '/class-phpass.php';
+			$wp_hasher = new PasswordHash( 8, true );
+		}
+		$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
+		$wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
+
+		$switched_locale = switch_to_locale( get_user_locale( $user ) );
+
+		/* translators: %s: user login */
+		$message  = sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
+		$message .= __( 'To set your password, visit the following address:' ) . "\r\n\r\n";
+		$message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user->user_login ), 'login' ) . ">\r\n\r\n";
+
+		$message .= wp_login_url() . "\r\n";
+
+		$wp_new_user_notification_email = array(
+			'to'      => $user->user_email,
 			/* translators: Password change notification email subject. %s: Site title */
-			'subject' => __( '[%s] New User Registration' ),
+			'subject' => __( '[%s] Your username and password info' ),
 			'message' => $message,
 			'headers' => '',
 		);
 
 		/**
-		 * Filters the contents of the new user notification email sent to the site admin.
+		 * Filters the contents of the new user notification email sent to the new user.
 		 *
 		 * @since 4.9.0
 		 *
 		 * @param array   $wp_new_user_notification_email {
 		 *     Used to build wp_mail().
 		 *
-		 *     @type string $to      The intended recipient - site admin email address.
+		 *     @type string $to      The intended recipient - New user email address.
 		 *     @type string $subject The subject of the email.
 		 *     @type string $message The body of the email.
 		 *     @type string $headers The headers of the email.
@@ -1870,783 +1962,735 @@ function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' )
 		 * @param WP_User $user     User object for new user.
 		 * @param string  $blogname The site title.
 		 */
-		$wp_new_user_notification_email_admin = apply_filters( 'wp_new_user_notification_email_admin', $wp_new_user_notification_email_admin, $user, $blogname );
+		$wp_new_user_notification_email = apply_filters( 'wp_new_user_notification_email', $wp_new_user_notification_email, $user, $blogname );
 
-		@wp_mail(
-			$wp_new_user_notification_email_admin['to'],
-			wp_specialchars_decode( sprintf( $wp_new_user_notification_email_admin['subject'], $blogname ) ),
-			$wp_new_user_notification_email_admin['message'],
-			$wp_new_user_notification_email_admin['headers']
+		wp_mail(
+			$wp_new_user_notification_email['to'],
+			wp_specialchars_decode( sprintf( $wp_new_user_notification_email['subject'], $blogname ) ),
+			$wp_new_user_notification_email['message'],
+			$wp_new_user_notification_email['headers']
 		);
 
 		if ( $switched_locale ) {
 			restore_previous_locale();
 		}
 	}
-
-	// `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notification.
-	if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {
-		return;
-	}
-
-	// Generate something random for a password reset key.
-	$key = wp_generate_password( 20, false );
-
-	/** This action is documented in wp-login.php */
-	do_action( 'retrieve_password_key', $user->user_login, $key );
-
-	// Now insert the key, hashed, into the DB.
-	if ( empty( $wp_hasher ) ) {
-		require_once ABSPATH . WPINC . '/class-phpass.php';
-		$wp_hasher = new PasswordHash( 8, true );
-	}
-	$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
-	$wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
-
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
-
-	/* translators: %s: user login */
-	$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
-	$message .= __('To set your password, visit the following address:') . "\r\n\r\n";
-	$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user->user_login), 'login') . ">\r\n\r\n";
-
-	$message .= wp_login_url() . "\r\n";
-
-	$wp_new_user_notification_email = array(
-		'to'      => $user->user_email,
-		/* translators: Password change notification email subject. %s: Site title */
-		'subject' => __( '[%s] Your username and password info' ),
-		'message' => $message,
-		'headers' => '',
-	);
-
-	/**
-	 * Filters the contents of the new user notification email sent to the new user.
-	 *
-	 * @since 4.9.0
-	 *
-	 * @param array   $wp_new_user_notification_email {
-	 *     Used to build wp_mail().
-	 *
-	 *     @type string $to      The intended recipient - New user email address.
-	 *     @type string $subject The subject of the email.
-	 *     @type string $message The body of the email.
-	 *     @type string $headers The headers of the email.
-	 * }
-	 * @param WP_User $user     User object for new user.
-	 * @param string  $blogname The site title.
-	 */
-	$wp_new_user_notification_email = apply_filters( 'wp_new_user_notification_email', $wp_new_user_notification_email, $user, $blogname );
-
-	wp_mail(
-		$wp_new_user_notification_email['to'],
-		wp_specialchars_decode( sprintf( $wp_new_user_notification_email['subject'], $blogname ) ),
-		$wp_new_user_notification_email['message'],
-		$wp_new_user_notification_email['headers']
-	);
-
-	if ( $switched_locale ) {
-		restore_previous_locale();
-	}
-}
 endif;
 
-if ( !function_exists('wp_nonce_tick') ) :
-/**
- * Get the time-dependent variable for nonce creation.
- *
- * A nonce has a lifespan of two ticks. Nonces in their second tick may be
- * updated, e.g. by autosave.
- *
- * @since 2.5.0
- *
- * @return float Float value rounded up to the next highest integer.
- */
-function wp_nonce_tick() {
+if ( ! function_exists( 'wp_nonce_tick' ) ) :
 	/**
-	 * Filters the lifespan of nonces in seconds.
+	 * Get the time-dependent variable for nonce creation.
+	 *
+	 * A nonce has a lifespan of two ticks. Nonces in their second tick may be
+	 * updated, e.g. by autosave.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param int $lifespan Lifespan of nonces in seconds. Default 86,400 seconds, or one day.
+	 * @return float Float value rounded up to the next highest integer.
 	 */
-	$nonce_life = apply_filters( 'nonce_life', DAY_IN_SECONDS );
-
-	return ceil(time() / ( $nonce_life / 2 ));
-}
-endif;
-
-if ( !function_exists('wp_verify_nonce') ) :
-/**
- * Verify that correct nonce was used with time limit.
- *
- * The user is given an amount of time to use the token, so therefore, since the
- * UID and $action remain the same, the independent variable is the time.
- *
- * @since 2.0.3
- *
- * @param string     $nonce  Nonce that was used in the form to verify
- * @param string|int $action Should give context to what is taking place and be the same when nonce was created.
- * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
- *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
- */
-function wp_verify_nonce( $nonce, $action = -1 ) {
-	$nonce = (string) $nonce;
-	$user = wp_get_current_user();
-	$uid = (int) $user->ID;
-	if ( ! $uid ) {
+	function wp_nonce_tick() {
 		/**
-		 * Filters whether the user who generated the nonce is logged out.
-		 *
-		 * @since 3.5.0
-		 *
-		 * @param int    $uid    ID of the nonce-owning user.
-		 * @param string $action The nonce action.
-		 */
-		$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
-	}
-
-	if ( empty( $nonce ) ) {
-		return false;
-	}
-
-	$token = wp_get_session_token();
-	$i = wp_nonce_tick();
-
-	// Nonce generated 0-12 hours ago
-	$expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 );
-	if ( hash_equals( $expected, $nonce ) ) {
-		return 1;
-	}
-
-	// Nonce generated 12-24 hours ago
-	$expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
-	if ( hash_equals( $expected, $nonce ) ) {
-		return 2;
-	}
-
-	/**
-	 * Fires when nonce verification fails.
-	 *
-	 * @since 4.4.0
-	 *
-	 * @param string     $nonce  The invalid nonce.
-	 * @param string|int $action The nonce action.
-	 * @param WP_User    $user   The current user object.
-	 * @param string     $token  The user's session token.
-	 */
-	do_action( 'wp_verify_nonce_failed', $nonce, $action, $user, $token );
-
-	// Invalid nonce
-	return false;
-}
-endif;
-
-if ( !function_exists('wp_create_nonce') ) :
-/**
- * Creates a cryptographic token tied to a specific action, user, user session,
- * and window of time.
- *
- * @since 2.0.3
- * @since 4.0.0 Session tokens were integrated with nonce creation
- *
- * @param string|int $action Scalar value to add context to the nonce.
- * @return string The token.
- */
-function wp_create_nonce($action = -1) {
-	$user = wp_get_current_user();
-	$uid = (int) $user->ID;
-	if ( ! $uid ) {
-		/** This filter is documented in wp-includes/pluggable.php */
-		$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
-	}
-
-	$token = wp_get_session_token();
-	$i = wp_nonce_tick();
-
-	return substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
-}
-endif;
-
-if ( !function_exists('wp_salt') ) :
-/**
- * Get salt to add to hashes.
- *
- * Salts are created using secret keys. Secret keys are located in two places:
- * in the database and in the wp-config.php file. The secret key in the database
- * is randomly generated and will be appended to the secret keys in wp-config.php.
- *
- * The secret keys in wp-config.php should be updated to strong, random keys to maximize
- * security. Below is an example of how the secret key constants are defined.
- * Do not paste this example directly into wp-config.php. Instead, have a
- * {@link https://api.wordpress.org/secret-key/1.1/salt/ secret key created} just
- * for you.
- *
- *     define('AUTH_KEY',         ' Xakm<o xQy rw4EMsLKM-?!T+,PFF})H4lzcW57AF0U@N@< >M%G4Yt>f`z]MON');
- *     define('SECURE_AUTH_KEY',  'LzJ}op]mr|6+![P}Ak:uNdJCJZd>(Hx.-Mh#Tz)pCIU#uGEnfFz|f ;;eU%/U^O~');
- *     define('LOGGED_IN_KEY',    '|i|Ux`9<p-h$aFf(qnT:sDO:D1P^wZ$$/Ra@miTJi9G;ddp_<q}6H1)o|a +&JCM');
- *     define('NONCE_KEY',        '%:R{[P|,s.KuMltH5}cI;/k<Gx~j!f0I)m_sIyu+&NJZ)-iO>z7X>QYR0Z_XnZ@|');
- *     define('AUTH_SALT',        'eZyT)-Naw]F8CwA*VaW#q*|.)g@o}||wf~@C-YSt}(dh_r6EbI#A,y|nU2{B#JBW');
- *     define('SECURE_AUTH_SALT', '!=oLUTXh,QW=H `}`L|9/^4-3 STz},T(w}W<I`.JjPi)<Bmf1v,HpGe}T1:Xt7n');
- *     define('LOGGED_IN_SALT',   '+XSqHc;@Q*K_b|Z?NC[3H!!EONbh.n<+=uKR:>*c(u`g~EJBf#8u#R{mUEZrozmm');
- *     define('NONCE_SALT',       'h`GXHhD>SLWVfg1(1(N{;.V!MoE(SfbA_ksP@&`+AycHcAV$+?@3q+rxV{%^VyKT');
- *
- * Salting passwords helps against tools which has stored hashed values of
- * common dictionary strings. The added values makes it harder to crack.
- *
- * @since 2.5.0
- *
- * @link https://api.wordpress.org/secret-key/1.1/salt/ Create secrets for wp-config.php
- *
- * @staticvar array $cached_salts
- * @staticvar array $duplicated_keys
- *
- * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce)
- * @return string Salt value
- */
-function wp_salt( $scheme = 'auth' ) {
-	static $cached_salts = array();
-	if ( isset( $cached_salts[ $scheme ] ) ) {
-		/**
-		 * Filters the WordPress salt.
+		 * Filters the lifespan of nonces in seconds.
 		 *
 		 * @since 2.5.0
 		 *
-		 * @param string $cached_salt Cached salt for the given scheme.
-		 * @param string $scheme      Authentication scheme. Values include 'auth',
-		 *                            'secure_auth', 'logged_in', and 'nonce'.
+		 * @param int $lifespan Lifespan of nonces in seconds. Default 86,400 seconds, or one day.
 		 */
+		$nonce_life = apply_filters( 'nonce_life', DAY_IN_SECONDS );
+
+		return ceil( time() / ( $nonce_life / 2 ) );
+	}
+endif;
+
+if ( ! function_exists( 'wp_verify_nonce' ) ) :
+	/**
+	 * Verify that correct nonce was used with time limit.
+	 *
+	 * The user is given an amount of time to use the token, so therefore, since the
+	 * UID and $action remain the same, the independent variable is the time.
+	 *
+	 * @since 2.0.3
+	 *
+	 * @param string     $nonce  Nonce that was used in the form to verify
+	 * @param string|int $action Should give context to what is taking place and be the same when nonce was created.
+	 * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
+	 *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
+	 */
+	function wp_verify_nonce( $nonce, $action = -1 ) {
+		$nonce = (string) $nonce;
+		$user  = wp_get_current_user();
+		$uid   = (int) $user->ID;
+		if ( ! $uid ) {
+			/**
+			 * Filters whether the user who generated the nonce is logged out.
+			 *
+			 * @since 3.5.0
+			 *
+			 * @param int    $uid    ID of the nonce-owning user.
+			 * @param string $action The nonce action.
+			 */
+			$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
+		}
+
+		if ( empty( $nonce ) ) {
+			return false;
+		}
+
+		$token = wp_get_session_token();
+		$i     = wp_nonce_tick();
+
+		// Nonce generated 0-12 hours ago
+		$expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+		if ( hash_equals( $expected, $nonce ) ) {
+			return 1;
+		}
+
+		// Nonce generated 12-24 hours ago
+		$expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+		if ( hash_equals( $expected, $nonce ) ) {
+			return 2;
+		}
+
+		/**
+		 * Fires when nonce verification fails.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param string     $nonce  The invalid nonce.
+		 * @param string|int $action The nonce action.
+		 * @param WP_User    $user   The current user object.
+		 * @param string     $token  The user's session token.
+		 */
+		do_action( 'wp_verify_nonce_failed', $nonce, $action, $user, $token );
+
+		// Invalid nonce
+		return false;
+	}
+endif;
+
+if ( ! function_exists( 'wp_create_nonce' ) ) :
+	/**
+	 * Creates a cryptographic token tied to a specific action, user, user session,
+	 * and window of time.
+	 *
+	 * @since 2.0.3
+	 * @since 4.0.0 Session tokens were integrated with nonce creation
+	 *
+	 * @param string|int $action Scalar value to add context to the nonce.
+	 * @return string The token.
+	 */
+	function wp_create_nonce( $action = -1 ) {
+		$user = wp_get_current_user();
+		$uid  = (int) $user->ID;
+		if ( ! $uid ) {
+			/** This filter is documented in wp-includes/pluggable.php */
+			$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
+		}
+
+		$token = wp_get_session_token();
+		$i     = wp_nonce_tick();
+
+		return substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+	}
+endif;
+
+if ( ! function_exists( 'wp_salt' ) ) :
+	/**
+	 * Get salt to add to hashes.
+	 *
+	 * Salts are created using secret keys. Secret keys are located in two places:
+	 * in the database and in the wp-config.php file. The secret key in the database
+	 * is randomly generated and will be appended to the secret keys in wp-config.php.
+	 *
+	 * The secret keys in wp-config.php should be updated to strong, random keys to maximize
+	 * security. Below is an example of how the secret key constants are defined.
+	 * Do not paste this example directly into wp-config.php. Instead, have a
+	 * {@link https://api.wordpress.org/secret-key/1.1/salt/ secret key created} just
+	 * for you.
+	 *
+	 *     define('AUTH_KEY',         ' Xakm<o xQy rw4EMsLKM-?!T+,PFF})H4lzcW57AF0U@N@< >M%G4Yt>f`z]MON');
+	 *     define('SECURE_AUTH_KEY',  'LzJ}op]mr|6+![P}Ak:uNdJCJZd>(Hx.-Mh#Tz)pCIU#uGEnfFz|f ;;eU%/U^O~');
+	 *     define('LOGGED_IN_KEY',    '|i|Ux`9<p-h$aFf(qnT:sDO:D1P^wZ$$/Ra@miTJi9G;ddp_<q}6H1)o|a +&JCM');
+	 *     define('NONCE_KEY',        '%:R{[P|,s.KuMltH5}cI;/k<Gx~j!f0I)m_sIyu+&NJZ)-iO>z7X>QYR0Z_XnZ@|');
+	 *     define('AUTH_SALT',        'eZyT)-Naw]F8CwA*VaW#q*|.)g@o}||wf~@C-YSt}(dh_r6EbI#A,y|nU2{B#JBW');
+	 *     define('SECURE_AUTH_SALT', '!=oLUTXh,QW=H `}`L|9/^4-3 STz},T(w}W<I`.JjPi)<Bmf1v,HpGe}T1:Xt7n');
+	 *     define('LOGGED_IN_SALT',   '+XSqHc;@Q*K_b|Z?NC[3H!!EONbh.n<+=uKR:>*c(u`g~EJBf#8u#R{mUEZrozmm');
+	 *     define('NONCE_SALT',       'h`GXHhD>SLWVfg1(1(N{;.V!MoE(SfbA_ksP@&`+AycHcAV$+?@3q+rxV{%^VyKT');
+	 *
+	 * Salting passwords helps against tools which has stored hashed values of
+	 * common dictionary strings. The added values makes it harder to crack.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @link https://api.wordpress.org/secret-key/1.1/salt/ Create secrets for wp-config.php
+	 *
+	 * @staticvar array $cached_salts
+	 * @staticvar array $duplicated_keys
+	 *
+	 * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce)
+	 * @return string Salt value
+	 */
+	function wp_salt( $scheme = 'auth' ) {
+		static $cached_salts = array();
+		if ( isset( $cached_salts[ $scheme ] ) ) {
+			/**
+			 * Filters the WordPress salt.
+			 *
+			 * @since 2.5.0
+			 *
+			 * @param string $cached_salt Cached salt for the given scheme.
+			 * @param string $scheme      Authentication scheme. Values include 'auth',
+			 *                            'secure_auth', 'logged_in', and 'nonce'.
+			 */
+			return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );
+		}
+
+		static $duplicated_keys;
+		if ( null === $duplicated_keys ) {
+			$duplicated_keys = array( 'put your unique phrase here' => true );
+			foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
+				foreach ( array( 'KEY', 'SALT' ) as $second ) {
+					if ( ! defined( "{$first}_{$second}" ) ) {
+						continue;
+					}
+					$value                     = constant( "{$first}_{$second}" );
+					$duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] );
+				}
+			}
+		}
+
+		$values = array(
+			'key'  => '',
+			'salt' => '',
+		);
+		if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) {
+			$values['key'] = SECRET_KEY;
+		}
+		if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) {
+			$values['salt'] = SECRET_SALT;
+		}
+
+		if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) {
+			foreach ( array( 'key', 'salt' ) as $type ) {
+				$const = strtoupper( "{$scheme}_{$type}" );
+				if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
+					$values[ $type ] = constant( $const );
+				} elseif ( ! $values[ $type ] ) {
+					$values[ $type ] = get_site_option( "{$scheme}_{$type}" );
+					if ( ! $values[ $type ] ) {
+						$values[ $type ] = wp_generate_password( 64, true, true );
+						update_site_option( "{$scheme}_{$type}", $values[ $type ] );
+					}
+				}
+			}
+		} else {
+			if ( ! $values['key'] ) {
+				$values['key'] = get_site_option( 'secret_key' );
+				if ( ! $values['key'] ) {
+					$values['key'] = wp_generate_password( 64, true, true );
+					update_site_option( 'secret_key', $values['key'] );
+				}
+			}
+			$values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] );
+		}
+
+		$cached_salts[ $scheme ] = $values['key'] . $values['salt'];
+
+		/** This filter is documented in wp-includes/pluggable.php */
 		return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );
 	}
-
-	static $duplicated_keys;
-	if ( null === $duplicated_keys ) {
-		$duplicated_keys = array( 'put your unique phrase here' => true );
-		foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
-			foreach ( array( 'KEY', 'SALT' ) as $second ) {
-				if ( ! defined( "{$first}_{$second}" ) ) {
-					continue;
-				}
-				$value = constant( "{$first}_{$second}" );
-				$duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] );
-			}
-		}
-	}
-
-	$values = array(
-		'key' => '',
-		'salt' => ''
-	);
-	if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) {
-		$values['key'] = SECRET_KEY;
-	}
-	if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) {
-		$values['salt'] = SECRET_SALT;
-	}
-
-	if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) {
-		foreach ( array( 'key', 'salt' ) as $type ) {
-			$const = strtoupper( "{$scheme}_{$type}" );
-			if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
-				$values[ $type ] = constant( $const );
-			} elseif ( ! $values[ $type ] ) {
-				$values[ $type ] = get_site_option( "{$scheme}_{$type}" );
-				if ( ! $values[ $type ] ) {
-					$values[ $type ] = wp_generate_password( 64, true, true );
-					update_site_option( "{$scheme}_{$type}", $values[ $type ] );
-				}
-			}
-		}
-	} else {
-		if ( ! $values['key'] ) {
-			$values['key'] = get_site_option( 'secret_key' );
-			if ( ! $values['key'] ) {
-				$values['key'] = wp_generate_password( 64, true, true );
-				update_site_option( 'secret_key', $values['key'] );
-			}
-		}
-		$values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] );
-	}
-
-	$cached_salts[ $scheme ] = $values['key'] . $values['salt'];
-
-	/** This filter is documented in wp-includes/pluggable.php */
-	return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );
-}
 endif;
 
-if ( !function_exists('wp_hash') ) :
-/**
- * Get hash of given string.
- *
- * @since 2.0.3
- *
- * @param string $data   Plain text to hash
- * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce)
- * @return string Hash of $data
- */
-function wp_hash($data, $scheme = 'auth') {
-	$salt = wp_salt($scheme);
+if ( ! function_exists( 'wp_hash' ) ) :
+	/**
+	 * Get hash of given string.
+	 *
+	 * @since 2.0.3
+	 *
+	 * @param string $data   Plain text to hash
+	 * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce)
+	 * @return string Hash of $data
+	 */
+	function wp_hash( $data, $scheme = 'auth' ) {
+		$salt = wp_salt( $scheme );
 
-	return hash_hmac('md5', $data, $salt);
-}
-endif;
-
-if ( !function_exists('wp_hash_password') ) :
-/**
- * Create a hash (encrypt) of a plain text password.
- *
- * For integration with other applications, this function can be overwritten to
- * instead use the other package password checking algorithm.
- *
- * @since 2.5.0
- *
- * @global PasswordHash $wp_hasher PHPass object
- *
- * @param string $password Plain text user password to hash
- * @return string The hash string of the password
- */
-function wp_hash_password($password) {
-	global $wp_hasher;
-
-	if ( empty($wp_hasher) ) {
-		require_once( ABSPATH . WPINC . '/class-phpass.php');
-		// By default, use the portable hash from phpass
-		$wp_hasher = new PasswordHash(8, true);
+		return hash_hmac( 'md5', $data, $salt );
 	}
-
-	return $wp_hasher->HashPassword( trim( $password ) );
-}
 endif;
 
-if ( !function_exists('wp_check_password') ) :
-/**
- * Checks the plaintext password against the encrypted Password.
- *
- * Maintains compatibility between old version and the new cookie authentication
- * protocol using PHPass library. The $hash parameter is the encrypted password
- * and the function compares the plain text password when encrypted similarly
- * against the already encrypted password to see if they match.
- *
- * For integration with other applications, this function can be overwritten to
- * instead use the other package password checking algorithm.
- *
- * @since 2.5.0
- *
- * @global PasswordHash $wp_hasher PHPass object used for checking the password
- *	against the $hash + $password
- * @uses PasswordHash::CheckPassword
- *
- * @param string     $password Plaintext user's password
- * @param string     $hash     Hash of the user's password to check against.
- * @param string|int $user_id  Optional. User ID.
- * @return bool False, if the $password does not match the hashed password
- */
-function wp_check_password($password, $hash, $user_id = '') {
-	global $wp_hasher;
+if ( ! function_exists( 'wp_hash_password' ) ) :
+	/**
+	 * Create a hash (encrypt) of a plain text password.
+	 *
+	 * For integration with other applications, this function can be overwritten to
+	 * instead use the other package password checking algorithm.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @global PasswordHash $wp_hasher PHPass object
+	 *
+	 * @param string $password Plain text user password to hash
+	 * @return string The hash string of the password
+	 */
+	function wp_hash_password( $password ) {
+		global $wp_hasher;
 
-	// If the hash is still md5...
-	if ( strlen($hash) <= 32 ) {
-		$check = hash_equals( $hash, md5( $password ) );
-		if ( $check && $user_id ) {
-			// Rehash using new hash.
-			wp_set_password($password, $user_id);
-			$hash = wp_hash_password($password);
+		if ( empty( $wp_hasher ) ) {
+			require_once( ABSPATH . WPINC . '/class-phpass.php' );
+			// By default, use the portable hash from phpass
+			$wp_hasher = new PasswordHash( 8, true );
+		}
+
+		return $wp_hasher->HashPassword( trim( $password ) );
+	}
+endif;
+
+if ( ! function_exists( 'wp_check_password' ) ) :
+	/**
+	 * Checks the plaintext password against the encrypted Password.
+	 *
+	 * Maintains compatibility between old version and the new cookie authentication
+	 * protocol using PHPass library. The $hash parameter is the encrypted password
+	 * and the function compares the plain text password when encrypted similarly
+	 * against the already encrypted password to see if they match.
+	 *
+	 * For integration with other applications, this function can be overwritten to
+	 * instead use the other package password checking algorithm.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @global PasswordHash $wp_hasher PHPass object used for checking the password
+	 *  against the $hash + $password
+	 * @uses PasswordHash::CheckPassword
+	 *
+	 * @param string     $password Plaintext user's password
+	 * @param string     $hash     Hash of the user's password to check against.
+	 * @param string|int $user_id  Optional. User ID.
+	 * @return bool False, if the $password does not match the hashed password
+	 */
+	function wp_check_password( $password, $hash, $user_id = '' ) {
+		global $wp_hasher;
+
+		// If the hash is still md5...
+		if ( strlen( $hash ) <= 32 ) {
+			$check = hash_equals( $hash, md5( $password ) );
+			if ( $check && $user_id ) {
+				// Rehash using new hash.
+				wp_set_password( $password, $user_id );
+				$hash = wp_hash_password( $password );
+			}
+
+			/**
+			 * Filters whether the plaintext password matches the encrypted password.
+			 *
+			 * @since 2.5.0
+			 *
+			 * @param bool       $check    Whether the passwords match.
+			 * @param string     $password The plaintext password.
+			 * @param string     $hash     The hashed password.
+			 * @param string|int $user_id  User ID. Can be empty.
+			 */
+			return apply_filters( 'check_password', $check, $password, $hash, $user_id );
+		}
+
+		// If the stored hash is longer than an MD5, presume the
+		// new style phpass portable hash.
+		if ( empty( $wp_hasher ) ) {
+			require_once( ABSPATH . WPINC . '/class-phpass.php' );
+			// By default, use the portable hash from phpass
+			$wp_hasher = new PasswordHash( 8, true );
+		}
+
+		$check = $wp_hasher->CheckPassword( $password, $hash );
+
+		/** This filter is documented in wp-includes/pluggable.php */
+		return apply_filters( 'check_password', $check, $password, $hash, $user_id );
+	}
+endif;
+
+if ( ! function_exists( 'wp_generate_password' ) ) :
+	/**
+	 * Generates a random password drawn from the defined set of characters.
+	 *
+	 * @since 2.5.0
+	 *
+	 * @param int  $length              Optional. The length of password to generate. Default 12.
+	 * @param bool $special_chars       Optional. Whether to include standard special characters.
+	 *                                  Default true.
+	 * @param bool $extra_special_chars Optional. Whether to include other special characters.
+	 *                                  Used when generating secret keys and salts. Default false.
+	 * @return string The random password.
+	 */
+	function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
+		$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		if ( $special_chars ) {
+			$chars .= '!@#$%^&*()';
+		}
+		if ( $extra_special_chars ) {
+			$chars .= '-_ []{}<>~`+=,.;:/?|';
+		}
+
+		$password = '';
+		for ( $i = 0; $i < $length; $i++ ) {
+			$password .= substr( $chars, wp_rand( 0, strlen( $chars ) - 1 ), 1 );
 		}
 
 		/**
-		 * Filters whether the plaintext password matches the encrypted password.
+		 * Filters the randomly-generated password.
 		 *
-		 * @since 2.5.0
+		 * @since 3.0.0
 		 *
-		 * @param bool       $check    Whether the passwords match.
-		 * @param string     $password The plaintext password.
-		 * @param string     $hash     The hashed password.
-		 * @param string|int $user_id  User ID. Can be empty.
+		 * @param string $password The generated password.
 		 */
-		return apply_filters( 'check_password', $check, $password, $hash, $user_id );
+		return apply_filters( 'random_password', $password );
 	}
-
-	// If the stored hash is longer than an MD5, presume the
-	// new style phpass portable hash.
-	if ( empty($wp_hasher) ) {
-		require_once( ABSPATH . WPINC . '/class-phpass.php');
-		// By default, use the portable hash from phpass
-		$wp_hasher = new PasswordHash(8, true);
-	}
-
-	$check = $wp_hasher->CheckPassword($password, $hash);
-
-	/** This filter is documented in wp-includes/pluggable.php */
-	return apply_filters( 'check_password', $check, $password, $hash, $user_id );
-}
 endif;
 
-if ( !function_exists('wp_generate_password') ) :
-/**
- * Generates a random password drawn from the defined set of characters.
- *
- * @since 2.5.0
- *
- * @param int  $length              Optional. The length of password to generate. Default 12.
- * @param bool $special_chars       Optional. Whether to include standard special characters.
- *                                  Default true.
- * @param bool $extra_special_chars Optional. Whether to include other special characters.
- *                                  Used when generating secret keys and salts. Default false.
- * @return string The random password.
- */
-function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
-	$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	if ( $special_chars )
-		$chars .= '!@#$%^&*()';
-	if ( $extra_special_chars )
-		$chars .= '-_ []{}<>~`+=,.;:/?|';
-
-	$password = '';
-	for ( $i = 0; $i < $length; $i++ ) {
-		$password .= substr($chars, wp_rand(0, strlen($chars) - 1), 1);
-	}
-
+if ( ! function_exists( 'wp_rand' ) ) :
 	/**
-	 * Filters the randomly-generated password.
+	 * Generates a random number
 	 *
-	 * @since 3.0.0
+	 * @since 2.6.2
+	 * @since 4.4.0 Uses PHP7 random_int() or the random_compat library if available.
 	 *
-	 * @param string $password The generated password.
+	 * @global string $rnd_value
+	 * @staticvar string $seed
+	 * @staticvar bool $external_rand_source_available
+	 *
+	 * @param int $min Lower limit for the generated number
+	 * @param int $max Upper limit for the generated number
+	 * @return int A random number between min and max
 	 */
-	return apply_filters( 'random_password', $password );
-}
-endif;
+	function wp_rand( $min = 0, $max = 0 ) {
+		global $rnd_value;
 
-if ( !function_exists('wp_rand') ) :
-/**
- * Generates a random number
- *
- * @since 2.6.2
- * @since 4.4.0 Uses PHP7 random_int() or the random_compat library if available.
- *
- * @global string $rnd_value
- * @staticvar string $seed
- * @staticvar bool $external_rand_source_available
- *
- * @param int $min Lower limit for the generated number
- * @param int $max Upper limit for the generated number
- * @return int A random number between min and max
- */
-function wp_rand( $min = 0, $max = 0 ) {
-	global $rnd_value;
+		// Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
+		$max_random_number = 3000000000 === 2147483647 ? (float) '4294967295' : 4294967295; // 4294967295 = 0xffffffff
 
-	// Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
-	$max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff
+		// We only handle Ints, floats are truncated to their integer value.
+		$min = (int) $min;
+		$max = (int) $max;
 
-	// We only handle Ints, floats are truncated to their integer value.
-	$min = (int) $min;
-	$max = (int) $max;
-
-	// Use PHP's CSPRNG, or a compatible method
-	static $use_random_int_functionality = true;
-	if ( $use_random_int_functionality ) {
-		try {
-			$_max = ( 0 != $max ) ? $max : $max_random_number;
-			// wp_rand() can accept arguments in either order, PHP cannot.
-			$_max = max( $min, $_max );
-			$_min = min( $min, $_max );
-			$val = random_int( $_min, $_max );
-			if ( false !== $val ) {
-				return absint( $val );
-			} else {
+		// Use PHP's CSPRNG, or a compatible method
+		static $use_random_int_functionality = true;
+		if ( $use_random_int_functionality ) {
+			try {
+				$_max = ( 0 != $max ) ? $max : $max_random_number;
+				// wp_rand() can accept arguments in either order, PHP cannot.
+				$_max = max( $min, $_max );
+				$_min = min( $min, $_max );
+				$val  = random_int( $_min, $_max );
+				if ( false !== $val ) {
+					return absint( $val );
+				} else {
+					$use_random_int_functionality = false;
+				}
+			} catch ( Error $e ) {
+				$use_random_int_functionality = false;
+			} catch ( Exception $e ) {
 				$use_random_int_functionality = false;
 			}
-		} catch ( Error $e ) {
-			$use_random_int_functionality = false;
-		} catch ( Exception $e ) {
-			$use_random_int_functionality = false;
 		}
-	}
 
-	// Reset $rnd_value after 14 uses
-	// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
-	if ( strlen($rnd_value) < 8 ) {
-		if ( defined( 'WP_SETUP_CONFIG' ) )
-			static $seed = '';
-		else
-			$seed = get_transient('random_seed');
-		$rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
-		$rnd_value .= sha1($rnd_value);
-		$rnd_value .= sha1($rnd_value . $seed);
-		$seed = md5($seed . $rnd_value);
-		if ( ! defined( 'WP_SETUP_CONFIG' ) && ! defined( 'WP_INSTALLING' ) ) {
-			set_transient( 'random_seed', $seed );
+		// Reset $rnd_value after 14 uses
+		// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
+		if ( strlen( $rnd_value ) < 8 ) {
+			if ( defined( 'WP_SETUP_CONFIG' ) ) {
+				static $seed = '';
+			} else {
+				$seed = get_transient( 'random_seed' );
+			}
+			$rnd_value  = md5( uniqid( microtime() . mt_rand(), true ) . $seed );
+			$rnd_value .= sha1( $rnd_value );
+			$rnd_value .= sha1( $rnd_value . $seed );
+			$seed       = md5( $seed . $rnd_value );
+			if ( ! defined( 'WP_SETUP_CONFIG' ) && ! defined( 'WP_INSTALLING' ) ) {
+				set_transient( 'random_seed', $seed );
+			}
 		}
+
+		// Take the first 8 digits for our value
+		$value = substr( $rnd_value, 0, 8 );
+
+		// Strip the first eight, leaving the remainder for the next call to wp_rand().
+		$rnd_value = substr( $rnd_value, 8 );
+
+		$value = abs( hexdec( $value ) );
+
+		// Reduce the value to be within the min - max range
+		if ( $max != 0 ) {
+			$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+		}
+
+		return abs( intval( $value ) );
 	}
-
-	// Take the first 8 digits for our value
-	$value = substr($rnd_value, 0, 8);
-
-	// Strip the first eight, leaving the remainder for the next call to wp_rand().
-	$rnd_value = substr($rnd_value, 8);
-
-	$value = abs(hexdec($value));
-
-	// Reduce the value to be within the min - max range
-	if ( $max != 0 )
-		$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
-
-	return abs(intval($value));
-}
 endif;
 
-if ( !function_exists('wp_set_password') ) :
-/**
- * Updates the user's password with a new encrypted one.
- *
- * For integration with other applications, this function can be overwritten to
- * instead use the other package password checking algorithm.
- *
- * Please note: This function should be used sparingly and is really only meant for single-time
- * application. Leveraging this improperly in a plugin or theme could result in an endless loop
- * of password resets if precautions are not taken to ensure it does not execute on every page load.
- *
- * @since 2.5.0
- *
- * @global wpdb $wpdb WordPress database abstraction object.
- *
- * @param string $password The plaintext new user password
- * @param int    $user_id  User ID
- */
-function wp_set_password( $password, $user_id ) {
-	global $wpdb;
-
-	$hash = wp_hash_password( $password );
-	$wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id) );
-
-	wp_cache_delete($user_id, 'users');
-}
-endif;
-
-if ( !function_exists( 'get_avatar' ) ) :
-/**
- * Retrieve the avatar `<img>` tag for a user, email address, MD5 hash, comment, or post.
- *
- * @since 2.5.0
- * @since 4.2.0 Optional `$args` parameter added.
- *
- * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
- *                           user email, WP_User object, WP_Post object, or WP_Comment object.
- * @param int    $size       Optional. Height and width of the avatar image file in pixels. Default 96.
- * @param string $default    Optional. URL for the default image or a default type. Accepts '404'
- *                           (return a 404 instead of a default image), 'retro' (8bit), 'monsterid'
- *                           (monster), 'wavatar' (cartoon face), 'indenticon' (the "quilt"),
- *                           'mystery', 'mm', or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF),
- *                           or 'gravatar_default' (the Gravatar logo). Default is the value of the
- *                           'avatar_default' option, with a fallback of 'mystery'.
- * @param string $alt        Optional. Alternative text to use in &lt;img&gt; tag. Default empty.
- * @param array  $args       {
- *     Optional. Extra arguments to retrieve the avatar.
- *
- *     @type int          $height        Display height of the avatar in pixels. Defaults to $size.
- *     @type int          $width         Display width of the avatar in pixels. Defaults to $size.
- *     @type bool         $force_default Whether to always show the default image, never the Gravatar. Default false.
- *     @type string       $rating        What rating to display avatars up to. Accepts 'G', 'PG', 'R', 'X', and are
- *                                       judged in that order. Default is the value of the 'avatar_rating' option.
- *     @type string       $scheme        URL scheme to use. See set_url_scheme() for accepted values.
- *                                       Default null.
- *     @type array|string $class         Array or string of additional classes to add to the &lt;img&gt; element.
- *                                       Default null.
- *     @type bool         $force_display Whether to always show the avatar - ignores the show_avatars option.
- *                                       Default false.
- *     @type string       $extra_attr    HTML attributes to insert in the IMG element. Is not sanitized. Default empty.
- * }
- * @return false|string `<img>` tag for the user's avatar. False on failure.
- */
-function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = null ) {
-	$defaults = array(
-		// get_avatar_data() args.
-		'size'          => 96,
-		'height'        => null,
-		'width'         => null,
-		'default'       => get_option( 'avatar_default', 'mystery' ),
-		'force_default' => false,
-		'rating'        => get_option( 'avatar_rating' ),
-		'scheme'        => null,
-		'alt'           => '',
-		'class'         => null,
-		'force_display' => false,
-		'extra_attr'    => '',
-	);
-
-	if ( empty( $args ) ) {
-		$args = array();
-	}
-
-	$args['size']    = (int) $size;
-	$args['default'] = $default;
-	$args['alt']     = $alt;
-
-	$args = wp_parse_args( $args, $defaults );
-
-	if ( empty( $args['height'] ) ) {
-		$args['height'] = $args['size'];
-	}
-	if ( empty( $args['width'] ) ) {
-		$args['width'] = $args['size'];
-	}
-
-	if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
-		$id_or_email = get_comment( $id_or_email );
-	}
-
+if ( ! function_exists( 'wp_set_password' ) ) :
 	/**
-	 * Filters whether to retrieve the avatar URL early.
+	 * Updates the user's password with a new encrypted one.
 	 *
-	 * Passing a non-null value will effectively short-circuit get_avatar(), passing
-	 * the value through the {@see 'get_avatar'} filter and returning early.
+	 * For integration with other applications, this function can be overwritten to
+	 * instead use the other package password checking algorithm.
 	 *
-	 * @since 4.2.0
-	 *
-	 * @param string $avatar      HTML for the user's avatar. Default null.
-	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
-	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
-	 * @param array  $args        Arguments passed to get_avatar_url(), after processing.
-	 */
-	$avatar = apply_filters( 'pre_get_avatar', null, $id_or_email, $args );
-
-	if ( ! is_null( $avatar ) ) {
-		/** This filter is documented in wp-includes/pluggable.php */
-		return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
-	}
-
-	if ( ! $args['force_display'] && ! get_option( 'show_avatars' ) ) {
-		return false;
-	}
-
-	$url2x = get_avatar_url( $id_or_email, array_merge( $args, array( 'size' => $args['size'] * 2 ) ) );
-
-	$args = get_avatar_data( $id_or_email, $args );
-
-	$url = $args['url'];
-
-	if ( ! $url || is_wp_error( $url ) ) {
-		return false;
-	}
-
-	$class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' );
-
-	if ( ! $args['found_avatar'] || $args['force_default'] ) {
-		$class[] = 'avatar-default';
-	}
-
-	if ( $args['class'] ) {
-		if ( is_array( $args['class'] ) ) {
-			$class = array_merge( $class, $args['class'] );
-		} else {
-			$class[] = $args['class'];
-		}
-	}
-
-	$avatar = sprintf(
-		"<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' %s/>",
-		esc_attr( $args['alt'] ),
-		esc_url( $url ),
-		esc_url( $url2x ) . ' 2x',
-		esc_attr( join( ' ', $class ) ),
-		(int) $args['height'],
-		(int) $args['width'],
-		$args['extra_attr']
-	);
-
-	/**
-	 * Filters the avatar to retrieve.
+	 * Please note: This function should be used sparingly and is really only meant for single-time
+	 * application. Leveraging this improperly in a plugin or theme could result in an endless loop
+	 * of password resets if precautions are not taken to ensure it does not execute on every page load.
 	 *
 	 * @since 2.5.0
-	 * @since 4.2.0 The `$args` parameter was added.
 	 *
-	 * @param string $avatar      &lt;img&gt; tag for the user's avatar.
-	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
-	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
-	 * @param int    $size        Square avatar width and height in pixels to retrieve.
-	 * @param string $default     URL for the default image or a default type. Accepts '404', 'retro', 'monsterid',
-	 *                            'wavatar', 'indenticon','mystery' (or 'mm', or 'mysteryman'), 'blank', or 'gravatar_default'.
-	 *                            Default is the value of the 'avatar_default' option, with a fallback of 'mystery'.
-	 * @param string $alt         Alternative text to use in the avatar image tag. Default empty.
-	 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
+	 * @global wpdb $wpdb WordPress database abstraction object.
+	 *
+	 * @param string $password The plaintext new user password
+	 * @param int    $user_id  User ID
 	 */
-	return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
-}
+	function wp_set_password( $password, $user_id ) {
+		global $wpdb;
+
+		$hash = wp_hash_password( $password );
+		$wpdb->update(
+			$wpdb->users, array(
+				'user_pass'           => $hash,
+				'user_activation_key' => '',
+			), array( 'ID' => $user_id )
+		);
+
+		wp_cache_delete( $user_id, 'users' );
+	}
 endif;
 
-if ( !function_exists( 'wp_text_diff' ) ) :
-/**
- * Displays a human readable HTML representation of the difference between two strings.
- *
- * The Diff is available for getting the changes between versions. The output is
- * HTML, so the primary use is for displaying the changes. If the two strings
- * are equivalent, then an empty string will be returned.
- *
- * The arguments supported and can be changed are listed below.
- *
- * 'title' : Default is an empty string. Titles the diff in a manner compatible
- *		with the output.
- * 'title_left' : Default is an empty string. Change the HTML to the left of the
- *		title.
- * 'title_right' : Default is an empty string. Change the HTML to the right of
- *		the title.
- *
- * @since 2.6.0
- *
- * @see wp_parse_args() Used to change defaults to user defined settings.
- * @uses Text_Diff
- * @uses WP_Text_Diff_Renderer_Table
- *
- * @param string       $left_string  "old" (left) version of string
- * @param string       $right_string "new" (right) version of string
- * @param string|array $args         Optional. Change 'title', 'title_left', and 'title_right' defaults.
- * @return string Empty string if strings are equivalent or HTML with differences.
- */
-function wp_text_diff( $left_string, $right_string, $args = null ) {
-	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
-	$args = wp_parse_args( $args, $defaults );
+if ( ! function_exists( 'get_avatar' ) ) :
+	/**
+	 * Retrieve the avatar `<img>` tag for a user, email address, MD5 hash, comment, or post.
+	 *
+	 * @since 2.5.0
+	 * @since 4.2.0 Optional `$args` parameter added.
+	 *
+	 * @param mixed $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+	 *                           user email, WP_User object, WP_Post object, or WP_Comment object.
+	 * @param int    $size       Optional. Height and width of the avatar image file in pixels. Default 96.
+	 * @param string $default    Optional. URL for the default image or a default type. Accepts '404'
+	 *                           (return a 404 instead of a default image), 'retro' (8bit), 'monsterid'
+	 *                           (monster), 'wavatar' (cartoon face), 'indenticon' (the "quilt"),
+	 *                           'mystery', 'mm', or 'mysteryman' (The Oyster Man), 'blank' (transparent GIF),
+	 *                           or 'gravatar_default' (the Gravatar logo). Default is the value of the
+	 *                           'avatar_default' option, with a fallback of 'mystery'.
+	 * @param string $alt        Optional. Alternative text to use in &lt;img&gt; tag. Default empty.
+	 * @param array  $args       {
+	 *     Optional. Extra arguments to retrieve the avatar.
+	 *
+	 *     @type int          $height        Display height of the avatar in pixels. Defaults to $size.
+	 *     @type int          $width         Display width of the avatar in pixels. Defaults to $size.
+	 *     @type bool         $force_default Whether to always show the default image, never the Gravatar. Default false.
+	 *     @type string       $rating        What rating to display avatars up to. Accepts 'G', 'PG', 'R', 'X', and are
+	 *                                       judged in that order. Default is the value of the 'avatar_rating' option.
+	 *     @type string       $scheme        URL scheme to use. See set_url_scheme() for accepted values.
+	 *                                       Default null.
+	 *     @type array|string $class         Array or string of additional classes to add to the &lt;img&gt; element.
+	 *                                       Default null.
+	 *     @type bool         $force_display Whether to always show the avatar - ignores the show_avatars option.
+	 *                                       Default false.
+	 *     @type string       $extra_attr    HTML attributes to insert in the IMG element. Is not sanitized. Default empty.
+	 * }
+	 * @return false|string `<img>` tag for the user's avatar. False on failure.
+	 */
+	function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = null ) {
+		$defaults = array(
+			// get_avatar_data() args.
+			'size'          => 96,
+			'height'        => null,
+			'width'         => null,
+			'default'       => get_option( 'avatar_default', 'mystery' ),
+			'force_default' => false,
+			'rating'        => get_option( 'avatar_rating' ),
+			'scheme'        => null,
+			'alt'           => '',
+			'class'         => null,
+			'force_display' => false,
+			'extra_attr'    => '',
+		);
 
-	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+		if ( empty( $args ) ) {
+			$args = array();
+		}
 
-	$left_string  = normalize_whitespace($left_string);
-	$right_string = normalize_whitespace($right_string);
+		$args['size']    = (int) $size;
+		$args['default'] = $default;
+		$args['alt']     = $alt;
 
-	$left_lines  = explode("\n", $left_string);
-	$right_lines = explode("\n", $right_string);
-	$text_diff = new Text_Diff($left_lines, $right_lines);
-	$renderer  = new WP_Text_Diff_Renderer_Table( $args );
-	$diff = $renderer->render($text_diff);
+		$args = wp_parse_args( $args, $defaults );
 
-	if ( !$diff )
-		return '';
+		if ( empty( $args['height'] ) ) {
+			$args['height'] = $args['size'];
+		}
+		if ( empty( $args['width'] ) ) {
+			$args['width'] = $args['size'];
+		}
 
-	$r  = "<table class='diff'>\n";
+		if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
+			$id_or_email = get_comment( $id_or_email );
+		}
 
-	if ( ! empty( $args[ 'show_split_view' ] ) ) {
-		$r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
-	} else {
-		$r .= "<col class='content' />";
+		/**
+		 * Filters whether to retrieve the avatar URL early.
+		 *
+		 * Passing a non-null value will effectively short-circuit get_avatar(), passing
+		 * the value through the {@see 'get_avatar'} filter and returning early.
+		 *
+		 * @since 4.2.0
+		 *
+		 * @param string $avatar      HTML for the user's avatar. Default null.
+		 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+		 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
+		 * @param array  $args        Arguments passed to get_avatar_url(), after processing.
+		 */
+		$avatar = apply_filters( 'pre_get_avatar', null, $id_or_email, $args );
+
+		if ( ! is_null( $avatar ) ) {
+			/** This filter is documented in wp-includes/pluggable.php */
+			return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
+		}
+
+		if ( ! $args['force_display'] && ! get_option( 'show_avatars' ) ) {
+			return false;
+		}
+
+		$url2x = get_avatar_url( $id_or_email, array_merge( $args, array( 'size' => $args['size'] * 2 ) ) );
+
+		$args = get_avatar_data( $id_or_email, $args );
+
+		$url = $args['url'];
+
+		if ( ! $url || is_wp_error( $url ) ) {
+			return false;
+		}
+
+		$class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' );
+
+		if ( ! $args['found_avatar'] || $args['force_default'] ) {
+			$class[] = 'avatar-default';
+		}
+
+		if ( $args['class'] ) {
+			if ( is_array( $args['class'] ) ) {
+				$class = array_merge( $class, $args['class'] );
+			} else {
+				$class[] = $args['class'];
+			}
+		}
+
+		$avatar = sprintf(
+			"<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' %s/>",
+			esc_attr( $args['alt'] ),
+			esc_url( $url ),
+			esc_url( $url2x ) . ' 2x',
+			esc_attr( join( ' ', $class ) ),
+			(int) $args['height'],
+			(int) $args['width'],
+			$args['extra_attr']
+		);
+
+		/**
+		 * Filters the avatar to retrieve.
+		 *
+		 * @since 2.5.0
+		 * @since 4.2.0 The `$args` parameter was added.
+		 *
+		 * @param string $avatar      &lt;img&gt; tag for the user's avatar.
+		 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
+		 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
+		 * @param int    $size        Square avatar width and height in pixels to retrieve.
+		 * @param string $default     URL for the default image or a default type. Accepts '404', 'retro', 'monsterid',
+		 *                            'wavatar', 'indenticon','mystery' (or 'mm', or 'mysteryman'), 'blank', or 'gravatar_default'.
+		 *                            Default is the value of the 'avatar_default' option, with a fallback of 'mystery'.
+		 * @param string $alt         Alternative text to use in the avatar image tag. Default empty.
+		 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
+		 */
+		return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
+	}
+endif;
+
+if ( ! function_exists( 'wp_text_diff' ) ) :
+	/**
+	 * Displays a human readable HTML representation of the difference between two strings.
+	 *
+	 * The Diff is available for getting the changes between versions. The output is
+	 * HTML, so the primary use is for displaying the changes. If the two strings
+	 * are equivalent, then an empty string will be returned.
+	 *
+	 * The arguments supported and can be changed are listed below.
+	 *
+	 * 'title' : Default is an empty string. Titles the diff in a manner compatible
+	 *      with the output.
+	 * 'title_left' : Default is an empty string. Change the HTML to the left of the
+	 *      title.
+	 * 'title_right' : Default is an empty string. Change the HTML to the right of
+	 *      the title.
+	 *
+	 * @since 2.6.0
+	 *
+	 * @see wp_parse_args() Used to change defaults to user defined settings.
+	 * @uses Text_Diff
+	 * @uses WP_Text_Diff_Renderer_Table
+	 *
+	 * @param string       $left_string  "old" (left) version of string
+	 * @param string       $right_string "new" (right) version of string
+	 * @param string|array $args         Optional. Change 'title', 'title_left', and 'title_right' defaults.
+	 * @return string Empty string if strings are equivalent or HTML with differences.
+	 */
+	function wp_text_diff( $left_string, $right_string, $args = null ) {
+		$defaults = array(
+			'title'       => '',
+			'title_left'  => '',
+			'title_right' => '',
+		);
+		$args     = wp_parse_args( $args, $defaults );
+
+		if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) ) {
+			require( ABSPATH . WPINC . '/wp-diff.php' );
+		}
+
+		$left_string  = normalize_whitespace( $left_string );
+		$right_string = normalize_whitespace( $right_string );
+
+		$left_lines  = explode( "\n", $left_string );
+		$right_lines = explode( "\n", $right_string );
+		$text_diff   = new Text_Diff( $left_lines, $right_lines );
+		$renderer    = new WP_Text_Diff_Renderer_Table( $args );
+		$diff        = $renderer->render( $text_diff );
+
+		if ( ! $diff ) {
+			return '';
+		}
+
+		$r = "<table class='diff'>\n";
+
+		if ( ! empty( $args['show_split_view'] ) ) {
+			$r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
+		} else {
+			$r .= "<col class='content' />";
+		}
+
+		if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= '<thead>';
+		}
+		if ( $args['title'] ) {
+			$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+		}
+		if ( $args['title_left'] || $args['title_right'] ) {
+			$r .= "<tr class='diff-sub-title'>\n";
+			$r .= "\t<td></td><th>$args[title_left]</th>\n";
+			$r .= "\t<td></td><th>$args[title_right]</th>\n";
+			$r .= "</tr>\n";
+		}
+		if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "</thead>\n";
+		}
+
+		$r .= "<tbody>\n$diff\n</tbody>\n";
+		$r .= '</table>';
+
+		return $r;
 	}
-
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "<thead>";
-	if ( $args['title'] )
-		$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
-	if ( $args['title_left'] || $args['title_right'] ) {
-		$r .= "<tr class='diff-sub-title'>\n";
-		$r .= "\t<td></td><th>$args[title_left]</th>\n";
-		$r .= "\t<td></td><th>$args[title_right]</th>\n";
-		$r .= "</tr>\n";
-	}
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "</thead>\n";
-
-	$r .= "<tbody>\n$diff\n</tbody>\n";
-	$r .= "</table>";
-
-	return $r;
-}
 endif;
 
diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php
index 5a87e40635..879bb12fd4 100644
--- a/wp-includes/plugin.php
+++ b/wp-includes/plugin.php
@@ -33,11 +33,13 @@ if ( $wp_filter ) {
 	$wp_filter = array();
 }
 
-if ( ! isset( $wp_actions ) )
+if ( ! isset( $wp_actions ) ) {
 	$wp_actions = array();
+}
 
-if ( ! isset( $wp_current_filter ) )
+if ( ! isset( $wp_current_filter ) ) {
 	$wp_current_filter = array();
+}
 
 /**
  * Hook a function or method to a specific filter action.
@@ -128,7 +130,7 @@ function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1
  *                   that evaluates to false (e.g.) 0, so use the === operator for testing the
  *                   return value.
  */
-function has_filter($tag, $function_to_check = false) {
+function has_filter( $tag, $function_to_check = false ) {
 	global $wp_filter;
 
 	if ( ! isset( $wp_filter[ $tag ] ) ) {
@@ -179,23 +181,26 @@ function apply_filters( $tag, $value ) {
 	$args = array();
 
 	// Do 'all' actions first.
-	if ( isset($wp_filter['all']) ) {
+	if ( isset( $wp_filter['all'] ) ) {
 		$wp_current_filter[] = $tag;
-		$args = func_get_args();
-		_wp_call_all_hook($args);
+		$args                = func_get_args();
+		_wp_call_all_hook( $args );
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+	if ( ! isset( $wp_filter[ $tag ] ) ) {
+		if ( isset( $wp_filter['all'] ) ) {
+			array_pop( $wp_current_filter );
+		}
 		return $value;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset( $wp_filter['all'] ) ) {
 		$wp_current_filter[] = $tag;
+	}
 
-	if ( empty($args) )
+	if ( empty( $args ) ) {
 		$args = func_get_args();
+	}
 
 	// don't pass the tag name to WP_Hook
 	array_shift( $args );
@@ -222,24 +227,26 @@ function apply_filters( $tag, $value ) {
  * @param array  $args The arguments supplied to the functions hooked to $tag.
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
-function apply_filters_ref_array($tag, $args) {
+function apply_filters_ref_array( $tag, $args ) {
 	global $wp_filter, $wp_current_filter;
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if ( isset( $wp_filter['all'] ) ) {
 		$wp_current_filter[] = $tag;
-		$all_args = func_get_args();
-		_wp_call_all_hook($all_args);
+		$all_args            = func_get_args();
+		_wp_call_all_hook( $all_args );
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+	if ( ! isset( $wp_filter[ $tag ] ) ) {
+		if ( isset( $wp_filter['all'] ) ) {
+			array_pop( $wp_current_filter );
+		}
 		return $args[0];
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset( $wp_filter['all'] ) ) {
 		$wp_current_filter[] = $tag;
+	}
 
 	$filtered = $wp_filter[ $tag ]->apply_filters( $args[0], $args );
 
@@ -296,7 +303,7 @@ function remove_filter( $tag, $function_to_remove, $priority = 10 ) {
 function remove_all_filters( $tag, $priority = false ) {
 	global $wp_filter;
 
-	if ( isset( $wp_filter[ $tag ]) ) {
+	if ( isset( $wp_filter[ $tag ] ) ) {
 		$wp_filter[ $tag ]->remove_all_filters( $priority );
 		if ( ! $wp_filter[ $tag ]->has_filters() ) {
 			unset( $wp_filter[ $tag ] );
@@ -395,8 +402,8 @@ function doing_action( $action = null ) {
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
  * @return true Will always return true.
  */
-function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
-	return add_filter($tag, $function_to_add, $priority, $accepted_args);
+function add_action( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
+	return add_filter( $tag, $function_to_add, $priority, $accepted_args );
 }
 
 /**
@@ -418,41 +425,46 @@ function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1)
  * @param mixed  $arg,... Optional. Additional arguments which are passed on to the
  *                        functions hooked to the action. Default empty.
  */
-function do_action($tag, $arg = '') {
+function do_action( $tag, $arg = '' ) {
 	global $wp_filter, $wp_actions, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
-
-	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
-		$wp_current_filter[] = $tag;
-		$all_args = func_get_args();
-		_wp_call_all_hook($all_args);
+	if ( ! isset( $wp_actions[ $tag ] ) ) {
+		$wp_actions[ $tag ] = 1;
+	} else {
+		++$wp_actions[ $tag ];
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+	// Do 'all' actions first
+	if ( isset( $wp_filter['all'] ) ) {
+		$wp_current_filter[] = $tag;
+		$all_args            = func_get_args();
+		_wp_call_all_hook( $all_args );
+	}
+
+	if ( ! isset( $wp_filter[ $tag ] ) ) {
+		if ( isset( $wp_filter['all'] ) ) {
+			array_pop( $wp_current_filter );
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset( $wp_filter['all'] ) ) {
 		$wp_current_filter[] = $tag;
+	}
 
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
+	if ( is_array( $arg ) && 1 == count( $arg ) && isset( $arg[0] ) && is_object( $arg[0] ) ) { // array(&$this)
 		$args[] =& $arg[0];
-	else
+	} else {
 		$args[] = $arg;
-	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ )
-		$args[] = func_get_arg($a);
+	}
+	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ ) {
+		$args[] = func_get_arg( $a );
+	}
 
 	$wp_filter[ $tag ]->do_action( $args );
 
-	array_pop($wp_current_filter);
+	array_pop( $wp_current_filter );
 }
 
 /**
@@ -465,13 +477,14 @@ function do_action($tag, $arg = '') {
  * @param string $tag The name of the action hook.
  * @return int The number of times action hook $tag is fired.
  */
-function did_action($tag) {
+function did_action( $tag ) {
 	global $wp_actions;
 
-	if ( ! isset( $wp_actions[ $tag ] ) )
+	if ( ! isset( $wp_actions[ $tag ] ) ) {
 		return 0;
+	}
 
-	return $wp_actions[$tag];
+	return $wp_actions[ $tag ];
 }
 
 /**
@@ -488,33 +501,36 @@ function did_action($tag) {
  * @param string $tag  The name of the action to be executed.
  * @param array  $args The arguments supplied to the functions hooked to `$tag`.
  */
-function do_action_ref_array($tag, $args) {
+function do_action_ref_array( $tag, $args ) {
 	global $wp_filter, $wp_actions, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
-
-	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
-		$wp_current_filter[] = $tag;
-		$all_args = func_get_args();
-		_wp_call_all_hook($all_args);
+	if ( ! isset( $wp_actions[ $tag ] ) ) {
+		$wp_actions[ $tag ] = 1;
+	} else {
+		++$wp_actions[ $tag ];
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+	// Do 'all' actions first
+	if ( isset( $wp_filter['all'] ) ) {
+		$wp_current_filter[] = $tag;
+		$all_args            = func_get_args();
+		_wp_call_all_hook( $all_args );
+	}
+
+	if ( ! isset( $wp_filter[ $tag ] ) ) {
+		if ( isset( $wp_filter['all'] ) ) {
+			array_pop( $wp_current_filter );
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset( $wp_filter['all'] ) ) {
 		$wp_current_filter[] = $tag;
+	}
 
 	$wp_filter[ $tag ]->do_action( $args );
 
-	array_pop($wp_current_filter);
+	array_pop( $wp_current_filter );
 }
 
 /**
@@ -533,8 +549,8 @@ function do_action_ref_array($tag, $args) {
  *                  that evaluates to false (e.g.) 0, so use the === operator for testing the
  *                  return value.
  */
-function has_action($tag, $function_to_check = false) {
-	return has_filter($tag, $function_to_check);
+function has_action( $tag, $function_to_check = false ) {
+	return has_filter( $tag, $function_to_check );
 }
 
 /**
@@ -564,8 +580,8 @@ function remove_action( $tag, $function_to_remove, $priority = 10 ) {
  * @param int|bool $priority The priority number to remove them from. Default false.
  * @return true True when finished.
  */
-function remove_all_actions($tag, $priority = false) {
-	return remove_all_filters($tag, $priority);
+function remove_all_actions( $tag, $priority = false ) {
+	return remove_all_filters( $tag, $priority );
 }
 
 /**
@@ -660,11 +676,11 @@ function plugin_basename( $file ) {
 		}
 	}
 
-	$plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
+	$plugin_dir    = wp_normalize_path( WP_PLUGIN_DIR );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	$file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '/|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir
-	$file = trim($file, '/');
+	$file = preg_replace( '#^' . preg_quote( $plugin_dir, '#' ) . '/|^' . preg_quote( $mu_plugin_dir, '#' ) . '/#', '', $file ); // get relative path from plugins dir
+	$file = trim( $file, '/' );
 	return $file;
 }
 
@@ -691,11 +707,11 @@ function wp_register_plugin_realpath( $file ) {
 	// Normalize, but store as static to avoid recalculation of a constant value
 	static $wp_plugin_path = null, $wpmu_plugin_path = null;
 	if ( ! isset( $wp_plugin_path ) ) {
-		$wp_plugin_path   = wp_normalize_path( WP_PLUGIN_DIR   );
+		$wp_plugin_path   = wp_normalize_path( WP_PLUGIN_DIR );
 		$wpmu_plugin_path = wp_normalize_path( WPMU_PLUGIN_DIR );
 	}
 
-	$plugin_path = wp_normalize_path( dirname( $file ) );
+	$plugin_path     = wp_normalize_path( dirname( $file ) );
 	$plugin_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
 
 	if ( $plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path ) {
@@ -751,9 +767,9 @@ function plugin_dir_url( $file ) {
  * @param string   $file     The filename of the plugin including the path.
  * @param callable $function The function hooked to the 'activate_PLUGIN' action.
  */
-function register_activation_hook($file, $function) {
-	$file = plugin_basename($file);
-	add_action('activate_' . $file, $function);
+function register_activation_hook( $file, $function ) {
+	$file = plugin_basename( $file );
+	add_action( 'activate_' . $file, $function );
 }
 
 /**
@@ -774,9 +790,9 @@ function register_activation_hook($file, $function) {
  * @param string   $file     The filename of the plugin including the path.
  * @param callable $function The function hooked to the 'deactivate_PLUGIN' action.
  */
-function register_deactivation_hook($file, $function) {
-	$file = plugin_basename($file);
-	add_action('deactivate_' . $file, $function);
+function register_deactivation_hook( $file, $function ) {
+	$file = plugin_basename( $file );
+	add_action( 'deactivate_' . $file, $function );
 }
 
 /**
@@ -816,10 +832,10 @@ function register_uninstall_hook( $file, $callback ) {
 	 * cases. Emphasis should be put on using the 'uninstall.php' way of
 	 * uninstalling the plugin.
 	 */
-	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	$uninstallable_plugins[plugin_basename($file)] = $callback;
+	$uninstallable_plugins                             = (array) get_option( 'uninstall_plugins' );
+	$uninstallable_plugins[ plugin_basename( $file ) ] = $callback;
 
-	update_option('uninstall_plugins', $uninstallable_plugins);
+	update_option( 'uninstall_plugins', $uninstallable_plugins );
 }
 
 /**
@@ -840,7 +856,7 @@ function register_uninstall_hook( $file, $callback ) {
  *
  * @param array $args The collected parameters from the hook that was called.
  */
-function _wp_call_all_hook($args) {
+function _wp_call_all_hook( $args ) {
 	global $wp_filter;
 
 	$wp_filter['all']->do_all_hook( $args );
@@ -880,30 +896,32 @@ function _wp_call_all_hook($args) {
  *                      and $function is an object reference, and it does not already have
  *                      a unique id.
  */
-function _wp_filter_build_unique_id($tag, $function, $priority) {
+function _wp_filter_build_unique_id( $tag, $function, $priority ) {
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
+	if ( is_string( $function ) ) {
 		return $function;
+	}
 
-	if ( is_object($function) ) {
+	if ( is_object( $function ) ) {
 		// Closures are currently implemented as objects
 		$function = array( $function, '' );
 	} else {
 		$function = (array) $function;
 	}
 
-	if (is_object($function[0]) ) {
+	if ( is_object( $function[0] ) ) {
 		// Object Class Calling
-		if ( function_exists('spl_object_hash') ) {
-			return spl_object_hash($function[0]) . $function[1];
+		if ( function_exists( 'spl_object_hash' ) ) {
+			return spl_object_hash( $function[0] ) . $function[1];
 		} else {
-			$obj_idx = get_class($function[0]).$function[1];
-			if ( !isset($function[0]->wp_filter_id) ) {
-				if ( false === $priority )
+			$obj_idx = get_class( $function[0] ) . $function[1];
+			if ( ! isset( $function[0]->wp_filter_id ) ) {
+				if ( false === $priority ) {
 					return false;
-				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
+				}
+				$obj_idx                  .= isset( $wp_filter[ $tag ][ $priority ] ) ? count( (array) $wp_filter[ $tag ][ $priority ] ) : $filter_id_count;
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;
 			} else {
diff --git a/wp-includes/pomo/entry.php b/wp-includes/pomo/entry.php
index 788092ba4b..a750a944a9 100644
--- a/wp-includes/pomo/entry.php
+++ b/wp-includes/pomo/entry.php
@@ -7,87 +7,97 @@
  * @subpackage entry
  */
 
-if ( ! class_exists( 'Translation_Entry', false ) ):
-/**
- * Translation_Entry class encapsulates a translatable string
- */
-class Translation_Entry {
-
+if ( ! class_exists( 'Translation_Entry', false ) ) :
 	/**
-	 * Whether the entry contains a string and its plural form, default is false
-	 *
-	 * @var boolean
+	 * Translation_Entry class encapsulates a translatable string
 	 */
-	var $is_plural = false;
+	class Translation_Entry {
 
-	var $context = null;
-	var $singular = null;
-	var $plural = null;
-	var $translations = array();
-	var $translator_comments = '';
-	var $extracted_comments = '';
-	var $references = array();
-	var $flags = array();
+		/**
+		 * Whether the entry contains a string and its plural form, default is false
+		 *
+		 * @var boolean
+		 */
+		var $is_plural = false;
 
-	/**
-	 * @param array $args associative array, support following keys:
-	 * 	- singular (string) -- the string to translate, if omitted and empty entry will be created
-	 * 	- plural (string) -- the plural form of the string, setting this will set {@link $is_plural} to true
-	 * 	- translations (array) -- translations of the string and possibly -- its plural forms
-	 * 	- context (string) -- a string differentiating two equal strings used in different contexts
-	 * 	- translator_comments (string) -- comments left by translators
-	 * 	- extracted_comments (string) -- comments left by developers
-	 * 	- references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
-	 * 	- flags (array) -- flags like php-format
-	 */
-	function __construct( $args = array() ) {
-		// if no singular -- empty object
-		if (!isset($args['singular'])) {
-			return;
-		}
-		// get member variable values from args hash
-		foreach ($args as $varname => $value) {
-			$this->$varname = $value;
-		}
-		if (isset($args['plural']) && $args['plural']) $this->is_plural = true;
-		if (!is_array($this->translations)) $this->translations = array();
-		if (!is_array($this->references)) $this->references = array();
-		if (!is_array($this->flags)) $this->flags = array();
-	}
+		var $context             = null;
+		var $singular            = null;
+		var $plural              = null;
+		var $translations        = array();
+		var $translator_comments = '';
+		var $extracted_comments  = '';
+		var $references          = array();
+		var $flags               = array();
 
-	/**
-	 * PHP4 constructor.
-	 */
-	public function Translation_Entry( $args = array() ) {
-		self::__construct( $args );
-	}
-
-	/**
-	 * Generates a unique key for this entry
-	 *
-	 * @return string|bool the key or false if the entry is empty
-	 */
-	function key() {
-		if ( null === $this->singular || '' === $this->singular ) return false;
-
-		// Prepend context and EOT, like in MO files
-		$key = !$this->context? $this->singular : $this->context.chr(4).$this->singular;
-		// Standardize on \n line endings
-		$key = str_replace( array( "\r\n", "\r" ), "\n", $key );
-
-		return $key;
-	}
-
-	/**
-	 * @param object $other
-	 */
-	function merge_with(&$other) {
-		$this->flags = array_unique( array_merge( $this->flags, $other->flags ) );
-		$this->references = array_unique( array_merge( $this->references, $other->references ) );
-		if ( $this->extracted_comments != $other->extracted_comments ) {
-			$this->extracted_comments .= $other->extracted_comments;
+		/**
+		 * @param array $args associative array, support following keys:
+		 *  - singular (string) -- the string to translate, if omitted and empty entry will be created
+		 *  - plural (string) -- the plural form of the string, setting this will set {@link $is_plural} to true
+		 *  - translations (array) -- translations of the string and possibly -- its plural forms
+		 *  - context (string) -- a string differentiating two equal strings used in different contexts
+		 *  - translator_comments (string) -- comments left by translators
+		 *  - extracted_comments (string) -- comments left by developers
+		 *  - references (array) -- places in the code this strings is used, in relative_to_root_path/file.php:linenum form
+		 *  - flags (array) -- flags like php-format
+		 */
+		function __construct( $args = array() ) {
+			// if no singular -- empty object
+			if ( ! isset( $args['singular'] ) ) {
+				return;
+			}
+			// get member variable values from args hash
+			foreach ( $args as $varname => $value ) {
+				$this->$varname = $value;
+			}
+			if ( isset( $args['plural'] ) && $args['plural'] ) {
+				$this->is_plural = true;
+			}
+			if ( ! is_array( $this->translations ) ) {
+				$this->translations = array();
+			}
+			if ( ! is_array( $this->references ) ) {
+				$this->references = array();
+			}
+			if ( ! is_array( $this->flags ) ) {
+				$this->flags = array();
+			}
 		}
 
+		/**
+		 * PHP4 constructor.
+		 */
+		public function Translation_Entry( $args = array() ) {
+			self::__construct( $args );
+		}
+
+		/**
+		 * Generates a unique key for this entry
+		 *
+		 * @return string|bool the key or false if the entry is empty
+		 */
+		function key() {
+			if ( null === $this->singular || '' === $this->singular ) {
+				return false;
+			}
+
+			// Prepend context and EOT, like in MO files
+			$key = ! $this->context ? $this->singular : $this->context . chr( 4 ) . $this->singular;
+			// Standardize on \n line endings
+			$key = str_replace( array( "\r\n", "\r" ), "\n", $key );
+
+			return $key;
+		}
+
+		/**
+		 * @param object $other
+		 */
+		function merge_with( &$other ) {
+			$this->flags      = array_unique( array_merge( $this->flags, $other->flags ) );
+			$this->references = array_unique( array_merge( $this->references, $other->references ) );
+			if ( $this->extracted_comments != $other->extracted_comments ) {
+				$this->extracted_comments .= $other->extracted_comments;
+			}
+
+		}
 	}
-}
-endif;
\ No newline at end of file
+endif;
diff --git a/wp-includes/pomo/mo.php b/wp-includes/pomo/mo.php
index 47e9b6afe4..6ec35245b9 100644
--- a/wp-includes/pomo/mo.php
+++ b/wp-includes/pomo/mo.php
@@ -7,317 +7,333 @@
  * @subpackage mo
  */
 
-require_once dirname(__FILE__) . '/translations.php';
-require_once dirname(__FILE__) . '/streams.php';
+require_once dirname( __FILE__ ) . '/translations.php';
+require_once dirname( __FILE__ ) . '/streams.php';
 
-if ( ! class_exists( 'MO', false ) ):
-class MO extends Gettext_Translations {
+if ( ! class_exists( 'MO', false ) ) :
+	class MO extends Gettext_Translations {
 
-	var $_nplurals = 2;
+		var $_nplurals = 2;
 
-	/**
-	 * Loaded MO file.
-	 *
-	 * @var string
-	 */
-	private $filename = '';
+		/**
+		 * Loaded MO file.
+		 *
+		 * @var string
+		 */
+		private $filename = '';
 
-	/**
-	 * Returns the loaded MO file.
-	 *
-	 * @return string The loaded MO file.
-	 */
-	public function get_filename() {
-		return $this->filename;
-	}
-
-	/**
-	 * Fills up with the entries from MO file $filename
-	 *
-	 * @param string $filename MO file to load
-	 */
-	function import_from_file($filename) {
-		$reader = new POMO_FileReader( $filename );
-
-		if ( ! $reader->is_resource() ) {
-			return false;
+		/**
+		 * Returns the loaded MO file.
+		 *
+		 * @return string The loaded MO file.
+		 */
+		public function get_filename() {
+			return $this->filename;
 		}
 
-		$this->filename = (string) $filename;
+		/**
+		 * Fills up with the entries from MO file $filename
+		 *
+		 * @param string $filename MO file to load
+		 */
+		function import_from_file( $filename ) {
+			$reader = new POMO_FileReader( $filename );
 
-		return $this->import_from_reader( $reader );
-	}
+			if ( ! $reader->is_resource() ) {
+				return false;
+			}
 
-	/**
-	 * @param string $filename
-	 * @return bool
-	 */
-	function export_to_file($filename) {
-		$fh = fopen($filename, 'wb');
-		if ( !$fh ) return false;
-		$res = $this->export_to_file_handle( $fh );
-		fclose($fh);
-		return $res;
-	}
+			$this->filename = (string) $filename;
 
-	/**
-	 * @return string|false
-	 */
-	function export() {
-		$tmp_fh = fopen("php://temp", 'r+');
-		if ( !$tmp_fh ) return false;
-		$this->export_to_file_handle( $tmp_fh );
-		rewind( $tmp_fh );
-		return stream_get_contents( $tmp_fh );
-	}
-
-	/**
-	 * @param Translation_Entry $entry
-	 * @return bool
-	 */
-	function is_entry_good_for_export( $entry ) {
-		if ( empty( $entry->translations ) ) {
-			return false;
+			return $this->import_from_reader( $reader );
 		}
 
-		if ( !array_filter( $entry->translations ) ) {
-			return false;
+		/**
+		 * @param string $filename
+		 * @return bool
+		 */
+		function export_to_file( $filename ) {
+			$fh = fopen( $filename, 'wb' );
+			if ( ! $fh ) {
+				return false;
+			}
+			$res = $this->export_to_file_handle( $fh );
+			fclose( $fh );
+			return $res;
 		}
 
-		return true;
-	}
-
-	/**
-	 * @param resource $fh
-	 * @return true
-	 */
-	function export_to_file_handle($fh) {
-		$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
-		ksort($entries);
-		$magic = 0x950412de;
-		$revision = 0;
-		$total = count($entries) + 1; // all the headers are one entry
-		$originals_lenghts_addr = 28;
-		$translations_lenghts_addr = $originals_lenghts_addr + 8 * $total;
-		$size_of_hash = 0;
-		$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));
-		fseek($fh, $originals_lenghts_addr);
-
-		// headers' msgid is an empty string
-		fwrite($fh, pack('VV', 0, $current_addr));
-		$current_addr++;
-		$originals_table = chr(0);
-
-		$reader = new POMO_Reader();
-
-		foreach($entries as $entry) {
-			$originals_table .= $this->export_original($entry) . chr(0);
-			$length = $reader->strlen($this->export_original($entry));
-			fwrite($fh, pack('VV', $length, $current_addr));
-			$current_addr += $length + 1; // account for the NULL byte after
+		/**
+		 * @return string|false
+		 */
+		function export() {
+			$tmp_fh = fopen( 'php://temp', 'r+' );
+			if ( ! $tmp_fh ) {
+				return false;
+			}
+			$this->export_to_file_handle( $tmp_fh );
+			rewind( $tmp_fh );
+			return stream_get_contents( $tmp_fh );
 		}
 
-		$exported_headers = $this->export_headers();
-		fwrite($fh, pack('VV', $reader->strlen($exported_headers), $current_addr));
-		$current_addr += strlen($exported_headers) + 1;
-		$translations_table = $exported_headers . chr(0);
+		/**
+		 * @param Translation_Entry $entry
+		 * @return bool
+		 */
+		function is_entry_good_for_export( $entry ) {
+			if ( empty( $entry->translations ) ) {
+				return false;
+			}
 
-		foreach($entries as $entry) {
-			$translations_table .= $this->export_translations($entry) . chr(0);
-			$length = $reader->strlen($this->export_translations($entry));
-			fwrite($fh, pack('VV', $length, $current_addr));
-			$current_addr += $length + 1;
+			if ( ! array_filter( $entry->translations ) ) {
+				return false;
+			}
+
+			return true;
 		}
 
-		fwrite($fh, $originals_table);
-		fwrite($fh, $translations_table);
-		return true;
-	}
+		/**
+		 * @param resource $fh
+		 * @return true
+		 */
+		function export_to_file_handle( $fh ) {
+			$entries = array_filter( $this->entries, array( $this, 'is_entry_good_for_export' ) );
+			ksort( $entries );
+			$magic                     = 0x950412de;
+			$revision                  = 0;
+			$total                     = count( $entries ) + 1; // all the headers are one entry
+			$originals_lenghts_addr    = 28;
+			$translations_lenghts_addr = $originals_lenghts_addr + 8 * $total;
+			$size_of_hash              = 0;
+			$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
+				)
+			);
+			fseek( $fh, $originals_lenghts_addr );
 
-	/**
-	 * @param Translation_Entry $entry
-	 * @return string
-	 */
-	function export_original($entry) {
-		//TODO: warnings for control characters
-		$exported = $entry->singular;
-		if ($entry->is_plural) $exported .= chr(0).$entry->plural;
-		if ($entry->context) $exported = $entry->context . chr(4) . $exported;
-		return $exported;
-	}
+			// headers' msgid is an empty string
+			fwrite( $fh, pack( 'VV', 0, $current_addr ) );
+			$current_addr++;
+			$originals_table = chr( 0 );
 
-	/**
-	 * @param Translation_Entry $entry
-	 * @return string
-	 */
-	function export_translations($entry) {
-		//TODO: warnings for control characters
-		return $entry->is_plural ? implode(chr(0), $entry->translations) : $entry->translations[0];
-	}
+			$reader = new POMO_Reader();
 
-	/**
-	 * @return string
-	 */
-	function export_headers() {
-		$exported = '';
-		foreach($this->headers as $header => $value) {
-			$exported.= "$header: $value\n";
-		}
-		return $exported;
-	}
+			foreach ( $entries as $entry ) {
+				$originals_table .= $this->export_original( $entry ) . chr( 0 );
+				$length           = $reader->strlen( $this->export_original( $entry ) );
+				fwrite( $fh, pack( 'VV', $length, $current_addr ) );
+				$current_addr += $length + 1; // account for the NULL byte after
+			}
 
-	/**
-	 * @param int $magic
-	 * @return string|false
-	 */
-	function get_byteorder($magic) {
-		// The magic is 0x950412de
+			$exported_headers = $this->export_headers();
+			fwrite( $fh, pack( 'VV', $reader->strlen( $exported_headers ), $current_addr ) );
+			$current_addr      += strlen( $exported_headers ) + 1;
+			$translations_table = $exported_headers . chr( 0 );
 
-		// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
-		$magic_little = (int) - 1794895138;
-		$magic_little_64 = (int) 2500072158;
-		// 0xde120495
-		$magic_big = ((int) - 569244523) & 0xFFFFFFFF;
-		if ($magic_little == $magic || $magic_little_64 == $magic) {
-			return 'little';
-		} else if ($magic_big == $magic) {
-			return 'big';
-		} else {
-			return false;
-		}
-	}
+			foreach ( $entries as $entry ) {
+				$translations_table .= $this->export_translations( $entry ) . chr( 0 );
+				$length              = $reader->strlen( $this->export_translations( $entry ) );
+				fwrite( $fh, pack( 'VV', $length, $current_addr ) );
+				$current_addr += $length + 1;
+			}
 
-	/**
-	 * @param POMO_FileReader $reader
-	 */
-	function import_from_reader($reader) {
-		$endian_string = MO::get_byteorder($reader->readint32());
-		if (false === $endian_string) {
-			return false;
-		}
-		$reader->setEndian($endian_string);
-
-		$endian = ('big' == $endian_string)? 'N' : 'V';
-
-		$header = $reader->read(24);
-		if ($reader->strlen($header) != 24)
-			return false;
-
-		// parse header
-		$header = unpack("{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header);
-		if (!is_array($header))
-			return false;
-
-		// support revision 0 of MO format specs, only
-		if ( $header['revision'] != 0 ) {
-			return false;
+			fwrite( $fh, $originals_table );
+			fwrite( $fh, $translations_table );
+			return true;
 		}
 
-		// seek to data blocks
-		$reader->seekto( $header['originals_lenghts_addr'] );
-
-		// read originals' indices
-		$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
-		if ( $originals_lengths_length != $header['total'] * 8 ) {
-			return false;
+		/**
+		 * @param Translation_Entry $entry
+		 * @return string
+		 */
+		function export_original( $entry ) {
+			//TODO: warnings for control characters
+			$exported = $entry->singular;
+			if ( $entry->is_plural ) {
+				$exported .= chr( 0 ) . $entry->plural;
+			}
+			if ( $entry->context ) {
+				$exported = $entry->context . chr( 4 ) . $exported;
+			}
+			return $exported;
 		}
 
-		$originals = $reader->read($originals_lengths_length);
-		if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
-			return false;
+		/**
+		 * @param Translation_Entry $entry
+		 * @return string
+		 */
+		function export_translations( $entry ) {
+			//TODO: warnings for control characters
+			return $entry->is_plural ? implode( chr( 0 ), $entry->translations ) : $entry->translations[0];
 		}
 
-		// read translations' indices
-		$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
-		if ( $translations_lenghts_length != $header['total'] * 8 ) {
-			return false;
+		/**
+		 * @return string
+		 */
+		function export_headers() {
+			$exported = '';
+			foreach ( $this->headers as $header => $value ) {
+				$exported .= "$header: $value\n";
+			}
+			return $exported;
 		}
 
-		$translations = $reader->read($translations_lenghts_length);
-		if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
-			return false;
-		}
+		/**
+		 * @param int $magic
+		 * @return string|false
+		 */
+		function get_byteorder( $magic ) {
+			// The magic is 0x950412de
 
-		// transform raw data into set of indices
-		$originals    = $reader->str_split( $originals, 8 );
-		$translations = $reader->str_split( $translations, 8 );
-
-		// skip hash table
-		$strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
-
-		$reader->seekto($strings_addr);
-
-		$strings = $reader->read_all();
-		$reader->close();
-
-		for ( $i = 0; $i < $header['total']; $i++ ) {
-			$o = unpack( "{$endian}length/{$endian}pos", $originals[$i] );
-			$t = unpack( "{$endian}length/{$endian}pos", $translations[$i] );
-			if ( !$o || !$t ) return false;
-
-			// adjust offset due to reading strings to separate space before
-			$o['pos'] -= $strings_addr;
-			$t['pos'] -= $strings_addr;
-
-			$original    = $reader->substr( $strings, $o['pos'], $o['length'] );
-			$translation = $reader->substr( $strings, $t['pos'], $t['length'] );
-
-			if ('' === $original) {
-				$this->set_headers($this->make_headers($translation));
+			// bug in PHP 5.0.2, see https://savannah.nongnu.org/bugs/?func=detailitem&item_id=10565
+			$magic_little    = (int) - 1794895138;
+			$magic_little_64 = (int) 2500072158;
+			// 0xde120495
+			$magic_big = ( (int) - 569244523 ) & 0xFFFFFFFF;
+			if ( $magic_little == $magic || $magic_little_64 == $magic ) {
+				return 'little';
+			} elseif ( $magic_big == $magic ) {
+				return 'big';
 			} else {
-				$entry = &$this->make_entry($original, $translation);
-				$this->entries[$entry->key()] = &$entry;
+				return false;
 			}
 		}
-		return true;
-	}
 
-	/**
-	 * Build a Translation_Entry from original string and translation strings,
-	 * found in a MO file
-	 *
-	 * @static
-	 * @param string $original original string to translate from MO file. Might contain
-	 * 	0x04 as context separator or 0x00 as singular/plural separator
-	 * @param string $translation translation string from MO file. Might contain
-	 * 	0x00 as a plural translations separator
-	 */
-	function &make_entry($original, $translation) {
-		$entry = new Translation_Entry();
-		// look for context
-		$parts = explode(chr(4), $original);
-		if (isset($parts[1])) {
-			$original = $parts[1];
-			$entry->context = $parts[0];
+		/**
+		 * @param POMO_FileReader $reader
+		 */
+		function import_from_reader( $reader ) {
+			$endian_string = MO::get_byteorder( $reader->readint32() );
+			if ( false === $endian_string ) {
+				return false;
+			}
+			$reader->setEndian( $endian_string );
+
+			$endian = ( 'big' == $endian_string ) ? 'N' : 'V';
+
+			$header = $reader->read( 24 );
+			if ( $reader->strlen( $header ) != 24 ) {
+				return false;
+			}
+
+			// parse header
+			$header = unpack( "{$endian}revision/{$endian}total/{$endian}originals_lenghts_addr/{$endian}translations_lenghts_addr/{$endian}hash_length/{$endian}hash_addr", $header );
+			if ( ! is_array( $header ) ) {
+				return false;
+			}
+
+			// support revision 0 of MO format specs, only
+			if ( $header['revision'] != 0 ) {
+				return false;
+			}
+
+			// seek to data blocks
+			$reader->seekto( $header['originals_lenghts_addr'] );
+
+			// read originals' indices
+			$originals_lengths_length = $header['translations_lenghts_addr'] - $header['originals_lenghts_addr'];
+			if ( $originals_lengths_length != $header['total'] * 8 ) {
+				return false;
+			}
+
+			$originals = $reader->read( $originals_lengths_length );
+			if ( $reader->strlen( $originals ) != $originals_lengths_length ) {
+				return false;
+			}
+
+			// read translations' indices
+			$translations_lenghts_length = $header['hash_addr'] - $header['translations_lenghts_addr'];
+			if ( $translations_lenghts_length != $header['total'] * 8 ) {
+				return false;
+			}
+
+			$translations = $reader->read( $translations_lenghts_length );
+			if ( $reader->strlen( $translations ) != $translations_lenghts_length ) {
+				return false;
+			}
+
+			// transform raw data into set of indices
+			$originals    = $reader->str_split( $originals, 8 );
+			$translations = $reader->str_split( $translations, 8 );
+
+			// skip hash table
+			$strings_addr = $header['hash_addr'] + $header['hash_length'] * 4;
+
+			$reader->seekto( $strings_addr );
+
+			$strings = $reader->read_all();
+			$reader->close();
+
+			for ( $i = 0; $i < $header['total']; $i++ ) {
+				$o = unpack( "{$endian}length/{$endian}pos", $originals[ $i ] );
+				$t = unpack( "{$endian}length/{$endian}pos", $translations[ $i ] );
+				if ( ! $o || ! $t ) {
+					return false;
+				}
+
+				// adjust offset due to reading strings to separate space before
+				$o['pos'] -= $strings_addr;
+				$t['pos'] -= $strings_addr;
+
+				$original    = $reader->substr( $strings, $o['pos'], $o['length'] );
+				$translation = $reader->substr( $strings, $t['pos'], $t['length'] );
+
+				if ( '' === $original ) {
+					$this->set_headers( $this->make_headers( $translation ) );
+				} else {
+					$entry                          = &$this->make_entry( $original, $translation );
+					$this->entries[ $entry->key() ] = &$entry;
+				}
+			}
+			return true;
 		}
-		// look for plural original
-		$parts = explode(chr(0), $original);
-		$entry->singular = $parts[0];
-		if (isset($parts[1])) {
-			$entry->is_plural = true;
-			$entry->plural = $parts[1];
+
+		/**
+		 * Build a Translation_Entry from original string and translation strings,
+		 * found in a MO file
+		 *
+		 * @static
+		 * @param string $original original string to translate from MO file. Might contain
+		 *  0x04 as context separator or 0x00 as singular/plural separator
+		 * @param string $translation translation string from MO file. Might contain
+		 *  0x00 as a plural translations separator
+		 */
+		function &make_entry( $original, $translation ) {
+			$entry = new Translation_Entry();
+			// look for context
+			$parts = explode( chr( 4 ), $original );
+			if ( isset( $parts[1] ) ) {
+				$original       = $parts[1];
+				$entry->context = $parts[0];
+			}
+			// look for plural original
+			$parts           = explode( chr( 0 ), $original );
+			$entry->singular = $parts[0];
+			if ( isset( $parts[1] ) ) {
+				$entry->is_plural = true;
+				$entry->plural    = $parts[1];
+			}
+			// plural translations are also separated by \0
+			$entry->translations = explode( chr( 0 ), $translation );
+			return $entry;
 		}
-		// plural translations are also separated by \0
-		$entry->translations = explode(chr(0), $translation);
-		return $entry;
-	}
 
-	/**
-	 * @param int $count
-	 * @return string
-	 */
-	function select_plural_form($count) {
-		return $this->gettext_select_plural_form($count);
-	}
+		/**
+		 * @param int $count
+		 * @return string
+		 */
+		function select_plural_form( $count ) {
+			return $this->gettext_select_plural_form( $count );
+		}
 
-	/**
-	 * @return int
-	 */
-	function get_plural_forms_count() {
-		return $this->_nplurals;
+		/**
+		 * @return int
+		 */
+		function get_plural_forms_count() {
+			return $this->_nplurals;
+		}
 	}
-}
 endif;
diff --git a/wp-includes/pomo/plural-forms.php b/wp-includes/pomo/plural-forms.php
index a41c659598..cabc807180 100644
--- a/wp-includes/pomo/plural-forms.php
+++ b/wp-includes/pomo/plural-forms.php
@@ -34,11 +34,11 @@ class Plural_Forms {
 	 * @var array $op_precedence Operator precedence from highest to lowest.
 	 */
 	protected static $op_precedence = array(
-		'%' => 6,
+		'%'  => 6,
 
-		'<' => 5,
+		'<'  => 5,
 		'<=' => 5,
-		'>' => 5,
+		'>'  => 5,
 		'>=' => 5,
 
 		'==' => 4,
@@ -49,10 +49,10 @@ class Plural_Forms {
 		'||' => 2,
 
 		'?:' => 1,
-		'?' => 1,
+		'?'  => 1,
 
-		'(' => 0,
-		')' => 0,
+		'('  => 0,
+		')'  => 0,
 	);
 
 	/**
@@ -98,7 +98,7 @@ class Plural_Forms {
 
 		// Convert infix operators to postfix using the shunting-yard algorithm.
 		$output = array();
-		$stack = array();
+		$stack  = array();
 		while ( $pos < $len ) {
 			$next = substr( $str, $pos, 1 );
 
@@ -153,7 +153,7 @@ class Plural_Forms {
 				case '%':
 				case '?':
 					$end_operator = strspn( $str, self::OP_CHARS, $pos );
-					$operator = substr( $str, $pos, $end_operator );
+					$operator     = substr( $str, $pos, $end_operator );
 					if ( ! array_key_exists( $operator, self::$op_precedence ) ) {
 						throw new Exception( sprintf( 'Unknown operator "%s"', $operator ) );
 					}
@@ -191,7 +191,7 @@ class Plural_Forms {
 
 						// Replace.
 						$stack[ $s_pos ] = '?:';
-						$found = true;
+						$found           = true;
 						break;
 					}
 
@@ -204,9 +204,9 @@ class Plural_Forms {
 				// Default - number or invalid
 				default:
 					if ( $next >= '0' && $next <= '9' ) {
-						$span = strspn( $str, self::NUM_CHARS, $pos );
+						$span     = strspn( $str, self::NUM_CHARS, $pos );
 						$output[] = array( 'value', intval( substr( $str, $pos, $span ) ) );
-						$pos += $span;
+						$pos     += $span;
 						continue;
 					}
 
@@ -253,10 +253,10 @@ class Plural_Forms {
 	 */
 	public function execute( $n ) {
 		$stack = array();
-		$i = 0;
+		$i     = 0;
 		$total = count( $this->tokens );
 		while ( $i < $total ) {
-			$next = $this->tokens[$i];
+			$next = $this->tokens[ $i ];
 			$i++;
 			if ( $next[0] === 'var' ) {
 				$stack[] = $n;
@@ -269,63 +269,63 @@ class Plural_Forms {
 			// Only operators left.
 			switch ( $next[1] ) {
 				case '%':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 % $v2;
 					break;
 
 				case '||':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 || $v2;
 					break;
 
 				case '&&':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 && $v2;
 					break;
 
 				case '<':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 < $v2;
 					break;
 
 				case '<=':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 <= $v2;
 					break;
 
 				case '>':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 > $v2;
 					break;
 
 				case '>=':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 >= $v2;
 					break;
 
 				case '!=':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 != $v2;
 					break;
 
 				case '==':
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 == $v2;
 					break;
 
 				case '?:':
-					$v3 = array_pop( $stack );
-					$v2 = array_pop( $stack );
-					$v1 = array_pop( $stack );
+					$v3      = array_pop( $stack );
+					$v2      = array_pop( $stack );
+					$v1      = array_pop( $stack );
 					$stack[] = $v1 ? $v2 : $v3;
 					break;
 
diff --git a/wp-includes/pomo/po.php b/wp-includes/pomo/po.php
index 98e0760d19..17e1d71f83 100644
--- a/wp-includes/pomo/po.php
+++ b/wp-includes/pomo/po.php
@@ -7,463 +7,506 @@
  * @subpackage po
  */
 
-require_once dirname(__FILE__) . '/translations.php';
+require_once dirname( __FILE__ ) . '/translations.php';
 
 if ( ! defined( 'PO_MAX_LINE_LEN' ) ) {
-	define('PO_MAX_LINE_LEN', 79);
+	define( 'PO_MAX_LINE_LEN', 79 );
 }
 
-ini_set('auto_detect_line_endings', 1);
+ini_set( 'auto_detect_line_endings', 1 );
 
 /**
  * Routines for working with PO files
  */
-if ( ! class_exists( 'PO', false ) ):
-class PO extends Gettext_Translations {
+if ( ! class_exists( 'PO', false ) ) :
+	class PO extends Gettext_Translations {
 
-	var $comments_before_headers = '';
+		var $comments_before_headers = '';
 
-	/**
-	 * Exports headers to a PO entry
-	 *
-	 * @return string msgid/msgstr PO entry for this PO file headers, doesn't contain newline at the end
-	 */
-	function export_headers() {
-		$header_string = '';
-		foreach($this->headers as $header => $value) {
-			$header_string.= "$header: $value\n";
+		/**
+		 * Exports headers to a PO entry
+		 *
+		 * @return string msgid/msgstr PO entry for this PO file headers, doesn't contain newline at the end
+		 */
+		function export_headers() {
+			$header_string = '';
+			foreach ( $this->headers as $header => $value ) {
+				$header_string .= "$header: $value\n";
+			}
+			$poified = PO::poify( $header_string );
+			if ( $this->comments_before_headers ) {
+				$before_headers = $this->prepend_each_line( rtrim( $this->comments_before_headers ) . "\n", '# ' );
+			} else {
+				$before_headers = '';
+			}
+			return rtrim( "{$before_headers}msgid \"\"\nmsgstr $poified" );
 		}
-		$poified = PO::poify($header_string);
-		if ($this->comments_before_headers)
-			$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
-		else
-			$before_headers = '';
-		return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
-	}
 
-	/**
-	 * Exports all entries to PO format
-	 *
-	 * @return string sequence of mgsgid/msgstr PO strings, doesn't containt newline at the end
-	 */
-	function export_entries() {
-		//TODO sorting
-		return implode("\n\n", array_map(array('PO', 'export_entry'), $this->entries));
-	}
-
-	/**
-	 * Exports the whole PO file as a string
-	 *
-	 * @param bool $include_headers whether to include the headers in the export
-	 * @return string ready for inclusion in PO file string for headers and all the enrtries
-	 */
-	function export($include_headers = true) {
-		$res = '';
-		if ($include_headers) {
-			$res .= $this->export_headers();
-			$res .= "\n\n";
+		/**
+		 * Exports all entries to PO format
+		 *
+		 * @return string sequence of mgsgid/msgstr PO strings, doesn't containt newline at the end
+		 */
+		function export_entries() {
+			//TODO sorting
+			return implode( "\n\n", array_map( array( 'PO', 'export_entry' ), $this->entries ) );
 		}
-		$res .= $this->export_entries();
-		return $res;
-	}
 
-	/**
-	 * Same as {@link export}, but writes the result to a file
-	 *
-	 * @param string $filename where to write the PO string
-	 * @param bool $include_headers whether to include tje headers in the export
-	 * @return bool true on success, false on error
-	 */
-	function export_to_file($filename, $include_headers = true) {
-		$fh = fopen($filename, 'w');
-		if (false === $fh) return false;
-		$export = $this->export($include_headers);
-		$res = fwrite($fh, $export);
-		if (false === $res) return false;
-		return fclose($fh);
-	}
-
-	/**
-	 * Text to include as a comment before the start of the PO contents
-	 *
-	 * Doesn't need to include # in the beginning of lines, these are added automatically
-	 */
-	function set_comment_before_headers( $text ) {
-		$this->comments_before_headers = $text;
-	}
-
-	/**
-	 * Formats a string in PO-style
-	 *
-	 * @static
-	 * @param string $string the string to format
-	 * @return string the poified string
-	 */
-	public static function poify($string) {
-		$quote = '"';
-		$slash = '\\';
-		$newline = "\n";
-
-		$replaces = array(
-			"$slash" 	=> "$slash$slash",
-			"$quote"	=> "$slash$quote",
-			"\t" 		=> '\t',
-		);
-
-		$string = str_replace(array_keys($replaces), array_values($replaces), $string);
-
-		$po = $quote.implode("${slash}n$quote$newline$quote", explode($newline, $string)).$quote;
-		// add empty string on first line for readbility
-		if (false !== strpos($string, $newline) &&
-				(substr_count($string, $newline) > 1 || !($newline === substr($string, -strlen($newline))))) {
-			$po = "$quote$quote$newline$po";
+		/**
+		 * Exports the whole PO file as a string
+		 *
+		 * @param bool $include_headers whether to include the headers in the export
+		 * @return string ready for inclusion in PO file string for headers and all the enrtries
+		 */
+		function export( $include_headers = true ) {
+			$res = '';
+			if ( $include_headers ) {
+				$res .= $this->export_headers();
+				$res .= "\n\n";
+			}
+			$res .= $this->export_entries();
+			return $res;
 		}
-		// remove empty strings
-		$po = str_replace("$newline$quote$quote", '', $po);
-		return $po;
-	}
 
-	/**
-	 * Gives back the original string from a PO-formatted string
-	 *
-	 * @static
-	 * @param string $string PO-formatted string
-	 * @return string enascaped string
-	 */
-	public static function unpoify($string) {
-		$escapes = array('t' => "\t", 'n' => "\n", 'r' => "\r", '\\' => '\\');
-		$lines = array_map('trim', explode("\n", $string));
-		$lines = array_map(array('PO', 'trim_quotes'), $lines);
-		$unpoified = '';
-		$previous_is_backslash = false;
-		foreach($lines as $line) {
-			preg_match_all('/./u', $line, $chars);
-			$chars = $chars[0];
-			foreach($chars as $char) {
-				if (!$previous_is_backslash) {
-					if ('\\' == $char)
-						$previous_is_backslash = true;
-					else
-						$unpoified .= $char;
-				} else {
-					$previous_is_backslash = false;
-					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
+		/**
+		 * Same as {@link export}, but writes the result to a file
+		 *
+		 * @param string $filename where to write the PO string
+		 * @param bool $include_headers whether to include tje headers in the export
+		 * @return bool true on success, false on error
+		 */
+		function export_to_file( $filename, $include_headers = true ) {
+			$fh = fopen( $filename, 'w' );
+			if ( false === $fh ) {
+				return false;
+			}
+			$export = $this->export( $include_headers );
+			$res    = fwrite( $fh, $export );
+			if ( false === $res ) {
+				return false;
+			}
+			return fclose( $fh );
+		}
+
+		/**
+		 * Text to include as a comment before the start of the PO contents
+		 *
+		 * Doesn't need to include # in the beginning of lines, these are added automatically
+		 */
+		function set_comment_before_headers( $text ) {
+			$this->comments_before_headers = $text;
+		}
+
+		/**
+		 * Formats a string in PO-style
+		 *
+		 * @static
+		 * @param string $string the string to format
+		 * @return string the poified string
+		 */
+		public static function poify( $string ) {
+			$quote   = '"';
+			$slash   = '\\';
+			$newline = "\n";
+
+			$replaces = array(
+				"$slash" => "$slash$slash",
+				"$quote" => "$slash$quote",
+				"\t"     => '\t',
+			);
+
+			$string = str_replace( array_keys( $replaces ), array_values( $replaces ), $string );
+
+			$po = $quote . implode( "${slash}n$quote$newline$quote", explode( $newline, $string ) ) . $quote;
+			// add empty string on first line for readbility
+			if ( false !== strpos( $string, $newline ) &&
+				( substr_count( $string, $newline ) > 1 || ! ( $newline === substr( $string, -strlen( $newline ) ) ) ) ) {
+				$po = "$quote$quote$newline$po";
+			}
+			// remove empty strings
+			$po = str_replace( "$newline$quote$quote", '', $po );
+			return $po;
+		}
+
+		/**
+		 * Gives back the original string from a PO-formatted string
+		 *
+		 * @static
+		 * @param string $string PO-formatted string
+		 * @return string enascaped string
+		 */
+		public static function unpoify( $string ) {
+			$escapes               = array(
+				't'  => "\t",
+				'n'  => "\n",
+				'r'  => "\r",
+				'\\' => '\\',
+			);
+			$lines                 = array_map( 'trim', explode( "\n", $string ) );
+			$lines                 = array_map( array( 'PO', 'trim_quotes' ), $lines );
+			$unpoified             = '';
+			$previous_is_backslash = false;
+			foreach ( $lines as $line ) {
+				preg_match_all( '/./u', $line, $chars );
+				$chars = $chars[0];
+				foreach ( $chars as $char ) {
+					if ( ! $previous_is_backslash ) {
+						if ( '\\' == $char ) {
+							$previous_is_backslash = true;
+						} else {
+							$unpoified .= $char;
+						}
+					} else {
+						$previous_is_backslash = false;
+						$unpoified            .= isset( $escapes[ $char ] ) ? $escapes[ $char ] : $char;
+					}
 				}
 			}
+
+			// Standardise the line endings on imported content, technically PO files shouldn't contain \r
+			$unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified );
+
+			return $unpoified;
 		}
 
-		// Standardise the line endings on imported content, technically PO files shouldn't contain \r
-		$unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified );
-
-		return $unpoified;
-	}
-
-	/**
-	 * Inserts $with in the beginning of every new line of $string and
-	 * returns the modified string
-	 *
-	 * @static
-	 * @param string $string prepend lines in this string
-	 * @param string $with prepend lines with this string
-	 */
-	public static function prepend_each_line($string, $with) {
-		$lines = explode("\n", $string);
-		$append = '';
-		if ("\n" === substr($string, -1) && '' === end($lines)) {
-			// Last line might be empty because $string was terminated
-			// with a newline, remove it from the $lines array,
-			// we'll restore state by re-terminating the string at the end
-			array_pop($lines);
-			$append = "\n";
-		}
-		foreach ($lines as &$line) {
-			$line = $with . $line;
-		}
-		unset($line);
-		return implode("\n", $lines) . $append;
-	}
-
-	/**
-	 * Prepare a text as a comment -- wraps the lines and prepends #
-	 * and a special character to each line
-	 *
-	 * @access private
-	 * @param string $text the comment text
-	 * @param string $char character to denote a special PO comment,
-	 * 	like :, default is a space
-	 */
-	public static function comment_block($text, $char=' ') {
-		$text = wordwrap($text, PO_MAX_LINE_LEN - 3);
-		return PO::prepend_each_line($text, "#$char ");
-	}
-
-	/**
-	 * Builds a string from the entry for inclusion in PO file
-	 *
-	 * @static
-	 * @param Translation_Entry $entry the entry to convert to po string (passed by reference).
-	 * @return false|string PO-style formatted string for the entry or
-	 * 	false if the entry is empty
-	 */
-	public static function export_entry(&$entry) {
-		if ( null === $entry->singular || '' === $entry->singular ) return false;
-		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
-		if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
-		$po[] = 'msgid '.PO::poify($entry->singular);
-		if (!$entry->is_plural) {
-			$translation = empty($entry->translations)? '' : $entry->translations[0];
-			$translation = PO::match_begin_and_end_newlines( $translation, $entry->singular );
-			$po[] = 'msgstr '.PO::poify($translation);
-		} else {
-			$po[] = 'msgid_plural '.PO::poify($entry->plural);
-			$translations = empty($entry->translations)? array('', '') : $entry->translations;
-			foreach($translations as $i => $translation) {
-				$translation = PO::match_begin_and_end_newlines( $translation, $entry->plural );
-				$po[] = "msgstr[$i] ".PO::poify($translation);
+		/**
+		 * Inserts $with in the beginning of every new line of $string and
+		 * returns the modified string
+		 *
+		 * @static
+		 * @param string $string prepend lines in this string
+		 * @param string $with prepend lines with this string
+		 */
+		public static function prepend_each_line( $string, $with ) {
+			$lines  = explode( "\n", $string );
+			$append = '';
+			if ( "\n" === substr( $string, -1 ) && '' === end( $lines ) ) {
+				// Last line might be empty because $string was terminated
+				// with a newline, remove it from the $lines array,
+				// we'll restore state by re-terminating the string at the end
+				array_pop( $lines );
+				$append = "\n";
 			}
+			foreach ( $lines as &$line ) {
+				$line = $with . $line;
+			}
+			unset( $line );
+			return implode( "\n", $lines ) . $append;
 		}
-		return implode("\n", $po);
-	}
 
-	public static function match_begin_and_end_newlines( $translation, $original ) {
-		if ( '' === $translation ) {
+		/**
+		 * Prepare a text as a comment -- wraps the lines and prepends #
+		 * and a special character to each line
+		 *
+		 * @access private
+		 * @param string $text the comment text
+		 * @param string $char character to denote a special PO comment,
+		 *  like :, default is a space
+		 */
+		public static function comment_block( $text, $char = ' ' ) {
+			$text = wordwrap( $text, PO_MAX_LINE_LEN - 3 );
+			return PO::prepend_each_line( $text, "#$char " );
+		}
+
+		/**
+		 * Builds a string from the entry for inclusion in PO file
+		 *
+		 * @static
+		 * @param Translation_Entry $entry the entry to convert to po string (passed by reference).
+		 * @return false|string PO-style formatted string for the entry or
+		 *  false if the entry is empty
+		 */
+		public static function export_entry( &$entry ) {
+			if ( null === $entry->singular || '' === $entry->singular ) {
+				return false;
+			}
+			$po = array();
+			if ( ! empty( $entry->translator_comments ) ) {
+				$po[] = PO::comment_block( $entry->translator_comments );
+			}
+			if ( ! empty( $entry->extracted_comments ) ) {
+				$po[] = PO::comment_block( $entry->extracted_comments, '.' );
+			}
+			if ( ! empty( $entry->references ) ) {
+				$po[] = PO::comment_block( implode( ' ', $entry->references ), ':' );
+			}
+			if ( ! empty( $entry->flags ) ) {
+				$po[] = PO::comment_block( implode( ', ', $entry->flags ), ',' );
+			}
+			if ( $entry->context ) {
+				$po[] = 'msgctxt ' . PO::poify( $entry->context );
+			}
+			$po[] = 'msgid ' . PO::poify( $entry->singular );
+			if ( ! $entry->is_plural ) {
+				$translation = empty( $entry->translations ) ? '' : $entry->translations[0];
+				$translation = PO::match_begin_and_end_newlines( $translation, $entry->singular );
+				$po[]        = 'msgstr ' . PO::poify( $translation );
+			} else {
+				$po[]         = 'msgid_plural ' . PO::poify( $entry->plural );
+				$translations = empty( $entry->translations ) ? array( '', '' ) : $entry->translations;
+				foreach ( $translations as $i => $translation ) {
+					$translation = PO::match_begin_and_end_newlines( $translation, $entry->plural );
+					$po[]        = "msgstr[$i] " . PO::poify( $translation );
+				}
+			}
+			return implode( "\n", $po );
+		}
+
+		public static function match_begin_and_end_newlines( $translation, $original ) {
+			if ( '' === $translation ) {
+				return $translation;
+			}
+
+			$original_begin    = "\n" === substr( $original, 0, 1 );
+			$original_end      = "\n" === substr( $original, -1 );
+			$translation_begin = "\n" === substr( $translation, 0, 1 );
+			$translation_end   = "\n" === substr( $translation, -1 );
+
+			if ( $original_begin ) {
+				if ( ! $translation_begin ) {
+					$translation = "\n" . $translation;
+				}
+			} elseif ( $translation_begin ) {
+				$translation = ltrim( $translation, "\n" );
+			}
+
+			if ( $original_end ) {
+				if ( ! $translation_end ) {
+					$translation .= "\n";
+				}
+			} elseif ( $translation_end ) {
+				$translation = rtrim( $translation, "\n" );
+			}
+
 			return $translation;
 		}
 
-		$original_begin = "\n" === substr( $original, 0, 1 );
-		$original_end = "\n" === substr( $original, -1 );
-		$translation_begin = "\n" === substr( $translation, 0, 1 );
-		$translation_end = "\n" === substr( $translation, -1 );
-
-		if ( $original_begin ) {
-			if ( ! $translation_begin ) {
-				$translation = "\n" . $translation;
+		/**
+		 * @param string $filename
+		 * @return boolean
+		 */
+		function import_from_file( $filename ) {
+			$f = fopen( $filename, 'r' );
+			if ( ! $f ) {
+				return false;
 			}
-		} elseif ( $translation_begin ) {
-			$translation = ltrim( $translation, "\n" );
-		}
-
-		if ( $original_end ) {
-			if ( ! $translation_end ) {
-				$translation .= "\n";
+			$lineno = 0;
+			while ( true ) {
+				$res = $this->read_entry( $f, $lineno );
+				if ( ! $res ) {
+					break;
+				}
+				if ( $res['entry']->singular == '' ) {
+					$this->set_headers( $this->make_headers( $res['entry']->translations[0] ) );
+				} else {
+					$this->add_entry( $res['entry'] );
+				}
 			}
-		} elseif ( $translation_end ) {
-			$translation = rtrim( $translation, "\n" );
-		}
-
-		return $translation;
-	}
-
-	/**
-	 * @param string $filename
-	 * @return boolean
-	 */
-	function import_from_file($filename) {
-		$f = fopen($filename, 'r');
-		if (!$f) return false;
-		$lineno = 0;
-		while (true) {
-			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
-			if ($res['entry']->singular == '') {
-				$this->set_headers($this->make_headers($res['entry']->translations[0]));
-			} else {
-				$this->add_entry($res['entry']);
+			PO::read_line( $f, 'clear' );
+			if ( false === $res ) {
+				return false;
 			}
+			if ( ! $this->headers && ! $this->entries ) {
+				return false;
+			}
+			return true;
 		}
-		PO::read_line($f, 'clear');
-		if ( false === $res ) {
-			return false;
-		}
-		if ( ! $this->headers && ! $this->entries ) {
-			return false;
-		}
-		return true;
-	}
 
-	/**
-	 * Helper function for read_entry
-	 * @param string $context
-	 * @return bool
-	 */
-	protected static function is_final($context) {
-		return ($context === 'msgstr') || ($context === 'msgstr_plural');
-	}
+		/**
+		 * Helper function for read_entry
+		 *
+		 * @param string $context
+		 * @return bool
+		 */
+		protected static function is_final( $context ) {
+			return ( $context === 'msgstr' ) || ( $context === 'msgstr_plural' );
+		}
 
-	/**
-	 * @param resource $f
-	 * @param int      $lineno
-	 * @return null|false|array
-	 */
-	function read_entry($f, $lineno = 0) {
-		$entry = new Translation_Entry();
-		// where were we in the last step
-		// can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural
-		$context = '';
-		$msgstr_index = 0;
-		while (true) {
-			$lineno++;
-			$line = PO::read_line($f);
-			if (!$line)  {
-				if (feof($f)) {
-					if (self::is_final($context))
-						break;
-					elseif (!$context) // we haven't read a line and eof came
-						return null;
-					else
+		/**
+		 * @param resource $f
+		 * @param int      $lineno
+		 * @return null|false|array
+		 */
+		function read_entry( $f, $lineno = 0 ) {
+			$entry = new Translation_Entry();
+			// where were we in the last step
+			// can be: comment, msgctxt, msgid, msgid_plural, msgstr, msgstr_plural
+			$context      = '';
+			$msgstr_index = 0;
+			while ( true ) {
+				$lineno++;
+				$line = PO::read_line( $f );
+				if ( ! $line ) {
+					if ( feof( $f ) ) {
+						if ( self::is_final( $context ) ) {
+							break;
+						} elseif ( ! $context ) { // we haven't read a line and eof came
+							return null;
+						} else {
+							return false;
+						}
+					} else {
 						return false;
+					}
+				}
+				if ( $line == "\n" ) {
+					continue;
+				}
+				$line = trim( $line );
+				if ( preg_match( '/^#/', $line, $m ) ) {
+					// the comment is the start of a new entry
+					if ( self::is_final( $context ) ) {
+						PO::read_line( $f, 'put-back' );
+						$lineno--;
+						break;
+					}
+					// comments have to be at the beginning
+					if ( $context && $context != 'comment' ) {
+						return false;
+					}
+					// add comment
+					$this->add_comment_to_entry( $entry, $line );
+				} elseif ( preg_match( '/^msgctxt\s+(".*")/', $line, $m ) ) {
+					if ( self::is_final( $context ) ) {
+						PO::read_line( $f, 'put-back' );
+						$lineno--;
+						break;
+					}
+					if ( $context && $context != 'comment' ) {
+						return false;
+					}
+					$context         = 'msgctxt';
+					$entry->context .= PO::unpoify( $m[1] );
+				} elseif ( preg_match( '/^msgid\s+(".*")/', $line, $m ) ) {
+					if ( self::is_final( $context ) ) {
+						PO::read_line( $f, 'put-back' );
+						$lineno--;
+						break;
+					}
+					if ( $context && $context != 'msgctxt' && $context != 'comment' ) {
+						return false;
+					}
+					$context          = 'msgid';
+					$entry->singular .= PO::unpoify( $m[1] );
+				} elseif ( preg_match( '/^msgid_plural\s+(".*")/', $line, $m ) ) {
+					if ( $context != 'msgid' ) {
+						return false;
+					}
+					$context          = 'msgid_plural';
+					$entry->is_plural = true;
+					$entry->plural   .= PO::unpoify( $m[1] );
+				} elseif ( preg_match( '/^msgstr\s+(".*")/', $line, $m ) ) {
+					if ( $context != 'msgid' ) {
+						return false;
+					}
+					$context             = 'msgstr';
+					$entry->translations = array( PO::unpoify( $m[1] ) );
+				} elseif ( preg_match( '/^msgstr\[(\d+)\]\s+(".*")/', $line, $m ) ) {
+					if ( $context != 'msgid_plural' && $context != 'msgstr_plural' ) {
+						return false;
+					}
+					$context                      = 'msgstr_plural';
+					$msgstr_index                 = $m[1];
+					$entry->translations[ $m[1] ] = PO::unpoify( $m[2] );
+				} elseif ( preg_match( '/^".*"$/', $line ) ) {
+					$unpoified = PO::unpoify( $line );
+					switch ( $context ) {
+						case 'msgid':
+							$entry->singular .= $unpoified;
+							break;
+						case 'msgctxt':
+							$entry->context .= $unpoified;
+							break;
+						case 'msgid_plural':
+							$entry->plural .= $unpoified;
+							break;
+						case 'msgstr':
+							$entry->translations[0] .= $unpoified;
+							break;
+						case 'msgstr_plural':
+							$entry->translations[ $msgstr_index ] .= $unpoified;
+							break;
+						default:
+							return false;
+					}
 				} else {
 					return false;
 				}
 			}
-			if ($line == "\n") continue;
-			$line = trim($line);
-			if (preg_match('/^#/', $line, $m)) {
-				// the comment is the start of a new entry
-				if (self::is_final($context)) {
-					PO::read_line($f, 'put-back');
-					$lineno--;
+
+			$have_translations = false;
+			foreach ( $entry->translations as $t ) {
+				if ( $t || ( '0' === $t ) ) {
+					$have_translations = true;
 					break;
 				}
-				// comments have to be at the beginning
-				if ($context && $context != 'comment') {
-					return false;
-				}
-				// add comment
-				$this->add_comment_to_entry($entry, $line);
-			} elseif (preg_match('/^msgctxt\s+(".*")/', $line, $m)) {
-				if (self::is_final($context)) {
-					PO::read_line($f, 'put-back');
-					$lineno--;
-					break;
-				}
-				if ($context && $context != 'comment') {
-					return false;
-				}
-				$context = 'msgctxt';
-				$entry->context .= PO::unpoify($m[1]);
-			} elseif (preg_match('/^msgid\s+(".*")/', $line, $m)) {
-				if (self::is_final($context)) {
-					PO::read_line($f, 'put-back');
-					$lineno--;
-					break;
-				}
-				if ($context && $context != 'msgctxt' && $context != 'comment') {
-					return false;
-				}
-				$context = 'msgid';
-				$entry->singular .= PO::unpoify($m[1]);
-			} elseif (preg_match('/^msgid_plural\s+(".*")/', $line, $m)) {
-				if ($context != 'msgid') {
-					return false;
-				}
-				$context = 'msgid_plural';
-				$entry->is_plural = true;
-				$entry->plural .= PO::unpoify($m[1]);
-			} elseif (preg_match('/^msgstr\s+(".*")/', $line, $m)) {
-				if ($context != 'msgid') {
-					return false;
-				}
-				$context = 'msgstr';
-				$entry->translations = array(PO::unpoify($m[1]));
-			} elseif (preg_match('/^msgstr\[(\d+)\]\s+(".*")/', $line, $m)) {
-				if ($context != 'msgid_plural' && $context != 'msgstr_plural') {
-					return false;
-				}
-				$context = 'msgstr_plural';
-				$msgstr_index = $m[1];
-				$entry->translations[$m[1]] = PO::unpoify($m[2]);
-			} elseif (preg_match('/^".*"$/', $line)) {
-				$unpoified = PO::unpoify($line);
-				switch ($context) {
-					case 'msgid':
-						$entry->singular .= $unpoified; break;
-					case 'msgctxt':
-						$entry->context .= $unpoified; break;
-					case 'msgid_plural':
-						$entry->plural .= $unpoified; break;
-					case 'msgstr':
-						$entry->translations[0] .= $unpoified; break;
-					case 'msgstr_plural':
-						$entry->translations[$msgstr_index] .= $unpoified; break;
-					default:
-						return false;
-				}
+			}
+			if ( false === $have_translations ) {
+				$entry->translations = array();
+			}
+
+			return array(
+				'entry'  => $entry,
+				'lineno' => $lineno,
+			);
+		}
+
+		/**
+		 * @staticvar string   $last_line
+		 * @staticvar boolean  $use_last_line
+		 *
+		 * @param     resource $f
+		 * @param     string   $action
+		 * @return boolean
+		 */
+		function read_line( $f, $action = 'read' ) {
+			static $last_line     = '';
+			static $use_last_line = false;
+			if ( 'clear' == $action ) {
+				$last_line = '';
+				return true;
+			}
+			if ( 'put-back' == $action ) {
+				$use_last_line = true;
+				return true;
+			}
+			$line          = $use_last_line ? $last_line : fgets( $f );
+			$line          = ( "\r\n" == substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
+			$last_line     = $line;
+			$use_last_line = false;
+			return $line;
+		}
+
+		/**
+		 * @param Translation_Entry $entry
+		 * @param string            $po_comment_line
+		 */
+		function add_comment_to_entry( &$entry, $po_comment_line ) {
+			$first_two = substr( $po_comment_line, 0, 2 );
+			$comment   = trim( substr( $po_comment_line, 2 ) );
+			if ( '#:' == $first_two ) {
+				$entry->references = array_merge( $entry->references, preg_split( '/\s+/', $comment ) );
+			} elseif ( '#.' == $first_two ) {
+				$entry->extracted_comments = trim( $entry->extracted_comments . "\n" . $comment );
+			} elseif ( '#,' == $first_two ) {
+				$entry->flags = array_merge( $entry->flags, preg_split( '/,\s*/', $comment ) );
 			} else {
-				return false;
+				$entry->translator_comments = trim( $entry->translator_comments . "\n" . $comment );
 			}
 		}
 
-		$have_translations = false;
-		foreach ( $entry->translations as $t ) {
-			if ( $t || ('0' === $t) ) {
-				$have_translations = true;
-				break;
+		/**
+		 * @param string $s
+		 * @return sring
+		 */
+		public static function trim_quotes( $s ) {
+			if ( substr( $s, 0, 1 ) == '"' ) {
+				$s = substr( $s, 1 );
 			}
-		}
-		if ( false === $have_translations ) {
-			$entry->translations = array();
-		}
-
-		return array('entry' => $entry, 'lineno' => $lineno);
-	}
-
-	/**
-	 * @staticvar string   $last_line
-	 * @staticvar boolean  $use_last_line
-	 *
-	 * @param     resource $f
-	 * @param     string   $action
-	 * @return boolean
-	 */
-	function read_line($f, $action = 'read') {
-		static $last_line = '';
-		static $use_last_line = false;
-		if ('clear' == $action) {
-			$last_line = '';
-			return true;
-		}
-		if ('put-back' == $action) {
-			$use_last_line = true;
-			return true;
-		}
-		$line = $use_last_line? $last_line : fgets($f);
-		$line = ( "\r\n" == substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
-		$last_line = $line;
-		$use_last_line = false;
-		return $line;
-	}
-
-	/**
-	 * @param Translation_Entry $entry
-	 * @param string            $po_comment_line
-	 */
-	function add_comment_to_entry(&$entry, $po_comment_line) {
-		$first_two = substr($po_comment_line, 0, 2);
-		$comment = trim(substr($po_comment_line, 2));
-		if ('#:' == $first_two) {
-			$entry->references = array_merge($entry->references, preg_split('/\s+/', $comment));
-		} elseif ('#.' == $first_two) {
-			$entry->extracted_comments = trim($entry->extracted_comments . "\n" . $comment);
-		} elseif ('#,' == $first_two) {
-			$entry->flags = array_merge($entry->flags, preg_split('/,\s*/', $comment));
-		} else {
-			$entry->translator_comments = trim($entry->translator_comments . "\n" . $comment);
+			if ( substr( $s, -1, 1 ) == '"' ) {
+				$s = substr( $s, 0, -1 );
+			}
+			return $s;
 		}
 	}
-
-	/**
-	 * @param string $s
-	 * @return sring
-	 */
-	public static function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
-		return $s;
-	}
-}
 endif;
diff --git a/wp-includes/pomo/streams.php b/wp-includes/pomo/streams.php
index 5e37c9c412..b0605057d9 100644
--- a/wp-includes/pomo/streams.php
+++ b/wp-includes/pomo/streams.php
@@ -8,308 +8,317 @@
  * @subpackage streams
  */
 
-if ( ! class_exists( 'POMO_Reader', false ) ):
-class POMO_Reader {
+if ( ! class_exists( 'POMO_Reader', false ) ) :
+	class POMO_Reader {
 
-	var $endian = 'little';
-	var $_post = '';
+		var $endian = 'little';
+		var $_post  = '';
 
-	/**
-	 * PHP5 constructor.
-	 */
-	function __construct() {
-		$this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr');
-		$this->_pos = 0;
-	}
+		/**
+		 * PHP5 constructor.
+		 */
+		function __construct() {
+			$this->is_overloaded = ( ( ini_get( 'mbstring.func_overload' ) & 2 ) != 0 ) && function_exists( 'mb_substr' );
+			$this->_pos          = 0;
+		}
 
-	/**
-	 * PHP4 constructor.
-	 */
-	public function POMO_Reader() {
-		self::__construct();
-	}
+		/**
+		 * PHP4 constructor.
+		 */
+		public function POMO_Reader() {
+			self::__construct();
+		}
 
-	/**
-	 * Sets the endianness of the file.
-	 *
-	 * @param $endian string 'big' or 'little'
-	 */
-	function setEndian($endian) {
-		$this->endian = $endian;
-	}
+		/**
+		 * Sets the endianness of the file.
+		 *
+		 * @param $endian string 'big' or 'little'
+		 */
+		function setEndian( $endian ) {
+			$this->endian = $endian;
+		}
 
-	/**
-	 * Reads a 32bit Integer from the Stream
-	 *
-	 * @return mixed The integer, corresponding to the next 32 bits from
-	 * 	the stream of false if there are not enough bytes or on error
-	 */
-	function readint32() {
-		$bytes = $this->read(4);
-		if (4 != $this->strlen($bytes))
-			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
-		$int = unpack($endian_letter, $bytes);
-		return reset( $int );
-	}
+		/**
+		 * Reads a 32bit Integer from the Stream
+		 *
+		 * @return mixed The integer, corresponding to the next 32 bits from
+		 *  the stream of false if there are not enough bytes or on error
+		 */
+		function readint32() {
+			$bytes = $this->read( 4 );
+			if ( 4 != $this->strlen( $bytes ) ) {
+				return false;
+			}
+			$endian_letter = ( 'big' == $this->endian ) ? 'N' : 'V';
+			$int           = unpack( $endian_letter, $bytes );
+			return reset( $int );
+		}
 
-	/**
-	 * Reads an array of 32-bit Integers from the Stream
-	 *
-	 * @param integer count How many elements should be read
-	 * @return mixed Array of integers or false if there isn't
-	 * 	enough data or on error
-	 */
-	function readint32array($count) {
-		$bytes = $this->read(4 * $count);
-		if (4*$count != $this->strlen($bytes))
-			return false;
-		$endian_letter = ('big' == $this->endian)? 'N' : 'V';
-		return unpack($endian_letter.$count, $bytes);
-	}
+		/**
+		 * Reads an array of 32-bit Integers from the Stream
+		 *
+		 * @param integer count How many elements should be read
+		 * @return mixed Array of integers or false if there isn't
+		 *  enough data or on error
+		 */
+		function readint32array( $count ) {
+			$bytes = $this->read( 4 * $count );
+			if ( 4 * $count != $this->strlen( $bytes ) ) {
+				return false;
+			}
+			$endian_letter = ( 'big' == $this->endian ) ? 'N' : 'V';
+			return unpack( $endian_letter . $count, $bytes );
+		}
 
-	/**
-	 * @param string $string
-	 * @param int    $start
-	 * @param int    $length
-	 * @return string
-	 */
-	function substr($string, $start, $length) {
-		if ($this->is_overloaded) {
-			return mb_substr($string, $start, $length, 'ascii');
-		} else {
-			return substr($string, $start, $length);
+		/**
+		 * @param string $string
+		 * @param int    $start
+		 * @param int    $length
+		 * @return string
+		 */
+		function substr( $string, $start, $length ) {
+			if ( $this->is_overloaded ) {
+				return mb_substr( $string, $start, $length, 'ascii' );
+			} else {
+				return substr( $string, $start, $length );
+			}
+		}
+
+		/**
+		 * @param string $string
+		 * @return int
+		 */
+		function strlen( $string ) {
+			if ( $this->is_overloaded ) {
+				return mb_strlen( $string, 'ascii' );
+			} else {
+				return strlen( $string );
+			}
+		}
+
+		/**
+		 * @param string $string
+		 * @param int    $chunk_size
+		 * @return array
+		 */
+		function str_split( $string, $chunk_size ) {
+			if ( ! function_exists( 'str_split' ) ) {
+				$length = $this->strlen( $string );
+				$out    = array();
+				for ( $i = 0; $i < $length; $i += $chunk_size ) {
+					$out[] = $this->substr( $string, $i, $chunk_size );
+				}
+				return $out;
+			} else {
+				return str_split( $string, $chunk_size );
+			}
+		}
+
+		/**
+		 * @return int
+		 */
+		function pos() {
+			return $this->_pos;
+		}
+
+		/**
+		 * @return true
+		 */
+		function is_resource() {
+			return true;
+		}
+
+		/**
+		 * @return true
+		 */
+		function close() {
+			return true;
 		}
 	}
+endif;
 
-	/**
-	 * @param string $string
-	 * @return int
-	 */
-	function strlen($string) {
-		if ($this->is_overloaded) {
-			return mb_strlen($string, 'ascii');
-		} else {
-			return strlen($string);
+if ( ! class_exists( 'POMO_FileReader', false ) ) :
+	class POMO_FileReader extends POMO_Reader {
+
+		/**
+		 * @param string $filename
+		 */
+		function __construct( $filename ) {
+			parent::POMO_Reader();
+			$this->_f = fopen( $filename, 'rb' );
+		}
+
+		/**
+		 * PHP4 constructor.
+		 */
+		public function POMO_FileReader( $filename ) {
+			self::__construct( $filename );
+		}
+
+		/**
+		 * @param int $bytes
+		 */
+		function read( $bytes ) {
+			return fread( $this->_f, $bytes );
+		}
+
+		/**
+		 * @param int $pos
+		 * @return boolean
+		 */
+		function seekto( $pos ) {
+			if ( -1 == fseek( $this->_f, $pos, SEEK_SET ) ) {
+				return false;
+			}
+			$this->_pos = $pos;
+			return true;
+		}
+
+		/**
+		 * @return bool
+		 */
+		function is_resource() {
+			return is_resource( $this->_f );
+		}
+
+		/**
+		 * @return bool
+		 */
+		function feof() {
+			return feof( $this->_f );
+		}
+
+		/**
+		 * @return bool
+		 */
+		function close() {
+			return fclose( $this->_f );
+		}
+
+		/**
+		 * @return string
+		 */
+		function read_all() {
+			$all = '';
+			while ( ! $this->feof() ) {
+				$all .= $this->read( 4096 );
+			}
+			return $all;
 		}
 	}
+endif;
 
+if ( ! class_exists( 'POMO_StringReader', false ) ) :
 	/**
-	 * @param string $string
-	 * @param int    $chunk_size
-	 * @return array
+	 * Provides file-like methods for manipulating a string instead
+	 * of a physical file.
 	 */
-	function str_split($string, $chunk_size) {
-		if (!function_exists('str_split')) {
-			$length = $this->strlen($string);
-			$out = array();
-			for ($i = 0; $i < $length; $i += $chunk_size)
-				$out[] = $this->substr($string, $i, $chunk_size);
-			return $out;
-		} else {
-			return str_split( $string, $chunk_size );
+	class POMO_StringReader extends POMO_Reader {
+
+		var $_str = '';
+
+		/**
+		 * PHP5 constructor.
+		 */
+		function __construct( $str = '' ) {
+			parent::POMO_Reader();
+			$this->_str = $str;
+			$this->_pos = 0;
+		}
+
+		/**
+		 * PHP4 constructor.
+		 */
+		public function POMO_StringReader( $str = '' ) {
+			self::__construct( $str );
+		}
+
+		/**
+		 * @param string $bytes
+		 * @return string
+		 */
+		function read( $bytes ) {
+			$data        = $this->substr( $this->_str, $this->_pos, $bytes );
+			$this->_pos += $bytes;
+			if ( $this->strlen( $this->_str ) < $this->_pos ) {
+				$this->_pos = $this->strlen( $this->_str );
+			}
+			return $data;
+		}
+
+		/**
+		 * @param int $pos
+		 * @return int
+		 */
+		function seekto( $pos ) {
+			$this->_pos = $pos;
+			if ( $this->strlen( $this->_str ) < $this->_pos ) {
+				$this->_pos = $this->strlen( $this->_str );
+			}
+			return $this->_pos;
+		}
+
+		/**
+		 * @return int
+		 */
+		function length() {
+			return $this->strlen( $this->_str );
+		}
+
+		/**
+		 * @return string
+		 */
+		function read_all() {
+			return $this->substr( $this->_str, $this->_pos, $this->strlen( $this->_str ) );
+		}
+
+	}
+endif;
+
+if ( ! class_exists( 'POMO_CachedFileReader', false ) ) :
+	/**
+	 * Reads the contents of the file in the beginning.
+	 */
+	class POMO_CachedFileReader extends POMO_StringReader {
+		/**
+		 * PHP5 constructor.
+		 */
+		function __construct( $filename ) {
+			parent::POMO_StringReader();
+			$this->_str = file_get_contents( $filename );
+			if ( false === $this->_str ) {
+				return false;
+			}
+			$this->_pos = 0;
+		}
+
+		/**
+		 * PHP4 constructor.
+		 */
+		public function POMO_CachedFileReader( $filename ) {
+			self::__construct( $filename );
 		}
 	}
-
-	/**
-	 * @return int
-	 */
-	function pos() {
-		return $this->_pos;
-	}
-
-	/**
-	 * @return true
-	 */
-	function is_resource() {
-		return true;
-	}
-
-	/**
-	 * @return true
-	 */
-	function close() {
-		return true;
-	}
-}
 endif;
 
-if ( ! class_exists( 'POMO_FileReader', false ) ):
-class POMO_FileReader extends POMO_Reader {
-
+if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ) :
 	/**
-	 * @param string $filename
+	 * Reads the contents of the file in the beginning.
 	 */
-	function __construct( $filename ) {
-		parent::POMO_Reader();
-		$this->_f = fopen($filename, 'rb');
-	}
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function POMO_FileReader( $filename ) {
-		self::__construct( $filename );
-	}
-
-	/**
-	 * @param int $bytes
-	 */
-	function read($bytes) {
-		return fread($this->_f, $bytes);
-	}
-
-	/**
-	 * @param int $pos
-	 * @return boolean
-	 */
-	function seekto($pos) {
-		if ( -1 == fseek($this->_f, $pos, SEEK_SET)) {
-			return false;
+	class POMO_CachedIntFileReader extends POMO_CachedFileReader {
+		/**
+		 * PHP5 constructor.
+		 */
+		public function __construct( $filename ) {
+			parent::POMO_CachedFileReader( $filename );
 		}
-		$this->_pos = $pos;
-		return true;
-	}
 
-	/**
-	 * @return bool
-	 */
-	function is_resource() {
-		return is_resource($this->_f);
+		/**
+		 * PHP4 constructor.
+		 */
+		function POMO_CachedIntFileReader( $filename ) {
+			self::__construct( $filename );
+		}
 	}
-
-	/**
-	 * @return bool
-	 */
-	function feof() {
-		return feof($this->_f);
-	}
-
-	/**
-	 * @return bool
-	 */
-	function close() {
-		return fclose($this->_f);
-	}
-
-	/**
-	 * @return string
-	 */
-	function read_all() {
-		$all = '';
-		while ( !$this->feof() )
-			$all .= $this->read(4096);
-		return $all;
-	}
-}
-endif;
-
-if ( ! class_exists( 'POMO_StringReader', false ) ):
-/**
- * Provides file-like methods for manipulating a string instead
- * of a physical file.
- */
-class POMO_StringReader extends POMO_Reader {
-
-	var $_str = '';
-
-	/**
-	 * PHP5 constructor.
-	 */
-	function __construct( $str = '' ) {
-		parent::POMO_Reader();
-		$this->_str = $str;
-		$this->_pos = 0;
-	}
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function POMO_StringReader( $str = '' ) {
-		self::__construct( $str );
-	}
-
-	/**
-	 * @param string $bytes
-	 * @return string
-	 */
-	function read($bytes) {
-		$data = $this->substr($this->_str, $this->_pos, $bytes);
-		$this->_pos += $bytes;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
-		return $data;
-	}
-
-	/**
-	 * @param int $pos
-	 * @return int
-	 */
-	function seekto($pos) {
-		$this->_pos = $pos;
-		if ($this->strlen($this->_str) < $this->_pos) $this->_pos = $this->strlen($this->_str);
-		return $this->_pos;
-	}
-
-	/**
-	 * @return int
-	 */
-	function length() {
-		return $this->strlen($this->_str);
-	}
-
-	/**
-	 * @return string
-	 */
-	function read_all() {
-		return $this->substr($this->_str, $this->_pos, $this->strlen($this->_str));
-	}
-
-}
-endif;
-
-if ( ! class_exists( 'POMO_CachedFileReader', false ) ):
-/**
- * Reads the contents of the file in the beginning.
- */
-class POMO_CachedFileReader extends POMO_StringReader {
-	/**
-	 * PHP5 constructor.
-	 */
-	function __construct( $filename ) {
-		parent::POMO_StringReader();
-		$this->_str = file_get_contents($filename);
-		if (false === $this->_str)
-			return false;
-		$this->_pos = 0;
-	}
-
-	/**
-	 * PHP4 constructor.
-	 */
-	public function POMO_CachedFileReader( $filename ) {
-		self::__construct( $filename );
-	}
-}
-endif;
-
-if ( ! class_exists( 'POMO_CachedIntFileReader', false ) ):
-/**
- * Reads the contents of the file in the beginning.
- */
-class POMO_CachedIntFileReader extends POMO_CachedFileReader {
-	/**
-	 * PHP5 constructor.
-	 */
-	public function __construct( $filename ) {
-		parent::POMO_CachedFileReader($filename);
-	}
-
-	/**
-	 * PHP4 constructor.
-	 */
-	function POMO_CachedIntFileReader( $filename ) {
-		self::__construct( $filename );
-	}
-}
 endif;
 
diff --git a/wp-includes/pomo/translations.php b/wp-includes/pomo/translations.php
index 1e20c37d90..be9081a2fc 100644
--- a/wp-includes/pomo/translations.php
+++ b/wp-includes/pomo/translations.php
@@ -7,355 +7,373 @@
  * @subpackage translations
  */
 
-require_once dirname(__FILE__) . '/plural-forms.php';
-require_once dirname(__FILE__) . '/entry.php';
+require_once dirname( __FILE__ ) . '/plural-forms.php';
+require_once dirname( __FILE__ ) . '/entry.php';
 
-if ( ! class_exists( 'Translations', false ) ):
-class Translations {
-	var $entries = array();
-	var $headers = array();
+if ( ! class_exists( 'Translations', false ) ) :
+	class Translations {
+		var $entries = array();
+		var $headers = array();
 
-	/**
-	 * Add entry to the PO structure
-	 *
-	 * @param array|Translation_Entry $entry
-	 * @return bool true on success, false if the entry doesn't have a key
-	 */
-	function add_entry($entry) {
-		if (is_array($entry)) {
-			$entry = new Translation_Entry($entry);
+		/**
+		 * Add entry to the PO structure
+		 *
+		 * @param array|Translation_Entry $entry
+		 * @return bool true on success, false if the entry doesn't have a key
+		 */
+		function add_entry( $entry ) {
+			if ( is_array( $entry ) ) {
+				$entry = new Translation_Entry( $entry );
+			}
+			$key = $entry->key();
+			if ( false === $key ) {
+				return false;
+			}
+			$this->entries[ $key ] = &$entry;
+			return true;
 		}
-		$key = $entry->key();
-		if (false === $key) return false;
-		$this->entries[$key] = &$entry;
-		return true;
-	}
 
-	/**
-	 * @param array|Translation_Entry $entry
-	 * @return bool
-	 */
-	function add_entry_or_merge($entry) {
-		if (is_array($entry)) {
-			$entry = new Translation_Entry($entry);
+		/**
+		 * @param array|Translation_Entry $entry
+		 * @return bool
+		 */
+		function add_entry_or_merge( $entry ) {
+			if ( is_array( $entry ) ) {
+				$entry = new Translation_Entry( $entry );
+			}
+			$key = $entry->key();
+			if ( false === $key ) {
+				return false;
+			}
+			if ( isset( $this->entries[ $key ] ) ) {
+				$this->entries[ $key ]->merge_with( $entry );
+			} else {
+				$this->entries[ $key ] = &$entry;
+			}
+			return true;
 		}
-		$key = $entry->key();
-		if (false === $key) return false;
-		if (isset($this->entries[$key]))
-			$this->entries[$key]->merge_with($entry);
-		else
-			$this->entries[$key] = &$entry;
-		return true;
-	}
 
-	/**
-	 * Sets $header PO header to $value
-	 *
-	 * If the header already exists, it will be overwritten
-	 *
-	 * TODO: this should be out of this class, it is gettext specific
-	 *
-	 * @param string $header header name, without trailing :
-	 * @param string $value header value, without trailing \n
-	 */
-	function set_header($header, $value) {
-		$this->headers[$header] = $value;
-	}
-
-	/**
-	 * @param array $headers
-	 */
-	function set_headers($headers) {
-		foreach($headers as $header => $value) {
-			$this->set_header($header, $value);
+		/**
+		 * Sets $header PO header to $value
+		 *
+		 * If the header already exists, it will be overwritten
+		 *
+		 * TODO: this should be out of this class, it is gettext specific
+		 *
+		 * @param string $header header name, without trailing :
+		 * @param string $value header value, without trailing \n
+		 */
+		function set_header( $header, $value ) {
+			$this->headers[ $header ] = $value;
 		}
-	}
 
-	/**
-	 * @param string $header
-	 */
-	function get_header($header) {
-		return isset($this->headers[$header])? $this->headers[$header] : false;
-	}
-
-	/**
-	 * @param Translation_Entry $entry
-	 */
-	function translate_entry(&$entry) {
-		$key = $entry->key();
-		return isset($this->entries[$key])? $this->entries[$key] : false;
-	}
-
-	/**
-	 * @param string $singular
-	 * @param string $context
-	 * @return string
-	 */
-	function translate($singular, $context=null) {
-		$entry = new Translation_Entry(array('singular' => $singular, 'context' => $context));
-		$translated = $this->translate_entry($entry);
-		return ($translated && !empty($translated->translations))? $translated->translations[0] : $singular;
-	}
-
-	/**
-	 * Given the number of items, returns the 0-based index of the plural form to use
-	 *
-	 * Here, in the base Translations class, the common logic for English is implemented:
-	 * 	0 if there is one element, 1 otherwise
-	 *
-	 * This function should be overridden by the sub-classes. For example MO/PO can derive the logic
-	 * from their headers.
-	 *
-	 * @param integer $count number of items
-	 */
-	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
-	}
-
-	/**
-	 * @return int
-	 */
-	function get_plural_forms_count() {
-		return 2;
-	}
-
-	/**
-	 * @param string $singular
-	 * @param string $plural
-	 * @param int    $count
-	 * @param string $context
-	 */
-	function translate_plural($singular, $plural, $count, $context = null) {
-		$entry = new Translation_Entry(array('singular' => $singular, 'plural' => $plural, 'context' => $context));
-		$translated = $this->translate_entry($entry);
-		$index = $this->select_plural_form($count);
-		$total_plural_forms = $this->get_plural_forms_count();
-		if ($translated && 0 <= $index && $index < $total_plural_forms &&
-				is_array($translated->translations) &&
-				isset($translated->translations[$index]))
-			return $translated->translations[$index];
-		else
-			return 1 == $count? $singular : $plural;
-	}
-
-	/**
-	 * Merge $other in the current object.
-	 *
-	 * @param Object $other Another Translation object, whose translations will be merged in this one (passed by reference).
-	 * @return void
-	 **/
-	function merge_with(&$other) {
-		foreach( $other->entries as $entry ) {
-			$this->entries[$entry->key()] = $entry;
-		}
-	}
-
-	/**
-	 * @param object $other
-	 */
-	function merge_originals_with(&$other) {
-		foreach( $other->entries as $entry ) {
-			if ( !isset( $this->entries[$entry->key()] ) )
-				$this->entries[$entry->key()] = $entry;
-			else
-				$this->entries[$entry->key()]->merge_with($entry);
-		}
-	}
-}
-
-class Gettext_Translations extends Translations {
-	/**
-	 * The gettext implementation of select_plural_form.
-	 *
-	 * It lives in this class, because there are more than one descendand, which will use it and
-	 * they can't share it effectively.
-	 *
-	 * @param int $count
-	 */
-	function gettext_select_plural_form($count) {
-		if (!isset($this->_gettext_select_plural_form) || is_null($this->_gettext_select_plural_form)) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
-			$this->_nplurals = $nplurals;
-			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
-		}
-		return call_user_func($this->_gettext_select_plural_form, $count);
-	}
-
-	/**
-	 * @param string $header
-	 * @return array
-	 */
-	function nplurals_and_expression_from_header($header) {
-		if (preg_match('/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches)) {
-			$nplurals = (int)$matches[1];
-			$expression = trim( $matches[2] );
-			return array($nplurals, $expression);
-		} else {
-			return array(2, 'n != 1');
-		}
-	}
-
-	/**
-	 * Makes a function, which will return the right translation index, according to the
-	 * plural forms header
-	 * @param int    $nplurals
-	 * @param string $expression
-	 */
-	function make_plural_form_function($nplurals, $expression) {
-		try {
-			$handler = new Plural_Forms( rtrim( $expression, ';' ) );
-			return array( $handler, 'get' );
-		} catch ( Exception $e ) {
-			// Fall back to default plural-form function.
-			return $this->make_plural_form_function( 2, 'n != 1' );
-		}
-	}
-
-	/**
-	 * Adds parentheses to the inner parts of ternary operators in
-	 * plural expressions, because PHP evaluates ternary oerators from left to right
-	 *
-	 * @param string $expression the expression without parentheses
-	 * @return string the expression with parentheses added
-	 */
-	function parenthesize_plural_exression($expression) {
-		$expression .= ';';
-		$res = '';
-		$depth = 0;
-		for ($i = 0; $i < strlen($expression); ++$i) {
-			$char = $expression[$i];
-			switch ($char) {
-				case '?':
-					$res .= ' ? (';
-					$depth++;
-					break;
-				case ':':
-					$res .= ') : (';
-					break;
-				case ';':
-					$res .= str_repeat(')', $depth) . ';';
-					$depth= 0;
-					break;
-				default:
-					$res .= $char;
+		/**
+		 * @param array $headers
+		 */
+		function set_headers( $headers ) {
+			foreach ( $headers as $header => $value ) {
+				$this->set_header( $header, $value );
 			}
 		}
-		return rtrim($res, ';');
-	}
 
-	/**
-	 * @param string $translation
-	 * @return array
-	 */
-	function make_headers($translation) {
-		$headers = array();
-		// sometimes \ns are used instead of real new lines
-		$translation = str_replace('\n', "\n", $translation);
-		$lines = explode("\n", $translation);
-		foreach($lines as $line) {
-			$parts = explode(':', $line, 2);
-			if (!isset($parts[1])) continue;
-			$headers[trim($parts[0])] = trim($parts[1]);
+		/**
+		 * @param string $header
+		 */
+		function get_header( $header ) {
+			return isset( $this->headers[ $header ] ) ? $this->headers[ $header ] : false;
 		}
-		return $headers;
-	}
 
-	/**
-	 * @param string $header
-	 * @param string $value
-	 */
-	function set_header($header, $value) {
-		parent::set_header($header, $value);
-		if ('Plural-Forms' == $header) {
-			list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header($this->get_header('Plural-Forms'));
-			$this->_nplurals = $nplurals;
-			$this->_gettext_select_plural_form = $this->make_plural_form_function($nplurals, $expression);
+		/**
+		 * @param Translation_Entry $entry
+		 */
+		function translate_entry( &$entry ) {
+			$key = $entry->key();
+			return isset( $this->entries[ $key ] ) ? $this->entries[ $key ] : false;
+		}
+
+		/**
+		 * @param string $singular
+		 * @param string $context
+		 * @return string
+		 */
+		function translate( $singular, $context = null ) {
+			$entry      = new Translation_Entry(
+				array(
+					'singular' => $singular,
+					'context'  => $context,
+				)
+			);
+			$translated = $this->translate_entry( $entry );
+			return ( $translated && ! empty( $translated->translations ) ) ? $translated->translations[0] : $singular;
+		}
+
+		/**
+		 * Given the number of items, returns the 0-based index of the plural form to use
+		 *
+		 * Here, in the base Translations class, the common logic for English is implemented:
+		 *  0 if there is one element, 1 otherwise
+		 *
+		 * This function should be overridden by the sub-classes. For example MO/PO can derive the logic
+		 * from their headers.
+		 *
+		 * @param integer $count number of items
+		 */
+		function select_plural_form( $count ) {
+			return 1 == $count ? 0 : 1;
+		}
+
+		/**
+		 * @return int
+		 */
+		function get_plural_forms_count() {
+			return 2;
+		}
+
+		/**
+		 * @param string $singular
+		 * @param string $plural
+		 * @param int    $count
+		 * @param string $context
+		 */
+		function translate_plural( $singular, $plural, $count, $context = null ) {
+			$entry              = new Translation_Entry(
+				array(
+					'singular' => $singular,
+					'plural'   => $plural,
+					'context'  => $context,
+				)
+			);
+			$translated         = $this->translate_entry( $entry );
+			$index              = $this->select_plural_form( $count );
+			$total_plural_forms = $this->get_plural_forms_count();
+			if ( $translated && 0 <= $index && $index < $total_plural_forms &&
+				is_array( $translated->translations ) &&
+				isset( $translated->translations[ $index ] ) ) {
+				return $translated->translations[ $index ];
+			} else {
+				return 1 == $count ? $singular : $plural;
+			}
+		}
+
+		/**
+		 * Merge $other in the current object.
+		 *
+		 * @param Object $other Another Translation object, whose translations will be merged in this one (passed by reference).
+		 * @return void
+		 */
+		function merge_with( &$other ) {
+			foreach ( $other->entries as $entry ) {
+				$this->entries[ $entry->key() ] = $entry;
+			}
+		}
+
+		/**
+		 * @param object $other
+		 */
+		function merge_originals_with( &$other ) {
+			foreach ( $other->entries as $entry ) {
+				if ( ! isset( $this->entries[ $entry->key() ] ) ) {
+					$this->entries[ $entry->key() ] = $entry;
+				} else {
+					$this->entries[ $entry->key() ]->merge_with( $entry );
+				}
+			}
+		}
+	}
+
+	class Gettext_Translations extends Translations {
+		/**
+		 * The gettext implementation of select_plural_form.
+		 *
+		 * It lives in this class, because there are more than one descendand, which will use it and
+		 * they can't share it effectively.
+		 *
+		 * @param int $count
+		 */
+		function gettext_select_plural_form( $count ) {
+			if ( ! isset( $this->_gettext_select_plural_form ) || is_null( $this->_gettext_select_plural_form ) ) {
+				list( $nplurals, $expression )     = $this->nplurals_and_expression_from_header( $this->get_header( 'Plural-Forms' ) );
+				$this->_nplurals                   = $nplurals;
+				$this->_gettext_select_plural_form = $this->make_plural_form_function( $nplurals, $expression );
+			}
+			return call_user_func( $this->_gettext_select_plural_form, $count );
+		}
+
+		/**
+		 * @param string $header
+		 * @return array
+		 */
+		function nplurals_and_expression_from_header( $header ) {
+			if ( preg_match( '/^\s*nplurals\s*=\s*(\d+)\s*;\s+plural\s*=\s*(.+)$/', $header, $matches ) ) {
+				$nplurals   = (int) $matches[1];
+				$expression = trim( $matches[2] );
+				return array( $nplurals, $expression );
+			} else {
+				return array( 2, 'n != 1' );
+			}
+		}
+
+		/**
+		 * Makes a function, which will return the right translation index, according to the
+		 * plural forms header
+		 *
+		 * @param int    $nplurals
+		 * @param string $expression
+		 */
+		function make_plural_form_function( $nplurals, $expression ) {
+			try {
+				$handler = new Plural_Forms( rtrim( $expression, ';' ) );
+				return array( $handler, 'get' );
+			} catch ( Exception $e ) {
+				// Fall back to default plural-form function.
+				return $this->make_plural_form_function( 2, 'n != 1' );
+			}
+		}
+
+		/**
+		 * Adds parentheses to the inner parts of ternary operators in
+		 * plural expressions, because PHP evaluates ternary oerators from left to right
+		 *
+		 * @param string $expression the expression without parentheses
+		 * @return string the expression with parentheses added
+		 */
+		function parenthesize_plural_exression( $expression ) {
+			$expression .= ';';
+			$res         = '';
+			$depth       = 0;
+			for ( $i = 0; $i < strlen( $expression ); ++$i ) {
+				$char = $expression[ $i ];
+				switch ( $char ) {
+					case '?':
+						$res .= ' ? (';
+						$depth++;
+						break;
+					case ':':
+						$res .= ') : (';
+						break;
+					case ';':
+						$res  .= str_repeat( ')', $depth ) . ';';
+						$depth = 0;
+						break;
+					default:
+						$res .= $char;
+				}
+			}
+			return rtrim( $res, ';' );
+		}
+
+		/**
+		 * @param string $translation
+		 * @return array
+		 */
+		function make_headers( $translation ) {
+			$headers = array();
+			// sometimes \ns are used instead of real new lines
+			$translation = str_replace( '\n', "\n", $translation );
+			$lines       = explode( "\n", $translation );
+			foreach ( $lines as $line ) {
+				$parts = explode( ':', $line, 2 );
+				if ( ! isset( $parts[1] ) ) {
+					continue;
+				}
+				$headers[ trim( $parts[0] ) ] = trim( $parts[1] );
+			}
+			return $headers;
+		}
+
+		/**
+		 * @param string $header
+		 * @param string $value
+		 */
+		function set_header( $header, $value ) {
+			parent::set_header( $header, $value );
+			if ( 'Plural-Forms' == $header ) {
+				list( $nplurals, $expression )     = $this->nplurals_and_expression_from_header( $this->get_header( 'Plural-Forms' ) );
+				$this->_nplurals                   = $nplurals;
+				$this->_gettext_select_plural_form = $this->make_plural_form_function( $nplurals, $expression );
+			}
 		}
 	}
-}
 endif;
 
-if ( ! class_exists( 'NOOP_Translations', false ) ):
-/**
- * Provides the same interface as Translations, but doesn't do anything
- */
-class NOOP_Translations {
-	var $entries = array();
-	var $headers = array();
-
-	function add_entry($entry) {
-		return true;
-	}
-
+if ( ! class_exists( 'NOOP_Translations', false ) ) :
 	/**
-	 *
-	 * @param string $header
-	 * @param string $value
+	 * Provides the same interface as Translations, but doesn't do anything
 	 */
-	function set_header($header, $value) {
-	}
+	class NOOP_Translations {
+		var $entries = array();
+		var $headers = array();
 
-	/**
-	 *
-	 * @param array $headers
-	 */
-	function set_headers($headers) {
-	}
+		function add_entry( $entry ) {
+			return true;
+		}
 
-	/**
-	 * @param string $header
-	 * @return false
-	 */
-	function get_header($header) {
-		return false;
-	}
+		/**
+		 * @param string $header
+		 * @param string $value
+		 */
+		function set_header( $header, $value ) {
+		}
 
-	/**
-	 * @param Translation_Entry $entry
-	 * @return false
-	 */
-	function translate_entry(&$entry) {
-		return false;
-	}
+		/**
+		 * @param array $headers
+		 */
+		function set_headers( $headers ) {
+		}
 
-	/**
-	 * @param string $singular
-	 * @param string $context
-	 */
-	function translate($singular, $context=null) {
-		return $singular;
-	}
+		/**
+		 * @param string $header
+		 * @return false
+		 */
+		function get_header( $header ) {
+			return false;
+		}
 
-	/**
-	 *
-	 * @param int $count
-	 * @return bool
-	 */
-	function select_plural_form($count) {
-		return 1 == $count? 0 : 1;
-	}
+		/**
+		 * @param Translation_Entry $entry
+		 * @return false
+		 */
+		function translate_entry( &$entry ) {
+			return false;
+		}
 
-	/**
-	 * @return int
-	 */
-	function get_plural_forms_count() {
-		return 2;
-	}
+		/**
+		 * @param string $singular
+		 * @param string $context
+		 */
+		function translate( $singular, $context = null ) {
+			return $singular;
+		}
 
-	/**
-	 * @param string $singular
-	 * @param string $plural
-	 * @param int    $count
-	 * @param string $context
-	 */
-	function translate_plural($singular, $plural, $count, $context = null) {
-			return 1 == $count? $singular : $plural;
-	}
+		/**
+		 * @param int $count
+		 * @return bool
+		 */
+		function select_plural_form( $count ) {
+			return 1 == $count ? 0 : 1;
+		}
 
-	/**
-	 * @param object $other
-	 */
-	function merge_with(&$other) {
+		/**
+		 * @return int
+		 */
+		function get_plural_forms_count() {
+			return 2;
+		}
+
+		/**
+		 * @param string $singular
+		 * @param string $plural
+		 * @param int    $count
+		 * @param string $context
+		 */
+		function translate_plural( $singular, $plural, $count, $context = null ) {
+			return 1 == $count ? $singular : $plural;
+		}
+
+		/**
+		 * @param object $other
+		 */
+		function merge_with( &$other ) {
+		}
 	}
-}
 endif;
diff --git a/wp-includes/post-formats.php b/wp-includes/post-formats.php
index 47db10b176..eb6fef0380 100644
--- a/wp-includes/post-formats.php
+++ b/wp-includes/post-formats.php
@@ -15,20 +15,23 @@
  * @return string|false The format if successful. False otherwise.
  */
 function get_post_format( $post = null ) {
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post( $post ) ) {
 		return false;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
+	if ( ! post_type_supports( $post->post_type, 'post-formats' ) ) {
 		return false;
+	}
 
 	$_format = get_the_terms( $post->ID, 'post_format' );
 
-	if ( empty( $_format ) )
+	if ( empty( $_format ) ) {
 		return false;
+	}
 
 	$format = reset( $_format );
 
-	return str_replace('post-format-', '', $format->slug );
+	return str_replace( 'post-format-', '', $format->slug );
 }
 
 /**
@@ -64,15 +67,17 @@ function has_post_format( $format = array(), $post = null ) {
 function set_post_format( $post, $format ) {
 	$post = get_post( $post );
 
-	if ( empty( $post ) )
+	if ( empty( $post ) ) {
 		return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+	}
 
 	if ( ! empty( $format ) ) {
 		$format = sanitize_key( $format );
-		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
+		if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) {
 			$format = '';
-		else
+		} else {
 			$format = 'post-format-' . $format;
+		}
 	}
 
 	return wp_set_post_terms( $post->ID, $format, 'post_format' );
@@ -88,15 +93,15 @@ function set_post_format( $post, $format ) {
 function get_post_format_strings() {
 	$strings = array(
 		'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
-		'aside'    => _x( 'Aside',    'Post format' ),
-		'chat'     => _x( 'Chat',     'Post format' ),
-		'gallery'  => _x( 'Gallery',  'Post format' ),
-		'link'     => _x( 'Link',     'Post format' ),
-		'image'    => _x( 'Image',    'Post format' ),
-		'quote'    => _x( 'Quote',    'Post format' ),
-		'status'   => _x( 'Status',   'Post format' ),
-		'video'    => _x( 'Video',    'Post format' ),
-		'audio'    => _x( 'Audio',    'Post format' ),
+		'aside'    => _x( 'Aside', 'Post format' ),
+		'chat'     => _x( 'Chat', 'Post format' ),
+		'gallery'  => _x( 'Gallery', 'Post format' ),
+		'link'     => _x( 'Link', 'Post format' ),
+		'image'    => _x( 'Image', 'Post format' ),
+		'quote'    => _x( 'Quote', 'Post format' ),
+		'status'   => _x( 'Status', 'Post format' ),
+		'video'    => _x( 'Video', 'Post format' ),
+		'audio'    => _x( 'Audio', 'Post format' ),
 	);
 	return $strings;
 }
@@ -123,10 +128,11 @@ function get_post_format_slugs() {
  */
 function get_post_format_string( $slug ) {
 	$strings = get_post_format_strings();
-	if ( !$slug )
+	if ( ! $slug ) {
 		return $strings['standard'];
-	else
-		return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+	} else {
+		return ( isset( $strings[ $slug ] ) ) ? $strings[ $slug ] : '';
+	}
 }
 
 /**
@@ -138,9 +144,10 @@ function get_post_format_string( $slug ) {
  * @return string|WP_Error|false The post format term link.
  */
 function get_post_format_link( $format ) {
-	$term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-	if ( ! $term || is_wp_error( $term ) )
+	$term = get_term_by( 'slug', 'post-format-' . $format, 'post_format' );
+	if ( ! $term || is_wp_error( $term ) ) {
 		return false;
+	}
 	return get_term_link( $term );
 }
 
@@ -154,14 +161,17 @@ function get_post_format_link( $format ) {
  * @return array
  */
 function _post_format_request( $qvs ) {
-	if ( ! isset( $qvs['post_format'] ) )
+	if ( ! isset( $qvs['post_format'] ) ) {
 		return $qvs;
+	}
 	$slugs = get_post_format_slugs();
-	if ( isset( $slugs[ $qvs['post_format'] ] ) )
+	if ( isset( $slugs[ $qvs['post_format'] ] ) ) {
 		$qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+	}
 	$tax = get_taxonomy( 'post_format' );
-	if ( ! is_admin() )
+	if ( ! is_admin() ) {
 		$qvs['post_type'] = $tax->object_type;
+	}
 	return $qvs;
 }
 
@@ -222,12 +232,12 @@ function _post_format_get_terms( $terms, $taxonomies, $args ) {
 	if ( in_array( 'post_format', (array) $taxonomies ) ) {
 		if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
 			foreach ( $terms as $order => $name ) {
-				$terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+				$terms[ $order ] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
 			}
 		} else {
 			foreach ( (array) $terms as $order => $term ) {
 				if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-					$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+					$terms[ $order ]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
 				}
 			}
 		}
@@ -247,7 +257,7 @@ function _post_format_get_terms( $terms, $taxonomies, $args ) {
 function _post_format_wp_get_object_terms( $terms ) {
 	foreach ( (array) $terms as $order => $term ) {
 		if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-			$terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+			$terms[ $order ]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
 		}
 	}
 	return $terms;
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 5443340970..36dec909ac 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -42,15 +42,17 @@ function get_the_ID() {
 function the_title( $before = '', $after = '', $echo = true ) {
 	$title = get_the_title();
 
-	if ( strlen($title) == 0 )
+	if ( strlen( $title ) == 0 ) {
 		return;
+	}
 
 	$title = $before . $title . $after;
 
-	if ( $echo )
+	if ( $echo ) {
 		echo $title;
-	else
+	} else {
 		return $title;
+	}
 }
 
 /**
@@ -76,8 +78,13 @@ function the_title( $before = '', $after = '', $echo = true ) {
  * @return string|void String when echo is false.
  */
 function the_title_attribute( $args = '' ) {
-	$defaults = array( 'before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post() );
-	$r = wp_parse_args( $args, $defaults );
+	$defaults = array(
+		'before' => '',
+		'after'  => '',
+		'echo'   => true,
+		'post'   => get_post(),
+	);
+	$r        = wp_parse_args( $args, $defaults );
 
 	$title = get_the_title( $r['post'] );
 
@@ -111,7 +118,7 @@ function get_the_title( $post = 0 ) {
 	$post = get_post( $post );
 
 	$title = isset( $post->post_title ) ? $post->post_title : '';
-	$id = isset( $post->ID ) ? $post->ID : 0;
+	$id    = isset( $post->ID ) ? $post->ID : 0;
 
 	if ( ! is_admin() ) {
 		if ( ! empty( $post->post_password ) ) {
@@ -128,7 +135,7 @@ function get_the_title( $post = 0 ) {
 			 * @param WP_Post $post    Current post object.
 			 */
 			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post );
-			$title = sprintf( $protected_title_format, $title );
+			$title                  = sprintf( $protected_title_format, $title );
 		} elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
 
 			/**
@@ -143,7 +150,7 @@ function get_the_title( $post = 0 ) {
 			 * @param WP_Post $post    Current post object.
 			 */
 			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ), $post );
-			$title = sprintf( $private_title_format, $title );
+			$title                = sprintf( $private_title_format, $title );
 		}
 	}
 
@@ -227,7 +234,7 @@ function get_the_guid( $post = 0 ) {
  * @param string $more_link_text Optional. Content for when there is more text.
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  */
-function the_content( $more_link_text = null, $strip_teaser = false) {
+function the_content( $more_link_text = null, $strip_teaser = false ) {
 	$content = get_the_content( $more_link_text, $strip_teaser );
 
 	/**
@@ -274,34 +281,39 @@ function get_the_content( $more_link_text = null, $strip_teaser = false ) {
 		);
 	}
 
-	$output = '';
+	$output     = '';
 	$has_teaser = false;
 
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required( $post ) )
+	if ( post_password_required( $post ) ) {
 		return get_the_password_form( $post );
+	}
 
-	if ( $page > count( $pages ) ) // if the requested page doesn't exist
+	if ( $page > count( $pages ) ) { // if the requested page doesn't exist
 		$page = count( $pages ); // give them the highest numbered page that DOES exist
+	}
 
-	$content = $pages[$page - 1];
+	$content = $pages[ $page - 1 ];
 	if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
 		$content = explode( $matches[0], $content, 2 );
-		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
+		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) ) {
 			$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+		}
 
 		$has_teaser = true;
 	} else {
 		$content = array( $content );
 	}
 
-	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
+	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) ) {
 		$strip_teaser = true;
+	}
 
 	$teaser = $content[0];
 
-	if ( $more && $strip_teaser && $has_teaser )
+	if ( $more && $strip_teaser && $has_teaser ) {
 		$teaser = '';
+	}
 
 	$output .= $teaser;
 
@@ -309,7 +321,7 @@ function get_the_content( $more_link_text = null, $strip_teaser = false ) {
 		if ( $more ) {
 			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
 		} else {
-			if ( ! empty( $more_link_text ) )
+			if ( ! empty( $more_link_text ) ) {
 
 				/**
 				 * Filters the Read More link text.
@@ -320,12 +332,14 @@ function get_the_content( $more_link_text = null, $strip_teaser = false ) {
 				 * @param string $more_link_text    Read More text.
 				 */
 				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
+			}
 			$output = force_balance_tags( $output );
 		}
 	}
 
-	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
-		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	if ( $preview ) { // Preview fix for JavaScript bug with foreign languages.
+		$output = preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	}
 
 	return $output;
 }
@@ -407,7 +421,7 @@ function get_the_excerpt( $post = null ) {
  */
 function has_excerpt( $post = 0 ) {
 	$post = get_post( $post );
-	return ( !empty( $post->post_excerpt ) );
+	return ( ! empty( $post->post_excerpt ) );
 }
 
 /**
@@ -464,8 +478,9 @@ function get_post_class( $class = '', $post_id = null ) {
 	}
 
 	$classes[] = 'post-' . $post->ID;
-	if ( ! is_admin() )
+	if ( ! is_admin() ) {
 		$classes[] = $post->post_type;
+	}
 	$classes[] = 'type-' . $post->post_type;
 	$classes[] = 'status-' . $post->post_status;
 
@@ -473,10 +488,11 @@ function get_post_class( $class = '', $post_id = null ) {
 	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 		$post_format = get_post_format( $post->ID );
 
-		if ( $post_format && !is_wp_error($post_format) )
+		if ( $post_format && ! is_wp_error( $post_format ) ) {
 			$classes[] = 'format-' . sanitize_html_class( $post_format );
-		else
+		} else {
 			$classes[] = 'format-standard';
+		}
 	}
 
 	$post_password_required = post_password_required( $post->ID );
@@ -572,31 +588,39 @@ function get_body_class( $class = '' ) {
 
 	$classes = array();
 
-	if ( is_rtl() )
+	if ( is_rtl() ) {
 		$classes[] = 'rtl';
+	}
 
-	if ( is_front_page() )
+	if ( is_front_page() ) {
 		$classes[] = 'home';
-	if ( is_home() )
+	}
+	if ( is_home() ) {
 		$classes[] = 'blog';
-	if ( is_archive() )
+	}
+	if ( is_archive() ) {
 		$classes[] = 'archive';
-	if ( is_date() )
+	}
+	if ( is_date() ) {
 		$classes[] = 'date';
+	}
 	if ( is_search() ) {
 		$classes[] = 'search';
 		$classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
 	}
-	if ( is_paged() )
+	if ( is_paged() ) {
 		$classes[] = 'paged';
-	if ( is_attachment() )
+	}
+	if ( is_attachment() ) {
 		$classes[] = 'attachment';
-	if ( is_404() )
+	}
+	if ( is_404() ) {
 		$classes[] = 'error404';
+	}
 
 	if ( is_singular() ) {
-		$post_id = $wp_query->get_queried_object_id();
-		$post = $wp_query->get_queried_object();
+		$post_id   = $wp_query->get_queried_object_id();
+		$post      = $wp_query->get_queried_object();
 		$post_type = $post->post_type;
 
 		if ( is_page_template() ) {
@@ -623,29 +647,35 @@ function get_body_class( $class = '' ) {
 				if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 					$post_format = get_post_format( $post->ID );
 
-					if ( $post_format && !is_wp_error($post_format) )
+					if ( $post_format && ! is_wp_error( $post_format ) ) {
 						$classes[] = 'single-format-' . sanitize_html_class( $post_format );
-					else
+					} else {
 						$classes[] = 'single-format-standard';
+					}
 				}
 			}
 		}
 
 		if ( is_attachment() ) {
-			$mime_type = get_post_mime_type($post_id);
+			$mime_type   = get_post_mime_type( $post_id );
 			$mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
-			$classes[] = 'attachmentid-' . $post_id;
-			$classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
+			$classes[]   = 'attachmentid-' . $post_id;
+			$classes[]   = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
 		} elseif ( is_page() ) {
 			$classes[] = 'page';
 
 			$page_id = $wp_query->get_queried_object_id();
 
-			$post = get_post($page_id);
+			$post = get_post( $page_id );
 
 			$classes[] = 'page-id-' . $page_id;
 
-			if ( get_pages( array( 'parent' => $page_id, 'number' => 1 ) ) ) {
+			if ( get_pages(
+				array(
+					'parent' => $page_id,
+					'number' => 1,
+				)
+			) ) {
 				$classes[] = 'page-parent';
 			}
 
@@ -658,18 +688,19 @@ function get_body_class( $class = '' ) {
 		if ( is_post_type_archive() ) {
 			$classes[] = 'post-type-archive';
 			$post_type = get_query_var( 'post_type' );
-			if ( is_array( $post_type ) )
+			if ( is_array( $post_type ) ) {
 				$post_type = reset( $post_type );
+			}
 			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
 		} elseif ( is_author() ) {
-			$author = $wp_query->get_queried_object();
+			$author    = $wp_query->get_queried_object();
 			$classes[] = 'author';
 			if ( isset( $author->user_nicename ) ) {
 				$classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
 				$classes[] = 'author-' . $author->ID;
 			}
 		} elseif ( is_category() ) {
-			$cat = $wp_query->get_queried_object();
+			$cat       = $wp_query->get_queried_object();
 			$classes[] = 'category';
 			if ( isset( $cat->term_id ) ) {
 				$cat_class = sanitize_html_class( $cat->slug, $cat->term_id );
@@ -681,7 +712,7 @@ function get_body_class( $class = '' ) {
 				$classes[] = 'category-' . $cat->term_id;
 			}
 		} elseif ( is_tag() ) {
-			$tag = $wp_query->get_queried_object();
+			$tag       = $wp_query->get_queried_object();
 			$classes[] = 'tag';
 			if ( isset( $tag->term_id ) ) {
 				$tag_class = sanitize_html_class( $tag->slug, $tag->term_id );
@@ -707,16 +738,18 @@ function get_body_class( $class = '' ) {
 		}
 	}
 
-	if ( is_user_logged_in() )
+	if ( is_user_logged_in() ) {
 		$classes[] = 'logged-in';
+	}
 
 	if ( is_admin_bar_showing() ) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
 
-	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
+	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() ) {
 		$classes[] = 'custom-background';
+	}
 
 	if ( has_custom_logo() ) {
 		$classes[] = 'wp-custom-logo';
@@ -724,33 +757,36 @@ function get_body_class( $class = '' ) {
 
 	$page = $wp_query->get( 'page' );
 
-	if ( ! $page || $page < 2 )
+	if ( ! $page || $page < 2 ) {
 		$page = $wp_query->get( 'paged' );
+	}
 
 	if ( $page && $page > 1 && ! is_404() ) {
 		$classes[] = 'paged-' . $page;
 
-		if ( is_single() )
+		if ( is_single() ) {
 			$classes[] = 'single-paged-' . $page;
-		elseif ( is_page() )
+		} elseif ( is_page() ) {
 			$classes[] = 'page-paged-' . $page;
-		elseif ( is_category() )
+		} elseif ( is_category() ) {
 			$classes[] = 'category-paged-' . $page;
-		elseif ( is_tag() )
+		} elseif ( is_tag() ) {
 			$classes[] = 'tag-paged-' . $page;
-		elseif ( is_date() )
+		} elseif ( is_date() ) {
 			$classes[] = 'date-paged-' . $page;
-		elseif ( is_author() )
+		} elseif ( is_author() ) {
 			$classes[] = 'author-paged-' . $page;
-		elseif ( is_search() )
+		} elseif ( is_search() ) {
 			$classes[] = 'search-paged-' . $page;
-		elseif ( is_post_type_archive() )
+		} elseif ( is_post_type_archive() ) {
 			$classes[] = 'post-type-paged-' . $page;
+		}
 	}
 
 	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
+		if ( ! is_array( $class ) ) {
 			$class = preg_split( '#\s+#', $class );
+		}
 		$classes = array_merge( $classes, $class );
 	} else {
 		// Ensure that we always coerce class to being an array.
@@ -781,7 +817,7 @@ function get_body_class( $class = '' ) {
  * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
  */
 function post_password_required( $post = null ) {
-	$post = get_post($post);
+	$post = get_post( $post );
 
 	if ( empty( $post->post_password ) ) {
 		/** This filter is documented in wp-includes/post-template.php */
@@ -866,7 +902,7 @@ function wp_link_pages( $args = '' ) {
 		'nextpagelink'     => __( 'Next page' ),
 		'previouspagelink' => __( 'Previous page' ),
 		'pagelink'         => '%',
-		'echo'             => 1
+		'echo'             => 1,
 	);
 
 	$params = wp_parse_args( $args, $defaults );
@@ -906,7 +942,7 @@ function wp_link_pages( $args = '' ) {
 			$output .= $r['after'];
 		} elseif ( $more ) {
 			$output .= $r['before'];
-			$prev = $page - 1;
+			$prev    = $page - 1;
 			if ( $prev > 0 ) {
 				$link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
 
@@ -956,24 +992,25 @@ function wp_link_pages( $args = '' ) {
  */
 function _wp_link_page( $i ) {
 	global $wp_rewrite;
-	$post = get_post();
+	$post       = get_post();
 	$query_args = array();
 
 	if ( 1 == $i ) {
 		$url = get_permalink();
 	} else {
-		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
+		if ( '' == get_option( 'permalink_structure' ) || in_array( $post->post_status, array( 'draft', 'pending' ) ) ) {
 			$url = add_query_arg( 'page', $i, get_permalink() );
-		elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
-		else
-			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+		} elseif ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post->ID ) {
+			$url = trailingslashit( get_permalink() ) . user_trailingslashit( "$wp_rewrite->pagination_base/" . $i, 'single_paged' );
+		} else {
+			$url = trailingslashit( get_permalink() ) . user_trailingslashit( $i, 'single_paged' );
+		}
 	}
 
 	if ( is_preview() ) {
 
 		if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
-			$query_args['preview_id'] = wp_unslash( $_GET['preview_id'] );
+			$query_args['preview_id']    = wp_unslash( $_GET['preview_id'] );
 			$query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] );
 		}
 
@@ -998,12 +1035,13 @@ function _wp_link_page( $i ) {
 function post_custom( $key = '' ) {
 	$custom = get_post_custom();
 
-	if ( !isset( $custom[$key] ) )
+	if ( ! isset( $custom[ $key ] ) ) {
 		return false;
-	elseif ( 1 == count($custom[$key]) )
-		return $custom[$key][0];
-	else
-		return $custom[$key];
+	} elseif ( 1 == count( $custom[ $key ] ) ) {
+		return $custom[ $key ][0];
+	} else {
+		return $custom[ $key ];
+	}
 }
 
 /**
@@ -1012,7 +1050,6 @@ function post_custom( $key = '' ) {
  * @since 1.2.0
  *
  * @internal This will probably change at some point...
- *
  */
 function the_meta() {
 	if ( $keys = get_post_custom_keys() ) {
@@ -1024,9 +1061,10 @@ function the_meta() {
 			}
 
 			$values = array_map( 'trim', get_post_custom_values( $key ) );
-			$value = implode( $values, ', ' );
+			$value  = implode( $values, ', ' );
 
-			$html = sprintf( "<li><span class='post-meta-key'>%s</span> %s</li>\n",
+			$html = sprintf(
+				"<li><span class='post-meta-key'>%s</span> %s</li>\n",
 				/* translators: %s: Post custom field name */
 				sprintf( _x( '%s:', 'Post custom field name' ), $key ),
 				$value
@@ -1084,18 +1122,22 @@ function the_meta() {
  */
 function wp_dropdown_pages( $args = '' ) {
 	$defaults = array(
-		'depth' => 0, 'child_of' => 0,
-		'selected' => 0, 'echo' => 1,
-		'name' => 'page_id', 'id' => '',
-		'class' => '',
-		'show_option_none' => '', 'show_option_no_change' => '',
-		'option_none_value' => '',
-		'value_field' => 'ID',
+		'depth'                 => 0,
+		'child_of'              => 0,
+		'selected'              => 0,
+		'echo'                  => 1,
+		'name'                  => 'page_id',
+		'id'                    => '',
+		'class'                 => '',
+		'show_option_none'      => '',
+		'show_option_no_change' => '',
+		'option_none_value'     => '',
+		'value_field'           => 'ID',
 	);
 
 	$r = wp_parse_args( $args, $defaults );
 
-	$pages = get_pages( $r );
+	$pages  = get_pages( $r );
 	$output = '';
 	// Back-compat with old system where both id and name were based on $name argument
 	if ( empty( $r['id'] ) ) {
@@ -1128,7 +1170,7 @@ function wp_dropdown_pages( $args = '' ) {
 	 * @param string $output HTML output for drop down list of pages.
 	 * @param array  $r      The parsed arguments array.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
- 	 */
+	 */
 	$html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
 
 	if ( $r['echo'] ) {
@@ -1201,7 +1243,7 @@ function wp_list_pages( $args = '' ) {
 		$r['item_spacing'] = $defaults['item_spacing'];
 	}
 
-	$output = '';
+	$output       = '';
 	$current_page = 0;
 
 	// sanitize, mostly to keep spaces out
@@ -1221,7 +1263,7 @@ function wp_list_pages( $args = '' ) {
 
 	// Query pages.
 	$r['hierarchical'] = 0;
-	$pages = get_pages( $r );
+	$pages             = get_pages( $r );
 
 	if ( ! empty( $pages ) ) {
 		if ( $r['title_li'] ) {
@@ -1310,7 +1352,7 @@ function wp_page_menu( $args = array() ) {
 		'item_spacing' => 'discard',
 		'walker'       => '',
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 
 	if ( ! in_array( $args['item_spacing'], array( 'preserve', 'discard' ) ) ) {
 		// invalid value, fall back to default.
@@ -1341,29 +1383,31 @@ function wp_page_menu( $args = array() ) {
 	$list_args = $args;
 
 	// Show Home in the menu
-	if ( ! empty($args['show_home']) ) {
-		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
-			$text = __('Home');
-		else
+	if ( ! empty( $args['show_home'] ) ) {
+		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] ) {
+			$text = __( 'Home' );
+		} else {
 			$text = $args['show_home'];
+		}
 		$class = '';
-		if ( is_front_page() && !is_paged() )
+		if ( is_front_page() && ! is_paged() ) {
 			$class = 'class="current_page_item"';
+		}
 		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
 		// If the front page is a page, add it to the exclude list
-		if (get_option('show_on_front') == 'page') {
-			if ( !empty( $list_args['exclude'] ) ) {
+		if ( get_option( 'show_on_front' ) == 'page' ) {
+			if ( ! empty( $list_args['exclude'] ) ) {
 				$list_args['exclude'] .= ',';
 			} else {
 				$list_args['exclude'] = '';
 			}
-			$list_args['exclude'] .= get_option('page_on_front');
+			$list_args['exclude'] .= get_option( 'page_on_front' );
 		}
 	}
 
-	$list_args['echo'] = false;
+	$list_args['echo']     = false;
 	$list_args['title_li'] = '';
-	$menu .= wp_list_pages( $list_args );
+	$menu                 .= wp_list_pages( $list_args );
 
 	$container = sanitize_text_field( $args['container'] );
 
@@ -1379,7 +1423,7 @@ function wp_page_menu( $args = array() ) {
 			'wp_page_menu' === $args['fallback_cb'] &&
 			'ul' !== $container ) {
 			$args['before'] = "<ul>{$n}";
-			$args['after'] = '</ul>';
+			$args['after']  = '</ul>';
 		}
 
 		$menu = $args['before'] . $menu . $args['after'];
@@ -1407,10 +1451,11 @@ function wp_page_menu( $args = array() ) {
 	 * @param array  $args An array of arguments.
 	 */
 	$menu = apply_filters( 'wp_page_menu', $menu, $args );
-	if ( $args['echo'] )
+	if ( $args['echo'] ) {
 		echo $menu;
-	else
+	} else {
 		return $menu;
+	}
 }
 
 //
@@ -1430,18 +1475,20 @@ function wp_page_menu( $args = array() ) {
  * @return string
  */
 function walk_page_tree( $pages, $depth, $current_page, $r ) {
-	if ( empty($r['walker']) )
+	if ( empty( $r['walker'] ) ) {
 		$walker = new Walker_Page;
-	else
+	} else {
 		$walker = $r['walker'];
-
-	foreach ( (array) $pages as $page ) {
-		if ( $page->post_parent )
-			$r['pages_with_children'][ $page->post_parent ] = true;
 	}
 
-	$args = array($pages, $depth, $r, $current_page);
-	return call_user_func_array(array($walker, 'walk'), $args);
+	foreach ( (array) $pages as $page ) {
+		if ( $page->post_parent ) {
+			$r['pages_with_children'][ $page->post_parent ] = true;
+		}
+	}
+
+	$args = array( $pages, $depth, $r, $current_page );
+	return call_user_func_array( array( $walker, 'walk' ), $args );
 }
 
 /**
@@ -1455,12 +1502,13 @@ function walk_page_tree( $pages, $depth, $current_page, $r ) {
  */
 function walk_page_dropdown_tree() {
 	$args = func_get_args();
-	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
+	if ( empty( $args[2]['walker'] ) ) { // the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
-	else
+	} else {
 		$walker = $args[2]['walker'];
+	}
 
-	return call_user_func_array(array($walker, 'walk'), $args);
+	return call_user_func_array( array( $walker, 'walk' ), $args );
 }
 
 //
@@ -1478,13 +1526,15 @@ function walk_page_dropdown_tree() {
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
  */
 function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.5.0' );
+	}
 
-	if ( $fullsize )
-		echo wp_get_attachment_link($id, 'full', $permalink);
-	else
-		echo wp_get_attachment_link($id, 'thumbnail', $permalink);
+	if ( $fullsize ) {
+		echo wp_get_attachment_link( $id, 'full', $permalink );
+	} else {
+		echo wp_get_attachment_link( $id, 'thumbnail', $permalink );
+	}
 }
 
 /**
@@ -1554,17 +1604,18 @@ function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = fals
  * @param string $content
  * @return string
  */
-function prepend_attachment($content) {
+function prepend_attachment( $content ) {
 	$post = get_post();
 
-	if ( empty($post->post_type) || $post->post_type != 'attachment' )
+	if ( empty( $post->post_type ) || $post->post_type != 'attachment' ) {
 		return $content;
+	}
 
 	if ( wp_attachment_is( 'video', $post ) ) {
 		$meta = wp_get_attachment_metadata( get_the_ID() );
 		$atts = array( 'src' => wp_get_attachment_url() );
 		if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
-			$atts['width'] = (int) $meta['width'];
+			$atts['width']  = (int) $meta['width'];
 			$atts['height'] = (int) $meta['height'];
 		}
 		if ( has_post_thumbnail() ) {
@@ -1576,7 +1627,7 @@ function prepend_attachment($content) {
 	} else {
 		$p = '<p class="attachment">';
 		// show the medium sized image representation of the attachment if available, and link to the raw file
-		$p .= wp_get_attachment_link(0, 'medium', false);
+		$p .= wp_get_attachment_link( 0, 'medium', false );
 		$p .= '</p>';
 	}
 
@@ -1607,8 +1658,8 @@ function prepend_attachment($content) {
  * @return string HTML content for password form for password protected post.
  */
 function get_the_password_form( $post = 0 ) {
-	$post = get_post( $post );
-	$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
+	$post   = get_post( $post );
+	$label  = 'pwbox-' . ( empty( $post->ID ) ? rand() : $post->ID );
 	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
 	<p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p>
 	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
@@ -1649,11 +1700,13 @@ function is_page_template( $template = '' ) {
 
 	$page_template = get_page_template_slug( get_queried_object_id() );
 
-	if ( empty( $template ) )
+	if ( empty( $template ) ) {
 		return (bool) $page_template;
+	}
 
-	if ( $template == $page_template )
+	if ( $template == $page_template ) {
 		return true;
+	}
 
 	if ( is_array( $template ) ) {
 		if ( ( in_array( 'default', $template, true ) && ! $page_template )
@@ -1674,7 +1727,7 @@ function is_page_template( $template = '' ) {
  *
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false Page template filename. Returns an empty string when the default page template
- * 	is in use. Returns false if the post does not exist.
+ *  is in use. Returns false if the post does not exist.
  */
 function get_page_template_slug( $post = null ) {
 	$post = get_post( $post );
@@ -1702,27 +1755,31 @@ function get_page_template_slug( $post = null ) {
  * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+	if ( ! $revision = get_post( $revision ) ) {
 		return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
 		return false;
+	}
 
 	/* translators: revision date format, see https://secure.php.net/date */
 	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
 	/* translators: %s: revision date */
 	$autosavef = __( '%s [Autosave]' );
 	/* translators: %s: revision date */
-	$currentf  = __( '%s [Current Revision]' );
+	$currentf = __( '%s [Current Revision]' );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
 		$date = "<a href='$link'>$date</a>";
+	}
 
-	if ( !wp_is_post_revision( $revision ) )
+	if ( ! wp_is_post_revision( $revision ) ) {
 		$date = sprintf( $currentf, $date );
-	elseif ( wp_is_post_autosave( $revision ) )
+	} elseif ( wp_is_post_autosave( $revision ) ) {
 		$date = sprintf( $autosavef, $date );
+	}
 
 	return $date;
 }
@@ -1737,11 +1794,13 @@ function wp_post_revision_title( $revision, $link = true ) {
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title_expanded( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+	if ( ! $revision = get_post( $revision ) ) {
 		return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
 		return false;
+	}
 
 	$author = get_the_author_meta( 'display_name', $revision->post_author );
 	/* translators: revision date format, see https://secure.php.net/date */
@@ -1750,8 +1809,9 @@ function wp_post_revision_title_expanded( $revision, $link = true ) {
 	$gravatar = get_avatar( $revision->post_author, 24 );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
 		$date = "<a href='$link'>$date</a>";
+	}
 
 	$revision_date_author = sprintf(
 		/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
@@ -1765,12 +1825,13 @@ function wp_post_revision_title_expanded( $revision, $link = true ) {
 	/* translators: %s: revision date with author avatar */
 	$autosavef = __( '%s [Autosave]' );
 	/* translators: %s: revision date with author avatar */
-	$currentf  = __( '%s [Current Revision]' );
+	$currentf = __( '%s [Current Revision]' );
 
-	if ( !wp_is_post_revision( $revision ) )
+	if ( ! wp_is_post_revision( $revision ) ) {
 		$revision_date_author = sprintf( $currentf, $revision_date_author );
-	elseif ( wp_is_post_autosave( $revision ) )
+	} elseif ( wp_is_post_autosave( $revision ) ) {
 		$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	}
 
 	/**
 	 * Filters the formatted author and date for a revision.
@@ -1797,26 +1858,30 @@ function wp_post_revision_title_expanded( $revision, $link = true ) {
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
 function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
-	if ( ! $post = get_post( $post_id ) )
+	if ( ! $post = get_post( $post_id ) ) {
 		return;
+	}
 
 	// $args array with (parent, format, right, left, type) deprecated since 3.6
 	if ( is_array( $type ) ) {
-		$type = ! empty( $type['type'] ) ? $type['type']  : $type;
+		$type = ! empty( $type['type'] ) ? $type['type'] : $type;
 		_deprecated_argument( __FUNCTION__, '3.6.0' );
 	}
 
-	if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+	if ( ! $revisions = wp_get_post_revisions( $post->ID ) ) {
 		return;
+	}
 
 	$rows = '';
 	foreach ( $revisions as $revision ) {
-		if ( ! current_user_can( 'read_post', $revision->ID ) )
+		if ( ! current_user_can( 'read_post', $revision->ID ) ) {
 			continue;
+		}
 
 		$is_autosave = wp_is_post_autosave( $revision );
-		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
+		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) ) {
 			continue;
+		}
 
 		$rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
 	}
@@ -1825,5 +1890,5 @@ function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
 
 	echo "<ul class='post-revisions hide-if-no-js'>\n";
 	echo $rows;
-	echo "</ul>";
+	echo '</ul>';
 }
diff --git a/wp-includes/post-thumbnail-template.php b/wp-includes/post-thumbnail-template.php
index 0dbe74aad6..fbc7be5873 100644
--- a/wp-includes/post-thumbnail-template.php
+++ b/wp-includes/post-thumbnail-template.php
@@ -72,19 +72,22 @@ function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
  * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
  */
 function update_post_thumbnail_cache( $wp_query = null ) {
-	if ( ! $wp_query )
+	if ( ! $wp_query ) {
 		$wp_query = $GLOBALS['wp_query'];
+	}
 
-	if ( $wp_query->thumbnails_cached )
+	if ( $wp_query->thumbnails_cached ) {
 		return;
+	}
 
 	$thumb_ids = array();
 	foreach ( $wp_query->posts as $post ) {
-		if ( $id = get_post_thumbnail_id( $post->ID ) )
+		if ( $id = get_post_thumbnail_id( $post->ID ) ) {
 			$thumb_ids[] = $id;
+		}
 	}
 
-	if ( ! empty ( $thumb_ids ) ) {
+	if ( ! empty( $thumb_ids ) ) {
 		_prime_post_caches( $thumb_ids, false, true );
 	}
 
@@ -145,8 +148,9 @@ function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr =
 		 *                                        and height values (in that order). Default 'post-thumbnail'.
 		 */
 		do_action( 'begin_fetch_post_thumbnail_html', $post->ID, $post_thumbnail_id, $size );
-		if ( in_the_loop() )
+		if ( in_the_loop() ) {
 			update_post_thumbnail_cache();
+		}
 		$html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
 
 		/**
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 2af241b6c5..45fb3573b8 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -18,253 +18,285 @@
  * @since 2.9.0
  */
 function create_initial_post_types() {
-	register_post_type( 'post', array(
-		'labels' => array(
-			'name_admin_bar' => _x( 'Post', 'add new from admin bar' ),
-		),
-		'public'  => true,
-		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-		'_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
-		'capability_type' => 'post',
-		'map_meta_cap' => true,
-		'menu_position' => 5,
-		'hierarchical' => false,
-		'rewrite' => false,
-		'query_var' => false,
-		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
-		'show_in_rest' => true,
-		'rest_base' => 'posts',
-		'rest_controller_class' => 'WP_REST_Posts_Controller',
-	) );
+	register_post_type(
+		'post', array(
+			'labels'                => array(
+				'name_admin_bar' => _x( 'Post', 'add new from admin bar' ),
+			),
+			'public'                => true,
+			'_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'            => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
+			'capability_type'       => 'post',
+			'map_meta_cap'          => true,
+			'menu_position'         => 5,
+			'hierarchical'          => false,
+			'rewrite'               => false,
+			'query_var'             => false,
+			'delete_with_user'      => true,
+			'supports'              => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
+			'show_in_rest'          => true,
+			'rest_base'             => 'posts',
+			'rest_controller_class' => 'WP_REST_Posts_Controller',
+		)
+	);
 
-	register_post_type( 'page', array(
-		'labels' => array(
-			'name_admin_bar' => _x( 'Page', 'add new from admin bar' ),
-		),
-		'public' => true,
-		'publicly_queryable' => false,
-		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-		'_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
-		'capability_type' => 'page',
-		'map_meta_cap' => true,
-		'menu_position' => 20,
-		'hierarchical' => true,
-		'rewrite' => false,
-		'query_var' => false,
-		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
-		'show_in_rest' => true,
-		'rest_base' => 'pages',
-		'rest_controller_class' => 'WP_REST_Posts_Controller',
-	) );
+	register_post_type(
+		'page', array(
+			'labels'                => array(
+				'name_admin_bar' => _x( 'Page', 'add new from admin bar' ),
+			),
+			'public'                => true,
+			'publicly_queryable'    => false,
+			'_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'            => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
+			'capability_type'       => 'page',
+			'map_meta_cap'          => true,
+			'menu_position'         => 20,
+			'hierarchical'          => true,
+			'rewrite'               => false,
+			'query_var'             => false,
+			'delete_with_user'      => true,
+			'supports'              => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
+			'show_in_rest'          => true,
+			'rest_base'             => 'pages',
+			'rest_controller_class' => 'WP_REST_Posts_Controller',
+		)
+	);
 
-	register_post_type( 'attachment', array(
-		'labels' => array(
-			'name' => _x('Media', 'post type general name'),
-			'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
-			'add_new' => _x( 'Add New', 'add new media' ),
- 			'edit_item' => __( 'Edit Media' ),
- 			'view_item' => __( 'View Attachment Page' ),
-			'attributes' => __( 'Attachment Attributes' ),
-		),
-		'public' => true,
-		'show_ui' => true,
-		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-		'_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
-		'capability_type' => 'post',
-		'capabilities' => array(
-			'create_posts' => 'upload_files',
-		),
-		'map_meta_cap' => true,
-		'hierarchical' => false,
-		'rewrite' => false,
-		'query_var' => false,
-		'show_in_nav_menus' => false,
-		'delete_with_user' => true,
-		'supports' => array( 'title', 'author', 'comments' ),
-		'show_in_rest' => true,
-		'rest_base' => 'media',
-		'rest_controller_class' => 'WP_REST_Attachments_Controller',
-	) );
+	register_post_type(
+		'attachment', array(
+			'labels'                => array(
+				'name'           => _x( 'Media', 'post type general name' ),
+				'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
+				'add_new'        => _x( 'Add New', 'add new media' ),
+				'edit_item'      => __( 'Edit Media' ),
+				'view_item'      => __( 'View Attachment Page' ),
+				'attributes'     => __( 'Attachment Attributes' ),
+			),
+			'public'                => true,
+			'show_ui'               => true,
+			'_builtin'              => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'            => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
+			'capability_type'       => 'post',
+			'capabilities'          => array(
+				'create_posts' => 'upload_files',
+			),
+			'map_meta_cap'          => true,
+			'hierarchical'          => false,
+			'rewrite'               => false,
+			'query_var'             => false,
+			'show_in_nav_menus'     => false,
+			'delete_with_user'      => true,
+			'supports'              => array( 'title', 'author', 'comments' ),
+			'show_in_rest'          => true,
+			'rest_base'             => 'media',
+			'rest_controller_class' => 'WP_REST_Attachments_Controller',
+		)
+	);
 	add_post_type_support( 'attachment:audio', 'thumbnail' );
 	add_post_type_support( 'attachment:video', 'thumbnail' );
 
-	register_post_type( 'revision', array(
-		'labels' => array(
-			'name' => __( 'Revisions' ),
-			'singular_name' => __( 'Revision' ),
-		),
-		'public' => false,
-		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-		'_edit_link' => 'revision.php?revision=%d', /* internal use only. don't use this when registering your own post type. */
-		'capability_type' => 'post',
-		'map_meta_cap' => true,
-		'hierarchical' => false,
-		'rewrite' => false,
-		'query_var' => false,
-		'can_export' => false,
-		'delete_with_user' => true,
-		'supports' => array( 'author' ),
-	) );
+	register_post_type(
+		'revision', array(
+			'labels'           => array(
+				'name'          => __( 'Revisions' ),
+				'singular_name' => __( 'Revision' ),
+			),
+			'public'           => false,
+			'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
+			'_edit_link'       => 'revision.php?revision=%d', /* internal use only. don't use this when registering your own post type. */
+			'capability_type'  => 'post',
+			'map_meta_cap'     => true,
+			'hierarchical'     => false,
+			'rewrite'          => false,
+			'query_var'        => false,
+			'can_export'       => false,
+			'delete_with_user' => true,
+			'supports'         => array( 'author' ),
+		)
+	);
 
-	register_post_type( 'nav_menu_item', array(
-		'labels' => array(
-			'name' => __( 'Navigation Menu Items' ),
-			'singular_name' => __( 'Navigation Menu Item' ),
-		),
-		'public' => false,
-		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-		'hierarchical' => false,
-		'rewrite' => false,
-		'delete_with_user' => false,
-		'query_var' => false,
-	) );
+	register_post_type(
+		'nav_menu_item', array(
+			'labels'           => array(
+				'name'          => __( 'Navigation Menu Items' ),
+				'singular_name' => __( 'Navigation Menu Item' ),
+			),
+			'public'           => false,
+			'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
+			'hierarchical'     => false,
+			'rewrite'          => false,
+			'delete_with_user' => false,
+			'query_var'        => false,
+		)
+	);
 
-	register_post_type( 'custom_css', array(
-		'labels' => array(
-			'name'          => __( 'Custom CSS' ),
-			'singular_name' => __( 'Custom CSS' ),
-		),
-		'public'           => false,
-		'hierarchical'     => false,
-		'rewrite'          => false,
-		'query_var'        => false,
-		'delete_with_user' => false,
-		'can_export'       => true,
-		'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
-		'supports'         => array( 'title', 'revisions' ),
-		'capabilities'     => array(
-			'delete_posts'           => 'edit_theme_options',
-			'delete_post'            => 'edit_theme_options',
-			'delete_published_posts' => 'edit_theme_options',
-			'delete_private_posts'   => 'edit_theme_options',
-			'delete_others_posts'    => 'edit_theme_options',
-			'edit_post'              => 'edit_css',
-			'edit_posts'             => 'edit_css',
-			'edit_others_posts'      => 'edit_css',
-			'edit_published_posts'   => 'edit_css',
-			'read_post'              => 'read',
-			'read_private_posts'     => 'read',
-			'publish_posts'          => 'edit_theme_options',
-		),
-	) );
+	register_post_type(
+		'custom_css', array(
+			'labels'           => array(
+				'name'          => __( 'Custom CSS' ),
+				'singular_name' => __( 'Custom CSS' ),
+			),
+			'public'           => false,
+			'hierarchical'     => false,
+			'rewrite'          => false,
+			'query_var'        => false,
+			'delete_with_user' => false,
+			'can_export'       => true,
+			'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
+			'supports'         => array( 'title', 'revisions' ),
+			'capabilities'     => array(
+				'delete_posts'           => 'edit_theme_options',
+				'delete_post'            => 'edit_theme_options',
+				'delete_published_posts' => 'edit_theme_options',
+				'delete_private_posts'   => 'edit_theme_options',
+				'delete_others_posts'    => 'edit_theme_options',
+				'edit_post'              => 'edit_css',
+				'edit_posts'             => 'edit_css',
+				'edit_others_posts'      => 'edit_css',
+				'edit_published_posts'   => 'edit_css',
+				'read_post'              => 'read',
+				'read_private_posts'     => 'read',
+				'publish_posts'          => 'edit_theme_options',
+			),
+		)
+	);
 
-	register_post_type( 'customize_changeset', array(
-		'labels' => array(
-			'name'               => _x( 'Changesets', 'post type general name' ),
-			'singular_name'      => _x( 'Changeset', 'post type singular name' ),
-			'menu_name'          => _x( 'Changesets', 'admin menu' ),
-			'name_admin_bar'     => _x( 'Changeset', 'add new on admin bar' ),
-			'add_new'            => _x( 'Add New', 'Customize Changeset' ),
-			'add_new_item'       => __( 'Add New Changeset' ),
-			'new_item'           => __( 'New Changeset' ),
-			'edit_item'          => __( 'Edit Changeset' ),
-			'view_item'          => __( 'View Changeset' ),
-			'all_items'          => __( 'All Changesets' ),
-			'search_items'       => __( 'Search Changesets' ),
-			'not_found'          => __( 'No changesets found.' ),
-			'not_found_in_trash' => __( 'No changesets found in Trash.' ),
-		),
-		'public' => false,
-		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-		'map_meta_cap' => true,
-		'hierarchical' => false,
-		'rewrite' => false,
-		'query_var' => false,
-		'can_export' => false,
-		'delete_with_user' => false,
-		'supports' => array( 'title', 'author' ),
-		'capability_type' => 'customize_changeset',
-		'capabilities' => array(
-			'create_posts' => 'customize',
-			'delete_others_posts' => 'customize',
-			'delete_post' => 'customize',
-			'delete_posts' => 'customize',
-			'delete_private_posts' => 'customize',
-			'delete_published_posts' => 'customize',
-			'edit_others_posts' => 'customize',
-			'edit_post' => 'customize',
-			'edit_posts' => 'customize',
-			'edit_private_posts' => 'customize',
-			'edit_published_posts' => 'do_not_allow',
-			'publish_posts' => 'customize',
-			'read' => 'read',
-			'read_post' => 'customize',
-			'read_private_posts' => 'customize',
-		),
-	) );
+	register_post_type(
+		'customize_changeset', array(
+			'labels'           => array(
+				'name'               => _x( 'Changesets', 'post type general name' ),
+				'singular_name'      => _x( 'Changeset', 'post type singular name' ),
+				'menu_name'          => _x( 'Changesets', 'admin menu' ),
+				'name_admin_bar'     => _x( 'Changeset', 'add new on admin bar' ),
+				'add_new'            => _x( 'Add New', 'Customize Changeset' ),
+				'add_new_item'       => __( 'Add New Changeset' ),
+				'new_item'           => __( 'New Changeset' ),
+				'edit_item'          => __( 'Edit Changeset' ),
+				'view_item'          => __( 'View Changeset' ),
+				'all_items'          => __( 'All Changesets' ),
+				'search_items'       => __( 'Search Changesets' ),
+				'not_found'          => __( 'No changesets found.' ),
+				'not_found_in_trash' => __( 'No changesets found in Trash.' ),
+			),
+			'public'           => false,
+			'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
+			'map_meta_cap'     => true,
+			'hierarchical'     => false,
+			'rewrite'          => false,
+			'query_var'        => false,
+			'can_export'       => false,
+			'delete_with_user' => false,
+			'supports'         => array( 'title', 'author' ),
+			'capability_type'  => 'customize_changeset',
+			'capabilities'     => array(
+				'create_posts'           => 'customize',
+				'delete_others_posts'    => 'customize',
+				'delete_post'            => 'customize',
+				'delete_posts'           => 'customize',
+				'delete_private_posts'   => 'customize',
+				'delete_published_posts' => 'customize',
+				'edit_others_posts'      => 'customize',
+				'edit_post'              => 'customize',
+				'edit_posts'             => 'customize',
+				'edit_private_posts'     => 'customize',
+				'edit_published_posts'   => 'do_not_allow',
+				'publish_posts'          => 'customize',
+				'read'                   => 'read',
+				'read_post'              => 'customize',
+				'read_private_posts'     => 'customize',
+			),
+		)
+	);
 
-	register_post_type( 'oembed_cache', array(
-		'labels' => array(
-			'name'          => __( 'oEmbed Responses' ),
-			'singular_name' => __( 'oEmbed Response' ),
-		),
-		'public'           => false,
-		'hierarchical'     => false,
-		'rewrite'          => false,
-		'query_var'        => false,
-		'delete_with_user' => false,
-		'can_export'       => false,
-		'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
-		'supports'         => array(),
-	) );
+	register_post_type(
+		'oembed_cache', array(
+			'labels'           => array(
+				'name'          => __( 'oEmbed Responses' ),
+				'singular_name' => __( 'oEmbed Response' ),
+			),
+			'public'           => false,
+			'hierarchical'     => false,
+			'rewrite'          => false,
+			'query_var'        => false,
+			'delete_with_user' => false,
+			'can_export'       => false,
+			'_builtin'         => true, /* internal use only. don't use this when registering your own post type. */
+			'supports'         => array(),
+		)
+	);
 
-	register_post_status( 'publish', array(
-		'label'       => _x( 'Published', 'post status' ),
-		'public'      => true,
-		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
-	) );
+	register_post_status(
+		'publish', array(
+			'label'       => _x( 'Published', 'post status' ),
+			'public'      => true,
+			'_builtin'    => true, /* internal use only. */
+			'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
+		)
+	);
 
-	register_post_status( 'future', array(
-		'label'       => _x( 'Scheduled', 'post status' ),
-		'protected'   => true,
-		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
-	) );
+	register_post_status(
+		'future', array(
+			'label'       => _x( 'Scheduled', 'post status' ),
+			'protected'   => true,
+			'_builtin'    => true, /* internal use only. */
+			'label_count' => _n_noop( 'Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
+		)
+	);
 
-	register_post_status( 'draft', array(
-		'label'       => _x( 'Draft', 'post status' ),
-		'protected'   => true,
-		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
-	) );
+	register_post_status(
+		'draft', array(
+			'label'       => _x( 'Draft', 'post status' ),
+			'protected'   => true,
+			'_builtin'    => true, /* internal use only. */
+			'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
+		)
+	);
 
-	register_post_status( 'pending', array(
-		'label'       => _x( 'Pending', 'post status' ),
-		'protected'   => true,
-		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
-	) );
+	register_post_status(
+		'pending', array(
+			'label'       => _x( 'Pending', 'post status' ),
+			'protected'   => true,
+			'_builtin'    => true, /* internal use only. */
+			'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
+		)
+	);
 
-	register_post_status( 'private', array(
-		'label'       => _x( 'Private', 'post status' ),
-		'private'     => true,
-		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
-	) );
+	register_post_status(
+		'private', array(
+			'label'       => _x( 'Private', 'post status' ),
+			'private'     => true,
+			'_builtin'    => true, /* internal use only. */
+			'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
+		)
+	);
 
-	register_post_status( 'trash', array(
-		'label'       => _x( 'Trash', 'post status' ),
-		'internal'    => true,
-		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
-		'show_in_admin_status_list' => true,
-	) );
+	register_post_status(
+		'trash', array(
+			'label'                     => _x( 'Trash', 'post status' ),
+			'internal'                  => true,
+			'_builtin'                  => true, /* internal use only. */
+			'label_count'               => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
+			'show_in_admin_status_list' => true,
+		)
+	);
 
-	register_post_status( 'auto-draft', array(
-		'label'    => 'auto-draft',
-		'internal' => true,
-		'_builtin' => true, /* internal use only. */
-	) );
+	register_post_status(
+		'auto-draft', array(
+			'label'    => 'auto-draft',
+			'internal' => true,
+			'_builtin' => true, /* internal use only. */
+		)
+	);
 
-	register_post_status( 'inherit', array(
-		'label'    => 'inherit',
-		'internal' => true,
-		'_builtin' => true, /* internal use only. */
-		'exclude_from_search' => false,
-	) );
+	register_post_status(
+		'inherit', array(
+			'label'               => 'inherit',
+			'internal'            => true,
+			'_builtin'            => true, /* internal use only. */
+			'exclude_from_search' => false,
+		)
+	);
 }
 
 /**
@@ -321,8 +353,9 @@ function get_attached_file( $attachment_id, $unfiltered = false ) {
  * @return bool True on success, false on failure.
  */
 function update_attached_file( $attachment_id, $file ) {
-	if ( !get_post( $attachment_id ) )
+	if ( ! get_post( $attachment_id ) ) {
 		return false;
+	}
 
 	/**
 	 * Filters the path to the attached file to update.
@@ -334,10 +367,11 @@ function update_attached_file( $attachment_id, $file ) {
 	 */
 	$file = apply_filters( 'update_attached_file', $file, $attachment_id );
 
-	if ( $file = _wp_relative_upload_path( $file ) )
+	if ( $file = _wp_relative_upload_path( $file ) ) {
 		return update_post_meta( $attachment_id, '_wp_attached_file', $file );
-	else
+	} else {
 		return delete_post_meta( $attachment_id, '_wp_attached_file' );
+	}
 }
 
 /**
@@ -425,48 +459,53 @@ function get_children( $args = '', $output = OBJECT ) {
 	$kids = array();
 	if ( empty( $args ) ) {
 		if ( isset( $GLOBALS['post'] ) ) {
-			$args = array('post_parent' => (int) $GLOBALS['post']->post_parent );
+			$args = array( 'post_parent' => (int) $GLOBALS['post']->post_parent );
 		} else {
 			return $kids;
 		}
 	} elseif ( is_object( $args ) ) {
-		$args = array('post_parent' => (int) $args->post_parent );
+		$args = array( 'post_parent' => (int) $args->post_parent );
 	} elseif ( is_numeric( $args ) ) {
-		$args = array('post_parent' => (int) $args);
+		$args = array( 'post_parent' => (int) $args );
 	}
 
 	$defaults = array(
-		'numberposts' => -1, 'post_type' => 'any',
-		'post_status' => 'any', 'post_parent' => 0,
+		'numberposts' => -1,
+		'post_type'   => 'any',
+		'post_status' => 'any',
+		'post_parent' => 0,
 	);
 
 	$r = wp_parse_args( $args, $defaults );
 
 	$children = get_posts( $r );
 
-	if ( ! $children )
+	if ( ! $children ) {
 		return $kids;
+	}
 
-	if ( ! empty( $r['fields'] ) )
+	if ( ! empty( $r['fields'] ) ) {
 		return $children;
+	}
 
-	update_post_cache($children);
+	update_post_cache( $children );
 
-	foreach ( $children as $key => $child )
-		$kids[$child->ID] = $children[$key];
+	foreach ( $children as $key => $child ) {
+		$kids[ $child->ID ] = $children[ $key ];
+	}
 
 	if ( $output == OBJECT ) {
 		return $kids;
 	} elseif ( $output == ARRAY_A ) {
 		$weeuns = array();
 		foreach ( (array) $kids as $kid ) {
-			$weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]);
+			$weeuns[ $kid->ID ] = get_object_vars( $kids[ $kid->ID ] );
 		}
 		return $weeuns;
 	} elseif ( $output == ARRAY_N ) {
 		$babes = array();
 		foreach ( (array) $kids as $kid ) {
-			$babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID]));
+			$babes[ $kid->ID ] = array_values( get_object_vars( $kids[ $kid->ID ] ) );
 		}
 		return $babes;
 	} else {
@@ -492,21 +531,25 @@ function get_children( $args = '', $output = OBJECT ) {
  */
 function get_extended( $post ) {
 	//Match the new style more links.
-	if ( preg_match('/<!--more(.*?)?-->/', $post, $matches) ) {
-		list($main, $extended) = explode($matches[0], $post, 2);
-		$more_text = $matches[1];
+	if ( preg_match( '/<!--more(.*?)?-->/', $post, $matches ) ) {
+		list($main, $extended) = explode( $matches[0], $post, 2 );
+		$more_text             = $matches[1];
 	} else {
-		$main = $post;
-		$extended = '';
+		$main      = $post;
+		$extended  = '';
 		$more_text = '';
 	}
 
 	//  leading and trailing whitespace.
-	$main = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $main);
-	$extended = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $extended);
-	$more_text = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $more_text);
+	$main      = preg_replace( '/^[\s]*(.*)[\s]*$/', '\\1', $main );
+	$extended  = preg_replace( '/^[\s]*(.*)[\s]*$/', '\\1', $extended );
+	$more_text = preg_replace( '/^[\s]*(.*)[\s]*$/', '\\1', $more_text );
 
-	return array( 'main' => $main, 'extended' => $extended, 'more_text' => $more_text );
+	return array(
+		'main'      => $main,
+		'extended'  => $extended,
+		'more_text' => $more_text,
+	);
 }
 
 /**
@@ -528,8 +571,9 @@ function get_extended( $post ) {
  *                            When $output is OBJECT, a `WP_Post` instance is returned.
  */
 function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $post ) && isset( $GLOBALS['post'] ) )
+	if ( empty( $post ) && isset( $GLOBALS['post'] ) ) {
 		$post = $GLOBALS['post'];
+	}
 
 	if ( $post instanceof WP_Post ) {
 		$_post = $post;
@@ -546,15 +590,17 @@ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
 		$_post = WP_Post::get_instance( $post );
 	}
 
-	if ( ! $_post )
+	if ( ! $_post ) {
 		return null;
+	}
 
 	$_post = $_post->filter( $filter );
 
-	if ( $output == ARRAY_A )
+	if ( $output == ARRAY_A ) {
 		return $_post->to_array();
-	elseif ( $output == ARRAY_N )
+	} elseif ( $output == ARRAY_N ) {
 		return array_values( $_post->to_array() );
+	}
 
 	return $_post;
 }
@@ -570,8 +616,9 @@ function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
 function get_post_ancestors( $post ) {
 	$post = get_post( $post );
 
-	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID )
+	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID ) {
 		return array();
+	}
 
 	$ancestors = array();
 
@@ -579,8 +626,9 @@ function get_post_ancestors( $post ) {
 
 	while ( $ancestor = get_post( $id ) ) {
 		// Loop detection: If the ancestor has been seen before, break.
-		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) )
+		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) ) {
 			break;
+		}
 
 		$id = $ancestors[] = $ancestor->post_parent;
 	}
@@ -611,13 +659,15 @@ function get_post_ancestors( $post ) {
 function get_post_field( $field, $post = null, $context = 'display' ) {
 	$post = get_post( $post );
 
-	if ( !$post )
+	if ( ! $post ) {
 		return '';
+	}
 
-	if ( !isset($post->$field) )
+	if ( ! isset( $post->$field ) ) {
 		return '';
+	}
 
-	return sanitize_post_field($field, $post->$field, $post->ID, $context);
+	return sanitize_post_field( $field, $post->$field, $post->ID, $context );
 }
 
 /**
@@ -632,10 +682,11 @@ function get_post_field( $field, $post = null, $context = 'display' ) {
  * @return string|false The mime type on success, false on failure.
  */
 function get_post_mime_type( $ID = '' ) {
-	$post = get_post($ID);
+	$post = get_post( $ID );
 
-	if ( is_object($post) )
+	if ( is_object( $post ) ) {
 		return $post->post_mime_type;
+	}
 
 	return false;
 }
@@ -652,18 +703,21 @@ function get_post_mime_type( $ID = '' ) {
  * @return string|false Post status on success, false on failure.
  */
 function get_post_status( $ID = '' ) {
-	$post = get_post($ID);
+	$post = get_post( $ID );
 
-	if ( !is_object($post) )
+	if ( ! is_object( $post ) ) {
 		return false;
+	}
 
 	if ( 'attachment' == $post->post_type ) {
-		if ( 'private' == $post->post_status )
+		if ( 'private' == $post->post_status ) {
 			return 'private';
+		}
 
 		// Unattached attachments are assumed to be published.
-		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) )
+		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent ) ) {
 			return 'publish';
+		}
 
 		// Inherit status from the parent.
 		if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
@@ -674,7 +728,6 @@ function get_post_status( $ID = '' ) {
 				return $parent_post_status;
 			}
 		}
-
 	}
 
 	/**
@@ -703,7 +756,7 @@ function get_post_statuses() {
 		'draft'   => __( 'Draft' ),
 		'pending' => __( 'Pending Review' ),
 		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'publish' => __( 'Published' ),
 	);
 
 	return $status;
@@ -723,7 +776,7 @@ function get_page_statuses() {
 	$status = array(
 		'draft'   => __( 'Draft' ),
 		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'publish' => __( 'Published' ),
 	);
 
 	return $status;
@@ -775,64 +828,76 @@ function get_page_statuses() {
 function register_post_status( $post_status, $args = array() ) {
 	global $wp_post_statuses;
 
-	if (!is_array($wp_post_statuses))
+	if ( ! is_array( $wp_post_statuses ) ) {
 		$wp_post_statuses = array();
+	}
 
 	// Args prefixed with an underscore are reserved for internal use.
 	$defaults = array(
-		'label' => false,
-		'label_count' => false,
-		'exclude_from_search' => null,
-		'_builtin' => false,
-		'public' => null,
-		'internal' => null,
-		'protected' => null,
-		'private' => null,
-		'publicly_queryable' => null,
+		'label'                     => false,
+		'label_count'               => false,
+		'exclude_from_search'       => null,
+		'_builtin'                  => false,
+		'public'                    => null,
+		'internal'                  => null,
+		'protected'                 => null,
+		'private'                   => null,
+		'publicly_queryable'        => null,
 		'show_in_admin_status_list' => null,
-		'show_in_admin_all_list' => null,
+		'show_in_admin_all_list'    => null,
 	);
-	$args = wp_parse_args($args, $defaults);
-	$args = (object) $args;
+	$args     = wp_parse_args( $args, $defaults );
+	$args     = (object) $args;
 
-	$post_status = sanitize_key($post_status);
-	$args->name = $post_status;
+	$post_status = sanitize_key( $post_status );
+	$args->name  = $post_status;
 
 	// Set various defaults.
-	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private )
+	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private ) {
 		$args->internal = true;
+	}
 
-	if ( null === $args->public  )
+	if ( null === $args->public ) {
 		$args->public = false;
+	}
 
-	if ( null === $args->private  )
+	if ( null === $args->private ) {
 		$args->private = false;
+	}
 
-	if ( null === $args->protected  )
+	if ( null === $args->protected ) {
 		$args->protected = false;
+	}
 
-	if ( null === $args->internal  )
+	if ( null === $args->internal ) {
 		$args->internal = false;
+	}
 
-	if ( null === $args->publicly_queryable )
+	if ( null === $args->publicly_queryable ) {
 		$args->publicly_queryable = $args->public;
+	}
 
-	if ( null === $args->exclude_from_search )
+	if ( null === $args->exclude_from_search ) {
 		$args->exclude_from_search = $args->internal;
+	}
 
-	if ( null === $args->show_in_admin_all_list )
-		$args->show_in_admin_all_list = !$args->internal;
+	if ( null === $args->show_in_admin_all_list ) {
+		$args->show_in_admin_all_list = ! $args->internal;
+	}
 
-	if ( null === $args->show_in_admin_status_list )
-		$args->show_in_admin_status_list = !$args->internal;
+	if ( null === $args->show_in_admin_status_list ) {
+		$args->show_in_admin_status_list = ! $args->internal;
+	}
 
-	if ( false === $args->label )
+	if ( false === $args->label ) {
 		$args->label = $post_status;
+	}
 
-	if ( false === $args->label_count )
+	if ( false === $args->label_count ) {
 		$args->label_count = _n_noop( $args->label, $args->label );
+	}
 
-	$wp_post_statuses[$post_status] = $args;
+	$wp_post_statuses[ $post_status ] = $args;
 
 	return $args;
 }
@@ -852,10 +917,11 @@ function register_post_status( $post_status, $args = array() ) {
 function get_post_status_object( $post_status ) {
 	global $wp_post_statuses;
 
-	if ( empty($wp_post_statuses[$post_status]) )
+	if ( empty( $wp_post_statuses[ $post_status ] ) ) {
 		return null;
+	}
 
-	return $wp_post_statuses[$post_status];
+	return $wp_post_statuses[ $post_status ];
 }
 
 /**
@@ -878,9 +944,9 @@ function get_post_status_object( $post_status ) {
 function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) {
 	global $wp_post_statuses;
 
-	$field = ('names' == $output) ? 'name' : false;
+	$field = ( 'names' == $output ) ? 'name' : false;
 
-	return wp_filter_object_list($wp_post_statuses, $args, $operator, $field);
+	return wp_filter_object_list( $wp_post_statuses, $args, $operator, $field );
 }
 
 /**
@@ -896,8 +962,9 @@ function get_post_stati( $args = array(), $output = 'names', $operator = 'and' )
  * @return bool Whether post type is hierarchical.
  */
 function is_post_type_hierarchical( $post_type ) {
-	if ( ! post_type_exists( $post_type ) )
+	if ( ! post_type_exists( $post_type ) ) {
 		return false;
+	}
 
 	$post_type = get_post_type_object( $post_type );
 	return $post_type->hierarchical;
@@ -926,8 +993,9 @@ function post_type_exists( $post_type ) {
  * @return string|false          Post type on success, false on failure.
  */
 function get_post_type( $post = null ) {
-	if ( $post = get_post( $post ) )
+	if ( $post = get_post( $post ) ) {
 		return $post->post_type;
+	}
 
 	return false;
 }
@@ -976,9 +1044,9 @@ function get_post_type_object( $post_type ) {
 function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) {
 	global $wp_post_types;
 
-	$field = ('names' == $output) ? 'name' : false;
+	$field = ( 'names' == $output ) ? 'name' : false;
 
-	return wp_filter_object_list($wp_post_types, $args, $operator, $field);
+	return wp_filter_object_list( $wp_post_types, $args, $operator, $field );
 }
 
 /**
@@ -1258,21 +1326,22 @@ function unregister_post_type( $post_type ) {
  * @return object Object with all the capabilities as member variables.
  */
 function get_post_type_capabilities( $args ) {
-	if ( ! is_array( $args->capability_type ) )
+	if ( ! is_array( $args->capability_type ) ) {
 		$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+	}
 
 	// Singular base for meta capabilities, plural base for primitive capabilities.
 	list( $singular_base, $plural_base ) = $args->capability_type;
 
 	$default_capabilities = array(
 		// Meta capabilities
-		'edit_post'          => 'edit_'         . $singular_base,
-		'read_post'          => 'read_'         . $singular_base,
-		'delete_post'        => 'delete_'       . $singular_base,
+		'edit_post'          => 'edit_' . $singular_base,
+		'read_post'          => 'read_' . $singular_base,
+		'delete_post'        => 'delete_' . $singular_base,
 		// Primitive capabilities used outside of map_meta_cap():
-		'edit_posts'         => 'edit_'         . $plural_base,
-		'edit_others_posts'  => 'edit_others_'  . $plural_base,
-		'publish_posts'      => 'publish_'      . $plural_base,
+		'edit_posts'         => 'edit_' . $plural_base,
+		'edit_others_posts'  => 'edit_others_' . $plural_base,
+		'publish_posts'      => 'publish_' . $plural_base,
 		'read_private_posts' => 'read_private_' . $plural_base,
 	);
 
@@ -1280,25 +1349,27 @@ function get_post_type_capabilities( $args ) {
 	if ( $args->map_meta_cap ) {
 		$default_capabilities_for_mapping = array(
 			'read'                   => 'read',
-			'delete_posts'           => 'delete_'           . $plural_base,
-			'delete_private_posts'   => 'delete_private_'   . $plural_base,
+			'delete_posts'           => 'delete_' . $plural_base,
+			'delete_private_posts'   => 'delete_private_' . $plural_base,
 			'delete_published_posts' => 'delete_published_' . $plural_base,
-			'delete_others_posts'    => 'delete_others_'    . $plural_base,
-			'edit_private_posts'     => 'edit_private_'     . $plural_base,
-			'edit_published_posts'   => 'edit_published_'   . $plural_base,
+			'delete_others_posts'    => 'delete_others_' . $plural_base,
+			'edit_private_posts'     => 'edit_private_' . $plural_base,
+			'edit_published_posts'   => 'edit_published_' . $plural_base,
 		);
-		$default_capabilities = array_merge( $default_capabilities, $default_capabilities_for_mapping );
+		$default_capabilities             = array_merge( $default_capabilities, $default_capabilities_for_mapping );
 	}
 
 	$capabilities = array_merge( $default_capabilities, $args->capabilities );
 
 	// Post creation capability simply maps to edit_posts by default:
-	if ( ! isset( $capabilities['create_posts'] ) )
+	if ( ! isset( $capabilities['create_posts'] ) ) {
 		$capabilities['create_posts'] = $capabilities['edit_posts'];
+	}
 
 	// Remember meta capabilities for future reference.
-	if ( $args->map_meta_cap )
+	if ( $args->map_meta_cap ) {
 		_post_type_meta_capabilities( $capabilities );
+	}
 
 	return (object) $capabilities;
 }
@@ -1381,31 +1452,31 @@ function _post_type_meta_capabilities( $capabilities = null ) {
  * @return object Object with all the labels as member variables.
  */
 function get_post_type_labels( $post_type_object ) {
-	$nohier_vs_hier_defaults = array(
-		'name' => array( _x('Posts', 'post type general name'), _x('Pages', 'post type general name') ),
-		'singular_name' => array( _x('Post', 'post type singular name'), _x('Page', 'post type singular name') ),
-		'add_new' => array( _x('Add New', 'post'), _x('Add New', 'page') ),
-		'add_new_item' => array( __('Add New Post'), __('Add New Page') ),
-		'edit_item' => array( __('Edit Post'), __('Edit Page') ),
-		'new_item' => array( __('New Post'), __('New Page') ),
-		'view_item' => array( __('View Post'), __('View Page') ),
-		'view_items' => array( __('View Posts'), __('View Pages') ),
-		'search_items' => array( __('Search Posts'), __('Search Pages') ),
-		'not_found' => array( __('No posts found.'), __('No pages found.') ),
-		'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
-		'parent_item_colon' => array( null, __('Parent Page:') ),
-		'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
-		'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ),
-		'attributes' => array( __( 'Post Attributes' ), __( 'Page Attributes' ) ),
-		'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ),
+	$nohier_vs_hier_defaults              = array(
+		'name'                  => array( _x( 'Posts', 'post type general name' ), _x( 'Pages', 'post type general name' ) ),
+		'singular_name'         => array( _x( 'Post', 'post type singular name' ), _x( 'Page', 'post type singular name' ) ),
+		'add_new'               => array( _x( 'Add New', 'post' ), _x( 'Add New', 'page' ) ),
+		'add_new_item'          => array( __( 'Add New Post' ), __( 'Add New Page' ) ),
+		'edit_item'             => array( __( 'Edit Post' ), __( 'Edit Page' ) ),
+		'new_item'              => array( __( 'New Post' ), __( 'New Page' ) ),
+		'view_item'             => array( __( 'View Post' ), __( 'View Page' ) ),
+		'view_items'            => array( __( 'View Posts' ), __( 'View Pages' ) ),
+		'search_items'          => array( __( 'Search Posts' ), __( 'Search Pages' ) ),
+		'not_found'             => array( __( 'No posts found.' ), __( 'No pages found.' ) ),
+		'not_found_in_trash'    => array( __( 'No posts found in Trash.' ), __( 'No pages found in Trash.' ) ),
+		'parent_item_colon'     => array( null, __( 'Parent Page:' ) ),
+		'all_items'             => array( __( 'All Posts' ), __( 'All Pages' ) ),
+		'archives'              => array( __( 'Post Archives' ), __( 'Page Archives' ) ),
+		'attributes'            => array( __( 'Post Attributes' ), __( 'Page Attributes' ) ),
+		'insert_into_item'      => array( __( 'Insert into post' ), __( 'Insert into page' ) ),
 		'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ),
-		'featured_image' => array( _x( 'Featured Image', 'post' ), _x( 'Featured Image', 'page' ) ),
-		'set_featured_image' => array( _x( 'Set featured image', 'post' ), _x( 'Set featured image', 'page' ) ),
+		'featured_image'        => array( _x( 'Featured Image', 'post' ), _x( 'Featured Image', 'page' ) ),
+		'set_featured_image'    => array( _x( 'Set featured image', 'post' ), _x( 'Set featured image', 'page' ) ),
 		'remove_featured_image' => array( _x( 'Remove featured image', 'post' ), _x( 'Remove featured image', 'page' ) ),
-		'use_featured_image' => array( _x( 'Use as featured image', 'post' ), _x( 'Use as featured image', 'page' ) ),
-		'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ),
+		'use_featured_image'    => array( _x( 'Use as featured image', 'post' ), _x( 'Use as featured image', 'page' ) ),
+		'filter_items_list'     => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ),
 		'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ),
-		'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ),
+		'items_list'            => array( __( 'Posts list' ), __( 'Pages list' ) ),
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
@@ -1449,30 +1520,35 @@ function get_post_type_labels( $post_type_object ) {
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
 	$object->labels = (array) $object->labels;
 
-	if ( isset( $object->label ) && empty( $object->labels['name'] ) )
+	if ( isset( $object->label ) && empty( $object->labels['name'] ) ) {
 		$object->labels['name'] = $object->label;
+	}
 
-	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
 		$object->labels['singular_name'] = $object->labels['name'];
+	}
 
-	if ( ! isset( $object->labels['name_admin_bar'] ) )
+	if ( ! isset( $object->labels['name_admin_bar'] ) ) {
 		$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	}
 
-	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) ) {
 		$object->labels['menu_name'] = $object->labels['name'];
+	}
 
-	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
+	if ( ! isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) ) {
 		$object->labels['all_items'] = $object->labels['menu_name'];
+	}
 
-	if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
+	if ( ! isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
 		$object->labels['archives'] = $object->labels['all_items'];
 	}
 
 	$defaults = array();
 	foreach ( $nohier_vs_hier_defaults as $key => $value ) {
-		$defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
+		$defaults[ $key ] = $object->hierarchical ? $value[1] : $value[0];
 	}
-	$labels = array_merge( $defaults, $object->labels );
+	$labels         = array_merge( $defaults, $object->labels );
 	$object->labels = (object) $object->labels;
 
 	return (object) $labels;
@@ -1488,8 +1564,9 @@ function _add_post_type_submenus() {
 	foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
 		$ptype_obj = get_post_type_object( $ptype );
 		// Sub-menus only.
-		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
+		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true ) {
 			continue;
+		}
 		add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
 	}
 }
@@ -1518,11 +1595,12 @@ function add_post_type_support( $post_type, $feature ) {
 	global $_wp_post_type_features;
 
 	$features = (array) $feature;
-	foreach ($features as $feature) {
-		if ( func_num_args() == 2 )
-			$_wp_post_type_features[$post_type][$feature] = true;
-		else
-			$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+	foreach ( $features as $feature ) {
+		if ( func_num_args() == 2 ) {
+			$_wp_post_type_features[ $post_type ][ $feature ] = true;
+		} else {
+			$_wp_post_type_features[ $post_type ][ $feature ] = array_slice( func_get_args(), 2 );
+		}
 	}
 }
 
@@ -1555,8 +1633,9 @@ function remove_post_type_support( $post_type, $feature ) {
 function get_all_post_type_supports( $post_type ) {
 	global $_wp_post_type_features;
 
-	if ( isset( $_wp_post_type_features[$post_type] ) )
-		return $_wp_post_type_features[$post_type];
+	if ( isset( $_wp_post_type_features[ $post_type ] ) ) {
+		return $_wp_post_type_features[ $post_type ];
+	}
 
 	return array();
 }
@@ -1575,7 +1654,7 @@ function get_all_post_type_supports( $post_type ) {
 function post_type_supports( $post_type, $feature ) {
 	global $_wp_post_type_features;
 
-	return ( isset( $_wp_post_type_features[$post_type][$feature] ) );
+	return ( isset( $_wp_post_type_features[ $post_type ][ $feature ] ) );
 }
 
 /**
@@ -1617,8 +1696,8 @@ function get_post_types_by_support( $feature, $operator = 'and' ) {
 function set_post_type( $post_id = 0, $post_type = 'post' ) {
 	global $wpdb;
 
-	$post_type = sanitize_post_field('post_type', $post_type, $post_id, 'db');
-	$return = $wpdb->update( $wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id) );
+	$post_type = sanitize_post_field( 'post_type', $post_type, $post_id, 'db' );
+	$return    = $wpdb->update( $wpdb->posts, array( 'post_type' => $post_type ), array( 'ID' => $post_id ) );
 
 	clean_post_cache( $post_id );
 
@@ -1675,33 +1754,41 @@ function is_post_type_viewable( $post_type ) {
  */
 function get_posts( $args = null ) {
 	$defaults = array(
-		'numberposts' => 5,
-		'category' => 0, 'orderby' => 'date',
-		'order' => 'DESC', 'include' => array(),
-		'exclude' => array(), 'meta_key' => '',
-		'meta_value' =>'', 'post_type' => 'post',
-		'suppress_filters' => true
+		'numberposts'      => 5,
+		'category'         => 0,
+		'orderby'          => 'date',
+		'order'            => 'DESC',
+		'include'          => array(),
+		'exclude'          => array(),
+		'meta_key'         => '',
+		'meta_value'       => '',
+		'post_type'        => 'post',
+		'suppress_filters' => true,
 	);
 
 	$r = wp_parse_args( $args, $defaults );
-	if ( empty( $r['post_status'] ) )
+	if ( empty( $r['post_status'] ) ) {
 		$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) )
+	}
+	if ( ! empty( $r['numberposts'] ) && empty( $r['posts_per_page'] ) ) {
 		$r['posts_per_page'] = $r['numberposts'];
-	if ( ! empty($r['category']) )
+	}
+	if ( ! empty( $r['category'] ) ) {
 		$r['cat'] = $r['category'];
-	if ( ! empty($r['include']) ) {
-		$incposts = wp_parse_id_list( $r['include'] );
-		$r['posts_per_page'] = count($incposts);  // only the number of posts included
-		$r['post__in'] = $incposts;
-	} elseif ( ! empty($r['exclude']) )
+	}
+	if ( ! empty( $r['include'] ) ) {
+		$incposts            = wp_parse_id_list( $r['include'] );
+		$r['posts_per_page'] = count( $incposts );  // only the number of posts included
+		$r['post__in']       = $incposts;
+	} elseif ( ! empty( $r['exclude'] ) ) {
 		$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	}
 
 	$r['ignore_sticky_posts'] = true;
-	$r['no_found_rows'] = true;
+	$r['no_found_rows']       = true;
 
 	$get_posts = new WP_Query;
-	return $get_posts->query($r);
+	return $get_posts->query( $r );
 
 }
 
@@ -1725,8 +1812,9 @@ function get_posts( $args = null ) {
  */
 function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ( $the_post = wp_is_post_revision( $post_id ) ) {
 		$post_id = $the_post;
+	}
 
 	$added = add_metadata( 'post', $post_id, $meta_key, $meta_value, $unique );
 	if ( $added ) {
@@ -1752,8 +1840,9 @@ function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) {
  */
 function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ( $the_post = wp_is_post_revision( $post_id ) ) {
 		$post_id = $the_post;
+	}
 
 	$deleted = delete_metadata( 'post', $post_id, $meta_key, $meta_value );
 	if ( $deleted ) {
@@ -1777,7 +1866,7 @@ function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) {
  *               field if $single is true.
  */
 function get_post_meta( $post_id, $key = '', $single = false ) {
-	return get_metadata('post', $post_id, $key, $single);
+	return get_metadata( 'post', $post_id, $key, $single );
 }
 
 /**
@@ -1800,8 +1889,9 @@ function get_post_meta( $post_id, $key = '', $single = false ) {
  */
 function update_post_meta( $post_id, $meta_key, $meta_value, $prev_value = '' ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ( $the_post = wp_is_post_revision( $post_id ) ) {
 		$post_id = $the_post;
+	}
 
 	$updated = update_metadata( 'post', $post_id, $meta_key, $meta_value, $prev_value );
 	if ( $updated ) {
@@ -1839,8 +1929,9 @@ function delete_post_meta_by_key( $post_meta_key ) {
  */
 function get_post_custom( $post_id = 0 ) {
 	$post_id = absint( $post_id );
-	if ( ! $post_id )
+	if ( ! $post_id ) {
 		$post_id = get_the_ID();
+	}
 
 	return get_post_meta( $post_id );
 }
@@ -1858,11 +1949,13 @@ function get_post_custom( $post_id = 0 ) {
 function get_post_custom_keys( $post_id = 0 ) {
 	$custom = get_post_custom( $post_id );
 
-	if ( !is_array($custom) )
+	if ( ! is_array( $custom ) ) {
 		return;
+	}
 
-	if ( $keys = array_keys($custom) )
+	if ( $keys = array_keys( $custom ) ) {
 		return $keys;
+	}
 }
 
 /**
@@ -1878,12 +1971,13 @@ function get_post_custom_keys( $post_id = 0 ) {
  * @return array|null Meta field values.
  */
 function get_post_custom_values( $key = '', $post_id = 0 ) {
-	if ( !$key )
+	if ( ! $key ) {
 		return null;
+	}
 
-	$custom = get_post_custom($post_id);
+	$custom = get_post_custom( $post_id );
 
-	return isset($custom[$key]) ? $custom[$key] : null;
+	return isset( $custom[ $key ] ) ? $custom[ $key ] : null;
 }
 
 /**
@@ -1900,16 +1994,19 @@ function get_post_custom_values( $key = '', $post_id = 0 ) {
 function is_sticky( $post_id = 0 ) {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
+	if ( ! $post_id ) {
 		$post_id = get_the_ID();
+	}
 
 	$stickies = get_option( 'sticky_posts' );
 
-	if ( ! is_array( $stickies ) )
+	if ( ! is_array( $stickies ) ) {
 		return false;
+	}
 
-	if ( in_array( $post_id, $stickies ) )
+	if ( in_array( $post_id, $stickies ) ) {
 		return true;
+	}
 
 	return false;
 }
@@ -1932,23 +2029,29 @@ function is_sticky( $post_id = 0 ) {
  *                              same type as $post).
  */
 function sanitize_post( $post, $context = 'display' ) {
-	if ( is_object($post) ) {
+	if ( is_object( $post ) ) {
 		// Check if post already filtered for this context.
-		if ( isset($post->filter) && $context == $post->filter )
+		if ( isset( $post->filter ) && $context == $post->filter ) {
 			return $post;
-		if ( !isset($post->ID) )
+		}
+		if ( ! isset( $post->ID ) ) {
 			$post->ID = 0;
-		foreach ( array_keys(get_object_vars($post)) as $field )
-			$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
+		}
+		foreach ( array_keys( get_object_vars( $post ) ) as $field ) {
+			$post->$field = sanitize_post_field( $field, $post->$field, $post->ID, $context );
+		}
 		$post->filter = $context;
 	} elseif ( is_array( $post ) ) {
 		// Check if post already filtered for this context.
-		if ( isset($post['filter']) && $context == $post['filter'] )
+		if ( isset( $post['filter'] ) && $context == $post['filter'] ) {
 			return $post;
-		if ( !isset($post['ID']) )
+		}
+		if ( ! isset( $post['ID'] ) ) {
 			$post['ID'] = 0;
-		foreach ( array_keys($post) as $field )
-			$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
+		}
+		foreach ( array_keys( $post ) as $field ) {
+			$post[ $field ] = sanitize_post_field( $field, $post[ $field ], $post['ID'], $context );
+		}
 		$post['filter'] = $context;
 	}
 	return $post;
@@ -1972,28 +2075,30 @@ function sanitize_post( $post, $context = 'display' ) {
  * @return mixed Sanitized value.
  */
 function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
-	$int_fields = array('ID', 'post_parent', 'menu_order');
-	if ( in_array($field, $int_fields) )
+	$int_fields = array( 'ID', 'post_parent', 'menu_order' );
+	if ( in_array( $field, $int_fields ) ) {
 		$value = (int) $value;
+	}
 
 	// Fields which contain arrays of integers.
 	$array_int_fields = array( 'ancestors' );
-	if ( in_array($field, $array_int_fields) ) {
-		$value = array_map( 'absint', $value);
+	if ( in_array( $field, $array_int_fields ) ) {
+		$value = array_map( 'absint', $value );
 		return $value;
 	}
 
-	if ( 'raw' == $context )
+	if ( 'raw' == $context ) {
 		return $value;
+	}
 
 	$prefixed = false;
-	if ( false !== strpos($field, 'post_') ) {
-		$prefixed = true;
-		$field_no_prefix = str_replace('post_', '', $field);
+	if ( false !== strpos( $field, 'post_' ) ) {
+		$prefixed        = true;
+		$field_no_prefix = str_replace( 'post_', '', $field );
 	}
 
 	if ( 'edit' == $context ) {
-		$format_to_edit = array('post_content', 'post_excerpt', 'post_title', 'post_password');
+		$format_to_edit = array( 'post_content', 'post_excerpt', 'post_title', 'post_password' );
 
 		if ( $prefixed ) {
 
@@ -2026,13 +2131,14 @@ function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
 			$value = apply_filters( "edit_post_{$field}", $value, $post_id );
 		}
 
-		if ( in_array($field, $format_to_edit) ) {
-			if ( 'post_content' == $field )
-				$value = format_to_edit($value, user_can_richedit());
-			else
-				$value = format_to_edit($value);
+		if ( in_array( $field, $format_to_edit ) ) {
+			if ( 'post_content' == $field ) {
+				$value = format_to_edit( $value, user_can_richedit() );
+			} else {
+				$value = format_to_edit( $value );
+			}
 		} else {
-			$value = esc_attr($value);
+			$value = esc_attr( $value );
 		}
 	} elseif ( 'db' == $context ) {
 		if ( $prefixed ) {
@@ -2119,13 +2225,15 @@ function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
  * @param int $post_id Post ID.
  */
 function stick_post( $post_id ) {
-	$stickies = get_option('sticky_posts');
+	$stickies = get_option( 'sticky_posts' );
 
-	if ( !is_array($stickies) )
-		$stickies = array($post_id);
+	if ( ! is_array( $stickies ) ) {
+		$stickies = array( $post_id );
+	}
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array( $post_id, $stickies ) ) {
 		$stickies[] = $post_id;
+	}
 
 	$updated = update_option( 'sticky_posts', $stickies );
 
@@ -2151,19 +2259,22 @@ function stick_post( $post_id ) {
  * @param int $post_id Post ID.
  */
 function unstick_post( $post_id ) {
-	$stickies = get_option('sticky_posts');
+	$stickies = get_option( 'sticky_posts' );
 
-	if ( !is_array($stickies) )
+	if ( ! is_array( $stickies ) ) {
 		return;
+	}
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array( $post_id, $stickies ) ) {
 		return;
+	}
 
-	$offset = array_search($post_id, $stickies);
-	if ( false === $offset )
+	$offset = array_search( $post_id, $stickies );
+	if ( false === $offset ) {
 		return;
+	}
 
-	array_splice($stickies, $offset, 1);
+	array_splice( $stickies, $offset, 1 );
 
 	$updated = update_option( 'sticky_posts', $stickies );
 
@@ -2221,8 +2332,9 @@ function _count_posts_cache_key( $type = 'post', $perm = '' ) {
 function wp_count_posts( $type = 'post', $perm = '' ) {
 	global $wpdb;
 
-	if ( ! post_type_exists( $type ) )
+	if ( ! post_type_exists( $type ) ) {
 		return new stdClass;
+	}
 
 	$cache_key = _count_posts_cache_key( $type, $perm );
 
@@ -2234,9 +2346,10 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
 
 	$query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
 	if ( 'readable' == $perm && is_user_logged_in() ) {
-		$post_type_object = get_post_type_object($type);
+		$post_type_object = get_post_type_object( $type );
 		if ( ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
-			$query .= $wpdb->prepare( " AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
+			$query .= $wpdb->prepare(
+				" AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
 				get_current_user_id()
 			);
 		}
@@ -2244,7 +2357,7 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
 	$query .= ' GROUP BY post_status';
 
 	$results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
-	$counts = array_fill_keys( get_post_stati(), 0 );
+	$counts  = array_fill_keys( get_post_stati(), 0 );
 
 	foreach ( $results as $row ) {
 		$counts[ $row['post_status'] ] = $row['num_posts'];
@@ -2286,14 +2399,14 @@ function wp_count_posts( $type = 'post', $perm = '' ) {
 function wp_count_attachments( $mime_type = '' ) {
 	global $wpdb;
 
-	$and = wp_post_mime_type_where( $mime_type );
+	$and   = wp_post_mime_type_where( $mime_type );
 	$count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A );
 
 	$counts = array();
 	foreach ( (array) $count as $row ) {
 		$counts[ $row['post_mime_type'] ] = $row['num_posts'];
 	}
-	$counts['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
+	$counts['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and" );
 
 	/**
 	 * Modify returned attachment counts by mime type.
@@ -2316,10 +2429,10 @@ function wp_count_attachments( $mime_type = '' ) {
  * @return array List of post mime types.
  */
 function get_post_mime_types() {
-	$post_mime_types = array(	//	array( adj, noun )
-		'image' => array(__('Images'), __('Manage Images'), _n_noop('Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>')),
-		'audio' => array(__('Audio'), __('Manage Audio'), _n_noop('Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>')),
-		'video' => array(__('Video'), __('Manage Video'), _n_noop('Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>')),
+	$post_mime_types = array(   //	array( adj, noun )
+		'image' => array( __( 'Images' ), __( 'Manage Images' ), _n_noop( 'Image <span class="count">(%s)</span>', 'Images <span class="count">(%s)</span>' ) ),
+		'audio' => array( __( 'Audio' ), __( 'Manage Audio' ), _n_noop( 'Audio <span class="count">(%s)</span>', 'Audio <span class="count">(%s)</span>' ) ),
+		'video' => array( __( 'Video' ), __( 'Manage Video' ), _n_noop( 'Video <span class="count">(%s)</span>', 'Video <span class="count">(%s)</span>' ) ),
 	);
 
 	/**
@@ -2356,16 +2469,16 @@ function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
 	}
 
 	$patternses = array();
-	$wild = '[-._a-z0-9]*';
+	$wild       = '[-._a-z0-9]*';
 
 	foreach ( (array) $wildcard_mime_types as $type ) {
 		$mimes = array_map( 'trim', explode( ',', $type ) );
 		foreach ( $mimes as $mime ) {
-			$regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
-			$patternses[][$type] = "^$regex$";
+			$regex                 = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+			$patternses[][ $type ] = "^$regex$";
 			if ( false === strpos( $mime, '/' ) ) {
-				$patternses[][$type] = "^$regex/";
-				$patternses[][$type] = $regex;
+				$patternses[][ $type ] = "^$regex/";
+				$patternses[][ $type ] = $regex;
 			}
 		}
 	}
@@ -2374,8 +2487,8 @@ function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
 	foreach ( $patternses as $patterns ) {
 		foreach ( $patterns as $type => $pattern ) {
 			foreach ( (array) $real_mime_types as $real ) {
-				if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[$type] ) || false === array_search( $real, $matches[$type] ) ) ) {
-					$matches[$type][] = $real;
+				if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[ $type ] ) || false === array_search( $real, $matches[ $type ] ) ) ) {
+					$matches[ $type ][] = $real;
 				}
 			}
 		}
@@ -2395,42 +2508,48 @@ function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
  * @return string The SQL AND clause for mime searching.
  */
 function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
-	$where = '';
-	$wildcards = array('', '%', '%/%');
-	if ( is_string($post_mime_types) )
-		$post_mime_types = array_map('trim', explode(',', $post_mime_types));
+	$where     = '';
+	$wildcards = array( '', '%', '%/%' );
+	if ( is_string( $post_mime_types ) ) {
+		$post_mime_types = array_map( 'trim', explode( ',', $post_mime_types ) );
+	}
 
 	$wheres = array();
 
 	foreach ( (array) $post_mime_types as $mime_type ) {
-		$mime_type = preg_replace('/\s/', '', $mime_type);
-		$slashpos = strpos($mime_type, '/');
+		$mime_type = preg_replace( '/\s/', '', $mime_type );
+		$slashpos  = strpos( $mime_type, '/' );
 		if ( false !== $slashpos ) {
-			$mime_group = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, 0, $slashpos));
-			$mime_subgroup = preg_replace('/[^-*.+a-zA-Z0-9]/', '', substr($mime_type, $slashpos + 1));
-			if ( empty($mime_subgroup) )
+			$mime_group    = preg_replace( '/[^-*.a-zA-Z0-9]/', '', substr( $mime_type, 0, $slashpos ) );
+			$mime_subgroup = preg_replace( '/[^-*.+a-zA-Z0-9]/', '', substr( $mime_type, $slashpos + 1 ) );
+			if ( empty( $mime_subgroup ) ) {
 				$mime_subgroup = '*';
-			else
-				$mime_subgroup = str_replace('/', '', $mime_subgroup);
+			} else {
+				$mime_subgroup = str_replace( '/', '', $mime_subgroup );
+			}
 			$mime_pattern = "$mime_group/$mime_subgroup";
 		} else {
-			$mime_pattern = preg_replace('/[^-*.a-zA-Z0-9]/', '', $mime_type);
-			if ( false === strpos($mime_pattern, '*') )
+			$mime_pattern = preg_replace( '/[^-*.a-zA-Z0-9]/', '', $mime_type );
+			if ( false === strpos( $mime_pattern, '*' ) ) {
 				$mime_pattern .= '/*';
+			}
 		}
 
-		$mime_pattern = preg_replace('/\*+/', '%', $mime_pattern);
+		$mime_pattern = preg_replace( '/\*+/', '%', $mime_pattern );
 
-		if ( in_array( $mime_type, $wildcards ) )
+		if ( in_array( $mime_type, $wildcards ) ) {
 			return '';
+		}
 
-		if ( false !== strpos($mime_pattern, '%') )
-			$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
-		else
-			$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
+		if ( false !== strpos( $mime_pattern, '%' ) ) {
+			$wheres[] = empty( $table_alias ) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
+		} else {
+			$wheres[] = empty( $table_alias ) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
+		}
+	}
+	if ( ! empty( $wheres ) ) {
+		$where = ' AND (' . join( ' OR ', $wheres ) . ') ';
 	}
-	if ( !empty($wheres) )
-		$where = ' AND (' . join(' OR ', $wheres) . ') ';
 	return $where;
 }
 
@@ -2499,18 +2618,18 @@ function wp_delete_post( $postid = 0, $force_delete = false ) {
 	 */
 	do_action( 'before_delete_post', $postid );
 
-	delete_post_meta($postid,'_wp_trash_meta_status');
-	delete_post_meta($postid,'_wp_trash_meta_time');
+	delete_post_meta( $postid, '_wp_trash_meta_status' );
+	delete_post_meta( $postid, '_wp_trash_meta_time' );
 
-	wp_delete_object_term_relationships($postid, get_object_taxonomies($post->post_type));
+	wp_delete_object_term_relationships( $postid, get_object_taxonomies( $post->post_type ) );
 
-	$parent_data = array( 'post_parent' => $post->post_parent );
+	$parent_data  = array( 'post_parent' => $post->post_parent );
 	$parent_where = array( 'post_parent' => $postid );
 
 	if ( is_post_type_hierarchical( $post->post_type ) ) {
 		// Point children of this page to its parent, also clean the cache of affected children.
 		$children_query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type );
-		$children = $wpdb->get_results( $children_query );
+		$children       = $wpdb->get_results( $children_query );
 		if ( $children ) {
 			$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) );
 		}
@@ -2519,24 +2638,26 @@ function wp_delete_post( $postid = 0, $force_delete = false ) {
 	// Do raw query. wp_get_post_revisions() is filtered.
 	$revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
 	// Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
-	foreach ( $revision_ids as $revision_id )
+	foreach ( $revision_ids as $revision_id ) {
 		wp_delete_post_revision( $revision_id );
+	}
 
 	// Point all attachments to this post up one level.
 	$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
 
 	wp_defer_comment_counting( true );
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
+	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ) );
 	foreach ( $comment_ids as $comment_id ) {
 		wp_delete_comment( $comment_id, true );
 	}
 
 	wp_defer_comment_counting( false );
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
-	foreach ( $post_meta_ids as $mid )
+	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ) );
+	foreach ( $post_meta_ids as $mid ) {
 		delete_metadata_by_mid( 'post', $mid );
+	}
 
 	/**
 	 * Fires immediately before a post is deleted from the database.
@@ -2563,11 +2684,12 @@ function wp_delete_post( $postid = 0, $force_delete = false ) {
 	clean_post_cache( $post );
 
 	if ( is_post_type_hierarchical( $post->post_type ) && $children ) {
-		foreach ( $children as $child )
+		foreach ( $children as $child ) {
 			clean_post_cache( $child );
+		}
 	}
 
-	wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
+	wp_clear_scheduled_hook( 'publish_future_post', array( $postid ) );
 
 	/**
 	 * Fires after a post is deleted, at the conclusion of wp_delete_post().
@@ -2597,10 +2719,10 @@ function wp_delete_post( $postid = 0, $force_delete = false ) {
 function _reset_front_page_settings_for_post( $post_id ) {
 	$post = get_post( $post_id );
 	if ( 'page' == $post->post_type ) {
-	 	/*
-	 	 * If the page is defined in option page_on_front or post_for_posts,
-	 	 * adjust the corresponding options.
-	 	 */
+		/*
+		  * If the page is defined in option page_on_front or post_for_posts,
+		  * adjust the corresponding options.
+		  */
 		if ( get_option( 'page_on_front' ) == $post->ID ) {
 			update_option( 'show_on_front', 'posts' );
 			update_option( 'page_on_front', 0 );
@@ -2665,7 +2787,12 @@ function wp_trash_post( $post_id = 0 ) {
 	add_post_meta( $post_id, '_wp_trash_meta_status', $post->post_status );
 	add_post_meta( $post_id, '_wp_trash_meta_time', time() );
 
-	wp_update_post( array( 'ID' => $post_id, 'post_status' => 'trash' ) );
+	wp_update_post(
+		array(
+			'ID'          => $post_id,
+			'post_status' => 'trash',
+		)
+	);
 
 	wp_trash_post_comments( $post_id );
 
@@ -2727,7 +2854,12 @@ function wp_untrash_post( $post_id = 0 ) {
 	delete_post_meta( $post_id, '_wp_trash_meta_status' );
 	delete_post_meta( $post_id, '_wp_trash_meta_time' );
 
-	wp_update_post( array( 'ID' => $post_id, 'post_status' => $post_status ) );
+	wp_update_post(
+		array(
+			'ID'          => $post_id,
+			'post_status' => $post_status,
+		)
+	);
 
 	wp_untrash_post_comments( $post_id );
 
@@ -2756,9 +2888,10 @@ function wp_untrash_post( $post_id = 0 ) {
 function wp_trash_post_comments( $post = null ) {
 	global $wpdb;
 
-	$post = get_post($post);
-	if ( empty($post) )
+	$post = get_post( $post );
+	if ( empty( $post ) ) {
 		return;
+	}
 
 	$post_id = $post->ID;
 
@@ -2771,20 +2904,22 @@ function wp_trash_post_comments( $post = null ) {
 	 */
 	do_action( 'trash_post_comments', $post_id );
 
-	$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id) );
-	if ( empty($comments) )
+	$comments = $wpdb->get_results( $wpdb->prepare( "SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ) );
+	if ( empty( $comments ) ) {
 		return;
+	}
 
 	// Cache current status for each comment.
 	$statuses = array();
-	foreach ( $comments as $comment )
-		$statuses[$comment->comment_ID] = $comment->comment_approved;
-	add_post_meta($post_id, '_wp_trash_meta_comments_status', $statuses);
+	foreach ( $comments as $comment ) {
+		$statuses[ $comment->comment_ID ] = $comment->comment_approved;
+	}
+	add_post_meta( $post_id, '_wp_trash_meta_comments_status', $statuses );
 
 	// Set status for all comments to post-trashed.
-	$result = $wpdb->update($wpdb->comments, array('comment_approved' => 'post-trashed'), array('comment_post_ID' => $post_id));
+	$result = $wpdb->update( $wpdb->comments, array( 'comment_approved' => 'post-trashed' ), array( 'comment_post_ID' => $post_id ) );
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache( array_keys( $statuses ) );
 
 	/**
 	 * Fires after comments are sent to the trash.
@@ -2812,16 +2947,18 @@ function wp_trash_post_comments( $post = null ) {
 function wp_untrash_post_comments( $post = null ) {
 	global $wpdb;
 
-	$post = get_post($post);
-	if ( empty($post) )
+	$post = get_post( $post );
+	if ( empty( $post ) ) {
 		return;
+	}
 
 	$post_id = $post->ID;
 
-	$statuses = get_post_meta($post_id, '_wp_trash_meta_comments_status', true);
+	$statuses = get_post_meta( $post_id, '_wp_trash_meta_comments_status', true );
 
-	if ( empty($statuses) )
+	if ( empty( $statuses ) ) {
 		return true;
+	}
 
 	/**
 	 * Fires before comments are restored for a post from the trash.
@@ -2834,8 +2971,9 @@ function wp_untrash_post_comments( $post = null ) {
 
 	// Restore each comment to its original status.
 	$group_by_status = array();
-	foreach ( $statuses as $comment_id => $comment_status )
-		$group_by_status[$comment_status][] = $comment_id;
+	foreach ( $statuses as $comment_id => $comment_status ) {
+		$group_by_status[ $comment_status ][] = $comment_id;
+	}
 
 	foreach ( $group_by_status as $status => $comments ) {
 		// Sanity check. This shouldn't happen.
@@ -2846,9 +2984,9 @@ function wp_untrash_post_comments( $post = null ) {
 		$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status ) );
 	}
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache( array_keys( $statuses ) );
 
-	delete_post_meta($post_id, '_wp_trash_meta_comments_status');
+	delete_post_meta( $post_id, '_wp_trash_meta_comments_status' );
 
 	/**
 	 * Fires after comments are restored for a post from the trash.
@@ -2882,10 +3020,10 @@ function wp_untrash_post_comments( $post = null ) {
 function wp_get_post_categories( $post_id = 0, $args = array() ) {
 	$post_id = (int) $post_id;
 
-	$defaults = array('fields' => 'ids');
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array( 'fields' => 'ids' );
+	$args     = wp_parse_args( $args, $defaults );
 
-	$cats = wp_get_object_terms($post_id, 'category', $args);
+	$cats = wp_get_object_terms( $post_id, 'category', $args );
 	return $cats;
 }
 
@@ -2906,7 +3044,7 @@ function wp_get_post_categories( $post_id = 0, $args = array() ) {
  *                        WP_Error object if 'post_tag' taxonomy doesn't exist.
  */
 function wp_get_post_tags( $post_id = 0, $args = array() ) {
-	return wp_get_post_terms( $post_id, 'post_tag', $args);
+	return wp_get_post_terms( $post_id, 'post_tag', $args );
 }
 
 /**
@@ -2929,10 +3067,10 @@ function wp_get_post_tags( $post_id = 0, $args = array() ) {
 function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array() ) {
 	$post_id = (int) $post_id;
 
-	$defaults = array('fields' => 'all');
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array( 'fields' => 'all' );
+	$args     = wp_parse_args( $args, $defaults );
 
-	$tags = wp_get_object_terms($post_id, $taxonomy, $args);
+	$tags = wp_get_object_terms( $post_id, $taxonomy, $args );
 
 	return $tags;
 }
@@ -2959,12 +3097,18 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
 
 	// Set default arguments.
 	$defaults = array(
-		'numberposts' => 10, 'offset' => 0,
-		'category' => 0, 'orderby' => 'post_date',
-		'order' => 'DESC', 'include' => '',
-		'exclude' => '', 'meta_key' => '',
-		'meta_value' =>'', 'post_type' => 'post', 'post_status' => 'draft, publish, future, pending, private',
-		'suppress_filters' => true
+		'numberposts'      => 10,
+		'offset'           => 0,
+		'category'         => 0,
+		'orderby'          => 'post_date',
+		'order'            => 'DESC',
+		'include'          => '',
+		'exclude'          => '',
+		'meta_key'         => '',
+		'meta_value'       => '',
+		'post_type'        => 'post',
+		'post_status'      => 'draft, publish, future, pending, private',
+		'suppress_filters' => true,
 	);
 
 	$r = wp_parse_args( $args, $defaults );
@@ -2972,9 +3116,9 @@ function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
 	$results = get_posts( $r );
 
 	// Backward compatibility. Prior to 3.1 expected posts to be returned in array.
-	if ( ARRAY_A == $output ){
+	if ( ARRAY_A == $output ) {
 		foreach ( $results as $key => $result ) {
-			$results[$key] = get_object_vars( $result );
+			$results[ $key ] = get_object_vars( $result );
 		}
 		return $results ? $results : array();
 	}
@@ -3049,41 +3193,41 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 	$user_id = get_current_user_id();
 
 	$defaults = array(
-		'post_author' => $user_id,
-		'post_content' => '',
+		'post_author'           => $user_id,
+		'post_content'          => '',
 		'post_content_filtered' => '',
-		'post_title' => '',
-		'post_excerpt' => '',
-		'post_status' => 'draft',
-		'post_type' => 'post',
-		'comment_status' => '',
-		'ping_status' => '',
-		'post_password' => '',
-		'to_ping' =>  '',
-		'pinged' => '',
-		'post_parent' => 0,
-		'menu_order' => 0,
-		'guid' => '',
-		'import_id' => 0,
-		'context' => '',
+		'post_title'            => '',
+		'post_excerpt'          => '',
+		'post_status'           => 'draft',
+		'post_type'             => 'post',
+		'comment_status'        => '',
+		'ping_status'           => '',
+		'post_password'         => '',
+		'to_ping'               => '',
+		'pinged'                => '',
+		'post_parent'           => 0,
+		'menu_order'            => 0,
+		'guid'                  => '',
+		'import_id'             => 0,
+		'context'               => '',
 	);
 
-	$postarr = wp_parse_args($postarr, $defaults);
+	$postarr = wp_parse_args( $postarr, $defaults );
 
-	unset( $postarr[ 'filter' ] );
+	unset( $postarr['filter'] );
 
-	$postarr = sanitize_post($postarr, 'db');
+	$postarr = sanitize_post( $postarr, 'db' );
 
 	// Are we updating or creating?
 	$post_ID = 0;
-	$update = false;
-	$guid = $postarr['guid'];
+	$update  = false;
+	$guid    = $postarr['guid'];
 
 	if ( ! empty( $postarr['ID'] ) ) {
 		$update = true;
 
 		// Get the post ID and GUID.
-		$post_ID = $postarr['ID'];
+		$post_ID     = $postarr['ID'];
 		$post_before = get_post( $post_ID );
 		if ( is_null( $post_before ) ) {
 			if ( $wp_error ) {
@@ -3092,15 +3236,15 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 			return 0;
 		}
 
-		$guid = get_post_field( 'guid', $post_ID );
-		$previous_status = get_post_field('post_status', $post_ID );
+		$guid            = get_post_field( 'guid', $post_ID );
+		$previous_status = get_post_field( 'post_status', $post_ID );
 	} else {
 		$previous_status = 'new';
 	}
 
 	$post_type = empty( $postarr['post_type'] ) ? 'post' : $postarr['post_type'];
 
-	$post_title = $postarr['post_title'];
+	$post_title   = $postarr['post_title'];
 	$post_content = $postarr['post_content'];
 	$post_excerpt = $postarr['post_excerpt'];
 	if ( isset( $postarr['post_name'] ) ) {
@@ -3154,14 +3298,14 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 	if ( empty( $post_category ) || 0 == count( $post_category ) || ! is_array( $post_category ) ) {
 		// 'post' requires at least one category.
 		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_category = array( get_option('default_category') );
+			$post_category = array( get_option( 'default_category' ) );
 		} else {
 			$post_category = array();
 		}
 	}
 
 	// Don't allow contributors to set the post slug for pending review posts.
-	if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) ) {
+	if ( 'pending' == $post_status && ! current_user_can( 'publish_posts' ) ) {
 		$post_name = '';
 	}
 
@@ -3169,9 +3313,9 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 	 * Create a valid post name. Drafts and pending posts are allowed to have
 	 * an empty post name.
 	 */
-	if ( empty($post_name) ) {
-		if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
-			$post_name = sanitize_title($post_title);
+	if ( empty( $post_name ) ) {
+		if ( ! in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
+			$post_name = sanitize_title( $post_title );
 		} else {
 			$post_name = '';
 		}
@@ -3181,7 +3325,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 		if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $post_ID ) == $check_name ) {
 			$post_name = $check_name;
 		} else { // new post, or slug has changed.
-			$post_name = sanitize_title($post_name);
+			$post_name = sanitize_title( $post_name );
 		}
 	}
 
@@ -3200,9 +3344,9 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 	}
 
 	// Validate the date.
-	$mm = substr( $post_date, 5, 2 );
-	$jj = substr( $post_date, 8, 2 );
-	$aa = substr( $post_date, 0, 4 );
+	$mm         = substr( $post_date, 5, 2 );
+	$jj         = substr( $post_date, 8, 2 );
+	$aa         = substr( $post_date, 0, 4 );
 	$valid_date = wp_checkdate( $mm, $jj, $aa, $post_date );
 	if ( ! $valid_date ) {
 		if ( $wp_error ) {
@@ -3232,13 +3376,13 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 
 	if ( 'attachment' !== $post_type ) {
 		if ( 'publish' == $post_status ) {
-			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) {
+			$now = gmdate( 'Y-m-d H:i:59' );
+			if ( mysql2date( 'U', $post_date_gmt, false ) > mysql2date( 'U', $now, false ) ) {
 				$post_status = 'future';
 			}
 		} elseif ( 'future' == $post_status ) {
-			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) {
+			$now = gmdate( 'Y-m-d H:i:59' );
+			if ( mysql2date( 'U', $post_date_gmt, false ) <= mysql2date( 'U', $now, false ) ) {
 				$post_status = 'publish';
 			}
 		}
@@ -3257,11 +3401,11 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 
 	// These variables are needed by compact() later.
 	$post_content_filtered = $postarr['post_content_filtered'];
-	$post_author = isset( $postarr['post_author'] ) ? $postarr['post_author'] : $user_id;
-	$ping_status = empty( $postarr['ping_status'] ) ? get_default_comment_status( $post_type, 'pingback' ) : $postarr['ping_status'];
-	$to_ping = isset( $postarr['to_ping'] ) ? sanitize_trackback_urls( $postarr['to_ping'] ) : '';
-	$pinged = isset( $postarr['pinged'] ) ? $postarr['pinged'] : '';
-	$import_id = isset( $postarr['import_id'] ) ? $postarr['import_id'] : 0;
+	$post_author           = isset( $postarr['post_author'] ) ? $postarr['post_author'] : $user_id;
+	$ping_status           = empty( $postarr['ping_status'] ) ? get_default_comment_status( $post_type, 'pingback' ) : $postarr['ping_status'];
+	$to_ping               = isset( $postarr['to_ping'] ) ? sanitize_trackback_urls( $postarr['to_ping'] ) : '';
+	$pinged                = isset( $postarr['pinged'] ) ? $postarr['pinged'] : '';
+	$import_id             = isset( $postarr['import_id'] ) ? $postarr['import_id'] : 0;
 
 	/*
 	 * The 'wp_insert_post_parent' filter expects all variables to be present.
@@ -3358,7 +3502,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 		 */
 		$data = apply_filters( 'wp_insert_post_data', $data, $postarr );
 	}
-	$data = wp_unslash( $data );
+	$data  = wp_unslash( $data );
 	$where = array( 'ID' => $post_ID );
 
 	if ( $update ) {
@@ -3373,7 +3517,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 		do_action( 'pre_post_update', $post_ID, $data );
 		if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
 			if ( $wp_error ) {
-				return new WP_Error('db_update_error', __('Could not update post in the database'), $wpdb->last_error);
+				return new WP_Error( 'db_update_error', __( 'Could not update post in the database' ), $wpdb->last_error );
 			} else {
 				return 0;
 			}
@@ -3382,13 +3526,13 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 		// If there is a suggested ID, use it if not already present.
 		if ( ! empty( $import_id ) ) {
 			$import_id = (int) $import_id;
-			if ( ! $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id) ) ) {
+			if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id ) ) ) {
 				$data['ID'] = $import_id;
 			}
 		}
 		if ( false === $wpdb->insert( $wpdb->posts, $data ) ) {
 			if ( $wp_error ) {
-				return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error);
+				return new WP_Error( 'db_insert_error', __( 'Could not insert post into the database' ), $wpdb->last_error );
 			} else {
 				return 0;
 			}
@@ -3416,7 +3560,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 	// New-style support for all custom taxonomies.
 	if ( ! empty( $postarr['tax_input'] ) ) {
 		foreach ( $postarr['tax_input'] as $taxonomy => $tags ) {
-			$taxonomy_obj = get_taxonomy($taxonomy);
+			$taxonomy_obj = get_taxonomy( $taxonomy );
 			if ( ! $taxonomy_obj ) {
 				/* translators: %s: taxonomy name */
 				_doing_it_wrong( __FUNCTION__, sprintf( __( 'Invalid taxonomy: %s.' ), $taxonomy ), '4.4.0' );
@@ -3425,7 +3569,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 
 			// array = hierarchical, string = non-hierarchical.
 			if ( is_array( $tags ) ) {
-				$tags = array_filter($tags);
+				$tags = array_filter( $tags );
 			}
 			if ( current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
 				wp_set_post_terms( $post_ID, $tags, $taxonomy );
@@ -3483,7 +3627,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 
 	if ( ! empty( $postarr['page_template'] ) ) {
 		$post->page_template = $postarr['page_template'];
-		$page_templates = wp_get_theme()->get_page_templates( $post );
+		$page_templates      = wp_get_theme()->get_page_templates( $post );
 		if ( 'default' != $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
 			if ( $wp_error ) {
 				return new WP_Error( 'invalid_page_template', __( 'Invalid page template.' ) );
@@ -3543,7 +3687,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 		 * @param WP_Post $post    Post object.
 		 */
 		do_action( 'edit_post', $post_ID, $post );
-		$post_after = get_post($post_ID);
+		$post_after = get_post( $post_ID );
 
 		/**
 		 * Fires once an existing post has been updated.
@@ -3554,7 +3698,7 @@ function wp_insert_post( $postarr, $wp_error = false ) {
 		 * @param WP_Post $post_after   Post object following the update.
 		 * @param WP_Post $post_before  Post object before the update.
 		 */
-		do_action( 'post_updated', $post_ID, $post_after, $post_before);
+		do_action( 'post_updated', $post_ID, $post_after, $post_before );
 	}
 
 	/**
@@ -3610,48 +3754,52 @@ function wp_insert_post( $postarr, $wp_error = false ) {
  * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
  */
 function wp_update_post( $postarr = array(), $wp_error = false ) {
-	if ( is_object($postarr) ) {
+	if ( is_object( $postarr ) ) {
 		// Non-escaped post was passed.
-		$postarr = get_object_vars($postarr);
-		$postarr = wp_slash($postarr);
+		$postarr = get_object_vars( $postarr );
+		$postarr = wp_slash( $postarr );
 	}
 
 	// First, get all of the original fields.
-	$post = get_post($postarr['ID'], ARRAY_A);
+	$post = get_post( $postarr['ID'], ARRAY_A );
 
 	if ( is_null( $post ) ) {
-		if ( $wp_error )
+		if ( $wp_error ) {
 			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		}
 		return 0;
 	}
 
 	// Escape data pulled from DB.
-	$post = wp_slash($post);
+	$post = wp_slash( $post );
 
 	// Passed post category list overwrites existing category list if not empty.
-	if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
-			&& 0 != count($postarr['post_category']) )
+	if ( isset( $postarr['post_category'] ) && is_array( $postarr['post_category'] )
+			&& 0 != count( $postarr['post_category'] ) ) {
 		$post_cats = $postarr['post_category'];
-	else
+	} else {
 		$post_cats = $post['post_category'];
+	}
 
 	// Drafts shouldn't be assigned a date unless explicitly done so by the user.
-	if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-			('0000-00-00 00:00:00' == $post['post_date_gmt']) )
+	if ( isset( $post['post_status'] ) && in_array( $post['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) && empty( $postarr['edit_date'] ) &&
+			( '0000-00-00 00:00:00' == $post['post_date_gmt'] ) ) {
 		$clear_date = true;
-	else
+	} else {
 		$clear_date = false;
+	}
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$postarr = array_merge($post, $postarr);
+	$postarr                  = array_merge( $post, $postarr );
 	$postarr['post_category'] = $post_cats;
 	if ( $clear_date ) {
-		$postarr['post_date'] = current_time('mysql');
+		$postarr['post_date']     = current_time( 'mysql' );
 		$postarr['post_date_gmt'] = '';
 	}
 
-	if ($postarr['post_type'] == 'attachment')
-		return wp_insert_attachment($postarr);
+	if ( $postarr['post_type'] == 'attachment' ) {
+		return wp_insert_attachment( $postarr );
+	}
 
 	return wp_insert_post( $postarr, $wp_error );
 }
@@ -3668,17 +3816,19 @@ function wp_update_post( $postarr = array(), $wp_error = false ) {
 function wp_publish_post( $post ) {
 	global $wpdb;
 
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post( $post ) ) {
 		return;
+	}
 
-	if ( 'publish' == $post->post_status )
+	if ( 'publish' == $post->post_status ) {
 		return;
+	}
 
 	$wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
 
 	clean_post_cache( $post->ID );
 
-	$old_status = $post->post_status;
+	$old_status        = $post->post_status;
 	$post->post_status = 'publish';
 	wp_transition_post_status( 'publish', $old_status, $post );
 
@@ -3706,13 +3856,15 @@ function wp_publish_post( $post ) {
  * @param int|WP_Post $post_id Post ID or post object.
  */
 function check_and_publish_future_post( $post_id ) {
-	$post = get_post($post_id);
+	$post = get_post( $post_id );
 
-	if ( empty($post) )
+	if ( empty( $post ) ) {
 		return;
+	}
 
-	if ( 'future' != $post->post_status )
+	if ( 'future' != $post->post_status ) {
 		return;
+	}
 
 	$time = strtotime( $post->post_date_gmt . ' GMT' );
 
@@ -3743,20 +3895,22 @@ function check_and_publish_future_post( $post_id ) {
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
 function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) )
+	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) ) {
 		return $slug;
+	}
 
 	global $wpdb, $wp_rewrite;
 
 	$original_slug = $slug;
 
 	$feeds = $wp_rewrite->feeds;
-	if ( ! is_array( $feeds ) )
+	if ( ! is_array( $feeds ) ) {
 		$feeds = array();
+	}
 
 	if ( 'attachment' == $post_type ) {
 		// Attachment slugs must be unique across all types.
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
+		$check_sql       = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
 		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
 
 		/**
@@ -3770,21 +3924,22 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+				$alt_post_name   = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
 				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID ) );
 				$suffix++;
 			} while ( $post_name_check );
 			$slug = $alt_post_name;
 		}
 	} elseif ( is_post_type_hierarchical( $post_type ) ) {
-		if ( 'nav_menu_item' == $post_type )
+		if ( 'nav_menu_item' == $post_type ) {
 			return $slug;
+		}
 
 		/*
 		 * Page slugs must be unique within their own trees. Pages are in a separate
 		 * namespace than posts so page slugs are allowed to overlap post slugs.
 		 */
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
+		$check_sql       = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
 		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) );
 
 		/**
@@ -3797,10 +3952,10 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 		 * @param string $post_type   Post type.
 		 * @param int    $post_parent Post parent ID.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )  || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
+		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug ) || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+				$alt_post_name   = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
 				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );
 				$suffix++;
 			} while ( $post_name_check );
@@ -3808,11 +3963,11 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 		}
 	} else {
 		// Post slugs must be unique across all posts.
-		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
+		$check_sql       = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
 		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
 
 		// Prevent new post slugs that could result in URLs that conflict with date archives.
-		$post = get_post( $post_ID );
+		$post                        = get_post( $post_ID );
 		$conflicts_with_date_archive = false;
 		if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) {
 			$permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
@@ -3845,7 +4000,7 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+				$alt_post_name   = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
 				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
 				$suffix++;
 			} while ( $post_name_check );
@@ -3883,10 +4038,11 @@ function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_p
 function _truncate_post_slug( $slug, $length = 200 ) {
 	if ( strlen( $slug ) > $length ) {
 		$decoded_slug = urldecode( $slug );
-		if ( $decoded_slug === $slug )
+		if ( $decoded_slug === $slug ) {
 			$slug = substr( $slug, 0, $length );
-		else
+		} else {
 			$slug = utf8_uri_encode( $decoded_slug, $length );
+		}
 	}
 
 	return rtrim( $slug, '-' );
@@ -3905,7 +4061,7 @@ function _truncate_post_slug( $slug, $length = 200 ) {
  * @return array|false|WP_Error Array of affected term IDs. WP_Error or false on failure.
  */
 function wp_add_post_tags( $post_id = 0, $tags = '' ) {
-	return wp_set_post_tags($post_id, $tags, true);
+	return wp_set_post_tags( $post_id, $tags, true );
 }
 
 /**
@@ -3923,7 +4079,7 @@ function wp_add_post_tags( $post_id = 0, $tags = '' ) {
  * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
  */
 function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
-	return wp_set_post_terms( $post_id, $tags, 'post_tag', $append);
+	return wp_set_post_terms( $post_id, $tags, 'post_tag', $append );
 }
 
 /**
@@ -3944,16 +4100,19 @@ function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
 function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
 	$post_id = (int) $post_id;
 
-	if ( !$post_id )
+	if ( ! $post_id ) {
 		return false;
+	}
 
-	if ( empty($tags) )
+	if ( empty( $tags ) ) {
 		$tags = array();
+	}
 
 	if ( ! is_array( $tags ) ) {
 		$comma = _x( ',', 'tag delimiter' );
-		if ( ',' !== $comma )
+		if ( ',' !== $comma ) {
 			$tags = str_replace( $comma, ',', $tags );
+		}
 		$tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) );
 	}
 
@@ -3985,15 +4144,15 @@ function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $a
  * @return array|false|WP_Error Array of term taxonomy IDs of affected categories. WP_Error or false on failure.
  */
 function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $append = false ) {
-	$post_ID = (int) $post_ID;
-	$post_type = get_post_type( $post_ID );
+	$post_ID     = (int) $post_ID;
+	$post_type   = get_post_type( $post_ID );
 	$post_status = get_post_status( $post_ID );
 	// If $post_categories isn't already an array, make it one:
 	$post_categories = (array) $post_categories;
 	if ( empty( $post_categories ) ) {
 		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_categories = array( get_option('default_category') );
-			$append = false;
+			$post_categories = array( get_option( 'default_category' ) );
+			$append          = false;
 		} else {
 			$post_categories = array();
 		}
@@ -4101,11 +4260,10 @@ function add_ping( $post_id, $uri ) {
 
 	if ( is_array( $uri ) ) {
 		$pung = array_merge( $pung, $uri );
-	}
-	else {
+	} else {
 		$pung[] = $uri;
 	}
-	$new = implode("\n", $pung);
+	$new = implode( "\n", $pung );
 
 	/**
 	 * Filters the new ping URL to add for the given post.
@@ -4131,16 +4289,18 @@ function add_ping( $post_id, $uri ) {
  */
 function get_enclosed( $post_id ) {
 	$custom_fields = get_post_custom( $post_id );
-	$pung = array();
-	if ( !is_array( $custom_fields ) )
+	$pung          = array();
+	if ( ! is_array( $custom_fields ) ) {
 		return $pung;
+	}
 
 	foreach ( $custom_fields as $key => $val ) {
-		if ( 'enclosure' != $key || !is_array( $val ) )
+		if ( 'enclosure' != $key || ! is_array( $val ) ) {
 			continue;
+		}
 		foreach ( $val as $enc ) {
 			$enclosure = explode( "\n", $enc );
-			$pung[] = trim( $enclosure[ 0 ] );
+			$pung[]    = trim( $enclosure[0] );
 		}
 	}
 
@@ -4201,7 +4361,7 @@ function get_to_ping( $post_id ) {
 	}
 
 	$to_ping = sanitize_trackback_urls( $post->to_ping );
-	$to_ping = preg_split('/\s/', $to_ping, -1, PREG_SPLIT_NO_EMPTY);
+	$to_ping = preg_split( '/\s/', $to_ping, -1, PREG_SPLIT_NO_EMPTY );
 
 	/**
 	 * Filters the list of URLs yet to ping for the given post.
@@ -4257,10 +4417,10 @@ function trackback_url_list( $tb_list, $post_id ) {
 function get_all_page_ids() {
 	global $wpdb;
 
-	$page_ids = wp_cache_get('all_page_ids', 'posts');
+	$page_ids = wp_cache_get( 'all_page_ids', 'posts' );
 	if ( ! is_array( $page_ids ) ) {
-		$page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'page'");
-		wp_cache_add('all_page_ids', $page_ids, 'posts');
+		$page_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type = 'page'" );
+		wp_cache_add( 'all_page_ids', $page_ids, 'posts' );
 	}
 
 	return $page_ids;
@@ -4281,7 +4441,7 @@ function get_all_page_ids() {
  *                       'edit', 'db', 'display'. Default 'raw'.
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
-function get_page( $page, $output = OBJECT, $filter = 'raw') {
+function get_page( $page, $output = OBJECT, $filter = 'raw' ) {
 	return get_post( $page, $output, $filter );
 }
 
@@ -4303,9 +4463,9 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 
 	$last_changed = wp_cache_get_last_changed( 'posts' );
 
-	$hash = md5( $page_path . serialize( $post_type ) );
+	$hash      = md5( $page_path . serialize( $post_type ) );
 	$cache_key = "get_page_by_path:$hash:$last_changed";
-	$cached = wp_cache_get( $cache_key, 'posts' );
+	$cached    = wp_cache_get( $cache_key, 'posts' );
 	if ( false !== $cached ) {
 		// Special case: '0' is a bad `$page_path`.
 		if ( '0' === $cached || 0 === $cached ) {
@@ -4315,11 +4475,11 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 		}
 	}
 
-	$page_path = rawurlencode(urldecode($page_path));
-	$page_path = str_replace('%2F', '/', $page_path);
-	$page_path = str_replace('%20', ' ', $page_path);
-	$parts = explode( '/', trim( $page_path, '/' ) );
-	$parts = array_map( 'sanitize_title_for_query', $parts );
+	$page_path     = rawurlencode( urldecode( $page_path ) );
+	$page_path     = str_replace( '%2F', '/', $page_path );
+	$page_path     = str_replace( '%20', ' ', $page_path );
+	$parts         = explode( '/', trim( $page_path, '/' ) );
+	$parts         = array_map( 'sanitize_title_for_query', $parts );
 	$escaped_parts = esc_sql( $parts );
 
 	$in_string = "'" . implode( "','", $escaped_parts ) . "'";
@@ -4330,9 +4490,9 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 		$post_types = array( $post_type, 'attachment' );
 	}
 
-	$post_types = esc_sql( $post_types );
+	$post_types          = esc_sql( $post_types );
 	$post_type_in_string = "'" . implode( "','", $post_types ) . "'";
-	$sql = "
+	$sql                 = "
 		SELECT ID, post_name, post_parent, post_type
 		FROM $wpdb->posts
 		WHERE post_name IN ($in_string)
@@ -4347,7 +4507,7 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 	foreach ( (array) $pages as $page ) {
 		if ( $page->post_name == $revparts[0] ) {
 			$count = 0;
-			$p = $page;
+			$p     = $page;
 
 			/*
 			 * Loop through the given path parts from right to left,
@@ -4356,15 +4516,17 @@ function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
 			while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) {
 				$count++;
 				$parent = $pages[ $p->post_parent ];
-				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] )
+				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] ) {
 					break;
+				}
 				$p = $parent;
 			}
 
-			if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
+			if ( $p->post_parent == 0 && $count + 1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
 				$foundid = $page->ID;
-				if ( $page->post_type == $post_type )
+				if ( $page->post_type == $post_type ) {
 					break;
+				}
 			}
 		}
 	}
@@ -4394,21 +4556,25 @@ function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' )
 	global $wpdb;
 
 	if ( is_array( $post_type ) ) {
-		$post_type = esc_sql( $post_type );
+		$post_type           = esc_sql( $post_type );
 		$post_type_in_string = "'" . implode( "','", $post_type ) . "'";
-		$sql = $wpdb->prepare( "
+		$sql                 = $wpdb->prepare(
+			"
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type IN ($post_type_in_string)
-		", $page_title );
+		", $page_title
+		);
 	} else {
-		$sql = $wpdb->prepare( "
+		$sql = $wpdb->prepare(
+			"
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type = %s
-		", $page_title, $post_type );
+		", $page_title, $post_type
+		);
 	}
 
 	$page = $wpdb->get_var( $sql );
@@ -4444,7 +4610,7 @@ function get_page_children( $page_id, $pages ) {
 		$to_look = array_reverse( $children[ $page_id ] );
 
 		while ( $to_look ) {
-			$p = array_pop( $to_look );
+			$p           = array_pop( $to_look );
 			$page_list[] = $p;
 			if ( isset( $children[ $p->ID ] ) ) {
 				foreach ( array_reverse( $children[ $p->ID ] ) as $child ) {
@@ -4477,7 +4643,7 @@ function get_page_hierarchy( &$pages, $page_id = 0 ) {
 
 	$children = array();
 	foreach ( (array) $pages as $p ) {
-		$parent_id = intval( $p->post_parent );
+		$parent_id                = intval( $p->post_parent );
 		$children[ $parent_id ][] = $p;
 	}
 
@@ -4500,9 +4666,9 @@ function get_page_hierarchy( &$pages, $page_id = 0 ) {
  * @param array $children  Parent-children relations (passed by reference).
  * @param array $result    Result (passed by reference).
  */
-function _page_traverse_name( $page_id, &$children, &$result ){
-	if ( isset( $children[ $page_id ] ) ){
-		foreach ( (array)$children[ $page_id ] as $child ) {
+function _page_traverse_name( $page_id, &$children, &$result ) {
+	if ( isset( $children[ $page_id ] ) ) {
+		foreach ( (array) $children[ $page_id ] as $child ) {
 			$result[ $child->ID ] = $child->post_name;
 			_page_traverse_name( $child->ID, $children, $result );
 		}
@@ -4525,8 +4691,9 @@ function get_page_uri( $page = 0 ) {
 		$page = get_post( $page );
 	}
 
-	if ( ! $page )
+	if ( ! $page ) {
 		return false;
+	}
 
 	$uri = $page->post_name;
 
@@ -4613,15 +4780,15 @@ function get_pages( $args = array() ) {
 
 	$r = wp_parse_args( $args, $defaults );
 
-	$number = (int) $r['number'];
-	$offset = (int) $r['offset'];
-	$child_of = (int) $r['child_of'];
+	$number       = (int) $r['number'];
+	$offset       = (int) $r['offset'];
+	$child_of     = (int) $r['child_of'];
 	$hierarchical = $r['hierarchical'];
-	$exclude = $r['exclude'];
-	$meta_key = $r['meta_key'];
-	$meta_value = $r['meta_value'];
-	$parent = $r['parent'];
-	$post_status = $r['post_status'];
+	$exclude      = $r['exclude'];
+	$meta_key     = $r['meta_key'];
+	$meta_value   = $r['meta_value'];
+	$parent       = $r['parent'];
+	$post_status  = $r['post_status'];
 
 	// Make sure the post type is hierarchical.
 	$hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
@@ -4642,7 +4809,7 @@ function get_pages( $args = array() ) {
 	}
 
 	// $args can be whatever, only use the args defined in defaults to compute the key.
-	$key = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
+	$key          = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
 	$last_changed = wp_cache_get_last_changed( 'posts' );
 
 	$cache_key = "get_pages:$key:$last_changed";
@@ -4656,15 +4823,15 @@ function get_pages( $args = array() ) {
 
 	$inclusions = '';
 	if ( ! empty( $r['include'] ) ) {
-		$child_of = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
-		$parent = -1;
-		$exclude = '';
-		$meta_key = '';
-		$meta_value = '';
+		$child_of     = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
+		$parent       = -1;
+		$exclude      = '';
+		$meta_key     = '';
+		$meta_value   = '';
 		$hierarchical = false;
-		$incpages = wp_parse_id_list( $r['include'] );
+		$incpages     = wp_parse_id_list( $r['include'] );
 		if ( ! empty( $incpages ) ) {
-			$inclusions = ' AND ID IN (' . implode( ',', $incpages ) .  ')';
+			$inclusions = ' AND ID IN (' . implode( ',', $incpages ) . ')';
 		}
 	}
 
@@ -4672,7 +4839,7 @@ function get_pages( $args = array() ) {
 	if ( ! empty( $exclude ) ) {
 		$expages = wp_parse_id_list( $exclude );
 		if ( ! empty( $expages ) ) {
-			$exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) .  ')';
+			$exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) . ')';
 		}
 	}
 
@@ -4683,8 +4850,8 @@ function get_pages( $args = array() ) {
 		if ( ! empty( $post_authors ) ) {
 			foreach ( $post_authors as $post_author ) {
 				//Do we have an author id or an author login?
-				if ( 0 == intval($post_author) ) {
-					$post_author = get_user_by('login', $post_author);
+				if ( 0 == intval( $post_author ) ) {
+					$post_author = get_user_by( 'login', $post_author );
 					if ( empty( $post_author ) ) {
 						continue;
 					}
@@ -4695,9 +4862,9 @@ function get_pages( $args = array() ) {
 				}
 
 				if ( '' == $author_query ) {
-					$author_query = $wpdb->prepare(' post_author = %d ', $post_author);
+					$author_query = $wpdb->prepare( ' post_author = %d ', $post_author );
 				} else {
-					$author_query .= $wpdb->prepare(' OR post_author = %d ', $post_author);
+					$author_query .= $wpdb->prepare( ' OR post_author = %d ', $post_author );
 				}
 			}
 			if ( '' != $author_query ) {
@@ -4706,21 +4873,20 @@ function get_pages( $args = array() ) {
 		}
 	}
 
-	$join = '';
+	$join  = '';
 	$where = "$exclusions $inclusions ";
 	if ( '' !== $meta_key || '' !== $meta_value ) {
 		$join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )";
 
 		// meta_key and meta_value might be slashed
-		$meta_key = wp_unslash($meta_key);
-		$meta_value = wp_unslash($meta_value);
+		$meta_key   = wp_unslash( $meta_key );
+		$meta_value = wp_unslash( $meta_value );
 		if ( '' !== $meta_key ) {
-			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s", $meta_key);
+			$where .= $wpdb->prepare( " AND $wpdb->postmeta.meta_key = %s", $meta_key );
 		}
 		if ( '' !== $meta_value ) {
-			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_value = %s", $meta_value);
+			$where .= $wpdb->prepare( " AND $wpdb->postmeta.meta_value = %s", $meta_value );
 		}
-
 	}
 
 	if ( is_array( $parent ) ) {
@@ -4729,20 +4895,37 @@ function get_pages( $args = array() ) {
 			$where .= " AND post_parent IN ($post_parent__in)";
 		}
 	} elseif ( $parent >= 0 ) {
-		$where .= $wpdb->prepare(' AND post_parent = %d ', $parent);
+		$where .= $wpdb->prepare( ' AND post_parent = %d ', $parent );
 	}
 
 	if ( 1 == count( $post_status ) ) {
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], reset( $post_status ) );
+		$where_post_type = $wpdb->prepare( 'post_type = %s AND post_status = %s', $r['post_type'], reset( $post_status ) );
 	} else {
-		$post_status = implode( "', '", $post_status );
+		$post_status     = implode( "', '", $post_status );
 		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $r['post_type'] );
 	}
 
 	$orderby_array = array();
-	$allowed_keys = array( 'author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified',
-		'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent',
-		'ID', 'rand', 'comment_count' );
+	$allowed_keys  = array(
+		'author',
+		'post_author',
+		'date',
+		'post_date',
+		'title',
+		'post_title',
+		'name',
+		'post_name',
+		'modified',
+		'post_modified',
+		'modified_gmt',
+		'post_modified_gmt',
+		'menu_order',
+		'parent',
+		'post_parent',
+		'ID',
+		'rand',
+		'comment_count',
+	);
 
 	foreach ( explode( ',', $r['sort_column'] ) as $orderby ) {
 		$orderby = trim( $orderby );
@@ -4780,33 +4963,33 @@ function get_pages( $args = array() ) {
 		$sort_order = 'ASC';
 	}
 
-	$query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
+	$query  = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
 	$query .= $author_query;
-	$query .= " ORDER BY " . $sort_column . " " . $sort_order ;
+	$query .= ' ORDER BY ' . $sort_column . ' ' . $sort_order;
 
 	if ( ! empty( $number ) ) {
 		$query .= ' LIMIT ' . $offset . ',' . $number;
 	}
 
-	$pages = $wpdb->get_results($query);
+	$pages = $wpdb->get_results( $query );
 
-	if ( empty($pages) ) {
+	if ( empty( $pages ) ) {
 		/** This filter is documented in wp-includes/post.php */
 		$pages = apply_filters( 'get_pages', array(), $r );
 		return $pages;
 	}
 
 	// Sanitize before caching so it'll only get done once.
-	$num_pages = count($pages);
-	for ($i = 0; $i < $num_pages; $i++) {
-		$pages[$i] = sanitize_post($pages[$i], 'raw');
+	$num_pages = count( $pages );
+	for ( $i = 0; $i < $num_pages; $i++ ) {
+		$pages[ $i ] = sanitize_post( $pages[ $i ], 'raw' );
 	}
 
 	// Update cache.
 	update_post_cache( $pages );
 
 	if ( $child_of || $hierarchical ) {
-		$pages = get_page_children($child_of, $pages);
+		$pages = get_page_children( $child_of, $pages );
 	}
 
 	if ( ! empty( $r['exclude_tree'] ) ) {
@@ -4820,8 +5003,8 @@ function get_pages( $args = array() ) {
 
 		$num_pages = count( $pages );
 		for ( $i = 0; $i < $num_pages; $i++ ) {
-			if ( in_array( $pages[$i]->ID, $exclude ) ) {
-				unset( $pages[$i] );
+			if ( in_array( $pages[ $i ]->ID, $exclude ) ) {
+				unset( $pages[ $i ] );
 			}
 		}
 	}
@@ -4859,15 +5042,18 @@ function get_pages( $args = array() ) {
  * @param string $url URL to check
  * @return bool True on success, false on failure.
  */
-function is_local_attachment($url) {
-	if (strpos($url, home_url()) === false)
+function is_local_attachment( $url ) {
+	if ( strpos( $url, home_url() ) === false ) {
 		return false;
-	if (strpos($url, home_url('/?attachment_id=')) !== false)
+	}
+	if ( strpos( $url, home_url( '/?attachment_id=' ) ) !== false ) {
 		return true;
-	if ( $id = url_to_postid($url) ) {
-		$post = get_post($id);
-		if ( 'attachment' == $post->post_type )
+	}
+	if ( $id = url_to_postid( $url ) ) {
+		$post = get_post( $id );
+		if ( 'attachment' == $post->post_type ) {
 			return true;
+		}
 	}
 	return false;
 }
@@ -4900,7 +5086,7 @@ function is_local_attachment($url) {
 function wp_insert_attachment( $args, $file = false, $parent = 0, $wp_error = false ) {
 	$defaults = array(
 		'file'        => $file,
-		'post_parent' => 0
+		'post_parent' => 0,
 	);
 
 	$data = wp_parse_args( $args, $defaults );
@@ -4952,15 +5138,16 @@ function wp_delete_attachment( $post_id, $force_delete = false ) {
 		return wp_trash_post( $post_id );
 	}
 
-	delete_post_meta($post_id, '_wp_trash_meta_status');
-	delete_post_meta($post_id, '_wp_trash_meta_time');
+	delete_post_meta( $post_id, '_wp_trash_meta_status' );
+	delete_post_meta( $post_id, '_wp_trash_meta_time' );
 
-	$meta = wp_get_attachment_metadata( $post_id );
+	$meta         = wp_get_attachment_metadata( $post_id );
 	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
-	$file = get_attached_file( $post_id );
+	$file         = get_attached_file( $post_id );
 
-	if ( is_multisite() )
+	if ( is_multisite() ) {
 		delete_transient( 'dirsize_cache' );
+	}
 
 	/**
 	 * Fires before an attachment is deleted, at the start of wp_delete_attachment().
@@ -4971,24 +5158,25 @@ function wp_delete_attachment( $post_id, $force_delete = false ) {
 	 */
 	do_action( 'delete_attachment', $post_id );
 
-	wp_delete_object_term_relationships($post_id, array('category', 'post_tag'));
-	wp_delete_object_term_relationships($post_id, get_object_taxonomies($post->post_type));
+	wp_delete_object_term_relationships( $post_id, array( 'category', 'post_tag' ) );
+	wp_delete_object_term_relationships( $post_id, get_object_taxonomies( $post->post_type ) );
 
 	// Delete all for any posts.
 	delete_metadata( 'post', null, '_thumbnail_id', $post_id, true );
 
 	wp_defer_comment_counting( true );
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ));
+	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ) );
 	foreach ( $comment_ids as $comment_id ) {
 		wp_delete_comment( $comment_id, true );
 	}
 
 	wp_defer_comment_counting( false );
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));
-	foreach ( $post_meta_ids as $mid )
+	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ) );
+	foreach ( $post_meta_ids as $mid ) {
 		delete_metadata_by_mid( 'post', $mid );
+	}
 
 	/** This action is documented in wp-includes/post.php */
 	do_action( 'delete_post', $post_id );
@@ -5001,13 +5189,13 @@ function wp_delete_attachment( $post_id, $force_delete = false ) {
 
 	$uploadpath = wp_get_upload_dir();
 
-	if ( ! empty($meta['thumb']) ) {
+	if ( ! empty( $meta['thumb'] ) ) {
 		// Don't delete the thumb if another attachment uses it.
-		if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id)) ) {
-			$thumbfile = str_replace(basename($file), $meta['thumb'], $file);
+		if ( ! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id ) ) ) {
+			$thumbfile = str_replace( basename( $file ), $meta['thumb'], $file );
 			/** This filter is documented in wp-includes/functions.php */
 			$thumbfile = apply_filters( 'wp_delete_file', $thumbfile );
-			@ unlink( path_join($uploadpath['basedir'], $thumbfile) );
+			@ unlink( path_join( $uploadpath['basedir'], $thumbfile ) );
 		}
 	}
 
@@ -5021,12 +5209,12 @@ function wp_delete_attachment( $post_id, $force_delete = false ) {
 		}
 	}
 
-	if ( is_array($backup_sizes) ) {
+	if ( is_array( $backup_sizes ) ) {
 		foreach ( $backup_sizes as $size ) {
-			$del_file = path_join( dirname($meta['file']), $size['file'] );
+			$del_file = path_join( dirname( $meta['file'] ), $size['file'] );
 			/** This filter is documented in wp-includes/functions.php */
 			$del_file = apply_filters( 'wp_delete_file', $del_file );
-			@ unlink( path_join($uploadpath['basedir'], $del_file) );
+			@ unlink( path_join( $uploadpath['basedir'], $del_file ) );
 		}
 	}
 
@@ -5054,8 +5242,9 @@ function wp_get_attachment_metadata( $attachment_id = 0, $unfiltered = false ) {
 
 	$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
 
-	if ( $unfiltered )
+	if ( $unfiltered ) {
 		return $data;
+	}
 
 	/**
 	 * Filters the attachment meta data.
@@ -5092,10 +5281,11 @@ function wp_update_attachment_metadata( $attachment_id, $data ) {
 	 * @param array $data          Array of updated attachment meta data.
 	 * @param int   $attachment_id Attachment post ID.
 	 */
-	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) )
+	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) ) {
 		return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
-	else
+	} else {
 		return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
+	}
 }
 
 /**
@@ -5114,8 +5304,9 @@ function wp_get_attachment_url( $attachment_id = 0 ) {
 		return false;
 	}
 
-	if ( 'attachment' != $post->post_type )
+	if ( 'attachment' != $post->post_type ) {
 		return false;
+	}
 
 	$url = '';
 	// Get attached file.
@@ -5125,8 +5316,8 @@ function wp_get_attachment_url( $attachment_id = 0 ) {
 			// Check that the upload base exists in the file location.
 			if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
 				// Replace file location with url location.
-				$url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
-			} elseif ( false !== strpos($file, 'wp-content/uploads') ) {
+				$url = str_replace( $uploads['basedir'], $uploads['baseurl'], $file );
+			} elseif ( false !== strpos( $file, 'wp-content/uploads' ) ) {
 				// Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
 				$url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
 			} else {
@@ -5140,7 +5331,7 @@ function wp_get_attachment_url( $attachment_id = 0 ) {
 	 * If any of the above options failed, Fallback on the GUID as used pre-2.7,
 	 * not recommended to rely upon this.
 	 */
-	if ( empty($url) ) {
+	if ( empty( $url ) ) {
 		$url = get_the_guid( $post->ID );
 	}
 
@@ -5159,8 +5350,9 @@ function wp_get_attachment_url( $attachment_id = 0 ) {
 	 */
 	$url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
 
-	if ( empty( $url ) )
+	if ( empty( $url ) ) {
 		return false;
+	}
 
 	return $url;
 }
@@ -5206,14 +5398,16 @@ function wp_get_attachment_caption( $post_id = 0 ) {
  */
 function wp_get_attachment_thumb_file( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post( $post_id ) ) {
 		return false;
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
+	}
+	if ( ! is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) ) {
 		return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
-	if ( !empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile) ) {
+	if ( ! empty( $imagedata['thumb'] ) && ( $thumbfile = str_replace( basename( $file ), $imagedata['thumb'], $file ) ) && file_exists( $thumbfile ) ) {
 		/**
 		 * Filters the attachment thumbnail file path.
 		 *
@@ -5237,19 +5431,23 @@ function wp_get_attachment_thumb_file( $post_id = 0 ) {
  */
 function wp_get_attachment_thumb_url( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post( $post_id ) ) {
 		return false;
-	if ( !$url = wp_get_attachment_url( $post->ID ) )
+	}
+	if ( ! $url = wp_get_attachment_url( $post->ID ) ) {
 		return false;
+	}
 
 	$sized = image_downsize( $post_id, 'thumbnail' );
-	if ( $sized )
+	if ( $sized ) {
 		return $sized[0];
+	}
 
-	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) )
+	if ( ! $thumb = wp_get_attachment_thumb_file( $post->ID ) ) {
 		return false;
+	}
 
-	$url = str_replace(basename($url), basename($thumb), $url);
+	$url = str_replace( basename( $url ), basename( $thumb ), $url );
 
 	/**
 	 * Filters the attachment thumbnail URL.
@@ -5296,18 +5494,18 @@ function wp_attachment_is( $type, $post = null ) {
 	}
 
 	switch ( $type ) {
-	case 'image':
-		$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-		return in_array( $ext, $image_exts );
+		case 'image':
+			$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+			return in_array( $ext, $image_exts );
 
-	case 'audio':
-		return in_array( $ext, wp_get_audio_extensions() );
+		case 'audio':
+			return in_array( $ext, wp_get_audio_extensions() );
 
-	case 'video':
-		return in_array( $ext, wp_get_video_extensions() );
+		case 'video':
+			return in_array( $ext, wp_get_video_extensions() );
 
-	default:
-		return $type === $ext;
+		default:
+			return $type === $ext;
 	}
 }
 
@@ -5334,22 +5532,24 @@ function wp_attachment_is_image( $post = null ) {
  * @return string|false Icon, false otherwise.
  */
 function wp_mime_type_icon( $mime = 0 ) {
-	if ( !is_numeric($mime) )
-		$icon = wp_cache_get("mime_type_icon_$mime");
+	if ( ! is_numeric( $mime ) ) {
+		$icon = wp_cache_get( "mime_type_icon_$mime" );
+	}
 
 	$post_id = 0;
-	if ( empty($icon) ) {
+	if ( empty( $icon ) ) {
 		$post_mimes = array();
-		if ( is_numeric($mime) ) {
+		if ( is_numeric( $mime ) ) {
 			$mime = (int) $mime;
 			if ( $post = get_post( $mime ) ) {
 				$post_id = (int) $post->ID;
-				$file = get_attached_file( $post_id );
-				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
-				if ( !empty($ext) ) {
+				$file    = get_attached_file( $post_id );
+				$ext     = preg_replace( '/^.+?\.([^.]+)$/', '$1', $file );
+				if ( ! empty( $ext ) ) {
 					$post_mimes[] = $ext;
-					if ( $ext_type = wp_ext2type( $ext ) )
+					if ( $ext_type = wp_ext2type( $ext ) ) {
 						$post_mimes[] = $ext_type;
+					}
 				}
 				$mime = $post->post_mime_type;
 			} else {
@@ -5359,9 +5559,9 @@ function wp_mime_type_icon( $mime = 0 ) {
 			$post_mimes[] = $mime;
 		}
 
-		$icon_files = wp_cache_get('icon_files');
+		$icon_files = wp_cache_get( 'icon_files' );
 
-		if ( !is_array($icon_files) ) {
+		if ( ! is_array( $icon_files ) ) {
 			/**
 			 * Filters the icon directory path.
 			 *
@@ -5387,25 +5587,27 @@ function wp_mime_type_icon( $mime = 0 ) {
 			 *
 			 * @param array $uris List of icon directory URIs.
 			 */
-			$dirs = apply_filters( 'icon_dirs', array( $icon_dir => $icon_dir_uri ) );
+			$dirs       = apply_filters( 'icon_dirs', array( $icon_dir => $icon_dir_uri ) );
 			$icon_files = array();
 			while ( $dirs ) {
 				$keys = array_keys( $dirs );
-				$dir = array_shift( $keys );
-				$uri = array_shift($dirs);
-				if ( $dh = opendir($dir) ) {
-					while ( false !== $file = readdir($dh) ) {
-						$file = basename($file);
-						if ( substr($file, 0, 1) == '.' )
-							continue;
-						if ( !in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg') ) ) {
-							if ( is_dir("$dir/$file") )
-								$dirs["$dir/$file"] = "$uri/$file";
+				$dir  = array_shift( $keys );
+				$uri  = array_shift( $dirs );
+				if ( $dh = opendir( $dir ) ) {
+					while ( false !== $file = readdir( $dh ) ) {
+						$file = basename( $file );
+						if ( substr( $file, 0, 1 ) == '.' ) {
 							continue;
 						}
-						$icon_files["$dir/$file"] = "$uri/$file";
+						if ( ! in_array( strtolower( substr( $file, -4 ) ), array( '.png', '.gif', '.jpg' ) ) ) {
+							if ( is_dir( "$dir/$file" ) ) {
+								$dirs[ "$dir/$file" ] = "$uri/$file";
+							}
+							continue;
+						}
+						$icon_files[ "$dir/$file" ] = "$uri/$file";
 					}
-					closedir($dh);
+					closedir( $dh );
 				}
 			}
 			wp_cache_add( 'icon_files', $icon_files, 'default', 600 );
@@ -5413,17 +5615,18 @@ function wp_mime_type_icon( $mime = 0 ) {
 
 		$types = array();
 		// Icon basename - extension = MIME wildcard.
-		foreach ( $icon_files as $file => $uri )
-			$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
-
-		if ( ! empty($mime) ) {
-			$post_mimes[] = substr($mime, 0, strpos($mime, '/'));
-			$post_mimes[] = substr($mime, strpos($mime, '/') + 1);
-			$post_mimes[] = str_replace('/', '_', $mime);
+		foreach ( $icon_files as $file => $uri ) {
+			$types[ preg_replace( '/^([^.]*).*$/', '$1', basename( $file ) ) ] =& $icon_files[ $file ];
 		}
 
-		$matches = wp_match_mime_types(array_keys($types), $post_mimes);
-		$matches['default'] = array('default');
+		if ( ! empty( $mime ) ) {
+			$post_mimes[] = substr( $mime, 0, strpos( $mime, '/' ) );
+			$post_mimes[] = substr( $mime, strpos( $mime, '/' ) + 1 );
+			$post_mimes[] = str_replace( '/', '_', $mime );
+		}
+
+		$matches            = wp_match_mime_types( array_keys( $types ), $post_mimes );
+		$matches['default'] = array( 'default' );
 
 		foreach ( $matches as $match => $wilds ) {
 			foreach ( $wilds as $wild ) {
@@ -5584,7 +5787,7 @@ function get_posts_by_author_sql( $post_type, $full = true, $post_author = null,
 		return $full ? 'WHERE 1 = 0' : '1 = 0';
 	}
 
-	$sql = '( '. implode( ' OR ', $post_type_clauses ) . ' )';
+	$sql = '( ' . implode( ' OR ', $post_type_clauses ) . ' )';
 
 	if ( null !== $post_author ) {
 		$sql .= $wpdb->prepare( ' AND post_author = %d', $post_author );
@@ -5663,7 +5866,7 @@ function get_lastpostmodified( $timezone = 'server', $post_type = 'any' ) {
 
 	$lastpostmodified = _get_last_post_time( $timezone, 'modified', $post_type );
 
-	$lastpostdate = get_lastpostdate($timezone);
+	$lastpostdate = get_lastpostdate( $timezone );
 	if ( $lastpostdate > $lastpostmodified ) {
 		$lastpostmodified = $lastpostdate;
 	}
@@ -5724,14 +5927,14 @@ function _get_last_post_time( $timezone, $field, $post_type = 'any' ) {
 
 	switch ( $timezone ) {
 		case 'gmt':
-			$date = $wpdb->get_var("SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+			$date = $wpdb->get_var( "SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1" );
 			break;
 		case 'blog':
-			$date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+			$date = $wpdb->get_var( "SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1" );
 			break;
 		case 'server':
 			$add_seconds_server = date( 'Z' );
-			$date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
+			$date               = $wpdb->get_var( "SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1" );
 			break;
 	}
 
@@ -5752,11 +5955,13 @@ function _get_last_post_time( $timezone, $field, $post_type = 'any' ) {
  * @param array $posts Array of post objects (passed by reference).
  */
 function update_post_cache( &$posts ) {
-	if ( ! $posts )
+	if ( ! $posts ) {
 		return;
+	}
 
-	foreach ( $posts as $post )
+	foreach ( $posts as $post ) {
 		wp_cache_add( $post->ID, $post, 'posts' );
+	}
 }
 
 /**
@@ -5777,12 +5982,14 @@ function update_post_cache( &$posts ) {
 function clean_post_cache( $post ) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) )
+	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
 		return;
+	}
 
 	$post = get_post( $post );
-	if ( empty( $post ) )
+	if ( empty( $post ) ) {
 		return;
+	}
 
 	wp_cache_delete( $post->ID, 'posts' );
 	wp_cache_delete( $post->ID, 'post_meta' );
@@ -5829,20 +6036,23 @@ function clean_post_cache( $post ) {
  */
 function update_post_caches( &$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true ) {
 	// No point in doing all this work if we didn't match any posts.
-	if ( !$posts )
+	if ( ! $posts ) {
 		return;
+	}
 
-	update_post_cache($posts);
+	update_post_cache( $posts );
 
 	$post_ids = array();
-	foreach ( $posts as $post )
+	foreach ( $posts as $post ) {
 		$post_ids[] = $post->ID;
+	}
 
-	if ( ! $post_type )
+	if ( ! $post_type ) {
 		$post_type = 'any';
+	}
 
 	if ( $update_term_cache ) {
-		if ( is_array($post_type) ) {
+		if ( is_array( $post_type ) ) {
 			$ptypes = $post_type;
 		} elseif ( 'any' == $post_type ) {
 			$ptypes = array();
@@ -5850,17 +6060,19 @@ function update_post_caches( &$posts, $post_type = 'post', $update_term_cache =
 			foreach ( $posts as $post ) {
 				$ptypes[] = $post->post_type;
 			}
-			$ptypes = array_unique($ptypes);
+			$ptypes = array_unique( $ptypes );
 		} else {
-			$ptypes = array($post_type);
+			$ptypes = array( $post_type );
 		}
 
-		if ( ! empty($ptypes) )
-			update_object_term_cache($post_ids, $ptypes);
+		if ( ! empty( $ptypes ) ) {
+			update_object_term_cache( $post_ids, $ptypes );
+		}
 	}
 
-	if ( $update_meta_cache )
-		update_postmeta_cache($post_ids);
+	if ( $update_meta_cache ) {
+		update_postmeta_cache( $post_ids );
+	}
 }
 
 /**
@@ -5877,7 +6089,7 @@ function update_post_caches( &$posts, $post_type = 'post', $update_term_cache =
  *                     of metadata.
  */
 function update_postmeta_cache( $post_ids ) {
-	return update_meta_cache('post', $post_ids);
+	return update_meta_cache( 'post', $post_ids );
 }
 
 /**
@@ -5898,16 +6110,18 @@ function update_postmeta_cache( $post_ids ) {
 function clean_attachment_cache( $id, $clean_terms = false ) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( !empty($_wp_suspend_cache_invalidation) )
+	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
 		return;
+	}
 
 	$id = (int) $id;
 
-	wp_cache_delete($id, 'posts');
-	wp_cache_delete($id, 'post_meta');
+	wp_cache_delete( $id, 'posts' );
+	wp_cache_delete( $id, 'post_meta' );
 
-	if ( $clean_terms )
-		clean_object_term_cache($id, 'attachment');
+	if ( $clean_terms ) {
+		clean_object_term_cache( $id, 'attachment' );
+	}
 
 	/**
 	 * Fires after the given attachment's cache is cleaned.
@@ -5941,8 +6155,9 @@ function _transition_post_status( $new_status, $old_status, $post ) {
 
 	if ( $old_status != 'publish' && $new_status == 'publish' ) {
 		// Reset GUID if transitioning to publish and it is empty.
-		if ( '' == get_the_guid($post->ID) )
+		if ( '' == get_the_guid( $post->ID ) ) {
 			$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		}
 
 		/**
 		 * Fires when a post's status is transitioned from private to published.
@@ -5952,11 +6167,11 @@ function _transition_post_status( $new_status, $old_status, $post ) {
 		 *
 		 * @param int $post_id Post ID.
 		 */
-		do_action('private_to_published', $post->ID);
+		do_action( 'private_to_published', $post->ID );
 	}
 
 	// If published posts changed clear the lastpostmodified cache.
-	if ( 'publish' == $new_status || 'publish' == $old_status) {
+	if ( 'publish' == $new_status || 'publish' == $old_status ) {
 		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
 			wp_cache_delete( "lastpostmodified:$timezone", 'timeinfo' );
 			wp_cache_delete( "lastpostdate:$timezone", 'timeinfo' );
@@ -5970,7 +6185,7 @@ function _transition_post_status( $new_status, $old_status, $post ) {
 	}
 
 	// Always clears the hook in case the post status bounced from future to draft.
-	wp_clear_scheduled_hook('publish_future_post', array( $post->ID ) );
+	wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
 }
 
 /**
@@ -5988,7 +6203,7 @@ function _transition_post_status( $new_status, $old_status, $post ) {
  */
 function _future_post_hook( $deprecated, $post ) {
 	wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
-	wp_schedule_single_event( strtotime( get_gmt_from_date( $post->post_date ) . ' GMT') , 'publish_future_post', array( $post->ID ) );
+	wp_schedule_single_event( strtotime( get_gmt_from_date( $post->post_date ) . ' GMT' ), 'publish_future_post', array( $post->ID ) );
 }
 
 /**
@@ -6013,11 +6228,13 @@ function _publish_post_hook( $post_id ) {
 		do_action( 'xmlrpc_publish_post', $post_id );
 	}
 
-	if ( defined('WP_IMPORTING') )
+	if ( defined( 'WP_IMPORTING' ) ) {
 		return;
+	}
 
-	if ( get_option('default_pingback_flag') )
+	if ( get_option( 'default_pingback_flag' ) ) {
 		add_post_meta( $post_id, '_pingme', '1' );
+	}
 	add_post_meta( $post_id, '_encloseme', '1' );
 
 	if ( ! wp_next_scheduled( 'do_pings' ) ) {
@@ -6036,8 +6253,9 @@ function _publish_post_hook( $post_id ) {
  */
 function wp_get_post_parent_id( $post_ID ) {
 	$post = get_post( $post_ID );
-	if ( !$post || is_wp_error( $post ) )
+	if ( ! $post || is_wp_error( $post ) ) {
 		return false;
+	}
 	return (int) $post->post_parent;
 }
 
@@ -6057,28 +6275,39 @@ function wp_get_post_parent_id( $post_ID ) {
  */
 function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
 	// Nothing fancy here - bail.
-	if ( !$post_parent )
+	if ( ! $post_parent ) {
 		return 0;
+	}
 
 	// New post can't cause a loop.
-	if ( empty( $post_ID ) )
+	if ( empty( $post_ID ) ) {
 		return $post_parent;
+	}
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_ID )
+	if ( $post_parent == $post_ID ) {
 		return 0;
+	}
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) )
+	if ( ! $loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) ) {
 		return $post_parent; // No loop
+	}
 
 	// Setting $post_parent to the given value causes a loop.
-	if ( isset( $loop[$post_ID] ) )
+	if ( isset( $loop[ $post_ID ] ) ) {
 		return 0;
+	}
 
 	// There's a loop, but it doesn't contain $post_ID. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	foreach ( array_keys( $loop ) as $loop_member ) {
+		wp_update_post(
+			array(
+				'ID'          => $loop_member,
+				'post_parent' => 0,
+			)
+		);
+	}
 
 	return $post_parent;
 }
@@ -6093,13 +6322,14 @@ function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
  * @return int|bool True on success, false on failure.
  */
 function set_post_thumbnail( $post, $thumbnail_id ) {
-	$post = get_post( $post );
+	$post         = get_post( $post );
 	$thumbnail_id = absint( $thumbnail_id );
 	if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
-		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) )
+		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) ) {
 			return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
-		else
+		} else {
 			return delete_post_meta( $post->ID, '_thumbnail_id' );
+		}
 	}
 	return false;
 }
@@ -6114,8 +6344,9 @@ function set_post_thumbnail( $post, $thumbnail_id ) {
  */
 function delete_post_thumbnail( $post ) {
 	$post = get_post( $post );
-	if ( $post )
+	if ( $post ) {
 		return delete_post_meta( $post->ID, '_thumbnail_id' );
+	}
 	return false;
 }
 
@@ -6213,8 +6444,8 @@ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache
 	global $wpdb;
 
 	$non_cached_ids = _get_non_cached_ids( $ids, 'posts' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join( ",", $non_cached_ids ) ) );
+	if ( ! empty( $non_cached_ids ) ) {
+		$fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join( ',', $non_cached_ids ) ) );
 
 		update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
 	}
@@ -6235,13 +6466,15 @@ function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache
  * @param string $post_ID   Optional. Post ID that should be ignored. Default 0.
  */
 function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
-	$trashed_posts_with_desired_slug = get_posts( array(
-		'name' => $post_name,
-		'post_status' => 'trash',
-		'post_type' => 'any',
-		'nopaging' => true,
-		'post__not_in' => array( $post_ID )
-	) );
+	$trashed_posts_with_desired_slug = get_posts(
+		array(
+			'name'         => $post_name,
+			'post_status'  => 'trash',
+			'post_type'    => 'any',
+			'nopaging'     => true,
+			'post__not_in' => array( $post_ID ),
+		)
+	);
 
 	if ( ! empty( $trashed_posts_with_desired_slug ) ) {
 		foreach ( $trashed_posts_with_desired_slug as $_post ) {
@@ -6302,8 +6535,9 @@ function _filter_query_attachment_filenames( $clauses ) {
 
 	$clauses['where'] = preg_replace(
 		"/\({$wpdb->posts}.post_content (NOT LIKE|LIKE) (\'[^']+\')\)/",
-		"$0 OR ( sq1.meta_value $1 $2 )",
-		$clauses['where'] );
+		'$0 OR ( sq1.meta_value $1 $2 )',
+		$clauses['where']
+	);
 
 	return $clauses;
 }
diff --git a/wp-includes/query.php b/wp-includes/query.php
index 0ed1fab575..e689828c21 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -93,9 +93,9 @@ function set_query_var( $var, $value ) {
  * @param array|string $query Array or string of WP_Query arguments.
  * @return array List of post objects.
  */
-function query_posts($query) {
+function query_posts( $query ) {
 	$GLOBALS['wp_query'] = new WP_Query();
-	return $GLOBALS['wp_query']->query($query);
+	return $GLOBALS['wp_query']->query( $query );
 }
 
 /**
@@ -873,18 +873,18 @@ function wp_old_slug_redirect() {
 			return;
 		}
 
-		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, get_query_var( 'name' ) );
+		$query = $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, get_query_var( 'name' ) );
 
 		// 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 );
@@ -897,7 +897,7 @@ function wp_old_slug_redirect() {
 
 		if ( get_query_var( 'paged' ) > 1 ) {
 			$link = user_trailingslashit( trailingslashit( $link ) . 'page/' . get_query_var( 'paged' ) );
-		} elseif( is_embed() ) {
+		} elseif ( is_embed() ) {
 			$link = user_trailingslashit( trailingslashit( $link ) . 'embed' );
 		}
 
diff --git a/wp-includes/registration-functions.php b/wp-includes/registration-functions.php
index 2054885f1c..d48fa27466 100644
--- a/wp-includes/registration-functions.php
+++ b/wp-includes/registration-functions.php
@@ -4,4 +4,4 @@
  *
  * @package WordPress
  */
-_deprecated_file( basename(__FILE__), '2.1.0', null, __( 'This file no longer needs to be included.' ) );
+_deprecated_file( basename( __FILE__ ), '2.1.0', null, __( 'This file no longer needs to be included.' ) );
diff --git a/wp-includes/registration.php b/wp-includes/registration.php
index aa05672dde..c346c1145e 100644
--- a/wp-includes/registration.php
+++ b/wp-includes/registration.php
@@ -4,4 +4,4 @@
  *
  * @package WordPress
  */
-_deprecated_file( basename(__FILE__), '3.1.0', null, __( 'This file no longer needs to be included.' ) );
+_deprecated_file( basename( __FILE__ ), '3.1.0', null, __( 'This file no longer needs to be included.' ) );
diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php
index cba8182af4..0cce9fa62f 100644
--- a/wp-includes/rest-api.php
+++ b/wp-includes/rest-api.php
@@ -36,7 +36,7 @@ function register_rest_route( $namespace, $route, $args = array(), $override = f
 		 */
 		_doing_it_wrong( 'register_rest_route', __( 'Routes must be namespaced with plugin or theme name and version.' ), '4.4.0' );
 		return false;
-	} else if ( empty( $route ) ) {
+	} elseif ( empty( $route ) ) {
 		_doing_it_wrong( 'register_rest_route', __( 'Route must be specified.' ), '4.4.0' );
 		return false;
 	}
@@ -54,9 +54,9 @@ function register_rest_route( $namespace, $route, $args = array(), $override = f
 	}
 
 	$defaults = array(
-		'methods'         => 'GET',
-		'callback'        => null,
-		'args'            => array(),
+		'methods'  => 'GET',
+		'callback' => null,
+		'args'     => array(),
 	);
 	foreach ( $args as $key => &$arg_group ) {
 		if ( ! is_numeric( $key ) ) {
@@ -64,7 +64,7 @@ function register_rest_route( $namespace, $route, $args = array(), $override = f
 			continue;
 		}
 
-		$arg_group = array_merge( $defaults, $arg_group );
+		$arg_group         = array_merge( $defaults, $arg_group );
 		$arg_group['args'] = array_merge( $common_args, $arg_group['args'] );
 	}
 
@@ -141,10 +141,10 @@ function rest_api_init() {
 function rest_api_register_rewrites() {
 	global $wp_rewrite;
 
-	add_rewrite_rule( '^' . rest_get_url_prefix() . '/?$','index.php?rest_route=/','top' );
-	add_rewrite_rule( '^' . rest_get_url_prefix() . '/(.*)?','index.php?rest_route=/$matches[1]','top' );
-	add_rewrite_rule( '^' . $wp_rewrite->index . '/' . rest_get_url_prefix() . '/?$','index.php?rest_route=/','top' );
-	add_rewrite_rule( '^' . $wp_rewrite->index . '/' . rest_get_url_prefix() . '/(.*)?','index.php?rest_route=/$matches[1]','top' );
+	add_rewrite_rule( '^' . rest_get_url_prefix() . '/?$', 'index.php?rest_route=/', 'top' );
+	add_rewrite_rule( '^' . rest_get_url_prefix() . '/(.*)?', 'index.php?rest_route=/$matches[1]', 'top' );
+	add_rewrite_rule( '^' . $wp_rewrite->index . '/' . rest_get_url_prefix() . '/?$', 'index.php?rest_route=/', 'top' );
+	add_rewrite_rule( '^' . $wp_rewrite->index . '/' . rest_get_url_prefix() . '/(.*)?', 'index.php?rest_route=/$matches[1]', 'top' );
 }
 
 /**
@@ -417,7 +417,7 @@ function rest_get_server() {
 		 * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
 		 */
 		$wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
-		$wp_rest_server = new $wp_rest_server_class;
+		$wp_rest_server       = new $wp_rest_server_class;
 
 		/**
 		 * Fires when preparing to serve an API request.
@@ -569,7 +569,7 @@ function rest_handle_options_request( $response, $handler, $request ) {
 	}
 
 	$response = new WP_REST_Response();
-	$data = array();
+	$data     = array();
 
 	foreach ( $handler->get_routes() as $route => $endpoints ) {
 		$match = preg_match( '@^' . $route . '$@i', $request->get_route() );
@@ -651,7 +651,7 @@ function rest_filter_response_fields( $response, $server, $request ) {
 
 	$data = $response->get_data();
 
-	$fields = is_array( $request['_fields']  ) ? $request['_fields'] : preg_split( '/[\s,]+/', $request['_fields'] );
+	$fields = is_array( $request['_fields'] ) ? $request['_fields'] : preg_split( '/[\s,]+/', $request['_fields'] );
 
 	if ( 0 === count( $fields ) ) {
 		return $response;
@@ -867,9 +867,9 @@ function rest_get_date_with_gmt( $date, $is_utc = false ) {
 	// cases.
 	if ( ! $is_utc && ! $has_timezone ) {
 		$local = date( 'Y-m-d H:i:s', $date );
-		$utc = get_gmt_from_date( $local );
+		$utc   = get_gmt_from_date( $local );
 	} else {
-		$utc = date( 'Y-m-d H:i:s', $date );
+		$utc   = date( 'Y-m-d H:i:s', $date );
 		$local = get_date_from_gmt( $utc );
 	}
 
@@ -982,7 +982,7 @@ function rest_is_ip_address( $ip ) {
  */
 function rest_sanitize_boolean( $value ) {
 	// String values are translated to `true`; make sure 'false' is false.
-	if ( is_string( $value )  ) {
+	if ( is_string( $value ) ) {
 		$value = strtolower( $value );
 		if ( in_array( $value, array( 'false', '0' ), true ) ) {
 			$value = false;
@@ -1146,18 +1146,18 @@ function rest_validate_value_from_schema( $value, $args, $param = '' ) {
 
 	if ( isset( $args['format'] ) ) {
 		switch ( $args['format'] ) {
-			case 'date-time' :
+			case 'date-time':
 				if ( ! rest_parse_date( $value ) ) {
 					return new WP_Error( 'rest_invalid_date', __( 'Invalid date.' ) );
 				}
 				break;
 
-			case 'email' :
+			case 'email':
 				if ( ! is_email( $value ) ) {
 					return new WP_Error( 'rest_invalid_email', __( 'Invalid email address.' ) );
 				}
 				break;
-			case 'ip' :
+			case 'ip':
 				if ( ! rest_is_ip_address( $value ) ) {
 					/* translators: %s: IP address */
 					return new WP_Error( 'rest_invalid_param', sprintf( __( '%s is not a valid IP address.' ), $value ) );
@@ -1270,19 +1270,19 @@ function rest_sanitize_value_from_schema( $value, $args ) {
 
 	if ( isset( $args['format'] ) ) {
 		switch ( $args['format'] ) {
-			case 'date-time' :
+			case 'date-time':
 				return sanitize_text_field( $value );
 
-			case 'email' :
+			case 'email':
 				/*
 				 * sanitize_email() validates, which would be unexpected.
 				 */
 				return sanitize_text_field( $value );
 
-			case 'uri' :
+			case 'uri':
 				return esc_url_raw( $value );
 
-			case 'ip' :
+			case 'ip':
 				return sanitize_text_field( $value );
 		}
 	}
diff --git a/wp-includes/rest-api/class-wp-rest-request.php b/wp-includes/rest-api/class-wp-rest-request.php
index f9c6317896..49e119ddc3 100644
--- a/wp-includes/rest-api/class-wp-rest-request.php
+++ b/wp-includes/rest-api/class-wp-rest-request.php
@@ -111,13 +111,13 @@ class WP_REST_Request implements ArrayAccess {
 	 */
 	public function __construct( $method = '', $route = '', $attributes = array() ) {
 		$this->params = array(
-			'URL'   => array(),
-			'GET'   => array(),
-			'POST'  => array(),
-			'FILES' => array(),
+			'URL'      => array(),
+			'GET'      => array(),
+			'POST'     => array(),
+			'FILES'    => array(),
 
 			// See parse_json_params.
-			'JSON'  => null,
+			'JSON'     => null,
 
 			'defaults' => array(),
 		);
@@ -235,7 +235,7 @@ class WP_REST_Request implements ArrayAccess {
 	 * @param string $value Header value, or list of values.
 	 */
 	public function set_header( $key, $value ) {
-		$key = $this->canonicalize_header_name( $key );
+		$key   = $this->canonicalize_header_name( $key );
 		$value = (array) $value;
 
 		$this->headers[ $key ] = $value;
@@ -250,7 +250,7 @@ class WP_REST_Request implements ArrayAccess {
 	 * @param string $value Header value, or list of values.
 	 */
 	public function add_header( $key, $value ) {
-		$key = $this->canonicalize_header_name( $key );
+		$key   = $this->canonicalize_header_name( $key );
 		$value = (array) $value;
 
 		if ( ! isset( $this->headers[ $key ] ) ) {
@@ -368,7 +368,7 @@ class WP_REST_Request implements ArrayAccess {
 		 * @param array           $order {
 		 *    An array of types to check, in order of priority.
 		 *
-		 *    @param string $type The type to check.
+		 * @param string $type The type to check.
 		 * }
 		 * @param WP_REST_Request $this The request object.
 		 */
@@ -405,7 +405,7 @@ class WP_REST_Request implements ArrayAccess {
 	 * @param mixed  $value Parameter value.
 	 */
 	public function set_param( $key, $value ) {
-		$order = $this->get_parameter_order();
+		$order                             = $this->get_parameter_order();
 		$this->params[ $order[0] ][ $key ] = $value;
 	}
 
@@ -587,8 +587,8 @@ class WP_REST_Request implements ArrayAccess {
 		$this->body = $data;
 
 		// Enable lazy parsing.
-		$this->parsed_json = false;
-		$this->parsed_body = false;
+		$this->parsed_json    = false;
+		$this->parsed_body    = false;
 		$this->params['JSON'] = null;
 	}
 
@@ -650,7 +650,7 @@ class WP_REST_Request implements ArrayAccess {
 				'status' => WP_Http::BAD_REQUEST,
 			);
 			if ( function_exists( 'json_last_error' ) ) {
-				$error_data['json_error_code'] = json_last_error();
+				$error_data['json_error_code']    = json_last_error();
 				$error_data['json_error_message'] = json_last_error_msg();
 			}
 
@@ -802,7 +802,12 @@ 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( 'status' => 400, 'params' => $invalid_params ) );
+			return new WP_Error(
+				'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
+					'status' => 400,
+					'params' => $invalid_params,
+				)
+			);
 		}
 
 		return true;
@@ -824,7 +829,7 @@ class WP_REST_Request implements ArrayAccess {
 		}
 
 		$attributes = $this->get_attributes();
-		$required = array();
+		$required   = array();
 
 		// No arguments set, skip validation.
 		if ( empty( $attributes['args'] ) ) {
@@ -840,7 +845,12 @@ 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( 'status' => 400, 'params' => $required ) );
+			return new WP_Error(
+				'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array(
+					'status' => 400,
+					'params' => $required,
+				)
+			);
 		}
 
 		/*
@@ -868,7 +878,12 @@ 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( 'status' => 400, 'params' => $invalid_params ) );
+			return new WP_Error(
+				'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array(
+					'status' => 400,
+					'params' => $invalid_params,
+				)
+			);
 		}
 
 		return true;
@@ -945,7 +960,7 @@ class WP_REST_Request implements ArrayAccess {
 	 * @return WP_REST_Request|false WP_REST_Request object on success, false on failure.
 	 */
 	public static function from_url( $url ) {
-		$bits = parse_url( $url );
+		$bits         = parse_url( $url );
 		$query_params = array();
 
 		if ( ! empty( $bits['query'] ) ) {
@@ -956,7 +971,7 @@ class WP_REST_Request implements ArrayAccess {
 		if ( get_option( 'permalink_structure' ) && 0 === strpos( $url, $api_root ) ) {
 			// Pretty permalinks on, and URL is under the API root.
 			$api_url_part = substr( $url, strlen( untrailingslashit( $api_root ) ) );
-			$route = parse_url( $api_url_part, PHP_URL_PATH );
+			$route        = parse_url( $api_url_part, PHP_URL_PATH );
 		} elseif ( ! empty( $query_params['rest_route'] ) ) {
 			// ?rest_route=... set directly
 			$route = $query_params['rest_route'];
diff --git a/wp-includes/rest-api/class-wp-rest-response.php b/wp-includes/rest-api/class-wp-rest-response.php
index 794ba1fb82..f949cdb9cf 100644
--- a/wp-includes/rest-api/class-wp-rest-response.php
+++ b/wp-includes/rest-api/class-wp-rest-response.php
@@ -232,7 +232,7 @@ class WP_REST_Response extends WP_HTTP_Response {
 			$data = $this->get_data();
 			$error->add( $data['code'], $data['message'], $data['data'] );
 			if ( ! empty( $data['additional_errors'] ) ) {
-				foreach( $data['additional_errors'] as $err ) {
+				foreach ( $data['additional_errors'] as $err ) {
 					$error->add( $err['code'], $err['message'], $err['data'] );
 				}
 			}
@@ -253,8 +253,8 @@ class WP_REST_Response extends WP_HTTP_Response {
 	public function get_curies() {
 		$curies = array(
 			array(
-				'name' => 'wp',
-				'href' => 'https://api.w.org/{rel}',
+				'name'      => 'wp',
+				'href'      => 'https://api.w.org/{rel}',
 				'templated' => true,
 			),
 		);
diff --git a/wp-includes/rest-api/class-wp-rest-server.php b/wp-includes/rest-api/class-wp-rest-server.php
index d06974682a..fbc47dab5b 100644
--- a/wp-includes/rest-api/class-wp-rest-server.php
+++ b/wp-includes/rest-api/class-wp-rest-server.php
@@ -88,8 +88,8 @@ class WP_REST_Server {
 			// Meta endpoints.
 			'/' => array(
 				'callback' => array( $this, 'get_index' ),
-				'methods' => 'GET',
-				'args' => array(
+				'methods'  => 'GET',
+				'args'     => array(
 					'context' => array(
 						'default' => 'view',
 					),
@@ -160,7 +160,11 @@ class WP_REST_Server {
 
 		foreach ( (array) $error->errors as $code => $messages ) {
 			foreach ( (array) $messages as $message ) {
-				$errors[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) );
+				$errors[] = array(
+					'code'    => $code,
+					'message' => $message,
+					'data'    => $error->get_error_data( $code ),
+				);
 			}
 		}
 
@@ -260,7 +264,8 @@ 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',
+		apply_filters_deprecated(
+			'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.' )
 		);
 
@@ -398,8 +403,8 @@ class WP_REST_Server {
 			$json_error_message = $this->get_json_last_error();
 			if ( $json_error_message ) {
 				$json_error_obj = new WP_Error( 'rest_encode_error', $json_error_message, array( 'status' => 500 ) );
-				$result = $this->error_to_response( $json_error_obj );
-				$result = wp_json_encode( $result->data[0] );
+				$result         = $this->error_to_response( $json_error_obj );
+				$result         = wp_json_encode( $result->data[0] );
 			}
 
 			if ( $jsonp_callback ) {
@@ -471,9 +476,9 @@ class WP_REST_Server {
 			$data[ $rel ] = array();
 
 			foreach ( $items as $item ) {
-				$attributes = $item['attributes'];
+				$attributes         = $item['attributes'];
 				$attributes['href'] = $item['href'];
-				$data[ $rel ][] = $attributes;
+				$data[ $rel ][]     = $attributes;
 			}
 		}
 
@@ -499,7 +504,7 @@ class WP_REST_Server {
 			return array();
 		}
 
-		$curies = $response->get_curies();
+		$curies      = $response->get_curies();
 		$used_curies = array();
 
 		foreach ( $links as $rel => $items ) {
@@ -515,9 +520,9 @@ class WP_REST_Server {
 				$rel_regex = str_replace( '\{rel\}', '(.+)', preg_quote( $curie['href'], '!' ) );
 				preg_match( '!' . $rel_regex . '!', $rel, $matches );
 				if ( $matches ) {
-					$new_rel = $curie['name'] . ':' . $matches[1];
+					$new_rel                       = $curie['name'] . ':' . $matches[1];
 					$used_curies[ $curie['name'] ] = $curie;
-					$links[ $new_rel ] = $items;
+					$links[ $new_rel ]             = $items;
 					unset( $links[ $rel ] );
 					break;
 				}
@@ -652,25 +657,27 @@ class WP_REST_Server {
 		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
 			$this->namespaces[ $namespace ] = array();
 
-			$this->register_route( $namespace, '/' . $namespace, array(
-				array(
-					'methods' => self::READABLE,
-					'callback' => array( $this, 'get_namespace_index' ),
-					'args' => array(
-						'namespace' => array(
-							'default' => $namespace,
-						),
-						'context' => array(
-							'default' => 'view',
+			$this->register_route(
+				$namespace, '/' . $namespace, array(
+					array(
+						'methods'  => self::READABLE,
+						'callback' => array( $this, 'get_namespace_index' ),
+						'args'     => array(
+							'namespace' => array(
+								'default' => $namespace,
+							),
+							'context'   => array(
+								'default' => 'view',
+							),
 						),
 					),
-				),
-			) );
+				)
+			);
 		}
 
 		// Associative to avoid double-registration.
 		$this->namespaces[ $namespace ][ $route ] = true;
-		$route_args['namespace'] = $namespace;
+		$route_args['namespace']                  = $namespace;
 
 		if ( $override || empty( $this->endpoints[ $route ] ) ) {
 			$this->endpoints[ $route ] = $route_args;
@@ -756,7 +763,7 @@ class WP_REST_Server {
 				$handler['methods'] = array();
 
 				foreach ( $methods as $method ) {
-					$method = strtoupper( trim( $method ) );
+					$method                        = strtoupper( trim( $method ) );
 					$handler['methods'][ $method ] = true;
 				}
 			}
@@ -838,7 +845,7 @@ class WP_REST_Server {
 			}
 
 			foreach ( $handlers as $handler ) {
-				$callback  = $handler['callback'];
+				$callback = $handler['callback'];
 				$response = null;
 
 				// Fallback to GET method if no HEAD method is registered.
@@ -1063,12 +1070,12 @@ class WP_REST_Server {
 			return new WP_Error( 'rest_invalid_namespace', __( 'The specified namespace could not be found.' ), array( 'status' => 404 ) );
 		}
 
-		$routes = $this->namespaces[ $namespace ];
+		$routes    = $this->namespaces[ $namespace ];
 		$endpoints = array_intersect_key( $this->get_routes(), $routes );
 
-		$data = array(
+		$data     = array(
 			'namespace' => $namespace,
-			'routes' => $this->get_data_for_routes( $endpoints, $request['context'] ),
+			'routes'    => $this->get_data_for_routes( $endpoints, $request['context'] ),
 		);
 		$response = rest_ensure_response( $data );
 
@@ -1146,7 +1153,7 @@ class WP_REST_Server {
 	public function get_data_for_route( $route, $callbacks, $context = 'view' ) {
 		$data = array(
 			'namespace' => '',
-			'methods' => array(),
+			'methods'   => array(),
 			'endpoints' => array(),
 		);
 
@@ -1171,7 +1178,7 @@ class WP_REST_Server {
 			}
 
 			$data['methods'] = array_merge( $data['methods'], array_keys( $callback['methods'] ) );
-			$endpoint_data = array(
+			$endpoint_data   = array(
 				'methods' => array_keys( $callback['methods'] ),
 			);
 
@@ -1320,7 +1327,11 @@ class WP_REST_Server {
 		$headers = array();
 
 		// CONTENT_* headers are not prefixed with HTTP_.
-		$additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
+		$additional = array(
+			'CONTENT_LENGTH' => true,
+			'CONTENT_MD5'    => true,
+			'CONTENT_TYPE'   => true,
+		);
 
 		foreach ( $server as $key => $value ) {
 			if ( strpos( $key, 'HTTP_' ) === 0 ) {
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
index ed101815a1..528a6ce0c6 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php
@@ -75,7 +75,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 
 		// Attaching media to a post requires ability to edit said post.
 		if ( ! empty( $request['post'] ) ) {
-			$parent = get_post( (int) $request['post'] );
+			$parent           = get_post( (int) $request['post'] );
 			$post_parent_type = get_post_type_object( $parent->post_type );
 
 			if ( ! current_user_can( $post_parent_type->cap->edit_post, $request['post'] ) ) {
@@ -101,7 +101,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 		}
 
 		// Get the file via $_FILES or raw data.
-		$files = $request->get_file_params();
+		$files   = $request->get_file_params();
 		$headers = $request->get_headers();
 
 		if ( ! empty( $files ) ) {
@@ -116,11 +116,11 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 
 		$name       = basename( $file['file'] );
 		$name_parts = pathinfo( $name );
-		$name       = trim( substr( $name, 0, -(1 + strlen( $name_parts['extension'] ) ) ) );
+		$name       = trim( substr( $name, 0, -( 1 + strlen( $name_parts['extension'] ) ) ) );
 
-		$url     = $file['url'];
-		$type    = $file['type'];
-		$file    = $file['file'];
+		$url  = $file['url'];
+		$type = $file['type'];
+		$file = $file['file'];
 
 		// use image exif/iptc data for title and caption defaults if possible
 		$image_meta = @wp_read_image_metadata( $file );
@@ -135,10 +135,10 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 			}
 		}
 
-		$attachment = $this->prepare_item_for_database( $request );
-		$attachment->file = $file;
+		$attachment                 = $this->prepare_item_for_database( $request );
+		$attachment->file           = $file;
 		$attachment->post_mime_type = $type;
-		$attachment->guid = $url;
+		$attachment->guid           = $url;
 
 		if ( empty( $attachment->post_title ) ) {
 			$attachment->post_title = preg_replace( '/\.[^.]+$/', '', basename( $file ) );
@@ -213,7 +213,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 		}
 
 		$response = rest_ensure_response( $response );
-		$data = $response->get_data();
+		$data     = $response->get_data();
 
 		if ( isset( $request['alt_text'] ) ) {
 			update_post_meta( $data['id'], '_wp_attachment_image_alt', $request['alt_text'] );
@@ -284,19 +284,19 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 */
 	public function prepare_item_for_response( $post, $request ) {
 		$response = parent::prepare_item_for_response( $post, $request );
-		$data = $response->get_data();
+		$data     = $response->get_data();
 
 		$data['description'] = array(
-			'raw'       => $post->post_content,
+			'raw'      => $post->post_content,
 			/** This filter is documented in wp-includes/post-template.php */
-			'rendered'  => apply_filters( 'the_content', $post->post_content ),
+			'rendered' => apply_filters( 'the_content', $post->post_content ),
 		);
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$caption = apply_filters( 'the_excerpt', apply_filters( 'get_the_excerpt', $post->post_excerpt, $post ) );
+		$caption         = apply_filters( 'the_excerpt', apply_filters( 'get_the_excerpt', $post->post_excerpt, $post ) );
 		$data['caption'] = array(
-			'raw'       => $post->post_excerpt,
-			'rendered'  => $caption,
+			'raw'      => $post->post_excerpt,
+			'rendered' => $caption,
 		);
 
 		$data['alt_text']      = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
@@ -377,10 +377,10 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 		$schema = parent::get_item_schema();
 
 		$schema['properties']['alt_text'] = array(
-			'description'     => __( 'Alternative text to display when attachment is not displayed.' ),
-			'type'            => 'string',
-			'context'         => array( 'view', 'edit', 'embed' ),
-			'arg_options'     => array(
+			'description' => __( 'Alternative text to display when attachment is not displayed.' ),
+			'type'        => 'string',
+			'context'     => array( 'view', 'edit', 'embed' ),
+			'arg_options' => array(
 				'sanitize_callback' => 'sanitize_text_field',
 			),
 		);
@@ -394,7 +394,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 				'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()
 			),
 			'properties'  => array(
-				'raw' => array(
+				'raw'      => array(
 					'description' => __( 'Caption for the attachment, as it exists in the database.' ),
 					'type'        => 'string',
 					'context'     => array( 'edit' ),
@@ -417,7 +417,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 				'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()
 			),
 			'properties'  => array(
-				'raw' => array(
+				'raw'      => array(
 					'description' => __( 'Description for the object, as it exists in the database.' ),
 					'type'        => 'string',
 					'context'     => array( 'edit' ),
@@ -432,39 +432,39 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 		);
 
 		$schema['properties']['media_type'] = array(
-			'description'     => __( 'Attachment type.' ),
-			'type'            => 'string',
-			'enum'            => array( 'image', 'file' ),
-			'context'         => array( 'view', 'edit', 'embed' ),
-			'readonly'        => true,
+			'description' => __( 'Attachment type.' ),
+			'type'        => 'string',
+			'enum'        => array( 'image', 'file' ),
+			'context'     => array( 'view', 'edit', 'embed' ),
+			'readonly'    => true,
 		);
 
 		$schema['properties']['mime_type'] = array(
-			'description'     => __( 'The attachment MIME type.' ),
-			'type'            => 'string',
-			'context'         => array( 'view', 'edit', 'embed' ),
-			'readonly'        => true,
+			'description' => __( 'The attachment MIME type.' ),
+			'type'        => 'string',
+			'context'     => array( 'view', 'edit', 'embed' ),
+			'readonly'    => true,
 		);
 
 		$schema['properties']['media_details'] = array(
-			'description'     => __( 'Details about the media file, specific to its type.' ),
-			'type'            => 'object',
-			'context'         => array( 'view', 'edit', 'embed' ),
-			'readonly'        => true,
+			'description' => __( 'Details about the media file, specific to its type.' ),
+			'type'        => 'object',
+			'context'     => array( 'view', 'edit', 'embed' ),
+			'readonly'    => true,
 		);
 
 		$schema['properties']['post'] = array(
-			'description'     => __( 'The ID for the associated post of the attachment.' ),
-			'type'            => 'integer',
-			'context'         => array( 'view', 'edit' ),
+			'description' => __( 'The ID for the associated post of the attachment.' ),
+			'type'        => 'integer',
+			'context'     => array( 'view', 'edit' ),
 		);
 
 		$schema['properties']['source_url'] = array(
-			'description'     => __( 'URL to the original attachment file.' ),
-			'type'            => 'string',
-			'format'          => 'uri',
-			'context'         => array( 'view', 'edit', 'embed' ),
-			'readonly'        => true,
+			'description' => __( 'URL to the original attachment file.' ),
+			'type'        => 'string',
+			'format'      => 'uri',
+			'context'     => array( 'view', 'edit', 'embed' ),
+			'readonly'    => true,
 		);
 
 		unset( $schema['properties']['password'] );
@@ -629,16 +629,16 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 	 * @return array Query parameters for the attachment collection as an array.
 	 */
 	public function get_collection_params() {
-		$params = parent::get_collection_params();
-		$params['status']['default'] = 'inherit';
+		$params                            = parent::get_collection_params();
+		$params['status']['default']       = 'inherit';
 		$params['status']['items']['enum'] = array( 'inherit', 'private', 'trash' );
-		$media_types = $this->get_media_types();
+		$media_types                       = $this->get_media_types();
 
 		$params['media_type'] = array(
-			'default'           => null,
-			'description'       => __( 'Limit result set to attachments of a particular media type.' ),
-			'type'              => 'string',
-			'enum'              => array_keys( $media_types ),
+			'default'     => null,
+			'description' => __( 'Limit result set to attachments of a particular media type.' ),
+			'type'        => 'string',
+			'enum'        => array_keys( $media_types ),
 		);
 
 		$params['mime_type'] = array(
@@ -695,7 +695,7 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller {
 
 		// Pass off to WP to handle the actual upload.
 		$overrides = array(
-			'test_form'   => false,
+			'test_form' => false,
 		);
 
 		// Bypasses is_uploaded_file() when running unit tests.
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 23b1262c3c..3f7a9ed554 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
@@ -43,65 +43,69 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'   => WP_REST_Server::READABLE,
-				'callback'  => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'      => $this->get_collection_params(),
-			),
-			array(
-				'methods'  => WP_REST_Server::CREATABLE,
-				'callback' => array( $this, 'create_item' ),
-				'permission_callback' => array( $this, 'create_item_permissions_check' ),
-				'args'     => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				array(
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'create_item' ),
+					'permission_callback' => array( $this, 'create_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
-			'args' => array(
-				'id' => array(
-					'description' => __( 'Unique identifier for the object.' ),
-					'type'        => 'integer',
-				),
-			),
-			array(
-				'methods'  => WP_REST_Server::READABLE,
-				'callback' => array( $this, 'get_item' ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'args'     => array(
-					'context'          => $this->get_context_param( array( 'default' => 'view' ) ),
-					'password' => array(
-						'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ),
-						'type'        => 'string',
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+				'args'   => array(
+					'id' => array(
+						'description' => __( 'Unique identifier for the object.' ),
+						'type'        => 'integer',
 					),
 				),
-			),
-			array(
-				'methods'  => WP_REST_Server::EDITABLE,
-				'callback' => array( $this, 'update_item' ),
-				'permission_callback' => array( $this, 'update_item_permissions_check' ),
-				'args'     => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-			),
-			array(
-				'methods'  => WP_REST_Server::DELETABLE,
-				'callback' => array( $this, 'delete_item' ),
-				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
-				'args'     => array(
-					'force'    => array(
-						'type'        => 'boolean',
-						'default'     => false,
-						'description' => __( 'Whether to bypass trash and force deletion.' ),
-					),
-					'password' => array(
-						'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ),
-						'type'        => 'string',
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => array(
+						'context'  => $this->get_context_param( array( 'default' => 'view' ) ),
+						'password' => array(
+							'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ),
+							'type'        => 'string',
+						),
 					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::EDITABLE,
+					'callback'            => array( $this, 'update_item' ),
+					'permission_callback' => array( $this, 'update_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'delete_item' ),
+					'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+					'args'                => array(
+						'force'    => array(
+							'type'        => 'boolean',
+							'default'     => false,
+							'description' => __( 'Whether to bypass trash and force deletion.' ),
+						),
+						'password' => array(
+							'description' => __( 'The password for the parent post of the comment (if the post is password protected).' ),
+							'type'        => 'string',
+						),
+					),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -245,7 +249,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		 */
 		$prepared_args = apply_filters( 'rest_comment_query', $prepared_args, $request );
 
-		$query = new WP_Comment_Query;
+		$query        = new WP_Comment_Query;
 		$query_result = $query->query( $prepared_args );
 
 		$comments = array();
@@ -255,7 +259,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 				continue;
 			}
 
-			$data = $this->prepare_item_for_response( $comment, $request );
+			$data       = $this->prepare_item_for_response( $comment, $request );
 			$comments[] = $this->prepare_response_for_collection( $data );
 		}
 
@@ -266,11 +270,11 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 			// Out-of-bounds, run the query again without LIMIT for total count.
 			unset( $prepared_args['number'], $prepared_args['offset'] );
 
-			$query = new WP_Comment_Query;
+			$query                  = new WP_Comment_Query;
 			$prepared_args['count'] = true;
 
 			$total_comments = $query->query( $prepared_args );
-			$max_pages = ceil( $total_comments / $request['per_page'] );
+			$max_pages      = ceil( $total_comments / $request['per_page'] );
 		}
 
 		$response = rest_ensure_response( $comments );
@@ -314,7 +318,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 			return $error;
 		}
 
-		$id = (int) $id;
+		$id      = (int) $id;
 		$comment = get_comment( $id );
 		if ( empty( $comment ) ) {
 			return $error;
@@ -375,7 +379,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 			return $comment;
 		}
 
-		$data = $this->prepare_item_for_response( $comment, $request );
+		$data     = $this->prepare_item_for_response( $comment, $request );
 		$response = rest_ensure_response( $data );
 
 		return $response;
@@ -415,7 +419,8 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 
 		// Limit who can set comment `author`, `author_ip` or `status` to anything other than the default.
 		if ( isset( $request['author'] ) && get_current_user_id() !== $request['author'] && ! current_user_can( 'moderate_comments' ) ) {
-			return new WP_Error( 'rest_comment_invalid_author',
+			return new WP_Error(
+				'rest_comment_invalid_author',
 				/* translators: %s: request parameter */
 				sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'author' ),
 				array( 'status' => rest_authorization_required_code() )
@@ -424,7 +429,8 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 
 		if ( isset( $request['author_ip'] ) && ! current_user_can( 'moderate_comments' ) ) {
 			if ( empty( $_SERVER['REMOTE_ADDR'] ) || $request['author_ip'] !== $_SERVER['REMOTE_ADDR'] ) {
-				return new WP_Error( 'rest_comment_invalid_author_ip',
+				return new WP_Error(
+					'rest_comment_invalid_author_ip',
 					/* translators: %s: request parameter */
 					sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'author_ip' ),
 					array( 'status' => rest_authorization_required_code() )
@@ -433,7 +439,8 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		}
 
 		if ( isset( $request['status'] ) && ! current_user_can( 'moderate_comments' ) ) {
-			return new WP_Error( 'rest_comment_invalid_status',
+			return new WP_Error(
+				'rest_comment_invalid_status',
 				/* translators: %s: request parameter */
 				sprintf( __( "Sorry, you are not allowed to edit '%s' for comments." ), 'status' ),
 				array( 'status' => rest_authorization_required_code() )
@@ -515,10 +522,10 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		if ( is_user_logged_in() && $missing_author ) {
 			$user = wp_get_current_user();
 
-			$prepared_comment['user_id'] = $user->ID;
-			$prepared_comment['comment_author'] = $user->display_name;
+			$prepared_comment['user_id']              = $user->ID;
+			$prepared_comment['comment_author']       = $user->display_name;
 			$prepared_comment['comment_author_email'] = $user->user_email;
-			$prepared_comment['comment_author_url'] = $user->user_url;
+			$prepared_comment['comment_author_url']   = $user->user_url;
 		}
 
 		// Honor the discussion setting that requires a name and email address of the comment author.
@@ -631,7 +638,6 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		$response->set_status( 201 );
 		$response->header( 'Location', rest_url( sprintf( '%s/%s/%d', $this->namespace, $this->rest_base, $comment_id ) ) );
 
-
 		return $response;
 	}
 
@@ -804,9 +810,14 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 
 		if ( $force ) {
 			$previous = $this->prepare_item_for_response( $comment, $request );
-			$result = wp_delete_comment( $comment->comment_ID, true );
+			$result   = wp_delete_comment( $comment->comment_ID, true );
 			$response = new WP_REST_Response();
-			$response->set_data( array( 'deleted' => true, 'previous' => $previous->get_data() ) );
+			$response->set_data(
+				array(
+					'deleted'  => true,
+					'previous' => $previous->get_data(),
+				)
+			);
 		} else {
 			// If this type doesn't support trashing, error out.
 			if ( ! $supports_trash ) {
@@ -818,8 +829,8 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 				return new WP_Error( 'rest_already_trashed', __( 'The comment has already been trashed.' ), array( 'status' => 410 ) );
 			}
 
-			$result = wp_trash_comment( $comment->comment_ID );
-			$comment = get_comment( $comment->comment_ID );
+			$result   = wp_trash_comment( $comment->comment_ID );
+			$comment  = get_comment( $comment->comment_ID );
 			$response = $this->prepare_item_for_response( $comment, $request );
 		}
 
@@ -852,25 +863,25 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 */
 	public function prepare_item_for_response( $comment, $request ) {
 		$data = array(
-			'id'                 => (int) $comment->comment_ID,
-			'post'               => (int) $comment->comment_post_ID,
-			'parent'             => (int) $comment->comment_parent,
-			'author'             => (int) $comment->user_id,
-			'author_name'        => $comment->comment_author,
-			'author_email'       => $comment->comment_author_email,
-			'author_url'         => $comment->comment_author_url,
-			'author_ip'          => $comment->comment_author_IP,
-			'author_user_agent'  => $comment->comment_agent,
-			'date'               => mysql_to_rfc3339( $comment->comment_date ),
-			'date_gmt'           => mysql_to_rfc3339( $comment->comment_date_gmt ),
-			'content'            => array(
+			'id'                => (int) $comment->comment_ID,
+			'post'              => (int) $comment->comment_post_ID,
+			'parent'            => (int) $comment->comment_parent,
+			'author'            => (int) $comment->user_id,
+			'author_name'       => $comment->comment_author,
+			'author_email'      => $comment->comment_author_email,
+			'author_url'        => $comment->comment_author_url,
+			'author_ip'         => $comment->comment_author_IP,
+			'author_user_agent' => $comment->comment_agent,
+			'date'              => mysql_to_rfc3339( $comment->comment_date ),
+			'date_gmt'          => mysql_to_rfc3339( $comment->comment_date_gmt ),
+			'content'           => array(
 				/** This filter is documented in wp-includes/comment-template.php */
 				'rendered' => apply_filters( 'comment_text', $comment->comment_content, $comment ),
 				'raw'      => $comment->comment_content,
 			),
-			'link'               => get_comment_link( $comment ),
-			'status'             => $this->prepare_status_response( $comment->comment_approved ),
-			'type'               => get_comment_type( $comment->comment_ID ),
+			'link'              => get_comment_link( $comment ),
+			'status'            => $this->prepare_status_response( $comment->comment_approved ),
+			'type'              => get_comment_type( $comment->comment_ID ),
 		);
 
 		$schema = $this->get_item_schema();
@@ -916,7 +927,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 */
 	protected function prepare_links( $comment ) {
 		$links = array(
-			'self' => array(
+			'self'       => array(
 				'href' => rest_url( sprintf( '%s/%s/%d', $this->namespace, $this->rest_base, $comment->comment_ID ) ),
 			),
 			'collection' => array(
@@ -935,7 +946,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 			$post = get_post( $comment->comment_post_ID );
 
 			if ( ! empty( $post->ID ) ) {
-				$obj = get_post_type_object( $post->post_type );
+				$obj  = get_post_type_object( $post->post_type );
 				$base = ! empty( $obj->rest_base ) ? $obj->rest_base : $obj->name;
 
 				$links['up'] = array(
@@ -954,14 +965,16 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		}
 
 		// Only grab one comment to verify the comment has children.
-		$comment_children = $comment->get_children( array(
-			'number' => 1,
-			'count'  => true
-		) );
+		$comment_children = $comment->get_children(
+			array(
+				'number' => 1,
+				'count'  => true,
+			)
+		);
 
 		if ( ! empty( $comment_children ) ) {
 			$args = array(
-				'parent' => $comment->comment_ID
+				'parent' => $comment->comment_ID,
 			);
 
 			$rest_url = add_query_arg( $args, rest_url( $this->namespace . '/' . $this->rest_base ) );
@@ -1070,10 +1083,10 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 			$user = new WP_User( $request['author'] );
 
 			if ( $user->exists() ) {
-				$prepared_comment['user_id'] = $user->ID;
-				$prepared_comment['comment_author'] = $user->display_name;
+				$prepared_comment['user_id']              = $user->ID;
+				$prepared_comment['comment_author']       = $user->display_name;
 				$prepared_comment['comment_author_email'] = $user->user_email;
-				$prepared_comment['comment_author_url'] = $user->user_url;
+				$prepared_comment['comment_author_url']   = $user->user_url;
 			} else {
 				return new WP_Error( 'rest_comment_author_invalid', __( 'Invalid comment author ID.' ), array( 'status' => 400 ) );
 			}
@@ -1141,125 +1154,125 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 */
 	public function get_item_schema() {
 		$schema = array(
-			'$schema'              => 'http://json-schema.org/draft-04/schema#',
-			'title'                => 'comment',
-			'type'                 => 'object',
-			'properties'           => array(
-				'id'               => array(
-					'description'  => __( 'Unique identifier for the object.' ),
-					'type'         => 'integer',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'comment',
+			'type'       => 'object',
+			'properties' => array(
+				'id'                => array(
+					'description' => __( 'Unique identifier for the object.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
-				'author'           => array(
-					'description'  => __( 'The ID of the user object, if author was a user.' ),
-					'type'         => 'integer',
-					'context'      => array( 'view', 'edit', 'embed' ),
+				'author'            => array(
+					'description' => __( 'The ID of the user object, if author was a user.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'author_email'     => array(
-					'description'  => __( 'Email address for the object author.' ),
-					'type'         => 'string',
-					'format'       => 'email',
-					'context'      => array( 'edit' ),
-					'arg_options'  => array(
+				'author_email'      => array(
+					'description' => __( 'Email address for the object author.' ),
+					'type'        => 'string',
+					'format'      => 'email',
+					'context'     => array( 'edit' ),
+					'arg_options' => array(
 						'sanitize_callback' => array( $this, 'check_comment_author_email' ),
 						'validate_callback' => null, // skip built-in validation of 'email'.
 					),
 				),
-				'author_ip'     => array(
-					'description'  => __( 'IP address for the object author.' ),
-					'type'         => 'string',
-					'format'       => 'ip',
-					'context'      => array( 'edit' ),
+				'author_ip'         => array(
+					'description' => __( 'IP address for the object author.' ),
+					'type'        => 'string',
+					'format'      => 'ip',
+					'context'     => array( 'edit' ),
 				),
-				'author_name'     => array(
-					'description'  => __( 'Display name for the object author.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'arg_options'  => array(
+				'author_name'       => array(
+					'description' => __( 'Display name for the object author.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_text_field',
 					),
 				),
-				'author_url'       => array(
-					'description'  => __( 'URL for the object author.' ),
-					'type'         => 'string',
-					'format'       => 'uri',
-					'context'      => array( 'view', 'edit', 'embed' ),
+				'author_url'        => array(
+					'description' => __( 'URL for the object author.' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'author_user_agent'     => array(
-					'description'  => __( 'User agent for the object author.' ),
-					'type'         => 'string',
-					'context'      => array( 'edit' ),
-					'arg_options'  => array(
+				'author_user_agent' => array(
+					'description' => __( 'User agent for the object author.' ),
+					'type'        => 'string',
+					'context'     => array( 'edit' ),
+					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_text_field',
 					),
 				),
-				'content'          => array(
-					'description'     => __( 'The content for the object.' ),
-					'type'            => 'object',
-					'context'         => array( 'view', 'edit', 'embed' ),
-					'arg_options'     => array(
+				'content'           => array(
+					'description' => __( 'The content for the object.' ),
+					'type'        => 'object',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'arg_options' => array(
 						'sanitize_callback' => null, // Note: sanitization implemented in self::prepare_item_for_database()
 						'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()
 					),
-					'properties'      => array(
-						'raw'         => array(
-							'description'     => __( 'Content for the object, as it exists in the database.' ),
-							'type'            => 'string',
-							'context'         => array( 'edit' ),
+					'properties'  => array(
+						'raw'      => array(
+							'description' => __( 'Content for the object, as it exists in the database.' ),
+							'type'        => 'string',
+							'context'     => array( 'edit' ),
 						),
-						'rendered'    => array(
-							'description'     => __( 'HTML content for the object, transformed for display.' ),
-							'type'            => 'string',
-							'context'         => array( 'view', 'edit', 'embed' ),
-							'readonly'        => true,
+						'rendered' => array(
+							'description' => __( 'HTML content for the object, transformed for display.' ),
+							'type'        => 'string',
+							'context'     => array( 'view', 'edit', 'embed' ),
+							'readonly'    => true,
 						),
 					),
 				),
-				'date'             => array(
-					'description'  => __( "The date the object was published, in the site's timezone." ),
-					'type'         => 'string',
-					'format'       => 'date-time',
-					'context'      => array( 'view', 'edit', 'embed' ),
+				'date'              => array(
+					'description' => __( "The date the object was published, in the site's timezone." ),
+					'type'        => 'string',
+					'format'      => 'date-time',
+					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'date_gmt'         => array(
-					'description'  => __( 'The date the object was published, as GMT.' ),
-					'type'         => 'string',
-					'format'       => 'date-time',
-					'context'      => array( 'view', 'edit' ),
+				'date_gmt'          => array(
+					'description' => __( 'The date the object was published, as GMT.' ),
+					'type'        => 'string',
+					'format'      => 'date-time',
+					'context'     => array( 'view', 'edit' ),
 				),
-				'link'             => array(
-					'description'  => __( 'URL to the object.' ),
-					'type'         => 'string',
-					'format'       => 'uri',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'link'              => array(
+					'description' => __( 'URL to the object.' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
-				'parent'           => array(
-					'description'  => __( 'The ID for the parent of the object.' ),
-					'type'         => 'integer',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'default'      => 0,
+				'parent'            => array(
+					'description' => __( 'The ID for the parent of the object.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'default'     => 0,
 				),
-				'post'             => array(
-					'description'  => __( 'The ID of the associated post object.' ),
-					'type'         => 'integer',
-					'context'      => array( 'view', 'edit' ),
-					'default'      => 0,
+				'post'              => array(
+					'description' => __( 'The ID of the associated post object.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'default'     => 0,
 				),
-				'status'           => array(
-					'description'  => __( 'State of the object.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit' ),
-					'arg_options'  => array(
+				'status'            => array(
+					'description' => __( 'State of the object.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_key',
 					),
 				),
-				'type'             => array(
-					'description'  => __( 'Type of Comment for the object.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'type'              => array(
+					'description' => __( 'Type of Comment for the object.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
 			),
 		);
@@ -1279,11 +1292,11 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 			}
 
 			$schema['properties']['author_avatar_urls'] = array(
-				'description'   => __( 'Avatar URLs for the object author.' ),
-				'type'          => 'object',
-				'context'       => array( 'view', 'edit', 'embed' ),
-				'readonly'      => true,
-				'properties'    => $avatar_properties,
+				'description' => __( 'Avatar URLs for the object author.' ),
+				'type'        => 'object',
+				'context'     => array( 'view', 'edit', 'embed' ),
+				'readonly'    => true,
+				'properties'  => $avatar_properties,
 			);
 		}
 
@@ -1305,78 +1318,78 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		$query_params['context']['default'] = 'view';
 
 		$query_params['after'] = array(
-			'description'       => __( 'Limit response to comments published after a given ISO8601 compliant date.' ),
-			'type'              => 'string',
-			'format'            => 'date-time',
+			'description' => __( 'Limit response to comments published after a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
 		);
 
 		$query_params['author'] = array(
-			'description'       => __( 'Limit result set to comments assigned to specific user IDs. Requires authorization.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'integer',
+			'description' => __( 'Limit result set to comments assigned to specific user IDs. Requires authorization.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
 		);
 
 		$query_params['author_exclude'] = array(
-			'description'       => __( 'Ensure result set excludes comments assigned to specific user IDs. Requires authorization.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'integer',
+			'description' => __( 'Ensure result set excludes comments assigned to specific user IDs. Requires authorization.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
 		);
 
 		$query_params['author_email'] = array(
-			'default'           => null,
-			'description'       => __( 'Limit result set to that from a specific author email. Requires authorization.' ),
-			'format'            => 'email',
-			'type'              => 'string',
+			'default'     => null,
+			'description' => __( 'Limit result set to that from a specific author email. Requires authorization.' ),
+			'format'      => 'email',
+			'type'        => 'string',
 		);
 
 		$query_params['before'] = array(
-			'description'       => __( 'Limit response to comments published before a given ISO8601 compliant date.' ),
-			'type'              => 'string',
-			'format'            => 'date-time',
+			'description' => __( 'Limit response to comments published before a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
 		);
 
 		$query_params['exclude'] = array(
-			'description'        => __( 'Ensure result set excludes specific IDs.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'           => 'integer',
+			'description' => __( 'Ensure result set excludes specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'            => array(),
+			'default'     => array(),
 		);
 
 		$query_params['include'] = array(
-			'description'        => __( 'Limit result set to specific IDs.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'           => 'integer',
+			'description' => __( 'Limit result set to specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'            => array(),
+			'default'     => array(),
 		);
 
 		$query_params['offset'] = array(
-			'description'        => __( 'Offset the result set by a specific number of items.' ),
-			'type'               => 'integer',
+			'description' => __( 'Offset the result set by a specific number of items.' ),
+			'type'        => 'integer',
 		);
 
-		$query_params['order']      = array(
-			'description'           => __( 'Order sort attribute ascending or descending.' ),
-			'type'                  => 'string',
-			'default'               => 'desc',
-			'enum'                  => array(
+		$query_params['order'] = array(
+			'description' => __( 'Order sort attribute ascending or descending.' ),
+			'type'        => 'string',
+			'default'     => 'desc',
+			'enum'        => array(
 				'asc',
 				'desc',
 			),
 		);
 
-		$query_params['orderby']    = array(
-			'description'           => __( 'Sort collection by object attribute.' ),
-			'type'                  => 'string',
-			'default'               => 'date_gmt',
-			'enum'                  => array(
+		$query_params['orderby'] = array(
+			'description' => __( 'Sort collection by object attribute.' ),
+			'type'        => 'string',
+			'default'     => 'date_gmt',
+			'enum'        => array(
 				'date',
 				'date_gmt',
 				'id',
@@ -1388,29 +1401,29 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		);
 
 		$query_params['parent'] = array(
-			'default'           => array(),
-			'description'       => __( 'Limit result set to comments of specific parent IDs.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'integer',
+			'default'     => array(),
+			'description' => __( 'Limit result set to comments of specific parent IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
 		);
 
 		$query_params['parent_exclude'] = array(
-			'default'           => array(),
-			'description'       => __( 'Ensure result set excludes specific parent IDs.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'integer',
+			'default'     => array(),
+			'description' => __( 'Ensure result set excludes specific parent IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
 		);
 
-		$query_params['post']   = array(
-			'default'           => array(),
-			'description'       => __( 'Limit result set to comments assigned to specific post IDs.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'integer',
+		$query_params['post'] = array(
+			'default'     => array(),
+			'description' => __( 'Limit result set to comments assigned to specific post IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
 		);
 
@@ -1466,7 +1479,7 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 		}
 
 		switch ( $new_status ) {
-			case 'approved' :
+			case 'approved':
 			case 'approve':
 			case '1':
 				$changed = wp_set_comment_status( $comment_id, 'approve' );
@@ -1475,19 +1488,19 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 			case '0':
 				$changed = wp_set_comment_status( $comment_id, 'hold' );
 				break;
-			case 'spam' :
+			case 'spam':
 				$changed = wp_spam_comment( $comment_id );
 				break;
-			case 'unspam' :
+			case 'unspam':
 				$changed = wp_unspam_comment( $comment_id );
 				break;
-			case 'trash' :
+			case 'trash':
 				$changed = wp_trash_comment( $comment_id );
 				break;
-			case 'untrash' :
+			case 'untrash':
 				$changed = wp_untrash_comment( $comment_id );
 				break;
-			default :
+			default:
 				$changed = false;
 				break;
 		}
@@ -1508,12 +1521,12 @@ class WP_REST_Comments_Controller extends WP_REST_Controller {
 	 */
 	protected function check_read_post_permission( $post, $request ) {
 		$posts_controller = new WP_REST_Posts_Controller( $post->post_type );
-		$post_type = get_post_type_object( $post->post_type );
+		$post_type        = get_post_type_object( $post->post_type );
 
 		$has_password_filter = false;
 
 		// Only check password if a specific post was queried for or a single comment
-		$requested_post = ! empty( $request['post'] ) && ( !is_array( $request['post'] ) || 1 === count( $request['post'] ) );
+		$requested_post    = ! empty( $request['post'] ) && ( ! is_array( $request['post'] ) || 1 === count( $request['post'] ) );
 		$requested_comment = ! empty( $request['id'] );
 		if ( ( $requested_post || $requested_comment ) && $posts_controller->can_access_password_content( $post, $request ) ) {
 			add_filter( 'post_password_required', '__return_false' );
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 f26e87606a..076d06c0ce 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-controller.php
@@ -305,29 +305,29 @@ abstract class WP_REST_Controller {
 	 */
 	public function get_collection_params() {
 		return array(
-			'context'                => $this->get_context_param(),
-			'page'                   => array(
-				'description'        => __( 'Current page of the collection.' ),
-				'type'               => 'integer',
-				'default'            => 1,
-				'sanitize_callback'  => 'absint',
-				'validate_callback'  => 'rest_validate_request_arg',
-				'minimum'            => 1,
+			'context'  => $this->get_context_param(),
+			'page'     => array(
+				'description'       => __( 'Current page of the collection.' ),
+				'type'              => 'integer',
+				'default'           => 1,
+				'sanitize_callback' => 'absint',
+				'validate_callback' => 'rest_validate_request_arg',
+				'minimum'           => 1,
 			),
-			'per_page'               => array(
-				'description'        => __( 'Maximum number of items to be returned in result set.' ),
-				'type'               => 'integer',
-				'default'            => 10,
-				'minimum'            => 1,
-				'maximum'            => 100,
-				'sanitize_callback'  => 'absint',
-				'validate_callback'  => 'rest_validate_request_arg',
+			'per_page' => array(
+				'description'       => __( 'Maximum number of items to be returned in result set.' ),
+				'type'              => 'integer',
+				'default'           => 10,
+				'minimum'           => 1,
+				'maximum'           => 100,
+				'sanitize_callback' => 'absint',
+				'validate_callback' => 'rest_validate_request_arg',
 			),
-			'search'                 => array(
-				'description'        => __( 'Limit results to those matching a string.' ),
-				'type'               => 'string',
-				'sanitize_callback'  => 'sanitize_text_field',
-				'validate_callback'  => 'rest_validate_request_arg',
+			'search'   => array(
+				'description'       => __( 'Limit results to those matching a string.' ),
+				'type'              => 'string',
+				'sanitize_callback' => 'sanitize_text_field',
+				'validate_callback' => 'rest_validate_request_arg',
 			),
 		);
 	}
@@ -344,10 +344,10 @@ abstract class WP_REST_Controller {
 	 */
 	public function get_context_param( $args = array() ) {
 		$param_details = array(
-			'description'        => __( 'Scope under which the request is made; determines fields present in response.' ),
-			'type'               => 'string',
-			'sanitize_callback'  => 'sanitize_key',
-			'validate_callback'  => 'rest_validate_request_arg',
+			'description'       => __( 'Scope under which the request is made; determines fields present in response.' ),
+			'type'              => 'string',
+			'sanitize_callback' => 'sanitize_key',
+			'validate_callback' => 'rest_validate_request_arg',
 		);
 
 		$schema = $this->get_item_schema();
@@ -556,7 +556,12 @@ 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( 'required' => '', 'default' => '' ) );
+					$params['arg_options'] = array_diff_key(
+						$params['arg_options'], array(
+							'required' => '',
+							'default'  => '',
+						)
+					);
 				}
 
 				$endpoint_args[ $field_id ] = array_merge( $endpoint_args[ $field_id ], $params['arg_options'] );
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 e2cce55b65..c6aadddb18 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
@@ -35,33 +35,37 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'                => $this->get_collection_params(),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<status>[\w-]+)', array(
-			'args' => array(
-				'status' => array(
-					'description' => __( 'An alphanumeric identifier for the status.' ),
-					'type'        => 'string',
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/(?P<status>[\w-]+)', array(
+				'args'   => array(
+					'status' => array(
+						'description' => __( 'An alphanumeric identifier for the status.' ),
+						'type'        => 'string',
+					),
 				),
-			),
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_item' ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'args'                => array(
-					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => array(
+						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -96,8 +100,8 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 * @return WP_Error|WP_REST_Response Response object on success, or WP_Error object on failure.
 	 */
 	public function get_items( $request ) {
-		$data = array();
-		$statuses = get_post_stati( array( 'internal' => false ), 'object' );
+		$data              = array();
+		$statuses          = get_post_stati( array( 'internal' => false ), 'object' );
 		$statuses['trash'] = get_post_status_object( 'trash' );
 
 		foreach ( $statuses as $slug => $obj ) {
@@ -107,7 +111,7 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 				continue;
 			}
 
-			$status = $this->prepare_item_for_response( $obj, $request );
+			$status             = $this->prepare_item_for_response( $obj, $request );
 			$data[ $obj->name ] = $this->prepare_response_for_collection( $status );
 		}
 
@@ -206,8 +210,8 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 		);
 
 		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data = $this->add_additional_fields_to_object( $data, $request );
-		$data = $this->filter_response_by_context( $data, $context );
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
 
 		$response = rest_ensure_response( $data );
 
@@ -240,51 +244,51 @@ class WP_REST_Post_Statuses_Controller extends WP_REST_Controller {
 	 */
 	public function get_item_schema() {
 		$schema = array(
-			'$schema'              => 'http://json-schema.org/draft-04/schema#',
-			'title'                => 'status',
-			'type'                 => 'object',
-			'properties'           => array(
-				'name'             => array(
-					'description'  => __( 'The title for the status.' ),
-					'type'         => 'string',
-					'context'      => array( 'embed', 'view', 'edit' ),
-					'readonly'     => true,
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'status',
+			'type'       => 'object',
+			'properties' => array(
+				'name'         => array(
+					'description' => __( 'The title for the status.' ),
+					'type'        => 'string',
+					'context'     => array( 'embed', 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'private'          => array(
-					'description'  => __( 'Whether posts with this status should be private.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+				'private'      => array(
+					'description' => __( 'Whether posts with this status should be private.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'protected'        => array(
-					'description'  => __( 'Whether posts with this status should be protected.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+				'protected'    => array(
+					'description' => __( 'Whether posts with this status should be protected.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'public'           => array(
-					'description'  => __( 'Whether posts of this status should be shown in the front end of the site.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+				'public'       => array(
+					'description' => __( 'Whether posts of this status should be shown in the front end of the site.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'queryable'        => array(
-					'description'  => __( 'Whether posts with this status should be publicly-queryable.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+				'queryable'    => array(
+					'description' => __( 'Whether posts with this status should be publicly-queryable.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'show_in_list'     => array(
-					'description'  => __( 'Whether to include posts in the edit listing for their post type.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+				'show_in_list' => array(
+					'description' => __( 'Whether to include posts in the edit listing for their post type.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'slug'             => array(
-					'description'  => __( 'An alphanumeric identifier for the status.' ),
-					'type'         => 'string',
-					'context'      => array( 'embed', 'view', 'edit' ),
-					'readonly'     => true,
+				'slug'         => array(
+					'description' => __( 'An alphanumeric identifier for the status.' ),
+					'type'        => 'string',
+					'context'     => array( 'embed', 'view', 'edit' ),
+					'readonly'    => true,
 				),
 			),
 		);
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 d574ba8372..203cea2530 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
@@ -35,32 +35,36 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'                => $this->get_collection_params(),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<type>[\w-]+)', array(
-			'args' => array(
-				'type' => array(
-					'description' => __( 'An alphanumeric identifier for the post type.' ),
-					'type'        => 'string',
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/(?P<type>[\w-]+)', array(
+				'args'   => array(
+					'type' => array(
+						'description' => __( 'An alphanumeric identifier for the post type.' ),
+						'type'        => 'string',
+					),
 				),
-			),
-			array(
-				'methods'  => WP_REST_Server::READABLE,
-				'callback' => array( $this, 'get_item' ),
-				'args'     => array(
-					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+				array(
+					'methods'  => WP_REST_Server::READABLE,
+					'callback' => array( $this, 'get_item' ),
+					'args'     => array(
+						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -101,7 +105,7 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 				continue;
 			}
 
-			$post_type = $this->prepare_item_for_response( $obj, $request );
+			$post_type          = $this->prepare_item_for_response( $obj, $request );
 			$data[ $obj->name ] = $this->prepare_response_for_collection( $post_type );
 		}
 
@@ -148,10 +152,10 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	public function prepare_item_for_response( $post_type, $request ) {
 		$taxonomies = wp_list_filter( get_object_taxonomies( $post_type->name, 'objects' ), array( 'show_in_rest' => true ) );
 		$taxonomies = wp_list_pluck( $taxonomies, 'name' );
-		$base = ! empty( $post_type->rest_base ) ? $post_type->rest_base : $post_type->name;
-		$supports = get_all_post_type_supports( $post_type->name );
+		$base       = ! empty( $post_type->rest_base ) ? $post_type->rest_base : $post_type->name;
+		$supports   = get_all_post_type_supports( $post_type->name );
 
-		$data = array(
+		$data    = array(
 			'capabilities' => $post_type->cap,
 			'description'  => $post_type->description,
 			'hierarchical' => $post_type->hierarchical,
@@ -169,14 +173,16 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 		// Wrap the data in a response object.
 		$response = rest_ensure_response( $data );
 
-		$response->add_links( array(
-			'collection' => array(
-				'href'   => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
-			),
-			'https://api.w.org/items' => array(
-				'href' => rest_url( sprintf( 'wp/v2/%s', $base ) ),
-			),
-		) );
+		$response->add_links(
+			array(
+				'collection'              => array(
+					'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
+				),
+				'https://api.w.org/items' => array(
+					'href' => rest_url( sprintf( 'wp/v2/%s', $base ) ),
+				),
+			)
+		);
 
 		/**
 		 * Filters a post type returned from the API.
@@ -201,66 +207,66 @@ class WP_REST_Post_Types_Controller extends WP_REST_Controller {
 	 */
 	public function get_item_schema() {
 		$schema = array(
-			'$schema'              => 'http://json-schema.org/draft-04/schema#',
-			'title'                => 'type',
-			'type'                 => 'object',
-			'properties'           => array(
-				'capabilities'     => array(
-					'description'  => __( 'All capabilities used by the post type.' ),
-					'type'         => 'object',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'type',
+			'type'       => 'object',
+			'properties' => array(
+				'capabilities' => array(
+					'description' => __( 'All capabilities used by the post type.' ),
+					'type'        => 'object',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'description'      => array(
-					'description'  => __( 'A human-readable description of the post type.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+				'description'  => array(
+					'description' => __( 'A human-readable description of the post type.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'hierarchical'     => array(
-					'description'  => __( 'Whether or not the post type should have children.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+				'hierarchical' => array(
+					'description' => __( 'Whether or not the post type should have children.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'labels'           => array(
-					'description'  => __( 'Human-readable labels for the post type for various contexts.' ),
-					'type'         => 'object',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+				'labels'       => array(
+					'description' => __( 'Human-readable labels for the post type for various contexts.' ),
+					'type'        => 'object',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'name'             => array(
-					'description'  => __( 'The title for the post type.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'name'         => array(
+					'description' => __( 'The title for the post type.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
-				'slug'             => array(
-					'description'  => __( 'An alphanumeric identifier for the post type.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'slug'         => array(
+					'description' => __( 'An alphanumeric identifier for the post type.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
-				'supports'         => array(
-					'description'  => __( 'All features, supported by the post type.' ),
-					'type'         => 'object',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+				'supports'     => array(
+					'description' => __( 'All features, supported by the post type.' ),
+					'type'        => 'object',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'taxonomies'       => array(
-					'description'  => __( 'Taxonomies associated with post type.' ),
-					'type'         => 'array',
-					'items'        => array(
+				'taxonomies'   => array(
+					'description' => __( 'Taxonomies associated with post type.' ),
+					'type'        => 'array',
+					'items'       => array(
 						'type' => 'string',
 					),
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'rest_base'            => array(
-					'description'  => __( 'REST base route for the post type.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'rest_base'    => array(
+					'description' => __( 'REST base route for the post type.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
 			),
 		);
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 2a24a9048b..7d8b5d6109 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
@@ -42,7 +42,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	public function __construct( $post_type ) {
 		$this->post_type = $post_type;
 		$this->namespace = 'wp/v2';
-		$obj = get_post_type_object( $post_type );
+		$obj             = get_post_type_object( $post_type );
 		$this->rest_base = ! empty( $obj->rest_base ) ? $obj->rest_base : $obj->name;
 
 		$this->meta = new WP_REST_Post_Meta_Fields( $this->post_type );
@@ -57,25 +57,27 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'                => $this->get_collection_params(),
-			),
-			array(
-				'methods'             => WP_REST_Server::CREATABLE,
-				'callback'            => array( $this, 'create_item' ),
-				'permission_callback' => array( $this, 'create_item_permissions_check' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				array(
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'create_item' ),
+					'permission_callback' => array( $this, 'create_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		$schema = $this->get_item_schema();
+		$schema        = $this->get_item_schema();
 		$get_item_args = array(
-			'context'  => $this->get_context_param( array( 'default' => 'view' ) ),
+			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
 		);
 		if ( isset( $schema['properties']['password'] ) ) {
 			$get_item_args['password'] = array(
@@ -83,39 +85,41 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 				'type'        => 'string',
 			);
 		}
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
-			'args' => array(
-				'id' => array(
-					'description' => __( 'Unique identifier for the object.' ),
-					'type'        => 'integer',
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_item' ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'args'                => $get_item_args,
-			),
-			array(
-				'methods'             => WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'update_item' ),
-				'permission_callback' => array( $this, 'update_item_permissions_check' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-			),
-			array(
-				'methods'             => WP_REST_Server::DELETABLE,
-				'callback'            => array( $this, 'delete_item' ),
-				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
-				'args'                => array(
-					'force' => array(
-						'type'        => 'boolean',
-						'default'     => false,
-						'description' => __( 'Whether to bypass trash and force deletion.' ),
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+				'args'   => array(
+					'id' => array(
+						'description' => __( 'Unique identifier for the object.' ),
+						'type'        => 'integer',
 					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => $get_item_args,
+				),
+				array(
+					'methods'             => WP_REST_Server::EDITABLE,
+					'callback'            => array( $this, 'update_item' ),
+					'permission_callback' => array( $this, 'update_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'delete_item' ),
+					'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+					'args'                => array(
+						'force' => array(
+							'type'        => 'boolean',
+							'default'     => false,
+							'description' => __( 'Whether to bypass trash and force deletion.' ),
+						),
+					),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -159,7 +163,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 		// Retrieve the list of registered collection query parameters.
 		$registered = $this->get_collection_params();
-		$args = array();
+		$args       = array();
 
 		/*
 		 * This array defines mappings between public API query parameters whose
@@ -258,13 +262,13 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 		 * @param array           $args    Key value array of query var to query value.
 		 * @param WP_REST_Request $request The request used.
 		 */
-		$args = apply_filters( "rest_{$this->post_type}_query", $args, $request );
+		$args       = apply_filters( "rest_{$this->post_type}_query", $args, $request );
 		$query_args = $this->prepare_items_query( $args, $request );
 
 		$taxonomies = wp_list_filter( get_object_taxonomies( $this->post_type, 'objects' ), array( 'show_in_rest' => true ) );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			$base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
+			$base        = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
 			$tax_exclude = $base . '_exclude';
 
 			if ( ! empty( $request[ $base ] ) ) {
@@ -311,7 +315,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			remove_filter( 'post_password_required', '__return_false' );
 		}
 
-		$page = (int) $query_args['paged'];
+		$page        = (int) $query_args['paged'];
 		$total_posts = $posts_query->found_posts;
 
 		if ( $total_posts < 1 ) {
@@ -329,13 +333,13 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			return new WP_Error( 'rest_post_invalid_page_number', __( 'The page number requested is larger than the number of pages available.' ), array( 'status' => 400 ) );
 		}
 
-		$response  = rest_ensure_response( $posts );
+		$response = rest_ensure_response( $posts );
 
 		$response->header( 'X-WP-Total', (int) $total_posts );
 		$response->header( 'X-WP-TotalPages', (int) $max_pages );
 
 		$request_params = $request->get_query_params();
-		$base = add_query_arg( $request_params, rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ) );
+		$base           = add_query_arg( $request_params, rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ) );
 
 		if ( $page > 1 ) {
 			$prev_page = $page - 1;
@@ -466,7 +470,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 		$response = rest_ensure_response( $data );
 
 		if ( is_post_type_viewable( get_post_type_object( $post->post_type ) ) ) {
-			$response->link_header( 'alternate',  get_permalink( $post->ID ), array( 'type' => 'text/html' ) );
+			$response->link_header( 'alternate', get_permalink( $post->ID ), array( 'type' => 'text/html' ) );
 		}
 
 		return $response;
@@ -591,7 +595,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			}
 		}
 
-		$post = get_post( $post_id );
+		$post          = get_post( $post_id );
 		$fields_update = $this->update_additional_fields_for_object( $post, $request );
 
 		if ( is_wp_error( $fields_update ) ) {
@@ -717,7 +721,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			}
 		}
 
-		$post = get_post( $post_id );
+		$post          = get_post( $post_id );
 		$fields_update = $this->update_additional_fields_for_object( $post, $request );
 
 		if ( is_wp_error( $fields_update ) ) {
@@ -795,13 +799,17 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 		$request->set_param( 'context', 'edit' );
 
-
 		// If we're forcing, then delete permanently.
 		if ( $force ) {
 			$previous = $this->prepare_item_for_response( $post, $request );
-			$result = wp_delete_post( $id, true );
+			$result   = wp_delete_post( $id, true );
 			$response = new WP_REST_Response();
-			$response->set_data( array( 'deleted' => true, 'previous' => $previous->get_data() ) );
+			$response->set_data(
+				array(
+					'deleted'  => true,
+					'previous' => $previous->get_data(),
+				)
+			);
 		} else {
 			// If we don't support trashing for this type, error out.
 			if ( ! $supports_trash ) {
@@ -816,8 +824,8 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 			// (Note that internally this falls through to `wp_delete_post` if
 			// the trash is disabled.)
-			$result = wp_trash_post( $id );
-			$post = get_post( $id );
+			$result   = wp_trash_post( $id );
+			$post     = get_post( $id );
 			$response = $this->prepare_item_for_response( $post, $request );
 		}
 
@@ -991,14 +999,14 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 			if ( ! empty( $date_data ) ) {
 				list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
-				$prepared_post->edit_date = true;
+				$prepared_post->edit_date                                        = true;
 			}
 		} elseif ( ! empty( $schema['properties']['date_gmt'] ) && ! empty( $request['date_gmt'] ) ) {
 			$date_data = rest_get_date_with_gmt( $request['date_gmt'], true );
 
 			if ( ! empty( $date_data ) ) {
 				list( $prepared_post->post_date, $prepared_post->post_date_gmt ) = $date_data;
-				$prepared_post->edit_date = true;
+				$prepared_post->edit_date                                        = true;
 			}
 		}
 
@@ -1502,7 +1510,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 		if ( ! empty( $schema['properties']['excerpt'] ) ) {
 			/** This filter is documented in wp-includes/post-template.php */
-			$excerpt = apply_filters( 'the_excerpt', apply_filters( 'get_the_excerpt', $post->post_excerpt, $post ) );
+			$excerpt         = apply_filters( 'the_excerpt', apply_filters( 'get_the_excerpt', $post->post_excerpt, $post ) );
 			$data['excerpt'] = array(
 				'raw'       => $post->post_excerpt,
 				'rendered'  => post_password_required( $post ) ? '' : $excerpt,
@@ -1570,7 +1578,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			$base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
 
 			if ( ! empty( $schema['properties'][ $base ] ) ) {
-				$terms = get_the_terms( $post, $taxonomy->name );
+				$terms         = get_the_terms( $post, $taxonomy->name );
 				$data[ $base ] = $terms ? array_values( wp_list_pluck( $terms, 'term_id' ) ) : array();
 			}
 		}
@@ -1626,14 +1634,14 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 		// Entity meta.
 		$links = array(
-			'self' => array(
-				'href'   => rest_url( trailingslashit( $base ) . $post->ID ),
+			'self'       => array(
+				'href' => rest_url( trailingslashit( $base ) . $post->ID ),
 			),
 			'collection' => array(
-				'href'   => rest_url( $base ),
+				'href' => rest_url( $base ),
 			),
 			'about'      => array(
-				'href'   => rest_url( 'wp/v2/types/' . $this->post_type ),
+				'href' => rest_url( 'wp/v2/types/' . $this->post_type ),
 			),
 		);
 
@@ -1736,19 +1744,19 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			'type'       => 'object',
 			// Base properties for every Post.
 			'properties' => array(
-				'date'            => array(
+				'date'         => array(
 					'description' => __( "The date the object was published, in the site's timezone." ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'date_gmt'        => array(
+				'date_gmt'     => array(
 					'description' => __( 'The date the object was published, as GMT.' ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit' ),
 				),
-				'guid'            => array(
+				'guid'         => array(
 					'description' => __( 'The globally unique identifier for the object.' ),
 					'type'        => 'object',
 					'context'     => array( 'view', 'edit' ),
@@ -1768,34 +1776,34 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 						),
 					),
 				),
-				'id'              => array(
+				'id'           => array(
 					'description' => __( 'Unique identifier for the object.' ),
 					'type'        => 'integer',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'link'            => array(
+				'link'         => array(
 					'description' => __( 'URL to the object.' ),
 					'type'        => 'string',
 					'format'      => 'uri',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'modified'        => array(
+				'modified'     => array(
 					'description' => __( "The date the object was last modified, in the site's timezone." ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'modified_gmt'    => array(
+				'modified_gmt' => array(
 					'description' => __( 'The date the object was last modified, as GMT.' ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'slug'            => array(
+				'slug'         => array(
 					'description' => __( 'An alphanumeric identifier for the object unique to its type.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
@@ -1803,19 +1811,19 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 						'sanitize_callback' => array( $this, 'sanitize_slug' ),
 					),
 				),
-				'status'          => array(
+				'status'       => array(
 					'description' => __( 'A named status for the object.' ),
 					'type'        => 'string',
 					'enum'        => array_keys( get_post_stati( array( 'internal' => false ) ) ),
 					'context'     => array( 'view', 'edit' ),
 				),
-				'type'            => array(
+				'type'         => array(
 					'description' => __( 'Type of Post for the object.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
 					'readonly'    => true,
 				),
-				'password'        => array(
+				'password'     => array(
 					'description' => __( 'A password to protect access to the content and excerpt.' ),
 					'type'        => 'string',
 					'context'     => array( 'edit' ),
@@ -1845,8 +1853,8 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			'post-formats',
 			'custom-fields',
 		);
-		$fixed_schemas = array(
-			'post' => array(
+		$fixed_schemas        = array(
+			'post'       => array(
 				'title',
 				'editor',
 				'author',
@@ -1857,7 +1865,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 				'post-formats',
 				'custom-fields',
 			),
-			'page' => array(
+			'page'       => array(
 				'title',
 				'editor',
 				'author',
@@ -1895,7 +1903,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 							'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()
 						),
 						'properties'  => array(
-							'raw' => array(
+							'raw'      => array(
 								'description' => __( 'Title for the object, as it exists in the database.' ),
 								'type'        => 'string',
 								'context'     => array( 'edit' ),
@@ -1920,18 +1928,18 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 							'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()
 						),
 						'properties'  => array(
-							'raw' => array(
+							'raw'       => array(
 								'description' => __( 'Content for the object, as it exists in the database.' ),
 								'type'        => 'string',
 								'context'     => array( 'edit' ),
 							),
-							'rendered' => array(
+							'rendered'  => array(
 								'description' => __( 'HTML content for the object, transformed for display.' ),
 								'type'        => 'string',
 								'context'     => array( 'view', 'edit' ),
 								'readonly'    => true,
 							),
-							'protected'       => array(
+							'protected' => array(
 								'description' => __( 'Whether the content is protected with a password.' ),
 								'type'        => 'boolean',
 								'context'     => array( 'view', 'edit', 'embed' ),
@@ -1959,18 +1967,18 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 							'validate_callback' => null, // Note: validation implemented in self::prepare_item_for_database()
 						),
 						'properties'  => array(
-							'raw' => array(
+							'raw'       => array(
 								'description' => __( 'Excerpt for the object, as it exists in the database.' ),
 								'type'        => 'string',
 								'context'     => array( 'edit' ),
 							),
-							'rendered' => array(
+							'rendered'  => array(
 								'description' => __( 'HTML excerpt for the object, transformed for display.' ),
 								'type'        => 'string',
 								'context'     => array( 'view', 'edit', 'embed' ),
 								'readonly'    => true,
 							),
-							'protected'       => array(
+							'protected' => array(
 								'description' => __( 'Whether the excerpt is protected with a password.' ),
 								'type'        => 'boolean',
 								'context'     => array( 'view', 'edit', 'embed' ),
@@ -1995,7 +2003,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 						'enum'        => array( 'open', 'closed' ),
 						'context'     => array( 'view', 'edit' ),
 					);
-					$schema['properties']['ping_status'] = array(
+					$schema['properties']['ping_status']    = array(
 						'description' => __( 'Whether or not the object can be pinged.' ),
 						'type'        => 'string',
 						'enum'        => array( 'open', 'closed' ),
@@ -2049,13 +2057,13 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 		$taxonomies = wp_list_filter( get_object_taxonomies( $this->post_type, 'objects' ), array( 'show_in_rest' => true ) );
 		foreach ( $taxonomies as $taxonomy ) {
-			$base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
+			$base                          = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
 			$schema['properties'][ $base ] = array(
 				/* translators: %s: taxonomy name */
 				'description' => sprintf( __( 'The terms assigned to the object in the %s taxonomy.' ), $taxonomy->name ),
 				'type'        => 'array',
 				'items'       => array(
-					'type'    => 'integer',
+					'type' => 'integer',
 				),
 				'context'     => array( 'view', 'edit' ),
 			);
@@ -2077,78 +2085,78 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 		$query_params['context']['default'] = 'view';
 
 		$query_params['after'] = array(
-			'description'        => __( 'Limit response to posts published after a given ISO8601 compliant date.' ),
-			'type'               => 'string',
-			'format'             => 'date-time',
+			'description' => __( 'Limit response to posts published after a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
 		);
 
 		if ( post_type_supports( $this->post_type, 'author' ) ) {
-			$query_params['author'] = array(
-				'description'         => __( 'Limit result set to posts assigned to specific authors.' ),
-				'type'                => 'array',
-				'items'               => array(
-					'type'            => 'integer',
+			$query_params['author']         = array(
+				'description' => __( 'Limit result set to posts assigned to specific authors.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
 				),
-				'default'             => array(),
+				'default'     => array(),
 			);
 			$query_params['author_exclude'] = array(
-				'description'         => __( 'Ensure result set excludes posts assigned to specific authors.' ),
-				'type'                => 'array',
-				'items'               => array(
-					'type'            => 'integer',
+				'description' => __( 'Ensure result set excludes posts assigned to specific authors.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
 				),
-				'default'             => array(),
+				'default'     => array(),
 			);
 		}
 
 		$query_params['before'] = array(
-			'description'        => __( 'Limit response to posts published before a given ISO8601 compliant date.' ),
-			'type'               => 'string',
-			'format'             => 'date-time',
+			'description' => __( 'Limit response to posts published before a given ISO8601 compliant date.' ),
+			'type'        => 'string',
+			'format'      => 'date-time',
 		);
 
 		$query_params['exclude'] = array(
-			'description'        => __( 'Ensure result set excludes specific IDs.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'           => 'integer',
+			'description' => __( 'Ensure result set excludes specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'            => array(),
+			'default'     => array(),
 		);
 
 		$query_params['include'] = array(
-			'description'        => __( 'Limit result set to specific IDs.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'           => 'integer',
+			'description' => __( 'Limit result set to specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'            => array(),
+			'default'     => array(),
 		);
 
 		if ( 'page' === $this->post_type || post_type_supports( $this->post_type, 'page-attributes' ) ) {
 			$query_params['menu_order'] = array(
-				'description'        => __( 'Limit result set to posts with a specific menu_order value.' ),
-				'type'               => 'integer',
+				'description' => __( 'Limit result set to posts with a specific menu_order value.' ),
+				'type'        => 'integer',
 			);
 		}
 
 		$query_params['offset'] = array(
-			'description'        => __( 'Offset the result set by a specific number of items.' ),
-			'type'               => 'integer',
+			'description' => __( 'Offset the result set by a specific number of items.' ),
+			'type'        => 'integer',
 		);
 
 		$query_params['order'] = array(
-			'description'        => __( 'Order sort attribute ascending or descending.' ),
-			'type'               => 'string',
-			'default'            => 'desc',
-			'enum'               => array( 'asc', 'desc' ),
+			'description' => __( 'Order sort attribute ascending or descending.' ),
+			'type'        => 'string',
+			'default'     => 'desc',
+			'enum'        => array( 'asc', 'desc' ),
 		);
 
 		$query_params['orderby'] = array(
-			'description'        => __( 'Sort collection by object attribute.' ),
-			'type'               => 'string',
-			'default'            => 'date',
-			'enum'               => array(
+			'description' => __( 'Sort collection by object attribute.' ),
+			'type'        => 'string',
+			'default'     => 'date',
+			'enum'        => array(
 				'author',
 				'date',
 				'id',
@@ -2169,21 +2177,21 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 		$post_type = get_post_type_object( $this->post_type );
 
 		if ( $post_type->hierarchical || 'attachment' === $this->post_type ) {
-			$query_params['parent'] = array(
-				'description'       => __( 'Limit result set to items with particular parent IDs.' ),
-				'type'              => 'array',
-				'items'             => array(
-					'type'          => 'integer',
+			$query_params['parent']         = array(
+				'description' => __( 'Limit result set to items with particular parent IDs.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
 				),
-				'default'           => array(),
+				'default'     => array(),
 			);
 			$query_params['parent_exclude'] = array(
-				'description'       => __( 'Limit result set to all items except those of a particular parent ID.' ),
-				'type'              => 'array',
-				'items'             => array(
-					'type'          => 'integer',
+				'description' => __( 'Limit result set to all items except those of a particular parent ID.' ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
 				),
-				'default'           => array(),
+				'default'     => array(),
 			);
 		}
 
@@ -2191,7 +2199,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			'description'       => __( 'Limit result set to posts with one or more specific slugs.' ),
 			'type'              => 'array',
 			'items'             => array(
-				'type'          => 'string',
+				'type' => 'string',
 			),
 			'sanitize_callback' => 'wp_parse_slug_list',
 		);
@@ -2201,8 +2209,8 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 			'description'       => __( 'Limit result set to posts assigned one or more statuses.' ),
 			'type'              => 'array',
 			'items'             => array(
-				'enum'          => array_merge( array_keys( get_post_stati() ), array( 'any' ) ),
-				'type'          => 'string',
+				'enum' => array_merge( array_keys( get_post_stati() ), array( 'any' ) ),
+				'type' => 'string',
 			),
 			'sanitize_callback' => array( $this, 'sanitize_post_statuses' ),
 		);
@@ -2214,12 +2222,12 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 
 			$query_params[ $base ] = array(
 				/* translators: %s: taxonomy name */
-				'description'       => sprintf( __( 'Limit result set to all items that have the specified term assigned in the %s taxonomy.' ), $base ),
-				'type'              => 'array',
-				'items'             => array(
-					'type'          => 'integer',
+				'description' => sprintf( __( 'Limit result set to all items that have the specified term assigned in the %s taxonomy.' ), $base ),
+				'type'        => 'array',
+				'items'       => array(
+					'type' => 'integer',
 				),
-				'default'           => array(),
+				'default'     => array(),
 			);
 
 			$query_params[ $base . '_exclude' ] = array(
@@ -2227,16 +2235,16 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 				'description' => sprintf( __( 'Limit result set to all items except those that have the specified term assigned in the %s taxonomy.' ), $base ),
 				'type'        => 'array',
 				'items'       => array(
-					'type'    => 'integer',
+					'type' => 'integer',
 				),
-				'default'           => array(),
+				'default'     => array(),
 			);
 		}
 
 		if ( 'post' === $this->post_type ) {
 			$query_params['sticky'] = array(
-				'description'       => __( 'Limit result set to items that are sticky.' ),
-				'type'              => 'boolean',
+				'description' => __( 'Limit result set to items that are sticky.' ),
+				'type'        => 'boolean',
 			);
 		}
 
@@ -2273,7 +2281,7 @@ class WP_REST_Posts_Controller extends WP_REST_Controller {
 		$statuses = wp_parse_slug_list( $statuses );
 
 		// The default status is different in WP_REST_Attachments_Controller
-		$attributes = $request->get_attributes();
+		$attributes     = $request->get_attributes();
 		$default_status = $attributes['args']['status']['default'];
 
 		foreach ( $statuses as $status ) {
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 298fcc5748..471c4c4b4f 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
@@ -48,12 +48,12 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 	 * @param string $parent_post_type Post type of the parent.
 	 */
 	public function __construct( $parent_post_type ) {
-		$this->parent_post_type = $parent_post_type;
+		$this->parent_post_type  = $parent_post_type;
 		$this->parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
-		$this->namespace = 'wp/v2';
-		$this->rest_base = 'revisions';
-		$post_type_object = get_post_type_object( $parent_post_type );
-		$this->parent_base = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
+		$this->namespace         = 'wp/v2';
+		$this->rest_base         = 'revisions';
+		$post_type_object        = get_post_type_object( $parent_post_type );
+		$this->parent_base       = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
 	}
 
 	/**
@@ -65,55 +65,59 @@ 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(
-			'args' => array(
-				'parent' => array(
-					'description' => __( 'The ID for the parent of the object.' ),
-					'type'        => 'integer',
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'                => $this->get_collection_params(),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
-
-		register_rest_route( $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.' ),
-					'type'        => 'integer',
-				),
-				'id' => array(
-					'description' => __( 'Unique identifier for the object.' ),
-					'type'        => 'integer',
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_item' ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'args'                => array(
-					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::DELETABLE,
-				'callback'            => array( $this, 'delete_item' ),
-				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
-				'args'                => array(
-					'force' => array(
-						'type'        => 'boolean',
-						'default'     => false,
-						'description' => __( 'Required to be true, as revisions do not support trashing.' ),
+		register_rest_route(
+			$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.' ),
+						'type'        => 'integer',
 					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		));
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
+
+		register_rest_route(
+			$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.' ),
+						'type'        => 'integer',
+					),
+					'id'     => array(
+						'description' => __( 'Unique identifier for the object.' ),
+						'type'        => 'integer',
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => array(
+						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'delete_item' ),
+					'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+					'args'                => array(
+						'force' => array(
+							'type'        => 'boolean',
+							'default'     => false,
+							'description' => __( 'Required to be true, as revisions do not support trashing.' ),
+						),
+					),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
 	}
 
@@ -201,7 +205,7 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 
 		$response = array();
 		foreach ( $revisions as $revision ) {
-			$data = $this->prepare_item_for_response( $revision, $request );
+			$data       = $this->prepare_item_for_response( $revision, $request );
 			$response[] = $this->prepare_response_for_collection( $data );
 		}
 		return rest_ensure_response( $response );
@@ -313,7 +317,12 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 		}
 
 		$response = new WP_REST_Response();
-		$response->set_data( array( 'deleted' => true, 'previous' => $previous->get_data() ) );
+		$response->set_data(
+			array(
+				'deleted'  => true,
+				'previous' => $previous->get_data(),
+			)
+		);
 		return $response;
 	}
 
@@ -398,9 +407,9 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 			);
 		}
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data = $this->add_additional_fields_to_object( $data, $request );
-		$data = $this->filter_response_by_context( $data, $context );
+		$context  = ! empty( $request['context'] ) ? $request['context'] : 'view';
+		$data     = $this->add_additional_fields_to_object( $data, $request );
+		$data     = $this->filter_response_by_context( $data, $context );
 		$response = rest_ensure_response( $data );
 
 		if ( ! empty( $data['parent'] ) ) {
@@ -457,51 +466,51 @@ class WP_REST_Revisions_Controller extends WP_REST_Controller {
 			'type'       => 'object',
 			// Base properties for every Revision.
 			'properties' => array(
-				'author'          => array(
+				'author'       => array(
 					'description' => __( 'The ID for the author of the object.' ),
 					'type'        => 'integer',
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'date'            => array(
+				'date'         => array(
 					'description' => __( "The date the object was published, in the site's timezone." ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'date_gmt'        => array(
+				'date_gmt'     => array(
 					'description' => __( 'The date the object was published, as GMT.' ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit' ),
 				),
-				'guid'            => array(
+				'guid'         => array(
 					'description' => __( 'GUID for the object, as it exists in the database.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit' ),
 				),
-				'id'              => array(
+				'id'           => array(
 					'description' => __( 'Unique identifier for the object.' ),
 					'type'        => 'integer',
 					'context'     => array( 'view', 'edit', 'embed' ),
 				),
-				'modified'        => array(
+				'modified'     => array(
 					'description' => __( "The date the object was last modified, in the site's timezone." ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit' ),
 				),
-				'modified_gmt'    => array(
+				'modified_gmt' => array(
 					'description' => __( 'The date the object was last modified, as GMT.' ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'view', 'edit' ),
 				),
-				'parent'          => array(
+				'parent'       => array(
 					'description' => __( 'The ID for the parent of the object.' ),
 					'type'        => 'integer',
 					'context'     => array( 'view', 'edit', 'embed' ),
-					),
-				'slug'            => array(
+				),
+				'slug'         => array(
 					'description' => __( 'An alphanumeric identifier for the object unique to its type.' ),
 					'type'        => 'string',
 					'context'     => array( 'view', 'edit', 'embed' ),
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 82a22101f2..1a38261a08 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
@@ -35,21 +35,23 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_item' ),
-				'args'                => array(),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-			),
-			array(
-				'methods'             => WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'update_item' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'args'                => array(),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				),
+				array(
+					'methods'             => WP_REST_Server::EDITABLE,
+					'callback'            => array( $this, 'update_item' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
 	}
 
@@ -139,7 +141,7 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 	public function update_item( $request ) {
 		$options = $this->get_registered_options();
 
-		$params  = $request->get_params();
+		$params = $request->get_params();
 
 		foreach ( $options as $name => $args ) {
 			if ( ! array_key_exists( $name, $params ) ) {
@@ -232,7 +234,7 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 				'default'     => isset( $args['default'] ) ? $args['default'] : null,
 			);
 
-			$rest_args['schema'] = array_merge( $default_schema, $rest_args['schema'] );
+			$rest_args['schema']      = array_merge( $default_schema, $rest_args['schema'] );
 			$rest_args['option_name'] = $name;
 
 			// Skip over settings that don't have a defined type in the schema.
@@ -274,7 +276,7 @@ class WP_REST_Settings_Controller extends WP_REST_Controller {
 		);
 
 		foreach ( $options as $option_name => $option ) {
-			$schema['properties'][ $option_name ] = $option['schema'];
+			$schema['properties'][ $option_name ]                = $option['schema'];
 			$schema['properties'][ $option_name ]['arg_options'] = array(
 				'sanitize_callback' => array( $this, 'sanitize_callback' ),
 			);
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 9720a20945..14384814ee 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
@@ -35,33 +35,37 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'         => WP_REST_Server::READABLE,
-				'callback'        => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'            => $this->get_collection_params(),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<taxonomy>[\w-]+)', array(
-			'args' => array(
-				'taxonomy' => array(
-					'description'  => __( 'An alphanumeric identifier for the taxonomy.' ),
-					'type'         => 'string',
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/(?P<taxonomy>[\w-]+)', array(
+				'args'   => array(
+					'taxonomy' => array(
+						'description' => __( 'An alphanumeric identifier for the taxonomy.' ),
+						'type'        => 'string',
+					),
 				),
-			),
-			array(
-				'methods'         => WP_REST_Server::READABLE,
-				'callback'        => array( $this, 'get_item' ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'args'            => array(
-					'context'     => $this->get_context_param( array( 'default' => 'view' ) ),
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => array(
+						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -112,8 +116,8 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 			if ( empty( $value->show_in_rest ) || ( 'edit' === $request['context'] && ! current_user_can( $value->cap->manage_terms ) ) ) {
 				continue;
 			}
-			$tax = $this->prepare_item_for_response( $value, $request );
-			$tax = $this->prepare_response_for_collection( $tax );
+			$tax               = $this->prepare_item_for_response( $value, $request );
+			$tax               = $this->prepare_response_for_collection( $tax );
 			$data[ $tax_type ] = $tax;
 		}
 
@@ -190,20 +194,22 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 		);
 
 		$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
-		$data = $this->add_additional_fields_to_object( $data, $request );
-		$data = $this->filter_response_by_context( $data, $context );
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
 
 		// Wrap the data in a response object.
 		$response = rest_ensure_response( $data );
 
-		$response->add_links( array(
-			'collection'                => array(
-				'href'                  => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
-			),
-			'https://api.w.org/items'   => array(
-				'href'                  => rest_url( sprintf( 'wp/v2/%s', $base ) ),
-			),
-		) );
+		$response->add_links(
+			array(
+				'collection'              => array(
+					'href' => rest_url( sprintf( '%s/%s', $this->namespace, $this->rest_base ) ),
+				),
+				'https://api.w.org/items' => array(
+					'href' => rest_url( sprintf( 'wp/v2/%s', $base ) ),
+				),
+			)
+		);
 
 		/**
 		 * Filters a taxonomy returned from the REST API.
@@ -228,66 +234,66 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 */
 	public function get_item_schema() {
 		$schema = array(
-			'$schema'              => 'http://json-schema.org/draft-04/schema#',
-			'title'                => 'taxonomy',
-			'type'                 => 'object',
-			'properties'           => array(
-				'capabilities'     => array(
-					'description'  => __( 'All capabilities used by the taxonomy.' ),
-					'type'         => 'object',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => 'taxonomy',
+			'type'       => 'object',
+			'properties' => array(
+				'capabilities' => array(
+					'description' => __( 'All capabilities used by the taxonomy.' ),
+					'type'        => 'object',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'description'      => array(
-					'description'  => __( 'A human-readable description of the taxonomy.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+				'description'  => array(
+					'description' => __( 'A human-readable description of the taxonomy.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'hierarchical'     => array(
-					'description'  => __( 'Whether or not the taxonomy should have children.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+				'hierarchical' => array(
+					'description' => __( 'Whether or not the taxonomy should have children.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'labels'           => array(
-					'description'  => __( 'Human-readable labels for the taxonomy for various contexts.' ),
-					'type'         => 'object',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+				'labels'       => array(
+					'description' => __( 'Human-readable labels for the taxonomy for various contexts.' ),
+					'type'        => 'object',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'name'             => array(
-					'description'  => __( 'The title for the taxonomy.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'name'         => array(
+					'description' => __( 'The title for the taxonomy.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
-				'slug'             => array(
-					'description'  => __( 'An alphanumeric identifier for the taxonomy.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'slug'         => array(
+					'description' => __( 'An alphanumeric identifier for the taxonomy.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
-				'show_cloud'       => array(
-					'description'  => __( 'Whether or not the term cloud should be displayed.' ),
-					'type'         => 'boolean',
-					'context'      => array( 'edit' ),
-					'readonly'     => true,
+				'show_cloud'   => array(
+					'description' => __( 'Whether or not the term cloud should be displayed.' ),
+					'type'        => 'boolean',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
 				),
-				'types'            => array(
-					'description'  => __( 'Types associated with the taxonomy.' ),
-					'type'         => 'array',
-					'items'        => array(
+				'types'        => array(
+					'description' => __( 'Types associated with the taxonomy.' ),
+					'type'        => 'array',
+					'items'       => array(
 						'type' => 'string',
 					),
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
-				'rest_base'            => array(
-					'description'  => __( 'REST base route for the taxonomy.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit', 'embed' ),
-					'readonly'     => true,
+				'rest_base'    => array(
+					'description' => __( 'REST base route for the taxonomy.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit', 'embed' ),
+					'readonly'    => true,
 				),
 			),
 		);
@@ -302,11 +308,11 @@ class WP_REST_Taxonomies_Controller extends WP_REST_Controller {
 	 * @return array Collection parameters.
 	 */
 	public function get_collection_params() {
-		$new_params = array();
+		$new_params            = array();
 		$new_params['context'] = $this->get_context_param( array( 'default' => 'view' ) );
-		$new_params['type'] = array(
-			'description'  => __( 'Limit results to taxonomies associated with a specific post type.' ),
-			'type'         => 'string',
+		$new_params['type']    = array(
+			'description' => __( 'Limit results to taxonomies associated with a specific post type.' ),
+			'type'        => 'string',
 		);
 		return $new_params;
 	}
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 749a6d6870..459ef3e948 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
@@ -56,9 +56,9 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * @param string $taxonomy Taxonomy key.
 	 */
 	public function __construct( $taxonomy ) {
-		$this->taxonomy = $taxonomy;
+		$this->taxonomy  = $taxonomy;
 		$this->namespace = 'wp/v2';
-		$tax_obj = get_taxonomy( $taxonomy );
+		$tax_obj         = get_taxonomy( $taxonomy );
 		$this->rest_base = ! empty( $tax_obj->rest_base ) ? $tax_obj->rest_base : $tax_obj->name;
 
 		$this->meta = new WP_REST_Term_Meta_Fields( $taxonomy );
@@ -73,57 +73,61 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'                => $this->get_collection_params(),
-			),
-			array(
-				'methods'             => WP_REST_Server::CREATABLE,
-				'callback'            => array( $this, 'create_item' ),
-				'permission_callback' => array( $this, 'create_item_permissions_check' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				array(
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'create_item' ),
+					'permission_callback' => array( $this, 'create_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
-			'args' => array(
-				'id' => array(
-					'description' => __( 'Unique identifier for the term.' ),
-					'type'        => 'integer',
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_item' ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'args'                => array(
-					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'update_item' ),
-				'permission_callback' => array( $this, 'update_item_permissions_check' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-			),
-			array(
-				'methods'             => WP_REST_Server::DELETABLE,
-				'callback'            => array( $this, 'delete_item' ),
-				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
-				'args'                => array(
-					'force' => array(
-						'type'        => 'boolean',
-						'default'     => false,
-						'description' => __( 'Required to be true, as terms do not support trashing.' ),
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+				'args'   => array(
+					'id' => array(
+						'description' => __( 'Unique identifier for the term.' ),
+						'type'        => 'integer',
 					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => array(
+						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::EDITABLE,
+					'callback'            => array( $this, 'update_item' ),
+					'permission_callback' => array( $this, 'update_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'delete_item' ),
+					'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+					'args'                => array(
+						'force' => array(
+							'type'        => 'boolean',
+							'default'     => false,
+							'description' => __( 'Required to be true, as terms do not support trashing.' ),
+						),
+					),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -235,7 +239,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 		 */
 		$prepared_args = apply_filters( "rest_{$this->taxonomy}_query", $prepared_args, $request );
 
-		if ( ! empty( $prepared_args['post'] )  ) {
+		if ( ! empty( $prepared_args['post'] ) ) {
 			$query_result = wp_get_object_terms( $prepared_args['post'], $this->taxonomy, $prepared_args );
 
 			// Used when calling wp_count_terms() below.
@@ -258,7 +262,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 		$response = array();
 
 		foreach ( $query_result as $term ) {
-			$data = $this->prepare_item_for_response( $term, $request );
+			$data       = $this->prepare_item_for_response( $term, $request );
 			$response[] = $this->prepare_response_for_collection( $data );
 		}
 
@@ -601,7 +605,12 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 		}
 
 		$response = new WP_REST_Response();
-		$response->set_data( array( 'deleted' => true, 'previous' => $previous->get_data() ) );
+		$response->set_data(
+			array(
+				'deleted'  => true,
+				'previous' => $previous->get_data(),
+			)
+		);
 
 		/**
 		 * Fires after a single term is deleted via the REST API.
@@ -754,7 +763,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 * @return array Links for the given term.
 	 */
 	protected function prepare_links( $term ) {
-		$base = $this->namespace . '/' . $this->rest_base;
+		$base  = $this->namespace . '/' . $this->rest_base;
 		$links = array(
 			'self'       => array(
 				'href' => rest_url( trailingslashit( $base ) . $term->term_id ),
@@ -793,7 +802,7 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 				continue;
 			}
 
-			$rest_base = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
+			$rest_base         = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
 			$post_type_links[] = array(
 				'href' => add_query_arg( $this->rest_base, $term->term_id, rest_url( sprintf( 'wp/v2/%s', $rest_base ) ) ),
 			);
@@ -820,52 +829,52 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 			'type'       => 'object',
 			'properties' => array(
 				'id'          => array(
-					'description'  => __( 'Unique identifier for the term.' ),
-					'type'         => 'integer',
-					'context'      => array( 'view', 'embed', 'edit' ),
-					'readonly'     => true,
+					'description' => __( 'Unique identifier for the term.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'embed', 'edit' ),
+					'readonly'    => true,
 				),
 				'count'       => array(
-					'description'  => __( 'Number of published posts for the term.' ),
-					'type'         => 'integer',
-					'context'      => array( 'view', 'edit' ),
-					'readonly'     => true,
+					'description' => __( 'Number of published posts for the term.' ),
+					'type'        => 'integer',
+					'context'     => array( 'view', 'edit' ),
+					'readonly'    => true,
 				),
 				'description' => array(
-					'description'  => __( 'HTML description of the term.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'edit' ),
+					'description' => __( 'HTML description of the term.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'edit' ),
 				),
 				'link'        => array(
-					'description'  => __( 'URL of the term.' ),
-					'type'         => 'string',
-					'format'       => 'uri',
-					'context'      => array( 'view', 'embed', 'edit' ),
-					'readonly'     => true,
+					'description' => __( 'URL of the term.' ),
+					'type'        => 'string',
+					'format'      => 'uri',
+					'context'     => array( 'view', 'embed', 'edit' ),
+					'readonly'    => true,
 				),
 				'name'        => array(
-					'description'  => __( 'HTML title for the term.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'embed', 'edit' ),
-					'arg_options'  => array(
+					'description' => __( 'HTML title for the term.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'embed', 'edit' ),
+					'arg_options' => array(
 						'sanitize_callback' => 'sanitize_text_field',
 					),
-					'required'     => true,
+					'required'    => true,
 				),
 				'slug'        => array(
-					'description'  => __( 'An alphanumeric identifier for the term unique to its type.' ),
-					'type'         => 'string',
-					'context'      => array( 'view', 'embed', 'edit' ),
-					'arg_options'  => array(
+					'description' => __( 'An alphanumeric identifier for the term unique to its type.' ),
+					'type'        => 'string',
+					'context'     => array( 'view', 'embed', 'edit' ),
+					'arg_options' => array(
 						'sanitize_callback' => array( $this, 'sanitize_slug' ),
 					),
 				),
 				'taxonomy'    => array(
-					'description'  => __( 'Type attribution for the term.' ),
-					'type'         => 'string',
-					'enum'         => array_keys( get_taxonomies() ),
-					'context'      => array( 'view', 'embed', 'edit' ),
-					'readonly'     => true,
+					'description' => __( 'Type attribution for the term.' ),
+					'type'        => 'string',
+					'enum'        => array_keys( get_taxonomies() ),
+					'context'     => array( 'view', 'embed', 'edit' ),
+					'readonly'    => true,
 				),
 			),
 		);
@@ -874,9 +883,9 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 
 		if ( $taxonomy->hierarchical ) {
 			$schema['properties']['parent'] = array(
-				'description'  => __( 'The parent term ID.' ),
-				'type'         => 'integer',
-				'context'      => array( 'view', 'edit' ),
+				'description' => __( 'The parent term ID.' ),
+				'type'        => 'integer',
+				'context'     => array( 'view', 'edit' ),
 			);
 		}
 
@@ -894,50 +903,50 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 	 */
 	public function get_collection_params() {
 		$query_params = parent::get_collection_params();
-		$taxonomy = get_taxonomy( $this->taxonomy );
+		$taxonomy     = get_taxonomy( $this->taxonomy );
 
 		$query_params['context']['default'] = 'view';
 
 		$query_params['exclude'] = array(
-			'description'       => __( 'Ensure result set excludes specific IDs.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'integer',
+			'description' => __( 'Ensure result set excludes specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'           => array(),
+			'default'     => array(),
 		);
 
 		$query_params['include'] = array(
-			'description'       => __( 'Limit result set to specific IDs.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'integer',
+			'description' => __( 'Limit result set to specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'           => array(),
+			'default'     => array(),
 		);
 
 		if ( ! $taxonomy->hierarchical ) {
 			$query_params['offset'] = array(
-				'description'       => __( 'Offset the result set by a specific number of items.' ),
-				'type'              => 'integer',
+				'description' => __( 'Offset the result set by a specific number of items.' ),
+				'type'        => 'integer',
 			);
 		}
 
 		$query_params['order'] = array(
-			'description'       => __( 'Order sort attribute ascending or descending.' ),
-			'type'              => 'string',
-			'default'           => 'asc',
-			'enum'              => array(
+			'description' => __( 'Order sort attribute ascending or descending.' ),
+			'type'        => 'string',
+			'default'     => 'asc',
+			'enum'        => array(
 				'asc',
 				'desc',
 			),
 		);
 
 		$query_params['orderby'] = array(
-			'description'       => __( 'Sort collection by term attribute.' ),
-			'type'              => 'string',
-			'default'           => 'name',
-			'enum'              => array(
+			'description' => __( 'Sort collection by term attribute.' ),
+			'type'        => 'string',
+			'default'     => 'name',
+			'enum'        => array(
 				'id',
 				'include',
 				'name',
@@ -950,29 +959,29 @@ class WP_REST_Terms_Controller extends WP_REST_Controller {
 		);
 
 		$query_params['hide_empty'] = array(
-			'description'       => __( 'Whether to hide terms not assigned to any posts.' ),
-			'type'              => 'boolean',
-			'default'           => false,
+			'description' => __( 'Whether to hide terms not assigned to any posts.' ),
+			'type'        => 'boolean',
+			'default'     => false,
 		);
 
 		if ( $taxonomy->hierarchical ) {
 			$query_params['parent'] = array(
-				'description'       => __( 'Limit result set to terms assigned to a specific parent.' ),
-				'type'              => 'integer',
+				'description' => __( 'Limit result set to terms assigned to a specific parent.' ),
+				'type'        => 'integer',
 			);
 		}
 
 		$query_params['post'] = array(
-			'description'       => __( 'Limit result set to terms assigned to a specific post.' ),
-			'type'              => 'integer',
-			'default'           => null,
+			'description' => __( 'Limit result set to terms assigned to a specific post.' ),
+			'type'        => 'integer',
+			'default'     => null,
 		);
 
 		$query_params['slug'] = array(
-			'description'       => __( 'Limit result set to terms with one or more specific slugs.' ),
-			'type'              => 'array',
-			'items'             => array(
-				'type'          => 'string'
+			'description' => __( 'Limit result set to terms with one or more specific slugs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'string',
 			),
 		);
 
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 c7c32a73db..e741b2149d 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
@@ -45,98 +45,104 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 */
 	public function register_routes() {
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base, array(
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_items' ),
-				'permission_callback' => array( $this, 'get_items_permissions_check' ),
-				'args'                => $this->get_collection_params(),
-			),
-			array(
-				'methods'             => WP_REST_Server::CREATABLE,
-				'callback'            => array( $this, 'create_item' ),
-				'permission_callback' => array( $this, 'create_item_permissions_check' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base, array(
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				array(
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'create_item' ),
+					'permission_callback' => array( $this, 'create_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
-			'args' => array(
-				'id' => array(
-					'description' => __( 'Unique identifier for the user.' ),
-					'type'        => 'integer',
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_item' ),
-				'permission_callback' => array( $this, 'get_item_permissions_check' ),
-				'args'                => array(
-					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'update_item' ),
-				'permission_callback' => array( $this, 'update_item_permissions_check' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-			),
-			array(
-				'methods'             => WP_REST_Server::DELETABLE,
-				'callback'            => array( $this, 'delete_item' ),
-				'permission_callback' => array( $this, 'delete_item_permissions_check' ),
-				'args'                => array(
-					'force'    => array(
-						'type'        => 'boolean',
-						'default'     => false,
-						'description' => __( 'Required to be true, as users do not support trashing.' ),
-					),
-					'reassign' => array(
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/(?P<id>[\d]+)', array(
+				'args'   => array(
+					'id' => array(
+						'description' => __( 'Unique identifier for the user.' ),
 						'type'        => 'integer',
-						'description' => __( 'Reassign the deleted user\'s posts and links to this user ID.' ),
-						'required'    => true,
-						'sanitize_callback' => array( $this, 'check_reassign' ),
 					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		) );
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => array(
+						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::EDITABLE,
+					'callback'            => array( $this, 'update_item' ),
+					'permission_callback' => array( $this, 'update_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'delete_item' ),
+					'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+					'args'                => array(
+						'force'    => array(
+							'type'        => 'boolean',
+							'default'     => false,
+							'description' => __( 'Required to be true, as users do not support trashing.' ),
+						),
+						'reassign' => array(
+							'type'              => 'integer',
+							'description'       => __( 'Reassign the deleted user\'s posts and links to this user ID.' ),
+							'required'          => true,
+							'sanitize_callback' => array( $this, 'check_reassign' ),
+						),
+					),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 
-		register_rest_route( $this->namespace, '/' . $this->rest_base . '/me', array(
-			array(
-				'methods'             => WP_REST_Server::READABLE,
-				'callback'            => array( $this, 'get_current_item' ),
-				'args'                => array(
-					'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-				),
-			),
-			array(
-				'methods'             => WP_REST_Server::EDITABLE,
-				'callback'            => array( $this, 'update_current_item' ),
-				'permission_callback' => array( $this, 'update_current_item_permissions_check' ),
-				'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
-			),
-			array(
-				'methods'             => WP_REST_Server::DELETABLE,
-				'callback'            => array( $this, 'delete_current_item' ),
-				'permission_callback' => array( $this, 'delete_current_item_permissions_check' ),
-				'args'                => array(
-					'force'    => array(
-						'type'        => 'boolean',
-						'default'     => false,
-						'description' => __( 'Required to be true, as users do not support trashing.' ),
-					),
-					'reassign' => array(
-						'type'        => 'integer',
-						'description' => __( 'Reassign the deleted user\'s posts and links to this user ID.' ),
-						'required'    => true,
-						'sanitize_callback' => array( $this, 'check_reassign' ),
+		register_rest_route(
+			$this->namespace, '/' . $this->rest_base . '/me', array(
+				array(
+					'methods'  => WP_REST_Server::READABLE,
+					'callback' => array( $this, 'get_current_item' ),
+					'args'     => array(
+						'context' => $this->get_context_param( array( 'default' => 'view' ) ),
 					),
 				),
-			),
-			'schema' => array( $this, 'get_public_item_schema' ),
-		));
+				array(
+					'methods'             => WP_REST_Server::EDITABLE,
+					'callback'            => array( $this, 'update_current_item' ),
+					'permission_callback' => array( $this, 'update_current_item_permissions_check' ),
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::EDITABLE ),
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'delete_current_item' ),
+					'permission_callback' => array( $this, 'delete_current_item_permissions_check' ),
+					'args'                => array(
+						'force'    => array(
+							'type'        => 'boolean',
+							'default'     => false,
+							'description' => __( 'Required to be true, as users do not support trashing.' ),
+						),
+						'reassign' => array(
+							'type'              => 'integer',
+							'description'       => __( 'Reassign the deleted user\'s posts and links to this user ID.' ),
+							'required'          => true,
+							'sanitize_callback' => array( $this, 'check_reassign' ),
+						),
+					),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
 	}
 
 	/**
@@ -233,11 +239,11 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		if ( isset( $registered['offset'] ) && ! empty( $request['offset'] ) ) {
 			$prepared_args['offset'] = $request['offset'];
 		} else {
-			$prepared_args['offset']  = ( $request['page'] - 1 ) * $prepared_args['number'];
+			$prepared_args['offset'] = ( $request['page'] - 1 ) * $prepared_args['number'];
 		}
 
 		if ( isset( $registered['orderby'] ) ) {
-			$orderby_possibles = array(
+			$orderby_possibles        = array(
 				'id'              => 'ID',
 				'include'         => 'include',
 				'name'            => 'display_name',
@@ -274,7 +280,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		$users = array();
 
 		foreach ( $query->results as $user ) {
-			$data = $this->prepare_item_for_response( $user, $request );
+			$data    = $this->prepare_item_for_response( $user, $request );
 			$users[] = $this->prepare_response_for_collection( $data );
 		}
 
@@ -391,7 +397,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 			return $user;
 		}
 
-		$user = $this->prepare_item_for_response( $user, $request );
+		$user     = $this->prepare_item_for_response( $user, $request );
 		$response = rest_ensure_response( $user );
 
 		return $response;
@@ -416,7 +422,6 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		$response = $this->prepare_item_for_response( $user, $request );
 		$response = rest_ensure_response( $response );
 
-
 		return $response;
 	}
 
@@ -493,7 +498,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 				return $user_id;
 			}
 
-			$result= add_user_to_blog( get_site()->id, $user_id, '' );
+			$result = add_user_to_blog( get_site()->id, $user_id, '' );
 			if ( is_wp_error( $result ) ) {
 				return $result;
 			}
@@ -530,7 +535,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 			}
 		}
 
-		$user = get_user_by( 'id', $user_id );
+		$user          = get_user_by( 'id', $user_id );
 		$fields_update = $this->update_additional_fields_for_object( $user, $request );
 
 		if ( is_wp_error( $fields_update ) ) {
@@ -653,7 +658,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 			}
 		}
 
-		$user = get_user_by( 'id', $user_id );
+		$user          = get_user_by( 'id', $user_id );
 		$fields_update = $this->update_additional_fields_for_object( $user, $request );
 
 		if ( is_wp_error( $fields_update ) ) {
@@ -765,7 +770,12 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		}
 
 		$response = new WP_REST_Response();
-		$response->set_data( array( 'deleted' => true, 'previous' => $previous->get_data() ) );
+		$response->set_data(
+			array(
+				'deleted'  => true,
+				'previous' => $previous->get_data(),
+			)
+		);
 
 		/**
 		 * Fires immediately after a user is deleted via the REST API.
@@ -928,7 +938,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 	 */
 	protected function prepare_links( $user ) {
 		$links = array(
-			'self' => array(
+			'self'       => array(
 				'href' => rest_url( sprintf( '%s/%s/%d', $this->namespace, $this->rest_base, $user->ID ) ),
 			),
 			'collection' => array(
@@ -1114,7 +1124,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 			return new WP_Error( 'rest_user_invalid_password', __( 'Passwords cannot be empty.' ), array( 'status' => 400 ) );
 		}
 
-		if ( false !== strpos( $password, "\\" ) ) {
+		if ( false !== strpos( $password, '\\' ) ) {
 			return new WP_Error( 'rest_user_invalid_password', __( 'Passwords cannot contain the "\\" character.' ), array( 'status' => 400 ) );
 		}
 
@@ -1134,13 +1144,13 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 			'title'      => 'user',
 			'type'       => 'object',
 			'properties' => array(
-				'id'          => array(
+				'id'                 => array(
 					'description' => __( 'Unique identifier for the user.' ),
 					'type'        => 'integer',
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'username'    => array(
+				'username'           => array(
 					'description' => __( 'Login name for the user.' ),
 					'type'        => 'string',
 					'context'     => array( 'edit' ),
@@ -1149,7 +1159,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 						'sanitize_callback' => array( $this, 'check_username' ),
 					),
 				),
-				'name'        => array(
+				'name'               => array(
 					'description' => __( 'Display name for the user.' ),
 					'type'        => 'string',
 					'context'     => array( 'embed', 'view', 'edit' ),
@@ -1157,7 +1167,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 						'sanitize_callback' => 'sanitize_text_field',
 					),
 				),
-				'first_name'  => array(
+				'first_name'         => array(
 					'description' => __( 'First name for the user.' ),
 					'type'        => 'string',
 					'context'     => array( 'edit' ),
@@ -1165,7 +1175,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 						'sanitize_callback' => 'sanitize_text_field',
 					),
 				),
-				'last_name'   => array(
+				'last_name'          => array(
 					'description' => __( 'Last name for the user.' ),
 					'type'        => 'string',
 					'context'     => array( 'edit' ),
@@ -1173,38 +1183,38 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 						'sanitize_callback' => 'sanitize_text_field',
 					),
 				),
-				'email'       => array(
+				'email'              => array(
 					'description' => __( 'The email address for the user.' ),
 					'type'        => 'string',
 					'format'      => 'email',
 					'context'     => array( 'edit' ),
 					'required'    => true,
 				),
-				'url'         => array(
+				'url'                => array(
 					'description' => __( 'URL of the user.' ),
 					'type'        => 'string',
 					'format'      => 'uri',
 					'context'     => array( 'embed', 'view', 'edit' ),
 				),
-				'description' => array(
+				'description'        => array(
 					'description' => __( 'Description of the user.' ),
 					'type'        => 'string',
 					'context'     => array( 'embed', 'view', 'edit' ),
 				),
-				'link'        => array(
+				'link'               => array(
 					'description' => __( 'Author URL of the user.' ),
 					'type'        => 'string',
 					'format'      => 'uri',
 					'context'     => array( 'embed', 'view', 'edit' ),
 					'readonly'    => true,
 				),
-				'locale'    => array(
+				'locale'             => array(
 					'description' => __( 'Locale for the user.' ),
 					'type'        => 'string',
 					'enum'        => array_merge( array( '', 'en_US' ), get_available_languages() ),
 					'context'     => array( 'edit' ),
 				),
-				'nickname'    => array(
+				'nickname'           => array(
 					'description' => __( 'The nickname for the user.' ),
 					'type'        => 'string',
 					'context'     => array( 'edit' ),
@@ -1212,7 +1222,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 						'sanitize_callback' => 'sanitize_text_field',
 					),
 				),
-				'slug'        => array(
+				'slug'               => array(
 					'description' => __( 'An alphanumeric identifier for the user.' ),
 					'type'        => 'string',
 					'context'     => array( 'embed', 'view', 'edit' ),
@@ -1220,22 +1230,22 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 						'sanitize_callback' => array( $this, 'sanitize_slug' ),
 					),
 				),
-				'registered_date' => array(
+				'registered_date'    => array(
 					'description' => __( 'Registration date for the user.' ),
 					'type'        => 'string',
 					'format'      => 'date-time',
 					'context'     => array( 'edit' ),
 					'readonly'    => true,
 				),
-				'roles'           => array(
+				'roles'              => array(
 					'description' => __( 'Roles assigned to the user.' ),
 					'type'        => 'array',
 					'items'       => array(
-						'type'    => 'string',
+						'type' => 'string',
 					),
 					'context'     => array( 'edit' ),
 				),
-				'password'        => array(
+				'password'           => array(
 					'description' => __( 'Password for the user (never included).' ),
 					'type'        => 'string',
 					'context'     => array(), // Password is never displayed.
@@ -1244,7 +1254,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 						'sanitize_callback' => array( $this, 'check_user_password' ),
 					),
 				),
-				'capabilities'    => array(
+				'capabilities'       => array(
 					'description' => __( 'All capabilities assigned to the user.' ),
 					'type'        => 'object',
 					'context'     => array( 'edit' ),
@@ -1274,7 +1284,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 				);
 			}
 
-			$schema['properties']['avatar_urls']  = array(
+			$schema['properties']['avatar_urls'] = array(
 				'description' => __( 'Avatar URLs for the user.' ),
 				'type'        => 'object',
 				'context'     => array( 'embed', 'view', 'edit' ),
@@ -1301,39 +1311,39 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 		$query_params['context']['default'] = 'view';
 
 		$query_params['exclude'] = array(
-			'description'        => __( 'Ensure result set excludes specific IDs.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'           => 'integer',
+			'description' => __( 'Ensure result set excludes specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'            => array(),
+			'default'     => array(),
 		);
 
 		$query_params['include'] = array(
-			'description'        => __( 'Limit result set to specific IDs.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'           => 'integer',
+			'description' => __( 'Limit result set to specific IDs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'integer',
 			),
-			'default'            => array(),
+			'default'     => array(),
 		);
 
 		$query_params['offset'] = array(
-			'description'        => __( 'Offset the result set by a specific number of items.' ),
-			'type'               => 'integer',
+			'description' => __( 'Offset the result set by a specific number of items.' ),
+			'type'        => 'integer',
 		);
 
 		$query_params['order'] = array(
-			'default'            => 'asc',
-			'description'        => __( 'Order sort attribute ascending or descending.' ),
-			'enum'               => array( 'asc', 'desc' ),
-			'type'               => 'string',
+			'default'     => 'asc',
+			'description' => __( 'Order sort attribute ascending or descending.' ),
+			'enum'        => array( 'asc', 'desc' ),
+			'type'        => 'string',
 		);
 
 		$query_params['orderby'] = array(
-			'default'            => 'name',
-			'description'        => __( 'Sort collection by object attribute.' ),
-			'enum'               => array(
+			'default'     => 'name',
+			'description' => __( 'Sort collection by object attribute.' ),
+			'enum'        => array(
 				'id',
 				'include',
 				'name',
@@ -1343,22 +1353,22 @@ class WP_REST_Users_Controller extends WP_REST_Controller {
 				'email',
 				'url',
 			),
-			'type'               => 'string',
+			'type'        => 'string',
 		);
 
-		$query_params['slug']    = array(
-			'description'        => __( 'Limit result set to users with one or more specific slugs.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'               => 'string',
+		$query_params['slug'] = array(
+			'description' => __( 'Limit result set to users with one or more specific slugs.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'string',
 			),
 		);
 
-		$query_params['roles']   = array(
-			'description'        => __( 'Limit result set to users matching at least one specific role provided. Accepts csv list or single role.' ),
-			'type'               => 'array',
-			'items'              => array(
-				'type'           => 'string',
+		$query_params['roles'] = array(
+			'description' => __( 'Limit result set to users matching at least one specific role provided. Accepts csv list or single role.' ),
+			'type'        => 'array',
+			'items'       => array(
+				'type' => 'string',
 			),
 		);
 
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 9288c0a284..e0b41440a9 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
@@ -41,11 +41,13 @@ abstract class WP_REST_Meta_Fields {
 	 * @see register_rest_field()
 	 */
 	public function register_field() {
-		register_rest_field( $this->get_rest_field_type(), 'meta', array(
-			'get_callback'    => array( $this, 'get_value' ),
-			'update_callback' => array( $this, 'update_value' ),
-			'schema'          => $this->get_field_schema(),
-		));
+		register_rest_field(
+			$this->get_rest_field_type(), 'meta', array(
+				'get_callback'    => array( $this, 'get_value' ),
+				'update_callback' => array( $this, 'update_value' ),
+				'schema'          => $this->get_field_schema(),
+			)
+		);
 	}
 
 	/**
@@ -62,7 +64,7 @@ abstract class WP_REST_Meta_Fields {
 		$response = array();
 
 		foreach ( $fields as $meta_key => $args ) {
-			$name = $args['name'];
+			$name       = $args['name'];
 			$all_values = get_metadata( $this->get_meta_type(), $object_id, $meta_key, false );
 			if ( $args['single'] ) {
 				if ( empty( $all_values ) ) {
@@ -174,7 +176,10 @@ abstract class WP_REST_Meta_Fields {
 				'rest_cannot_delete',
 				/* translators: %s: custom field key */
 				sprintf( __( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ),
-				array( 'key' => $name, 'status' => rest_authorization_required_code() )
+				array(
+					'key'    => $name,
+					'status' => rest_authorization_required_code(),
+				)
 			);
 		}
 
@@ -182,7 +187,10 @@ abstract class WP_REST_Meta_Fields {
 			return new WP_Error(
 				'rest_meta_database_error',
 				__( 'Could not delete meta value from database.' ),
-				array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR )
+				array(
+					'key'    => $name,
+					'status' => WP_Http::INTERNAL_SERVER_ERROR,
+				)
 			);
 		}
 
@@ -209,7 +217,10 @@ abstract class WP_REST_Meta_Fields {
 				'rest_cannot_update',
 				/* translators: %s: custom field key */
 				sprintf( __( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ),
-				array( 'key' => $name, 'status' => rest_authorization_required_code() )
+				array(
+					'key'    => $name,
+					'status' => rest_authorization_required_code(),
+				)
 			);
 		}
 
@@ -244,7 +255,10 @@ abstract class WP_REST_Meta_Fields {
 				return new WP_Error(
 					'rest_meta_database_error',
 					__( 'Could not update meta value in database.' ),
-					array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR )
+					array(
+						'key'    => $name,
+						'status' => WP_Http::INTERNAL_SERVER_ERROR,
+					)
 				);
 			}
 		}
@@ -254,7 +268,10 @@ abstract class WP_REST_Meta_Fields {
 				return new WP_Error(
 					'rest_meta_database_error',
 					__( 'Could not update meta value in database.' ),
-					array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR )
+					array(
+						'key'    => $name,
+						'status' => WP_Http::INTERNAL_SERVER_ERROR,
+					)
 				);
 			}
 		}
@@ -275,12 +292,15 @@ abstract class WP_REST_Meta_Fields {
 	 */
 	protected function update_meta_value( $object_id, $meta_key, $name, $value ) {
 		$meta_type = $this->get_meta_type();
-		if ( ! current_user_can(  "edit_{$meta_type}_meta", $object_id, $meta_key ) ) {
+		if ( ! current_user_can( "edit_{$meta_type}_meta", $object_id, $meta_key ) ) {
 			return new WP_Error(
 				'rest_cannot_update',
 				/* translators: %s: custom field key */
 				sprintf( __( 'Sorry, you are not allowed to edit the %s custom field.' ), $name ),
-				array( 'key' => $name, 'status' => rest_authorization_required_code() )
+				array(
+					'key'    => $name,
+					'status' => rest_authorization_required_code(),
+				)
 			);
 		}
 
@@ -300,7 +320,10 @@ abstract class WP_REST_Meta_Fields {
 			return new WP_Error(
 				'rest_meta_database_error',
 				__( 'Could not update meta value in database.' ),
-				array( 'key' => $name, 'status' => WP_Http::INTERNAL_SERVER_ERROR )
+				array(
+					'key'    => $name,
+					'status' => WP_Http::INTERNAL_SERVER_ERROR,
+				)
 			);
 		}
 
@@ -342,7 +365,7 @@ abstract class WP_REST_Meta_Fields {
 				'default'     => isset( $args['default'] ) ? $args['default'] : null,
 			);
 
-			$rest_args = array_merge( $default_args, $rest_args );
+			$rest_args           = array_merge( $default_args, $rest_args );
 			$rest_args['schema'] = array_merge( $default_schema, $rest_args['schema'] );
 
 			$type = ! empty( $rest_args['type'] ) ? $rest_args['type'] : null;
@@ -356,7 +379,7 @@ abstract class WP_REST_Meta_Fields {
 				$rest_args['schema']['items'] = array(
 					'type' => $rest_args['type'],
 				);
-				$rest_args['schema']['type'] = 'array';
+				$rest_args['schema']['type']  = 'array';
 			}
 
 			$registered[ $name ] = $rest_args;
diff --git a/wp-includes/revision.php b/wp-includes/revision.php
index 136395e2f1..bc95631fb6 100644
--- a/wp-includes/revision.php
+++ b/wp-includes/revision.php
@@ -31,7 +31,7 @@ function _wp_post_revision_fields( $post = array(), $deprecated = false ) {
 	if ( is_null( $fields ) ) {
 		// Allow these to be versioned
 		$fields = array(
-			'post_title' => __( 'Title' ),
+			'post_title'   => __( 'Title' ),
 			'post_content' => __( 'Content' ),
 			'post_excerpt' => __( 'Excerpt' ),
 		);
@@ -60,7 +60,6 @@ function _wp_post_revision_fields( $post = array(), $deprecated = false ) {
 		unset( $fields[ $protect ] );
 	}
 
-
 	return $fields;
 }
 
@@ -110,20 +109,25 @@ function _wp_post_revision_data( $post = array(), $autosave = false ) {
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
 function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
 		return;
+	}
 
-	if ( ! $post = get_post( $post_id ) )
+	if ( ! $post = get_post( $post_id ) ) {
 		return;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
 		return;
+	}
 
-	if ( 'auto-draft' == $post->post_status )
+	if ( 'auto-draft' == $post->post_status ) {
 		return;
+	}
 
-	if ( ! wp_revisions_enabled( $post ) )
+	if ( ! wp_revisions_enabled( $post ) ) {
 		return;
+	}
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
@@ -149,7 +153,6 @@ function wp_save_post_revision( $post_id ) {
 		 *                                   Default true.
 		 * @param WP_Post $last_revision     The last revision post object.
 		 * @param WP_Post $post              The post object.
-		 *
 		 */
 		if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) {
 			$post_has_changed = false;
@@ -172,7 +175,6 @@ function wp_save_post_revision( $post_id ) {
 			 * @param bool    $post_has_changed Whether the post has changed.
 			 * @param WP_Post $last_revision    The last revision post object.
 			 * @param WP_Post $post             The post object.
-			 *
 			 */
 			$post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post );
 
@@ -189,21 +191,24 @@ function wp_save_post_revision( $post_id ) {
 	// delete the oldest ones.
 	$revisions_to_keep = wp_revisions_to_keep( $post );
 
-	if ( $revisions_to_keep < 0 )
+	if ( $revisions_to_keep < 0 ) {
 		return $return;
+	}
 
 	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
-	$delete = count($revisions) - $revisions_to_keep;
+	$delete = count( $revisions ) - $revisions_to_keep;
 
-	if ( $delete < 1 )
+	if ( $delete < 1 ) {
 		return $return;
+	}
 
 	$revisions = array_slice( $revisions, 0, $delete );
 
-	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
+	for ( $i = 0; isset( $revisions[ $i ] ); $i++ ) {
+		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) ) {
 			continue;
+		}
 
 		wp_delete_post_revision( $revisions[ $i ]->ID );
 	}
@@ -229,8 +234,9 @@ function wp_get_post_autosave( $post_id, $user_id = 0 ) {
 
 	foreach ( $revisions as $revision ) {
 		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
+			if ( $user_id && $user_id != $revision->post_author ) {
 				continue;
+			}
 
 			return $revision;
 		}
@@ -248,8 +254,9 @@ function wp_get_post_autosave( $post_id, $user_id = 0 ) {
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
 function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+	if ( ! $post = wp_get_post_revision( $post ) ) {
 		return false;
+	}
 
 	return (int) $post->post_parent;
 }
@@ -263,11 +270,13 @@ function wp_is_post_revision( $post ) {
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
 function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+	if ( ! $post = wp_get_post_revision( $post ) ) {
 		return false;
+	}
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
+	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
 		return (int) $post->post_parent;
+	}
 
 	return false;
 }
@@ -283,23 +292,27 @@ function wp_is_post_autosave( $post ) {
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
 function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
+	if ( is_object( $post ) ) {
 		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
-		$post = get_post($post, ARRAY_A);
+	} elseif ( ! is_array( $post ) ) {
+		$post = get_post( $post, ARRAY_A );
+	}
 
-	if ( ! $post || empty($post['ID']) )
+	if ( ! $post || empty( $post['ID'] ) ) {
 		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	}
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
+	if ( isset( $post['post_type'] ) && 'revision' == $post['post_type'] ) {
 		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	}
 
 	$post = _wp_post_revision_data( $post, $autosave );
-	$post = wp_slash($post); //since data is from db
+	$post = wp_slash( $post ); //since data is from db
 
 	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
+	if ( is_wp_error( $revision_id ) ) {
 		return $revision_id;
+	}
 
 	if ( $revision_id ) {
 		/**
@@ -326,19 +339,21 @@ function _wp_put_post_revision( $post = null, $autosave = false ) {
  * @param string      $filter Optional sanitation filter. See sanitize_post().
  * @return WP_Post|array|null WP_Post (or array) on success, or null on failure.
  */
-function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
+function wp_get_post_revision( &$post, $output = OBJECT, $filter = 'raw' ) {
+	if ( ! $revision = get_post( $post, OBJECT, $filter ) ) {
 		return $revision;
-	if ( 'revision' !== $revision->post_type )
+	}
+	if ( 'revision' !== $revision->post_type ) {
 		return null;
+	}
 
 	if ( $output == OBJECT ) {
 		return $revision;
 	} elseif ( $output == ARRAY_A ) {
-		$_revision = get_object_vars($revision);
+		$_revision = get_object_vars( $revision );
 		return $_revision;
 	} elseif ( $output == ARRAY_N ) {
-		$_revision = array_values(get_object_vars($revision));
+		$_revision = array_values( get_object_vars( $revision ) );
 		return $_revision;
 	}
 
@@ -357,27 +372,31 @@ function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
 function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
+	if ( ! $revision = wp_get_post_revision( $revision_id, ARRAY_A ) ) {
 		return $revision;
+	}
 
-	if ( !is_array( $fields ) )
+	if ( ! is_array( $fields ) ) {
 		$fields = array_keys( _wp_post_revision_fields( $revision ) );
+	}
 
 	$update = array();
 	foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
-		$update[$field] = $revision[$field];
+		$update[ $field ] = $revision[ $field ];
 	}
 
-	if ( !$update )
+	if ( ! $update ) {
 		return false;
+	}
 
 	$update['ID'] = $revision['post_parent'];
 
 	$update = wp_slash( $update ); //since data is from db
 
 	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
+	if ( ! $post_id || is_wp_error( $post_id ) ) {
 		return $post_id;
+	}
 
 	// Update last edit user
 	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
@@ -439,19 +458,32 @@ function wp_delete_post_revision( $revision_id ) {
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
 	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
+	if ( ! $post || empty( $post->ID ) ) {
 		return array();
+	}
 
-	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array(
+		'order'         => 'DESC',
+		'orderby'       => 'date ID',
+		'check_enabled' => true,
+	);
+	$args     = wp_parse_args( $args, $defaults );
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
+	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) ) {
 		return array();
+	}
 
-	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
+	$args = array_merge(
+		$args, array(
+			'post_parent' => $post->ID,
+			'post_type'   => 'revision',
+			'post_status' => 'inherit',
+		)
+	);
 
-	if ( ! $revisions = get_children( $args ) )
+	if ( ! $revisions = get_children( $args ) ) {
 		return array();
+	}
 
 	return $revisions;
 }
@@ -484,13 +516,15 @@ function wp_revisions_enabled( $post ) {
 function wp_revisions_to_keep( $post ) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
+	if ( true === $num ) {
 		$num = -1;
-	else
+	} else {
 		$num = intval( $num );
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
 		$num = 0;
+	}
 
 	/**
 	 * Filters the number of revisions to save for the given post.
@@ -527,7 +561,7 @@ function _set_preview( $post ) {
 	$preview = sanitize_post( $preview );
 
 	$post->post_content = $preview->post_content;
-	$post->post_title = $preview->post_title;
+	$post->post_title   = $preview->post_title;
 	$post->post_excerpt = $preview->post_excerpt;
 
 	add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
@@ -543,13 +577,14 @@ function _set_preview( $post ) {
  * @access private
  */
 function _show_post_preview() {
-	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
+	if ( isset( $_GET['preview_id'] ) && isset( $_GET['preview_nonce'] ) ) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('Sorry, you are not allowed to preview drafts.') );
+		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to preview drafts.' ) );
+		}
 
-		add_filter('the_preview', '_set_preview');
+		add_filter( 'the_preview', '_set_preview' );
 	}
 }
 
@@ -565,16 +600,19 @@ function _show_post_preview() {
  * @return array
  */
 function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
+	if ( ! $post = get_post() ) {
 		return $terms;
+	}
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
+	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type ) {
 		return $terms;
+	}
 
-	if ( 'standard' == $_REQUEST['post_format'] )
+	if ( 'standard' == $_REQUEST['post_format'] ) {
 		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
+	} elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) ) {
 		$terms = array( $term ); // Can only have one post format
+	}
 
 	return $terms;
 }
@@ -623,13 +661,15 @@ function _wp_preview_post_thumbnail_filter( $value, $post_id, $meta_key ) {
  * @return int|false
  */
 function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
+	if ( is_object( $revision ) ) {
 		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
+	} elseif ( ! is_array( $revision ) ) {
 		return false;
+	}
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
+	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) ) {
 		return (int) $matches[1];
+	}
 
 	return 0;
 }
@@ -650,8 +690,8 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
 	global $wpdb;
 
 	// Add post option exclusively
-	$lock = "revision-upgrade-{$post->ID}";
-	$now = time();
+	$lock   = "revision-upgrade-{$post->ID}";
+	$now    = time();
 	$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );
 	if ( ! $result ) {
 		// If we couldn't get a lock, see how old the previous lock is
@@ -683,8 +723,9 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
 		$this_revision_version = _wp_get_post_revision_version( $this_revision );
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
+		if ( false === $this_revision_version ) {
 			continue;
+		}
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
@@ -705,23 +746,25 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
 			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
+			if ( $prev_revision_version < 1 ) {
 				$update['post_author'] = $prev_revision->post_author;
+			}
 		}
 
 		// Upgrade this revision
 		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
 
-		if ( $result )
+		if ( $result ) {
 			wp_cache_delete( $this_revision->ID, 'posts' );
-
+		}
 	} while ( $prev_revision );
 
 	delete_option( $lock );
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
+	if ( $add_last ) {
 		wp_save_post_revision( $post->ID );
+	}
 
 	return true;
 }
diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 943d7d0079..71a83ac3e9 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -11,98 +11,98 @@
  *
  * @since 2.1.0
  */
-define('EP_NONE', 0);
+define( 'EP_NONE', 0 );
 
 /**
  * Endpoint Mask for Permalink.
  *
  * @since 2.1.0
  */
-define('EP_PERMALINK', 1);
+define( 'EP_PERMALINK', 1 );
 
 /**
  * Endpoint Mask for Attachment.
  *
  * @since 2.1.0
  */
-define('EP_ATTACHMENT', 2);
+define( 'EP_ATTACHMENT', 2 );
 
 /**
  * Endpoint Mask for date.
  *
  * @since 2.1.0
  */
-define('EP_DATE', 4);
+define( 'EP_DATE', 4 );
 
 /**
  * Endpoint Mask for year
  *
  * @since 2.1.0
  */
-define('EP_YEAR', 8);
+define( 'EP_YEAR', 8 );
 
 /**
  * Endpoint Mask for month.
  *
  * @since 2.1.0
  */
-define('EP_MONTH', 16);
+define( 'EP_MONTH', 16 );
 
 /**
  * Endpoint Mask for day.
  *
  * @since 2.1.0
  */
-define('EP_DAY', 32);
+define( 'EP_DAY', 32 );
 
 /**
  * Endpoint Mask for root.
  *
  * @since 2.1.0
  */
-define('EP_ROOT', 64);
+define( 'EP_ROOT', 64 );
 
 /**
  * Endpoint Mask for comments.
  *
  * @since 2.1.0
  */
-define('EP_COMMENTS', 128);
+define( 'EP_COMMENTS', 128 );
 
 /**
  * Endpoint Mask for searches.
  *
  * @since 2.1.0
  */
-define('EP_SEARCH', 256);
+define( 'EP_SEARCH', 256 );
 
 /**
  * Endpoint Mask for categories.
  *
  * @since 2.1.0
  */
-define('EP_CATEGORIES', 512);
+define( 'EP_CATEGORIES', 512 );
 
 /**
  * Endpoint Mask for tags.
  *
  * @since 2.3.0
  */
-define('EP_TAGS', 1024);
+define( 'EP_TAGS', 1024 );
 
 /**
  * Endpoint Mask for authors.
  *
  * @since 2.1.0
  */
-define('EP_AUTHORS', 2048);
+define( 'EP_AUTHORS', 2048 );
 
 /**
  * Endpoint Mask for pages.
  *
  * @since 2.1.0
  */
-define('EP_PAGES', 4096);
+define( 'EP_PAGES', 4096 );
 
 /**
  * Endpoint Mask for all archive views.
@@ -158,8 +158,9 @@ function add_rewrite_rule( $regex, $query, $after = 'bottom' ) {
  */
 function add_rewrite_tag( $tag, $regex, $query = '' ) {
 	// validate the tag's name
-	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen($tag) - 1 ] != '%' )
+	if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen( $tag ) - 1 ] != '%' ) {
 		return;
+	}
 
 	global $wp_rewrite, $wp;
 
@@ -203,10 +204,12 @@ function add_permastruct( $name, $struct, $args = array() ) {
 	global $wp_rewrite;
 
 	// Back-compat for the old parameters: $with_front and $ep_mask.
-	if ( ! is_array( $args ) )
+	if ( ! is_array( $args ) ) {
 		$args = array( 'with_front' => $args );
-	if ( func_num_args() == 4 )
+	}
+	if ( func_num_args() == 4 ) {
 		$args['ep_mask'] = func_get_arg( 3 );
+	}
 
 	$wp_rewrite->add_permastruct( $name, $struct, $args );
 }
@@ -266,7 +269,7 @@ function add_feed( $feedname, $function ) {
  * @global WP_Rewrite $wp_rewrite
  *
  * @param bool $hard Whether to update .htaccess (hard flush) or just update
- * 	                 rewrite_rules transient (soft flush). Default is true (hard).
+ *                   rewrite_rules transient (soft flush). Default is true (hard).
  */
 function flush_rewrite_rules( $hard = true ) {
 	global $wp_rewrite;
@@ -322,7 +325,7 @@ function add_rewrite_endpoint( $name, $places, $query_var = true ) {
  * @return string
  */
 function _wp_filter_taxonomy_base( $base ) {
-	if ( !empty( $base ) ) {
+	if ( ! empty( $base ) ) {
 		$base = preg_replace( '|^/index\.php/|', '', $base );
 		$base = trim( $base, '/' );
 	}
@@ -480,31 +483,34 @@ function url_to_postid( $url ) {
 	}
 
 	// First, check to see if there is a 'p=N' or 'page_id=N' to match against
-	if ( preg_match('#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values) )	{
-		$id = absint($values[2]);
-		if ( $id )
+	if ( preg_match( '#[?&](p|page_id|attachment_id)=(\d+)#', $url, $values ) ) {
+		$id = absint( $values[2] );
+		if ( $id ) {
 			return $id;
+		}
 	}
 
 	// Get rid of the #anchor
-	$url_split = explode('#', $url);
-	$url = $url_split[0];
+	$url_split = explode( '#', $url );
+	$url       = $url_split[0];
 
 	// Get rid of URL ?query=string
-	$url_split = explode('?', $url);
-	$url = $url_split[0];
+	$url_split = explode( '?', $url );
+	$url       = $url_split[0];
 
 	// Set the correct URL scheme.
 	$scheme = parse_url( home_url(), PHP_URL_SCHEME );
-	$url = set_url_scheme( $url, $scheme );
+	$url    = set_url_scheme( $url, $scheme );
 
 	// Add 'www.' if it is absent and should be there
-	if ( false !== strpos(home_url(), '://www.') && false === strpos($url, '://www.') )
-		$url = str_replace('://', '://www.', $url);
+	if ( false !== strpos( home_url(), '://www.' ) && false === strpos( $url, '://www.' ) ) {
+		$url = str_replace( '://', '://www.', $url );
+	}
 
 	// Strip 'www.' if it is present and shouldn't be
-	if ( false === strpos(home_url(), '://www.') )
-		$url = str_replace('://www.', '://', $url);
+	if ( false === strpos( home_url(), '://www.' ) ) {
+		$url = str_replace( '://www.', '://', $url );
+	}
 
 	if ( trim( $url, '/' ) === home_url() && 'page' == get_option( 'show_on_front' ) ) {
 		$page_on_front = get_option( 'page_on_front' );
@@ -518,44 +524,48 @@ function url_to_postid( $url ) {
 	$rewrite = $wp_rewrite->wp_rewrite_rules();
 
 	// Not using rewrite rules, and 'p=N' and 'page_id=N' methods failed, so we're out of options
-	if ( empty($rewrite) )
+	if ( empty( $rewrite ) ) {
 		return 0;
+	}
 
 	// Strip 'index.php/' if we're not using path info permalinks
-	if ( !$wp_rewrite->using_index_permalinks() )
+	if ( ! $wp_rewrite->using_index_permalinks() ) {
 		$url = str_replace( $wp_rewrite->index . '/', '', $url );
+	}
 
 	if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
 		// Chop off http://domain.com/[path]
-		$url = str_replace(home_url(), '', $url);
+		$url = str_replace( home_url(), '', $url );
 	} else {
 		// Chop off /path/to/blog
 		$home_path = parse_url( home_url( '/' ) );
-		$home_path = isset( $home_path['path'] ) ? $home_path['path'] : '' ;
-		$url = preg_replace( sprintf( '#^%s#', preg_quote( $home_path ) ), '', trailingslashit( $url ) );
+		$home_path = isset( $home_path['path'] ) ? $home_path['path'] : '';
+		$url       = preg_replace( sprintf( '#^%s#', preg_quote( $home_path ) ), '', trailingslashit( $url ) );
 	}
 
 	// Trim leading and lagging slashes
-	$url = trim($url, '/');
+	$url = trim( $url, '/' );
 
-	$request = $url;
+	$request              = $url;
 	$post_type_query_vars = array();
 
-	foreach ( get_post_types( array() , 'objects' ) as $post_type => $t ) {
-		if ( ! empty( $t->query_var ) )
+	foreach ( get_post_types( array(), 'objects' ) as $post_type => $t ) {
+		if ( ! empty( $t->query_var ) ) {
 			$post_type_query_vars[ $t->query_var ] = $post_type;
+		}
 	}
 
 	// Look for matches.
 	$request_match = $request;
-	foreach ( (array)$rewrite as $match => $query) {
+	foreach ( (array) $rewrite as $match => $query ) {
 
 		// If the requesting file is the anchor of the match, prepend it
 		// to the path info.
-		if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) )
+		if ( ! empty( $url ) && ( $url != $request ) && ( strpos( $match, $url ) === 0 ) ) {
 			$request_match = $url . '/' . $request;
+		}
 
-		if ( preg_match("#^$match#", $request_match, $matches) ) {
+		if ( preg_match( "#^$match#", $request_match, $matches ) ) {
 
 			if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
 				// This is a verbose page match, let's check to be sure about it.
@@ -573,21 +583,21 @@ function url_to_postid( $url ) {
 
 			// Got a match.
 			// Trim the query of everything up to the '?'.
-			$query = preg_replace("!^.+\?!", '', $query);
+			$query = preg_replace( '!^.+\?!', '', $query );
 
 			// Substitute the substring matches into the query.
-			$query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
+			$query = addslashes( WP_MatchesMapRegex::apply( $query, $matches ) );
 
 			// Filter out non-public query vars
 			global $wp;
 			parse_str( $query, $query_vars );
 			$query = array();
 			foreach ( (array) $query_vars as $key => $value ) {
-				if ( in_array( $key, $wp->public_query_vars ) ){
-					$query[$key] = $value;
-					if ( isset( $post_type_query_vars[$key] ) ) {
-						$query['post_type'] = $post_type_query_vars[$key];
-						$query['name'] = $value;
+				if ( in_array( $key, $wp->public_query_vars ) ) {
+					$query[ $key ] = $value;
+					if ( isset( $post_type_query_vars[ $key ] ) ) {
+						$query['post_type'] = $post_type_query_vars[ $key ];
+						$query['name']      = $value;
 					}
 				}
 			}
@@ -597,10 +607,11 @@ function url_to_postid( $url ) {
 
 			// Do the query
 			$query = new WP_Query( $query );
-			if ( ! empty( $query->posts ) && $query->is_singular )
+			if ( ! empty( $query->posts ) && $query->is_singular ) {
 				return $query->post->ID;
-			else
+			} else {
 				return 0;
+			}
 		}
 	}
 	return 0;
diff --git a/wp-includes/rss-functions.php b/wp-includes/rss-functions.php
index 034a3e5db4..a7cc30fdaf 100644
--- a/wp-includes/rss-functions.php
+++ b/wp-includes/rss-functions.php
@@ -5,5 +5,5 @@
  * @package WordPress
  */
 
-_deprecated_file( basename(__FILE__), '2.1.0', WPINC . '/rss.php' );
+_deprecated_file( basename( __FILE__ ), '2.1.0', WPINC . '/rss.php' );
 require_once( ABSPATH . WPINC . '/rss.php' );
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 0202474f84..a490e6c5af 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -56,100 +56,113 @@ function wp_default_scripts( &$scripts ) {
 
 	if ( ! $guessurl = site_url() ) {
 		$guessed_url = true;
-		$guessurl = wp_guess_url();
+		$guessurl    = wp_guess_url();
 	}
 
-	$scripts->base_url = $guessurl;
-	$scripts->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
+	$scripts->base_url        = $guessurl;
+	$scripts->content_url     = defined( 'WP_CONTENT_URL' ) ? WP_CONTENT_URL : '';
 	$scripts->default_version = get_bloginfo( 'version' );
-	$scripts->default_dirs = array('/wp-admin/js/', '/wp-includes/js/');
+	$scripts->default_dirs    = array( '/wp-admin/js/', '/wp-includes/js/' );
 
-	$suffix = SCRIPT_DEBUG ? '' : '.min';
+	$suffix     = SCRIPT_DEBUG ? '' : '.min';
 	$dev_suffix = $develop_src ? '' : '.min';
 
 	$scripts->add( 'utils', "/wp-includes/js/utils$suffix.js" );
-	did_action( 'init' ) && $scripts->localize( 'utils', 'userSettings', array(
-		'url' => (string) SITECOOKIEPATH,
-		'uid' => (string) get_current_user_id(),
-		'time' => (string) time(),
-		'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'utils', 'userSettings', array(
+			'url'    => (string) SITECOOKIEPATH,
+			'uid'    => (string) get_current_user_id(),
+			'time'   => (string) time(),
+			'secure' => (string) ( 'https' === parse_url( site_url(), PHP_URL_SCHEME ) ),
+		)
+	);
 
-	$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array('jquery', 'hoverIntent', 'utils'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( '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' ),
-		'expandMenu'   => __( 'Expand Main menu' ),
-	) );
+	$scripts->add( 'common', "/wp-admin/js/common$suffix.js", array( 'jquery', 'hoverIntent', 'utils' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'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' ),
+			'expandMenu'   => __( 'Expand Main menu' ),
+		)
+	);
 
 	$scripts->add( 'wp-a11y', "/wp-includes/js/wp-a11y$suffix.js", array( 'jquery' ), false, 1 );
 
 	$scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", array(), '1.6.1', 1 );
 
 	$scripts->add( 'quicktags', "/wp-includes/js/quicktags$suffix.js", array(), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'quicktags', 'quicktagsL10n', array(
-		'closeAllOpenTags'      => __( 'Close all open tags' ),
-		'closeTags'             => __( 'close tags' ),
-		'enterURL'              => __( 'Enter the URL' ),
-		'enterImageURL'         => __( 'Enter the URL of the image' ),
-		'enterImageDescription' => __( 'Enter a description of the image' ),
-		'textdirection'         => __( 'text direction' ),
-		'toggleTextdirection'   => __( 'Toggle Editor Text Direction' ),
-		'dfw'                   => __( 'Distraction-free writing mode' ),
-		'strong'          => __( 'Bold' ),
-		'strongClose'     => __( 'Close bold tag' ),
-		'em'              => __( 'Italic' ),
-		'emClose'         => __( 'Close italic tag' ),
-		'link'            => __( 'Insert link' ),
-		'blockquote'      => __( 'Blockquote' ),
-		'blockquoteClose' => __( 'Close blockquote tag' ),
-		'del'             => __( 'Deleted text (strikethrough)' ),
-		'delClose'        => __( 'Close deleted text tag' ),
-		'ins'             => __( 'Inserted text' ),
-		'insClose'        => __( 'Close inserted text tag' ),
-		'image'           => __( 'Insert image' ),
-		'ul'              => __( 'Bulleted list' ),
-		'ulClose'         => __( 'Close bulleted list tag' ),
-		'ol'              => __( 'Numbered list' ),
-		'olClose'         => __( 'Close numbered list tag' ),
-		'li'              => __( 'List item' ),
-		'liClose'         => __( 'Close list item tag' ),
-		'code'            => __( 'Code' ),
-		'codeClose'       => __( 'Close code tag' ),
-		'more'            => __( 'Insert Read More tag' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'quicktags', 'quicktagsL10n', array(
+			'closeAllOpenTags'      => __( 'Close all open tags' ),
+			'closeTags'             => __( 'close tags' ),
+			'enterURL'              => __( 'Enter the URL' ),
+			'enterImageURL'         => __( 'Enter the URL of the image' ),
+			'enterImageDescription' => __( 'Enter a description of the image' ),
+			'textdirection'         => __( 'text direction' ),
+			'toggleTextdirection'   => __( 'Toggle Editor Text Direction' ),
+			'dfw'                   => __( 'Distraction-free writing mode' ),
+			'strong'                => __( 'Bold' ),
+			'strongClose'           => __( 'Close bold tag' ),
+			'em'                    => __( 'Italic' ),
+			'emClose'               => __( 'Close italic tag' ),
+			'link'                  => __( 'Insert link' ),
+			'blockquote'            => __( 'Blockquote' ),
+			'blockquoteClose'       => __( 'Close blockquote tag' ),
+			'del'                   => __( 'Deleted text (strikethrough)' ),
+			'delClose'              => __( 'Close deleted text tag' ),
+			'ins'                   => __( 'Inserted text' ),
+			'insClose'              => __( 'Close inserted text tag' ),
+			'image'                 => __( 'Insert image' ),
+			'ul'                    => __( 'Bulleted list' ),
+			'ulClose'               => __( 'Close bulleted list tag' ),
+			'ol'                    => __( 'Numbered list' ),
+			'olClose'               => __( 'Close numbered list tag' ),
+			'li'                    => __( 'List item' ),
+			'liClose'               => __( 'Close list item tag' ),
+			'code'                  => __( 'Code' ),
+			'codeClose'             => __( 'Close code tag' ),
+			'more'                  => __( 'Insert Read More tag' ),
+		)
+	);
 
-	$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' );
+	$scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array( 'prototype' ), '3517m' );
 
-	$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array('utils','jquery'), false, 1 );
+	$scripts->add( 'editor', "/wp-admin/js/editor$suffix.js", array( 'utils', 'jquery' ), false, 1 );
 
 	// Back-compat for old DFW. To-do: remove at the end of 2016.
 	$scripts->add( 'wp-fullscreen-stub', "/wp-admin/js/wp-fullscreen-stub$suffix.js", array(), false, 1 );
 
-	$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(
-		'noPerm' => __('Sorry, you are not allowed to do that.'),
-		'broken' => __('An unidentified error has occurred.')
-	) );
+	$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(
+			'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
+			'broken' => __( 'An unidentified error has occurred.' ),
+		)
+	);
 
 	$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(
-		'root'          => esc_url_raw( get_rest_url() ),
-		'nonce'         => ( wp_installing() && ! is_multisite() ) ? '' : wp_create_nonce( 'wp_rest' ),
-		'versionString' => 'wp/v2/',
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'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/',
+		)
+	);
 
 	$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(
-		'dismiss' => __('Dismiss'),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'wp-pointer', 'wpPointerL10n', array(
+			'dismiss' => __( 'Dismiss' ),
+		)
+	);
 
-	$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('heartbeat'), false, 1 );
+	$scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array( 'heartbeat' ), false, 1 );
 
-	$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
+	$scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array( 'jquery' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'heartbeat', 'heartbeatSettings',
 		/**
 		 * Filters the Heartbeat settings.
 		 *
@@ -160,36 +173,38 @@ function wp_default_scripts( &$scripts ) {
 		apply_filters( 'heartbeat_settings', array() )
 	);
 
-	$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(
-		'beforeunload' => __('Your session has expired. You can log in again from this page or go to the login page.'),
+	$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(
+			'beforeunload' => __( 'Your session has expired. You can log in again from this page or go to the login page.' ),
 
-		/**
-		 * Filters the authentication check interval.
-		 *
-		 * @since 3.6.0
-		 *
-		 * @param int $interval The interval in which to check a user's authentication.
-		 *                      Default 3 minutes in seconds, or 180.
-		 */
-		'interval' => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
-	) );
+			/**
+			 * Filters the authentication check interval.
+			 *
+			 * @since 3.6.0
+			 *
+			 * @param int $interval The interval in which to check a user's authentication.
+			 *                      Default 3 minutes in seconds, or 180.
+			 */
+			'interval'     => apply_filters( 'wp_auth_check_interval', 3 * MINUTE_IN_SECONDS ),
+		)
+	);
 
 	$scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
 
 	// WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.
-	$scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1');
-	$scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array('prototype'), '1.9.0');
-	$scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array('scriptaculous-builder', 'scriptaculous-effects'), '1.9.0');
-	$scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array('scriptaculous-effects'), '1.9.0');
+	$scripts->add( 'prototype', 'https://ajax.googleapis.com/ajax/libs/prototype/1.7.1.0/prototype.js', array(), '1.7.1' );
+	$scripts->add( 'scriptaculous-root', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/scriptaculous.js', array( 'prototype' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-builder', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/builder.js', array( 'scriptaculous-root' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-dragdrop', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/dragdrop.js', array( 'scriptaculous-builder', 'scriptaculous-effects' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-effects', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/effects.js', array( 'scriptaculous-root' ), '1.9.0' );
+	$scripts->add( 'scriptaculous-slider', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/slider.js', array( 'scriptaculous-effects' ), '1.9.0' );
 	$scripts->add( 'scriptaculous-sound', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/sound.js', array( 'scriptaculous-root' ), '1.9.0' );
-	$scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array('scriptaculous-root'), '1.9.0');
-	$scripts->add( 'scriptaculous', false, array('scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls') );
+	$scripts->add( 'scriptaculous-controls', 'https://ajax.googleapis.com/ajax/libs/scriptaculous/1.9.0/controls.js', array( 'scriptaculous-root' ), '1.9.0' );
+	$scripts->add( 'scriptaculous', false, array( 'scriptaculous-dragdrop', 'scriptaculous-slider', 'scriptaculous-controls' ) );
 
 	// not used in core, replaced by Jcrop.js
-	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array('scriptaculous-dragdrop') );
+	$scripts->add( 'cropper', '/wp-includes/js/crop/cropper.js', array( 'scriptaculous-dragdrop' ) );
 
 	// jQuery
 	$scripts->add( 'jquery', false, array( 'jquery-core', 'jquery-migrate' ), '1.12.4' );
@@ -197,117 +212,121 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'jquery-migrate', "/wp-includes/js/jquery/jquery-migrate$suffix.js", array(), '1.4.1' );
 
 	// full jQuery UI
-	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array('jquery'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-core', "/wp-includes/js/jquery/ui/core$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-core', "/wp-includes/js/jquery/ui/effect$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
 
-	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-scale'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array('jquery-effects-core', 'jquery-effects-size'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array('jquery-effects-core'), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-blind', "/wp-includes/js/jquery/ui/effect-blind$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-bounce', "/wp-includes/js/jquery/ui/effect-bounce$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-clip', "/wp-includes/js/jquery/ui/effect-clip$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-drop', "/wp-includes/js/jquery/ui/effect-drop$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-explode', "/wp-includes/js/jquery/ui/effect-explode$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-fade', "/wp-includes/js/jquery/ui/effect-fade$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-fold', "/wp-includes/js/jquery/ui/effect-fold$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-highlight', "/wp-includes/js/jquery/ui/effect-highlight$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-puff', "/wp-includes/js/jquery/ui/effect-puff$dev_suffix.js", array( 'jquery-effects-core', 'jquery-effects-scale' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-pulsate', "/wp-includes/js/jquery/ui/effect-pulsate$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-scale', "/wp-includes/js/jquery/ui/effect-scale$dev_suffix.js", array( 'jquery-effects-core', 'jquery-effects-size' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-shake', "/wp-includes/js/jquery/ui/effect-shake$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-size', "/wp-includes/js/jquery/ui/effect-size$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-slide', "/wp-includes/js/jquery/ui/effect-slide$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-effects-transfer', "/wp-includes/js/jquery/ui/effect-transfer$dev_suffix.js", array( 'jquery-effects-core' ), '1.11.4', 1 );
 
-	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-accordion', "/wp-includes/js/jquery/ui/accordion$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-autocomplete', "/wp-includes/js/jquery/ui/autocomplete$dev_suffix.js", array( 'jquery-ui-menu', 'wp-a11y' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array('jquery-ui-core'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array('jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array('jquery-ui-draggable'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-button', "/wp-includes/js/jquery/ui/button$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-datepicker', "/wp-includes/js/jquery/ui/datepicker$dev_suffix.js", array( 'jquery-ui-core' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-dialog', "/wp-includes/js/jquery/ui/dialog$dev_suffix.js", array( 'jquery-ui-resizable', 'jquery-ui-draggable', 'jquery-ui-button', 'jquery-ui-position' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-draggable', "/wp-includes/js/jquery/ui/draggable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-droppable', "/wp-includes/js/jquery/ui/droppable$dev_suffix.js", array( 'jquery-ui-draggable' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-menu', "/wp-includes/js/jquery/ui/menu$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-mouse', "/wp-includes/js/jquery/ui/mouse$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array('jquery'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array('jquery-ui-menu'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array('jquery-ui-mouse'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-position', "/wp-includes/js/jquery/ui/position$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-progressbar', "/wp-includes/js/jquery/ui/progressbar$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-resizable', "/wp-includes/js/jquery/ui/resizable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-selectable', "/wp-includes/js/jquery/ui/selectable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-selectmenu', "/wp-includes/js/jquery/ui/selectmenu$dev_suffix.js", array( 'jquery-ui-menu' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-slider', "/wp-includes/js/jquery/ui/slider$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-sortable', "/wp-includes/js/jquery/ui/sortable$dev_suffix.js", array( 'jquery-ui-mouse' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-spinner', "/wp-includes/js/jquery/ui/spinner$dev_suffix.js", array( 'jquery-ui-button' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array('jquery-ui-core', 'jquery-ui-widget'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-tabs', "/wp-includes/js/jquery/ui/tabs$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget' ), '1.11.4', 1 );
 	$scripts->add( 'jquery-ui-tooltip', "/wp-includes/js/jquery/ui/tooltip$dev_suffix.js", array( 'jquery-ui-core', 'jquery-ui-widget', 'jquery-ui-position' ), '1.11.4', 1 );
-	$scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array('jquery'), '1.11.4', 1 );
+	$scripts->add( 'jquery-ui-widget', "/wp-includes/js/jquery/ui/widget$dev_suffix.js", array( 'jquery' ), '1.11.4', 1 );
 
 	// Strings for 'jquery-ui-autocomplete' live region messages
-	did_action( 'init' ) && $scripts->localize( '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.' ),
-		/* translators: %d: Number of results found when using jQuery UI Autocomplete */
-		'manyResults' => __( '%d results found. Use up and down arrow keys to navigate.' ),
-		'itemSelected' => __( 'Item selected.' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'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.' ),
+			/* translators: %d: Number of results found when using jQuery UI Autocomplete */
+			'manyResults'  => __( '%d results found. Use up and down arrow keys to navigate.' ),
+			'itemSelected' => __( 'Item selected.' ),
+		)
+	);
 
 	// deprecated, not used in core, most functionality is included in jQuery 1.3
-	$scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array('jquery'), '4.2.1', 1 );
+	$scripts->add( 'jquery-form', "/wp-includes/js/jquery/jquery.form$suffix.js", array( 'jquery' ), '4.2.1', 1 );
 
 	// jQuery plugins
-	$scripts->add( 'jquery-color', "/wp-includes/js/jquery/jquery.color.min.js", array('jquery'), '2.1.1', 1 );
-	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20m', 1 );
-	$scripts->add( 'jquery-query', "/wp-includes/js/jquery/jquery.query.js", array('jquery'), '2.1.7', 1 );
-	$scripts->add( 'jquery-serialize-object', "/wp-includes/js/jquery/jquery.serialize-object.js", array('jquery'), '0.2', 1 );
-	$scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array('jquery'), '0.0.2m', 1 );
-	$scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), false, 1 );
-	$scripts->add( 'jquery-touch-punch', "/wp-includes/js/jquery/jquery.ui.touch-punch.js", array('jquery-ui-widget', 'jquery-ui-mouse'), '0.2.2', 1 );
+	$scripts->add( 'jquery-color', '/wp-includes/js/jquery/jquery.color.min.js', array( 'jquery' ), '2.1.1', 1 );
+	$scripts->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array( 'jquery' ), '20m', 1 );
+	$scripts->add( 'jquery-query', '/wp-includes/js/jquery/jquery.query.js', array( 'jquery' ), '2.1.7', 1 );
+	$scripts->add( 'jquery-serialize-object', '/wp-includes/js/jquery/jquery.serialize-object.js', array( 'jquery' ), '0.2', 1 );
+	$scripts->add( 'jquery-hotkeys', "/wp-includes/js/jquery/jquery.hotkeys$suffix.js", array( 'jquery' ), '0.0.2m', 1 );
+	$scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array( 'jquery', 'jquery-hotkeys' ), false, 1 );
+	$scripts->add( 'jquery-touch-punch', '/wp-includes/js/jquery/jquery.ui.touch-punch.js', array( 'jquery-ui-widget', 'jquery-ui-mouse' ), '0.2.2', 1 );
 
 	// Not used any more, registered for backwards compatibility.
-	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array('jquery'), '1.1-20110113', 1 );
+	$scripts->add( 'suggest', "/wp-includes/js/jquery/suggest$suffix.js", array( 'jquery' ), '1.1-20110113', 1 );
 
 	// Masonry v2 depended on jQuery. v3 does not. The older jquery-masonry handle is a shiv.
 	// It sets jQuery as a dependency, as the theme may have been implicitly loading it this way.
-	$scripts->add( 'imagesloaded', "/wp-includes/js/imagesloaded.min.js", array(), '3.2.0', 1 );
-	$scripts->add( 'masonry', "/wp-includes/js/masonry.min.js", array( 'imagesloaded' ), '3.3.2', 1 );
+	$scripts->add( 'imagesloaded', '/wp-includes/js/imagesloaded.min.js', array(), '3.2.0', 1 );
+	$scripts->add( 'masonry', '/wp-includes/js/masonry.min.js', array( 'imagesloaded' ), '3.3.2', 1 );
 	$scripts->add( 'jquery-masonry', "/wp-includes/js/jquery/jquery.masonry$dev_suffix.js", array( 'jquery', 'masonry' ), '3.1.2b', 1 );
 
-	$scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20121105', 1 );
-	did_action( 'init' ) && $scripts->localize( 'thickbox', 'thickboxL10n', array(
-		'next' => __('Next &gt;'),
-		'prev' => __('&lt; Prev'),
-		'image' => __('Image'),
-		'of' => __('of'),
-		'close' => __('Close'),
-		'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'),
-		'loadingAnimation' => includes_url('js/thickbox/loadingAnimation.gif'),
-	) );
+	$scripts->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array( 'jquery' ), '3.1-20121105', 1 );
+	did_action( 'init' ) && $scripts->localize(
+		'thickbox', 'thickboxL10n', array(
+			'next'             => __( 'Next &gt;' ),
+			'prev'             => __( '&lt; Prev' ),
+			'image'            => __( 'Image' ),
+			'of'               => __( 'of' ),
+			'close'            => __( 'Close' ),
+			'noiframes'        => __( 'This feature requires inline frames. You have iframes disabled or your browser does not support them.' ),
+			'loadingAnimation' => includes_url( 'js/thickbox/loadingAnimation.gif' ),
+		)
+	);
 
-	$scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop.min.js", array('jquery'), '0.9.12');
+	$scripts->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.min.js', array( 'jquery' ), '0.9.12' );
 
-	$scripts->add( 'swfobject', "/wp-includes/js/swfobject.js", array(), '2.2-20120417');
+	$scripts->add( 'swfobject', '/wp-includes/js/swfobject.js', array(), '2.2-20120417' );
 
 	// Error messages for Plupload.
 	$uploader_l10n = array(
-		'queue_limit_exceeded' => __('You have attempted to queue too many files.'),
-		'file_exceeds_size_limit' => __('%s exceeds the maximum upload size for this site.'),
-		'zero_byte_file' => __('This file is empty. Please try another.'),
-		'invalid_filetype' => __('Sorry, this file type is not permitted for security reasons.'),
-		'not_an_image' => __('This file is not an image. Please try another.'),
-		'image_memory_exceeded' => __('Memory exceeded. Please try another smaller file.'),
-		'image_dimensions_exceeded' => __('This is larger than the maximum size. Please try another.'),
-		'default_error' => __('An error occurred in the upload. Please try again later.'),
-		'missing_upload_url' => __('There was a configuration error. Please contact the server administrator.'),
-		'upload_limit_exceeded' => __('You may only upload 1 file.'),
-		'http_error' => __('HTTP error.'),
-		'upload_failed' => __('Upload failed.'),
+		'queue_limit_exceeded'      => __( 'You have attempted to queue too many files.' ),
+		'file_exceeds_size_limit'   => __( '%s exceeds the maximum upload size for this site.' ),
+		'zero_byte_file'            => __( 'This file is empty. Please try another.' ),
+		'invalid_filetype'          => __( 'Sorry, this file type is not permitted for security reasons.' ),
+		'not_an_image'              => __( 'This file is not an image. Please try another.' ),
+		'image_memory_exceeded'     => __( 'Memory exceeded. Please try another smaller file.' ),
+		'image_dimensions_exceeded' => __( 'This is larger than the maximum size. Please try another.' ),
+		'default_error'             => __( 'An error occurred in the upload. Please try again later.' ),
+		'missing_upload_url'        => __( 'There was a configuration error. Please contact the server administrator.' ),
+		'upload_limit_exceeded'     => __( 'You may only upload 1 file.' ),
+		'http_error'                => __( 'HTTP error.' ),
+		'upload_failed'             => __( 'Upload failed.' ),
 		/* translators: 1: Opening link tag, 2: Closing link tag */
-		'big_upload_failed' => __('Please try uploading this file with the %1$sbrowser uploader%2$s.'),
-		'big_upload_queued' => __('%s exceeds the maximum upload size for the multi-file uploader when used in your browser.'),
-		'io_error' => __('IO error.'),
-		'security_error' => __('Security error.'),
-		'file_cancelled' => __('File canceled.'),
-		'upload_stopped' => __('Upload stopped.'),
-		'dismiss' => __('Dismiss'),
-		'crunching' => __('Crunching&hellip;'),
-		'deleted' => __('moved to the trash.'),
-		'error_uploading' => __('&#8220;%s&#8221; has failed to upload.')
+		'big_upload_failed'         => __( 'Please try uploading this file with the %1$sbrowser uploader%2$s.' ),
+		'big_upload_queued'         => __( '%s exceeds the maximum upload size for the multi-file uploader when used in your browser.' ),
+		'io_error'                  => __( 'IO error.' ),
+		'security_error'            => __( 'Security error.' ),
+		'file_cancelled'            => __( 'File canceled.' ),
+		'upload_stopped'            => __( 'Upload stopped.' ),
+		'dismiss'                   => __( 'Dismiss' ),
+		'crunching'                 => __( 'Crunching&hellip;' ),
+		'deleted'                   => __( 'moved to the trash.' ),
+		'error_uploading'           => __( '&#8220;%s&#8221; has failed to upload.' ),
 	);
 
 	$scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );
@@ -324,9 +343,9 @@ function wp_default_scripts( &$scripts ) {
 	did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n );
 
 	// keep 'swfupload' for back-compat.
-	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113');
+	$scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' );
 	$scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' );
-	$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524');
+	$scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' );
 	did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n );
 
 	$scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 );
@@ -335,126 +354,134 @@ function wp_default_scripts( &$scripts ) {
 	did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' );
 
 	$scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1 );
-	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore','jquery' ), '1.2.3', 1 );
+	$scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.2.3', 1 );
 
-	$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(
-		'ajax' => array(
-			'url' => admin_url( 'admin-ajax.php', 'relative' ),
-		),
-	) );
+	$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(
+			'ajax' => array(
+				'url' => admin_url( 'admin-ajax.php', 'relative' ),
+			),
+		)
+	);
 
-	$scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array('jquery'), false, 1 );
+	$scripts->add( 'wp-sanitize', "/wp-includes/js/wp-sanitize$suffix.js", array( 'jquery' ), false, 1 );
 
-	$scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 );
+	$scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array( 'backbone', 'wp-util' ), false, 1 );
 
 	$scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'hoverIntent' ), false, 1 );
 
-	$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), false, 1 );
+	$scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array( 'jquery' ), false, 1 );
 
 	$scripts->add( 'mediaelement', false, array( 'jquery', 'mediaelement-core', 'mediaelement-migrate' ), '4.2.6-78496d1' );
 	$scripts->add( 'mediaelement-core', "/wp-includes/js/mediaelement/mediaelement-and-player$suffix.js", array(), '4.2.6-78496d1', 1 );
-	$scripts->add( 'mediaelement-migrate', "/wp-includes/js/mediaelement/mediaelement-migrate$suffix.js", array(), false, 1);
+	$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( array(
-		'language' => strtolower( strtok( is_admin() ? get_user_locale() : get_locale(), '_-' ) ),
-		'strings'  => array(
-			'mejs.install-flash'       => __( 'You are using a browser that does not have Flash player enabled or installed. Please turn on your Flash player plugin or download the latest version from https://get.adobe.com/flashplayer/' ),
-			'mejs.fullscreen-off'      => __( 'Turn off Fullscreen' ),
-			'mejs.fullscreen-on'       => __( 'Go Fullscreen' ),
-			'mejs.download-video'      => __( 'Download Video' ),
-			'mejs.fullscreen'          => __( 'Fullscreen' ),
-			'mejs.time-jump-forward'   => array( __( 'Jump forward 1 second' ), __( 'Jump forward %1 seconds' ) ),
-			'mejs.loop'                => __( 'Toggle Loop' ),
-			'mejs.play'                => __( 'Play' ),
-			'mejs.pause'               => __( 'Pause' ),
-			'mejs.close'               => __( 'Close' ),
-			'mejs.time-slider'         => __( 'Time Slider' ),
-			'mejs.time-help-text'      => __( 'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' ),
-			'mejs.time-skip-back'      => array( __( 'Skip back 1 second' ), __( 'Skip back %1 seconds' ) ),
-			'mejs.captions-subtitles'  => __( 'Captions/Subtitles' ),
-			'mejs.captions-chapters'   => __( 'Chapters' ),
-			'mejs.none'                => __( 'None' ),
-			'mejs.mute-toggle'         => __( 'Mute Toggle' ),
-			'mejs.volume-help-text'    => __( 'Use Up/Down Arrow keys to increase or decrease volume.' ),
-			'mejs.unmute'              => __( 'Unmute' ),
-			'mejs.mute'                => __( 'Mute' ),
-			'mejs.volume-slider'       => __( 'Volume Slider' ),
-			'mejs.video-player'        => __( 'Video Player' ),
-			'mejs.audio-player'        => __( 'Audio Player' ),
-			'mejs.ad-skip'             => __( 'Skip ad' ),
-			'mejs.ad-skip-info'        => array( __( 'Skip in 1 second' ), __( 'Skip in %1 seconds' ) ),
-			'mejs.source-chooser'      => __( 'Source Chooser' ),
-			'mejs.stop'                => __( 'Stop' ),
-			'mejs.speed-rate'          => __( 'Speed Rate' ),
-			'mejs.live-broadcast'      => __( 'Live Broadcast' ),
-			'mejs.afrikaans'           => __( 'Afrikaans' ),
-			'mejs.albanian'            => __( 'Albanian' ),
-			'mejs.arabic'              => __( 'Arabic' ),
-			'mejs.belarusian'          => __( 'Belarusian' ),
-			'mejs.bulgarian'           => __( 'Bulgarian' ),
-			'mejs.catalan'             => __( 'Catalan' ),
-			'mejs.chinese'             => __( 'Chinese' ),
-			'mejs.chinese-simplified'  => __( 'Chinese (Simplified)' ),
-			'mejs.chinese-traditional' => __( 'Chinese (Traditional)' ),
-			'mejs.croatian'            => __( 'Croatian' ),
-			'mejs.czech'               => __( 'Czech' ),
-			'mejs.danish'              => __( 'Danish' ),
-			'mejs.dutch'               => __( 'Dutch' ),
-			'mejs.english'             => __( 'English' ),
-			'mejs.estonian'            => __( 'Estonian' ),
-			'mejs.filipino'            => __( 'Filipino' ),
-			'mejs.finnish'             => __( 'Finnish' ),
-			'mejs.french'              => __( 'French' ),
-			'mejs.galician'            => __( 'Galician' ),
-			'mejs.german'              => __( 'German' ),
-			'mejs.greek'               => __( 'Greek' ),
-			'mejs.haitian-creole'      => __( 'Haitian Creole' ),
-			'mejs.hebrew'              => __( 'Hebrew' ),
-			'mejs.hindi'               => __( 'Hindi' ),
-			'mejs.hungarian'           => __( 'Hungarian' ),
-			'mejs.icelandic'           => __( 'Icelandic' ),
-			'mejs.indonesian'          => __( 'Indonesian' ),
-			'mejs.irish'               => __( 'Irish' ),
-			'mejs.italian'             => __( 'Italian' ),
-			'mejs.japanese'            => __( 'Japanese' ),
-			'mejs.korean'              => __( 'Korean' ),
-			'mejs.latvian'             => __( 'Latvian' ),
-			'mejs.lithuanian'          => __( 'Lithuanian' ),
-			'mejs.macedonian'          => __( 'Macedonian' ),
-			'mejs.malay'               => __( 'Malay' ),
-			'mejs.maltese'             => __( 'Maltese' ),
-			'mejs.norwegian'           => __( 'Norwegian' ),
-			'mejs.persian'             => __( 'Persian' ),
-			'mejs.polish'              => __( 'Polish' ),
-			'mejs.portuguese'          => __( 'Portuguese' ),
-			'mejs.romanian'            => __( 'Romanian' ),
-			'mejs.russian'             => __( 'Russian' ),
-			'mejs.serbian'             => __( 'Serbian' ),
-			'mejs.slovak'              => __( 'Slovak' ),
-			'mejs.slovenian'           => __( 'Slovenian' ),
-			'mejs.spanish'             => __( 'Spanish' ),
-			'mejs.swahili'             => __( 'Swahili' ),
-			'mejs.swedish'             => __( 'Swedish' ),
-			'mejs.tagalog'             => __( 'Tagalog' ),
-			'mejs.thai'                => __( 'Thai' ),
-			'mejs.turkish'             => __( 'Turkish' ),
-			'mejs.ukrainian'           => __( 'Ukrainian' ),
-			'mejs.vietnamese'          => __( 'Vietnamese' ),
-			'mejs.welsh'               => __( 'Welsh' ),
-			'mejs.yiddish'             => __( 'Yiddish' ),
-			),
-		) ) ), 'before' );
-
-
-	$scripts->add( 'mediaelement-vimeo', "/wp-includes/js/mediaelement/renderers/vimeo.min.js", array('mediaelement'), '4.2.6-78496d1', 1 );
-	$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array('mediaelement'), false, 1 );
-	$mejs_settings = array(
-		'pluginPath'    => includes_url( 'js/mediaelement/', 'relative' ),
-		'classPrefix'   => 'mejs-',
-		'stretching'    => 'responsive',
+	did_action( 'init' ) && $scripts->add_inline_script(
+		'mediaelement-core', sprintf(
+			'var mejsL10n = %s;', wp_json_encode(
+				array(
+					'language' => strtolower( strtok( is_admin() ? get_user_locale() : get_locale(), '_-' ) ),
+					'strings'  => array(
+						'mejs.install-flash'       => __( 'You are using a browser that does not have Flash player enabled or installed. Please turn on your Flash player plugin or download the latest version from https://get.adobe.com/flashplayer/' ),
+						'mejs.fullscreen-off'      => __( 'Turn off Fullscreen' ),
+						'mejs.fullscreen-on'       => __( 'Go Fullscreen' ),
+						'mejs.download-video'      => __( 'Download Video' ),
+						'mejs.fullscreen'          => __( 'Fullscreen' ),
+						'mejs.time-jump-forward'   => array( __( 'Jump forward 1 second' ), __( 'Jump forward %1 seconds' ) ),
+						'mejs.loop'                => __( 'Toggle Loop' ),
+						'mejs.play'                => __( 'Play' ),
+						'mejs.pause'               => __( 'Pause' ),
+						'mejs.close'               => __( 'Close' ),
+						'mejs.time-slider'         => __( 'Time Slider' ),
+						'mejs.time-help-text'      => __( 'Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.' ),
+						'mejs.time-skip-back'      => array( __( 'Skip back 1 second' ), __( 'Skip back %1 seconds' ) ),
+						'mejs.captions-subtitles'  => __( 'Captions/Subtitles' ),
+						'mejs.captions-chapters'   => __( 'Chapters' ),
+						'mejs.none'                => __( 'None' ),
+						'mejs.mute-toggle'         => __( 'Mute Toggle' ),
+						'mejs.volume-help-text'    => __( 'Use Up/Down Arrow keys to increase or decrease volume.' ),
+						'mejs.unmute'              => __( 'Unmute' ),
+						'mejs.mute'                => __( 'Mute' ),
+						'mejs.volume-slider'       => __( 'Volume Slider' ),
+						'mejs.video-player'        => __( 'Video Player' ),
+						'mejs.audio-player'        => __( 'Audio Player' ),
+						'mejs.ad-skip'             => __( 'Skip ad' ),
+						'mejs.ad-skip-info'        => array( __( 'Skip in 1 second' ), __( 'Skip in %1 seconds' ) ),
+						'mejs.source-chooser'      => __( 'Source Chooser' ),
+						'mejs.stop'                => __( 'Stop' ),
+						'mejs.speed-rate'          => __( 'Speed Rate' ),
+						'mejs.live-broadcast'      => __( 'Live Broadcast' ),
+						'mejs.afrikaans'           => __( 'Afrikaans' ),
+						'mejs.albanian'            => __( 'Albanian' ),
+						'mejs.arabic'              => __( 'Arabic' ),
+						'mejs.belarusian'          => __( 'Belarusian' ),
+						'mejs.bulgarian'           => __( 'Bulgarian' ),
+						'mejs.catalan'             => __( 'Catalan' ),
+						'mejs.chinese'             => __( 'Chinese' ),
+						'mejs.chinese-simplified'  => __( 'Chinese (Simplified)' ),
+						'mejs.chinese-traditional' => __( 'Chinese (Traditional)' ),
+						'mejs.croatian'            => __( 'Croatian' ),
+						'mejs.czech'               => __( 'Czech' ),
+						'mejs.danish'              => __( 'Danish' ),
+						'mejs.dutch'               => __( 'Dutch' ),
+						'mejs.english'             => __( 'English' ),
+						'mejs.estonian'            => __( 'Estonian' ),
+						'mejs.filipino'            => __( 'Filipino' ),
+						'mejs.finnish'             => __( 'Finnish' ),
+						'mejs.french'              => __( 'French' ),
+						'mejs.galician'            => __( 'Galician' ),
+						'mejs.german'              => __( 'German' ),
+						'mejs.greek'               => __( 'Greek' ),
+						'mejs.haitian-creole'      => __( 'Haitian Creole' ),
+						'mejs.hebrew'              => __( 'Hebrew' ),
+						'mejs.hindi'               => __( 'Hindi' ),
+						'mejs.hungarian'           => __( 'Hungarian' ),
+						'mejs.icelandic'           => __( 'Icelandic' ),
+						'mejs.indonesian'          => __( 'Indonesian' ),
+						'mejs.irish'               => __( 'Irish' ),
+						'mejs.italian'             => __( 'Italian' ),
+						'mejs.japanese'            => __( 'Japanese' ),
+						'mejs.korean'              => __( 'Korean' ),
+						'mejs.latvian'             => __( 'Latvian' ),
+						'mejs.lithuanian'          => __( 'Lithuanian' ),
+						'mejs.macedonian'          => __( 'Macedonian' ),
+						'mejs.malay'               => __( 'Malay' ),
+						'mejs.maltese'             => __( 'Maltese' ),
+						'mejs.norwegian'           => __( 'Norwegian' ),
+						'mejs.persian'             => __( 'Persian' ),
+						'mejs.polish'              => __( 'Polish' ),
+						'mejs.portuguese'          => __( 'Portuguese' ),
+						'mejs.romanian'            => __( 'Romanian' ),
+						'mejs.russian'             => __( 'Russian' ),
+						'mejs.serbian'             => __( 'Serbian' ),
+						'mejs.slovak'              => __( 'Slovak' ),
+						'mejs.slovenian'           => __( 'Slovenian' ),
+						'mejs.spanish'             => __( 'Spanish' ),
+						'mejs.swahili'             => __( 'Swahili' ),
+						'mejs.swedish'             => __( 'Swedish' ),
+						'mejs.tagalog'             => __( 'Tagalog' ),
+						'mejs.thai'                => __( 'Thai' ),
+						'mejs.turkish'             => __( 'Turkish' ),
+						'mejs.ukrainian'           => __( 'Ukrainian' ),
+						'mejs.vietnamese'          => __( 'Vietnamese' ),
+						'mejs.welsh'               => __( 'Welsh' ),
+						'mejs.yiddish'             => __( 'Yiddish' ),
+					),
+				)
+			)
+		), 'before'
 	);
-	did_action( 'init' ) && $scripts->localize( 'mediaelement', '_wpmejsSettings',
+
+	$scripts->add( 'mediaelement-vimeo', '/wp-includes/js/mediaelement/renderers/vimeo.min.js', array( 'mediaelement' ), '4.2.6-78496d1', 1 );
+	$scripts->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.js", array( 'mediaelement' ), false, 1 );
+	$mejs_settings = array(
+		'pluginPath'  => includes_url( 'js/mediaelement/', 'relative' ),
+		'classPrefix' => 'mejs-',
+		'stretching'  => 'responsive',
+	);
+	did_action( 'init' ) && $scripts->localize(
+		'mediaelement', '_wpmejsSettings',
 		/**
 		 * Filters the MediaElement configuration settings.
 		 *
@@ -473,44 +500,56 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) );
 	$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( 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.' ),
-		'lintError' => array(
-			/* translators: %d: error count */
-			'singular' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 1 ),
-			/* translators: %d: error count */
-			'plural' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
-		),
-	) ) ) );
+	did_action( 'init' ) && $scripts->add_inline_script(
+		'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.' ),
+					'lintError' => array(
+						/* translators: %d: error count */
+						'singular' => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 1 ),
+						/* translators: %d: error count */
+						'plural'   => _n( 'There is %d error which must be fixed before you can update this file.', 'There are %d errors which must be fixed before you can update this file.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+					),
+				)
+			)
+		)
+	);
 
 	$scripts->add( 'wp-playlist', "/wp-includes/js/mediaelement/wp-playlist$suffix.js", array( 'wp-util', 'backbone', 'mediaelement' ), false, 1 );
 
 	$scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
-	did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array(
-		'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'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(
-		'unknown'  => _x( 'Password strength unknown', 'password strength' ),
-		'short'    => _x( 'Very weak', 'password strength' ),
-		'bad'      => _x( 'Weak', 'password strength' ),
-		'good'     => _x( 'Medium', 'password strength' ),
-		'strong'   => _x( 'Strong', 'password strength' ),
-		'mismatch' => _x( 'Mismatch', 'password mismatch' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'password-strength-meter', 'pwsL10n', array(
+			'unknown'  => _x( 'Password strength unknown', 'password strength' ),
+			'short'    => _x( 'Very weak', 'password strength' ),
+			'bad'      => _x( 'Weak', 'password strength' ),
+			'good'     => _x( 'Medium', 'password strength' ),
+			'strong'   => _x( 'Strong', 'password strength' ),
+			'mismatch' => _x( 'Mismatch', 'password mismatch' ),
+		)
+	);
 
 	$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(
-		'warn'     => __( 'Your new password has not been saved.' ),
-		'warnWeak' => __( 'Confirm use of weak password' ),
-		'show'     => __( 'Show' ),
-		'hide'     => __( 'Hide' ),
-		'cancel'   => __( 'Cancel' ),
-		'ariaShow' => esc_attr__( 'Show password' ),
-		'ariaHide' => esc_attr__( 'Hide password' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'user-profile', 'userProfileL10n', array(
+			'warn'     => __( 'Your new password has not been saved.' ),
+			'warnWeak' => __( 'Confirm use of weak password' ),
+			'show'     => __( 'Show' ),
+			'hide'     => __( 'Hide' ),
+			'cancel'   => __( 'Cancel' ),
+			'ariaShow' => esc_attr__( 'Show password' ),
+			'ariaHide' => esc_attr__( 'Hide password' ),
+		)
+	);
 
 	$scripts->add( 'language-chooser', "/wp-admin/js/language-chooser$suffix.js", array( 'jquery' ), false, 1 );
 
@@ -519,15 +558,17 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", array(), false, 1 );
 
 	$scripts->add( 'wplink', "/wp-includes/js/wplink$suffix.js", array( 'jquery', 'wp-a11y' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'wplink', 'wpLinkL10n', array(
-		'title' => __('Insert/edit link'),
-		'update' => __('Update'),
-		'save' => __('Add Link'),
-		'noTitle' => __('(no title)'),
-		'noMatchesFound' => __('No results found.'),
-		'linkSelected' => __( 'Link selected.' ),
-		'linkInserted' => __( 'Link inserted.' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'wplink', 'wpLinkL10n', array(
+			'title'          => __( 'Insert/edit link' ),
+			'update'         => __( 'Update' ),
+			'save'           => __( 'Add Link' ),
+			'noTitle'        => __( '(no title)' ),
+			'noMatchesFound' => __( 'No results found.' ),
+			'linkSelected'   => __( 'Link selected.' ),
+			'linkInserted'   => __( 'Link inserted.' ),
+		)
+	);
 
 	$scripts->add( 'wpdialogs', "/wp-includes/js/wpdialog$suffix.js", array( 'jquery-ui-dialog' ), false, 1 );
 
@@ -535,76 +576,78 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
 
-	$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), '1.8.1', 1 );
+	$scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array( 'jquery' ), '1.8.1', 1 );
 
-	$scripts->add( 'customize-base',     "/wp-includes/js/customize-base$suffix.js",     array( 'jquery', 'json2', 'underscore' ), false, 1 );
-	$scripts->add( 'customize-loader',   "/wp-includes/js/customize-loader$suffix.js",   array( 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-preview',  "/wp-includes/js/customize-preview$suffix.js",  array( 'wp-a11y', 'customize-base' ), false, 1 );
-	$scripts->add( 'customize-models',   "/wp-includes/js/customize-models.js", array( 'underscore', 'backbone' ), false, 1 );
-	$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-base', "/wp-includes/js/customize-base$suffix.js", array( 'jquery', 'json2', 'underscore' ), false, 1 );
+	$scripts->add( 'customize-loader', "/wp-includes/js/customize-loader$suffix.js", array( 'customize-base' ), false, 1 );
+	$scripts->add( 'customize-preview', "/wp-includes/js/customize-preview$suffix.js", array( 'wp-a11y', 'customize-base' ), false, 1 );
+	$scripts->add( 'customize-models', '/wp-includes/js/customize-models.js', array( 'underscore', 'backbone' ), false, 1 );
+	$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(
-		'activate'           => __( 'Activate &amp; Publish' ),
-		'save'               => __( 'Save &amp; Publish' ), // @todo Remove as not required.
-		'publish'            => __( 'Publish' ),
-		'published'          => __( 'Published' ),
-		'saveDraft'          => __( 'Save Draft' ),
-		'draftSaved'         => __( 'Draft Saved' ),
-		'updating'           => __( 'Updating' ),
-		'schedule'           => _x( 'Schedule', 'customizer changeset action/button label' ),
-		'scheduled'          => _x( 'Scheduled', 'customizer changeset status' ),
-		'invalid'            => __( 'Invalid' ),
-		'saveBeforeShare'    => __( 'Please save your changes in order to share the preview.' ),
-		'futureDateError'    => __( 'You must supply a future date to schedule.' ),
-		'saveAlert'          => __( 'The changes you made will be lost if you navigate away from this page.' ),
-		'saved'              => __( 'Saved' ),
-		'cancel'             => __( 'Cancel' ),
-		'close'              => __( 'Close' ),
-		'action'             => __( 'Action' ),
-		'discardChanges'     => __( 'Discard changes' ),
-		'cheatin'            => __( 'Cheatin&#8217; uh?' ),
-		'notAllowed'         => __( 'Sorry, you are not allowed to customize this site.' ),
-		'previewIframeTitle' => __( 'Site Preview' ),
-		'loginIframeTitle'   => __( 'Session expired' ),
-		'collapseSidebar'    => _x( 'Hide Controls', 'label for hide controls button without length constraints' ),
-		'expandSidebar'      => _x( 'Show Controls', 'label for hide controls button without length constraints' ),
-		'untitledBlogName'   => __( '(Untitled)' ),
-		'unknownRequestFail' => __( 'Looks like something&#8217;s gone wrong. Wait a couple seconds, and then try again.' ),
-		'themeDownloading'   => __( 'Downloading your new theme&hellip;' ),
-		'themePreviewWait'   => __( 'Setting up your live preview. This may take a bit.' ),
-		'revertingChanges'   => __( 'Reverting unpublished changes&hellip;' ),
-		'trashConfirm'       => __( 'Are you sure you&#8217;d like to discard your unpublished changes?' ),
-		/* translators: %s: Display name of the user who has taken over the changeset in customizer. */
-		'takenOverMessage'   => __( '%s has taken over and is currently customizing.' ),
-		/* translators: %s: URL to the Customizer to load the autosaved version */
-		'autosaveNotice'     => __( 'There is a more recent autosave of your changes than the one you are previewing. <a href="%s">Restore the autosave</a>' ),
-		'videoHeaderNotice'  => __( 'This theme doesn&#8217;t support video headers on this page. Navigate to the front page or another page that supports video headers.' ),
-		// Used for overriding the file types allowed in plupload.
-		'allowedFiles'       => __( 'Allowed Files' ),
-		'customCssError'     => array(
-			/* translators: %d: error count */
-			'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
-			/* translators: %d: error count */
-			'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
-		),
-		'pageOnFrontError' => __( 'Homepage and posts page must be different.' ),
-		'saveBlockedError' => array(
-			/* translators: %s: number of invalid settings */
-			'singular' => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 1 ),
-			/* translators: %s: number of invalid settings */
-			'plural'   => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
-		),
-		'scheduleDescription' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
-		'themePreviewUnavailable' => __( 'Sorry, you can&#8217;t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
-		'themeInstallUnavailable' => sprintf(
-			/* translators: %s: URL to Add Themes admin screen */
-			__( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
-			esc_url( admin_url( 'theme-install.php' ) )
-		),
-		'publishSettings' => __( 'Publish Settings' ),
-		'invalidDate'     => __( 'Invalid date.' ),
-		'invalidValue'    => __( 'Invalid value.' ),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'customize-controls', '_wpCustomizeControlsL10n', array(
+			'activate'                => __( 'Activate &amp; Publish' ),
+			'save'                    => __( 'Save &amp; Publish' ), // @todo Remove as not required.
+			'publish'                 => __( 'Publish' ),
+			'published'               => __( 'Published' ),
+			'saveDraft'               => __( 'Save Draft' ),
+			'draftSaved'              => __( 'Draft Saved' ),
+			'updating'                => __( 'Updating' ),
+			'schedule'                => _x( 'Schedule', 'customizer changeset action/button label' ),
+			'scheduled'               => _x( 'Scheduled', 'customizer changeset status' ),
+			'invalid'                 => __( 'Invalid' ),
+			'saveBeforeShare'         => __( 'Please save your changes in order to share the preview.' ),
+			'futureDateError'         => __( 'You must supply a future date to schedule.' ),
+			'saveAlert'               => __( 'The changes you made will be lost if you navigate away from this page.' ),
+			'saved'                   => __( 'Saved' ),
+			'cancel'                  => __( 'Cancel' ),
+			'close'                   => __( 'Close' ),
+			'action'                  => __( 'Action' ),
+			'discardChanges'          => __( 'Discard changes' ),
+			'cheatin'                 => __( 'Cheatin&#8217; uh?' ),
+			'notAllowed'              => __( 'Sorry, you are not allowed to customize this site.' ),
+			'previewIframeTitle'      => __( 'Site Preview' ),
+			'loginIframeTitle'        => __( 'Session expired' ),
+			'collapseSidebar'         => _x( 'Hide Controls', 'label for hide controls button without length constraints' ),
+			'expandSidebar'           => _x( 'Show Controls', 'label for hide controls button without length constraints' ),
+			'untitledBlogName'        => __( '(Untitled)' ),
+			'unknownRequestFail'      => __( 'Looks like something&#8217;s gone wrong. Wait a couple seconds, and then try again.' ),
+			'themeDownloading'        => __( 'Downloading your new theme&hellip;' ),
+			'themePreviewWait'        => __( 'Setting up your live preview. This may take a bit.' ),
+			'revertingChanges'        => __( 'Reverting unpublished changes&hellip;' ),
+			'trashConfirm'            => __( 'Are you sure you&#8217;d like to discard your unpublished changes?' ),
+			/* translators: %s: Display name of the user who has taken over the changeset in customizer. */
+			'takenOverMessage'        => __( '%s has taken over and is currently customizing.' ),
+			/* translators: %s: URL to the Customizer to load the autosaved version */
+			'autosaveNotice'          => __( 'There is a more recent autosave of your changes than the one you are previewing. <a href="%s">Restore the autosave</a>' ),
+			'videoHeaderNotice'       => __( 'This theme doesn&#8217;t support video headers on this page. Navigate to the front page or another page that supports video headers.' ),
+			// Used for overriding the file types allowed in plupload.
+			'allowedFiles'            => __( 'Allowed Files' ),
+			'customCssError'          => array(
+				/* translators: %d: error count */
+				'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
+				/* translators: %d: error count */
+				'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+			),
+			'pageOnFrontError'        => __( 'Homepage and posts page must be different.' ),
+			'saveBlockedError'        => array(
+				/* translators: %s: number of invalid settings */
+				'singular' => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 1 ),
+				/* translators: %s: number of invalid settings */
+				'plural'   => _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+			),
+			'scheduleDescription'     => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
+			'themePreviewUnavailable' => __( 'Sorry, you can&#8217;t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
+			'themeInstallUnavailable' => sprintf(
+				/* translators: %s: URL to Add Themes admin screen */
+				__( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
+				esc_url( admin_url( 'theme-install.php' ) )
+			),
+			'publishSettings'         => __( 'Publish Settings' ),
+			'invalidDate'             => __( 'Invalid date.' ),
+			'invalidValue'            => __( 'Invalid value.' ),
+		)
+	);
 	$scripts->add( 'customize-selective-refresh', "/wp-includes/js/customize-selective-refresh$suffix.js", array( 'jquery', 'wp-util', 'customize-preview' ), false, 1 );
 
 	$scripts->add( 'customize-widgets', "/wp-admin/js/customize-widgets$suffix.js", array( 'jquery', 'jquery-ui-sortable', 'jquery-ui-droppable', 'wp-backbone', 'customize-controls' ), false, 1 );
@@ -619,18 +662,20 @@ 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(
-		'settings' => array(
-			'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
-			'post' => array( 'id' => 0 ),
-		),
-	) );
+	did_action( 'init' ) && $scripts->localize(
+		'media-models', '_wpMediaModelsL10n', array(
+			'settings' => array(
+				'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
+				'post'    => array( 'id' => 0 ),
+			),
+		)
+	);
 
 	$scripts->add( 'wp-embed', "/wp-includes/js/wp-embed$suffix.js" );
 
 	// To enqueue media-views or media-editor, call wp_enqueue_media().
 	// Both rely on numerous settings, styles, and templates to operate correctly.
-	$scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request' ), false, 1 );
+	$scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request' ), false, 1 );
 	$scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
 	$scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
 	$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );
@@ -639,68 +684,78 @@ 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(
-			'noPerm' => __('Sorry, you are not allowed to do that.'),
-			'broken' => __('An unidentified error has occurred.')
-		));
+		did_action( 'init' ) && $scripts->localize(
+			'admin-tags', 'tagsl10n', array(
+				'noPerm' => __( 'Sorry, you are not allowed to do that.' ),
+				'broken' => __( 'An unidentified error has occurred.' ),
+			)
+		);
 
-		$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(
-			'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),
-			'hotkeys_highlight_last' => isset($_GET['hotkeys_highlight_last']),
-			'replyApprove' => __( 'Approve and Reply' ),
-			'reply' => __( 'Reply' ),
-			'warnQuickEdit' => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
-			'warnCommentChanges' => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
-			'docTitleComments' => __( 'Comments' ),
-			/* translators: %s: comments count */
-			'docTitleCommentsCount' => __( 'Comments (%s)' ),
-		) );
+		$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(
+				'hotkeys_highlight_first' => isset( $_GET['hotkeys_highlight_first'] ),
+				'hotkeys_highlight_last'  => isset( $_GET['hotkeys_highlight_last'] ),
+				'replyApprove'            => __( 'Approve and Reply' ),
+				'reply'                   => __( 'Reply' ),
+				'warnQuickEdit'           => __( "Are you sure you want to edit this comment?\nThe changes you made will be lost." ),
+				'warnCommentChanges'      => __( "Are you sure you want to do this?\nThe comment changes you made will be lost." ),
+				'docTitleComments'        => __( 'Comments' ),
+				/* translators: %s: comments count */
+				'docTitleCommentsCount'   => __( 'Comments (%s)' ),
+			)
+		);
 
-		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array('jquery'), false, 1 );
+		$scripts->add( 'xfn', "/wp-admin/js/xfn$suffix.js", array( 'jquery' ), false, 1 );
 
-		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
-		did_action( 'init' ) && $scripts->localize( 'postbox', 'postBoxL10n', array(
-			'postBoxEmptyString' => __( 'Drag boxes here' ),
-		) );
+		$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array( 'jquery-ui-sortable' ), false, 1 );
+		did_action( 'init' ) && $scripts->localize(
+			'postbox', 'postBoxL10n', array(
+				'postBoxEmptyString' => __( 'Drag boxes here' ),
+			)
+		);
 
 		$scripts->add( 'tags-box', "/wp-admin/js/tags-box$suffix.js", array( 'jquery', 'tags-suggest' ), false, 1 );
 
 		$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(
-			'tagDelimiter' => _x( ',', 'tag delimiter' ),
-			'removeTerm'   => __( 'Remove term:' ),
-			'termSelected' => __( 'Term selected.' ),
-			'termAdded'    => __( 'Term added.' ),
-			'termRemoved'  => __( 'Term removed.' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'tags-suggest', 'tagsSuggestL10n', array(
+				'tagDelimiter' => _x( ',', 'tag delimiter' ),
+				'removeTerm'   => __( 'Remove term:' ),
+				'termSelected' => __( 'Term selected.' ),
+				'termAdded'    => __( 'Term added.' ),
+				'termRemoved'  => __( 'Term removed.' ),
+			)
+		);
 
 		$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(
-			'ok' => __('OK'),
-			'cancel' => __('Cancel'),
-			'publishOn' => __('Publish on:'),
-			'publishOnFuture' =>  __('Schedule for:'),
-			'publishOnPast' => __('Published on:'),
-			/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-			'dateFormat' => __('%1$s %2$s, %3$s @ %4$s:%5$s'),
-			'showcomm' => __('Show more comments'),
-			'endcomm' => __('No more comments found.'),
-			'publish' => __('Publish'),
-			'schedule' => _x('Schedule', 'post action/button label'),
-			'update' => __('Update'),
-			'savePending' => __('Save as Pending'),
-			'saveDraft' => __('Save Draft'),
-			'private' => __('Private'),
-			'public' => __('Public'),
-			'publicSticky' => __('Public, Sticky'),
-			'password' => __('Password Protected'),
-			'privatelyPublished' => __('Privately Published'),
-			'published' => __('Published'),
-			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
-			'savingText' => __('Saving Draft&#8230;'),
-			'permalinkSaved' => __( 'Permalink saved' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'post', 'postL10n', array(
+				'ok'                 => __( 'OK' ),
+				'cancel'             => __( 'Cancel' ),
+				'publishOn'          => __( 'Publish on:' ),
+				'publishOnFuture'    => __( 'Schedule for:' ),
+				'publishOnPast'      => __( 'Published on:' ),
+				/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
+				'dateFormat'         => __( '%1$s %2$s, %3$s @ %4$s:%5$s' ),
+				'showcomm'           => __( 'Show more comments' ),
+				'endcomm'            => __( 'No more comments found.' ),
+				'publish'            => __( 'Publish' ),
+				'schedule'           => _x( 'Schedule', 'post action/button label' ),
+				'update'             => __( 'Update' ),
+				'savePending'        => __( 'Save as Pending' ),
+				'saveDraft'          => __( 'Save Draft' ),
+				'private'            => __( 'Private' ),
+				'public'             => __( 'Public' ),
+				'publicSticky'       => __( 'Public, Sticky' ),
+				'password'           => __( 'Password Protected' ),
+				'privatelyPublished' => __( 'Privately Published' ),
+				'published'          => __( 'Published' ),
+				'saveAlert'          => __( 'The changes you made will be lost if you navigate away from this page.' ),
+				'savingText'         => __( 'Saving Draft&#8230;' ),
+				'permalinkSaved'     => __( 'Permalink saved' ),
+			)
+		);
 
 		$scripts->add( 'editor-expand', "/wp-admin/js/editor-expand$suffix.js", array( 'jquery', 'underscore' ), false, 1 );
 
@@ -708,20 +763,28 @@ 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(
-			'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' )
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'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' ),
+			)
+		);
 
 		$scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ) );
 
 		$scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
-		did_action( 'init' ) && $scripts->add_inline_script( 'admin-widgets', sprintf( 'wpWidgets.l10n = %s;', wp_json_encode( array(
-			'save' => __( 'Save' ),
-			'saved' => __( 'Saved' ),
-			'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
-		) ) ) );
+		did_action( 'init' ) && $scripts->add_inline_script(
+			'admin-widgets', sprintf(
+				'wpWidgets.l10n = %s;', wp_json_encode(
+					array(
+						'save'      => __( 'Save' ),
+						'saved'     => __( 'Saved' ),
+						'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+					)
+				)
+			)
+		);
 
 		$scripts->add( 'media-widgets', "/wp-admin/js/widgets/media-widgets$suffix.js", array( 'jquery', 'media-models', 'media-views', 'wp-api-request' ) );
 		$scripts->add_inline_script( 'media-widgets', 'wp.mediaWidgets.init();', 'after' );
@@ -736,125 +799,135 @@ function wp_default_scripts( &$scripts ) {
 		$scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y', 'customize-base' ), false, 1 );
 
 		$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(
-			'error'      => __( 'Error while saving the changes.' ),
-			'ntdeltitle' => __( 'Remove From Bulk Edit' ),
-			'notitle'    => __( '(no title)' ),
-			'comma'      => trim( _x( ',', 'tag delimiter' ) ),
-			'saved'      => __( 'Changes saved.' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'inline-edit-post', 'inlineEditL10n', array(
+				'error'      => __( 'Error while saving the changes.' ),
+				'ntdeltitle' => __( 'Remove From Bulk Edit' ),
+				'notitle'    => __( '(no title)' ),
+				'comma'      => trim( _x( ',', 'tag delimiter' ) ),
+				'saved'      => __( 'Changes saved.' ),
+			)
+		);
 
 		$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(
-			'error' => __( 'Error while saving the changes.' ),
-			'saved' => __( 'Changes saved.' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'inline-edit-tax', 'inlineEditL10n', array(
+				'error' => __( 'Error while saving the changes.' ),
+				'saved' => __( 'Changes saved.' ),
+			)
+		);
 
 		$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_information' => __( 'Plugin:' ),
-			'plugin_modal_label' => __( 'Plugin details' ),
-			'ays' => __('Are you sure you want to install this plugin?')
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'plugin-install', 'plugininstallL10n', array(
+				'plugin_information' => __( 'Plugin:' ),
+				'plugin_modal_label' => __( 'Plugin details' ),
+				'ays'                => __( 'Are you sure you want to install this plugin?' ),
+			)
+		);
 
 		$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(
-			'ajax_nonce' => wp_create_nonce( 'updates' ),
-			'l10n'       => array(
-				/* translators: %s: Search string */
-				'searchResults'              => __( 'Search results for &#8220;%s&#8221;' ),
-				'searchResultsLabel'         => __( 'Search Results' ),
-				'noPlugins'                  => __( 'You do not appear to have any plugins available at this time.' ),
-				'noItemsSelected'            => __( 'Please select at least one item to perform this action on.' ),
-				'updating'                   => __( 'Updating...' ), // No ellipsis.
-				'pluginUpdated'              => _x( 'Updated!', 'plugin' ),
-				'themeUpdated'               => _x( 'Updated!', 'theme' ),
-				'update'                     => __( 'Update' ),
-				'updateNow'                  => __( 'Update Now' ),
-				/* translators: %s: Plugin name and version */
-				'pluginUpdateNowLabel'       => _x( 'Update %s now', 'plugin' ),
-				'updateFailedShort'          => __( 'Update Failed!' ),
-				/* translators: %s: Error string for a failed update */
-				'updateFailed'               => __( 'Update Failed: %s' ),
-				/* translators: %s: Plugin name and version */
-				'pluginUpdatingLabel'        => _x( 'Updating %s...', 'plugin' ), // No ellipsis.
-				/* translators: %s: Plugin name and version */
-				'pluginUpdatedLabel'         => _x( '%s updated!', 'plugin' ),
-				/* translators: %s: Plugin name and version */
-				'pluginUpdateFailedLabel'    => _x( '%s update failed', 'plugin' ),
-				/* translators: Accessibility text */
-				'updatingMsg'                => __( 'Updating... please wait.' ), // No ellipsis.
-				/* translators: Accessibility text */
-				'updatedMsg'                 => __( 'Update completed successfully.' ),
-				/* translators: Accessibility text */
-				'updateCancel'               => __( 'Update canceled.' ),
-				'beforeunload'               => __( 'Updates may not complete if you navigate away from this page.' ),
-				'installNow'                 => __( 'Install Now' ),
-				/* translators: %s: Plugin name */
-				'pluginInstallNowLabel'      => _x( 'Install %s now', 'plugin' ),
-				'installing'                 => __( 'Installing...' ),
-				'pluginInstalled'            => _x( 'Installed!', 'plugin' ),
-				'themeInstalled'             => _x( 'Installed!', 'theme' ),
-				'installFailedShort'         => __( 'Installation Failed!' ),
-				/* translators: %s: Error string for a failed installation */
-				'installFailed'              => __( 'Installation failed: %s' ),
-				/* translators: %s: Plugin name and version */
-				'pluginInstallingLabel'      => _x( 'Installing %s...', 'plugin' ), // no ellipsis
-				/* translators: %s: Theme name and version */
-				'themeInstallingLabel'       => _x( 'Installing %s...', 'theme' ), // no ellipsis
-				/* translators: %s: Plugin name and version */
-				'pluginInstalledLabel'       => _x( '%s installed!', 'plugin' ),
-				/* translators: %s: Theme name and version */
-				'themeInstalledLabel'        => _x( '%s installed!', 'theme' ),
-				/* translators: %s: Plugin name and version */
-				'pluginInstallFailedLabel'   => _x( '%s installation failed', 'plugin' ),
-				/* translators: %s: Theme name and version */
-				'themeInstallFailedLabel'    => _x( '%s installation failed', 'theme' ),
-				'installingMsg'              => __( 'Installing... please wait.' ),
-				'installedMsg'               => __( 'Installation completed successfully.' ),
-				/* translators: %s: Activation URL */
-				'importerInstalledMsg'       => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ),
-				/* translators: %s: Theme name */
-				'aysDelete'                  => __( 'Are you sure you want to delete %s?' ),
-				/* translators: %s: Plugin name */
-				'aysDeleteUninstall'         => __( 'Are you sure you want to delete %s and its data?' ),
-				'aysBulkDelete'              => __( 'Are you sure you want to delete the selected plugins and their data?' ),
-				'aysBulkDeleteThemes'        => __( 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?' ),
-				'deleting'                   => __( 'Deleting...' ),
-				/* translators: %s: Error string for a failed deletion */
-				'deleteFailed'               => __( 'Deletion failed: %s' ),
-				'pluginDeleted'              => _x( 'Deleted!', 'plugin' ),
-				'themeDeleted'               => _x( 'Deleted!', 'theme' ),
-				'livePreview'                => __( 'Live Preview' ),
-				'activatePlugin'             => is_network_admin() ? __( 'Network Activate' ) : __( 'Activate' ),
-				'activateTheme'              => is_network_admin() ? __( 'Network Enable' ) : __( 'Activate' ),
-				/* translators: %s: Plugin name */
-				'activatePluginLabel'        => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ),
-				/* translators: %s: Theme name */
-				'activateThemeLabel'         => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ),
-				'activateImporter'           => __( 'Run Importer' ),
-				/* translators: %s: Importer name */
-				'activateImporterLabel'      => __( 'Run %s' ),
-				'unknownError'               => __( 'An unidentified error has occurred.' ),
-				'connectionError'            => __( 'Connection lost or the server is busy. Please try again later.' ),
-				'nonceError'                 => __( 'An error has occurred. Please reload the page and try again.' ),
-				'pluginsFound'               => __( 'Number of plugins found: %d' ),
-				'noPluginsFound'             => __( 'No plugins found. Try a different search.' ),
-			),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'updates', '_wpUpdatesSettings', array(
+				'ajax_nonce' => wp_create_nonce( 'updates' ),
+				'l10n'       => array(
+					/* translators: %s: Search string */
+					'searchResults'            => __( 'Search results for &#8220;%s&#8221;' ),
+					'searchResultsLabel'       => __( 'Search Results' ),
+					'noPlugins'                => __( 'You do not appear to have any plugins available at this time.' ),
+					'noItemsSelected'          => __( 'Please select at least one item to perform this action on.' ),
+					'updating'                 => __( 'Updating...' ), // No ellipsis.
+					'pluginUpdated'            => _x( 'Updated!', 'plugin' ),
+					'themeUpdated'             => _x( 'Updated!', 'theme' ),
+					'update'                   => __( 'Update' ),
+					'updateNow'                => __( 'Update Now' ),
+					/* translators: %s: Plugin name and version */
+					'pluginUpdateNowLabel'     => _x( 'Update %s now', 'plugin' ),
+					'updateFailedShort'        => __( 'Update Failed!' ),
+					/* translators: %s: Error string for a failed update */
+					'updateFailed'             => __( 'Update Failed: %s' ),
+					/* translators: %s: Plugin name and version */
+					'pluginUpdatingLabel'      => _x( 'Updating %s...', 'plugin' ), // No ellipsis.
+					/* translators: %s: Plugin name and version */
+					'pluginUpdatedLabel'       => _x( '%s updated!', 'plugin' ),
+					/* translators: %s: Plugin name and version */
+					'pluginUpdateFailedLabel'  => _x( '%s update failed', 'plugin' ),
+					/* translators: Accessibility text */
+					'updatingMsg'              => __( 'Updating... please wait.' ), // No ellipsis.
+					/* translators: Accessibility text */
+					'updatedMsg'               => __( 'Update completed successfully.' ),
+					/* translators: Accessibility text */
+					'updateCancel'             => __( 'Update canceled.' ),
+					'beforeunload'             => __( 'Updates may not complete if you navigate away from this page.' ),
+					'installNow'               => __( 'Install Now' ),
+					/* translators: %s: Plugin name */
+					'pluginInstallNowLabel'    => _x( 'Install %s now', 'plugin' ),
+					'installing'               => __( 'Installing...' ),
+					'pluginInstalled'          => _x( 'Installed!', 'plugin' ),
+					'themeInstalled'           => _x( 'Installed!', 'theme' ),
+					'installFailedShort'       => __( 'Installation Failed!' ),
+					/* translators: %s: Error string for a failed installation */
+					'installFailed'            => __( 'Installation failed: %s' ),
+					/* translators: %s: Plugin name and version */
+					'pluginInstallingLabel'    => _x( 'Installing %s...', 'plugin' ), // no ellipsis
+					/* translators: %s: Theme name and version */
+					'themeInstallingLabel'     => _x( 'Installing %s...', 'theme' ), // no ellipsis
+					/* translators: %s: Plugin name and version */
+					'pluginInstalledLabel'     => _x( '%s installed!', 'plugin' ),
+					/* translators: %s: Theme name and version */
+					'themeInstalledLabel'      => _x( '%s installed!', 'theme' ),
+					/* translators: %s: Plugin name and version */
+					'pluginInstallFailedLabel' => _x( '%s installation failed', 'plugin' ),
+					/* translators: %s: Theme name and version */
+					'themeInstallFailedLabel'  => _x( '%s installation failed', 'theme' ),
+					'installingMsg'            => __( 'Installing... please wait.' ),
+					'installedMsg'             => __( 'Installation completed successfully.' ),
+					/* translators: %s: Activation URL */
+					'importerInstalledMsg'     => __( 'Importer installed successfully. <a href="%s">Run importer</a>' ),
+					/* translators: %s: Theme name */
+					'aysDelete'                => __( 'Are you sure you want to delete %s?' ),
+					/* translators: %s: Plugin name */
+					'aysDeleteUninstall'       => __( 'Are you sure you want to delete %s and its data?' ),
+					'aysBulkDelete'            => __( 'Are you sure you want to delete the selected plugins and their data?' ),
+					'aysBulkDeleteThemes'      => __( 'Caution: These themes may be active on other sites in the network. Are you sure you want to proceed?' ),
+					'deleting'                 => __( 'Deleting...' ),
+					/* translators: %s: Error string for a failed deletion */
+					'deleteFailed'             => __( 'Deletion failed: %s' ),
+					'pluginDeleted'            => _x( 'Deleted!', 'plugin' ),
+					'themeDeleted'             => _x( 'Deleted!', 'theme' ),
+					'livePreview'              => __( 'Live Preview' ),
+					'activatePlugin'           => is_network_admin() ? __( 'Network Activate' ) : __( 'Activate' ),
+					'activateTheme'            => is_network_admin() ? __( 'Network Enable' ) : __( 'Activate' ),
+					/* translators: %s: Plugin name */
+					'activatePluginLabel'      => is_network_admin() ? _x( 'Network Activate %s', 'plugin' ) : _x( 'Activate %s', 'plugin' ),
+					/* translators: %s: Theme name */
+					'activateThemeLabel'       => is_network_admin() ? _x( 'Network Activate %s', 'theme' ) : _x( 'Activate %s', 'theme' ),
+					'activateImporter'         => __( 'Run Importer' ),
+					/* translators: %s: Importer name */
+					'activateImporterLabel'    => __( 'Run %s' ),
+					'unknownError'             => __( 'An unidentified error has occurred.' ),
+					'connectionError'          => __( 'Connection lost or the server is busy. Please try again later.' ),
+					'nonceError'               => __( 'An error has occurred. Please reload the page and try again.' ),
+					'pluginsFound'             => __( 'Number of plugins found: %d' ),
+					'noPluginsFound'           => __( 'No plugins found. Try a different search.' ),
+				),
+			)
+		);
 
-		$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );
+		$scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array( 'jquery' ), '1.2' );
 
 		$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(
-			'clear'            => __( 'Clear' ),
-			'clearAriaLabel'   => __( 'Clear color' ),
-			'defaultString'    => __( 'Default' ),
-			'defaultAriaLabel' => __( 'Select default color' ),
-			'pick'             => __( 'Select Color' ),
-			'defaultLabel'     => __( 'Color value' ),
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'wp-color-picker', 'wpColorPickerL10n', array(
+				'clear'            => __( 'Clear' ),
+				'clearAriaLabel'   => __( 'Clear color' ),
+				'defaultString'    => __( 'Default' ),
+				'defaultAriaLabel' => __( 'Select default color' ),
+				'pick'             => __( 'Select Color' ),
+				'defaultLabel'     => __( 'Color value' ),
+			)
+		);
 
 		$scripts->add( 'dashboard', "/wp-admin/js/dashboard$suffix.js", array( 'jquery', 'admin-comments', 'postbox', 'wp-util', 'wp-a11y' ), false, 1 );
 
@@ -862,35 +935,43 @@ 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(
-			'error' => __( 'An error has occurred. Please reload the page and try again.' ),
-		));
+		did_action( 'init' ) && $scripts->localize(
+			'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(
-			'error' => __( 'Could not load the preview image. 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(
+				'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(
-			'setThumbnail' => __( 'Use as featured image' ),
-			'saving' => __( 'Saving...' ), // no ellipsis
-			'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ),
-			'done' => __( 'Done' )
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'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.' ),
+				'done'         => __( 'Done' ),
+			)
+		);
 
 		// 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(
-			'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.' ),
-			'untitled' => _x( '(no label)', 'missing menu item navigation label' )
-		) );
+		did_action( 'init' ) && $scripts->localize(
+			'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.' ),
+				'untitled'       => _x( '(no label)', 'missing menu item navigation label' ),
+			)
+		);
 
-		$scripts->add( 'custom-header', "/wp-admin/js/custom-header.js", array( 'jquery-masonry' ), false, 1 );
+		$scripts->add( 'custom-header', '/wp-admin/js/custom-header.js', array( 'jquery-masonry' ), false, 1 );
 		$scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array( 'wp-color-picker', 'media-views' ), false, 1 );
-		$scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array('jquery'), false, 1 );
+		$scripts->add( 'media-gallery', "/wp-admin/js/media-gallery$suffix.js", array( 'jquery' ), false, 1 );
 
 		$scripts->add( 'svg-painter', '/wp-admin/js/svg-painter.js', array( 'jquery' ), false, 1 );
 	}
@@ -914,17 +995,19 @@ function wp_default_scripts( &$scripts ) {
 function wp_default_styles( &$styles ) {
 	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
 
-	if ( ! defined( 'SCRIPT_DEBUG' ) )
+	if ( ! defined( 'SCRIPT_DEBUG' ) ) {
 		define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
+	}
 
-	if ( ! $guessurl = site_url() )
+	if ( ! $guessurl = site_url() ) {
 		$guessurl = wp_guess_url();
+	}
 
-	$styles->base_url = $guessurl;
-	$styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
+	$styles->base_url        = $guessurl;
+	$styles->content_url     = defined( 'WP_CONTENT_URL' ) ? WP_CONTENT_URL : '';
 	$styles->default_version = get_bloginfo( 'version' );
-	$styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
-	$styles->default_dirs = array('/wp-admin/', '/wp-includes/css/');
+	$styles->text_direction  = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
+	$styles->default_dirs    = array( '/wp-admin/', '/wp-includes/css/' );
 
 	// Open Sans is no longer used by core, but may be relied upon by themes and plugins.
 	$open_sans_font_url = '';
@@ -958,74 +1041,99 @@ function wp_default_styles( &$styles ) {
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 
 	// Admin CSS
-	$styles->add( 'common',              "/wp-admin/css/common$suffix.css" );
-	$styles->add( 'forms',               "/wp-admin/css/forms$suffix.css" );
-	$styles->add( 'admin-menu',          "/wp-admin/css/admin-menu$suffix.css" );
-	$styles->add( 'dashboard',           "/wp-admin/css/dashboard$suffix.css" );
-	$styles->add( 'list-tables',         "/wp-admin/css/list-tables$suffix.css" );
-	$styles->add( 'edit',                "/wp-admin/css/edit$suffix.css" );
-	$styles->add( 'revisions',           "/wp-admin/css/revisions$suffix.css" );
-	$styles->add( 'media',               "/wp-admin/css/media$suffix.css" );
-	$styles->add( 'themes',              "/wp-admin/css/themes$suffix.css" );
-	$styles->add( 'about',               "/wp-admin/css/about$suffix.css" );
-	$styles->add( 'nav-menus',           "/wp-admin/css/nav-menus$suffix.css" );
-	$styles->add( 'widgets',             "/wp-admin/css/widgets$suffix.css", array( 'wp-pointer' ) );
-	$styles->add( 'site-icon',           "/wp-admin/css/site-icon$suffix.css" );
-	$styles->add( 'l10n',                "/wp-admin/css/l10n$suffix.css" );
-	$styles->add( 'code-editor',         "/wp-admin/css/code-editor$suffix.css", array( 'wp-codemirror' ) );
+	$styles->add( 'common', "/wp-admin/css/common$suffix.css" );
+	$styles->add( 'forms', "/wp-admin/css/forms$suffix.css" );
+	$styles->add( 'admin-menu', "/wp-admin/css/admin-menu$suffix.css" );
+	$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css" );
+	$styles->add( 'list-tables', "/wp-admin/css/list-tables$suffix.css" );
+	$styles->add( 'edit', "/wp-admin/css/edit$suffix.css" );
+	$styles->add( 'revisions', "/wp-admin/css/revisions$suffix.css" );
+	$styles->add( 'media', "/wp-admin/css/media$suffix.css" );
+	$styles->add( 'themes', "/wp-admin/css/themes$suffix.css" );
+	$styles->add( 'about', "/wp-admin/css/about$suffix.css" );
+	$styles->add( 'nav-menus', "/wp-admin/css/nav-menus$suffix.css" );
+	$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array( 'wp-pointer' ) );
+	$styles->add( 'site-icon', "/wp-admin/css/site-icon$suffix.css" );
+	$styles->add( 'l10n', "/wp-admin/css/l10n$suffix.css" );
+	$styles->add( 'code-editor', "/wp-admin/css/code-editor$suffix.css", array( 'wp-codemirror' ) );
 
 	$styles->add( 'wp-admin', false, array( 'dashicons', 'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus', 'widgets', 'site-icon', 'l10n' ) );
 
-	$styles->add( 'login',               "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
-	$styles->add( 'install',             "/wp-admin/css/install$suffix.css", array( 'buttons' ) );
-	$styles->add( 'wp-color-picker',     "/wp-admin/css/color-picker$suffix.css" );
-	$styles->add( 'customize-controls',  "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
-	$styles->add( 'customize-widgets',   "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
+	$styles->add( 'login', "/wp-admin/css/login$suffix.css", array( 'dashicons', 'buttons', 'forms', 'l10n' ) );
+	$styles->add( 'install', "/wp-admin/css/install$suffix.css", array( 'buttons' ) );
+	$styles->add( 'wp-color-picker', "/wp-admin/css/color-picker$suffix.css" );
+	$styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
+	$styles->add( 'customize-widgets', "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
 	$styles->add( 'customize-nav-menus', "/wp-admin/css/customize-nav-menus$suffix.css", array( 'wp-admin', 'colors' ) );
 
 	$styles->add( 'ie', "/wp-admin/css/ie$suffix.css" );
 	$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
 
 	// Common dependencies
-	$styles->add( 'buttons',   "/wp-includes/css/buttons$suffix.css" );
+	$styles->add( 'buttons', "/wp-includes/css/buttons$suffix.css" );
 	$styles->add( 'dashicons', "/wp-includes/css/dashicons$suffix.css" );
 
 	// Includes CSS
-	$styles->add( 'admin-bar',            "/wp-includes/css/admin-bar$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'wp-auth-check',        "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'editor-buttons',       "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'media-views',          "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
-	$styles->add( 'wp-pointer',           "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'customize-preview',    "/wp-includes/css/customize-preview$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'wp-auth-check', "/wp-includes/css/wp-auth-check$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'editor-buttons', "/wp-includes/css/editor$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'media-views', "/wp-includes/css/media-views$suffix.css", array( 'buttons', 'dashicons', 'wp-mediaelement' ) );
+	$styles->add( 'wp-pointer', "/wp-includes/css/wp-pointer$suffix.css", array( 'dashicons' ) );
+	$styles->add( 'customize-preview', "/wp-includes/css/customize-preview$suffix.css", array( 'dashicons' ) );
 	$styles->add( 'wp-embed-template-ie', "/wp-includes/css/wp-embed-template-ie$suffix.css" );
 	$styles->add_data( 'wp-embed-template-ie', 'conditional', 'lte IE 8' );
 
 	// External libraries and friends
-	$styles->add( 'imgareaselect',       '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
+	$styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.8' );
 	$styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array( 'dashicons' ) );
-	$styles->add( 'mediaelement',        "/wp-includes/js/mediaelement/mediaelementplayer-legacy.min.css", array(), '4.2.6-78496d1' );
-	$styles->add( 'wp-mediaelement',     "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
-	$styles->add( 'thickbox',            '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
-	$styles->add( 'wp-codemirror',       '/wp-includes/js/codemirror/codemirror.min.css', array(), '5.29.1-alpha-ee20357' );
+	$styles->add( 'mediaelement', '/wp-includes/js/mediaelement/mediaelementplayer-legacy.min.css', array(), '4.2.6-78496d1' );
+	$styles->add( 'wp-mediaelement', "/wp-includes/js/mediaelement/wp-mediaelement$suffix.css", array( 'mediaelement' ) );
+	$styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array( 'dashicons' ) );
+	$styles->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.css', array(), '5.29.1-alpha-ee20357' );
 
 	// Deprecated CSS
 	$styles->add( 'deprecated-media', "/wp-admin/css/deprecated-media$suffix.css" );
-	$styles->add( 'farbtastic',       "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' );
-	$styles->add( 'jcrop',            "/wp-includes/js/jcrop/jquery.Jcrop.min.css", array(), '0.9.12' );
+	$styles->add( 'farbtastic', "/wp-admin/css/farbtastic$suffix.css", array(), '1.3u1' );
+	$styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.min.css', array(), '0.9.12' );
 	$styles->add( 'colors-fresh', false, array( 'wp-admin', 'buttons' ) ); // Old handle.
 	$styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6
 
 	// RTL CSS
 	$rtl_styles = array(
 		// wp-admin
-		'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus',
-		'widgets', 'site-icon', 'l10n', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'customize-preview',
-		'ie', 'login',
+		'common',
+		'forms',
+		'admin-menu',
+		'dashboard',
+		'list-tables',
+		'edit',
+		'revisions',
+		'media',
+		'themes',
+		'about',
+		'nav-menus',
+		'widgets',
+		'site-icon',
+		'l10n',
+		'install',
+		'wp-color-picker',
+		'customize-controls',
+		'customize-widgets',
+		'customize-nav-menus',
+		'customize-preview',
+		'ie',
+		'login',
 		// wp-includes
-		'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
+		'buttons',
+		'admin-bar',
+		'wp-auth-check',
+		'editor-buttons',
+		'media-views',
+		'wp-pointer',
 		'wp-jquery-ui-dialog',
 		// deprecated
-		'deprecated-media', 'farbtastic',
+		'deprecated-media',
+		'farbtastic',
 	);
 
 	foreach ( $rtl_styles as $rtl_style ) {
@@ -1045,16 +1153,19 @@ function wp_default_styles( &$styles ) {
  * @return array Reordered array, if needed.
  */
 function wp_prototype_before_jquery( $js_array ) {
-	if ( false === $prototype = array_search( 'prototype', $js_array, true ) )
+	if ( false === $prototype = array_search( 'prototype', $js_array, true ) ) {
 		return $js_array;
+	}
 
-	if ( false === $jquery = array_search( 'jquery', $js_array, true ) )
+	if ( false === $jquery = array_search( 'jquery', $js_array, true ) ) {
 		return $js_array;
+	}
 
-	if ( $prototype < $jquery )
+	if ( $prototype < $jquery ) {
 		return $js_array;
+	}
 
-	unset($js_array[$prototype]);
+	unset( $js_array[ $prototype ] );
 
 	array_splice( $js_array, $jquery, 0, 'prototype' );
 
@@ -1070,24 +1181,30 @@ function wp_prototype_before_jquery( $js_array ) {
  */
 function wp_just_in_time_script_localization() {
 
-	wp_localize_script( 'autosave', 'autosaveL10n', array(
-		'autosaveInterval' => AUTOSAVE_INTERVAL,
-		'blog_id' => get_current_blog_id(),
-	) );
+	wp_localize_script(
+		'autosave', 'autosaveL10n', array(
+			'autosaveInterval' => AUTOSAVE_INTERVAL,
+			'blog_id'          => get_current_blog_id(),
+		)
+	);
 
-	wp_localize_script( 'mce-view', 'mceViewL10n', array(
-		'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
-	) );
+	wp_localize_script(
+		'mce-view', 'mceViewL10n', array(
+			'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
+		)
+	);
 
-	wp_localize_script( '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'.
-		 * Do not translate into your own language.
-		 */
-		'type' => _x( 'words', 'Word count type. Do not translate!' ),
-		'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array()
-	) );
+	wp_localize_script(
+		'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'.
+			 * Do not translate into your own language.
+			 */
+			'type'       => _x( 'words', 'Word count type. Do not translate!' ),
+			'shortcodes' => ! empty( $GLOBALS['shortcode_tags'] ) ? array_keys( $GLOBALS['shortcode_tags'] ) : array(),
+		)
+	);
 }
 
 /**
@@ -1109,32 +1226,48 @@ function wp_localize_jquery_ui_datepicker() {
 	// Convert the PHP date format into jQuery UI's format.
 	$datepicker_date_format = str_replace(
 		array(
-			'd', 'j', 'l', 'z', // Day.
-			'F', 'M', 'n', 'm', // Month.
-			'Y', 'y'            // Year.
+			'd',
+			'j',
+			'l',
+			'z', // Day.
+			'F',
+			'M',
+			'n',
+			'm', // Month.
+			'Y',
+			'y',            // Year.
 		),
 		array(
-			'dd', 'd', 'DD', 'o',
-			'MM', 'M', 'm', 'mm',
-			'yy', 'y'
+			'dd',
+			'd',
+			'DD',
+			'o',
+			'MM',
+			'M',
+			'm',
+			'mm',
+			'yy',
+			'y',
 		),
 		get_option( 'date_format' )
 	);
 
-	$datepicker_defaults = wp_json_encode( array(
-		'closeText'       => __( 'Close' ),
-		'currentText'     => __( 'Today' ),
-		'monthNames'      => array_values( $wp_locale->month ),
-		'monthNamesShort' => array_values( $wp_locale->month_abbrev ),
-		'nextText'        => __( 'Next' ),
-		'prevText'        => __( 'Previous' ),
-		'dayNames'        => array_values( $wp_locale->weekday ),
-		'dayNamesShort'   => array_values( $wp_locale->weekday_abbrev ),
-		'dayNamesMin'     => array_values( $wp_locale->weekday_initial ),
-		'dateFormat'      => $datepicker_date_format,
-		'firstDay'        => absint( get_option( 'start_of_week' ) ),
-		'isRTL'           => $wp_locale->is_rtl(),
-	) );
+	$datepicker_defaults = wp_json_encode(
+		array(
+			'closeText'       => __( 'Close' ),
+			'currentText'     => __( 'Today' ),
+			'monthNames'      => array_values( $wp_locale->month ),
+			'monthNamesShort' => array_values( $wp_locale->month_abbrev ),
+			'nextText'        => __( 'Next' ),
+			'prevText'        => __( 'Previous' ),
+			'dayNames'        => array_values( $wp_locale->weekday ),
+			'dayNamesShort'   => array_values( $wp_locale->weekday_abbrev ),
+			'dayNamesMin'     => array_values( $wp_locale->weekday_initial ),
+			'dateFormat'      => $datepicker_date_format,
+			'firstDay'        => absint( get_option( 'start_of_week' ) ),
+			'isRTL'           => $wp_locale->is_rtl(),
+		)
+	);
 
 	wp_add_inline_script( 'jquery-ui-datepicker', "jQuery(document).ready(function(jQuery){jQuery.datepicker.setDefaults({$datepicker_defaults});});" );
 }
@@ -1170,37 +1303,39 @@ function wp_localize_community_events() {
 
 	$events_client = new WP_Community_Events( $user_id, $saved_location );
 
-	wp_localize_script( 'dashboard', 'communityEventsData', array(
-		'nonce' => wp_create_nonce( 'community_events' ),
-		'cache' => $events_client->get_cached_events(),
+	wp_localize_script(
+		'dashboard', 'communityEventsData', array(
+			'nonce' => wp_create_nonce( 'community_events' ),
+			'cache' => $events_client->get_cached_events(),
 
-		'l10n' => array(
-			'enter_closest_city' => __( 'Enter your closest city to find nearby events.' ),
-			'error_occurred_please_try_again' => __( 'An error occurred. Please try again.' ),
-			'attend_event_near_generic' => __( 'Attend an upcoming event near you.' ),
+			'l10n'  => array(
+				'enter_closest_city'              => __( 'Enter your closest city to find nearby events.' ),
+				'error_occurred_please_try_again' => __( 'An error occurred. Please try again.' ),
+				'attend_event_near_generic'       => __( 'Attend an upcoming event near you.' ),
 
-			/*
-			 * These specific examples were chosen to highlight the fact that a
-			 * state is not needed, even for cities whose name is not unique.
-			 * It would be too cumbersome to include that in the instructions
-			 * to the user, so it's left as an implication.
-			 */
-			/* translators: %s is the name of the city we couldn't locate.
-			 * Replace the examples with cities related to your locale. Test that
-			 * they match the expected location and have upcoming events before
-			 * including them. If no cities related to your locale have events,
-			 * then use cities related to your locale that would be recognizable
-			 * to most users. Use only the city name itself, without any region
-			 * or country. Use the endonym (native locale name) instead of the
-			 * English name if possible.
-			 */
-			'could_not_locate_city' => __( 'We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
+				/*
+				 * These specific examples were chosen to highlight the fact that a
+				 * state is not needed, even for cities whose name is not unique.
+				 * It would be too cumbersome to include that in the instructions
+				 * to the user, so it's left as an implication.
+				 */
+				/* translators: %s is the name of the city we couldn't locate.
+				 * Replace the examples with cities related to your locale. Test that
+				 * they match the expected location and have upcoming events before
+				 * including them. If no cities related to your locale have events,
+				 * then use cities related to your locale that would be recognizable
+				 * to most users. Use only the city name itself, without any region
+				 * or country. Use the endonym (native locale name) instead of the
+				 * English name if possible.
+				 */
+				'could_not_locate_city'           => __( 'We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
 
-			// This one is only used with wp.a11y.speak(), so it can/should be more brief.
-			/* translators: %s: the name of a city */
-			'city_updated' => __( 'City updated. Listing events near %s.' ),
+				// This one is only used with wp.a11y.speak(), so it can/should be more brief.
+				/* translators: %s: the name of a city */
+				'city_updated'                    => __( 'City updated. Listing events near %s.' ),
+			),
 		)
-	) );
+	);
 }
 
 /**
@@ -1226,24 +1361,26 @@ function wp_localize_community_events() {
 function wp_style_loader_src( $src, $handle ) {
 	global $_wp_admin_css_colors;
 
-	if ( wp_installing() )
+	if ( wp_installing() ) {
 		return preg_replace( '#^wp-admin/#', './', $src );
+	}
 
 	if ( 'colors' == $handle ) {
-		$color = get_user_option('admin_color');
+		$color = get_user_option( 'admin_color' );
 
-		if ( empty($color) || !isset($_wp_admin_css_colors[$color]) )
+		if ( empty( $color ) || ! isset( $_wp_admin_css_colors[ $color ] ) ) {
 			$color = 'fresh';
+		}
 
-		$color = $_wp_admin_css_colors[$color];
-		$url = $color->url;
+		$color = $_wp_admin_css_colors[ $color ];
+		$url   = $color->url;
 
 		if ( ! $url ) {
 			return false;
 		}
 
 		$parsed = parse_url( $src );
-		if ( isset($parsed['query']) && $parsed['query'] ) {
+		if ( isset( $parsed['query'] ) && $parsed['query'] ) {
 			wp_parse_str( $parsed['query'], $qv );
 			$url = add_query_arg( $qv, $url );
 		}
@@ -1271,7 +1408,7 @@ function wp_style_loader_src( $src, $handle ) {
 function print_head_scripts() {
 	global $concatenate_scripts;
 
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action( 'wp_print_scripts' ) ) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
 		do_action( 'wp_print_scripts' );
 	}
@@ -1344,12 +1481,13 @@ function _print_scripts() {
 	global $wp_scripts, $compress_scripts;
 
 	$zip = $compress_scripts ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ( $zip && defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP ) {
 		$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
 
-		if ( !empty($wp_scripts->print_code) ) {
+		if ( ! empty( $wp_scripts->print_code ) ) {
 			echo "\n<script type='text/javascript'>\n";
 			echo "/* <![CDATA[ */\n"; // not needed in HTML 5
 			echo $wp_scripts->print_code;
@@ -1361,11 +1499,12 @@ function _print_scripts() {
 		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
 
 		$src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?c={$zip}&" . $concat . '&ver=' . $wp_scripts->default_version;
-		echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
+		echo "<script type='text/javascript' src='" . esc_attr( $src ) . "'></script>\n";
 	}
 
-	if ( !empty($wp_scripts->print_html) )
+	if ( ! empty( $wp_scripts->print_html ) ) {
 		echo $wp_scripts->print_html;
+	}
 }
 
 /**
@@ -1381,7 +1520,7 @@ function _print_scripts() {
  * @return array
  */
 function wp_print_head_scripts() {
-	if ( ! did_action('wp_print_scripts') ) {
+	if ( ! did_action( 'wp_print_scripts' ) ) {
 		/** This action is documented in wp-includes/functions.wp-scripts.php */
 		do_action( 'wp_print_scripts' );
 	}
@@ -1451,7 +1590,7 @@ function print_admin_styles() {
 
 	script_concat_settings();
 	$wp_styles->do_concat = $concatenate_scripts;
-	$wp_styles->do_items(false);
+	$wp_styles->do_items( false );
 
 	/**
 	 * Filters whether to print the admin styles.
@@ -1518,8 +1657,9 @@ function _print_styles() {
 	$wp_styles = wp_styles();
 
 	$zip = $compress_css ? 1 : 0;
-	if ( $zip && defined('ENFORCE_GZIP') && ENFORCE_GZIP )
+	if ( $zip && defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP ) {
 		$zip = 'gzip';
+	}
 
 	if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
 		$dir = $wp_styles->text_direction;
@@ -1529,17 +1669,18 @@ function _print_styles() {
 		$concat = 'load%5B%5D=' . implode( '&load%5B%5D=', $concat );
 
 		$href = $wp_styles->base_url . "/wp-admin/load-styles.php?c={$zip}&dir={$dir}&" . $concat . '&ver=' . $ver;
-		echo "<link rel='stylesheet' href='" . esc_attr($href) . "' type='text/css' media='all' />\n";
+		echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "' type='text/css' media='all' />\n";
 
-		if ( !empty($wp_styles->print_code) ) {
+		if ( ! empty( $wp_styles->print_code ) ) {
 			echo "<style type='text/css'>\n";
 			echo $wp_styles->print_code;
 			echo "\n</style>\n";
 		}
 	}
 
-	if ( !empty($wp_styles->print_html) )
+	if ( ! empty( $wp_styles->print_html ) ) {
 		echo $wp_styles->print_html;
+	}
 }
 
 /**
@@ -1554,23 +1695,26 @@ function _print_styles() {
 function script_concat_settings() {
 	global $concatenate_scripts, $compress_scripts, $compress_css;
 
-	$compressed_output = ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') );
+	$compressed_output = ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' == ini_get( 'output_handler' ) );
 
-	if ( ! isset($concatenate_scripts) ) {
-		$concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true;
-		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) )
+	if ( ! isset( $concatenate_scripts ) ) {
+		$concatenate_scripts = defined( 'CONCATENATE_SCRIPTS' ) ? CONCATENATE_SCRIPTS : true;
+		if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) {
 			$concatenate_scripts = false;
+		}
 	}
 
-	if ( ! isset($compress_scripts) ) {
-		$compress_scripts = defined('COMPRESS_SCRIPTS') ? COMPRESS_SCRIPTS : true;
-		if ( $compress_scripts && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+	if ( ! isset( $compress_scripts ) ) {
+		$compress_scripts = defined( 'COMPRESS_SCRIPTS' ) ? COMPRESS_SCRIPTS : true;
+		if ( $compress_scripts && ( ! get_site_option( 'can_compress_scripts' ) || $compressed_output ) ) {
 			$compress_scripts = false;
+		}
 	}
 
-	if ( ! isset($compress_css) ) {
-		$compress_css = defined('COMPRESS_CSS') ? COMPRESS_CSS : true;
-		if ( $compress_css && ( ! get_site_option('can_compress_scripts') || $compressed_output ) )
+	if ( ! isset( $compress_css ) ) {
+		$compress_css = defined( 'COMPRESS_CSS' ) ? COMPRESS_CSS : true;
+		if ( $compress_css && ( ! get_site_option( 'can_compress_scripts' ) || $compressed_output ) ) {
 			$compress_css = false;
+		}
 	}
 }
diff --git a/wp-includes/session.php b/wp-includes/session.php
index d9175c9895..3a8411a90b 100644
--- a/wp-includes/session.php
+++ b/wp-includes/session.php
@@ -8,4 +8,4 @@
 _deprecated_file( basename( __FILE__ ), '4.7.0' );
 
 require_once( ABSPATH . WPINC . '/class-wp-session-tokens.php' );
-require_once( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' );
\ No newline at end of file
+require_once( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' );
diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 61d6054f67..da583251d8 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -88,10 +88,10 @@ function add_shortcode( $tag, $callback ) {
  *
  * @param string $tag Shortcode tag to remove hook for.
  */
-function remove_shortcode($tag) {
+function remove_shortcode( $tag ) {
 	global $shortcode_tags;
 
-	unset($shortcode_tags[$tag]);
+	unset( $shortcode_tags[ $tag ] );
 }
 
 /**
@@ -144,8 +144,9 @@ function has_shortcode( $content, $tag ) {
 
 	if ( shortcode_exists( $tag ) ) {
 		preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER );
-		if ( empty( $matches ) )
+		if ( empty( $matches ) ) {
 			return false;
+		}
 
 		foreach ( $matches as $shortcode ) {
 			if ( $tag === $shortcode[2] ) {
@@ -180,8 +181,9 @@ function do_shortcode( $content, $ignore_html = false ) {
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
 		return $content;
+	}
 
 	// Find all registered tag names in $content.
 	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
@@ -231,7 +233,7 @@ function get_shortcode_regex( $tagnames = null ) {
 	if ( empty( $tagnames ) ) {
 		$tagnames = array_keys( $shortcode_tags );
 	}
-	$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
+	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
 
 	// WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
 	// Also, see shortcode_unautop() and shortcode.js.
@@ -271,6 +273,7 @@ function get_shortcode_regex( $tagnames = null ) {
 
 /**
  * Regular Expression callable for do_shortcode() for calling shortcode hook.
+ *
  * @see get_shortcode_regex for details of the match array contents.
  *
  * @since 2.5.0
@@ -286,10 +289,10 @@ function do_shortcode_tag( $m ) {
 
 	// allow [[foo]] syntax for escaping a tag
 	if ( $m[1] == '[' && $m[6] == ']' ) {
-		return substr($m[0], 1, -1);
+		return substr( $m[0], 1, -1 );
 	}
 
-	$tag = $m[2];
+	$tag  = $m[2];
 	$attr = shortcode_parse_atts( $m[3] );
 
 	if ( ! is_callable( $shortcode_tags[ $tag ] ) ) {
@@ -351,9 +354,15 @@ function do_shortcode_tag( $m ) {
  */
 function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 	// Normalize entities in unfiltered HTML before adding placeholders.
-	$trans = array( '&#91;' => '&#091;', '&#93;' => '&#093;' );
+	$trans   = array(
+		'&#91;' => '&#091;',
+		'&#93;' => '&#093;',
+	);
 	$content = strtr( $content, $trans );
-	$trans = array( '[' => '&#91;', ']' => '&#93;' );
+	$trans   = array(
+		'[' => '&#91;',
+		']' => '&#93;',
+	);
 
 	$pattern = get_shortcode_regex( $tagnames );
 	$textarr = wp_html_split( $content );
@@ -363,7 +372,7 @@ function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 			continue;
 		}
 
-		$noopen = false === strpos( $element, '[' );
+		$noopen  = false === strpos( $element, '[' );
 		$noclose = false === strpos( $element, ']' );
 		if ( $noopen || $noclose ) {
 			// This element does not contain shortcodes.
@@ -393,15 +402,15 @@ function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 		}
 
 		// Get element name
-		$front = array_shift( $attributes );
-		$back = array_pop( $attributes );
+		$front   = array_shift( $attributes );
+		$back    = array_pop( $attributes );
 		$matches = array();
-		preg_match('%[a-zA-Z0-9]+%', $front, $matches);
+		preg_match( '%[a-zA-Z0-9]+%', $front, $matches );
 		$elname = $matches[0];
 
 		// Look for shortcodes in each attribute separately.
 		foreach ( $attributes as &$attr ) {
-			$open = strpos( $attr, '[' );
+			$open  = strpos( $attr, '[' );
 			$close = strpos( $attr, ']' );
 			if ( false === $open || false === $close ) {
 				continue; // Go to next attribute.  Square braces will be escaped at end of loop.
@@ -417,7 +426,7 @@ function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
 			} else {
 				// $attr like 'name = "[shortcode]"' or "name = '[shortcode]'"
 				// We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
-				$count = 0;
+				$count    = 0;
 				$new_attr = preg_replace_callback( "/$pattern/", 'do_shortcode_tag', $attr, -1, $count );
 				if ( $count > 0 ) {
 					// Sanitize the shortcode output using KSES.
@@ -449,11 +458,14 @@ function do_shortcodes_in_html_tags( $content, $ignore_html, $tagnames ) {
  * @return string Content with placeholders removed.
  */
 function unescape_invalid_shortcodes( $content ) {
-        // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '&#91;' => '[', '&#93;' => ']' );
-        $content = strtr( $content, $trans );
+		// Clean up entire string, avoids re-parsing HTML.
+		$trans   = array(
+			'&#91;' => '[',
+			'&#93;' => ']',
+		);
+		$content = strtr( $content, $trans );
 
-        return $content;
+		return $content;
 }
 
 /**
@@ -482,28 +494,29 @@ function get_shortcode_atts_regex() {
  *                      Returns empty string if trim( $text ) == ''.
  *                      All other matches are checked for not empty().
  */
-function shortcode_parse_atts($text) {
-	$atts = array();
+function shortcode_parse_atts( $text ) {
+	$atts    = array();
 	$pattern = get_shortcode_atts_regex();
-	$text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
-	if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
-		foreach ($match as $m) {
-			if (!empty($m[1]))
-				$atts[strtolower($m[1])] = stripcslashes($m[2]);
-			elseif (!empty($m[3]))
-				$atts[strtolower($m[3])] = stripcslashes($m[4]);
-			elseif (!empty($m[5]))
-				$atts[strtolower($m[5])] = stripcslashes($m[6]);
-			elseif (isset($m[7]) && strlen($m[7]))
-				$atts[] = stripcslashes($m[7]);
-			elseif (isset($m[8]) && strlen($m[8]))
-				$atts[] = stripcslashes($m[8]);
-			elseif (isset($m[9]))
-				$atts[] = stripcslashes($m[9]);
+	$text    = preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text );
+	if ( preg_match_all( $pattern, $text, $match, PREG_SET_ORDER ) ) {
+		foreach ( $match as $m ) {
+			if ( ! empty( $m[1] ) ) {
+				$atts[ strtolower( $m[1] ) ] = stripcslashes( $m[2] );
+			} elseif ( ! empty( $m[3] ) ) {
+				$atts[ strtolower( $m[3] ) ] = stripcslashes( $m[4] );
+			} elseif ( ! empty( $m[5] ) ) {
+				$atts[ strtolower( $m[5] ) ] = stripcslashes( $m[6] );
+			} elseif ( isset( $m[7] ) && strlen( $m[7] ) ) {
+				$atts[] = stripcslashes( $m[7] );
+			} elseif ( isset( $m[8] ) && strlen( $m[8] ) ) {
+				$atts[] = stripcslashes( $m[8] );
+			} elseif ( isset( $m[9] ) ) {
+				$atts[] = stripcslashes( $m[9] );
+			}
 		}
 
 		// Reject any unclosed HTML elements
-		foreach( $atts as &$value ) {
+		foreach ( $atts as &$value ) {
 			if ( false !== strpos( $value, '<' ) ) {
 				if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
 					$value = '';
@@ -511,7 +524,7 @@ function shortcode_parse_atts($text) {
 			}
 		}
 	} else {
-		$atts = ltrim($text);
+		$atts = ltrim( $text );
 	}
 	return $atts;
 }
@@ -534,13 +547,14 @@ function shortcode_parse_atts($text) {
  * @return array Combined and filtered attribute list.
  */
 function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
-	$atts = (array)$atts;
-	$out = array();
-	foreach ($pairs as $name => $default) {
-		if ( array_key_exists($name, $atts) )
-			$out[$name] = $atts[$name];
-		else
-			$out[$name] = $default;
+	$atts = (array) $atts;
+	$out  = array();
+	foreach ( $pairs as $name => $default ) {
+		if ( array_key_exists( $name, $atts ) ) {
+			$out[ $name ] = $atts[ $name ];
+		} else {
+			$out[ $name ] = $default;
+		}
 	}
 	/**
 	 * Filters a shortcode's default attributes.
@@ -580,8 +594,9 @@ function strip_shortcodes( $content ) {
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if ( empty( $shortcode_tags ) || ! is_array( $shortcode_tags ) ) {
 		return $content;
+	}
 
 	// Find all registered tag names in $content.
 	preg_match_all( '@\[([^<>&/\[\]\x00-\x20=]++)@', $content, $matches );
@@ -626,7 +641,7 @@ function strip_shortcodes( $content ) {
 function strip_shortcode_tag( $m ) {
 	// allow [[foo]] syntax for escaping a tag
 	if ( $m[1] == '[' && $m[6] == ']' ) {
-		return substr($m[0], 1, -1);
+		return substr( $m[0], 1, -1 );
 	}
 
 	return $m[1] . $m[6];
diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index bdbeb3dc9d..293b18b8b6 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -25,7 +25,11 @@ function create_initial_taxonomies() {
 	global $wp_rewrite;
 
 	if ( ! did_action( 'init' ) ) {
-		$rewrite = array( 'category' => false, 'post_tag' => false, 'post_format' => false );
+		$rewrite = array(
+			'category'    => false,
+			'post_tag'    => false,
+			'post_format' => false,
+		);
 	} else {
 
 		/**
@@ -36,118 +40,128 @@ function create_initial_taxonomies() {
 		 * @param string $context Context of the rewrite base. Default 'type'.
 		 */
 		$post_format_base = apply_filters( 'post_format_rewrite_base', 'type' );
-		$rewrite = array(
-			'category' => array(
+		$rewrite          = array(
+			'category'    => array(
 				'hierarchical' => true,
-				'slug' => get_option('category_base') ? get_option('category_base') : 'category',
-				'with_front' => ! get_option('category_base') || $wp_rewrite->using_index_permalinks(),
-				'ep_mask' => EP_CATEGORIES,
+				'slug'         => get_option( 'category_base' ) ? get_option( 'category_base' ) : 'category',
+				'with_front'   => ! get_option( 'category_base' ) || $wp_rewrite->using_index_permalinks(),
+				'ep_mask'      => EP_CATEGORIES,
 			),
-			'post_tag' => array(
+			'post_tag'    => array(
 				'hierarchical' => false,
-				'slug' => get_option('tag_base') ? get_option('tag_base') : 'tag',
-				'with_front' => ! get_option('tag_base') || $wp_rewrite->using_index_permalinks(),
-				'ep_mask' => EP_TAGS,
+				'slug'         => get_option( 'tag_base' ) ? get_option( 'tag_base' ) : 'tag',
+				'with_front'   => ! get_option( 'tag_base' ) || $wp_rewrite->using_index_permalinks(),
+				'ep_mask'      => EP_TAGS,
 			),
 			'post_format' => $post_format_base ? array( 'slug' => $post_format_base ) : false,
 		);
 	}
 
-	register_taxonomy( 'category', 'post', array(
-		'hierarchical' => true,
-		'query_var' => 'category_name',
-		'rewrite' => $rewrite['category'],
-		'public' => true,
-		'show_ui' => true,
-		'show_admin_column' => true,
-		'_builtin' => true,
-		'capabilities' => array(
-			'manage_terms' => 'manage_categories',
-			'edit_terms'   => 'edit_categories',
-			'delete_terms' => 'delete_categories',
-			'assign_terms' => 'assign_categories',
-		),
-		'show_in_rest' => true,
-		'rest_base' => 'categories',
-		'rest_controller_class' => 'WP_REST_Terms_Controller',
-	) );
+	register_taxonomy(
+		'category', 'post', array(
+			'hierarchical'          => true,
+			'query_var'             => 'category_name',
+			'rewrite'               => $rewrite['category'],
+			'public'                => true,
+			'show_ui'               => true,
+			'show_admin_column'     => true,
+			'_builtin'              => true,
+			'capabilities'          => array(
+				'manage_terms' => 'manage_categories',
+				'edit_terms'   => 'edit_categories',
+				'delete_terms' => 'delete_categories',
+				'assign_terms' => 'assign_categories',
+			),
+			'show_in_rest'          => true,
+			'rest_base'             => 'categories',
+			'rest_controller_class' => 'WP_REST_Terms_Controller',
+		)
+	);
 
-	register_taxonomy( 'post_tag', 'post', array(
-	 	'hierarchical' => false,
-		'query_var' => 'tag',
-		'rewrite' => $rewrite['post_tag'],
-		'public' => true,
-		'show_ui' => true,
-		'show_admin_column' => true,
-		'_builtin' => true,
-		'capabilities' => array(
-			'manage_terms' => 'manage_post_tags',
-			'edit_terms'   => 'edit_post_tags',
-			'delete_terms' => 'delete_post_tags',
-			'assign_terms' => 'assign_post_tags',
-		),
-		'show_in_rest' => true,
-		'rest_base' => 'tags',
-		'rest_controller_class' => 'WP_REST_Terms_Controller',
-	) );
+	register_taxonomy(
+		'post_tag', 'post', array(
+			'hierarchical'          => false,
+			'query_var'             => 'tag',
+			'rewrite'               => $rewrite['post_tag'],
+			'public'                => true,
+			'show_ui'               => true,
+			'show_admin_column'     => true,
+			'_builtin'              => true,
+			'capabilities'          => array(
+				'manage_terms' => 'manage_post_tags',
+				'edit_terms'   => 'edit_post_tags',
+				'delete_terms' => 'delete_post_tags',
+				'assign_terms' => 'assign_post_tags',
+			),
+			'show_in_rest'          => true,
+			'rest_base'             => 'tags',
+			'rest_controller_class' => 'WP_REST_Terms_Controller',
+		)
+	);
 
-	register_taxonomy( 'nav_menu', 'nav_menu_item', array(
-		'public' => false,
-		'hierarchical' => false,
-		'labels' => array(
-			'name' => __( 'Navigation Menus' ),
-			'singular_name' => __( 'Navigation Menu' ),
-		),
-		'query_var' => false,
-		'rewrite' => false,
-		'show_ui' => false,
-		'_builtin' => true,
-		'show_in_nav_menus' => false,
-	) );
+	register_taxonomy(
+		'nav_menu', 'nav_menu_item', array(
+			'public'            => false,
+			'hierarchical'      => false,
+			'labels'            => array(
+				'name'          => __( 'Navigation Menus' ),
+				'singular_name' => __( 'Navigation Menu' ),
+			),
+			'query_var'         => false,
+			'rewrite'           => false,
+			'show_ui'           => false,
+			'_builtin'          => true,
+			'show_in_nav_menus' => false,
+		)
+	);
 
-	register_taxonomy( 'link_category', 'link', array(
-		'hierarchical' => false,
-		'labels' => array(
-			'name' => __( 'Link Categories' ),
-			'singular_name' => __( 'Link Category' ),
-			'search_items' => __( 'Search Link Categories' ),
-			'popular_items' => null,
-			'all_items' => __( 'All Link Categories' ),
-			'edit_item' => __( 'Edit Link Category' ),
-			'update_item' => __( 'Update Link Category' ),
-			'add_new_item' => __( 'Add New Link Category' ),
-			'new_item_name' => __( 'New Link Category Name' ),
-			'separate_items_with_commas' => null,
-			'add_or_remove_items' => null,
-			'choose_from_most_used' => null,
-			'back_to_items' => __( '&larr; Back to Link Categories' ),
-		),
-		'capabilities' => array(
-			'manage_terms' => 'manage_links',
-			'edit_terms'   => 'manage_links',
-			'delete_terms' => 'manage_links',
-			'assign_terms' => 'manage_links',
-		),
-		'query_var' => false,
-		'rewrite' => false,
-		'public' => false,
-		'show_ui' => true,
-		'_builtin' => true,
-	) );
+	register_taxonomy(
+		'link_category', 'link', array(
+			'hierarchical' => false,
+			'labels'       => array(
+				'name'                       => __( 'Link Categories' ),
+				'singular_name'              => __( 'Link Category' ),
+				'search_items'               => __( 'Search Link Categories' ),
+				'popular_items'              => null,
+				'all_items'                  => __( 'All Link Categories' ),
+				'edit_item'                  => __( 'Edit Link Category' ),
+				'update_item'                => __( 'Update Link Category' ),
+				'add_new_item'               => __( 'Add New Link Category' ),
+				'new_item_name'              => __( 'New Link Category Name' ),
+				'separate_items_with_commas' => null,
+				'add_or_remove_items'        => null,
+				'choose_from_most_used'      => null,
+				'back_to_items'              => __( '&larr; Back to Link Categories' ),
+			),
+			'capabilities' => array(
+				'manage_terms' => 'manage_links',
+				'edit_terms'   => 'manage_links',
+				'delete_terms' => 'manage_links',
+				'assign_terms' => 'manage_links',
+			),
+			'query_var'    => false,
+			'rewrite'      => false,
+			'public'       => false,
+			'show_ui'      => true,
+			'_builtin'     => true,
+		)
+	);
 
-	register_taxonomy( 'post_format', 'post', array(
-		'public' => true,
-		'hierarchical' => false,
-		'labels' => array(
-			'name' => _x( 'Format', 'post format' ),
-			'singular_name' => _x( 'Format', 'post format' ),
-		),
-		'query_var' => true,
-		'rewrite' => $rewrite['post_format'],
-		'show_ui' => false,
-		'_builtin' => true,
-		'show_in_nav_menus' => current_theme_supports( 'post-formats' ),
-	) );
+	register_taxonomy(
+		'post_format', 'post', array(
+			'public'            => true,
+			'hierarchical'      => false,
+			'labels'            => array(
+				'name'          => _x( 'Format', 'post format' ),
+				'singular_name' => _x( 'Format', 'post format' ),
+			),
+			'query_var'         => true,
+			'rewrite'           => $rewrite['post_format'],
+			'show_ui'           => false,
+			'_builtin'          => true,
+			'show_in_nav_menus' => current_theme_supports( 'post-formats' ),
+		)
+	);
 }
 
 /**
@@ -169,9 +183,9 @@ function create_initial_taxonomies() {
 function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' ) {
 	global $wp_taxonomies;
 
-	$field = ('names' == $output) ? 'name' : false;
+	$field = ( 'names' == $output ) ? 'name' : false;
 
-	return wp_filter_object_list($wp_taxonomies, $args, $operator, $field);
+	return wp_filter_object_list( $wp_taxonomies, $args, $operator, $field );
 }
 
 /**
@@ -198,9 +212,10 @@ function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' )
 function get_object_taxonomies( $object, $output = 'names' ) {
 	global $wp_taxonomies;
 
-	if ( is_object($object) ) {
-		if ( $object->post_type == 'attachment' )
+	if ( is_object( $object ) ) {
+		if ( $object->post_type == 'attachment' ) {
 			return get_attachment_taxonomies( $object, $output );
+		}
 		$object = $object->post_type;
 	}
 
@@ -208,11 +223,12 @@ function get_object_taxonomies( $object, $output = 'names' ) {
 
 	$taxonomies = array();
 	foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
-		if ( array_intersect($object, (array) $tax_obj->object_type) ) {
-			if ( 'names' == $output )
+		if ( array_intersect( $object, (array) $tax_obj->object_type ) ) {
+			if ( 'names' == $output ) {
 				$taxonomies[] = $tax_name;
-			else
+			} else {
 				$taxonomies[ $tax_name ] = $tax_obj;
+			}
 		}
 	}
 
@@ -235,10 +251,11 @@ function get_object_taxonomies( $object, $output = 'names' ) {
 function get_taxonomy( $taxonomy ) {
 	global $wp_taxonomies;
 
-	if ( ! taxonomy_exists( $taxonomy ) )
+	if ( ! taxonomy_exists( $taxonomy ) ) {
 		return false;
+	}
 
-	return $wp_taxonomies[$taxonomy];
+	return $wp_taxonomies[ $taxonomy ];
 }
 
 /**
@@ -256,7 +273,7 @@ function get_taxonomy( $taxonomy ) {
 function taxonomy_exists( $taxonomy ) {
 	global $wp_taxonomies;
 
-	return isset( $wp_taxonomies[$taxonomy] );
+	return isset( $wp_taxonomies[ $taxonomy ] );
 }
 
 /**
@@ -272,11 +289,12 @@ function taxonomy_exists( $taxonomy ) {
  * @param string $taxonomy Name of taxonomy object.
  * @return bool Whether the taxonomy is hierarchical.
  */
-function is_taxonomy_hierarchical($taxonomy) {
-	if ( ! taxonomy_exists($taxonomy) )
+function is_taxonomy_hierarchical( $taxonomy ) {
+	if ( ! taxonomy_exists( $taxonomy ) ) {
 		return false;
+	}
 
-	$taxonomy = get_taxonomy($taxonomy);
+	$taxonomy = get_taxonomy( $taxonomy );
 	return $taxonomy->hierarchical;
 }
 
@@ -376,8 +394,9 @@ function is_taxonomy_hierarchical($taxonomy) {
 function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
 	global $wp_taxonomies;
 
-	if ( ! is_array( $wp_taxonomies ) )
+	if ( ! is_array( $wp_taxonomies ) ) {
 		$wp_taxonomies = array();
+	}
 
 	$args = wp_parse_args( $args );
 
@@ -393,7 +412,6 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
 
 	$taxonomy_object->add_hooks();
 
-
 	/**
 	 * Fires after a taxonomy is registered.
 	 *
@@ -499,35 +517,37 @@ function unregister_taxonomy( $taxonomy ) {
 function get_taxonomy_labels( $tax ) {
 	$tax->labels = (array) $tax->labels;
 
-	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
+	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) {
 		$tax->labels['separate_items_with_commas'] = $tax->helps;
+	}
 
-	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) )
+	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) ) {
 		$tax->labels['not_found'] = $tax->no_tagcloud;
+	}
 
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
-		'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
-		'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
-		'popular_items' => array( __( 'Popular Tags' ), null ),
-		'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),
-		'parent_item' => array( null, __( 'Parent Category' ) ),
-		'parent_item_colon' => array( null, __( 'Parent Category:' ) ),
-		'edit_item' => array( __( 'Edit Tag' ), __( 'Edit Category' ) ),
-		'view_item' => array( __( 'View Tag' ), __( 'View Category' ) ),
-		'update_item' => array( __( 'Update Tag' ), __( 'Update Category' ) ),
-		'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
-		'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
+		'name'                       => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
+		'singular_name'              => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
+		'search_items'               => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
+		'popular_items'              => array( __( 'Popular Tags' ), null ),
+		'all_items'                  => array( __( 'All Tags' ), __( 'All Categories' ) ),
+		'parent_item'                => array( null, __( 'Parent Category' ) ),
+		'parent_item_colon'          => array( null, __( 'Parent Category:' ) ),
+		'edit_item'                  => array( __( 'Edit Tag' ), __( 'Edit Category' ) ),
+		'view_item'                  => array( __( 'View Tag' ), __( 'View Category' ) ),
+		'update_item'                => array( __( 'Update Tag' ), __( 'Update Category' ) ),
+		'add_new_item'               => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
+		'new_item_name'              => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
 		'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
-		'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
-		'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
-		'not_found' => array( __( 'No tags found.' ), __( 'No categories found.' ) ),
-		'no_terms' => array( __( 'No tags' ), __( 'No categories' ) ),
-		'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ),
-		'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
+		'add_or_remove_items'        => array( __( 'Add or remove tags' ), null ),
+		'choose_from_most_used'      => array( __( 'Choose from the most used tags' ), null ),
+		'not_found'                  => array( __( 'No tags found.' ), __( 'No categories found.' ) ),
+		'no_terms'                   => array( __( 'No tags' ), __( 'No categories' ) ),
+		'items_list_navigation'      => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ),
+		'items_list'                 => array( __( 'Tags list' ), __( 'Categories list' ) ),
 		/* translators: Tab heading when selecting from the most used terms */
-		'most_used' => array( _x( 'Most Used', 'tags' ), _x( 'Most Used', 'categories' ) ),
-		'back_to_items' => array( __( '&larr; Back to Tags' ), __( '&larr; Back to Categories' ) ),
+		'most_used'                  => array( _x( 'Most Used', 'tags' ), _x( 'Most Used', 'categories' ) ),
+		'back_to_items'              => array( __( '&larr; Back to Tags' ), __( '&larr; Back to Categories' ) ),
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
@@ -567,17 +587,20 @@ function get_taxonomy_labels( $tax ) {
  * @param string $object_type Name of the object type.
  * @return bool True if successful, false if not.
  */
-function register_taxonomy_for_object_type( $taxonomy, $object_type) {
+function register_taxonomy_for_object_type( $taxonomy, $object_type ) {
 	global $wp_taxonomies;
 
-	if ( !isset($wp_taxonomies[$taxonomy]) )
+	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) ) {
 		return false;
+	}
 
-	if ( ! get_post_type_object($object_type) )
+	if ( ! get_post_type_object( $object_type ) ) {
 		return false;
+	}
 
-	if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
-		$wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+	if ( ! in_array( $object_type, $wp_taxonomies[ $taxonomy ]->object_type ) ) {
+		$wp_taxonomies[ $taxonomy ]->object_type[] = $object_type;
+	}
 
 	// Filter out empties.
 	$wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
@@ -599,15 +622,18 @@ function register_taxonomy_for_object_type( $taxonomy, $object_type) {
 function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
 	global $wp_taxonomies;
 
-	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) )
+	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) ) {
 		return false;
+	}
 
-	if ( ! get_post_type_object( $object_type ) )
+	if ( ! get_post_type_object( $object_type ) ) {
 		return false;
+	}
 
 	$key = array_search( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true );
-	if ( false === $key )
+	if ( false === $key ) {
 		return false;
+	}
 
 	unset( $wp_taxonomies[ $taxonomy ]->object_type[ $key ] );
 	return true;
@@ -640,7 +666,7 @@ function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
  * @param string|array $taxonomies String of taxonomy name or Array of string values of taxonomy names.
  * @param array|string $args       Change the order of the object_ids, either ASC or DESC.
  * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success.
- *	the array can be empty meaning that there are no $object_ids found or it will return the $object_ids found.
+ *  the array can be empty meaning that there are no $object_ids found or it will return the $object_ids found.
  */
 function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
 	global $wpdb;
@@ -658,20 +684,20 @@ function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
 	}
 
 	$defaults = array( 'order' => 'ASC' );
-	$args = wp_parse_args( $args, $defaults );
+	$args     = wp_parse_args( $args, $defaults );
 
 	$order = ( 'desc' == strtolower( $args['order'] ) ) ? 'DESC' : 'ASC';
 
-	$term_ids = array_map('intval', $term_ids );
+	$term_ids = array_map( 'intval', $term_ids );
 
 	$taxonomies = "'" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
-	$term_ids = "'" . implode( "', '", $term_ids ) . "'";
+	$term_ids   = "'" . implode( "', '", $term_ids ) . "'";
 
 	$sql = "SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order";
 
 	$last_changed = wp_cache_get_last_changed( 'terms' );
-	$cache_key = 'get_objects_in_term:' . md5( $sql ) . ":$last_changed";
-	$cache = wp_cache_get( $cache_key, 'terms' );
+	$cache_key    = 'get_objects_in_term:' . md5( $sql ) . ":$last_changed";
+	$cache        = wp_cache_get( $cache_key, 'terms' );
 	if ( false === $cache ) {
 		$object_ids = $wpdb->get_col( $sql );
 		wp_cache_set( $cache_key, $object_ids, 'terms' );
@@ -679,7 +705,7 @@ function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
 		$object_ids = (array) $cache;
 	}
 
-	if ( ! $object_ids ){
+	if ( ! $object_ids ) {
 		return array();
 	}
 	return $object_ids;
@@ -887,17 +913,17 @@ function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter
 	);
 
 	switch ( $field ) {
-		case 'slug' :
+		case 'slug':
 			$args['slug'] = $value;
 			break;
-		case 'name' :
+		case 'name':
 			$args['name'] = $value;
 			break;
-		case 'term_taxonomy_id' :
+		case 'term_taxonomy_id':
 			$args['term_taxonomy_id'] = $value;
-			unset( $args[ 'taxonomy' ] );
+			unset( $args['taxonomy'] );
 			break;
-		default :
+		default:
 			return false;
 	}
 
@@ -937,20 +963,22 @@ function get_term_children( $term_id, $taxonomy ) {
 
 	$term_id = intval( $term_id );
 
-	$terms = _get_term_hierarchy($taxonomy);
+	$terms = _get_term_hierarchy( $taxonomy );
 
-	if ( ! isset($terms[$term_id]) )
+	if ( ! isset( $terms[ $term_id ] ) ) {
 		return array();
+	}
 
-	$children = $terms[$term_id];
+	$children = $terms[ $term_id ];
 
-	foreach ( (array) $terms[$term_id] as $child ) {
+	foreach ( (array) $terms[ $term_id ] as $child ) {
 		if ( $term_id == $child ) {
 			continue;
 		}
 
-		if ( isset($terms[$child]) )
-			$children = array_merge($children, get_term_children($child, $taxonomy));
+		if ( isset( $terms[ $child ] ) ) {
+			$children = array_merge( $children, get_term_children( $child, $taxonomy ) );
+		}
 	}
 
 	return $children;
@@ -974,14 +1002,17 @@ function get_term_children( $term_id, $taxonomy ) {
  */
 function get_term_field( $field, $term, $taxonomy = '', $context = 'display' ) {
 	$term = get_term( $term, $taxonomy );
-	if ( is_wp_error($term) )
+	if ( is_wp_error( $term ) ) {
 		return $term;
+	}
 
-	if ( !is_object($term) )
+	if ( ! is_object( $term ) ) {
 		return '';
+	}
 
-	if ( !isset($term->$field) )
+	if ( ! isset( $term->$field ) ) {
 		return '';
+	}
 
 	return sanitize_term_field( $field, $term->$field, $term->term_id, $term->taxonomy, $context );
 }
@@ -1001,13 +1032,15 @@ function get_term_field( $field, $term, $taxonomy = '', $context = 'display' ) {
 function get_term_to_edit( $id, $taxonomy ) {
 	$term = get_term( $id, $taxonomy );
 
-	if ( is_wp_error($term) )
+	if ( is_wp_error( $term ) ) {
 		return $term;
+	}
 
-	if ( !is_object($term) )
+	if ( ! is_object( $term ) ) {
 		return '';
+	}
 
-	return sanitize_term($term, $taxonomy, 'edit');
+	return sanitize_term( $term, $taxonomy, 'edit' );
 }
 
 /**
@@ -1073,13 +1106,13 @@ function get_terms( $args = array(), $deprecated = '' ) {
 	 * (a) a second non-empty parameter is passed, or
 	 * (b) the first parameter shares no keys with the default array (ie, it's a list of taxonomies)
 	 */
-	$_args = wp_parse_args( $args );
+	$_args          = wp_parse_args( $args );
 	$key_intersect  = array_intersect_key( $term_query->query_var_defaults, (array) $_args );
 	$do_legacy_args = $deprecated || empty( $key_intersect );
 
 	if ( $do_legacy_args ) {
-		$taxonomies = (array) $args;
-		$args = wp_parse_args( $deprecated, $defaults );
+		$taxonomies       = (array) $args;
+		$args             = wp_parse_args( $deprecated, $defaults );
 		$args['taxonomy'] = $taxonomies;
 	} else {
 		$args = wp_parse_args( $args, $defaults );
@@ -1145,7 +1178,7 @@ function add_term_meta( $term_id, $meta_key, $meta_value, $unique = false ) {
 	}
 
 	if ( wp_term_is_shared( $term_id ) ) {
-		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
+		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.' ), $term_id );
 	}
 
 	$added = add_metadata( 'term', $term_id, $meta_key, $meta_value, $unique );
@@ -1227,7 +1260,7 @@ function update_term_meta( $term_id, $meta_key, $meta_value, $prev_value = '' )
 	}
 
 	if ( wp_term_is_shared( $term_id ) ) {
-		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
+		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.' ), $term_id );
 	}
 
 	$updated = update_metadata( 'term', $term_id, $meta_key, $meta_value, $prev_value );
@@ -1301,50 +1334,54 @@ function has_term_meta( $term_id ) {
 function term_exists( $term, $taxonomy = '', $parent = null ) {
 	global $wpdb;
 
-	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
+	$select     = "SELECT term_id FROM $wpdb->terms as t WHERE ";
 	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
 
-	if ( is_int($term) ) {
-		if ( 0 == $term )
+	if ( is_int( $term ) ) {
+		if ( 0 == $term ) {
 			return 0;
+		}
 		$where = 't.term_id = %d';
-		if ( !empty($taxonomy) )
-			return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
-		else
+		if ( ! empty( $taxonomy ) ) {
+			return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . ' AND tt.taxonomy = %s', $term, $taxonomy ), ARRAY_A );
+		} else {
 			return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+		}
 	}
 
 	$term = trim( wp_unslash( $term ) );
 	$slug = sanitize_title( $term );
 
-	$where = 't.slug = %s';
-	$else_where = 't.name = %s';
-	$where_fields = array($slug);
-	$else_where_fields = array($term);
-	$orderby = 'ORDER BY t.term_id ASC';
-	$limit = 'LIMIT 1';
-	if ( !empty($taxonomy) ) {
+	$where             = 't.slug = %s';
+	$else_where        = 't.name = %s';
+	$where_fields      = array( $slug );
+	$else_where_fields = array( $term );
+	$orderby           = 'ORDER BY t.term_id ASC';
+	$limit             = 'LIMIT 1';
+	if ( ! empty( $taxonomy ) ) {
 		if ( is_numeric( $parent ) ) {
-			$parent = (int) $parent;
-			$where_fields[] = $parent;
+			$parent              = (int) $parent;
+			$where_fields[]      = $parent;
 			$else_where_fields[] = $parent;
-			$where .= ' AND tt.parent = %d';
-			$else_where .= ' AND tt.parent = %d';
+			$where              .= ' AND tt.parent = %d';
+			$else_where         .= ' AND tt.parent = %d';
 		}
 
-		$where_fields[] = $taxonomy;
+		$where_fields[]      = $taxonomy;
 		$else_where_fields[] = $taxonomy;
 
-		if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A) )
+		if ( $result = $wpdb->get_row( $wpdb->prepare( "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields ), ARRAY_A ) ) {
 			return $result;
+		}
 
-		return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields), ARRAY_A);
+		return $wpdb->get_row( $wpdb->prepare( "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields ), ARRAY_A );
 	}
 
-	if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields) ) )
+	if ( $result = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields ) ) ) {
 		return $result;
+	}
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields) );
+	return $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields ) );
 }
 
 /**
@@ -1360,15 +1397,19 @@ function term_exists( $term, $taxonomy = '', $parent = null ) {
  * @return bool Whether `$term2` is a child of `$term1`.
  */
 function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
-	if ( ! isset( $term1->term_id ) )
+	if ( ! isset( $term1->term_id ) ) {
 		$term1 = get_term( $term1, $taxonomy );
-	if ( ! isset( $term2->parent ) )
+	}
+	if ( ! isset( $term2->parent ) ) {
 		$term2 = get_term( $term2, $taxonomy );
+	}
 
-	if ( empty( $term1->term_id ) || empty( $term2->parent ) )
+	if ( empty( $term1->term_id ) || empty( $term2->parent ) ) {
 		return false;
-	if ( $term2->parent == $term1->term_id )
+	}
+	if ( $term2->parent == $term1->term_id ) {
 		return true;
+	}
 
 	return term_is_ancestor_of( $term1, get_term( $term2->parent, $taxonomy ), $taxonomy );
 }
@@ -1390,27 +1431,30 @@ function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
  *                               'display', 'attribute', or 'js'. Default 'display'.
  * @return array|object Term with all fields sanitized.
  */
-function sanitize_term($term, $taxonomy, $context = 'display') {
+function sanitize_term( $term, $taxonomy, $context = 'display' ) {
 	$fields = array( 'term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id' );
 
 	$do_object = is_object( $term );
 
-	$term_id = $do_object ? $term->term_id : (isset($term['term_id']) ? $term['term_id'] : 0);
+	$term_id = $do_object ? $term->term_id : ( isset( $term['term_id'] ) ? $term['term_id'] : 0 );
 
 	foreach ( (array) $fields as $field ) {
 		if ( $do_object ) {
-			if ( isset($term->$field) )
-				$term->$field = sanitize_term_field($field, $term->$field, $term_id, $taxonomy, $context);
+			if ( isset( $term->$field ) ) {
+				$term->$field = sanitize_term_field( $field, $term->$field, $term_id, $taxonomy, $context );
+			}
 		} else {
-			if ( isset($term[$field]) )
-				$term[$field] = sanitize_term_field($field, $term[$field], $term_id, $taxonomy, $context);
+			if ( isset( $term[ $field ] ) ) {
+				$term[ $field ] = sanitize_term_field( $field, $term[ $field ], $term_id, $taxonomy, $context );
+			}
 		}
 	}
 
-	if ( $do_object )
+	if ( $do_object ) {
 		$term->filter = $context;
-	else
+	} else {
 		$term['filter'] = $context;
+	}
 
 	return $term;
 }
@@ -1438,16 +1482,18 @@ function sanitize_term($term, $taxonomy, $context = 'display') {
  *                         'attribute', or 'js'.
  * @return mixed Sanitized field.
  */
-function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
+function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
 	$int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
 	if ( in_array( $field, $int_fields ) ) {
 		$value = (int) $value;
-		if ( $value < 0 )
+		if ( $value < 0 ) {
 			$value = 0;
+		}
 	}
 
-	if ( 'raw' == $context )
+	if ( 'raw' == $context ) {
 		return $value;
+	}
 
 	if ( 'edit' == $context ) {
 
@@ -1477,10 +1523,11 @@ function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
 		 */
 		$value = apply_filters( "edit_{$taxonomy}_{$field}", $value, $term_id );
 
-		if ( 'description' == $field )
-			$value = esc_html($value); // textarea_escaped
-		else
-			$value = esc_attr($value);
+		if ( 'description' == $field ) {
+			$value = esc_html( $value ); // textarea_escaped
+		} else {
+			$value = esc_attr( $value );
+		}
 	} elseif ( 'db' == $context ) {
 
 		/**
@@ -1520,7 +1567,6 @@ function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
 			 */
 			$value = apply_filters( 'pre_category_nicename', $value );
 		}
-
 	} elseif ( 'rss' == $context ) {
 
 		/**
@@ -1579,9 +1625,9 @@ function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
 	}
 
 	if ( 'attribute' == $context ) {
-		$value = esc_attr($value);
+		$value = esc_attr( $value );
 	} elseif ( 'js' == $context ) {
-		$value = esc_js($value);
+		$value = esc_js( $value );
 	}
 	return $value;
 }
@@ -1599,18 +1645,18 @@ function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
  * @return array|int|WP_Error Number of terms in that taxonomy or WP_Error if the taxonomy does not exist.
  */
 function wp_count_terms( $taxonomy, $args = array() ) {
-	$defaults = array('hide_empty' => false);
-	$args = wp_parse_args($args, $defaults);
+	$defaults = array( 'hide_empty' => false );
+	$args     = wp_parse_args( $args, $defaults );
 
 	// backward compatibility
-	if ( isset($args['ignore_empty']) ) {
+	if ( isset( $args['ignore_empty'] ) ) {
 		$args['hide_empty'] = $args['ignore_empty'];
-		unset($args['ignore_empty']);
+		unset( $args['ignore_empty'] );
 	}
 
 	$args['fields'] = 'count';
 
-	return get_terms($taxonomy, $args);
+	return get_terms( $taxonomy, $args );
 }
 
 /**
@@ -1628,8 +1674,9 @@ function wp_count_terms( $taxonomy, $args = array() ) {
 function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
 	$object_id = (int) $object_id;
 
-	if ( !is_array($taxonomies) )
-		$taxonomies = array($taxonomies);
+	if ( ! is_array( $taxonomies ) ) {
+		$taxonomies = array( $taxonomies );
+	}
 
 	foreach ( (array) $taxonomies as $taxonomy ) {
 		$term_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids' ) );
@@ -1670,10 +1717,12 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 
 	$term = (int) $term;
 
-	if ( ! $ids = term_exists($term, $taxonomy) )
+	if ( ! $ids = term_exists( $term, $taxonomy ) ) {
 		return false;
-	if ( is_wp_error( $ids ) )
+	}
+	if ( is_wp_error( $ids ) ) {
 		return $ids;
+	}
 
 	$tt_id = $ids['term_taxonomy_id'];
 
@@ -1681,11 +1730,12 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 
 	if ( 'category' == $taxonomy ) {
 		$defaults['default'] = get_option( 'default_category' );
-		if ( $defaults['default'] == $term )
+		if ( $defaults['default'] == $term ) {
 			return 0; // Don't delete the default category
+		}
 	}
 
-	$args = wp_parse_args($args, $defaults);
+	$args = wp_parse_args( $args, $defaults );
 
 	if ( isset( $args['default'] ) ) {
 		$default = (int) $args['default'];
@@ -1709,13 +1759,14 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 	do_action( 'pre_delete_term', $term, $taxonomy );
 
 	// Update children to point to new parent
-	if ( is_taxonomy_hierarchical($taxonomy) ) {
-		$term_obj = get_term($term, $taxonomy);
-		if ( is_wp_error( $term_obj ) )
+	if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+		$term_obj = get_term( $term, $taxonomy );
+		if ( is_wp_error( $term_obj ) ) {
 			return $term_obj;
+		}
 		$parent = $term_obj->parent;
 
-		$edit_ids = $wpdb->get_results( "SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = " . (int)$term_obj->term_id );
+		$edit_ids    = $wpdb->get_results( "SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = " . (int) $term_obj->term_id );
 		$edit_tt_ids = wp_list_pluck( $edit_ids, 'term_taxonomy_id' );
 
 		/**
@@ -1727,7 +1778,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 		 */
 		do_action( 'edit_term_taxonomies', $edit_tt_ids );
 
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'parent' ), array( 'parent' => $term_obj->term_id) + compact( 'taxonomy' ) );
+		$wpdb->update( $wpdb->term_taxonomy, compact( 'parent' ), array( 'parent' => $term_obj->term_id ) + compact( 'taxonomy' ) );
 
 		// Clean the cache for all child terms.
 		$edit_term_ids = wp_list_pluck( $edit_ids, 'term_id' );
@@ -1749,22 +1800,29 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 	$object_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
 
 	foreach ( $object_ids as $object_id ) {
-		$terms = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids', 'orderby' => 'none' ) );
-		if ( 1 == count($terms) && isset($default) ) {
-			$terms = array($default);
+		$terms = wp_get_object_terms(
+			$object_id, $taxonomy, array(
+				'fields'  => 'ids',
+				'orderby' => 'none',
+			)
+		);
+		if ( 1 == count( $terms ) && isset( $default ) ) {
+			$terms = array( $default );
 		} else {
-			$terms = array_diff($terms, array($term));
-			if (isset($default) && isset($force_default) && $force_default)
-				$terms = array_merge($terms, array($default));
+			$terms = array_diff( $terms, array( $term ) );
+			if ( isset( $default ) && isset( $force_default ) && $force_default ) {
+				$terms = array_merge( $terms, array( $default ) );
+			}
 		}
-		$terms = array_map('intval', $terms);
+		$terms = array_map( 'intval', $terms );
 		wp_set_object_terms( $object_id, $terms, $taxonomy );
 	}
 
 	// Clean the relationship caches for all object types using this term.
 	$tax_object = get_taxonomy( $taxonomy );
-	foreach ( $tax_object->object_type as $object_type )
+	foreach ( $tax_object->object_type as $object_type ) {
 		clean_object_term_cache( $object_ids, $object_type );
+	}
 
 	$term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
 	foreach ( $term_meta_ids as $mid ) {
@@ -1791,10 +1849,11 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 	do_action( 'deleted_term_taxonomy', $tt_id );
 
 	// Delete the term if no taxonomies use it.
-	if ( !$wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term) ) )
+	if ( ! $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term ) ) ) {
 		$wpdb->delete( $wpdb->terms, array( 'term_id' => $term ) );
+	}
 
-	clean_term_cache($term, $taxonomy);
+	clean_term_cache( $term, $taxonomy );
 
 	/**
 	 * Fires after a term is deleted from the database and the cache is cleaned.
@@ -1838,7 +1897,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
  *
  * @param int $cat_ID Category term ID.
  * @return bool|int|WP_Error Returns true if completes delete action; false if term doesn't exist;
- * 	Zero on attempted deletion of default Category; WP_Error object is also a possibility.
+ *  Zero on attempted deletion of default Category; WP_Error object is also a possibility.
  */
 function wp_delete_category( $cat_ID ) {
 	return wp_delete_term( $cat_ID, 'category' );
@@ -1860,21 +1919,25 @@ function wp_delete_category( $cat_ID ) {
  * @return array|WP_Error The requested term data or empty array if no terms found.
  *                        WP_Error if any of the $taxonomies don't exist.
  */
-function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
-	if ( empty( $object_ids ) || empty( $taxonomies ) )
+function wp_get_object_terms( $object_ids, $taxonomies, $args = array() ) {
+	if ( empty( $object_ids ) || empty( $taxonomies ) ) {
 		return array();
-
-	if ( !is_array($taxonomies) )
-		$taxonomies = array($taxonomies);
-
-	foreach ( $taxonomies as $taxonomy ) {
-		if ( ! taxonomy_exists($taxonomy) )
-			return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = array($object_ids);
-	$object_ids = array_map('intval', $object_ids);
+	if ( ! is_array( $taxonomies ) ) {
+		$taxonomies = array( $taxonomies );
+	}
+
+	foreach ( $taxonomies as $taxonomy ) {
+		if ( ! taxonomy_exists( $taxonomy ) ) {
+			return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+		}
+	}
+
+	if ( ! is_array( $object_ids ) ) {
+		$object_ids = array( $object_ids );
+	}
+	$object_ids = array_map( 'intval', $object_ids );
 
 	$args = wp_parse_args( $args );
 
@@ -1910,7 +1973,7 @@ function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
 		}
 	}
 
-	$args['taxonomy'] = $taxonomies;
+	$args['taxonomy']   = $taxonomies;
 	$args['object_ids'] = $object_ids;
 
 	// Taxonomies registered without an 'args' param are handled here.
@@ -2004,7 +2067,7 @@ function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
 function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	global $wpdb;
 
-	if ( ! taxonomy_exists($taxonomy) ) {
+	if ( ! taxonomy_exists( $taxonomy ) ) {
 		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 	}
 	/**
@@ -2025,25 +2088,30 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	if ( '' == trim( $term ) ) {
 		return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
 	}
-	$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array(
+		'alias_of'    => '',
+		'description' => '',
+		'parent'      => 0,
+		'slug'        => '',
+	);
+	$args     = wp_parse_args( $args, $defaults );
 
 	if ( $args['parent'] > 0 && ! term_exists( (int) $args['parent'] ) ) {
 		return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );
 	}
 
-	$args['name'] = $term;
+	$args['name']     = $term;
 	$args['taxonomy'] = $taxonomy;
 
 	// Coerce null description to strings, to avoid database errors.
 	$args['description'] = (string) $args['description'];
 
-	$args = sanitize_term($args, $taxonomy, 'db');
+	$args = sanitize_term( $args, $taxonomy, 'db' );
 
 	// expected_slashed ($name)
-	$name = wp_unslash( $args['name'] );
+	$name        = wp_unslash( $args['name'] );
 	$description = wp_unslash( $args['description'] );
-	$parent = (int) $args['parent'];
+	$parent      = (int) $args['parent'];
 
 	$slug_provided = ! empty( $args['slug'] );
 	if ( ! $slug_provided ) {
@@ -2063,11 +2131,13 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 			 * The alias is not in a group, so we create a new one
 			 * and add the alias to it.
 			 */
-			$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
+			$term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms" ) + 1;
 
-			wp_update_term( $alias->term_id, $taxonomy, array(
-				'term_group' => $term_group,
-			) );
+			wp_update_term(
+				$alias->term_id, $taxonomy, array(
+					'term_group' => $term_group,
+				)
+			);
 		}
 	}
 
@@ -2075,11 +2145,13 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	 * Prevent the creation of terms with duplicate names at the same level of a taxonomy hierarchy,
 	 * unless a unique slug has been explicitly provided.
 	 */
-	$name_matches = get_terms( $taxonomy, array(
-		'name' => $name,
-		'hide_empty' => false,
-		'parent' => $args['parent'],
-	) );
+	$name_matches = get_terms(
+		$taxonomy, array(
+			'name'       => $name,
+			'hide_empty' => false,
+			'parent'     => $args['parent'],
+		)
+	);
 
 	/*
 	 * The `name` match in `get_terms()` doesn't differentiate accented characters,
@@ -2099,7 +2171,12 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 		$slug_match = get_term_by( 'slug', $slug, $taxonomy );
 		if ( ! $slug_provided || $name_match->slug === $slug || $slug_match ) {
 			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-				$siblings = get_terms( $taxonomy, array( 'get' => 'all', 'parent' => $parent ) );
+				$siblings = get_terms(
+					$taxonomy, array(
+						'get'    => 'all',
+						'parent' => $parent,
+					)
+				);
 
 				$existing_term = null;
 				if ( ( ! $slug_provided || $name_match->slug === $slug ) && in_array( $name, wp_list_pluck( $siblings, 'name' ) ) ) {
@@ -2139,8 +2216,8 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	$term_id = (int) $wpdb->insert_id;
 
 	// Seems unreachable, However, Is used in the case that a term name is provided, which sanitizes to an empty string.
-	if ( empty($slug) ) {
-		$slug = sanitize_title($slug, $term_id);
+	if ( empty( $slug ) ) {
+		$slug = sanitize_title( $slug, $term_id );
 
 		/** This action is documented in wp-includes/taxonomy.php */
 		do_action( 'edit_terms', $term_id, $taxonomy );
@@ -2152,10 +2229,13 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 
 	$tt_id = $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id ) );
 
-	if ( !empty($tt_id) ) {
-		return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
+	if ( ! empty( $tt_id ) ) {
+		return array(
+			'term_id'          => $term_id,
+			'term_taxonomy_id' => $tt_id,
+		);
 	}
-	$wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent') + array( 'count' => 0 ) );
+	$wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent' ) + array( 'count' => 0 ) );
 	$tt_id = (int) $wpdb->insert_id;
 
 	/*
@@ -2173,7 +2253,10 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 		$tt_id   = (int) $duplicate_term->term_taxonomy_id;
 
 		clean_term_cache( $term_id, $taxonomy );
-		return array( 'term_id' => $term_id, 'term_taxonomy_id' => $tt_id );
+		return array(
+			'term_id'          => $term_id,
+			'term_taxonomy_id' => $tt_id,
+		);
 	}
 
 	/**
@@ -2185,7 +2268,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "create_term", $term_id, $tt_id, $taxonomy );
+	do_action( 'create_term', $term_id, $tt_id, $taxonomy );
 
 	/**
 	 * Fires after a new term is created for a specific taxonomy.
@@ -2210,7 +2293,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	 */
 	$term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
 
-	clean_term_cache($term_id, $taxonomy);
+	clean_term_cache( $term_id, $taxonomy );
 
 	/**
 	 * Fires after a new term is created, and after the term cache has been cleaned.
@@ -2236,7 +2319,10 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
 	 */
 	do_action( "created_{$taxonomy}", $term_id, $tt_id );
 
-	return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
+	return array(
+		'term_id'          => $term_id,
+		'term_taxonomy_id' => $tt_id,
+	);
 }
 
 /**
@@ -2271,36 +2357,47 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 	}
 
-	if ( !is_array($terms) )
-		$terms = array($terms);
+	if ( ! is_array( $terms ) ) {
+		$terms = array( $terms );
+	}
 
-	if ( ! $append )
-		$old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
-	else
+	if ( ! $append ) {
+		$old_tt_ids = wp_get_object_terms(
+			$object_id, $taxonomy, array(
+				'fields'  => 'tt_ids',
+				'orderby' => 'none',
+			)
+		);
+	} else {
 		$old_tt_ids = array();
+	}
 
-	$tt_ids = array();
-	$term_ids = array();
+	$tt_ids     = array();
+	$term_ids   = array();
 	$new_tt_ids = array();
 
-	foreach ( (array) $terms as $term) {
-		if ( !strlen(trim($term)) )
+	foreach ( (array) $terms as $term ) {
+		if ( ! strlen( trim( $term ) ) ) {
 			continue;
-
-		if ( !$term_info = term_exists($term, $taxonomy) ) {
-			// Skip if a non-existent term ID is passed.
-			if ( is_int($term) )
-				continue;
-			$term_info = wp_insert_term($term, $taxonomy);
 		}
-		if ( is_wp_error($term_info) )
-			return $term_info;
-		$term_ids[] = $term_info['term_id'];
-		$tt_id = $term_info['term_taxonomy_id'];
-		$tt_ids[] = $tt_id;
 
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) )
+		if ( ! $term_info = term_exists( $term, $taxonomy ) ) {
+			// Skip if a non-existent term ID is passed.
+			if ( is_int( $term ) ) {
+				continue;
+			}
+			$term_info = wp_insert_term( $term, $taxonomy );
+		}
+		if ( is_wp_error( $term_info ) ) {
+			return $term_info;
+		}
+		$term_ids[] = $term_info['term_id'];
+		$tt_id      = $term_info['term_taxonomy_id'];
+		$tt_ids[]   = $tt_id;
+
+		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) ) {
 			continue;
+		}
 
 		/**
 		 * Fires immediately before an object-term relationship is added.
@@ -2313,7 +2410,12 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 		 * @param string $taxonomy  Taxonomy slug.
 		 */
 		do_action( 'add_term_relationship', $object_id, $tt_id, $taxonomy );
-		$wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $tt_id ) );
+		$wpdb->insert(
+			$wpdb->term_relationships, array(
+				'object_id'        => $object_id,
+				'term_taxonomy_id' => $tt_id,
+			)
+		);
 
 		/**
 		 * Fires immediately after an object-term relationship is added.
@@ -2329,16 +2431,17 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 		$new_tt_ids[] = $tt_id;
 	}
 
-	if ( $new_tt_ids )
+	if ( $new_tt_ids ) {
 		wp_update_term_count( $new_tt_ids, $taxonomy );
+	}
 
 	if ( ! $append ) {
 		$delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
 
 		if ( $delete_tt_ids ) {
 			$in_delete_tt_ids = "'" . implode( "', '", $delete_tt_ids ) . "'";
-			$delete_term_ids = $wpdb->get_col( $wpdb->prepare( "SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy ) );
-			$delete_term_ids = array_map( 'intval', $delete_term_ids );
+			$delete_term_ids  = $wpdb->get_col( $wpdb->prepare( "SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy ) );
+			$delete_term_ids  = array_map( 'intval', $delete_term_ids );
 
 			$remove = wp_remove_object_terms( $object_id, $delete_term_ids, $taxonomy );
 			if ( is_wp_error( $remove ) ) {
@@ -2347,17 +2450,21 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
 		}
 	}
 
-	$t = get_taxonomy($taxonomy);
-	if ( ! $append && isset($t->sort) && $t->sort ) {
-		$values = array();
-		$term_order = 0;
-		$final_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
-		foreach ( $tt_ids as $tt_id )
-			if ( in_array($tt_id, $final_tt_ids) )
-				$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
-		if ( $values )
-			if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
+	$t = get_taxonomy( $taxonomy );
+	if ( ! $append && isset( $t->sort ) && $t->sort ) {
+		$values       = array();
+		$term_order   = 0;
+		$final_tt_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'tt_ids' ) );
+		foreach ( $tt_ids as $tt_id ) {
+			if ( in_array( $tt_id, $final_tt_ids ) ) {
+				$values[] = $wpdb->prepare( '(%d, %d, %d)', $object_id, $tt_id, ++$term_order );
+			}
+		}
+		if ( $values ) {
+			if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . ' ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)' ) ) {
 				return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database.' ), $wpdb->last_error );
+			}
+		}
 	}
 
 	wp_cache_delete( $object_id, $taxonomy . '_relationships' );
@@ -2504,7 +2611,7 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
 function wp_unique_term_slug( $slug, $term ) {
 	global $wpdb;
 
-	$needs_suffix = true;
+	$needs_suffix  = true;
 	$original_slug = $slug;
 
 	// As of 4.1, duplicate slugs are allowed as long as they're in different taxonomies.
@@ -2519,17 +2626,19 @@ function wp_unique_term_slug( $slug, $term ) {
 	$parent_suffix = '';
 	if ( $needs_suffix && is_taxonomy_hierarchical( $term->taxonomy ) && ! empty( $term->parent ) ) {
 		$the_parent = $term->parent;
-		while ( ! empty($the_parent) ) {
-			$parent_term = get_term($the_parent, $term->taxonomy);
-			if ( is_wp_error($parent_term) || empty($parent_term) )
+		while ( ! empty( $the_parent ) ) {
+			$parent_term = get_term( $the_parent, $term->taxonomy );
+			if ( is_wp_error( $parent_term ) || empty( $parent_term ) ) {
 				break;
+			}
 			$parent_suffix .= '-' . $parent_term->slug;
 			if ( ! term_exists( $slug . $parent_suffix ) ) {
 				break;
 			}
 
-			if ( empty($parent_term->parent) )
+			if ( empty( $parent_term->parent ) ) {
 				break;
+			}
 			$the_parent = $parent_term->parent;
 		}
 	}
@@ -2549,10 +2658,11 @@ function wp_unique_term_slug( $slug, $term ) {
 		if ( $parent_suffix ) {
 			$slug .= $parent_suffix;
 		} else {
-			if ( ! empty( $term->term_id ) )
+			if ( ! empty( $term->term_id ) ) {
 				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
-			else
+			} else {
 				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+			}
 
 			if ( $wpdb->get_var( $query ) ) {
 				$num = 2;
@@ -2634,18 +2744,23 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	$term = wp_slash( $term );
 
 	// Merge old and new args with new args overwriting old ones.
-	$args = array_merge($term, $args);
+	$args = array_merge( $term, $args );
 
-	$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
-	$args = wp_parse_args($args, $defaults);
-	$args = sanitize_term($args, $taxonomy, 'db');
+	$defaults    = array(
+		'alias_of'    => '',
+		'description' => '',
+		'parent'      => 0,
+		'slug'        => '',
+	);
+	$args        = wp_parse_args( $args, $defaults );
+	$args        = sanitize_term( $args, $taxonomy, 'db' );
 	$parsed_args = $args;
 
 	// expected_slashed ($name)
-	$name = wp_unslash( $args['name'] );
+	$name        = wp_unslash( $args['name'] );
 	$description = wp_unslash( $args['description'] );
 
-	$parsed_args['name'] = $name;
+	$parsed_args['name']        = $name;
 	$parsed_args['description'] = $description;
 
 	if ( '' == trim( $name ) ) {
@@ -2659,7 +2774,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	$empty_slug = false;
 	if ( empty( $args['slug'] ) ) {
 		$empty_slug = true;
-		$slug = sanitize_title($name);
+		$slug       = sanitize_title( $name );
 	} else {
 		$slug = $args['slug'];
 	}
@@ -2677,11 +2792,13 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 			 * The alias is not in a group, so we create a new one
 			 * and add the alias to it.
 			 */
-			$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
+			$term_group = $wpdb->get_var( "SELECT MAX(term_group) FROM $wpdb->terms" ) + 1;
 
-			wp_update_term( $alias->term_id, $taxonomy, array(
-				'term_group' => $term_group,
-			) );
+			wp_update_term(
+				$alias->term_id, $taxonomy, array(
+					'term_group' => $term_group,
+				)
+			);
 		}
 
 		$parsed_args['term_group'] = $term_group;
@@ -2707,15 +2824,15 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	if ( $duplicate && $duplicate->term_id != $term_id ) {
 		// If an empty slug was passed or the parent changed, reset the slug to something unique.
 		// Otherwise, bail.
-		if ( $empty_slug || ( $parent != $term['parent']) ) {
-			$slug = wp_unique_term_slug($slug, (object) $args);
+		if ( $empty_slug || ( $parent != $term['parent'] ) ) {
+			$slug = wp_unique_term_slug( $slug, (object) $args );
 		} else {
 			/* translators: 1: Taxonomy term slug */
 			return new WP_Error( 'duplicate_term_slug', sprintf( __( 'The slug &#8220;%s&#8221; is already in use by another term.' ), $slug ) );
 		}
 	}
 
-	$tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
+	$tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id ) );
 
 	// Check whether this is a shared term that needs splitting.
 	$_term_id = _split_shared_term( $term_id, $tt_id );
@@ -2748,8 +2865,8 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	$data = apply_filters( 'wp_update_term_data', $data, $term_id, $taxonomy, $args );
 
 	$wpdb->update( $wpdb->terms, $data, compact( 'term_id' ) );
-	if ( empty($slug) ) {
-		$slug = sanitize_title($name, $term_id);
+	if ( empty( $slug ) ) {
+		$slug = sanitize_title( $name, $term_id );
 		$wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
 	}
 
@@ -2794,7 +2911,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "edit_term", $term_id, $tt_id, $taxonomy );
+	do_action( 'edit_term', $term_id, $tt_id, $taxonomy );
 
 	/**
 	 * Fires after a term in a specific taxonomy has been updated, but before the term
@@ -2812,7 +2929,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	/** This filter is documented in wp-includes/taxonomy.php */
 	$term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
 
-	clean_term_cache($term_id, $taxonomy);
+	clean_term_cache( $term_id, $taxonomy );
 
 	/**
 	 * Fires after a term has been updated, and the term cache has been cleaned.
@@ -2823,7 +2940,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "edited_term", $term_id, $tt_id, $taxonomy );
+	do_action( 'edited_term', $term_id, $tt_id, $taxonomy );
 
 	/**
 	 * Fires after a term for a specific taxonomy has been updated, and the term
@@ -2838,7 +2955,10 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
 	 */
 	do_action( "edited_{$taxonomy}", $term_id, $tt_id );
 
-	return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
+	return array(
+		'term_id'          => $term_id,
+		'term_taxonomy_id' => $tt_id,
+	);
 }
 
 /**
@@ -2851,14 +2971,15 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) {
  * @param bool $defer Optional. Enable if true, disable if false.
  * @return bool Whether term counting is enabled or disabled.
  */
-function wp_defer_term_counting($defer=null) {
+function wp_defer_term_counting( $defer = null ) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if ( is_bool( $defer ) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
+		if ( ! $defer ) {
 			wp_update_term_count( null, null, true );
+		}
 	}
 
 	return $_defer;
@@ -2886,22 +3007,25 @@ function wp_update_term_count( $terms, $taxonomy, $do_deferred = false ) {
 	static $_deferred = array();
 
 	if ( $do_deferred ) {
-		foreach ( (array) array_keys($_deferred) as $tax ) {
-			wp_update_term_count_now( $_deferred[$tax], $tax );
-			unset( $_deferred[$tax] );
+		foreach ( (array) array_keys( $_deferred ) as $tax ) {
+			wp_update_term_count_now( $_deferred[ $tax ], $tax );
+			unset( $_deferred[ $tax ] );
 		}
 	}
 
-	if ( empty($terms) )
+	if ( empty( $terms ) ) {
 		return false;
+	}
 
-	if ( !is_array($terms) )
-		$terms = array($terms);
+	if ( ! is_array( $terms ) ) {
+		$terms = array( $terms );
+	}
 
 	if ( wp_defer_term_counting() ) {
-		if ( !isset($_deferred[$taxonomy]) )
-			$_deferred[$taxonomy] = array();
-		$_deferred[$taxonomy] = array_unique( array_merge($_deferred[$taxonomy], $terms) );
+		if ( ! isset( $_deferred[ $taxonomy ] ) ) {
+			$_deferred[ $taxonomy ] = array();
+		}
+		$_deferred[ $taxonomy ] = array_unique( array_merge( $_deferred[ $taxonomy ], $terms ) );
 		return true;
 	}
 
@@ -2918,16 +3042,17 @@ function wp_update_term_count( $terms, $taxonomy, $do_deferred = false ) {
  * @return true Always true when complete.
  */
 function wp_update_term_count_now( $terms, $taxonomy ) {
-	$terms = array_map('intval', $terms);
+	$terms = array_map( 'intval', $terms );
 
-	$taxonomy = get_taxonomy($taxonomy);
-	if ( !empty($taxonomy->update_count_callback) ) {
-		call_user_func($taxonomy->update_count_callback, $terms, $taxonomy);
+	$taxonomy = get_taxonomy( $taxonomy );
+	if ( ! empty( $taxonomy->update_count_callback ) ) {
+		call_user_func( $taxonomy->update_count_callback, $terms, $taxonomy );
 	} else {
 		$object_types = (array) $taxonomy->object_type;
 		foreach ( $object_types as &$object_type ) {
-			if ( 0 === strpos( $object_type, 'attachment:' ) )
+			if ( 0 === strpos( $object_type, 'attachment:' ) ) {
 				list( $object_type ) = explode( ':', $object_type );
+			}
 		}
 
 		if ( $object_types == array_filter( $object_types, 'post_type_exists' ) ) {
@@ -2939,7 +3064,7 @@ function wp_update_term_count_now( $terms, $taxonomy ) {
 		}
 	}
 
-	clean_term_cache($terms, '', false);
+	clean_term_cache( $terms, '', false );
 
 	return true;
 }
@@ -2964,21 +3089,22 @@ function wp_update_term_count_now( $terms, $taxonomy ) {
  * @param int|array    $object_ids  Single or list of term object ID(s).
  * @param array|string $object_type The taxonomy object type.
  */
-function clean_object_term_cache($object_ids, $object_type) {
+function clean_object_term_cache( $object_ids, $object_type ) {
 	global $_wp_suspend_cache_invalidation;
 
 	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
 		return;
 	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = array($object_ids);
+	if ( ! is_array( $object_ids ) ) {
+		$object_ids = array( $object_ids );
+	}
 
 	$taxonomies = get_object_taxonomies( $object_type );
 
 	foreach ( $object_ids as $id ) {
 		foreach ( $taxonomies as $taxonomy ) {
-			wp_cache_delete($id, "{$taxonomy}_relationships");
+			wp_cache_delete( $id, "{$taxonomy}_relationships" );
 		}
 	}
 
@@ -3007,31 +3133,32 @@ function clean_object_term_cache($object_ids, $object_type) {
  * @param bool      $clean_taxonomy Optional. Whether to clean taxonomy wide caches (true), or just individual
  *                                  term object caches (false). Default true.
  */
-function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
+function clean_term_cache( $ids, $taxonomy = '', $clean_taxonomy = true ) {
 	global $wpdb, $_wp_suspend_cache_invalidation;
 
 	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
 		return;
 	}
 
-	if ( !is_array($ids) )
-		$ids = array($ids);
+	if ( ! is_array( $ids ) ) {
+		$ids = array( $ids );
+	}
 
 	$taxonomies = array();
 	// If no taxonomy, assume tt_ids.
-	if ( empty($taxonomy) ) {
-		$tt_ids = array_map('intval', $ids);
-		$tt_ids = implode(', ', $tt_ids);
-		$terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)");
-		$ids = array();
+	if ( empty( $taxonomy ) ) {
+		$tt_ids = array_map( 'intval', $ids );
+		$tt_ids = implode( ', ', $tt_ids );
+		$terms  = $wpdb->get_results( "SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)" );
+		$ids    = array();
 		foreach ( (array) $terms as $term ) {
 			$taxonomies[] = $term->taxonomy;
-			$ids[] = $term->term_id;
+			$ids[]        = $term->term_id;
 			wp_cache_delete( $term->term_id, 'terms' );
 		}
-		$taxonomies = array_unique($taxonomies);
+		$taxonomies = array_unique( $taxonomies );
 	} else {
-		$taxonomies = array($taxonomy);
+		$taxonomies = array( $taxonomy );
 		foreach ( $taxonomies as $taxonomy ) {
 			foreach ( $ids as $id ) {
 				wp_cache_delete( $id, 'terms' );
@@ -3152,35 +3279,40 @@ function get_object_term_cache( $id, $taxonomy ) {
  * @param array|string $object_type The taxonomy object type.
  * @return void|false False if all of the terms in `$object_ids` are already cached.
  */
-function update_object_term_cache($object_ids, $object_type) {
-	if ( empty($object_ids) )
+function update_object_term_cache( $object_ids, $object_type ) {
+	if ( empty( $object_ids ) ) {
 		return;
+	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = explode(',', $object_ids);
+	if ( ! is_array( $object_ids ) ) {
+		$object_ids = explode( ',', $object_ids );
+	}
 
-	$object_ids = array_map('intval', $object_ids);
+	$object_ids = array_map( 'intval', $object_ids );
 
-	$taxonomies = get_object_taxonomies($object_type);
+	$taxonomies = get_object_taxonomies( $object_type );
 
 	$ids = array();
 	foreach ( (array) $object_ids as $id ) {
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( false === wp_cache_get($id, "{$taxonomy}_relationships") ) {
+			if ( false === wp_cache_get( $id, "{$taxonomy}_relationships" ) ) {
 				$ids[] = $id;
 				break;
 			}
 		}
 	}
 
-	if ( empty( $ids ) )
+	if ( empty( $ids ) ) {
 		return false;
+	}
 
-	$terms = wp_get_object_terms( $ids, $taxonomies, array(
-		'fields' => 'all_with_object_id',
-		'orderby' => 'name',
-		'update_term_meta_cache' => false,
-	) );
+	$terms = wp_get_object_terms(
+		$ids, $taxonomies, array(
+			'fields'                 => 'all_with_object_id',
+			'orderby'                => 'name',
+			'update_term_meta_cache' => false,
+		)
+	);
 
 	$object_terms = array();
 	foreach ( (array) $terms as $term ) {
@@ -3189,10 +3321,11 @@ function update_object_term_cache($object_ids, $object_type) {
 
 	foreach ( $ids as $id ) {
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( ! isset($object_terms[$id][$taxonomy]) ) {
-				if ( !isset($object_terms[$id]) )
-					$object_terms[$id] = array();
-				$object_terms[$id][$taxonomy] = array();
+			if ( ! isset( $object_terms[ $id ][ $taxonomy ] ) ) {
+				if ( ! isset( $object_terms[ $id ] ) ) {
+					$object_terms[ $id ] = array();
+				}
+				$object_terms[ $id ][ $taxonomy ] = array();
 			}
 		}
 	}
@@ -3238,19 +3371,28 @@ function update_term_cache( $terms, $taxonomy = '' ) {
  * @return array Empty if $taxonomy isn't hierarchical or returns children as Term IDs.
  */
 function _get_term_hierarchy( $taxonomy ) {
-	if ( !is_taxonomy_hierarchical($taxonomy) )
+	if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
 		return array();
-	$children = get_option("{$taxonomy}_children");
-
-	if ( is_array($children) )
-		return $children;
-	$children = array();
-	$terms = get_terms($taxonomy, array('get' => 'all', 'orderby' => 'id', 'fields' => 'id=>parent'));
-	foreach ( $terms as $term_id => $parent ) {
-		if ( $parent > 0 )
-			$children[$parent][] = $term_id;
 	}
-	update_option("{$taxonomy}_children", $children);
+	$children = get_option( "{$taxonomy}_children" );
+
+	if ( is_array( $children ) ) {
+		return $children;
+	}
+	$children = array();
+	$terms    = get_terms(
+		$taxonomy, array(
+			'get'     => 'all',
+			'orderby' => 'id',
+			'fields'  => 'id=>parent',
+		)
+	);
+	foreach ( $terms as $term_id => $parent ) {
+		if ( $parent > 0 ) {
+			$children[ $parent ][] = $term_id;
+		}
+	}
+	update_option( "{$taxonomy}_children", $children );
 
 	return $children;
 }
@@ -3276,14 +3418,16 @@ function _get_term_hierarchy( $taxonomy ) {
  */
 function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array() ) {
 	$empty_array = array();
-	if ( empty($terms) )
+	if ( empty( $terms ) ) {
 		return $empty_array;
+	}
 
-	$term_list = array();
-	$has_children = _get_term_hierarchy($taxonomy);
+	$term_list    = array();
+	$has_children = _get_term_hierarchy( $taxonomy );
 
-	if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
+	if ( ( 0 != $term_id ) && ! isset( $has_children[ $term_id ] ) ) {
 		return $empty_array;
+	}
 
 	// Include the term itself in the ancestors array, so we can properly detect when a loop has occurred.
 	if ( empty( $ancestors ) ) {
@@ -3292,10 +3436,11 @@ function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array()
 
 	foreach ( (array) $terms as $term ) {
 		$use_id = false;
-		if ( !is_object($term) ) {
-			$term = get_term($term, $taxonomy);
-			if ( is_wp_error( $term ) )
+		if ( ! is_object( $term ) ) {
+			$term = get_term( $term, $taxonomy );
+			if ( is_wp_error( $term ) ) {
 				return $term;
+			}
 			$use_id = true;
 		}
 
@@ -3305,18 +3450,21 @@ function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array()
 		}
 
 		if ( $term->parent == $term_id ) {
-			if ( $use_id )
+			if ( $use_id ) {
 				$term_list[] = $term->term_id;
-			else
+			} else {
 				$term_list[] = $term;
+			}
 
-			if ( !isset($has_children[$term->term_id]) )
+			if ( ! isset( $has_children[ $term->term_id ] ) ) {
 				continue;
+			}
 
 			$ancestors[ $term->term_id ] = 1;
 
-			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors) )
-				$term_list = array_merge($term_list, $children);
+			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors ) ) {
+				$term_list = array_merge( $term_list, $children );
+			}
 		}
 	}
 
@@ -3341,42 +3489,45 @@ function _pad_term_counts( &$terms, $taxonomy ) {
 	global $wpdb;
 
 	// This function only works for hierarchical taxonomies like post categories.
-	if ( !is_taxonomy_hierarchical( $taxonomy ) )
+	if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
 		return;
+	}
 
-	$term_hier = _get_term_hierarchy($taxonomy);
+	$term_hier = _get_term_hierarchy( $taxonomy );
 
-	if ( empty($term_hier) )
+	if ( empty( $term_hier ) ) {
 		return;
+	}
 
-	$term_items = array();
+	$term_items  = array();
 	$terms_by_id = array();
-	$term_ids = array();
+	$term_ids    = array();
 
 	foreach ( (array) $terms as $key => $term ) {
-		$terms_by_id[$term->term_id] = & $terms[$key];
-		$term_ids[$term->term_taxonomy_id] = $term->term_id;
+		$terms_by_id[ $term->term_id ]       = & $terms[ $key ];
+		$term_ids[ $term->term_taxonomy_id ] = $term->term_id;
 	}
 
 	// Get the object and term ids and stick them in a lookup table.
-	$tax_obj = get_taxonomy($taxonomy);
-	$object_types = esc_sql($tax_obj->object_type);
-	$results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
+	$tax_obj      = get_taxonomy( $taxonomy );
+	$object_types = esc_sql( $tax_obj->object_type );
+	$results      = $wpdb->get_results( "SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode( ',', array_keys( $term_ids ) ) . ") AND post_type IN ('" . implode( "', '", $object_types ) . "') AND post_status = 'publish'" );
 	foreach ( $results as $row ) {
-		$id = $term_ids[$row->term_taxonomy_id];
-		$term_items[$id][$row->object_id] = isset($term_items[$id][$row->object_id]) ? ++$term_items[$id][$row->object_id] : 1;
+		$id                                   = $term_ids[ $row->term_taxonomy_id ];
+		$term_items[ $id ][ $row->object_id ] = isset( $term_items[ $id ][ $row->object_id ] ) ? ++$term_items[ $id ][ $row->object_id ] : 1;
 	}
 
 	// Touch every ancestor's lookup row for each post in each term.
 	foreach ( $term_ids as $term_id ) {
-		$child = $term_id;
+		$child     = $term_id;
 		$ancestors = array();
-		while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
+		while ( ! empty( $terms_by_id[ $child ] ) && $parent = $terms_by_id[ $child ]->parent ) {
 			$ancestors[] = $child;
-			if ( !empty( $term_items[$term_id] ) )
-				foreach ( $term_items[$term_id] as $item_id => $touches ) {
-					$term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id]: 1;
+			if ( ! empty( $term_items[ $term_id ] ) ) {
+				foreach ( $term_items[ $term_id ] as $item_id => $touches ) {
+					$term_items[ $parent ][ $item_id ] = isset( $term_items[ $parent ][ $item_id ] ) ? ++$term_items[ $parent ][ $item_id ] : 1;
 				}
+			}
 			$child = $parent;
 
 			if ( in_array( $parent, $ancestors ) ) {
@@ -3386,9 +3537,11 @@ function _pad_term_counts( &$terms, $taxonomy ) {
 	}
 
 	// Transfer the touched cells.
-	foreach ( (array) $term_items as $id => $items )
-		if ( isset($terms_by_id[$id]) )
-			$terms_by_id[$id]->count = count($items);
+	foreach ( (array) $term_items as $id => $items ) {
+		if ( isset( $terms_by_id[ $id ] ) ) {
+			$terms_by_id[ $id ]->count = count( $items );
+		}
+	}
 }
 
 /**
@@ -3407,7 +3560,7 @@ function _prime_term_caches( $term_ids, $update_meta_cache = true ) {
 
 	$non_cached_ids = _get_non_cached_ids( $term_ids, 'terms' );
 	if ( ! empty( $non_cached_ids ) ) {
-		$fresh_terms = $wpdb->get_results( sprintf( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+		$fresh_terms = $wpdb->get_results( sprintf( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) );
 
 		update_term_cache( $fresh_terms, $update_meta_cache );
 
@@ -3440,8 +3593,9 @@ function _update_post_term_count( $terms, $taxonomy ) {
 
 	$object_types = (array) $taxonomy->object_type;
 
-	foreach ( $object_types as &$object_type )
+	foreach ( $object_types as &$object_type ) {
 		list( $object_type ) = explode( ':', $object_type );
+	}
 
 	$object_types = array_unique( $object_types );
 
@@ -3450,18 +3604,21 @@ function _update_post_term_count( $terms, $taxonomy ) {
 		$check_attachments = true;
 	}
 
-	if ( $object_types )
+	if ( $object_types ) {
 		$object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
+	}
 
 	foreach ( (array) $terms as $term ) {
 		$count = 0;
 
 		// Attachments can be 'inherit' status, we need to base count off the parent's status if so.
-		if ( $check_attachments )
+		if ( $check_attachments ) {
 			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
+		}
 
-		if ( $object_types )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		if ( $object_types ) {
+			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode( "', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		}
 
 		/** This action is documented in wp-includes/taxonomy.php */
 		do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
@@ -3527,11 +3684,11 @@ function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
 
 	if ( is_object( $term_id ) ) {
 		$shared_term = $term_id;
-		$term_id = intval( $shared_term->term_id );
+		$term_id     = intval( $shared_term->term_id );
 	}
 
 	if ( is_object( $term_taxonomy_id ) ) {
-		$term_taxonomy = $term_taxonomy_id;
+		$term_taxonomy    = $term_taxonomy_id;
 		$term_taxonomy_id = intval( $term_taxonomy->term_taxonomy_id );
 	}
 
@@ -3557,8 +3714,8 @@ function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
 	}
 
 	$new_term_data = array(
-		'name' => $shared_term->name,
-		'slug' => $shared_term->slug,
+		'name'       => $shared_term->name,
+		'slug'       => $shared_term->slug,
 		'term_group' => $shared_term->term_group,
 	);
 
@@ -3569,7 +3726,8 @@ function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
 	$new_term_id = (int) $wpdb->insert_id;
 
 	// Update the existing term_taxonomy to point to the newly created term.
-	$wpdb->update( $wpdb->term_taxonomy,
+	$wpdb->update(
+		$wpdb->term_taxonomy,
 		array( 'term_id' => $new_term_id ),
 		array( 'term_taxonomy_id' => $term_taxonomy_id )
 	);
@@ -3582,7 +3740,8 @@ function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
 	$children_tt_ids = $wpdb->get_col( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = %s", $term_id, $term_taxonomy->taxonomy ) );
 	if ( ! empty( $children_tt_ids ) ) {
 		foreach ( $children_tt_ids as $child_tt_id ) {
-			$wpdb->update( $wpdb->term_taxonomy,
+			$wpdb->update(
+				$wpdb->term_taxonomy,
 				array( 'parent' => $new_term_id ),
 				array( 'term_taxonomy_id' => $child_tt_id )
 			);
@@ -3603,7 +3762,7 @@ function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
 
 	// Clean the cache for term taxonomies formerly shared with the current term.
 	$shared_term_taxonomies = $wpdb->get_col( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
-	$taxonomies_to_clean = array_merge( $taxonomies_to_clean, $shared_term_taxonomies );
+	$taxonomies_to_clean    = array_merge( $taxonomies_to_clean, $shared_term_taxonomies );
 
 	foreach ( $taxonomies_to_clean as $taxonomy_to_clean ) {
 		clean_taxonomy_cache( $taxonomy_to_clean );
@@ -3697,17 +3856,17 @@ function _wp_batch_split_terms() {
 	// Rekey shared term array for faster lookups.
 	$_shared_terms = array();
 	foreach ( $shared_terms as $shared_term ) {
-		$term_id = intval( $shared_term->term_id );
+		$term_id                   = intval( $shared_term->term_id );
 		$_shared_terms[ $term_id ] = $shared_term;
 	}
 	$shared_terms = $_shared_terms;
 
 	// Get term taxonomy data for all shared terms.
 	$shared_term_ids = implode( ',', array_keys( $shared_terms ) );
-	$shared_tts = $wpdb->get_results( "SELECT * FROM {$wpdb->term_taxonomy} WHERE `term_id` IN ({$shared_term_ids})" );
+	$shared_tts      = $wpdb->get_results( "SELECT * FROM {$wpdb->term_taxonomy} WHERE `term_id` IN ({$shared_term_ids})" );
 
 	// Split term data recording is slow, so we do it just once, outside the loop.
-	$split_term_data = get_option( '_split_terms', array() );
+	$split_term_data    = get_option( '_split_terms', array() );
 	$skipped_first_term = $taxonomies = array();
 	foreach ( $shared_tts as $shared_tt ) {
 		$term_id = intval( $shared_tt->term_id );
@@ -3793,17 +3952,19 @@ function _wp_check_split_default_terms( $term_id, $new_term_id, $term_taxonomy_i
  */
 function _wp_check_split_terms_in_menus( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
 	global $wpdb;
-	$post_ids = $wpdb->get_col( $wpdb->prepare(
-		"SELECT m1.post_id
+	$post_ids = $wpdb->get_col(
+		$wpdb->prepare(
+			"SELECT m1.post_id
 		FROM {$wpdb->postmeta} AS m1
 			INNER JOIN {$wpdb->postmeta} AS m2 ON ( m2.post_id = m1.post_id )
 			INNER JOIN {$wpdb->postmeta} AS m3 ON ( m3.post_id = m1.post_id )
 		WHERE ( m1.meta_key = '_menu_item_type' AND m1.meta_value = 'taxonomy' )
 			AND ( m2.meta_key = '_menu_item_object' AND m2.meta_value = %s )
 			AND ( m3.meta_key = '_menu_item_object_id' AND m3.meta_value = %d )",
-		$taxonomy,
-		$term_id
-	) );
+			$taxonomy,
+			$term_id
+		)
+	);
 
 	if ( $post_ids ) {
 		foreach ( $post_ids as $post_id ) {
@@ -3917,7 +4078,7 @@ function wp_term_is_shared( $term_id ) {
 function get_term_link( $term, $taxonomy = '' ) {
 	global $wp_rewrite;
 
-	if ( !is_object($term) ) {
+	if ( ! is_object( $term ) ) {
 		if ( is_int( $term ) ) {
 			$term = get_term( $term, $taxonomy );
 		} else {
@@ -3925,15 +4086,17 @@ function get_term_link( $term, $taxonomy = '' ) {
 		}
 	}
 
-	if ( !is_object($term) )
+	if ( ! is_object( $term ) ) {
 		$term = new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
+	}
 
-	if ( is_wp_error( $term ) )
+	if ( is_wp_error( $term ) ) {
 		return $term;
+	}
 
 	$taxonomy = $term->taxonomy;
 
-	$termlink = $wp_rewrite->get_extra_permastruct($taxonomy);
+	$termlink = $wp_rewrite->get_extra_permastruct( $taxonomy );
 
 	/**
 	 * Filters the permalink structure for a terms before token replacement occurs.
@@ -3946,31 +4109,32 @@ function get_term_link( $term, $taxonomy = '' ) {
 	$termlink = apply_filters( 'pre_term_link', $termlink, $term );
 
 	$slug = $term->slug;
-	$t = get_taxonomy($taxonomy);
+	$t    = get_taxonomy( $taxonomy );
 
-	if ( empty($termlink) ) {
-		if ( 'category' == $taxonomy )
+	if ( empty( $termlink ) ) {
+		if ( 'category' == $taxonomy ) {
 			$termlink = '?cat=' . $term->term_id;
-		elseif ( $t->query_var )
+		} elseif ( $t->query_var ) {
 			$termlink = "?$t->query_var=$slug";
-		else
+		} else {
 			$termlink = "?taxonomy=$taxonomy&term=$slug";
-		$termlink = home_url($termlink);
+		}
+		$termlink = home_url( $termlink );
 	} else {
 		if ( $t->rewrite['hierarchical'] ) {
 			$hierarchical_slugs = array();
-			$ancestors = get_ancestors( $term->term_id, $taxonomy, 'taxonomy' );
-			foreach ( (array)$ancestors as $ancestor ) {
-				$ancestor_term = get_term($ancestor, $taxonomy);
+			$ancestors          = get_ancestors( $term->term_id, $taxonomy, 'taxonomy' );
+			foreach ( (array) $ancestors as $ancestor ) {
+				$ancestor_term        = get_term( $ancestor, $taxonomy );
 				$hierarchical_slugs[] = $ancestor_term->slug;
 			}
-			$hierarchical_slugs = array_reverse($hierarchical_slugs);
+			$hierarchical_slugs   = array_reverse( $hierarchical_slugs );
 			$hierarchical_slugs[] = $slug;
-			$termlink = str_replace("%$taxonomy%", implode('/', $hierarchical_slugs), $termlink);
+			$termlink             = str_replace( "%$taxonomy%", implode( '/', $hierarchical_slugs ), $termlink );
 		} else {
-			$termlink = str_replace("%$taxonomy%", $slug, $termlink);
+			$termlink = str_replace( "%$taxonomy%", $slug, $termlink );
 		}
-		$termlink = home_url( user_trailingslashit($termlink, 'category') );
+		$termlink = home_url( user_trailingslashit( $termlink, 'category' ) );
 	}
 	// Back Compat filters.
 	if ( 'post_tag' == $taxonomy ) {
@@ -4032,10 +4196,10 @@ function get_term_link( $term, $taxonomy = '' ) {
  */
 function the_taxonomies( $args = array() ) {
 	$defaults = array(
-		'post' => 0,
+		'post'   => 0,
 		'before' => '',
-		'sep' => ' ',
-		'after' => '',
+		'sep'    => ' ',
+		'after'  => '',
 	);
 
 	$r = wp_parse_args( $args, $defaults );
@@ -4065,11 +4229,13 @@ function the_taxonomies( $args = array() ) {
 function get_the_taxonomies( $post = 0, $args = array() ) {
 	$post = get_post( $post );
 
-	$args = wp_parse_args( $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>',
-	) );
+	$args = wp_parse_args(
+		$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>',
+		)
+	);
 
 	$taxonomies = array();
 
@@ -4102,7 +4268,7 @@ function get_the_taxonomies( $post = 0, $args = array() ) {
 			$links[] = wp_sprintf( $t['term_template'], esc_attr( get_term_link( $term ) ), $term->name );
 		}
 		if ( $links ) {
-			$taxonomies[$taxonomy] = wp_sprintf( $t['template'], $t['label'], $links, $terms );
+			$taxonomies[ $taxonomy ] = wp_sprintf( $t['template'], $t['label'], $links, $terms );
 		}
 	}
 	return $taxonomies;
@@ -4119,7 +4285,7 @@ function get_the_taxonomies( $post = 0, $args = array() ) {
 function get_post_taxonomies( $post = 0 ) {
 	$post = get_post( $post );
 
-	return get_object_taxonomies($post);
+	return get_object_taxonomies( $post );
 }
 
 /**
@@ -4137,8 +4303,9 @@ function get_post_taxonomies( $post = 0 ) {
  * @return bool|WP_Error WP_Error on input error.
  */
 function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
-	if ( !$object_id = (int) $object_id )
+	if ( ! $object_id = (int) $object_id ) {
 		return new WP_Error( 'invalid_object', __( 'Invalid object ID.' ) );
+	}
 
 	$object_terms = get_object_term_cache( $object_id, $taxonomy );
 	if ( false === $object_terms ) {
@@ -4150,19 +4317,23 @@ function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
 		wp_cache_set( $object_id, wp_list_pluck( $object_terms, 'term_id' ), "{$taxonomy}_relationships" );
 	}
 
-	if ( is_wp_error( $object_terms ) )
+	if ( is_wp_error( $object_terms ) ) {
 		return $object_terms;
-	if ( empty( $object_terms ) )
+	}
+	if ( empty( $object_terms ) ) {
 		return false;
-	if ( empty( $terms ) )
-		return ( !empty( $object_terms ) );
+	}
+	if ( empty( $terms ) ) {
+		return ( ! empty( $object_terms ) );
+	}
 
 	$terms = (array) $terms;
 
-	if ( $ints = array_filter( $terms, 'is_int' ) )
+	if ( $ints = array_filter( $terms, 'is_int' ) ) {
 		$strs = array_diff( $terms, $ints );
-	else
+	} else {
 		$strs =& $terms;
+	}
 
 	foreach ( $object_terms as $object_term ) {
 		// If term is an int, check against term_ids only.
@@ -4177,8 +4348,12 @@ function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
 				return true;
 			}
 
-			if ( in_array( $object_term->name, $strs ) ) return true;
-			if ( in_array( $object_term->slug, $strs ) ) return true;
+			if ( in_array( $object_term->name, $strs ) ) {
+				return true;
+			}
+			if ( in_array( $object_term->slug, $strs ) ) {
+				return true;
+			}
 		}
 	}
 
@@ -4235,13 +4410,13 @@ function get_ancestors( $object_id = 0, $object_type = '', $resource_type = '' )
 	}
 
 	if ( 'taxonomy' === $resource_type ) {
-		$term = get_term($object_id, $object_type);
-		while ( ! is_wp_error($term) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
+		$term = get_term( $object_id, $object_type );
+		while ( ! is_wp_error( $term ) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
 			$ancestors[] = (int) $term->parent;
-			$term = get_term($term->parent, $object_type);
+			$term        = get_term( $term->parent, $object_type );
 		}
 	} elseif ( 'post_type' === $resource_type ) {
-		$ancestors = get_post_ancestors($object_id);
+		$ancestors = get_post_ancestors( $object_id );
 	}
 
 	/**
@@ -4291,24 +4466,29 @@ function wp_get_term_taxonomy_parent_id( $term_id, $taxonomy ) {
  */
 function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
 	// Nothing fancy here - bail
-	if ( !$parent )
+	if ( ! $parent ) {
 		return 0;
+	}
 
 	// Can't be its own parent.
-	if ( $parent == $term_id )
+	if ( $parent == $term_id ) {
 		return 0;
+	}
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) )
+	if ( ! $loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) ) {
 		return $parent; // No loop
+	}
 
 	// Setting $parent to the given value causes a loop.
-	if ( isset( $loop[$term_id] ) )
+	if ( isset( $loop[ $term_id ] ) ) {
 		return 0;
+	}
 
 	// There's a loop, but it doesn't contain $term_id. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
+	foreach ( array_keys( $loop ) as $loop_member ) {
 		wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+	}
 
 	return $parent;
 }
diff --git a/wp-includes/template-loader.php b/wp-includes/template-loader.php
index 1ee7c222c1..0d2bafae44 100644
--- a/wp-includes/template-loader.php
+++ b/wp-includes/template-loader.php
@@ -1,15 +1,17 @@
 <?php
 /**
  * Loads the correct template based on the visitor's url
+ *
  * @package WordPress
  */
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
+if ( defined( 'WP_USE_THEMES' ) && WP_USE_THEMES ) {
 	/**
 	 * Fires before determining which template to load.
 	 *
 	 * @since 1.5.0
 	 */
 	do_action( 'template_redirect' );
+}
 
 /**
  * Filters whether to allow 'HEAD' requests to generate content.
@@ -21,8 +23,9 @@ if ( defined('WP_USE_THEMES') && WP_USE_THEMES )
  *
  * @param bool $exit Whether to exit without generating any content for 'HEAD' requests. Default true.
  */
-if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) )
+if ( 'HEAD' === $_SERVER['REQUEST_METHOD'] && apply_filters( 'exit_on_http_head', true ) ) {
 	exit();
+}
 
 // Process feeds and trackbacks even if not using themes.
 if ( is_robots() ) :
@@ -41,25 +44,25 @@ elseif ( is_trackback() ) :
 	return;
 endif;
 
-if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
+if ( defined( 'WP_USE_THEMES' ) && WP_USE_THEMES ) :
 	$template = false;
-	if     ( is_embed()          && $template = get_embed_template()          ) :
-	elseif ( is_404()            && $template = get_404_template()            ) :
-	elseif ( is_search()         && $template = get_search_template()         ) :
-	elseif ( is_front_page()     && $template = get_front_page_template()     ) :
-	elseif ( is_home()           && $template = get_home_template()           ) :
+	if ( is_embed() && $template = get_embed_template() ) :
+	elseif ( is_404() && $template = get_404_template() ) :
+	elseif ( is_search() && $template = get_search_template() ) :
+	elseif ( is_front_page() && $template = get_front_page_template() ) :
+	elseif ( is_home() && $template = get_home_template() ) :
 	elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
-	elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
-	elseif ( is_attachment()     && $template = get_attachment_template()     ) :
-		remove_filter('the_content', 'prepend_attachment');
-	elseif ( is_single()         && $template = get_single_template()         ) :
-	elseif ( is_page()           && $template = get_page_template()           ) :
-	elseif ( is_singular()       && $template = get_singular_template()       ) :
-	elseif ( is_category()       && $template = get_category_template()       ) :
-	elseif ( is_tag()            && $template = get_tag_template()            ) :
-	elseif ( is_author()         && $template = get_author_template()         ) :
-	elseif ( is_date()           && $template = get_date_template()           ) :
-	elseif ( is_archive()        && $template = get_archive_template()        ) :
+	elseif ( is_tax() && $template = get_taxonomy_template() ) :
+	elseif ( is_attachment() && $template = get_attachment_template() ) :
+		remove_filter( 'the_content', 'prepend_attachment' );
+	elseif ( is_single() && $template = get_single_template() ) :
+	elseif ( is_page() && $template = get_page_template() ) :
+	elseif ( is_singular() && $template = get_singular_template() ) :
+	elseif ( is_category() && $template = get_category_template() ) :
+	elseif ( is_tag() && $template = get_tag_template() ) :
+	elseif ( is_author() && $template = get_author_template() ) :
+	elseif ( is_date() && $template = get_date_template() ) :
+	elseif ( is_archive() && $template = get_archive_template() ) :
 	else :
 		$template = get_index_template();
 	endif;
diff --git a/wp-includes/template.php b/wp-includes/template.php
index 4205ce9fcd..b0b49fe06a 100644
--- a/wp-includes/template.php
+++ b/wp-includes/template.php
@@ -23,8 +23,9 @@
 function get_query_template( $type, $templates = array() ) {
 	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
 
-	if ( empty( $templates ) )
-		$templates = array("{$type}.php");
+	if ( empty( $templates ) ) {
+		$templates = array( "{$type}.php" );
+	}
 
 	/**
 	 * Filters the list of template filenames that are searched for when retrieving a template to use.
@@ -75,7 +76,7 @@ function get_query_template( $type, $templates = array() ) {
  * @return string Full path to index template file.
  */
 function get_index_template() {
-	return get_query_template('index');
+	return get_query_template( 'index' );
 }
 
 /**
@@ -91,7 +92,7 @@ function get_index_template() {
  * @return string Full path to 404 template file.
  */
 function get_404_template() {
-	return get_query_template('404');
+	return get_query_template( '404' );
 }
 
 /**
@@ -112,7 +113,7 @@ function get_archive_template() {
 	$templates = array();
 
 	if ( count( $post_types ) == 1 ) {
-		$post_type = reset( $post_types );
+		$post_type   = reset( $post_types );
 		$templates[] = "archive-{$post_type}.php";
 	}
 	$templates[] = 'archive.php';
@@ -134,8 +135,9 @@ function get_archive_template() {
  */
 function get_post_type_archive_template() {
 	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
+	if ( is_array( $post_type ) ) {
 		$post_type = reset( $post_type );
+	}
 
 	$obj = get_post_type_object( $post_type );
 	if ( ! ( $obj instanceof WP_Post_Type ) || ! $obj->has_archive ) {
@@ -335,7 +337,7 @@ function get_taxonomy_template() {
  * @return string Full path to date template file.
  */
 function get_date_template() {
-	return get_query_template('date');
+	return get_query_template( 'date' );
 }
 
 /**
@@ -369,7 +371,7 @@ function get_home_template() {
  * @return string Full path to front page template file.
  */
 function get_front_page_template() {
-	$templates = array('front-page.php');
+	$templates = array( 'front-page.php' );
 
 	return get_query_template( 'front_page', $templates );
 }
@@ -403,20 +405,22 @@ function get_front_page_template() {
  * @return string Full path to page template file.
  */
 function get_page_template() {
-	$id = get_queried_object_id();
+	$id       = get_queried_object_id();
 	$template = get_page_template_slug();
-	$pagename = get_query_var('pagename');
+	$pagename = get_query_var( 'pagename' );
 
 	if ( ! $pagename && $id ) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 		$post = get_queried_object();
-		if ( $post )
+		if ( $post ) {
 			$pagename = $post->post_name;
+		}
 	}
 
 	$templates = array();
-	if ( $template && 0 === validate_file( $template ) )
+	if ( $template && 0 === validate_file( $template ) ) {
 		$templates[] = $template;
+	}
 	if ( $pagename ) {
 		$pagename_decoded = urldecode( $pagename );
 		if ( $pagename_decoded !== $pagename ) {
@@ -424,8 +428,9 @@ function get_page_template() {
 		}
 		$templates[] = "page-{$pagename}.php";
 	}
-	if ( $id )
+	if ( $id ) {
 		$templates[] = "page-{$id}.php";
+	}
 	$templates[] = 'page.php';
 
 	return get_query_template( 'page', $templates );
@@ -444,7 +449,7 @@ function get_page_template() {
  * @return string Full path to search template file.
  */
 function get_search_template() {
-	return get_query_template('search');
+	return get_query_template( 'search' );
 }
 
 /**
@@ -498,7 +503,7 @@ function get_single_template() {
 		$templates[] = "single-{$object->post_type}.php";
 	}
 
-	$templates[] = "single.php";
+	$templates[] = 'single.php';
 
 	return get_query_template( 'single', $templates );
 }
@@ -540,7 +545,7 @@ function get_embed_template() {
 		$templates[] = "embed-{$object->post_type}.php";
 	}
 
-	$templates[] = "embed.php";
+	$templates[] = 'embed.php';
 
 	return get_query_template( 'embed', $templates );
 }
@@ -626,15 +631,16 @@ function get_attachment_template() {
  * @param bool         $require_once   Whether to require_once or require. Default true. Has no effect if $load is false.
  * @return string The template filename if one is located.
  */
-function locate_template($template_names, $load = false, $require_once = true ) {
+function locate_template( $template_names, $load = false, $require_once = true ) {
 	$located = '';
 	foreach ( (array) $template_names as $template_name ) {
-		if ( !$template_name )
+		if ( ! $template_name ) {
 			continue;
-		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
+		}
+		if ( file_exists( STYLESHEETPATH . '/' . $template_name ) ) {
 			$located = STYLESHEETPATH . '/' . $template_name;
 			break;
-		} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
+		} elseif ( file_exists( TEMPLATEPATH . '/' . $template_name ) ) {
 			$located = TEMPLATEPATH . '/' . $template_name;
 			break;
 		} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
@@ -643,8 +649,9 @@ function locate_template($template_names, $load = false, $require_once = true )
 		}
 	}
 
-	if ( $load && '' != $located )
+	if ( $load && '' != $located ) {
 		load_template( $located, $require_once );
+	}
 
 	return $located;
 }
diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php
index cb6d64fd9b..0f2e901e66 100644
--- a/wp-includes/theme-compat/comments.php
+++ b/wp-includes/theme-compat/comments.php
@@ -5,7 +5,6 @@
  * @deprecated 3.0.0
  *
  * This file is here for backward compatibility with old themes and will be removed in a future version
- *
  */
 _deprecated_file(
 	/* translators: %s: template name */
@@ -17,14 +16,15 @@ _deprecated_file(
 );
 
 // Do not delete these lines
-	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
-		die ('Please do not load this page directly. Thanks!');
+if ( ! empty( $_SERVER['SCRIPT_FILENAME'] ) && 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) ) {
+	die( 'Please do not load this page directly. Thanks!' );
+}
 
-	if ( post_password_required() ) { ?>
-		<p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
+if ( post_password_required() ) { ?>
+		<p class="nocomments"><?php _e( 'This post is password protected. Enter the password to view comments.' ); ?></p>
 	<?php
-		return;
-	}
+	return;
+}
 ?>
 
 <!-- You can start editing here. -->
@@ -32,29 +32,31 @@ _deprecated_file(
 <?php if ( have_comments() ) : ?>
 	<h3 id="comments">
 		<?php
-			if ( 1 == get_comments_number() ) {
-				/* translators: %s: post title */
-				printf( __( 'One response to %s' ),  '&#8220;' . get_the_title() . '&#8221;' );
-			} else {
-				/* 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;' );
-			}
+		if ( 1 == get_comments_number() ) {
+			/* translators: %s: post title */
+			printf( __( 'One response to %s' ), '&#8220;' . get_the_title() . '&#8221;' );
+		} else {
+			/* 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;'
+			);
+		}
 		?>
 	</h3>
 
 	<div class="navigation">
-		<div class="alignleft"><?php previous_comments_link() ?></div>
-		<div class="alignright"><?php next_comments_link() ?></div>
+		<div class="alignleft"><?php previous_comments_link(); ?></div>
+		<div class="alignright"><?php next_comments_link(); ?></div>
 	</div>
 
 	<ol class="commentlist">
-	<?php wp_list_comments();?>
+	<?php wp_list_comments(); ?>
 	</ol>
 
 	<div class="navigation">
-		<div class="alignleft"><?php previous_comments_link() ?></div>
-		<div class="alignright"><?php next_comments_link() ?></div>
+		<div class="alignleft"><?php previous_comments_link(); ?></div>
+		<div class="alignright"><?php next_comments_link(); ?></div>
 	</div>
 <?php else : // this is displayed if there are no comments so far ?>
 
@@ -63,7 +65,7 @@ _deprecated_file(
 
 	<?php else : // comments are closed ?>
 		<!-- If comments are closed. -->
-		<p class="nocomments"><?php _e('Comments are closed.'); ?></p>
+		<p class="nocomments"><?php _e( 'Comments are closed.' ); ?></p>
 
 	<?php endif; ?>
 <?php endif; ?>
diff --git a/wp-includes/theme-compat/embed-404.php b/wp-includes/theme-compat/embed-404.php
index ee766750c1..424b5a6a58 100644
--- a/wp-includes/theme-compat/embed-404.php
+++ b/wp-includes/theme-compat/embed-404.php
@@ -31,6 +31,6 @@
 	?>
 
 	<div class="wp-embed-footer">
-		<?php the_embed_site_title() ?>
+		<?php the_embed_site_title(); ?>
 	</div>
 </div>
diff --git a/wp-includes/theme-compat/embed-content.php b/wp-includes/theme-compat/embed-content.php
index 11bef95df8..bdb38339ad 100644
--- a/wp-includes/theme-compat/embed-content.php
+++ b/wp-includes/theme-compat/embed-content.php
@@ -75,7 +75,8 @@
 			$shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
 		}
 
-		if ( $thumbnail_id && 'rectangular' === $shape ) : ?>
+		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 ); ?>
@@ -109,7 +110,7 @@
 		?>
 
 		<div class="wp-embed-footer">
-			<?php the_embed_site_title() ?>
+			<?php the_embed_site_title(); ?>
 
 			<div class="wp-embed-meta">
 				<?php
@@ -118,7 +119,7 @@
 				 *
 				 * @since 4.4.0
 				 */
-				do_action( 'embed_content_meta');
+				do_action( 'embed_content_meta' );
 				?>
 			</div>
 		</div>
diff --git a/wp-includes/theme-compat/embed.php b/wp-includes/theme-compat/embed.php
index e1194ccbab..eb3c3dfca1 100644
--- a/wp-includes/theme-compat/embed.php
+++ b/wp-includes/theme-compat/embed.php
@@ -13,7 +13,8 @@
 get_header( 'embed' );
 
 if ( have_posts() ) :
-	while ( have_posts() ) : the_post();
+	while ( have_posts() ) :
+		the_post();
 		get_template_part( 'embed', 'content' );
 	endwhile;
 else :
diff --git a/wp-includes/theme-compat/footer.php b/wp-includes/theme-compat/footer.php
index 6d9655236b..68b4d6747b 100644
--- a/wp-includes/theme-compat/footer.php
+++ b/wp-includes/theme-compat/footer.php
@@ -24,7 +24,7 @@ _deprecated_file(
 		printf(
 			/* translators: 1: blog name, 2: WordPress */
 			__( '%1$s is proudly powered by %2$s' ),
-			get_bloginfo('name'),
+			get_bloginfo( 'name' ),
 			'<a href="https://wordpress.org/">WordPress</a>'
 		);
 		?>
diff --git a/wp-includes/theme-compat/header.php b/wp-includes/theme-compat/header.php
index 831144fe4c..cd92145e29 100644
--- a/wp-includes/theme-compat/header.php
+++ b/wp-includes/theme-compat/header.php
@@ -19,29 +19,32 @@ _deprecated_file(
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php bloginfo( 'charset' ); ?>" />
 
 <title><?php echo wp_get_document_title(); ?></title>
 
-<link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
-<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
+<link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ); ?>" type="text/css" media="screen" />
+<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
 
 <?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() ) {
+if ( empty( $withcomments ) && ! is_single() ) {
 ?>
-	#page { background: url("<?php bloginfo('stylesheet_directory'); ?>/images/kubrickbg-<?php bloginfo('text_direction'); ?>.jpg") repeat-y top; border: none; }
+	#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; }
+	#page { background: url("<?php bloginfo( 'stylesheet_directory' ); ?>/images/kubrickbgwide.jpg") repeat-y top; border: none; }
 <?php } ?>
 
 </style>
 <?php } ?>
 
-<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
+<?php
+if ( is_singular() ) {
+	wp_enqueue_script( 'comment-reply' );}
+?>
 
 <?php wp_head(); ?>
 </head>
@@ -50,8 +53,8 @@ if ( empty($withcomments) && !is_single() ) {
 
 <div id="header" role="banner">
 	<div id="headerimg">
-		<h1><a href="<?php echo home_url(); ?>/"><?php bloginfo('name'); ?></a></h1>
-		<div class="description"><?php bloginfo('description'); ?></div>
+		<h1><a href="<?php echo home_url(); ?>/"><?php bloginfo( 'name' ); ?></a></h1>
+		<div class="description"><?php bloginfo( 'description' ); ?></div>
 	</div>
 </div>
 <hr />
diff --git a/wp-includes/theme-compat/sidebar.php b/wp-includes/theme-compat/sidebar.php
index acf6ae794b..45ef03d1b6 100644
--- a/wp-includes/theme-compat/sidebar.php
+++ b/wp-includes/theme-compat/sidebar.php
@@ -17,68 +17,96 @@ _deprecated_file(
 ?>
 	<div id="sidebar" role="complementary">
 		<ul>
-			<?php 	/* Widgetized sidebar, if you have the plugin installed. */
-					if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar() ) : ?>
+			<?php
+			  /* Widgetized sidebar, if you have the plugin installed. */
+			if ( ! function_exists( 'dynamic_sidebar' ) || ! dynamic_sidebar() ) :
+					?>
 			<li>
 				<?php get_search_form(); ?>
 			</li>
 
 			<!-- Author information is disabled per default. Uncomment and fill in your details if you want to use it.
-			<li><h2><?php _e('Author'); ?></h2>
+			<li><h2><?php _e( 'Author' ); ?></h2>
 			<p>A little something about you, the author. Nothing lengthy, just an overview.</p>
 			</li>
 			-->
 
-			<?php if ( is_404() || is_category() || is_day() || is_month() ||
-						is_year() || is_search() || is_paged() ) :
-			?> <li>
+			<?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 elseif ( is_category() ) : /* If this is a category archive */ ?>
-				<p><?php /* translators: %s: category name */
-					printf( __( 'You are currently browsing the archives for the %s category.' ),
+				<p>
+				<?php
+				/* translators: %s: category name */
+					printf(
+						__( 'You are currently browsing the archives for the %s category.' ),
 						single_cat_title( '', false )
 					);
-				?></p>
+				?>
+				</p>
 
 			<?php elseif ( is_day() ) : /* If this is a daily archive */ ?>
-				<p><?php /* translators: 1: site link, 2: archive date */
-					printf( __( 'You are currently browsing the %1$s blog archives for the day %2$s.' ),
+				<p>
+				<?php
+				/* translators: 1: site link, 2: archive date */
+					printf(
+						__( 'You are currently browsing the %1$s blog archives for the day %2$s.' ),
 						sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
 						get_the_time( __( 'l, F jS, Y' ) )
 					);
-				?></p>
+				?>
+				</p>
 
 			<?php elseif ( is_month() ) : /* If this is a monthly archive */ ?>
-				<p><?php /* translators: 1: site link, 2: archive month */
-					printf( __( 'You are currently browsing the %1$s blog archives for %2$s.' ),
+				<p>
+				<?php
+				/* translators: 1: site link, 2: archive month */
+					printf(
+						__( 'You are currently browsing the %1$s blog archives for %2$s.' ),
 						sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
 						get_the_time( __( 'F, Y' ) )
 					);
-				?></p>
+				?>
+				</p>
 
 			<?php elseif ( is_year() ) : /* If this is a yearly archive */ ?>
-				<p><?php /* translators: 1: site link, 2: archive year */
-					printf( __( 'You are currently browsing the %1$s blog archives for the year %2$s.' ),
+				<p>
+				<?php
+				/* translators: 1: site link, 2: archive year */
+					printf(
+						__( 'You are currently browsing the %1$s blog archives for the year %2$s.' ),
 						sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
 						get_the_time( 'Y' )
 					);
-				?></p>
+				?>
+				</p>
 
 			<?php elseif ( is_search() ) : /* If this is a search result */ ?>
-				<p><?php /* translators: 1: site link, 2: search query */
-					printf( __( 'You have searched the %1$s blog archives for <strong>&#8216;%2$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.' ),
+				<p>
+				<?php
+				/* translators: 1: site link, 2: search query */
+					printf(
+						__( 'You have searched the %1$s blog archives for <strong>&#8216;%2$s&#8217;</strong>. If you are unable to find anything in these search results, you can try one of these links.' ),
 						sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
 						esc_html( get_search_query() )
 					);
-				?></p>
+				?>
+				</p>
 
 			<?php elseif ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) : /* If this set is paginated */ ?>
-				<p><?php /* translators: %s: site link */
-					printf( __( 'You are currently browsing the %s blog archives.' ),
+				<p>
+				<?php
+				/* translators: %s: site link */
+					printf(
+						__( 'You are currently browsing the %s blog archives.' ),
 						sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) )
 					);
-				?></p>
+				?>
+				</p>
 
 			<?php endif; ?>
 
@@ -86,21 +114,28 @@ _deprecated_file(
 		<?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>
+			<li><h2><?php _e( 'Archives' ); ?></h2>
 				<ul>
-				<?php wp_get_archives(array('type' => 'monthly')); ?>
+				<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
 				</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(); ?>
 
-				<li><h2><?php _e('Meta'); ?></h2>
+				<li><h2><?php _e( 'Meta' ); ?></h2>
 				<ul>
 					<?php wp_register(); ?>
 					<li><?php wp_loginout(); ?></li>
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 4e5f63bb8e..406fa4a310 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -30,8 +30,12 @@
 function wp_get_themes( $args = array() ) {
 	global $wp_theme_directories;
 
-	$defaults = array( 'errors' => false, 'allowed' => null, 'blog_id' => 0 );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array(
+		'errors'  => false,
+		'allowed' => null,
+		'blog_id' => 0,
+	);
+	$args     = wp_parse_args( $args, $defaults );
 
 	$theme_directories = search_theme_directories();
 
@@ -41,41 +45,46 @@ function wp_get_themes( $args = array() ) {
 		$current_theme = get_stylesheet();
 		if ( isset( $theme_directories[ $current_theme ] ) ) {
 			$root_of_current_theme = get_raw_theme_root( $current_theme );
-			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) )
+			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) ) {
 				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
+			}
 			$theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
 		}
 	}
 
-	if ( empty( $theme_directories ) )
+	if ( empty( $theme_directories ) ) {
 		return array();
+	}
 
 	if ( is_multisite() && null !== $args['allowed'] ) {
 		$allowed = $args['allowed'];
-		if ( 'network' === $allowed )
+		if ( 'network' === $allowed ) {
 			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
-		elseif ( 'site' === $allowed )
+		} elseif ( 'site' === $allowed ) {
 			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
-		elseif ( $allowed )
+		} elseif ( $allowed ) {
 			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
-		else
+		} else {
 			$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		}
 	}
 
-	$themes = array();
+	$themes         = array();
 	static $_themes = array();
 
 	foreach ( $theme_directories as $theme => $theme_root ) {
-		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
+		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) ) {
 			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
-		else
+		} else {
 			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+		}
 	}
 
 	if ( null !== $args['errors'] ) {
 		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] )
+			if ( $wp_theme->errors() != $args['errors'] ) {
 				unset( $themes[ $theme ] );
+			}
 		}
 	}
 
@@ -91,21 +100,23 @@ function wp_get_themes( $args = array() ) {
  *
  * @param string $stylesheet Directory name for the theme. Optional. Defaults to current theme.
  * @param string $theme_root Absolute path of the theme root to look in. Optional. If not specified, get_raw_theme_root()
- * 	                         is used to calculate the theme root for the $stylesheet provided (or current theme).
+ *                           is used to calculate the theme root for the $stylesheet provided (or current theme).
  * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence.
  */
 function wp_get_theme( $stylesheet = null, $theme_root = null ) {
 	global $wp_theme_directories;
 
-	if ( empty( $stylesheet ) )
+	if ( empty( $stylesheet ) ) {
 		$stylesheet = get_stylesheet();
+	}
 
 	if ( empty( $theme_root ) ) {
 		$theme_root = get_raw_theme_root( $stylesheet );
-		if ( false === $theme_root )
+		if ( false === $theme_root ) {
 			$theme_root = WP_CONTENT_DIR . '/themes';
-		elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
+		} elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
 			$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	}
 
 	return new WP_Theme( $stylesheet, $theme_root );
@@ -118,11 +129,13 @@ function wp_get_theme( $stylesheet = null, $theme_root = null ) {
  * @param bool $clear_update_cache Whether to clear the Theme updates cache
  */
 function wp_clean_themes_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
+	if ( $clear_update_cache ) {
 		delete_site_transient( 'update_themes' );
+	}
 	search_theme_directories( true );
-	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
+	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme ) {
 		$theme->cache_delete();
+	}
 }
 
 /**
@@ -131,7 +144,7 @@ function wp_clean_themes_cache( $clear_update_cache = true ) {
  * @since 3.0.0
  *
  * @return bool true if a child theme is in use, false otherwise.
- **/
+ */
 function is_child_theme() {
 	return ( TEMPLATEPATH !== STYLESHEETPATH );
 }
@@ -168,8 +181,8 @@ function get_stylesheet() {
  * @return string Path to current theme directory.
  */
 function get_stylesheet_directory() {
-	$stylesheet = get_stylesheet();
-	$theme_root = get_theme_root( $stylesheet );
+	$stylesheet     = get_stylesheet();
+	$theme_root     = get_theme_root( $stylesheet );
 	$stylesheet_dir = "$theme_root/$stylesheet";
 
 	/**
@@ -192,8 +205,8 @@ function get_stylesheet_directory() {
  * @return string
  */
 function get_stylesheet_directory_uri() {
-	$stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
-	$theme_root_uri = get_theme_root_uri( $stylesheet );
+	$stylesheet         = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
+	$theme_root_uri     = get_theme_root_uri( $stylesheet );
 	$stylesheet_dir_uri = "$theme_root_uri/$stylesheet";
 
 	/**
@@ -220,7 +233,7 @@ function get_stylesheet_directory_uri() {
  */
 function get_stylesheet_uri() {
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
-	$stylesheet_uri = $stylesheet_dir_uri . '/style.css';
+	$stylesheet_uri     = $stylesheet_dir_uri . '/style.css';
 	/**
 	 * Filters the URI of the current theme stylesheet.
 	 *
@@ -256,14 +269,15 @@ function get_stylesheet_uri() {
 function get_locale_stylesheet_uri() {
 	global $wp_locale;
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
-	$dir = get_stylesheet_directory();
-	$locale = get_locale();
-	if ( file_exists("$dir/$locale.css") )
+	$dir                = get_stylesheet_directory();
+	$locale             = get_locale();
+	if ( file_exists( "$dir/$locale.css" ) ) {
 		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
-	elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
+	} elseif ( ! empty( $wp_locale->text_direction ) && file_exists( "$dir/{$wp_locale->text_direction}.css" ) ) {
 		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
-	else
+	} else {
 		$stylesheet_uri = '';
+	}
 	/**
 	 * Filters the localized stylesheet URI.
 	 *
@@ -301,8 +315,8 @@ function get_template() {
  * @return string Template directory path.
  */
 function get_template_directory() {
-	$template = get_template();
-	$theme_root = get_theme_root( $template );
+	$template     = get_template();
+	$theme_root   = get_theme_root( $template );
 	$template_dir = "$theme_root/$template";
 
 	/**
@@ -325,8 +339,8 @@ function get_template_directory() {
  * @return string Template directory URI.
  */
 function get_template_directory_uri() {
-	$template = str_replace( '%2F', '/', rawurlencode( get_template() ) );
-	$theme_root_uri = get_theme_root_uri( $template );
+	$template         = str_replace( '%2F', '/', rawurlencode( get_template() ) );
+	$theme_root_uri   = get_theme_root_uri( $template );
 	$template_dir_uri = "$theme_root_uri/$template";
 
 	/**
@@ -353,8 +367,9 @@ function get_template_directory_uri() {
 function get_theme_roots() {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
+	if ( count( $wp_theme_directories ) <= 1 ) {
 		return '/themes';
+	}
 
 	$theme_roots = get_site_transient( 'theme_roots' );
 	if ( false === $theme_roots ) {
@@ -413,11 +428,13 @@ function search_theme_directories( $force = false ) {
 	global $wp_theme_directories;
 	static $found_themes = null;
 
-	if ( empty( $wp_theme_directories ) )
+	if ( empty( $wp_theme_directories ) ) {
 		return false;
+	}
 
-	if ( ! $force && isset( $found_themes ) )
+	if ( ! $force && isset( $found_themes ) ) {
 		return $found_themes;
+	}
 
 	$found_themes = array();
 
@@ -428,10 +445,11 @@ function search_theme_directories( $force = false ) {
 	// We always want to return absolute, but we need to cache relative
 	// to use in get_theme_root().
 	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
+		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
 			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
-		else
+		} else {
 			$relative_theme_roots[ $theme_root ] = $theme_root;
+		}
 	}
 
 	/**
@@ -447,8 +465,9 @@ function search_theme_directories( $force = false ) {
 		if ( is_array( $cached_roots ) ) {
 			foreach ( $cached_roots as $theme_dir => $theme_root ) {
 				// A cached theme root is no longer around, so skip it.
-				if ( ! isset( $relative_theme_roots[ $theme_root ] ) )
+				if ( ! isset( $relative_theme_roots[ $theme_root ] ) ) {
 					continue;
+				}
 				$found_themes[ $theme_dir ] = array(
 					'theme_file' => $theme_dir . '/style.css',
 					'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
@@ -456,8 +475,9 @@ function search_theme_directories( $force = false ) {
 			}
 			return $found_themes;
 		}
-		if ( ! is_int( $cache_expiration ) )
+		if ( ! is_int( $cache_expiration ) ) {
 			$cache_expiration = 1800; // half hour
+		}
 	} else {
 		$cache_expiration = 1800; // half hour
 	}
@@ -472,8 +492,9 @@ function search_theme_directories( $force = false ) {
 			continue;
 		}
 		foreach ( $dirs as $dir ) {
-			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
+			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
 				continue;
+			}
 			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
 				// wp-content/themes/a-single-theme
 				// wp-content/themes is $theme_root, a-single-theme is $dir
@@ -491,38 +512,42 @@ function search_theme_directories( $force = false ) {
 					continue;
 				}
 				foreach ( $sub_dirs as $sub_dir ) {
-					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
+					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
 						continue;
-					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) )
+					}
+					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) ) {
 						continue;
+					}
 					$found_themes[ $dir . '/' . $sub_dir ] = array(
 						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
 						'theme_root' => $theme_root,
 					);
-					$found_theme = true;
+					$found_theme                           = true;
 				}
 				// Never mind the above, it's just a theme missing a style.css.
 				// Return it; WP_Theme will catch the error.
-				if ( ! $found_theme )
+				if ( ! $found_theme ) {
 					$found_themes[ $dir ] = array(
 						'theme_file' => $dir . '/style.css',
 						'theme_root' => $theme_root,
 					);
+				}
 			}
 		}
 	}
 
 	asort( $found_themes );
 
-	$theme_roots = array();
+	$theme_roots          = array();
 	$relative_theme_roots = array_flip( $relative_theme_roots );
 
 	foreach ( $found_themes as $theme_dir => $theme_data ) {
 		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
 	}
 
-	if ( $theme_roots != get_site_transient( 'theme_roots' ) )
+	if ( $theme_roots != get_site_transient( 'theme_roots' ) ) {
 		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	}
 
 	return $found_themes;
 }
@@ -545,8 +570,9 @@ function get_theme_root( $stylesheet_or_template = false ) {
 	if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
 		// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
 		// This gives relative theme roots the benefit of the doubt when things go haywire.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
+		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
 			$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	} else {
 		$theme_root = WP_CONTENT_DIR . '/themes';
 	}
@@ -571,28 +597,30 @@ function get_theme_root( $stylesheet_or_template = false ) {
  * @global array $wp_theme_directories
  *
  * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
- * 	                                     Default is to leverage the main theme root.
+ *                                       Default is to leverage the main theme root.
  * @param string $theme_root             Optional. The theme root for which calculations will be based, preventing
- * 	                                     the need for a get_raw_theme_root() call.
+ *                                       the need for a get_raw_theme_root() call.
  * @return string Themes URI.
  */
 function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && ! $theme_root )
+	if ( $stylesheet_or_template && ! $theme_root ) {
 		$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	}
 
 	if ( $stylesheet_or_template && $theme_root ) {
 		if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
+			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
 				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, ABSPATH ) )
+			} elseif ( 0 === strpos( $theme_root, ABSPATH ) ) {
 				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) )
+			} elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) ) {
 				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
-			else
+			} else {
 				$theme_root_uri = $theme_root;
+			}
 		} else {
 			$theme_root_uri = content_url( $theme_root );
 		}
@@ -635,16 +663,18 @@ function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
 	if ( ! $skip_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
-			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
-			$theme_root = get_option('template_root');
+		if ( get_option( 'stylesheet' ) == $stylesheet_or_template ) {
+			$theme_root = get_option( 'stylesheet_root' );
+		} elseif ( get_option( 'template' ) == $stylesheet_or_template ) {
+			$theme_root = get_option( 'template_root' );
+		}
 	}
 
-	if ( empty($theme_root) ) {
+	if ( empty( $theme_root ) ) {
 		$theme_roots = get_theme_roots();
-		if ( !empty($theme_roots[$stylesheet_or_template]) )
-			$theme_root = $theme_roots[$stylesheet_or_template];
+		if ( ! empty( $theme_roots[ $stylesheet_or_template ] ) ) {
+			$theme_root = $theme_roots[ $stylesheet_or_template ];
+		}
 	}
 
 	return $theme_root;
@@ -657,8 +687,9 @@ function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
  */
 function locale_stylesheet() {
 	$stylesheet = get_locale_stylesheet_uri();
-	if ( empty($stylesheet) )
+	if ( empty( $stylesheet ) ) {
 		return;
+	}
 	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
 }
 
@@ -690,7 +721,12 @@ function switch_theme( $stylesheet ) {
 	}
 
 	if ( is_array( $_sidebars_widgets ) ) {
-		set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) );
+		set_theme_mod(
+			'sidebars_widgets', array(
+				'time' => time(),
+				'data' => $_sidebars_widgets,
+			)
+		);
 	}
 
 	$nav_menu_locations = get_theme_mod( 'nav_menu_locations' );
@@ -715,7 +751,7 @@ function switch_theme( $stylesheet ) {
 		delete_option( 'stylesheet_root' );
 	}
 
-	$new_name  = $new_theme->get('Name');
+	$new_name = $new_theme->get( 'Name' );
 
 	update_option( 'current_theme', $new_name );
 
@@ -775,8 +811,9 @@ function validate_current_theme() {
 	 *
 	 * @param bool $validate Whether to validate the current theme. Default true.
 	 */
-	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) )
+	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) ) {
 		return true;
+	}
 
 	if ( ! file_exists( get_template_directory() . '/index.php' ) ) {
 		// Invalid.
@@ -822,11 +859,12 @@ function validate_current_theme() {
  */
 function get_theme_mods() {
 	$theme_slug = get_option( 'stylesheet' );
-	$mods = get_option( "theme_mods_$theme_slug" );
+	$mods       = get_option( "theme_mods_$theme_slug" );
 	if ( false === $mods ) {
 		$theme_name = get_option( 'current_theme' );
-		if ( false === $theme_name )
-			$theme_name = wp_get_theme()->get('Name');
+		if ( false === $theme_name ) {
+			$theme_name = wp_get_theme()->get( 'Name' );
+		}
 		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
 		if ( is_admin() && false !== $mods ) {
 			update_option( "theme_mods_$theme_slug", $mods );
@@ -853,7 +891,7 @@ function get_theme_mods() {
 function get_theme_mod( $name, $default = false ) {
 	$mods = get_theme_mods();
 
-	if ( isset( $mods[$name] ) ) {
+	if ( isset( $mods[ $name ] ) ) {
 		/**
 		 * Filters the theme modification, or 'theme_mod', value.
 		 *
@@ -866,11 +904,12 @@ function get_theme_mod( $name, $default = false ) {
 		 *
 		 * @param string $current_mod The value of the current theme modification.
 		 */
-		return apply_filters( "theme_mod_{$name}", $mods[$name] );
+		return apply_filters( "theme_mod_{$name}", $mods[ $name ] );
 	}
 
-	if ( is_string( $default ) )
+	if ( is_string( $default ) ) {
 		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	}
 
 	/** This filter is documented in wp-includes/theme.php */
 	return apply_filters( "theme_mod_{$name}", $default );
@@ -885,7 +924,7 @@ function get_theme_mod( $name, $default = false ) {
  * @param mixed  $value Theme modification value.
  */
 function set_theme_mod( $name, $value ) {
-	$mods = get_theme_mods();
+	$mods      = get_theme_mods();
 	$old_value = isset( $mods[ $name ] ) ? $mods[ $name ] : false;
 
 	/**
@@ -919,8 +958,9 @@ function set_theme_mod( $name, $value ) {
 function remove_theme_mod( $name ) {
 	$mods = get_theme_mods();
 
-	if ( ! isset( $mods[ $name ] ) )
+	if ( ! isset( $mods[ $name ] ) ) {
 		return;
+	}
 
 	unset( $mods[ $name ] );
 
@@ -942,8 +982,9 @@ function remove_theme_mods() {
 
 	// Old style.
 	$theme_name = get_option( 'current_theme' );
-	if ( false === $theme_name )
-		$theme_name = wp_get_theme()->get('Name');
+	if ( false === $theme_name ) {
+		$theme_name = wp_get_theme()->get( 'Name' );
+	}
 	delete_option( 'mods_' . $theme_name );
 }
 
@@ -955,7 +996,7 @@ function remove_theme_mods() {
  * @return string Header text color in 3- or 6-digit hexadecimal form (minus the hash symbol).
  */
 function get_header_textcolor() {
-	return get_theme_mod('header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
+	return get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
 }
 
 /**
@@ -975,8 +1016,9 @@ function header_textcolor() {
  * @return bool
  */
 function display_header_text() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) )
+	if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
 		return false;
+	}
 
 	$text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
 	return 'blank' !== $text_color;
@@ -1005,11 +1047,13 @@ function has_header_image() {
 function get_header_image() {
 	$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
-	if ( 'remove-header' == $url )
+	if ( 'remove-header' == $url ) {
 		return false;
+	}
 
-	if ( is_random_header_image() )
+	if ( is_random_header_image() ) {
 		$url = get_random_header_image();
+	}
 
 	return esc_url_raw( set_url_scheme( $url ) );
 }
@@ -1024,23 +1068,23 @@ function get_header_image() {
  * @return string HTML image element markup or empty string on failure.
  */
 function get_header_image_tag( $attr = array() ) {
-	$header = get_custom_header();
+	$header      = get_custom_header();
 	$header->url = get_header_image();
 
 	if ( ! $header->url ) {
 		return '';
 	}
 
-	$width = absint( $header->width );
+	$width  = absint( $header->width );
 	$height = absint( $header->height );
 
 	$attr = wp_parse_args(
 		$attr,
 		array(
-			'src' => $header->url,
-			'width' => $width,
+			'src'    => $header->url,
+			'width'  => $width,
 			'height' => $height,
-			'alt' => get_bloginfo( 'name' ),
+			'alt'    => get_bloginfo( 'name' ),
 		)
 	);
 
@@ -1051,11 +1095,11 @@ function get_header_image_tag( $attr = array() ) {
 
 		if ( is_array( $image_meta ) ) {
 			$srcset = wp_calculate_image_srcset( $size_array, $header->url, $image_meta, $header->attachment_id );
-			$sizes = ! empty( $attr['sizes'] ) ? $attr['sizes'] : wp_calculate_image_sizes( $size_array, $header->url, $image_meta, $header->attachment_id );
+			$sizes  = ! empty( $attr['sizes'] ) ? $attr['sizes'] : wp_calculate_image_sizes( $size_array, $header->url, $image_meta, $header->attachment_id );
 
 			if ( $srcset && $sizes ) {
 				$attr['srcset'] = $srcset;
-				$attr['sizes'] = $sizes;
+				$attr['sizes']  = $sizes;
 			}
 		}
 	}
@@ -1110,26 +1154,28 @@ function _get_random_header_data() {
 	if ( empty( $_wp_random_header ) ) {
 		global $_wp_default_headers;
 		$header_image_mod = get_theme_mod( 'header_image', '' );
-		$headers = array();
+		$headers          = array();
 
-		if ( 'random-uploaded-image' == $header_image_mod )
+		if ( 'random-uploaded-image' == $header_image_mod ) {
 			$headers = get_uploaded_header_images();
-		elseif ( ! empty( $_wp_default_headers ) ) {
+		} elseif ( ! empty( $_wp_default_headers ) ) {
 			if ( 'random-default-image' == $header_image_mod ) {
 				$headers = $_wp_default_headers;
 			} else {
-				if ( current_theme_supports( 'custom-header', 'random-default' ) )
+				if ( current_theme_supports( 'custom-header', 'random-default' ) ) {
 					$headers = $_wp_default_headers;
+				}
 			}
 		}
 
-		if ( empty( $headers ) )
+		if ( empty( $headers ) ) {
 			return new stdClass;
+		}
 
 		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
 
-		$_wp_random_header->url =  sprintf( $_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri() );
-		$_wp_random_header->thumbnail_url =  sprintf( $_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$_wp_random_header->url           = sprintf( $_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$_wp_random_header->thumbnail_url = sprintf( $_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri() );
 	}
 	return $_wp_random_header;
 }
@@ -1143,8 +1189,9 @@ function _get_random_header_data() {
  */
 function get_random_header_image() {
 	$random_image = _get_random_header_data();
-	if ( empty( $random_image->url ) )
+	if ( empty( $random_image->url ) ) {
 		return '';
+	}
 	return $random_image->url;
 }
 
@@ -1164,13 +1211,15 @@ function is_random_header_image( $type = 'any' ) {
 	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
 	if ( 'any' == $type ) {
-		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
+		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) ) {
 			return true;
+		}
 	} else {
-		if ( "random-$type-image" == $header_image_mod )
+		if ( "random-$type-image" == $header_image_mod ) {
 			return true;
-		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
+		} elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() ) {
 			return true;
+		}
 	}
 
 	return false;
@@ -1199,27 +1248,38 @@ function get_uploaded_header_images() {
 	$header_images = array();
 
 	// @todo caching
-	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
+	$headers = get_posts(
+		array(
+			'post_type'  => 'attachment',
+			'meta_key'   => '_wp_attachment_is_custom_header',
+			'meta_value' => get_option( 'stylesheet' ),
+			'orderby'    => 'none',
+			'nopaging'   => true,
+		)
+	);
 
-	if ( empty( $headers ) )
+	if ( empty( $headers ) ) {
 		return array();
+	}
 
 	foreach ( (array) $headers as $header ) {
-		$url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
-		$header_data = wp_get_attachment_metadata( $header->ID );
+		$url          = esc_url_raw( wp_get_attachment_url( $header->ID ) );
+		$header_data  = wp_get_attachment_metadata( $header->ID );
 		$header_index = $header->ID;
 
-		$header_images[$header_index] = array();
-		$header_images[$header_index]['attachment_id'] = $header->ID;
-		$header_images[$header_index]['url'] =  $url;
-		$header_images[$header_index]['thumbnail_url'] = $url;
-		$header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
-		$header_images[$header_index]['attachment_parent'] = isset( $header_data['attachment_parent'] ) ? $header_data['attachment_parent'] : '';
+		$header_images[ $header_index ]                      = array();
+		$header_images[ $header_index ]['attachment_id']     = $header->ID;
+		$header_images[ $header_index ]['url']               = $url;
+		$header_images[ $header_index ]['thumbnail_url']     = $url;
+		$header_images[ $header_index ]['alt_text']          = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
+		$header_images[ $header_index ]['attachment_parent'] = isset( $header_data['attachment_parent'] ) ? $header_data['attachment_parent'] : '';
 
-		if ( isset( $header_data['width'] ) )
-			$header_images[$header_index]['width'] = $header_data['width'];
-		if ( isset( $header_data['height'] ) )
-			$header_images[$header_index]['height'] = $header_data['height'];
+		if ( isset( $header_data['width'] ) ) {
+			$header_images[ $header_index ]['width'] = $header_data['width'];
+		}
+		if ( isset( $header_data['height'] ) ) {
+			$header_images[ $header_index ]['height'] = $header_data['height'];
+		}
 	}
 
 	return $header_images;
@@ -1243,14 +1303,14 @@ function get_custom_header() {
 		$data = get_theme_mod( 'header_image_data' );
 		if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
 			$directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
-			$data = array();
-			$data['url'] = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
+			$data           = array();
+			$data['url']    = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
 			if ( ! empty( $_wp_default_headers ) ) {
 				foreach ( (array) $_wp_default_headers as $default_header ) {
 					$url = vsprintf( $default_header['url'], $directory_args );
 					if ( $data['url'] == $url ) {
-						$data = $default_header;
-						$data['url'] = $url;
+						$data                  = $default_header;
+						$data['url']           = $url;
 						$data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
 						break;
 					}
@@ -1334,7 +1394,7 @@ function has_header_video() {
  * @return string|false Header video URL or false if there is no video.
  */
 function get_header_video_url() {
-	$id = absint( get_theme_mod( 'header_video' ) );
+	$id  = absint( get_theme_mod( 'header_video' ) );
 	$url = esc_url( get_theme_mod( 'external_header_video' ) );
 
 	if ( $id ) {
@@ -1393,8 +1453,8 @@ function get_header_video_settings() {
 		'l10n'      => array(
 			'pause'      => __( 'Pause' ),
 			'play'       => __( 'Play' ),
-			'pauseSpeak' => __( 'Video is paused.'),
-			'playSpeak'  => __( 'Video is playing.'),
+			'pauseSpeak' => __( 'Video is paused.' ),
+			'playSpeak'  => __( 'Video is playing.' ),
 		),
 	);
 
@@ -1503,7 +1563,7 @@ function the_custom_header_markup() {
  * @return string
  */
 function get_background_image() {
-	return get_theme_mod('background_image', get_theme_support( 'custom-background', 'default-image' ) );
+	return get_theme_mod( 'background_image', get_theme_support( 'custom-background', 'default-image' ) );
 }
 
 /**
@@ -1523,7 +1583,7 @@ function background_image() {
  * @return string
  */
 function get_background_color() {
-	return get_theme_mod('background_color', get_theme_support( 'custom-background', 'default-color' ) );
+	return get_theme_mod( 'background_color', get_theme_support( 'custom-background', 'default-color' ) );
 }
 
 /**
@@ -1621,11 +1681,13 @@ body.custom-background { <?php echo trim( $style ); ?> }
  */
 function wp_custom_css_cb() {
 	$styles = wp_get_custom_css();
-	if ( $styles || is_customize_preview() ) : ?>
+	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 endif;
+	<?php
+	endif;
 }
 
 /**
@@ -1664,7 +1726,7 @@ function wp_get_custom_css_post( $stylesheet = '' ) {
 		// `-1` indicates no post exists; no query necessary.
 		if ( ! $post && -1 !== $post_id ) {
 			$query = new WP_Query( $custom_css_query_vars );
-			$post = $query->post;
+			$post  = $query->post;
 			/*
 			 * Cache the lookup. See wp_update_custom_css_post().
 			 * @todo This should get cleared if a custom_css post is added/removed.
@@ -1673,7 +1735,7 @@ function wp_get_custom_css_post( $stylesheet = '' ) {
 		}
 	} else {
 		$query = new WP_Query( $custom_css_query_vars );
-		$post = $query->post;
+		$post  = $query->post;
 	}
 
 	return $post;
@@ -1729,13 +1791,15 @@ function wp_get_custom_css( $stylesheet = '' ) {
  * @return WP_Post|WP_Error Post on success, error on failure.
  */
 function wp_update_custom_css_post( $css, $args = array() ) {
-	$args = wp_parse_args( $args, array(
-		'preprocessed' => '',
-		'stylesheet' => get_stylesheet(),
-	) );
+	$args = wp_parse_args(
+		$args, array(
+			'preprocessed' => '',
+			'stylesheet'   => get_stylesheet(),
+		)
+	);
 
 	$data = array(
-		'css' => $css,
+		'css'          => $css,
 		'preprocessed' => $args['preprocessed'],
 	);
 
@@ -1775,11 +1839,11 @@ function wp_update_custom_css_post( $css, $args = array() ) {
 	$data = apply_filters( 'update_custom_css_data', $data, array_merge( $args, compact( 'css' ) ) );
 
 	$post_data = array(
-		'post_title' => $args['stylesheet'],
-		'post_name' => sanitize_title( $args['stylesheet'] ),
-		'post_type' => 'custom_css',
-		'post_status' => 'publish',
-		'post_content' => $data['css'],
+		'post_title'            => $args['stylesheet'],
+		'post_name'             => sanitize_title( $args['stylesheet'] ),
+		'post_type'             => 'custom_css',
+		'post_status'           => 'publish',
+		'post_content'          => $data['css'],
 		'post_content_filtered' => $data['preprocessed'],
 	);
 
@@ -1787,7 +1851,7 @@ function wp_update_custom_css_post( $css, $args = array() ) {
 	$post = wp_get_custom_css_post( $args['stylesheet'] );
 	if ( $post ) {
 		$post_data['ID'] = $post->ID;
-		$r = wp_update_post( wp_slash( $post_data ), true );
+		$r               = wp_update_post( wp_slash( $post_data ), true );
 	} else {
 		$r = wp_insert_post( wp_slash( $post_data ), true );
 
@@ -1829,20 +1893,21 @@ function wp_update_custom_css_post( $css, $args = array() ) {
  * @global array $editor_styles
  *
  * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
- * 	                               Defaults to 'editor-style.css'
+ *                                 Defaults to 'editor-style.css'
  */
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
 	add_theme_support( 'editor-style' );
 
-	if ( ! is_admin() )
+	if ( ! is_admin() ) {
 		return;
+	}
 
 	global $editor_styles;
 	$editor_styles = (array) $editor_styles;
 	$stylesheet    = (array) $stylesheet;
 	if ( is_rtl() ) {
-		$rtl_stylesheet = str_replace('.css', '-rtl.css', $stylesheet[0]);
-		$stylesheet[] = $rtl_stylesheet;
+		$rtl_stylesheet = str_replace( '.css', '-rtl.css', $stylesheet[0] );
+		$stylesheet[]   = $rtl_stylesheet;
 	}
 
 	$editor_styles = array_merge( $editor_styles, $stylesheet );
@@ -1858,11 +1923,13 @@ function add_editor_style( $stylesheet = 'editor-style.css' ) {
  * @return bool True on success, false if there were no stylesheets to remove.
  */
 function remove_editor_styles() {
-	if ( ! current_theme_supports( 'editor-style' ) )
+	if ( ! current_theme_supports( 'editor-style' ) ) {
 		return false;
+	}
 	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
+	if ( is_admin() ) {
 		$GLOBALS['editor_styles'] = array();
+	}
 	return true;
 }
 
@@ -1882,8 +1949,8 @@ function get_editor_stylesheets() {
 		$editor_styles = $GLOBALS['editor_styles'];
 
 		$editor_styles = array_unique( array_filter( $editor_styles ) );
-		$style_uri = get_stylesheet_directory_uri();
-		$style_dir = get_stylesheet_directory();
+		$style_uri     = get_stylesheet_directory_uri();
+		$style_dir     = get_stylesheet_directory();
 
 		// Support externally referenced styles (like, say, fonts).
 		foreach ( $editor_styles as $key => $file ) {
@@ -1938,147 +2005,176 @@ function get_theme_starter_content() {
 	}
 
 	$core_content = array(
-		'widgets' => array(
-			'text_business_info' => array( 'text', array(
-				'title' => _x( 'Find Us', 'Theme starter content' ),
-				'text' => join( '', 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",
-					_x( 'Monday&mdash;Friday: 9:00AM&ndash;5:00PM', 'Theme starter content' ) . "\n" . _x( 'Saturday &amp; Sunday: 11:00AM&ndash;3:00PM', 'Theme starter content' )
-				) ),
-				'filter' => true,
-				'visual' => true,
-			) ),
-			'text_about' => array( 'text', array(
-				'title' => _x( 'About This Site', 'Theme starter content' ),
-				'text' => _x( 'This may be a good place to introduce yourself and your site or include some credits.', 'Theme starter content' ),
-				'filter' => true,
-				'visual' => true,
-			) ),
-			'archives' => array( 'archives', array(
-				'title' => _x( 'Archives', 'Theme starter content' ),
-			) ),
-			'calendar' => array( 'calendar', array(
-				'title' => _x( 'Calendar', 'Theme starter content' ),
-			) ),
-			'categories' => array( 'categories', array(
-				'title' => _x( 'Categories', 'Theme starter content' ),
-			) ),
-			'meta' => array( 'meta', array(
-				'title' => _x( 'Meta', 'Theme starter content' ),
-			) ),
-			'recent-comments' => array( 'recent-comments', array(
-				'title' => _x( 'Recent Comments', 'Theme starter content' ),
-			) ),
-			'recent-posts' => array( 'recent-posts', array(
-				'title' => _x( 'Recent Posts', 'Theme starter content' ),
-			) ),
-			'search' => array( 'search', array(
-				'title' => _x( 'Search', 'Theme starter content' ),
-			) ),
+		'widgets'   => array(
+			'text_business_info' => array(
+				'text',
+				array(
+					'title'  => _x( 'Find Us', 'Theme starter content' ),
+					'text'   => join(
+						'', 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",
+							_x( 'Monday&mdash;Friday: 9:00AM&ndash;5:00PM', 'Theme starter content' ) . "\n" . _x( 'Saturday &amp; Sunday: 11:00AM&ndash;3:00PM', 'Theme starter content' ),
+						)
+					),
+					'filter' => true,
+					'visual' => true,
+				),
+			),
+			'text_about'         => array(
+				'text',
+				array(
+					'title'  => _x( 'About This Site', 'Theme starter content' ),
+					'text'   => _x( 'This may be a good place to introduce yourself and your site or include some credits.', 'Theme starter content' ),
+					'filter' => true,
+					'visual' => true,
+				),
+			),
+			'archives'           => array(
+				'archives',
+				array(
+					'title' => _x( 'Archives', 'Theme starter content' ),
+				),
+			),
+			'calendar'           => array(
+				'calendar',
+				array(
+					'title' => _x( 'Calendar', 'Theme starter content' ),
+				),
+			),
+			'categories'         => array(
+				'categories',
+				array(
+					'title' => _x( 'Categories', 'Theme starter content' ),
+				),
+			),
+			'meta'               => array(
+				'meta',
+				array(
+					'title' => _x( 'Meta', 'Theme starter content' ),
+				),
+			),
+			'recent-comments'    => array(
+				'recent-comments',
+				array(
+					'title' => _x( 'Recent Comments', 'Theme starter content' ),
+				),
+			),
+			'recent-posts'       => array(
+				'recent-posts',
+				array(
+					'title' => _x( 'Recent Posts', 'Theme starter content' ),
+				),
+			),
+			'search'             => array(
+				'search',
+				array(
+					'title' => _x( 'Search', 'Theme starter content' ),
+				),
+			),
 		),
 		'nav_menus' => array(
-			'link_home' => array(
-				'type' => 'custom',
+			'link_home'       => array(
+				'type'  => 'custom',
 				'title' => _x( 'Home', 'Theme starter content' ),
-				'url' => home_url( '/' ),
+				'url'   => home_url( '/' ),
 			),
-			'page_home' => array( // Deprecated in favor of link_home.
-				'type' => 'post_type',
-				'object' => 'page',
+			'page_home'       => array( // Deprecated in favor of link_home.
+				'type'      => 'post_type',
+				'object'    => 'page',
 				'object_id' => '{{home}}',
 			),
-			'page_about' => array(
-				'type' => 'post_type',
-				'object' => 'page',
+			'page_about'      => array(
+				'type'      => 'post_type',
+				'object'    => 'page',
 				'object_id' => '{{about}}',
 			),
-			'page_blog' => array(
-				'type' => 'post_type',
-				'object' => 'page',
+			'page_blog'       => array(
+				'type'      => 'post_type',
+				'object'    => 'page',
 				'object_id' => '{{blog}}',
 			),
-			'page_news' => array(
-				'type' => 'post_type',
-				'object' => 'page',
+			'page_news'       => array(
+				'type'      => 'post_type',
+				'object'    => 'page',
 				'object_id' => '{{news}}',
 			),
-			'page_contact' => array(
-				'type' => 'post_type',
-				'object' => 'page',
+			'page_contact'    => array(
+				'type'      => 'post_type',
+				'object'    => 'page',
 				'object_id' => '{{contact}}',
 			),
 
-			'link_email' => array(
+			'link_email'      => array(
 				'title' => _x( 'Email', 'Theme starter content' ),
-				'url' => 'mailto:wordpress@example.com',
+				'url'   => 'mailto:wordpress@example.com',
 			),
-			'link_facebook' => array(
+			'link_facebook'   => array(
 				'title' => _x( 'Facebook', 'Theme starter content' ),
-				'url' => 'https://www.facebook.com/wordpress',
+				'url'   => 'https://www.facebook.com/wordpress',
 			),
 			'link_foursquare' => array(
 				'title' => _x( 'Foursquare', 'Theme starter content' ),
-				'url' => 'https://foursquare.com/',
+				'url'   => 'https://foursquare.com/',
 			),
-			'link_github' => array(
+			'link_github'     => array(
 				'title' => _x( 'GitHub', 'Theme starter content' ),
-				'url' => 'https://github.com/wordpress/',
+				'url'   => 'https://github.com/wordpress/',
 			),
-			'link_instagram' => array(
+			'link_instagram'  => array(
 				'title' => _x( 'Instagram', 'Theme starter content' ),
-				'url' => 'https://www.instagram.com/explore/tags/wordcamp/',
+				'url'   => 'https://www.instagram.com/explore/tags/wordcamp/',
 			),
-			'link_linkedin' => array(
+			'link_linkedin'   => array(
 				'title' => _x( 'LinkedIn', 'Theme starter content' ),
-				'url' => 'https://www.linkedin.com/company/1089783',
+				'url'   => 'https://www.linkedin.com/company/1089783',
 			),
-			'link_pinterest' => array(
+			'link_pinterest'  => array(
 				'title' => _x( 'Pinterest', 'Theme starter content' ),
-				'url' => 'https://www.pinterest.com/',
+				'url'   => 'https://www.pinterest.com/',
 			),
-			'link_twitter' => array(
+			'link_twitter'    => array(
 				'title' => _x( 'Twitter', 'Theme starter content' ),
-				'url' => 'https://twitter.com/wordpress',
+				'url'   => 'https://twitter.com/wordpress',
 			),
-			'link_yelp' => array(
+			'link_yelp'       => array(
 				'title' => _x( 'Yelp', 'Theme starter content' ),
-				'url' => 'https://www.yelp.com',
+				'url'   => 'https://www.yelp.com',
 			),
-			'link_youtube' => array(
+			'link_youtube'    => array(
 				'title' => _x( 'YouTube', 'Theme starter content' ),
-				'url' => 'https://www.youtube.com/channel/UCdof4Ju7amm1chz1gi1T2ZA',
+				'url'   => 'https://www.youtube.com/channel/UCdof4Ju7amm1chz1gi1T2ZA',
 			),
 		),
-		'posts' => array(
-			'home' => array(
-				'post_type' => 'page',
-				'post_title' => _x( 'Home', 'Theme starter content' ),
+		'posts'     => array(
+			'home'             => array(
+				'post_type'    => 'page',
+				'post_title'   => _x( 'Home', 'Theme starter content' ),
 				'post_content' => _x( 'Welcome to your site! This is your homepage, which is what most visitors will see when they come to your site for the first time.', 'Theme starter content' ),
 			),
-			'about' => array(
-				'post_type' => 'page',
-				'post_title' => _x( 'About', 'Theme starter content' ),
+			'about'            => array(
+				'post_type'    => 'page',
+				'post_title'   => _x( 'About', 'Theme starter content' ),
 				'post_content' => _x( 'You might be an artist who would like to introduce yourself and your work here or maybe you&rsquo;re a business with a mission to describe.', 'Theme starter content' ),
 			),
-			'contact' => array(
-				'post_type' => 'page',
-				'post_title' => _x( 'Contact', 'Theme starter content' ),
+			'contact'          => array(
+				'post_type'    => 'page',
+				'post_title'   => _x( 'Contact', 'Theme starter content' ),
 				'post_content' => _x( 'This is a page with some basic contact information, such as an address and phone number. You might also try a plugin to add a contact form.', 'Theme starter content' ),
 			),
-			'blog' => array(
-				'post_type' => 'page',
+			'blog'             => array(
+				'post_type'  => 'page',
 				'post_title' => _x( 'Blog', 'Theme starter content' ),
 			),
-			'news' => array(
-				'post_type' => 'page',
+			'news'             => array(
+				'post_type'  => 'page',
 				'post_title' => _x( 'News', 'Theme starter content' ),
 			),
 
 			'homepage-section' => array(
-				'post_type' => 'page',
-				'post_title' => _x( 'A homepage section', 'Theme starter content' ),
+				'post_type'    => 'page',
+				'post_title'   => _x( 'A homepage section', 'Theme starter content' ),
 				'post_content' => _x( 'This is an example of a homepage section. Homepage sections can be any page other than the homepage itself, including the page that shows your latest blog posts.', 'Theme starter content' ),
 			),
 		),
@@ -2087,15 +2183,15 @@ function get_theme_starter_content() {
 	$content = array();
 
 	foreach ( $config as $type => $args ) {
-		switch( $type ) {
+		switch ( $type ) {
 			// Use options and theme_mods as-is.
-			case 'options' :
-			case 'theme_mods' :
+			case 'options':
+			case 'theme_mods':
 				$content[ $type ] = $config[ $type ];
 				break;
 
 			// Widgets are grouped into sidebars.
-			case 'widgets' :
+			case 'widgets':
 				foreach ( $config[ $type ] as $sidebar_id => $widgets ) {
 					foreach ( $widgets as $id => $widget ) {
 						if ( is_array( $widget ) ) {
@@ -2117,7 +2213,7 @@ function get_theme_starter_content() {
 				break;
 
 			// And nav menu items are grouped into nav menus.
-			case 'nav_menus' :
+			case 'nav_menus':
 				foreach ( $config[ $type ] as $nav_menu_location => $nav_menu ) {
 
 					// Ensure nav menus get a name.
@@ -2144,7 +2240,7 @@ function get_theme_starter_content() {
 				break;
 
 			// Attachments are posts but have special treatment.
-			case 'attachments' :
+			case 'attachments':
 				foreach ( $config[ $type ] as $id => $item ) {
 					if ( ! empty( $item['file'] ) ) {
 						$content[ $type ][ $id ] = $item;
@@ -2153,7 +2249,7 @@ function get_theme_starter_content() {
 				break;
 
 			// All that's left now are posts (besides attachments). Not a default case for the sake of clarity and future work.
-			case 'posts' :
+			case 'posts':
 				foreach ( $config[ $type ] as $id => $item ) {
 					if ( is_array( $item ) ) {
 
@@ -2221,10 +2317,11 @@ function get_theme_starter_content() {
 function add_theme_support( $feature ) {
 	global $_wp_theme_features;
 
-	if ( func_num_args() == 1 )
+	if ( func_num_args() == 1 ) {
 		$args = true;
-	else
+	} else {
 		$args = array_slice( func_get_args(), 1 );
+	}
 
 	switch ( $feature ) {
 		case 'post-thumbnails':
@@ -2243,7 +2340,7 @@ function add_theme_support( $feature ) {
 
 			break;
 
-		case 'post-formats' :
+		case 'post-formats':
 			if ( is_array( $args[0] ) ) {
 				$post_formats = get_post_format_slugs();
 				unset( $post_formats['standard'] );
@@ -2252,7 +2349,7 @@ function add_theme_support( $feature ) {
 			}
 			break;
 
-		case 'html5' :
+		case 'html5':
 			// You can't just pass 'html5', you need to pass an array of types.
 			if ( empty( $args[0] ) ) {
 				// Build an array of types for back-compat.
@@ -2263,8 +2360,9 @@ function add_theme_support( $feature ) {
 			}
 
 			// Calling 'html5' again merges, rather than overwrites.
-			if ( isset( $_wp_theme_features['html5'] ) )
+			if ( isset( $_wp_theme_features['html5'] ) ) {
 				$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			}
 			break;
 
 		case 'custom-logo':
@@ -2278,7 +2376,7 @@ function add_theme_support( $feature ) {
 				'flex-height' => false,
 				'header-text' => '',
 			);
-			$args[0] = wp_parse_args( array_intersect_key( $args[0], $defaults ), $defaults );
+			$args[0]  = wp_parse_args( array_intersect_key( $args[0], $defaults ), $defaults );
 
 			// Allow full flexibility if no size is specified.
 			if ( is_null( $args[0]['width'] ) && is_null( $args[0]['height'] ) ) {
@@ -2287,28 +2385,29 @@ function add_theme_support( $feature ) {
 			}
 			break;
 
-		case 'custom-header-uploads' :
+		case 'custom-header-uploads':
 			return add_theme_support( 'custom-header', array( 'uploads' => true ) );
 
-		case 'custom-header' :
-			if ( ! is_array( $args ) )
+		case 'custom-header':
+			if ( ! is_array( $args ) ) {
 				$args = array( 0 => array() );
+			}
 
 			$defaults = array(
-				'default-image' => '',
-				'random-default' => false,
-				'width' => 0,
-				'height' => 0,
-				'flex-height' => false,
-				'flex-width' => false,
-				'default-text-color' => '',
-				'header-text' => true,
-				'uploads' => true,
-				'wp-head-callback' => '',
-				'admin-head-callback' => '',
+				'default-image'          => '',
+				'random-default'         => false,
+				'width'                  => 0,
+				'height'                 => 0,
+				'flex-height'            => false,
+				'flex-width'             => false,
+				'default-text-color'     => '',
+				'header-text'            => true,
+				'uploads'                => true,
+				'wp-head-callback'       => '',
+				'admin-head-callback'    => '',
 				'admin-preview-callback' => '',
-				'video' => false,
-				'video-active-callback' => 'is_front_page',
+				'video'                  => false,
+				'video-active-callback'  => 'is_front_page',
 			);
 
 			$jit = isset( $args[0]['__jit'] );
@@ -2316,13 +2415,15 @@ function add_theme_support( $feature ) {
 
 			// Merge in data from previous add_theme_support() calls.
 			// The first value registered wins. (A child theme is set up first.)
-			if ( isset( $_wp_theme_features['custom-header'] ) )
+			if ( isset( $_wp_theme_features['custom-header'] ) ) {
 				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			}
 
 			// Load in the defaults at the end, as we need to insure first one wins.
 			// This will cause all constants to be defined, as each arg will then be set to the default.
-			if ( $jit )
+			if ( $jit ) {
 				$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
 			// If a constant was defined, use that value. Otherwise, define the constant to ensure
 			// the constant is always accurate (and is not defined later,  overriding our value).
@@ -2330,48 +2431,57 @@ function add_theme_support( $feature ) {
 			// Once we get to wp_loaded (just-in-time), define any constants we haven't already.
 			// Constants are lame. Don't reference them. This is just for backward compatibility.
 
-			if ( defined( 'NO_HEADER_TEXT' ) )
+			if ( defined( 'NO_HEADER_TEXT' ) ) {
 				$args[0]['header-text'] = ! NO_HEADER_TEXT;
-			elseif ( isset( $args[0]['header-text'] ) )
+			} elseif ( isset( $args[0]['header-text'] ) ) {
 				define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			}
 
-			if ( defined( 'HEADER_IMAGE_WIDTH' ) )
+			if ( defined( 'HEADER_IMAGE_WIDTH' ) ) {
 				$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
-			elseif ( isset( $args[0]['width'] ) )
+			} elseif ( isset( $args[0]['width'] ) ) {
 				define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
+			if ( defined( 'HEADER_IMAGE_HEIGHT' ) ) {
 				$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-			elseif ( isset( $args[0]['height'] ) )
+			} elseif ( isset( $args[0]['height'] ) ) {
 				define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			}
 
-			if ( defined( 'HEADER_TEXTCOLOR' ) )
+			if ( defined( 'HEADER_TEXTCOLOR' ) ) {
 				$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
-			elseif ( isset( $args[0]['default-text-color'] ) )
+			} elseif ( isset( $args[0]['default-text-color'] ) ) {
 				define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE' ) )
+			if ( defined( 'HEADER_IMAGE' ) ) {
 				$args[0]['default-image'] = HEADER_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) )
+			} elseif ( isset( $args[0]['default-image'] ) ) {
 				define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			}
 
-			if ( $jit && ! empty( $args[0]['default-image'] ) )
+			if ( $jit && ! empty( $args[0]['default-image'] ) ) {
 				$args[0]['random-default'] = false;
+			}
 
 			// If headers are supported, and we still don't have a defined width or height,
 			// we have implicit flex sizes.
 			if ( $jit ) {
-				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) )
+				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) ) {
 					$args[0]['flex-width'] = true;
-				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) )
+				}
+				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) ) {
 					$args[0]['flex-height'] = true;
+				}
 			}
 
 			break;
 
-		case 'custom-background' :
-			if ( ! is_array( $args ) )
+		case 'custom-background':
+			if ( ! is_array( $args ) ) {
 				$args = array( 0 => array() );
+			}
 
 			$defaults = array(
 				'default-image'          => '',
@@ -2391,31 +2501,39 @@ function add_theme_support( $feature ) {
 			unset( $args[0]['__jit'] );
 
 			// Merge in data from previous add_theme_support() calls. The first value registered wins.
-			if ( isset( $_wp_theme_features['custom-background'] ) )
+			if ( isset( $_wp_theme_features['custom-background'] ) ) {
 				$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			}
 
-			if ( $jit )
+			if ( $jit ) {
 				$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
-			if ( defined( 'BACKGROUND_COLOR' ) )
+			if ( defined( 'BACKGROUND_COLOR' ) ) {
 				$args[0]['default-color'] = BACKGROUND_COLOR;
-			elseif ( isset( $args[0]['default-color'] ) || $jit )
+			} elseif ( isset( $args[0]['default-color'] ) || $jit ) {
 				define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			}
 
-			if ( defined( 'BACKGROUND_IMAGE' ) )
+			if ( defined( 'BACKGROUND_IMAGE' ) ) {
 				$args[0]['default-image'] = BACKGROUND_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) || $jit )
+			} elseif ( isset( $args[0]['default-image'] ) || $jit ) {
 				define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			}
 
 			break;
 
 		// Ensure that 'title-tag' is accessible in the admin.
-		case 'title-tag' :
+		case 'title-tag':
 			// Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
 			if ( did_action( 'wp_loaded' ) ) {
 				/* translators: 1: Theme support 2: hook name */
-				_doing_it_wrong( "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' );
+				_doing_it_wrong(
+					"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'
+				);
 
 				return false;
 			}
@@ -2441,8 +2559,9 @@ function _custom_header_background_just_in_time() {
 		add_theme_support( 'custom-header', array( '__jit' => true ) );
 
 		$args = get_theme_support( 'custom-header' );
-		if ( $args[0]['wp-head-callback'] )
+		if ( $args[0]['wp-head-callback'] ) {
 			add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		}
 
 		if ( is_admin() ) {
 			require_once( ABSPATH . 'wp-admin/custom-header.php' );
@@ -2500,22 +2619,25 @@ function _custom_logo_header_styles() {
  */
 function get_theme_support( $feature ) {
 	global $_wp_theme_features;
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
 		return false;
+	}
 
-	if ( func_num_args() <= 1 )
+	if ( func_num_args() <= 1 ) {
 		return $_wp_theme_features[ $feature ];
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	switch ( $feature ) {
-		case 'custom-logo' :
-		case 'custom-header' :
-		case 'custom-background' :
-			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
+		case 'custom-logo':
+		case 'custom-header':
+		case 'custom-background':
+			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) ) {
 				return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			}
 			return false;
 
-		default :
+		default:
 			return $_wp_theme_features[ $feature ];
 	}
 }
@@ -2533,8 +2655,9 @@ function get_theme_support( $feature ) {
  */
 function remove_theme_support( $feature ) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) )
+	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) ) {
 		return false;
+	}
 
 	return _remove_theme_support( $feature );
 }
@@ -2555,20 +2678,23 @@ function _remove_theme_support( $feature ) {
 	global $_wp_theme_features;
 
 	switch ( $feature ) {
-		case 'custom-header-uploads' :
-			if ( ! isset( $_wp_theme_features['custom-header'] ) )
+		case 'custom-header-uploads':
+			if ( ! isset( $_wp_theme_features['custom-header'] ) ) {
 				return false;
+			}
 			add_theme_support( 'custom-header', array( 'uploads' => false ) );
 			return; // Do not continue - custom-header-uploads no longer exists.
 	}
 
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
 		return false;
+	}
 
 	switch ( $feature ) {
-		case 'custom-header' :
-			if ( ! did_action( 'wp_loaded' ) )
+		case 'custom-header':
+			if ( ! did_action( 'wp_loaded' ) ) {
 				break;
+			}
 			$support = get_theme_support( 'custom-header' );
 			if ( isset( $support[0]['wp-head-callback'] ) ) {
 				remove_action( 'wp_head', $support[0]['wp-head-callback'] );
@@ -2579,9 +2705,10 @@ function _remove_theme_support( $feature ) {
 			}
 			break;
 
-		case 'custom-background' :
-			if ( ! did_action( 'wp_loaded' ) )
+		case 'custom-background':
+			if ( ! did_action( 'wp_loaded' ) ) {
 				break;
+			}
 			$support = get_theme_support( 'custom-background' );
 			remove_action( 'wp_head', $support[0]['wp-head-callback'] );
 			remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
@@ -2606,15 +2733,18 @@ function _remove_theme_support( $feature ) {
 function current_theme_supports( $feature ) {
 	global $_wp_theme_features;
 
-	if ( 'custom-header-uploads' == $feature )
+	if ( 'custom-header-uploads' == $feature ) {
 		return current_theme_supports( 'custom-header', 'uploads' );
+	}
 
-	if ( !isset( $_wp_theme_features[$feature] ) )
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
 		return false;
+	}
 
 	// If no args passed then no extra checks need be performed
-	if ( func_num_args() <= 1 )
+	if ( func_num_args() <= 1 ) {
 		return true;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 
@@ -2623,10 +2753,11 @@ function current_theme_supports( $feature ) {
 			// post-thumbnails can be registered for only certain content/post types by passing
 			// an array of types to add_theme_support(). If no array was passed, then
 			// any type is accepted
-			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+			if ( true === $_wp_theme_features[ $feature ] ) {  // Registered for all types
 				return true;
+			}
 			$content_type = $args[0];
-			return in_array( $content_type, $_wp_theme_features[$feature][0] );
+			return in_array( $content_type, $_wp_theme_features[ $feature ][0] );
 
 		case 'html5':
 		case 'post-formats':
@@ -2636,7 +2767,7 @@ function current_theme_supports( $feature ) {
 			// Specific areas of HTML5 support *must* be passed via an array to add_theme_support()
 
 			$type = $args[0];
-			return in_array( $type, $_wp_theme_features[$feature][0] );
+			return in_array( $type, $_wp_theme_features[ $feature ][0] );
 
 		case 'custom-logo':
 		case 'custom-header':
@@ -2659,7 +2790,7 @@ function current_theme_supports( $feature ) {
 	 * @param array  $args    Array of arguments for the feature.
 	 * @param string $feature The theme feature.
 	 */
-	return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature] );
+	return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[ $feature ] );
 }
 
 /**
@@ -2673,7 +2804,7 @@ function current_theme_supports( $feature ) {
  */
 function require_if_theme_supports( $feature, $include ) {
 	if ( current_theme_supports( $feature ) ) {
-		require ( $include );
+		require( $include );
 		return true;
 	}
 	return false;
@@ -2772,7 +2903,7 @@ function check_theme_switched() {
 function _wp_customize_include() {
 
 	$is_customize_admin_page = ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) );
-	$should_include = (
+	$should_include          = (
 		$is_customize_admin_page
 		||
 		( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
@@ -2789,17 +2920,17 @@ function _wp_customize_include() {
 	 * called before wp_magic_quotes() gets called. Besides this fact, none of
 	 * the values should contain any characters needing slashes anyway.
 	 */
-	$keys = array( 'changeset_uuid', 'customize_changeset_uuid', 'customize_theme', 'theme', 'customize_messenger_channel', 'customize_autosaved' );
+	$keys       = array( 'changeset_uuid', 'customize_changeset_uuid', 'customize_theme', 'theme', 'customize_messenger_channel', 'customize_autosaved' );
 	$input_vars = array_merge(
 		wp_array_slice_assoc( $_GET, $keys ),
 		wp_array_slice_assoc( $_POST, $keys )
 	);
 
-	$theme = null;
-	$changeset_uuid = false; // Value false indicates UUID should be determined after_setup_theme to either re-use existing saved changeset or else generate a new UUID if none exists.
+	$theme             = null;
+	$changeset_uuid    = false; // Value false indicates UUID should be determined after_setup_theme to either re-use existing saved changeset or else generate a new UUID if none exists.
 	$messenger_channel = null;
-	$autosaved = null;
-	$branching = false; // Set initially fo false since defaults to true for back-compat; can be overridden via the customize_changeset_branching filter.
+	$autosaved         = null;
+	$branching         = false; // Set initially fo false since defaults to true for back-compat; can be overridden via the customize_changeset_branching filter.
 
 	if ( $is_customize_admin_page && isset( $input_vars['changeset_uuid'] ) ) {
 		$changeset_uuid = sanitize_key( $input_vars['changeset_uuid'] );
@@ -2836,7 +2967,7 @@ function _wp_customize_include() {
 		&&
 		'customize_save' === wp_unslash( $_REQUEST['action'] )
 	);
-	$settings_previewed = ! $is_customize_save_action;
+	$settings_previewed       = ! $is_customize_save_action;
 
 	require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
 	$GLOBALS['wp_customize'] = new WP_Customize_Manager( compact( 'changeset_uuid', 'theme', 'messenger_channel', 'settings_previewed', 'autosaved', 'branching' ) );
@@ -2871,10 +3002,12 @@ function _wp_customize_publish_changeset( $new_status, $old_status, $changeset_p
 
 	if ( empty( $wp_customize ) ) {
 		require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-		$wp_customize = new WP_Customize_Manager( array(
-			'changeset_uuid' => $changeset_post->post_name,
-			'settings_previewed' => false,
-		) );
+		$wp_customize = new WP_Customize_Manager(
+			array(
+				'changeset_uuid'     => $changeset_post->post_name,
+				'settings_previewed' => false,
+			)
+		);
 	}
 
 	if ( ! did_action( 'customize_register' ) ) {
@@ -2898,7 +3031,7 @@ function _wp_customize_publish_changeset( $new_status, $old_status, $changeset_p
 		/** This filter is documented in /wp-includes/class-wp-customize-manager.php */
 		do_action( 'customize_register', $wp_customize );
 	}
-	$wp_customize->_publish_changeset_values( $changeset_post->ID ) ;
+	$wp_customize->_publish_changeset_values( $changeset_post->ID );
 
 	/*
 	 * Trash the changeset post if revisions are not enabled. Unpublished
@@ -2946,7 +3079,7 @@ function _wp_customize_changeset_filter_insert_post_data( $post_data, $supplied_
 function _wp_customize_loader_settings() {
 	$admin_origin = parse_url( admin_url() );
 	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$cross_domain = ( strtolower( $admin_origin['host'] ) != strtolower( $home_origin['host'] ) );
 
 	$browser = array(
 		'mobile' => wp_is_mobile(),
@@ -2966,9 +3099,10 @@ function _wp_customize_loader_settings() {
 	$script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';';
 
 	$wp_scripts = wp_scripts();
-	$data = $wp_scripts->get_data( 'customize-loader', 'data' );
-	if ( $data )
+	$data       = $wp_scripts->get_data( 'customize-loader', 'data' );
+	if ( $data ) {
 		$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'customize-loader', 'data', $script );
 }
@@ -2979,13 +3113,14 @@ function _wp_customize_loader_settings() {
  * @since 3.4.0
  *
  * @param string $stylesheet Optional. Theme to customize. Defaults to current theme.
- * 	                         The theme's stylesheet will be urlencoded if necessary.
+ *                           The theme's stylesheet will be urlencoded if necessary.
  * @return string
  */
 function wp_customize_url( $stylesheet = null ) {
 	$url = admin_url( 'customize.php' );
-	if ( $stylesheet )
+	if ( $stylesheet ) {
 		$url .= '?theme=' . urlencode( $stylesheet );
+	}
 	return esc_url( $url );
 }
 
@@ -3008,7 +3143,7 @@ function wp_customize_url( $stylesheet = null ) {
 function wp_customize_support_script() {
 	$admin_origin = parse_url( admin_url() );
 	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$cross_domain = ( strtolower( $admin_origin['host'] ) != strtolower( $home_origin['host'] ) );
 
 	?>
 	<!--[if lte IE 8]>
diff --git a/wp-includes/update.php b/wp-includes/update.php
index 4fa5a25742..412b826057 100644
--- a/wp-includes/update.php
+++ b/wp-includes/update.php
@@ -31,24 +31,26 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 	include( ABSPATH . WPINC . '/version.php' );
 	$php_version = phpversion();
 
-	$current = get_site_transient( 'update_core' );
+	$current      = get_site_transient( 'update_core' );
 	$translations = wp_get_installed_translations( 'core' );
 
 	// Invalidate the transient when $wp_version changes
-	if ( is_object( $current ) && $wp_version != $current->version_checked )
+	if ( is_object( $current ) && $wp_version != $current->version_checked ) {
 		$current = false;
+	}
 
-	if ( ! is_object($current) ) {
-		$current = new stdClass;
-		$current->updates = array();
+	if ( ! is_object( $current ) ) {
+		$current                  = new stdClass;
+		$current->updates         = array();
 		$current->version_checked = $wp_version;
 	}
 
-	if ( ! empty( $extra_stats ) )
+	if ( ! empty( $extra_stats ) ) {
 		$force_check = true;
+	}
 
 	// Wait 60 seconds between multiple version check requests
-	$timeout = 60;
+	$timeout          = 60;
 	$time_not_changed = isset( $current->last_checked ) && $timeout > ( time() - $current->last_checked );
 	if ( ! $force_check && $time_not_changed ) {
 		return;
@@ -67,22 +69,23 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 	$current->last_checked = time();
 	set_site_transient( 'update_core', $current );
 
-	if ( method_exists( $wpdb, 'db_version' ) )
-		$mysql_version = preg_replace('/[^0-9.].*/', '', $wpdb->db_version());
-	else
+	if ( method_exists( $wpdb, 'db_version' ) ) {
+		$mysql_version = preg_replace( '/[^0-9.].*/', '', $wpdb->db_version() );
+	} else {
 		$mysql_version = 'N/A';
+	}
 
 	if ( is_multisite() ) {
-		$user_count = get_user_count();
-		$num_blogs = get_blog_count();
-		$wp_install = network_site_url();
+		$user_count        = get_user_count();
+		$num_blogs         = get_blog_count();
+		$wp_install        = network_site_url();
 		$multisite_enabled = 1;
 	} else {
-		$user_count = count_users();
-		$user_count = $user_count['total_users'];
+		$user_count        = count_users();
+		$user_count        = $user_count['total_users'];
 		$multisite_enabled = 0;
-		$num_blogs = 1;
-		$wp_install = home_url( '/' );
+		$num_blogs         = 1;
+		$wp_install        = home_url( '/' );
 	}
 
 	$query = array(
@@ -106,7 +109,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 	 * @since 4.9.0
 	 *
 	 * @param array $query {
-	 *     Version check query arguments. 
+	 *     Version check query arguments.
 	 *
 	 *     @type string $version            WordPress version number.
 	 *     @type string $php                PHP version number.
@@ -125,23 +128,25 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 		'translations' => wp_json_encode( $translations ),
 	);
 
-	if ( is_array( $extra_stats ) )
+	if ( is_array( $extra_stats ) ) {
 		$post_body = array_merge( $post_body, $extra_stats );
+	}
 
 	$url = $http_url = 'http://api.wordpress.org/core/version-check/1.7/?' . http_build_query( $query, null, '&' );
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
 		$url = set_url_scheme( $url, 'https' );
+	}
 
 	$doing_cron = wp_doing_cron();
 
 	$options = array(
-		'timeout' => $doing_cron ? 30 : 3,
+		'timeout'    => $doing_cron ? 30 : 3,
 		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
-		'headers' => array(
+		'headers'    => array(
 			'wp_install' => $wp_install,
-			'wp_blog' => home_url( '/' )
+			'wp_blog'    => home_url( '/' ),
 		),
-		'body' => $post_body,
+		'body'       => $post_body,
 	);
 
 	$response = wp_remote_post( $url, $options );
@@ -172,25 +177,46 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 
 	foreach ( $offers as &$offer ) {
 		foreach ( $offer as $offer_key => $value ) {
-			if ( 'packages' == $offer_key )
-				$offer['packages'] = (object) array_intersect_key( array_map( 'esc_url', $offer['packages'] ),
-					array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial', 'rollback' ), '' ) );
-			elseif ( 'download' == $offer_key )
+			if ( 'packages' == $offer_key ) {
+				$offer['packages'] = (object) array_intersect_key(
+					array_map( 'esc_url', $offer['packages'] ),
+					array_fill_keys( array( 'full', 'no_content', 'new_bundled', 'partial', 'rollback' ), '' )
+				);
+			} elseif ( 'download' == $offer_key ) {
 				$offer['download'] = esc_url( $value );
-			else
+			} else {
 				$offer[ $offer_key ] = esc_html( $value );
+			}
 		}
-		$offer = (object) array_intersect_key( $offer, array_fill_keys( array( 'response', 'download', 'locale',
-			'packages', 'current', 'version', 'php_version', 'mysql_version', 'new_bundled', 'partial_version', 'notify_email', 'support_email', 'new_files' ), '' ) );
+		$offer = (object) array_intersect_key(
+			$offer, array_fill_keys(
+				array(
+					'response',
+					'download',
+					'locale',
+					'packages',
+					'current',
+					'version',
+					'php_version',
+					'mysql_version',
+					'new_bundled',
+					'partial_version',
+					'notify_email',
+					'support_email',
+					'new_files',
+				), ''
+			)
+		);
 	}
 
-	$updates = new stdClass();
-	$updates->updates = $offers;
-	$updates->last_checked = time();
+	$updates                  = new stdClass();
+	$updates->updates         = $offers;
+	$updates->last_checked    = time();
 	$updates->version_checked = $wp_version;
 
-	if ( isset( $body['translations'] ) )
+	if ( isset( $body['translations'] ) ) {
 		$updates->translations = $body['translations'];
+	}
 
 	set_site_transient( 'update_core', $updates );
 
@@ -229,35 +255,37 @@ function wp_update_plugins( $extra_stats = array() ) {
 	include( ABSPATH . WPINC . '/version.php' );
 
 	// If running blog-side, bail unless we've not checked in the last 12 hours
-	if ( !function_exists( 'get_plugins' ) )
+	if ( ! function_exists( 'get_plugins' ) ) {
 		require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+	}
 
-	$plugins = get_plugins();
+	$plugins      = get_plugins();
 	$translations = wp_get_installed_translations( 'plugins' );
 
 	$active  = get_option( 'active_plugins', array() );
 	$current = get_site_transient( 'update_plugins' );
-	if ( ! is_object($current) )
+	if ( ! is_object( $current ) ) {
 		$current = new stdClass;
+	}
 
-	$new_option = new stdClass;
+	$new_option               = new stdClass;
 	$new_option->last_checked = time();
 
 	$doing_cron = wp_doing_cron();
 
 	// Check for update on a different schedule, depending on the page.
 	switch ( current_filter() ) {
-		case 'upgrader_process_complete' :
+		case 'upgrader_process_complete':
 			$timeout = 0;
 			break;
-		case 'load-update-core.php' :
+		case 'load-update-core.php':
 			$timeout = MINUTE_IN_SECONDS;
 			break;
-		case 'load-plugins.php' :
-		case 'load-update.php' :
+		case 'load-plugins.php':
+		case 'load-update.php':
 			$timeout = HOUR_IN_SECONDS;
 			break;
-		default :
+		default:
 			if ( $doing_cron ) {
 				$timeout = 0;
 			} else {
@@ -272,13 +300,14 @@ function wp_update_plugins( $extra_stats = array() ) {
 		foreach ( $plugins as $file => $p ) {
 			$new_option->checked[ $file ] = $p['Version'];
 
-			if ( !isset( $current->checked[ $file ] ) || strval($current->checked[ $file ]) !== strval($p['Version']) )
+			if ( ! isset( $current->checked[ $file ] ) || strval( $current->checked[ $file ] ) !== strval( $p['Version'] ) ) {
 				$plugin_changed = true;
+			}
 		}
 
-		if ( isset ( $current->response ) && is_array( $current->response ) ) {
+		if ( isset( $current->response ) && is_array( $current->response ) ) {
 			foreach ( $current->response as $plugin_file => $update_details ) {
-				if ( ! isset($plugins[ $plugin_file ]) ) {
+				if ( ! isset( $plugins[ $plugin_file ] ) ) {
 					$plugin_changed = true;
 					break;
 				}
@@ -318,14 +347,14 @@ function wp_update_plugins( $extra_stats = array() ) {
 	}
 
 	$options = array(
-		'timeout' => $timeout,
-		'body' => array(
+		'timeout'    => $timeout,
+		'body'       => array(
 			'plugins'      => wp_json_encode( $to_send ),
 			'translations' => wp_json_encode( $translations ),
 			'locale'       => wp_json_encode( $locales ),
 			'all'          => wp_json_encode( true ),
 		),
-		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' )
+		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
 	);
 
 	if ( $extra_stats ) {
@@ -333,8 +362,9 @@ function wp_update_plugins( $extra_stats = array() ) {
 	}
 
 	$url = $http_url = 'http://api.wordpress.org/plugins/update-check/1.1/';
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
 		$url = set_url_scheme( $url, 'https' );
+	}
 
 	$raw_response = wp_remote_post( $url, $options );
 	if ( $ssl && is_wp_error( $raw_response ) ) {
@@ -370,14 +400,14 @@ function wp_update_plugins( $extra_stats = array() ) {
 	unset( $plugin );
 
 	if ( is_array( $response ) ) {
-		$new_option->response = $response['plugins'];
+		$new_option->response     = $response['plugins'];
 		$new_option->translations = $response['translations'];
 		// TODO: Perhaps better to store no_update in a separate transient with an expiry?
 		$new_option->no_update = $response['no_update'];
 	} else {
-		$new_option->response = array();
+		$new_option->response     = array();
 		$new_option->translations = array();
-		$new_option->no_update = array();
+		$new_option->no_update    = array();
 	}
 
 	set_site_transient( 'update_plugins', $new_option );
@@ -403,11 +433,12 @@ function wp_update_themes( $extra_stats = array() ) {
 	include( ABSPATH . WPINC . '/version.php' );
 
 	$installed_themes = wp_get_themes();
-	$translations = wp_get_installed_translations( 'themes' );
+	$translations     = wp_get_installed_translations( 'themes' );
 
 	$last_update = get_site_transient( 'update_themes' );
-	if ( ! is_object($last_update) )
+	if ( ! is_object( $last_update ) ) {
 		$last_update = new stdClass;
+	}
 
 	$themes = $checked = $request = array();
 
@@ -415,14 +446,14 @@ function wp_update_themes( $extra_stats = array() ) {
 	$request['active'] = get_option( 'stylesheet' );
 
 	foreach ( $installed_themes as $theme ) {
-		$checked[ $theme->get_stylesheet() ] = $theme->get('Version');
+		$checked[ $theme->get_stylesheet() ] = $theme->get( 'Version' );
 
 		$themes[ $theme->get_stylesheet() ] = array(
-			'Name'       => $theme->get('Name'),
-			'Title'      => $theme->get('Name'),
-			'Version'    => $theme->get('Version'),
-			'Author'     => $theme->get('Author'),
-			'Author URI' => $theme->get('AuthorURI'),
+			'Name'       => $theme->get( 'Name' ),
+			'Title'      => $theme->get( 'Name' ),
+			'Version'    => $theme->get( 'Version' ),
+			'Author'     => $theme->get( 'Author' ),
+			'Author URI' => $theme->get( 'AuthorURI' ),
 			'Template'   => $theme->get_template(),
 			'Stylesheet' => $theme->get_stylesheet(),
 		);
@@ -432,17 +463,17 @@ function wp_update_themes( $extra_stats = array() ) {
 
 	// Check for update on a different schedule, depending on the page.
 	switch ( current_filter() ) {
-		case 'upgrader_process_complete' :
+		case 'upgrader_process_complete':
 			$timeout = 0;
 			break;
-		case 'load-update-core.php' :
+		case 'load-update-core.php':
 			$timeout = MINUTE_IN_SECONDS;
 			break;
-		case 'load-themes.php' :
-		case 'load-update.php' :
+		case 'load-themes.php':
+		case 'load-update.php':
 			$timeout = HOUR_IN_SECONDS;
 			break;
-		default :
+		default:
 			$timeout = $doing_cron ? 0 : 12 * HOUR_IN_SECONDS;
 	}
 
@@ -451,13 +482,14 @@ function wp_update_themes( $extra_stats = array() ) {
 	if ( $time_not_changed && ! $extra_stats ) {
 		$theme_changed = false;
 		foreach ( $checked as $slug => $v ) {
-			if ( !isset( $last_update->checked[ $slug ] ) || strval($last_update->checked[ $slug ]) !== strval($v) )
+			if ( ! isset( $last_update->checked[ $slug ] ) || strval( $last_update->checked[ $slug ] ) !== strval( $v ) ) {
 				$theme_changed = true;
+			}
 		}
 
-		if ( isset ( $last_update->response ) && is_array( $last_update->response ) ) {
+		if ( isset( $last_update->response ) && is_array( $last_update->response ) ) {
 			foreach ( $last_update->response as $slug => $update_details ) {
-				if ( ! isset($checked[ $slug ]) ) {
+				if ( ! isset( $checked[ $slug ] ) ) {
 					$theme_changed = true;
 					break;
 				}
@@ -497,13 +529,13 @@ function wp_update_themes( $extra_stats = array() ) {
 	}
 
 	$options = array(
-		'timeout' => $timeout,
-		'body' => array(
+		'timeout'    => $timeout,
+		'body'       => array(
 			'themes'       => wp_json_encode( $request ),
 			'translations' => wp_json_encode( $translations ),
 			'locale'       => wp_json_encode( $locales ),
 		),
-		'user-agent'	=> 'WordPress/' . $wp_version . '; ' . home_url( '/' )
+		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
 	);
 
 	if ( $extra_stats ) {
@@ -511,8 +543,9 @@ function wp_update_themes( $extra_stats = array() ) {
 	}
 
 	$url = $http_url = 'http://api.wordpress.org/themes/update-check/1.1/';
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
 		$url = set_url_scheme( $url, 'https' );
+	}
 
 	$raw_response = wp_remote_post( $url, $options );
 	if ( $ssl && is_wp_error( $raw_response ) ) {
@@ -531,9 +564,9 @@ function wp_update_themes( $extra_stats = array() ) {
 		return;
 	}
 
-	$new_update = new stdClass;
+	$new_update               = new stdClass;
 	$new_update->last_checked = time();
-	$new_update->checked = $checked;
+	$new_update->checked      = $checked;
 
 	$response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
 
@@ -566,12 +599,17 @@ function wp_maybe_auto_update() {
  * @return array
  */
 function wp_get_translation_updates() {
-	$updates = array();
-	$transients = array( 'update_core' => 'core', 'update_plugins' => 'plugin', 'update_themes' => 'theme' );
+	$updates    = array();
+	$transients = array(
+		'update_core'    => 'core',
+		'update_plugins' => 'plugin',
+		'update_themes'  => 'theme',
+	);
 	foreach ( $transients as $transient => $type ) {
 		$transient = get_site_transient( $transient );
-		if ( empty( $transient->translations ) )
+		if ( empty( $transient->translations ) ) {
 			continue;
+		}
 
 		foreach ( $transient->translations as $translation ) {
 			$updates[] = (object) $translation;
@@ -588,34 +626,43 @@ function wp_get_translation_updates() {
  * @return array
  */
 function wp_get_update_data() {
-	$counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0 );
+	$counts = array(
+		'plugins'      => 0,
+		'themes'       => 0,
+		'wordpress'    => 0,
+		'translations' => 0,
+	);
 
 	if ( $plugins = current_user_can( 'update_plugins' ) ) {
 		$update_plugins = get_site_transient( 'update_plugins' );
-		if ( ! empty( $update_plugins->response ) )
+		if ( ! empty( $update_plugins->response ) ) {
 			$counts['plugins'] = count( $update_plugins->response );
+		}
 	}
 
 	if ( $themes = current_user_can( 'update_themes' ) ) {
 		$update_themes = get_site_transient( 'update_themes' );
-		if ( ! empty( $update_themes->response ) )
+		if ( ! empty( $update_themes->response ) ) {
 			$counts['themes'] = count( $update_themes->response );
+		}
 	}
 
 	if ( ( $core = current_user_can( 'update_core' ) ) && function_exists( 'get_core_updates' ) ) {
-		$update_wordpress = get_core_updates( array('dismissed' => false) );
-		if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array('development', 'latest') ) && current_user_can('update_core') )
+		$update_wordpress = get_core_updates( array( 'dismissed' => false ) );
+		if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array( 'development', 'latest' ) ) && current_user_can( 'update_core' ) ) {
 			$counts['wordpress'] = 1;
+		}
 	}
 
-	if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() )
+	if ( ( $core || $plugins || $themes ) && wp_get_translation_updates() ) {
 		$counts['translations'] = 1;
+	}
 
 	$counts['total'] = $counts['plugins'] + $counts['themes'] + $counts['wordpress'] + $counts['translations'];
-	$titles = array();
+	$titles          = array();
 	if ( $counts['wordpress'] ) {
 		/* translators: 1: Number of updates available to WordPress */
-		$titles['wordpress'] = sprintf( __( '%d WordPress Update'), $counts['wordpress'] );
+		$titles['wordpress'] = sprintf( __( '%d WordPress Update' ), $counts['wordpress'] );
 	}
 	if ( $counts['plugins'] ) {
 		/* translators: 1: Number of updates available to plugins */
@@ -631,7 +678,10 @@ function wp_get_update_data() {
 
 	$update_title = $titles ? esc_attr( implode( ', ', $titles ) ) : '';
 
-	$update_data = array( 'counts' => $counts, 'title' => $update_title );
+	$update_data = array(
+		'counts' => $counts,
+		'title'  => $update_title,
+	);
 	/**
 	 * Filters the returned array of update data for plugins, themes, and WordPress core.
 	 *
@@ -680,8 +730,9 @@ function _maybe_update_core() {
  */
 function _maybe_update_plugins() {
 	$current = get_site_transient( 'update_plugins' );
-	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )
+	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) {
 		return;
+	}
 	wp_update_plugins();
 }
 
@@ -696,8 +747,9 @@ function _maybe_update_plugins() {
  */
 function _maybe_update_themes() {
 	$current = get_site_transient( 'update_themes' );
-	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) )
+	if ( isset( $current->last_checked ) && 12 * HOUR_IN_SECONDS > ( time() - $current->last_checked ) ) {
 		return;
+	}
 	wp_update_themes();
 }
 
@@ -707,14 +759,17 @@ function _maybe_update_themes() {
  * @since 3.1.0
  */
 function wp_schedule_update_checks() {
-	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
+	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) {
+		wp_schedule_event( time(), 'twicedaily', 'wp_version_check' );
+	}
 
-	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
+	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) {
+		wp_schedule_event( time(), 'twicedaily', 'wp_update_plugins' );
+	}
 
-	if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
+	if ( ! wp_next_scheduled( 'wp_update_themes' ) && ! wp_installing() ) {
+		wp_schedule_event( time(), 'twicedaily', 'wp_update_themes' );
+	}
 }
 
 /**
@@ -751,7 +806,7 @@ add_action( 'load-update-core.php', 'wp_update_themes' );
 add_action( 'admin_init', '_maybe_update_themes' );
 add_action( 'wp_update_themes', 'wp_update_themes' );
 
-add_action( 'update_option_WPLANG', 'wp_clean_update_cache' , 10, 0 );
+add_action( 'update_option_WPLANG', 'wp_clean_update_cache', 10, 0 );
 
 add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );
 
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 1c1e466bf4..9a685b9b36 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -31,21 +31,25 @@
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_signon( $credentials = array(), $secure_cookie = '' ) {
-	if ( empty($credentials) ) {
+	if ( empty( $credentials ) ) {
 		$credentials = array(); // Back-compat for plugins passing an empty string.
 
-		if ( ! empty($_POST['log']) )
+		if ( ! empty( $_POST['log'] ) ) {
 			$credentials['user_login'] = $_POST['log'];
-		if ( ! empty($_POST['pwd']) )
+		}
+		if ( ! empty( $_POST['pwd'] ) ) {
 			$credentials['user_password'] = $_POST['pwd'];
-		if ( ! empty($_POST['rememberme']) )
+		}
+		if ( ! empty( $_POST['rememberme'] ) ) {
 			$credentials['remember'] = $_POST['rememberme'];
+		}
 	}
 
-	if ( !empty($credentials['remember']) )
+	if ( ! empty( $credentials['remember'] ) ) {
 		$credentials['remember'] = true;
-	else
+	} else {
 		$credentials['remember'] = false;
+	}
 
 	/**
 	 * Fires before the user is authenticated.
@@ -62,8 +66,9 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
 	 */
 	do_action_ref_array( 'wp_authenticate', array( &$credentials['user_login'], &$credentials['user_password'] ) );
 
-	if ( '' === $secure_cookie )
+	if ( '' === $secure_cookie ) {
 		$secure_cookie = is_ssl();
+	}
 
 	/**
 	 * Filters whether to use a secure sign-on cookie.
@@ -72,32 +77,32 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
 	 *
 	 * @param bool  $secure_cookie Whether to use a secure sign-on cookie.
 	 * @param array $credentials {
- 	 *     Array of entered sign-on data.
- 	 *
- 	 *     @type string $user_login    Username.
- 	 *     @type string $user_password Password entered.
+	 *     Array of entered sign-on data.
+	 *
+	 *     @type string $user_login    Username.
+	 *     @type string $user_password Password entered.
 	 *     @type bool   $remember      Whether to 'remember' the user. Increases the time
 	 *                                 that the cookie will be kept. Default false.
- 	 * }
+	 * }
 	 */
 	$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
 
 	global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie
 	$auth_secure_cookie = $secure_cookie;
 
-	add_filter('authenticate', 'wp_authenticate_cookie', 30, 3);
+	add_filter( 'authenticate', 'wp_authenticate_cookie', 30, 3 );
 
-	$user = wp_authenticate($credentials['user_login'], $credentials['user_password']);
+	$user = wp_authenticate( $credentials['user_login'], $credentials['user_password'] );
 
-	if ( is_wp_error($user) ) {
-		if ( $user->get_error_codes() == array('empty_username', 'empty_password') ) {
-			$user = new WP_Error('', '');
+	if ( is_wp_error( $user ) ) {
+		if ( $user->get_error_codes() == array( 'empty_username', 'empty_password' ) ) {
+			$user = new WP_Error( '', '' );
 		}
 
 		return $user;
 	}
 
-	wp_set_auth_cookie($user->ID, $credentials['remember'], $secure_cookie);
+	wp_set_auth_cookie( $user->ID, $credentials['remember'], $secure_cookie );
 	/**
 	 * Fires after the user has successfully logged in.
 	 *
@@ -120,30 +125,34 @@ function wp_signon( $credentials = array(), $secure_cookie = '' ) {
  * @param string                $password Password for authentication.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_authenticate_username_password($user, $username, $password) {
+function wp_authenticate_username_password( $user, $username, $password ) {
 	if ( $user instanceof WP_User ) {
 		return $user;
 	}
 
-	if ( empty($username) || empty($password) ) {
-		if ( is_wp_error( $user ) )
+	if ( empty( $username ) || empty( $password ) ) {
+		if ( is_wp_error( $user ) ) {
 			return $user;
+		}
 
 		$error = new WP_Error();
 
-		if ( empty($username) )
-			$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
+		if ( empty( $username ) ) {
+			$error->add( 'empty_username', __( '<strong>ERROR</strong>: The username field is empty.' ) );
+		}
 
-		if ( empty($password) )
-			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
+		if ( empty( $password ) ) {
+			$error->add( 'empty_password', __( '<strong>ERROR</strong>: The password field is empty.' ) );
+		}
 
 		return $error;
 	}
 
-	$user = get_user_by('login', $username);
+	$user = get_user_by( 'login', $username );
 
-	if ( !$user ) {
-		return new WP_Error( 'invalid_username',
+	if ( ! $user ) {
+		return new WP_Error(
+			'invalid_username',
 			__( '<strong>ERROR</strong>: Invalid username.' ) .
 			' <a href="' . wp_lostpassword_url() . '">' .
 			__( 'Lost your password?' ) .
@@ -161,11 +170,13 @@ function wp_authenticate_username_password($user, $username, $password) {
 	 * @param string           $password Password to check against the user.
 	 */
 	$user = apply_filters( 'wp_authenticate_user', $user, $password );
-	if ( is_wp_error($user) )
+	if ( is_wp_error( $user ) ) {
 		return $user;
+	}
 
 	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
-		return new WP_Error( 'incorrect_password',
+		return new WP_Error(
+			'incorrect_password',
 			sprintf(
 				/* translators: %s: user name */
 				__( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ),
@@ -221,7 +232,8 @@ function wp_authenticate_email_password( $user, $email, $password ) {
 	$user = get_user_by( 'email', $email );
 
 	if ( ! $user ) {
-		return new WP_Error( 'invalid_email',
+		return new WP_Error(
+			'invalid_email',
 			__( '<strong>ERROR</strong>: Invalid email address.' ) .
 			' <a href="' . wp_lostpassword_url() . '">' .
 			__( 'Lost your password?' ) .
@@ -237,7 +249,8 @@ function wp_authenticate_email_password( $user, $email, $password ) {
 	}
 
 	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
-		return new WP_Error( 'incorrect_password',
+		return new WP_Error(
+			'incorrect_password',
 			sprintf(
 				/* translators: %s: email address */
 				__( '<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.' ),
@@ -264,25 +277,28 @@ function wp_authenticate_email_password( $user, $email, $password ) {
  * @param string                $password Password. If not empty, cancels the cookie authentication.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_authenticate_cookie($user, $username, $password) {
+function wp_authenticate_cookie( $user, $username, $password ) {
 	if ( $user instanceof WP_User ) {
 		return $user;
 	}
 
-	if ( empty($username) && empty($password) ) {
+	if ( empty( $username ) && empty( $password ) ) {
 		$user_id = wp_validate_auth_cookie();
-		if ( $user_id )
-			return new WP_User($user_id);
+		if ( $user_id ) {
+			return new WP_User( $user_id );
+		}
 
 		global $auth_secure_cookie;
 
-		if ( $auth_secure_cookie )
+		if ( $auth_secure_cookie ) {
 			$auth_cookie = SECURE_AUTH_COOKIE;
-		else
+		} else {
 			$auth_cookie = AUTH_COOKIE;
+		}
 
-		if ( !empty($_COOKIE[$auth_cookie]) )
-			return new WP_Error('expired_session', __('Please log in again.'));
+		if ( ! empty( $_COOKIE[ $auth_cookie ] ) ) {
+			return new WP_Error( 'expired_session', __( 'Please log in again.' ) );
+		}
 
 		// If the cookie is not set, be silent.
 	}
@@ -311,8 +327,9 @@ function wp_authenticate_spam_check( $user ) {
 		 */
 		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user );
 
-		if ( $spammed )
+		if ( $spammed ) {
 			return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		}
 	}
 	return $user;
 }
@@ -337,11 +354,11 @@ function wp_validate_logged_in_cookie( $user_id ) {
 		return $user_id;
 	}
 
-	if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[LOGGED_IN_COOKIE] ) ) {
+	if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
 		return false;
 	}
 
-	return wp_validate_auth_cookie( $_COOKIE[LOGGED_IN_COOKIE], 'logged_in' );
+	return wp_validate_auth_cookie( $_COOKIE[ LOGGED_IN_COOKIE ], 'logged_in' );
 }
 
 /**
@@ -397,11 +414,12 @@ function count_many_users_posts( $users, $post_type = 'post', $public_only = fal
 	global $wpdb;
 
 	$count = array();
-	if ( empty( $users ) || ! is_array( $users ) )
+	if ( empty( $users ) || ! is_array( $users ) ) {
 		return $count;
+	}
 
 	$userlist = implode( ',', array_map( 'absint', $users ) );
-	$where = get_posts_by_author_sql( $post_type, true, null, $public_only );
+	$where    = get_posts_by_author_sql( $post_type, true, null, $public_only );
 
 	$result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );
 	foreach ( $result as $row ) {
@@ -409,8 +427,9 @@ function count_many_users_posts( $users, $post_type = 'post', $public_only = fal
 	}
 
 	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
+		if ( ! isset( $count[ $id ] ) ) {
 			$count[ $id ] = 0;
+		}
 	}
 
 	return $count;
@@ -428,8 +447,9 @@ function count_many_users_posts( $users, $post_type = 'post', $public_only = fal
  * @return int The current user's ID, or 0 if no user is logged in.
  */
 function get_current_user_id() {
-	if ( ! function_exists( 'wp_get_current_user' ) )
+	if ( ! function_exists( 'wp_get_current_user' ) ) {
 		return 0;
+	}
 	$user = wp_get_current_user();
 	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
 }
@@ -456,22 +476,26 @@ function get_current_user_id() {
 function get_user_option( $option, $user = 0, $deprecated = '' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
-	if ( empty( $user ) )
+	if ( empty( $user ) ) {
 		$user = get_current_user_id();
+	}
 
-	if ( ! $user = get_userdata( $user ) )
+	if ( ! $user = get_userdata( $user ) ) {
 		return false;
+	}
 
 	$prefix = $wpdb->get_blog_prefix();
-	if ( $user->has_prop( $prefix . $option ) ) // Blog specific
+	if ( $user->has_prop( $prefix . $option ) ) { // Blog specific
 		$result = $user->get( $prefix . $option );
-	elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
+	} elseif ( $user->has_prop( $option ) ) { // User specific and cross-blog
 		$result = $user->get( $option );
-	else
+	} else {
 		$result = false;
+	}
 
 	/**
 	 * Filters a specific user option value.
@@ -511,8 +535,9 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
 function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
+	if ( ! $global ) {
 		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 
 	return update_user_meta( $user_id, $option_name, $newvalue );
 }
@@ -537,8 +562,9 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false
 function delete_user_option( $user_id, $option_name, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
+	if ( ! $global ) {
 		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 	return delete_user_meta( $user_id, $option_name );
 }
 
@@ -555,10 +581,10 @@ function delete_user_option( $user_id, $option_name, $global = false ) {
  */
 function get_users( $args = array() ) {
 
-	$args = wp_parse_args( $args );
+	$args                = wp_parse_args( $args );
 	$args['count_total'] = false;
 
-	$user_search = new WP_User_Query($args);
+	$user_search = new WP_User_Query( $args );
 
 	return (array) $user_search->get_results();
 }
@@ -583,8 +609,9 @@ function get_blogs_of_user( $user_id, $all = false ) {
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have sites
-	if ( empty( $user_id ) )
+	if ( empty( $user_id ) ) {
 		return array();
+	}
 
 	/**
 	 * Filters the list of a user's sites before it is populated.
@@ -606,21 +633,22 @@ function get_blogs_of_user( $user_id, $all = false ) {
 	}
 
 	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
+	if ( empty( $keys ) ) {
 		return array();
+	}
 
 	if ( ! is_multisite() ) {
-		$site_id = get_current_blog_id();
-		$sites = array( $site_id => new stdClass );
+		$site_id                        = get_current_blog_id();
+		$sites                          = array( $site_id => new stdClass );
 		$sites[ $site_id ]->userblog_id = $site_id;
-		$sites[ $site_id ]->blogname = get_option('blogname');
-		$sites[ $site_id ]->domain = '';
-		$sites[ $site_id ]->path = '';
-		$sites[ $site_id ]->site_id = 1;
-		$sites[ $site_id ]->siteurl = get_option('siteurl');
-		$sites[ $site_id ]->archived = 0;
-		$sites[ $site_id ]->spam = 0;
-		$sites[ $site_id ]->deleted = 0;
+		$sites[ $site_id ]->blogname    = get_option( 'blogname' );
+		$sites[ $site_id ]->domain      = '';
+		$sites[ $site_id ]->path        = '';
+		$sites[ $site_id ]->site_id     = 1;
+		$sites[ $site_id ]->siteurl     = get_option( 'siteurl' );
+		$sites[ $site_id ]->archived    = 0;
+		$sites[ $site_id ]->spam        = 0;
+		$sites[ $site_id ]->deleted     = 0;
 		return $sites;
 	}
 
@@ -634,13 +662,16 @@ function get_blogs_of_user( $user_id, $all = false ) {
 	$keys = array_keys( $keys );
 
 	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) )
+		if ( 'capabilities' !== substr( $key, -12 ) ) {
 			continue;
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
+		}
+		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) ) {
 			continue;
+		}
 		$site_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $site_id ) )
+		if ( ! is_numeric( $site_id ) ) {
 			continue;
+		}
 
 		$site_ids[] = (int) $site_id;
 	}
@@ -766,8 +797,8 @@ function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {
  * @param bool   $unique     Optional. Whether the same key should not be added. Default false.
  * @return int|false Meta ID on success, false on failure.
  */
-function add_user_meta($user_id, $meta_key, $meta_value, $unique = false) {
-	return add_metadata('user', $user_id, $meta_key, $meta_value, $unique);
+function add_user_meta( $user_id, $meta_key, $meta_value, $unique = false ) {
+	return add_metadata( 'user', $user_id, $meta_key, $meta_value, $unique );
 }
 
 /**
@@ -785,8 +816,8 @@ function add_user_meta($user_id, $meta_key, $meta_value, $unique = false) {
  * @param mixed  $meta_value Optional. Metadata value.
  * @return bool True on success, false on failure.
  */
-function delete_user_meta($user_id, $meta_key, $meta_value = '') {
-	return delete_metadata('user', $user_id, $meta_key, $meta_value);
+function delete_user_meta( $user_id, $meta_key, $meta_value = '' ) {
+	return delete_metadata( 'user', $user_id, $meta_key, $meta_value );
 }
 
 /**
@@ -800,8 +831,8 @@ function delete_user_meta($user_id, $meta_key, $meta_value = '') {
  * @param bool   $single  Whether to return a single value.
  * @return mixed Will be an array if $single is false. Will be value of meta data field if $single is true.
  */
-function get_user_meta($user_id, $key = '', $single = false) {
-	return get_metadata('user', $user_id, $key, $single);
+function get_user_meta( $user_id, $key = '', $single = false ) {
+	return get_metadata( 'user', $user_id, $key, $single );
 }
 
 /**
@@ -821,8 +852,8 @@ function get_user_meta($user_id, $key = '', $single = false) {
  * @param mixed  $prev_value Optional. Previous value to check before removing.
  * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
  */
-function update_user_meta($user_id, $meta_key, $meta_value, $prev_value = '') {
-	return update_metadata('user', $user_id, $meta_key, $meta_value, $prev_value);
+function update_user_meta( $user_id, $meta_key, $meta_value, $prev_value = '' ) {
+	return update_metadata( 'user', $user_id, $meta_key, $meta_value, $prev_value );
 }
 
 /**
@@ -852,7 +883,7 @@ function count_users( $strategy = 'time', $site_id = null ) {
 		$site_id = get_current_blog_id();
 	}
 	$blog_prefix = $wpdb->get_blog_prefix( $site_id );
-	$result = array();
+	$result      = array();
 
 	if ( 'time' == $strategy ) {
 		if ( is_multisite() && $site_id != get_current_blog_id() ) {
@@ -866,33 +897,35 @@ function count_users( $strategy = 'time', $site_id = null ) {
 		// Build a CPU-intensive query that will return concise information.
 		$select_count = array();
 		foreach ( $avail_roles as $this_role => $name ) {
-			$select_count[] = $wpdb->prepare( "COUNT(NULLIF(`meta_value` LIKE %s, false))", '%' . $wpdb->esc_like( '"' . $this_role . '"' ) . '%');
+			$select_count[] = $wpdb->prepare( 'COUNT(NULLIF(`meta_value` LIKE %s, false))', '%' . $wpdb->esc_like( '"' . $this_role . '"' ) . '%' );
 		}
 		$select_count[] = "COUNT(NULLIF(`meta_value` = 'a:0:{}', false))";
-		$select_count = implode(', ', $select_count);
+		$select_count   = implode( ', ', $select_count );
 
 		// Add the meta_value index to the selection list, then run the query.
-		$row = $wpdb->get_row( "
+		$row = $wpdb->get_row(
+			"
 			SELECT {$select_count}, COUNT(*)
 			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.
-		$col = 0;
+		$col         = 0;
 		$role_counts = array();
 		foreach ( $avail_roles as $this_role => $name ) {
-			$count = (int) $row[$col++];
-			if ($count > 0) {
-				$role_counts[$this_role] = $count;
+			$count = (int) $row[ $col++ ];
+			if ( $count > 0 ) {
+				$role_counts[ $this_role ] = $count;
 			}
 		}
 
-		$role_counts['none'] = (int) $row[$col++];
+		$role_counts['none'] = (int) $row[ $col++ ];
 
 		// Get the meta_value index from the end of the result set.
-		$total_users = (int) $row[$col];
+		$total_users = (int) $row[ $col ];
 
 		$result['total_users'] = $total_users;
 		$result['avail_roles'] =& $role_counts;
@@ -901,25 +934,28 @@ function count_users( $strategy = 'time', $site_id = null ) {
 			'none' => 0,
 		);
 
-		$users_of_blog = $wpdb->get_col( "
+		$users_of_blog = $wpdb->get_col(
+			"
 			SELECT meta_value
 			FROM {$wpdb->usermeta}
 			INNER JOIN {$wpdb->users} ON user_id = ID
 			WHERE meta_key = '{$blog_prefix}capabilities'
-		" );
+		"
+		);
 
 		foreach ( $users_of_blog as $caps_meta ) {
-			$b_roles = maybe_unserialize($caps_meta);
-			if ( ! is_array( $b_roles ) )
+			$b_roles = maybe_unserialize( $caps_meta );
+			if ( ! is_array( $b_roles ) ) {
 				continue;
+			}
 			if ( empty( $b_roles ) ) {
 				$avail_roles['none']++;
 			}
 			foreach ( $b_roles as $b_role => $val ) {
-				if ( isset($avail_roles[$b_role]) ) {
-					$avail_roles[$b_role]++;
+				if ( isset( $avail_roles[ $b_role ] ) ) {
+					$avail_roles[ $b_role ]++;
 				} else {
-					$avail_roles[$b_role] = 1;
+					$avail_roles[ $b_role ] = 1;
 				}
 			}
 		}
@@ -952,27 +988,28 @@ function count_users( $strategy = 'time', $site_id = null ) {
  *
  * @param int $for_user_id Optional. User ID to set up global data.
  */
-function setup_userdata($for_user_id = '') {
+function setup_userdata( $for_user_id = '' ) {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_identity;
 
-	if ( '' == $for_user_id )
+	if ( '' == $for_user_id ) {
 		$for_user_id = get_current_user_id();
+	}
 	$user = get_userdata( $for_user_id );
 
 	if ( ! $user ) {
-		$user_ID = 0;
+		$user_ID    = 0;
 		$user_level = 0;
-		$userdata = null;
+		$userdata   = null;
 		$user_login = $user_email = $user_url = $user_identity = '';
 		return;
 	}
 
-	$user_ID    = (int) $user->ID;
-	$user_level = (int) $user->user_level;
-	$userdata   = $user;
-	$user_login = $user->user_login;
-	$user_email = $user->user_email;
-	$user_url   = $user->user_url;
+	$user_ID       = (int) $user->ID;
+	$user_level    = (int) $user->user_level;
+	$userdata      = $user;
+	$user_login    = $user->user_login;
+	$user_email    = $user->user_email;
+	$user_url      = $user->user_url;
 	$user_identity = $user->display_name;
 }
 
@@ -1041,16 +1078,27 @@ function setup_userdata($for_user_id = '') {
  */
 function wp_dropdown_users( $args = '' ) {
 	$defaults = array(
-		'show_option_all' => '', 'show_option_none' => '', 'hide_if_only_one_author' => '',
-		'orderby' => 'display_name', 'order' => 'ASC',
-		'include' => '', 'exclude' => '', 'multi' => 0,
-		'show' => 'display_name', 'echo' => 1,
-		'selected' => 0, 'name' => 'user', 'class' => '', 'id' => '',
-		'blog_id' => get_current_blog_id(), 'who' => '', 'include_selected' => false,
-		'option_none_value' => -1,
-		'role' => '',
-		'role__in' => array(),
-		'role__not_in' => array(),
+		'show_option_all'         => '',
+		'show_option_none'        => '',
+		'hide_if_only_one_author' => '',
+		'orderby'                 => 'display_name',
+		'order'                   => 'ASC',
+		'include'                 => '',
+		'exclude'                 => '',
+		'multi'                   => 0,
+		'show'                    => 'display_name',
+		'echo'                    => 1,
+		'selected'                => 0,
+		'name'                    => 'user',
+		'class'                   => '',
+		'id'                      => '',
+		'blog_id'                 => get_current_blog_id(),
+		'who'                     => '',
+		'include_selected'        => false,
+		'option_none_value'       => -1,
+		'role'                    => '',
+		'role__in'                => array(),
+		'role__not_in'            => array(),
 	);
 
 	$defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
@@ -1070,8 +1118,8 @@ function wp_dropdown_users( $args = '' ) {
 
 	$query_args['fields'] = $fields;
 
-	$show_option_all = $r['show_option_all'];
-	$show_option_none = $r['show_option_none'];
+	$show_option_all   = $r['show_option_all'];
+	$show_option_none  = $r['show_option_none'];
 	$option_none_value = $r['option_none_value'];
 
 	/**
@@ -1102,12 +1150,12 @@ function wp_dropdown_users( $args = '' ) {
 
 		if ( $show_option_none ) {
 			$_selected = selected( $option_none_value, $r['selected'], false );
-			$output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
+			$output   .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
 		}
 
 		if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) {
 			$found_selected = false;
-			$r['selected'] = (int) $r['selected'];
+			$r['selected']  = (int) $r['selected'];
 			foreach ( (array) $users as $user ) {
 				$user->ID = (int) $user->ID;
 				if ( $user->ID === $r['selected'] ) {
@@ -1131,10 +1179,10 @@ function wp_dropdown_users( $args = '' ) {
 			}
 
 			$_selected = selected( $user->ID, $r['selected'], false );
-			$output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+			$output   .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
 		}
 
-		$output .= "</select>";
+		$output .= '</select>';
 	}
 
 	/**
@@ -1168,16 +1216,19 @@ function wp_dropdown_users( $args = '' ) {
  *                        'attribute' and 'js'.
  * @return mixed Sanitized value.
  */
-function sanitize_user_field($field, $value, $user_id, $context) {
-	$int_fields = array('ID');
-	if ( in_array($field, $int_fields) )
+function sanitize_user_field( $field, $value, $user_id, $context ) {
+	$int_fields = array( 'ID' );
+	if ( in_array( $field, $int_fields ) ) {
 		$value = (int) $value;
+	}
 
-	if ( 'raw' == $context )
+	if ( 'raw' == $context ) {
 		return $value;
+	}
 
-	if ( !is_string($value) && !is_numeric($value) )
+	if ( ! is_string( $value ) && ! is_numeric( $value ) ) {
 		return $value;
+	}
 
 	$prefixed = false !== strpos( $field, 'user_' );
 
@@ -1202,10 +1253,11 @@ function sanitize_user_field($field, $value, $user_id, $context) {
 			$value = apply_filters( "edit_user_{$field}", $value, $user_id );
 		}
 
-		if ( 'description' == $field )
+		if ( 'description' == $field ) {
 			$value = esc_html( $value ); // textarea_escaped?
-		else
-			$value = esc_attr($value);
+		} else {
+			$value = esc_attr( $value );
+		}
 	} elseif ( 'db' == $context ) {
 		if ( $prefixed ) {
 			/** This filter is documented in wp-includes/post.php */
@@ -1217,7 +1269,7 @@ function sanitize_user_field($field, $value, $user_id, $context) {
 			 *
 			 * The dynamic portion of the hook name, `$field`, refers to the prefixed user
 			 * field being filtered, such as 'user_login', 'user_email', 'first_name', etc.
- 			 *
+			 *
 			 * @since 2.9.0
 			 *
 			 * @param mixed $value Value of the prefixed user field.
@@ -1248,8 +1300,9 @@ function sanitize_user_field($field, $value, $user_id, $context) {
 		}
 	}
 
-	if ( 'user_url' == $field )
-		$value = esc_url($value);
+	if ( 'user_url' == $field ) {
+		$value = esc_url( $value );
+	}
 
 	if ( 'attribute' == $context ) {
 		$value = esc_attr( $value );
@@ -1276,10 +1329,10 @@ function update_user_caches( $user ) {
 		$user = $user->data;
 	}
 
-	wp_cache_add($user->ID, $user, 'users');
-	wp_cache_add($user->user_login, $user->ID, 'userlogins');
-	wp_cache_add($user->user_email, $user->ID, 'useremail');
-	wp_cache_add($user->user_nicename, $user->ID, 'userslugs');
+	wp_cache_add( $user->ID, $user, 'users' );
+	wp_cache_add( $user->user_login, $user->ID, 'userlogins' );
+	wp_cache_add( $user->user_email, $user->ID, 'useremail' );
+	wp_cache_add( $user->user_nicename, $user->ID, 'userslugs' );
 }
 
 /**
@@ -1291,11 +1344,13 @@ function update_user_caches( $user ) {
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
 function clean_user_cache( $user ) {
-	if ( is_numeric( $user ) )
+	if ( is_numeric( $user ) ) {
 		$user = new WP_User( $user );
+	}
 
-	if ( ! $user->exists() )
+	if ( ! $user->exists() ) {
 		return;
+	}
 
 	wp_cache_delete( $user->ID, 'users' );
 	wp_cache_delete( $user->user_login, 'userlogins' );
@@ -1348,7 +1403,7 @@ function username_exists( $username ) {
  * @return int|false The user's ID on success, and false on failure.
  */
 function email_exists( $email ) {
-	if ( $user = get_user_by( 'email', $email) ) {
+	if ( $user = get_user_by( 'email', $email ) ) {
 		return $user->ID;
 	}
 	return false;
@@ -1365,7 +1420,7 @@ function email_exists( $email ) {
  */
 function validate_username( $username ) {
 	$sanitized = sanitize_user( $username, true );
-	$valid = ( $sanitized == $username && ! empty( $sanitized ) );
+	$valid     = ( $sanitized == $username && ! empty( $sanitized ) );
 
 	/**
 	 * Filters whether the provided username is valid or not.
@@ -1443,8 +1498,8 @@ function wp_insert_user( $userdata ) {
 
 	// Are we updating or creating?
 	if ( ! empty( $userdata['ID'] ) ) {
-		$ID = (int) $userdata['ID'];
-		$update = true;
+		$ID            = (int) $userdata['ID'];
+		$update        = true;
 		$old_user_data = get_userdata( $ID );
 
 		if ( ! $old_user_data ) {
@@ -1477,7 +1532,7 @@ function wp_insert_user( $userdata ) {
 
 	// user_login must be between 0 and 60 characters.
 	if ( empty( $user_login ) ) {
-		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
+		return new WP_Error( 'empty_user_login', __( 'Cannot create a user with an empty login name.' ) );
 	} elseif ( mb_strlen( $user_login ) > 60 ) {
 		return new WP_Error( 'user_login_too_long', __( 'Username may not be longer than 60 characters.' ) );
 	}
@@ -1635,7 +1690,7 @@ function wp_insert_user( $userdata ) {
 
 	$meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
 
-	$admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
+	$admin_color         = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
 	$meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
 
 	$meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
@@ -1646,22 +1701,22 @@ function wp_insert_user( $userdata ) {
 
 	$meta['locale'] = isset( $userdata['locale'] ) ? $userdata['locale'] : '';
 
-	$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
+	$user_nicename_check = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $user_nicename, $user_login ) );
 
 	if ( $user_nicename_check ) {
 		$suffix = 2;
-		while ($user_nicename_check) {
+		while ( $user_nicename_check ) {
 			// user_nicename allows 50 chars. Subtract one for a hyphen, plus the length of the suffix.
-			$base_length = 49 - mb_strlen( $suffix );
-			$alt_user_nicename = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix";
-			$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
+			$base_length         = 49 - mb_strlen( $suffix );
+			$alt_user_nicename   = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix";
+			$user_nicename_check = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $alt_user_nicename, $user_login ) );
 			$suffix++;
 		}
 		$user_nicename = $alt_user_nicename;
 	}
 
 	$compacted = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
-	$data = wp_unslash( $compacted );
+	$data      = wp_unslash( $compacted );
 
 	if ( ! $update ) {
 		$data = $data + compact( 'user_login' );
@@ -1705,17 +1760,17 @@ function wp_insert_user( $userdata ) {
 	$user = new WP_User( $user_id );
 
 	/**
- 	 * Filters a user's meta values and keys immediately after the user is created or updated
- 	 * and before any user meta is inserted or updated.
- 	 *
- 	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
- 	 *
- 	 * @since 4.4.0
- 	 *
- 	 * @param array $meta {
- 	 *     Default meta values and keys for the user.
- 	 *
- 	 *     @type string   $nickname             The user's nickname. Default is the user's username.
+	 * Filters a user's meta values and keys immediately after the user is created or updated
+	 * and before any user meta is inserted or updated.
+	 *
+	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param array $meta {
+	 *     Default meta values and keys for the user.
+	 *
+	 *     @type string   $nickname             The user's nickname. Default is the user's username.
 	 *     @type string   $first_name           The user's first name.
 	 *     @type string   $last_name            The user's last name.
 	 *     @type string   $description          The user's description.
@@ -1727,10 +1782,10 @@ function wp_insert_user( $userdata ) {
 	 *                                          not forced.
 	 *     @type bool     $show_admin_bar_front Whether to show the admin bar on the front end for the user.
 	 *                                          Default true.
- 	 * }
+	 * }
 	 * @param WP_User $user   User object.
 	 * @param bool    $update Whether the user is being updated rather than created.
- 	 */
+	 */
 	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update );
 
 	// Update user meta.
@@ -1747,7 +1802,7 @@ function wp_insert_user( $userdata ) {
 	if ( isset( $userdata['role'] ) ) {
 		$user->set_role( $userdata['role'] );
 	} elseif ( ! $update ) {
-		$user->set_role(get_option('default_role'));
+		$user->set_role( get_option( 'default_role' ) );
 	}
 	wp_cache_delete( $user_id, 'users' );
 	wp_cache_delete( $user_login, 'userlogins' );
@@ -1792,7 +1847,7 @@ function wp_insert_user( $userdata ) {
  * @param object|WP_User $userdata An array of user data or a user object of type stdClass or WP_User.
  * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated.
  */
-function wp_update_user($userdata) {
+function wp_update_user( $userdata ) {
 	if ( $userdata instanceof stdClass ) {
 		$userdata = get_object_vars( $userdata );
 	} elseif ( $userdata instanceof WP_User ) {
@@ -1822,7 +1877,7 @@ function wp_update_user($userdata) {
 
 	if ( ! empty( $userdata['user_pass'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) {
 		// If password is changing, hash it now
-		$plaintext_pass = $userdata['user_pass'];
+		$plaintext_pass        = $userdata['user_pass'];
 		$userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] );
 
 		/**
@@ -1835,7 +1890,6 @@ function wp_update_user($userdata) {
 		 * @param bool  $send     Whether to send the email.
 		 * @param array $user     The original user array.
 		 * @param array $userdata The updated user array.
-		 *
 		 */
 		$send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
 	}
@@ -1851,7 +1905,6 @@ function wp_update_user($userdata) {
 		 * @param bool  $send     Whether to send the email.
 		 * @param array $user     The original user array.
 		 * @param array $userdata The updated user array.
-		 *
 		 */
 		$send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
 	}
@@ -1861,7 +1914,7 @@ function wp_update_user($userdata) {
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$userdata = array_merge( $user, $userdata );
-	$user_id = wp_insert_user( $userdata );
+	$user_id  = wp_insert_user( $userdata );
 
 	if ( ! is_wp_error( $user_id ) ) {
 
@@ -1874,7 +1927,8 @@ function wp_update_user($userdata) {
 
 		if ( ! empty( $send_password_change_email ) ) {
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$pass_change_text = __( 'Hi ###USERNAME###,
+			$pass_change_text = __(
+				'Hi ###USERNAME###,
 
 This notice confirms that your password was changed on ###SITENAME###.
 
@@ -1885,7 +1939,8 @@ This email has been sent to ###EMAIL###
 
 Regards,
 All at ###SITENAME###
-###SITEURL###' );
+###SITEURL###'
+			);
 
 			$pass_change_email = array(
 				'to'      => $user['user_email'],
@@ -1915,7 +1970,6 @@ All at ###SITENAME###
 			 *        }
 			 * @param array $user     The original user array.
 			 * @param array $userdata The updated user array.
-			 *
 			 */
 			$pass_change_email = apply_filters( 'password_change_email', $pass_change_email, $user, $userdata );
 
@@ -1930,7 +1984,8 @@ All at ###SITENAME###
 
 		if ( ! empty( $send_email_change_email ) ) {
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, NEW_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$email_change_text = __( 'Hi ###USERNAME###,
+			$email_change_text = __(
+				'Hi ###USERNAME###,
 
 This notice confirms that your email address on ###SITENAME### was changed to ###NEW_EMAIL###.
 
@@ -1941,7 +1996,8 @@ This email has been sent to ###EMAIL###
 
 Regards,
 All at ###SITENAME###
-###SITEURL###' );
+###SITEURL###'
+			);
 
 			$email_change_email = array(
 				'to'      => $user['user_email'],
@@ -1993,12 +2049,12 @@ All at ###SITENAME###
 	// Update the cookies if the password changed.
 	$current_user = wp_get_current_user();
 	if ( $current_user->ID == $ID ) {
-		if ( isset($plaintext_pass) ) {
+		if ( isset( $plaintext_pass ) ) {
 			wp_clear_auth_cookie();
 
 			// Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
 			// If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
-			$logged_in_cookie    = wp_parse_auth_cookie( '', 'logged_in' );
+			$logged_in_cookie = wp_parse_auth_cookie( '', 'logged_in' );
 			/** This filter is documented in wp-includes/pluggable.php */
 			$default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $ID, false );
 			$remember            = ( ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life );
@@ -2025,13 +2081,13 @@ All at ###SITENAME###
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
  */
-function wp_create_user($username, $password, $email = '') {
+function wp_create_user( $username, $password, $email = '' ) {
 	$user_login = wp_slash( $username );
-	$user_email = wp_slash( $email    );
-	$user_pass = $password;
+	$user_email = wp_slash( $email );
+	$user_pass  = $password;
 
-	$userdata = compact('user_login', 'user_email', 'user_pass');
-	return wp_insert_user($userdata);
+	$userdata = compact( 'user_login', 'user_email', 'user_pass' );
+	return wp_insert_user( $userdata );
 }
 
 /**
@@ -2067,7 +2123,7 @@ function wp_get_user_contact_methods( $user = null ) {
 		$methods = array(
 			'aim'    => __( 'AIM' ),
 			'yim'    => __( 'Yahoo IM' ),
-			'jabber' => __( 'Jabber / Google Talk' )
+			'jabber' => __( 'Jabber / Google Talk' ),
 		);
 	}
 
@@ -2077,7 +2133,7 @@ function wp_get_user_contact_methods( $user = null ) {
 	 * @since 2.9.0
 	 *
 	 * @param array   $methods Array of contact methods and their labels.
- 	 * @param WP_User $user    WP_User object.
+	 * @param WP_User $user    WP_User object.
 	 */
 	return apply_filters( 'user_contactmethods', $methods, $user );
 }
@@ -2192,7 +2248,7 @@ function get_password_reset_key( $user ) {
 		require_once ABSPATH . WPINC . '/class-phpass.php';
 		$wp_hasher = new PasswordHash( 8, true );
 	}
-	$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
+	$hashed    = time() . ':' . $wp_hasher->HashPassword( $key );
 	$key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
 	if ( false === $key_saved ) {
 		return new WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) );
@@ -2218,20 +2274,23 @@ function get_password_reset_key( $user ) {
  * @param string $login     The user login.
  * @return WP_User|WP_Error WP_User object on success, WP_Error object for invalid or expired keys.
  */
-function check_password_reset_key($key, $login) {
+function check_password_reset_key( $key, $login ) {
 	global $wpdb, $wp_hasher;
 
-	$key = preg_replace('/[^a-z0-9]/i', '', $key);
+	$key = preg_replace( '/[^a-z0-9]/i', '', $key );
 
-	if ( empty( $key ) || !is_string( $key ) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty( $key ) || ! is_string( $key ) ) {
+		return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	}
 
-	if ( empty($login) || !is_string($login) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty( $login ) || ! is_string( $login ) ) {
+		return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	}
 
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
-	if ( ! $row )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( ! $row ) {
+		return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	}
 
 	if ( empty( $wp_hasher ) ) {
 		require_once ABSPATH . WPINC . '/class-phpass.php';
@@ -2249,9 +2308,9 @@ function check_password_reset_key($key, $login) {
 
 	if ( false !== strpos( $row->user_activation_key, ':' ) ) {
 		list( $pass_request_time, $pass_key ) = explode( ':', $row->user_activation_key, 2 );
-		$expiration_time = $pass_request_time + $expiration_duration;
+		$expiration_time                      = $pass_request_time + $expiration_duration;
 	} else {
-		$pass_key = $row->user_activation_key;
+		$pass_key        = $row->user_activation_key;
 		$expiration_time = false;
 	}
 
@@ -2269,7 +2328,7 @@ function check_password_reset_key($key, $login) {
 	}
 
 	if ( hash_equals( $row->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) {
-		$return = new WP_Error( 'expired_key', __( 'Invalid key' ) );
+		$return  = new WP_Error( 'expired_key', __( 'Invalid key' ) );
 		$user_id = $row->ID;
 
 		/**
@@ -2402,11 +2461,12 @@ function register_new_user( $user_login, $user_email ) {
 	 */
 	$errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
 
-	if ( $errors->get_error_code() )
+	if ( $errors->get_error_code() ) {
 		return $errors;
+	}
 
 	$user_pass = wp_generate_password( 12, false );
-	$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
+	$user_id   = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
 	if ( ! $user_id || is_wp_error( $user_id ) ) {
 		$errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
 		return $errors;
@@ -2529,14 +2589,18 @@ function wp_get_users_with_no_role( $site_id = null ) {
 		$role_names = wp_roles()->get_names();
 	}
 
-	$regex  = implode( '|', array_keys( $role_names ) );
-	$regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
-	$users  = $wpdb->get_col( $wpdb->prepare( "
+	$regex = implode( '|', array_keys( $role_names ) );
+	$regex = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
+	$users = $wpdb->get_col(
+		$wpdb->prepare(
+			"
 		SELECT user_id
 		FROM $wpdb->usermeta
 		WHERE meta_key = '{$prefix}capabilities'
 		AND meta_value NOT REGEXP %s
-	", $regex ) );
+	", $regex
+		)
+	);
 
 	return $users;
 }
@@ -2570,7 +2634,7 @@ function _wp_get_current_user() {
 
 		// Upgrade stdClass to WP_User
 		if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
-			$cur_id = $current_user->ID;
+			$cur_id       = $current_user->ID;
 			$current_user = null;
 			wp_set_current_user( $cur_id );
 			return $current_user;
@@ -2582,7 +2646,7 @@ function _wp_get_current_user() {
 		return $current_user;
 	}
 
-	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
+	if ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
 		wp_set_current_user( 0 );
 		return $current_user;
 	}
@@ -2634,17 +2698,21 @@ 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(
-				'form-field' => 'email',
-			) );
+			$errors->add(
+				'user_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array(
+					'form-field' => 'email',
+				)
+			);
 
 			return;
 		}
 
 		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(
-				'form-field' => 'email',
-			) );
+			$errors->add(
+				'user_email', __( '<strong>ERROR</strong>: The email address is already used.' ), array(
+					'form-field' => 'email',
+				)
+			);
 			delete_user_meta( $current_user->ID, '_new_email' );
 
 			return;
@@ -2664,7 +2732,8 @@ function send_confirmation_on_profile_email() {
 		}
 
 		/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-		$email_text = __( 'Howdy ###USERNAME###,
+		$email_text = __(
+			'Howdy ###USERNAME###,
 
 You recently requested to have the email address on your account changed.
 
@@ -2678,7 +2747,8 @@ This email has been sent to ###EMAIL###
 
 Regards,
 All at ###SITENAME###
-###SITEURL###' );
+###SITEURL###'
+		);
 
 		/**
 		 * Filters the text of the email sent when a change of user email address is attempted.
diff --git a/wp-includes/vars.php b/wp-includes/vars.php
index 89b3532327..b398c56eab 100644
--- a/wp-includes/vars.php
+++ b/wp-includes/vars.php
@@ -22,40 +22,43 @@ global $pagenow,
 // On which page are we ?
 if ( is_admin() ) {
 	// wp-admin pages are checked more carefully
-	if ( is_network_admin() )
-		preg_match('#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	elseif ( is_user_admin() )
-		preg_match('#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
-	else
-		preg_match('#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches);
+	if ( is_network_admin() ) {
+		preg_match( '#/wp-admin/network/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches );
+	} elseif ( is_user_admin() ) {
+		preg_match( '#/wp-admin/user/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches );
+	} else {
+		preg_match( '#/wp-admin/?(.*?)$#i', $_SERVER['PHP_SELF'], $self_matches );
+	}
 	$pagenow = $self_matches[1];
-	$pagenow = trim($pagenow, '/');
-	$pagenow = preg_replace('#\?.*?$#', '', $pagenow);
+	$pagenow = trim( $pagenow, '/' );
+	$pagenow = preg_replace( '#\?.*?$#', '', $pagenow );
 	if ( '' === $pagenow || 'index' === $pagenow || 'index.php' === $pagenow ) {
 		$pagenow = 'index.php';
 	} else {
-		preg_match('#(.*?)(/|$)#', $pagenow, $self_matches);
-		$pagenow = strtolower($self_matches[1]);
-		if ( '.php' !== substr($pagenow, -4, 4) )
+		preg_match( '#(.*?)(/|$)#', $pagenow, $self_matches );
+		$pagenow = strtolower( $self_matches[1] );
+		if ( '.php' !== substr( $pagenow, -4, 4 ) ) {
 			$pagenow .= '.php'; // for Options +Multiviews: /wp-admin/themes/index.php (themes.php is queried)
+		}
 	}
 } else {
-	if ( preg_match('#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches) )
-		$pagenow = strtolower($self_matches[1]);
-	else
+	if ( preg_match( '#([^/]+\.php)([?/].*?)?$#i', $_SERVER['PHP_SELF'], $self_matches ) ) {
+		$pagenow = strtolower( $self_matches[1] );
+	} else {
 		$pagenow = 'index.php';
+	}
 }
-unset($self_matches);
+unset( $self_matches );
 
 // Simple browser detection
 $is_lynx = $is_gecko = $is_winIE = $is_macIE = $is_opera = $is_NS4 = $is_safari = $is_chrome = $is_iphone = $is_edge = false;
 
-if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
-	if ( strpos($_SERVER['HTTP_USER_AGENT'], 'Lynx') !== false ) {
+if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
+	if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Lynx' ) !== false ) {
 		$is_lynx = true;
 	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edge' ) !== false ) {
 		$is_edge = true;
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'chrome') !== false ) {
+	} elseif ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chrome' ) !== false ) {
 		if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
 			$is_admin = is_admin();
 			/**
@@ -65,29 +68,31 @@ if ( isset($_SERVER['HTTP_USER_AGENT']) ) {
 			 *
 			 * @param bool $is_admin Whether to use the Google Chrome Frame. Default is the value of is_admin().
 			 */
-			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) )
+			if ( $is_chrome = apply_filters( 'use_google_chrome_frame', $is_admin ) ) {
 				header( 'X-UA-Compatible: chrome=1' );
+			}
 			$is_winIE = ! $is_chrome;
 		} else {
 			$is_chrome = true;
 		}
-	} elseif ( stripos($_SERVER['HTTP_USER_AGENT'], 'safari') !== false ) {
+	} elseif ( stripos( $_SERVER['HTTP_USER_AGENT'], 'safari' ) !== false ) {
 		$is_safari = true;
-	} elseif ( ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false ) && strpos($_SERVER['HTTP_USER_AGENT'], 'Win') !== false ) {
+	} elseif ( ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false || strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident' ) !== false ) && strpos( $_SERVER['HTTP_USER_AGENT'], 'Win' ) !== false ) {
 		$is_winIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ) {
+	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false && strpos( $_SERVER['HTTP_USER_AGENT'], 'Mac' ) !== false ) {
 		$is_macIE = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false ) {
+	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Gecko' ) !== false ) {
 		$is_gecko = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false ) {
+	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera' ) !== false ) {
 		$is_opera = true;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Nav') !== false && strpos($_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.') !== false ) {
+	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Nav' ) !== false && strpos( $_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.' ) !== false ) {
 		$is_NS4 = true;
 	}
 }
 
-if ( $is_safari && stripos($_SERVER['HTTP_USER_AGENT'], 'mobile') !== false )
+if ( $is_safari && stripos( $_SERVER['HTTP_USER_AGENT'], 'mobile' ) !== false ) {
 	$is_iphone = true;
+}
 
 $is_IE = ( $is_macIE || $is_winIE );
 
@@ -95,24 +100,28 @@ $is_IE = ( $is_macIE || $is_winIE );
 
 /**
  * Whether the server software is Apache or something else
+ *
  * @global bool $is_apache
  */
-$is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false);
+$is_apache = ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) !== false );
 
 /**
  * Whether the server software is Nginx or something else
+ *
  * @global bool $is_nginx
  */
-$is_nginx = (strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
+$is_nginx = ( strpos( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) !== false );
 
 /**
  * Whether the server software is IIS or something else
+ *
  * @global bool $is_IIS
  */
-$is_IIS = !$is_apache && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer') !== false);
+$is_IIS = ! $is_apache && ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer' ) !== false );
 
 /**
  * Whether the server software is IIS 7.X or greater
+ *
  * @global bool $is_iis7
  */
 $is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
@@ -121,19 +130,19 @@ $is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SER
  * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
  *
  * @since 3.4.0
- * 
+ *
  * @return bool
  */
 function wp_is_mobile() {
-	if ( empty($_SERVER['HTTP_USER_AGENT']) ) {
+	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
 		$is_mobile = false;
-	} elseif ( strpos($_SERVER['HTTP_USER_AGENT'], 'Mobile') !== false // many mobile devices (all iPhone, iPad, etc.)
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Android') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Silk/') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Kindle') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'BlackBerry') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mini') !== false
-		|| strpos($_SERVER['HTTP_USER_AGENT'], 'Opera Mobi') !== false ) {
+	} elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Mobile' ) !== false // many mobile devices (all iPhone, iPad, etc.)
+		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Android' ) !== false
+		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Silk/' ) !== false
+		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Kindle' ) !== false
+		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'BlackBerry' ) !== false
+		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera Mini' ) !== false
+		|| strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera Mobi' ) !== false ) {
 			$is_mobile = true;
 	} else {
 		$is_mobile = false;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 055157230c..9eb47ef58a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42342';
+$wp_version = '5.0-alpha-42343';
 
 /**
  * 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 3db5fb8c2a..b78ba89f8b 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -87,7 +87,7 @@ $GLOBALS['_wp_deprecated_widgets_callbacks'] = array(
 	'wp_widget_rss',
 	'wp_widget_rss_control',
 	'wp_widget_recent_comments',
-	'wp_widget_recent_comments_control'
+	'wp_widget_recent_comments_control',
 );
 
 //
@@ -167,22 +167,24 @@ function register_sidebars( $number = 1, $args = array() ) {
 	global $wp_registered_sidebars;
 	$number = (int) $number;
 
-	if ( is_string($args) )
-		parse_str($args, $args);
+	if ( is_string( $args ) ) {
+		parse_str( $args, $args );
+	}
 
 	for ( $i = 1; $i <= $number; $i++ ) {
 		$_args = $args;
 
-		if ( $number > 1 )
-			$_args['name'] = isset($args['name']) ? sprintf($args['name'], $i) : sprintf(__('Sidebar %d'), $i);
-		else
-			$_args['name'] = isset($args['name']) ? $args['name'] : __('Sidebar');
+		if ( $number > 1 ) {
+			$_args['name'] = isset( $args['name'] ) ? sprintf( $args['name'], $i ) : sprintf( __( 'Sidebar %d' ), $i );
+		} else {
+			$_args['name'] = isset( $args['name'] ) ? $args['name'] : __( 'Sidebar' );
+		}
 
 		// Custom specified ID's are suffixed if they exist already.
 		// Automatically generated sidebar names need to be suffixed regardless starting at -0
-		if ( isset($args['id']) ) {
+		if ( isset( $args['id'] ) ) {
 			$_args['id'] = $args['id'];
-			$n = 2; // Start at -2 for conflicting custom ID's
+			$n           = 2; // Start at -2 for conflicting custom ID's
 			while ( is_registered_sidebar( $_args['id'] ) ) {
 				$_args['id'] = $args['id'] . '-' . $n++;
 			}
@@ -192,7 +194,7 @@ function register_sidebars( $number = 1, $args = array() ) {
 				$_args['id'] = 'sidebar-' . ++$n;
 			} while ( is_registered_sidebar( $_args['id'] ) );
 		}
-		register_sidebar($_args);
+		register_sidebar( $_args );
 	}
 }
 
@@ -237,22 +239,22 @@ function register_sidebars( $number = 1, $args = array() ) {
  * }
  * @return string Sidebar ID added to $wp_registered_sidebars global.
  */
-function register_sidebar($args = array()) {
+function register_sidebar( $args = array() ) {
 	global $wp_registered_sidebars;
 
-	$i = count($wp_registered_sidebars) + 1;
+	$i = count( $wp_registered_sidebars ) + 1;
 
 	$id_is_empty = empty( $args['id'] );
 
 	$defaults = array(
-		'name' => sprintf(__('Sidebar %d'), $i ),
-		'id' => "sidebar-$i",
-		'description' => '',
-		'class' => '',
+		'name'          => sprintf( __( 'Sidebar %d' ), $i ),
+		'id'            => "sidebar-$i",
+		'description'   => '',
+		'class'         => '',
 		'before_widget' => '<li id="%1$s" class="widget %2$s">',
-		'after_widget' => "</li>\n",
-		'before_title' => '<h2 class="widgettitle">',
-		'after_title' => "</h2>\n",
+		'after_widget'  => "</li>\n",
+		'before_title'  => '<h2 class="widgettitle">',
+		'after_title'   => "</h2>\n",
 	);
 
 	$sidebar = wp_parse_args( $args, $defaults );
@@ -262,9 +264,9 @@ function register_sidebar($args = array()) {
 		_doing_it_wrong( __FUNCTION__, sprintf( __( 'No %1$s was set in the arguments array for the "%2$s" sidebar. Defaulting to "%3$s". Manually set the %1$s to "%3$s" to silence this notice and keep existing sidebar content.' ), '<code>id</code>', $sidebar['name'], $sidebar['id'] ), '4.2.0' );
 	}
 
-	$wp_registered_sidebars[$sidebar['id']] = $sidebar;
+	$wp_registered_sidebars[ $sidebar['id'] ] = $sidebar;
 
-	add_theme_support('widgets');
+	add_theme_support( 'widgets' );
 
 	/**
 	 * Fires once a sidebar has been registered.
@@ -339,31 +341,31 @@ function is_registered_sidebar( $sidebar_id ) {
 function wp_register_sidebar_widget( $id, $name, $output_callback, $options = array() ) {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates, $_wp_deprecated_widgets_callbacks;
 
-	$id = strtolower($id);
+	$id = strtolower( $id );
 
-	if ( empty($output_callback) ) {
-		unset($wp_registered_widgets[$id]);
+	if ( empty( $output_callback ) ) {
+		unset( $wp_registered_widgets[ $id ] );
 		return;
 	}
 
-	$id_base = _get_widget_id_base($id);
-	if ( in_array($output_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($output_callback) ) {
+	$id_base = _get_widget_id_base( $id );
+	if ( in_array( $output_callback, $_wp_deprecated_widgets_callbacks, true ) && ! is_callable( $output_callback ) ) {
 		unset( $wp_registered_widget_controls[ $id ] );
 		unset( $wp_registered_widget_updates[ $id_base ] );
 		return;
 	}
 
-	$defaults = array('classname' => $output_callback);
-	$options = wp_parse_args($options, $defaults);
-	$widget = array(
-		'name' => $name,
-		'id' => $id,
+	$defaults = array( 'classname' => $output_callback );
+	$options  = wp_parse_args( $options, $defaults );
+	$widget   = array(
+		'name'     => $name,
+		'id'       => $id,
 		'callback' => $output_callback,
-		'params' => array_slice(func_get_args(), 4)
+		'params'   => array_slice( func_get_args(), 4 ),
 	);
-	$widget = array_merge($widget, $options);
+	$widget   = array_merge( $widget, $options );
 
-	if ( is_callable($output_callback) && ( !isset($wp_registered_widgets[$id]) || did_action( 'widgets_init' ) ) ) {
+	if ( is_callable( $output_callback ) && ( ! isset( $wp_registered_widgets[ $id ] ) || did_action( 'widgets_init' ) ) ) {
 
 		/**
 		 * Fires once for each registered widget.
@@ -373,7 +375,7 @@ function wp_register_sidebar_widget( $id, $name, $output_callback, $options = ar
 		 * @param array $widget An array of default widget arguments.
 		 */
 		do_action( 'wp_register_sidebar_widget', $widget );
-		$wp_registered_widgets[$id] = $widget;
+		$wp_registered_widgets[ $id ] = $widget;
 	}
 }
 
@@ -392,13 +394,15 @@ function wp_register_sidebar_widget( $id, $name, $output_callback, $options = ar
  * @return string|void Widget description, if available.
  */
 function wp_widget_description( $id ) {
-	if ( !is_scalar($id) )
+	if ( ! is_scalar( $id ) ) {
 		return;
+	}
 
 	global $wp_registered_widgets;
 
-	if ( isset($wp_registered_widgets[$id]['description']) )
-		return esc_html( $wp_registered_widgets[$id]['description'] );
+	if ( isset( $wp_registered_widgets[ $id ]['description'] ) ) {
+		return esc_html( $wp_registered_widgets[ $id ]['description'] );
+	}
 }
 
 /**
@@ -415,13 +419,15 @@ function wp_widget_description( $id ) {
  * @return string|void Sidebar description, if available.
  */
 function wp_sidebar_description( $id ) {
-	if ( !is_scalar($id) )
+	if ( ! is_scalar( $id ) ) {
 		return;
+	}
 
 	global $wp_registered_sidebars;
 
-	if ( isset($wp_registered_sidebars[$id]['description']) )
-		return esc_html( $wp_registered_sidebars[$id]['description'] );
+	if ( isset( $wp_registered_sidebars[ $id ]['description'] ) ) {
+		return esc_html( $wp_registered_sidebars[ $id ]['description'] );
+	}
 }
 
 /**
@@ -431,7 +437,7 @@ function wp_sidebar_description( $id ) {
  *
  * @param int|string $id Widget ID.
  */
-function wp_unregister_sidebar_widget($id) {
+function wp_unregister_sidebar_widget( $id ) {
 
 	/**
 	 * Fires just before a widget is removed from a sidebar.
@@ -442,8 +448,8 @@ function wp_unregister_sidebar_widget($id) {
 	 */
 	do_action( 'wp_unregister_sidebar_widget', $id );
 
-	wp_register_sidebar_widget($id, '', '');
-	wp_unregister_widget_control($id);
+	wp_register_sidebar_widget( $id, '', '' );
+	wp_unregister_widget_control( $id );
 }
 
 /**
@@ -474,46 +480,52 @@ function wp_unregister_sidebar_widget($id) {
 function wp_register_widget_control( $id, $name, $control_callback, $options = array() ) {
 	global $wp_registered_widget_controls, $wp_registered_widget_updates, $wp_registered_widgets, $_wp_deprecated_widgets_callbacks;
 
-	$id = strtolower($id);
-	$id_base = _get_widget_id_base($id);
+	$id      = strtolower( $id );
+	$id_base = _get_widget_id_base( $id );
 
-	if ( empty($control_callback) ) {
-		unset($wp_registered_widget_controls[$id]);
-		unset($wp_registered_widget_updates[$id_base]);
+	if ( empty( $control_callback ) ) {
+		unset( $wp_registered_widget_controls[ $id ] );
+		unset( $wp_registered_widget_updates[ $id_base ] );
 		return;
 	}
 
-	if ( in_array($control_callback, $_wp_deprecated_widgets_callbacks, true) && !is_callable($control_callback) ) {
+	if ( in_array( $control_callback, $_wp_deprecated_widgets_callbacks, true ) && ! is_callable( $control_callback ) ) {
 		unset( $wp_registered_widgets[ $id ] );
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
+	if ( isset( $wp_registered_widget_controls[ $id ] ) && ! did_action( 'widgets_init' ) ) {
 		return;
+	}
 
-	$defaults = array('width' => 250, 'height' => 200 ); // height is never used
-	$options = wp_parse_args($options, $defaults);
-	$options['width'] = (int) $options['width'];
+	$defaults          = array(
+		'width'  => 250,
+		'height' => 200,
+	); // height is never used
+	$options           = wp_parse_args( $options, $defaults );
+	$options['width']  = (int) $options['width'];
 	$options['height'] = (int) $options['height'];
 
 	$widget = array(
-		'name' => $name,
-		'id' => $id,
+		'name'     => $name,
+		'id'       => $id,
 		'callback' => $control_callback,
-		'params' => array_slice(func_get_args(), 4)
+		'params'   => array_slice( func_get_args(), 4 ),
 	);
-	$widget = array_merge($widget, $options);
+	$widget = array_merge( $widget, $options );
 
-	$wp_registered_widget_controls[$id] = $widget;
+	$wp_registered_widget_controls[ $id ] = $widget;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) )
+	if ( isset( $wp_registered_widget_updates[ $id_base ] ) ) {
 		return;
+	}
 
-	if ( isset($widget['params'][0]['number']) )
+	if ( isset( $widget['params'][0]['number'] ) ) {
 		$widget['params'][0]['number'] = -1;
+	}
 
-	unset($widget['width'], $widget['height'], $widget['name'], $widget['id']);
-	$wp_registered_widget_updates[$id_base] = $widget;
+	unset( $widget['width'], $widget['height'], $widget['name'], $widget['id'] );
+	$wp_registered_widget_updates[ $id_base ] = $widget;
 }
 
 /**
@@ -531,19 +543,20 @@ function wp_register_widget_control( $id, $name, $control_callback, $options = a
 function _register_widget_update_callback( $id_base, $update_callback, $options = array() ) {
 	global $wp_registered_widget_updates;
 
-	if ( isset($wp_registered_widget_updates[$id_base]) ) {
-		if ( empty($update_callback) )
-			unset($wp_registered_widget_updates[$id_base]);
+	if ( isset( $wp_registered_widget_updates[ $id_base ] ) ) {
+		if ( empty( $update_callback ) ) {
+			unset( $wp_registered_widget_updates[ $id_base ] );
+		}
 		return;
 	}
 
 	$widget = array(
 		'callback' => $update_callback,
-		'params' => array_slice(func_get_args(), 3)
+		'params'   => array_slice( func_get_args(), 3 ),
 	);
 
-	$widget = array_merge($widget, $options);
-	$wp_registered_widget_updates[$id_base] = $widget;
+	$widget                                   = array_merge( $widget, $options );
+	$wp_registered_widget_updates[ $id_base ] = $widget;
 }
 
 /**
@@ -559,33 +572,37 @@ function _register_widget_update_callback( $id_base, $update_callback, $options
  * @param array      $options       Optional. Widget control options. See wp_register_widget_control().
  *                                  Default empty array.
  */
-function _register_widget_form_callback($id, $name, $form_callback, $options = array()) {
+function _register_widget_form_callback( $id, $name, $form_callback, $options = array() ) {
 	global $wp_registered_widget_controls;
 
-	$id = strtolower($id);
+	$id = strtolower( $id );
 
-	if ( empty($form_callback) ) {
-		unset($wp_registered_widget_controls[$id]);
+	if ( empty( $form_callback ) ) {
+		unset( $wp_registered_widget_controls[ $id ] );
 		return;
 	}
 
-	if ( isset($wp_registered_widget_controls[$id]) && !did_action( 'widgets_init' ) )
+	if ( isset( $wp_registered_widget_controls[ $id ] ) && ! did_action( 'widgets_init' ) ) {
 		return;
+	}
 
-	$defaults = array('width' => 250, 'height' => 200 );
-	$options = wp_parse_args($options, $defaults);
-	$options['width'] = (int) $options['width'];
+	$defaults          = array(
+		'width'  => 250,
+		'height' => 200,
+	);
+	$options           = wp_parse_args( $options, $defaults );
+	$options['width']  = (int) $options['width'];
 	$options['height'] = (int) $options['height'];
 
 	$widget = array(
-		'name' => $name,
-		'id' => $id,
+		'name'     => $name,
+		'id'       => $id,
 		'callback' => $form_callback,
-		'params' => array_slice(func_get_args(), 4)
+		'params'   => array_slice( func_get_args(), 4 ),
 	);
-	$widget = array_merge($widget, $options);
+	$widget = array_merge( $widget, $options );
 
-	$wp_registered_widget_controls[$id] = $widget;
+	$wp_registered_widget_controls[ $id ] = $widget;
 }
 
 /**
@@ -595,7 +612,7 @@ function _register_widget_form_callback($id, $name, $form_callback, $options = a
  *
  * @param int|string $id Widget ID.
  */
-function wp_unregister_widget_control($id) {
+function wp_unregister_widget_control( $id ) {
 	wp_register_widget_control( $id, '', '' );
 }
 
@@ -634,7 +651,7 @@ function dynamic_sidebar( $index = 1 ) {
 		/** This action is documented in wp-includes/widget.php */
 		do_action( 'dynamic_sidebar_before', $index, false );
 		/** This action is documented in wp-includes/widget.php */
-		do_action( 'dynamic_sidebar_after',  $index, false );
+		do_action( 'dynamic_sidebar_after', $index, false );
 		/** This filter is documented in wp-includes/widget.php */
 		return apply_filters( 'dynamic_sidebar_has_widgets', false, $index );
 	}
@@ -652,28 +669,38 @@ function dynamic_sidebar( $index = 1 ) {
 	 *                                Default true.
 	 */
 	do_action( 'dynamic_sidebar_before', $index, true );
-	$sidebar = $wp_registered_sidebars[$index];
+	$sidebar = $wp_registered_sidebars[ $index ];
 
 	$did_one = false;
-	foreach ( (array) $sidebars_widgets[$index] as $id ) {
+	foreach ( (array) $sidebars_widgets[ $index ] as $id ) {
 
-		if ( !isset($wp_registered_widgets[$id]) ) continue;
+		if ( ! isset( $wp_registered_widgets[ $id ] ) ) {
+			continue;
+		}
 
 		$params = array_merge(
-			array( array_merge( $sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']) ) ),
-			(array) $wp_registered_widgets[$id]['params']
+			array(
+				array_merge(
+					$sidebar, array(
+						'widget_id'   => $id,
+						'widget_name' => $wp_registered_widgets[ $id ]['name'],
+					)
+				),
+			),
+			(array) $wp_registered_widgets[ $id ]['params']
 		);
 
 		// Substitute HTML id and class attributes into before_widget
 		$classname_ = '';
-		foreach ( (array) $wp_registered_widgets[$id]['classname'] as $cn ) {
-			if ( is_string($cn) )
+		foreach ( (array) $wp_registered_widgets[ $id ]['classname'] as $cn ) {
+			if ( is_string( $cn ) ) {
 				$classname_ .= '_' . $cn;
-			elseif ( is_object($cn) )
-				$classname_ .= '_' . get_class($cn);
+			} elseif ( is_object( $cn ) ) {
+				$classname_ .= '_' . get_class( $cn );
+			}
 		}
-		$classname_ = ltrim($classname_, '_');
-		$params[0]['before_widget'] = sprintf($params[0]['before_widget'], $id, $classname_);
+		$classname_                 = ltrim( $classname_, '_' );
+		$params[0]['before_widget'] = sprintf( $params[0]['before_widget'], $id, $classname_ );
 
 		/**
 		 * Filters the parameters passed to a widget's display callback.
@@ -709,7 +736,7 @@ function dynamic_sidebar( $index = 1 ) {
 		 */
 		$params = apply_filters( 'dynamic_sidebar_params', $params );
 
-		$callback = $wp_registered_widgets[$id]['callback'];
+		$callback = $wp_registered_widgets[ $id ]['callback'];
 
 		/**
 		 * Fires before a widget's display callback is called.
@@ -738,8 +765,8 @@ function dynamic_sidebar( $index = 1 ) {
 		 */
 		do_action( 'dynamic_sidebar', $wp_registered_widgets[ $id ] );
 
-		if ( is_callable($callback) ) {
-			call_user_func_array($callback, $params);
+		if ( is_callable( $callback ) ) {
+			call_user_func_array( $callback, $params );
 			$did_one = true;
 		}
 	}
@@ -801,17 +828,18 @@ function is_active_widget( $callback = false, $widget_id = false, $id_base = fal
 
 	$sidebars_widgets = wp_get_sidebars_widgets();
 
-	if ( is_array($sidebars_widgets) ) {
+	if ( is_array( $sidebars_widgets ) ) {
 		foreach ( $sidebars_widgets as $sidebar => $widgets ) {
 			if ( $skip_inactive && ( 'wp_inactive_widgets' === $sidebar || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) ) {
 				continue;
 			}
 
-			if ( is_array($widgets) ) {
+			if ( is_array( $widgets ) ) {
 				foreach ( $widgets as $widget ) {
-					if ( ( $callback && isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback ) || ( $id_base && _get_widget_id_base($widget) == $id_base ) ) {
-						if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] )
+					if ( ( $callback && isset( $wp_registered_widgets[ $widget ]['callback'] ) && $wp_registered_widgets[ $widget ]['callback'] == $callback ) || ( $id_base && _get_widget_id_base( $widget ) == $id_base ) ) {
+						if ( ! $widget_id || $widget_id == $wp_registered_widgets[ $widget ]['id'] ) {
 							return $sidebar;
+						}
 					}
 				}
 			}
@@ -832,12 +860,14 @@ function is_active_widget( $callback = false, $widget_id = false, $id_base = fal
  */
 function is_dynamic_sidebar() {
 	global $wp_registered_widgets, $wp_registered_sidebars;
-	$sidebars_widgets = get_option('sidebars_widgets');
+	$sidebars_widgets = get_option( 'sidebars_widgets' );
 	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
 		if ( ! empty( $sidebars_widgets[ $index ] ) ) {
-			foreach ( (array) $sidebars_widgets[$index] as $widget )
-				if ( array_key_exists($widget, $wp_registered_widgets) )
+			foreach ( (array) $sidebars_widgets[ $index ] as $widget ) {
+				if ( array_key_exists( $widget, $wp_registered_widgets ) ) {
 					return true;
+				}
+			}
 		}
 	}
 	return false;
@@ -852,9 +882,9 @@ function is_dynamic_sidebar() {
  * @return bool true if the sidebar is in use, false otherwise.
  */
 function is_active_sidebar( $index ) {
-	$index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index);
-	$sidebars_widgets = wp_get_sidebars_widgets();
-	$is_active_sidebar = ! empty( $sidebars_widgets[$index] );
+	$index             = ( is_int( $index ) ) ? "sidebar-$index" : sanitize_title( $index );
+	$sidebars_widgets  = wp_get_sidebars_widgets();
+	$is_active_sidebar = ! empty( $sidebars_widgets[ $index ] );
 
 	/**
 	 * Filters whether a dynamic sidebar is considered "active".
@@ -888,24 +918,27 @@ function is_active_sidebar( $index ) {
  * @return array Upgraded list of widgets to version 3 array format when called from the admin.
  */
 function wp_get_sidebars_widgets( $deprecated = true ) {
-	if ( $deprecated !== true )
+	if ( $deprecated !== true ) {
 		_deprecated_argument( __FUNCTION__, '2.8.1' );
+	}
 
 	global $_wp_sidebars_widgets, $sidebars_widgets;
 
 	// If loading from front page, consult $_wp_sidebars_widgets rather than options
 	// to see if wp_convert_widget_settings() has made manipulations in memory.
-	if ( !is_admin() ) {
-		if ( empty($_wp_sidebars_widgets) )
-			$_wp_sidebars_widgets = get_option('sidebars_widgets', array());
+	if ( ! is_admin() ) {
+		if ( empty( $_wp_sidebars_widgets ) ) {
+			$_wp_sidebars_widgets = get_option( 'sidebars_widgets', array() );
+		}
 
 		$sidebars_widgets = $_wp_sidebars_widgets;
 	} else {
-		$sidebars_widgets = get_option('sidebars_widgets', array());
+		$sidebars_widgets = get_option( 'sidebars_widgets', array() );
 	}
 
-	if ( is_array( $sidebars_widgets ) && isset($sidebars_widgets['array_version']) )
-		unset($sidebars_widgets['array_version']);
+	if ( is_array( $sidebars_widgets ) && isset( $sidebars_widgets['array_version'] ) ) {
+		unset( $sidebars_widgets['array_version'] );
+	}
 
 	/**
 	 * Filters the list of sidebars and their widgets.
@@ -954,8 +987,9 @@ function wp_get_widget_defaults() {
 
 	$defaults = array();
 
-	foreach ( (array) $wp_registered_sidebars as $index => $sidebar )
-		$defaults[$index] = array();
+	foreach ( (array) $wp_registered_sidebars as $index => $sidebar ) {
+		$defaults[ $index ] = array();
+	}
 
 	return $defaults;
 }
@@ -972,16 +1006,17 @@ function wp_get_widget_defaults() {
  * @param array  $settings
  * @return array
  */
-function wp_convert_widget_settings($base_name, $option_name, $settings) {
+function wp_convert_widget_settings( $base_name, $option_name, $settings ) {
 	// This test may need expanding.
 	$single = $changed = false;
-	if ( empty($settings) ) {
+	if ( empty( $settings ) ) {
 		$single = true;
 	} else {
-		foreach ( array_keys($settings) as $number ) {
-			if ( 'number' == $number )
+		foreach ( array_keys( $settings ) as $number ) {
+			if ( 'number' == $number ) {
 				continue;
-			if ( !is_numeric($number) ) {
+			}
+			if ( ! is_numeric( $number ) ) {
 				$single = true;
 				break;
 			}
@@ -993,32 +1028,35 @@ function wp_convert_widget_settings($base_name, $option_name, $settings) {
 
 		// If loading from the front page, update sidebar in memory but don't save to options
 		if ( is_admin() ) {
-			$sidebars_widgets = get_option('sidebars_widgets');
+			$sidebars_widgets = get_option( 'sidebars_widgets' );
 		} else {
-			if ( empty($GLOBALS['_wp_sidebars_widgets']) )
-				$GLOBALS['_wp_sidebars_widgets'] = get_option('sidebars_widgets', array());
+			if ( empty( $GLOBALS['_wp_sidebars_widgets'] ) ) {
+				$GLOBALS['_wp_sidebars_widgets'] = get_option( 'sidebars_widgets', array() );
+			}
 			$sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets'];
 		}
 
 		foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
-			if ( is_array($sidebar) ) {
+			if ( is_array( $sidebar ) ) {
 				foreach ( $sidebar as $i => $name ) {
 					if ( $base_name == $name ) {
-						$sidebars_widgets[$index][$i] = "$name-2";
-						$changed = true;
+						$sidebars_widgets[ $index ][ $i ] = "$name-2";
+						$changed                          = true;
 						break 2;
 					}
 				}
 			}
 		}
 
-		if ( is_admin() && $changed )
-			update_option('sidebars_widgets', $sidebars_widgets);
+		if ( is_admin() && $changed ) {
+			update_option( 'sidebars_widgets', $sidebars_widgets );
+		}
 	}
 
 	$settings['_multiwidget'] = 1;
-	if ( is_admin() )
+	if ( is_admin() ) {
 		update_option( $option_name, $settings );
+	}
 
 	return $settings;
 }
@@ -1054,21 +1092,21 @@ function the_widget( $widget, $instance = array(), $args = array() ) {
 		return;
 	}
 
-	$widget_obj = $wp_widget_factory->widgets[$widget];
+	$widget_obj = $wp_widget_factory->widgets[ $widget ];
 	if ( ! ( $widget_obj instanceof WP_Widget ) ) {
 		return;
 	}
 
-	$default_args = array(
+	$default_args          = array(
 		'before_widget' => '<div class="widget %s">',
-		'after_widget'  => "</div>",
+		'after_widget'  => '</div>',
 		'before_title'  => '<h2 class="widgettitle">',
 		'after_title'   => '</h2>',
 	);
-	$args = wp_parse_args( $args, $default_args );
+	$args                  = wp_parse_args( $args, $default_args );
 	$args['before_widget'] = sprintf( $args['before_widget'], $widget_obj->widget_options['classname'] );
 
-	$instance = wp_parse_args($instance);
+	$instance = wp_parse_args( $instance );
 
 	/**
 	 * Fires before rendering the requested widget.
@@ -1081,8 +1119,8 @@ function the_widget( $widget, $instance = array(), $args = array() ) {
 	 */
 	do_action( 'the_widget', $widget, $instance, $args );
 
-	$widget_obj->_set(-1);
-	$widget_obj->widget($args, $instance);
+	$widget_obj->_set( -1 );
+	$widget_obj->widget( $args, $instance );
 }
 
 /**
@@ -1108,10 +1146,11 @@ function _get_widget_id_base( $id ) {
 function _wp_sidebars_changed() {
 	global $sidebars_widgets;
 
-	if ( ! is_array( $sidebars_widgets ) )
+	if ( ! is_array( $sidebars_widgets ) ) {
 		$sidebars_widgets = wp_get_sidebars_widgets();
+	}
 
-	retrieve_widgets(true);
+	retrieve_widgets( true );
 }
 
 /**
@@ -1133,7 +1172,7 @@ function retrieve_widgets( $theme_changed = false ) {
 	$registered_sidebars_keys = array_keys( $wp_registered_sidebars );
 	$registered_widgets_ids   = array_keys( $wp_registered_widgets );
 
-	if ( ! is_array( get_theme_mod( 'sidebars_widgets' ) ) )  {
+	if ( ! is_array( get_theme_mod( 'sidebars_widgets' ) ) ) {
 		if ( empty( $sidebars_widgets ) ) {
 			return array();
 		}
@@ -1217,7 +1256,7 @@ function wp_map_sidebars_widgets( $existing_sidebars_widgets ) {
 		if ( in_array( $sidebar, $existing_sidebars, true ) ) {
 			$new_sidebars_widgets[ $sidebar ] = $existing_sidebars_widgets[ $sidebar ];
 			unset( $existing_sidebars_widgets[ $sidebar ] );
-		} else if ( ! array_key_exists( $sidebar, $new_sidebars_widgets ) ) {
+		} elseif ( ! array_key_exists( $sidebar, $new_sidebars_widgets ) ) {
 			$new_sidebars_widgets[ $sidebar ] = array();
 		}
 	}
@@ -1341,7 +1380,6 @@ function wp_map_sidebars_widgets( $existing_sidebars_widgets ) {
 			} // endforeach ( $old_sidebars_widgets as $old_sidebar => $old_widgets )
 		} // endif ( ! empty( $old_sidebars_widgets ) )
 
-
 		// Restore widget settings from when theme was previously active.
 		$new_sidebars_widgets = array_merge( $new_sidebars_widgets, $old_sidebars_widgets );
 	}
@@ -1382,34 +1420,41 @@ function _wp_remove_unregistered_widgets( $sidebars_widgets, $whitelist = array(
  */
 function wp_widget_rss_output( $rss, $args = array() ) {
 	if ( is_string( $rss ) ) {
-		$rss = fetch_feed($rss);
-	} elseif ( is_array($rss) && isset($rss['url']) ) {
+		$rss = fetch_feed( $rss );
+	} elseif ( is_array( $rss ) && isset( $rss['url'] ) ) {
 		$args = $rss;
-		$rss = fetch_feed($rss['url']);
-	} elseif ( !is_object($rss) ) {
+		$rss  = fetch_feed( $rss['url'] );
+	} elseif ( ! is_object( $rss ) ) {
 		return;
 	}
 
-	if ( is_wp_error($rss) ) {
-		if ( is_admin() || current_user_can('manage_options') )
+	if ( is_wp_error( $rss ) ) {
+		if ( is_admin() || current_user_can( 'manage_options' ) ) {
 			echo '<p><strong>' . __( 'RSS Error:' ) . '</strong> ' . $rss->get_error_message() . '</p>';
+		}
 		return;
 	}
 
-	$default_args = array( 'show_author' => 0, 'show_date' => 0, 'show_summary' => 0, 'items' => 0 );
-	$args = wp_parse_args( $args, $default_args );
+	$default_args = array(
+		'show_author'  => 0,
+		'show_date'    => 0,
+		'show_summary' => 0,
+		'items'        => 0,
+	);
+	$args         = wp_parse_args( $args, $default_args );
 
 	$items = (int) $args['items'];
-	if ( $items < 1 || 20 < $items )
+	if ( $items < 1 || 20 < $items ) {
 		$items = 10;
-	$show_summary  = (int) $args['show_summary'];
-	$show_author   = (int) $args['show_author'];
-	$show_date     = (int) $args['show_date'];
+	}
+	$show_summary = (int) $args['show_summary'];
+	$show_author  = (int) $args['show_author'];
+	$show_date    = (int) $args['show_date'];
 
-	if ( !$rss->get_item_quantity() ) {
+	if ( ! $rss->get_item_quantity() ) {
 		echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>';
 		$rss->__destruct();
-		unset($rss);
+		unset( $rss );
 		return;
 	}
 
@@ -1453,7 +1498,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 		$author = '';
 		if ( $show_author ) {
 			$author = $item->get_author();
-			if ( is_object($author) ) {
+			if ( is_object( $author ) ) {
 				$author = $author->get_name();
 				$author = ' <cite>' . esc_html( strip_tags( $author ) ) . '</cite>';
 			}
@@ -1469,7 +1514,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
 	}
 	echo '</ul>';
 	$rss->__destruct();
-	unset($rss);
+	unset( $rss );
 }
 
 /**
@@ -1485,20 +1530,27 @@ function wp_widget_rss_output( $rss, $args = array() ) {
  * @param array $inputs Override default display options.
  */
 function wp_widget_rss_form( $args, $inputs = null ) {
-	$default_inputs = array( 'url' => true, 'title' => true, 'items' => true, 'show_summary' => true, 'show_author' => true, 'show_date' => true );
-	$inputs = wp_parse_args( $inputs, $default_inputs );
+	$default_inputs = array(
+		'url'          => true,
+		'title'        => true,
+		'items'        => true,
+		'show_summary' => true,
+		'show_author'  => true,
+		'show_date'    => true,
+	);
+	$inputs         = wp_parse_args( $inputs, $default_inputs );
 
 	$args['title'] = isset( $args['title'] ) ? $args['title'] : '';
-	$args['url'] = isset( $args['url'] ) ? $args['url'] : '';
+	$args['url']   = isset( $args['url'] ) ? $args['url'] : '';
 	$args['items'] = isset( $args['items'] ) ? (int) $args['items'] : 0;
 
 	if ( $args['items'] < 1 || 20 < $args['items'] ) {
 		$args['items'] = 10;
 	}
 
-	$args['show_summary']   = isset( $args['show_summary'] ) ? (int) $args['show_summary'] : (int) $inputs['show_summary'];
-	$args['show_author']    = isset( $args['show_author'] ) ? (int) $args['show_author'] : (int) $inputs['show_author'];
-	$args['show_date']      = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
+	$args['show_summary'] = isset( $args['show_summary'] ) ? (int) $args['show_summary'] : (int) $inputs['show_summary'];
+	$args['show_author']  = isset( $args['show_author'] ) ? (int) $args['show_author'] : (int) $inputs['show_author'];
+	$args['show_date']    = isset( $args['show_date'] ) ? (int) $args['show_date'] : (int) $inputs['show_date'];
 
 	if ( ! empty( $args['error'] ) ) {
 		echo '<p class="widget-error"><strong>' . __( 'RSS Error:' ) . '</strong> ' . $args['error'] . '</p>';
@@ -1532,13 +1584,13 @@ function wp_widget_rss_form( $args, $inputs = null ) {
 	<label for="rss-show-date-<?php echo $esc_number; ?>"><?php _e( 'Display item date?' ); ?></label></p>
 <?php
 	endif;
-	foreach ( array_keys($default_inputs) as $input ) :
-		if ( 'hidden' === $inputs[$input] ) :
-			$id = str_replace( '_', '-', $input );
+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 ] ); ?>" />
+<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
-		endif;
+	endif;
 	endforeach;
 }
 
@@ -1560,27 +1612,29 @@ function wp_widget_rss_form( $args, $inputs = null ) {
  */
 function wp_widget_rss_process( $widget_rss, $check_feed = true ) {
 	$items = (int) $widget_rss['items'];
-	if ( $items < 1 || 20 < $items )
+	if ( $items < 1 || 20 < $items ) {
 		$items = 10;
-	$url           = esc_url_raw( strip_tags( $widget_rss['url'] ) );
-	$title         = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
-	$show_summary  = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
-	$show_author   = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] :0;
-	$show_date     = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
+	}
+	$url          = esc_url_raw( strip_tags( $widget_rss['url'] ) );
+	$title        = isset( $widget_rss['title'] ) ? trim( strip_tags( $widget_rss['title'] ) ) : '';
+	$show_summary = isset( $widget_rss['show_summary'] ) ? (int) $widget_rss['show_summary'] : 0;
+	$show_author  = isset( $widget_rss['show_author'] ) ? (int) $widget_rss['show_author'] : 0;
+	$show_date    = isset( $widget_rss['show_date'] ) ? (int) $widget_rss['show_date'] : 0;
 
 	if ( $check_feed ) {
-		$rss = fetch_feed($url);
+		$rss   = fetch_feed( $url );
 		$error = false;
-		$link = '';
-		if ( is_wp_error($rss) ) {
+		$link  = '';
+		if ( is_wp_error( $rss ) ) {
 			$error = $rss->get_error_message();
 		} else {
-			$link = esc_url(strip_tags($rss->get_permalink()));
-			while ( stristr($link, 'http') != $link )
-				$link = substr($link, 1);
+			$link = esc_url( strip_tags( $rss->get_permalink() ) );
+			while ( stristr( $link, 'http' ) != $link ) {
+				$link = substr( $link, 1 );
+			}
 
 			$rss->__destruct();
-			unset($rss);
+			unset( $rss );
 		}
 	}
 
diff --git a/wp-includes/widgets/class-wp-nav-menu-widget.php b/wp-includes/widgets/class-wp-nav-menu-widget.php
index dc3d6db601..895431228b 100644
--- a/wp-includes/widgets/class-wp-nav-menu-widget.php
+++ b/wp-includes/widgets/class-wp-nav-menu-widget.php
@@ -23,10 +23,10 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'description' => __( 'Add a navigation menu to your sidebar.' ),
+			'description'                 => __( 'Add a navigation menu to your sidebar.' ),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'nav_menu', __('Navigation Menu'), $widget_ops );
+		parent::__construct( 'nav_menu', __( 'Navigation Menu' ), $widget_ops );
 	}
 
 	/**
@@ -59,7 +59,7 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 
 		$nav_menu_args = array(
 			'fallback_cb' => '',
-			'menu'        => $nav_menu
+			'menu'        => $nav_menu,
 		);
 
 		/**
@@ -114,7 +114,7 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 	 */
 	public function form( $instance ) {
 		global $wp_customize;
-		$title = isset( $instance['title'] ) ? $instance['title'] : '';
+		$title    = isset( $instance['title'] ) ? $instance['title'] : '';
 		$nav_menu = isset( $instance['nav_menu'] ) ? $instance['nav_menu'] : '';
 
 		// Get menus
@@ -146,7 +146,7 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 		</p>
 		<div class="nav-menu-widget-form-controls" <?php echo $empty_menus_style; ?>>
 			<p>
-				<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ) ?></label>
+				<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
 				<input type="text" class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr( $title ); ?>"/>
 			</p>
 			<p>
@@ -162,7 +162,7 @@ class WP_Nav_Menu_Widget extends WP_Widget {
 			</p>
 			<?php if ( $wp_customize instanceof WP_Customize_Manager ) : ?>
 				<p class="edit-selected-nav-menu" style="<?php echo $nav_menu_style; ?>">
-					<button type="button" class="button"><?php _e( 'Edit Menu' ) ?></button>
+					<button type="button" class="button"><?php _e( 'Edit Menu' ); ?></button>
 				</p>
 			<?php endif; ?>
 		</div>
diff --git a/wp-includes/widgets/class-wp-widget-archives.php b/wp-includes/widgets/class-wp-widget-archives.php
index dac336ecd3..56f45654fb 100644
--- a/wp-includes/widgets/class-wp-widget-archives.php
+++ b/wp-includes/widgets/class-wp-widget-archives.php
@@ -23,11 +23,11 @@ class WP_Widget_Archives extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_archive',
-			'description' => __( 'A monthly archive of your site&#8217;s Posts.' ),
+			'classname'                   => 'widget_archive',
+			'description'                 => __( 'A monthly archive of your site&#8217;s Posts.' ),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct('archives', __('Archives'), $widget_ops);
+		parent::__construct( 'archives', __( 'Archives' ), $widget_ops );
 	}
 
 	/**
@@ -71,11 +71,13 @@ class WP_Widget_Archives extends WP_Widget {
 			 * @param array $args     An array of Archives widget drop-down arguments.
 			 * @param array $instance Settings for the current Archives widget instance.
 			 */
-			$dropdown_args = apply_filters( 'widget_archives_dropdown_args', array(
-				'type'            => 'monthly',
-				'format'          => 'option',
-				'show_post_count' => $c
-			), $instance );
+			$dropdown_args = apply_filters(
+				'widget_archives_dropdown_args', array(
+					'type'            => 'monthly',
+					'format'          => 'option',
+					'show_post_count' => $c,
+				), $instance
+			);
 
 			switch ( $dropdown_args['type'] ) {
 				case 'yearly':
@@ -114,14 +116,18 @@ class WP_Widget_Archives extends WP_Widget {
 		 * @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 ) );
+		wp_get_archives(
+			apply_filters(
+				'widget_archives_args', array(
+					'type'            => 'monthly',
+					'show_post_count' => $c,
+				), $instance
+			)
+		);
 		?>
 		</ul>
 		<?php
-		}
+}
 
 		echo $args['after_widget'];
 	}
@@ -137,10 +143,16 @@ class WP_Widget_Archives extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
-		$new_instance = wp_parse_args( (array) $new_instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['count'] = $new_instance['count'] ? 1 : 0;
+		$instance             = $old_instance;
+		$new_instance         = wp_parse_args(
+			(array) $new_instance, array(
+				'title'    => '',
+				'count'    => 0,
+				'dropdown' => '',
+			)
+		);
+		$instance['title']    = sanitize_text_field( $new_instance['title'] );
+		$instance['count']    = $new_instance['count'] ? 1 : 0;
 		$instance['dropdown'] = $new_instance['dropdown'] ? 1 : 0;
 
 		return $instance;
@@ -154,14 +166,20 @@ class WP_Widget_Archives extends WP_Widget {
 	 * @param array $instance Current settings.
 	 */
 	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'count' => 0, 'dropdown' => '') );
-		$title = sanitize_text_field( $instance['title'] );
+		$instance = wp_parse_args(
+			(array) $instance, array(
+				'title'    => '',
+				'count'    => 0,
+				'dropdown' => '',
+			)
+		);
+		$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>
+		<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>
 		<p>
-			<input class="checkbox" type="checkbox"<?php checked( $instance['dropdown'] ); ?> id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>" /> <label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e('Display as dropdown'); ?></label>
+			<input class="checkbox" type="checkbox"<?php checked( $instance['dropdown'] ); ?> id="<?php echo $this->get_field_id( 'dropdown' ); ?>" name="<?php echo $this->get_field_name( 'dropdown' ); ?>" /> <label for="<?php echo $this->get_field_id( 'dropdown' ); ?>"><?php _e( 'Display as dropdown' ); ?></label>
 			<br/>
-			<input class="checkbox" type="checkbox"<?php checked( $instance['count'] ); ?> id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>" /> <label for="<?php echo $this->get_field_id('count'); ?>"><?php _e('Show post counts'); ?></label>
+			<input class="checkbox" type="checkbox"<?php checked( $instance['count'] ); ?> id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>" /> <label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Show post counts' ); ?></label>
 		</p>
 		<?php
 	}
diff --git a/wp-includes/widgets/class-wp-widget-calendar.php b/wp-includes/widgets/class-wp-widget-calendar.php
index fbd965166d..c19a3a29a3 100644
--- a/wp-includes/widgets/class-wp-widget-calendar.php
+++ b/wp-includes/widgets/class-wp-widget-calendar.php
@@ -32,8 +32,8 @@ class WP_Widget_Calendar extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_calendar',
-			'description' => __( 'A calendar of your site&#8217;s Posts.' ),
+			'classname'                   => 'widget_calendar',
+			'description'                 => __( 'A calendar of your site&#8217;s Posts.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'calendar', __( 'Calendar' ), $widget_ops );
@@ -81,7 +81,7 @@ class WP_Widget_Calendar extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
+		$instance          = $old_instance;
 		$instance['title'] = sanitize_text_field( $new_instance['title'] );
 
 		return $instance;
@@ -96,10 +96,10 @@ class WP_Widget_Calendar extends WP_Widget {
 	 */
 	public function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
-		$title = sanitize_text_field( $instance['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>
+		<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
 	}
 }
diff --git a/wp-includes/widgets/class-wp-widget-categories.php b/wp-includes/widgets/class-wp-widget-categories.php
index 35845918c6..13be3425e1 100644
--- a/wp-includes/widgets/class-wp-widget-categories.php
+++ b/wp-includes/widgets/class-wp-widget-categories.php
@@ -23,8 +23,8 @@ class WP_Widget_Categories extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_categories',
-			'description' => __( 'A list or dropdown of categories.' ),
+			'classname'                   => 'widget_categories',
+			'description'                 => __( 'A list or dropdown of categories.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'categories', __( 'Categories' ), $widget_ops );
@@ -67,13 +67,13 @@ class WP_Widget_Categories extends WP_Widget {
 
 		if ( $d ) {
 			echo sprintf( '<form action="%s" method="get">', esc_url( home_url() ) );
-			$dropdown_id = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
+			$dropdown_id    = ( $first_dropdown ) ? 'cat' : "{$this->id_base}-dropdown-{$this->number}";
 			$first_dropdown = false;
 
 			echo '<label class="screen-reader-text" for="' . esc_attr( $dropdown_id ) . '">' . $title . '</label>';
 
 			$cat_args['show_option_none'] = __( 'Select Category' );
-			$cat_args['id'] = $dropdown_id;
+			$cat_args['id']               = $dropdown_id;
 
 			/**
 			 * Filters the arguments for the Categories widget drop-down.
@@ -141,11 +141,11 @@ class WP_Widget_Categories extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['count'] = !empty($new_instance['count']) ? 1 : 0;
-		$instance['hierarchical'] = !empty($new_instance['hierarchical']) ? 1 : 0;
-		$instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
+		$instance                 = $old_instance;
+		$instance['title']        = sanitize_text_field( $new_instance['title'] );
+		$instance['count']        = ! empty( $new_instance['count'] ) ? 1 : 0;
+		$instance['hierarchical'] = ! empty( $new_instance['hierarchical'] ) ? 1 : 0;
+		$instance['dropdown']     = ! empty( $new_instance['dropdown'] ) ? 1 : 0;
 
 		return $instance;
 	}
@@ -159,23 +159,23 @@ class WP_Widget_Categories extends WP_Widget {
 	 */
 	public function form( $instance ) {
 		//Defaults
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-		$title = sanitize_text_field( $instance['title'] );
-		$count = isset($instance['count']) ? (bool) $instance['count'] :false;
+		$instance     = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+		$title        = sanitize_text_field( $instance['title'] );
+		$count        = isset( $instance['count'] ) ? (bool) $instance['count'] : false;
 		$hierarchical = isset( $instance['hierarchical'] ) ? (bool) $instance['hierarchical'] : false;
-		$dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
+		$dropdown     = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : 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 esc_attr( $title ); ?>" /></p>
+		<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>
 
-		<p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
-		<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
+		<p><input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id( 'dropdown' ); ?>" name="<?php echo $this->get_field_name( 'dropdown' ); ?>"<?php checked( $dropdown ); ?> />
+		<label for="<?php echo $this->get_field_id( 'dropdown' ); ?>"><?php _e( 'Display as dropdown' ); ?></label><br />
 
-		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count'); ?>"<?php checked( $count ); ?> />
-		<label for="<?php echo $this->get_field_id('count'); ?>"><?php _e( 'Show post counts' ); ?></label><br />
+		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name( 'count' ); ?>"<?php checked( $count ); ?> />
+		<label for="<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Show post counts' ); ?></label><br />
 
-		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id('hierarchical'); ?>" name="<?php echo $this->get_field_name('hierarchical'); ?>"<?php checked( $hierarchical ); ?> />
-		<label for="<?php echo $this->get_field_id('hierarchical'); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
+		<input type="checkbox" class="checkbox" id="<?php echo $this->get_field_id( 'hierarchical' ); ?>" name="<?php echo $this->get_field_name( 'hierarchical' ); ?>"<?php checked( $hierarchical ); ?> />
+		<label for="<?php echo $this->get_field_id( 'hierarchical' ); ?>"><?php _e( 'Show hierarchy' ); ?></label></p>
 		<?php
 	}
 
diff --git a/wp-includes/widgets/class-wp-widget-custom-html.php b/wp-includes/widgets/class-wp-widget-custom-html.php
index c01419c351..068d6f7551 100644
--- a/wp-includes/widgets/class-wp-widget-custom-html.php
+++ b/wp-includes/widgets/class-wp-widget-custom-html.php
@@ -31,7 +31,7 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 	 * @var array
 	 */
 	protected $default_instance = array(
-		'title' => '',
+		'title'   => '',
 		'content' => '',
 	);
 
@@ -41,13 +41,13 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 	 * @since 4.8.1
 	 */
 	public function __construct() {
-		$widget_ops = array(
-			'classname' => 'widget_custom_html',
-			'description' => __( 'Arbitrary HTML code.' ),
+		$widget_ops  = array(
+			'classname'                   => 'widget_custom_html',
+			'description'                 => __( 'Arbitrary HTML code.' ),
 			'customize_selective_refresh' => true,
 		);
 		$control_ops = array(
-			'width' => 400,
+			'width'  => 400,
 			'height' => 350,
 		);
 		parent::__construct( 'custom_html', __( 'Custom HTML' ), $widget_ops, $control_ops );
@@ -130,11 +130,13 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 		$title = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
 
 		// Prepare instance data that looks like a normal Text widget.
-		$simulated_text_widget_instance = array_merge( $instance, array(
-			'text' => isset( $instance['content'] ) ? $instance['content'] : '',
-			'filter' => false, // Because wpautop is not applied.
-			'visual' => false, // Because it wasn't created in TinyMCE.
-		) );
+		$simulated_text_widget_instance = array_merge(
+			$instance, array(
+				'text'   => isset( $instance['content'] ) ? $instance['content'] : '',
+				'filter' => false, // Because wpautop is not applied.
+				'visual' => false, // Because it wasn't created in TinyMCE.
+			)
+		);
 		unset( $simulated_text_widget_instance['content'] ); // Was moved to 'text' prop.
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-text.php */
@@ -179,7 +181,7 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = array_merge( $this->default_instance, $old_instance );
+		$instance          = array_merge( $this->default_instance, $old_instance );
 		$instance['title'] = sanitize_text_field( $new_instance['title'] );
 		if ( current_user_can( 'unfiltered_html' ) ) {
 			$instance['content'] = $new_instance['content'];
@@ -195,13 +197,15 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 	 * @since 4.9.0
 	 */
 	public function enqueue_admin_scripts() {
-		$settings = wp_enqueue_code_editor( array(
-			'type' => 'text/html',
-			'codemirror' => array(
-				'indentUnit' => 2,
-				'tabSize' => 2,
-			),
-		) );
+		$settings = wp_enqueue_code_editor(
+			array(
+				'type'       => 'text/html',
+				'codemirror' => array(
+					'indentUnit' => 2,
+					'tabSize'    => 2,
+				),
+			)
+		);
 
 		wp_enqueue_script( 'custom-html-widgets' );
 		if ( empty( $settings ) ) {
@@ -216,7 +220,7 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 				/* translators: %d: error count */
 				'singular' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 1 ),
 				/* translators: %d: error count */
-				'plural' => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
+				'plural'   => _n( 'There is %d error which must be fixed before you can save.', 'There are %d errors which must be fixed before you can save.', 2 ), // @todo This is lacking, as some languages have a dedicated dual form. For proper handling of plurals in JS, see #20491.
 			),
 		);
 		wp_add_inline_script( 'custom-html-widgets', sprintf( 'jQuery.extend( wp.customHtmlWidgets.l10n, %s );', wp_json_encode( $l10n ) ), 'after' );
@@ -262,8 +266,8 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 			<?php if ( ! current_user_can( 'unfiltered_html' ) ) : ?>
 				<?php
 				$probably_unsafe_html = array( 'script', 'iframe', 'form', 'input', 'style' );
-				$allowed_html = wp_kses_allowed_html( 'post' );
-				$disallowed_html = array_diff( $probably_unsafe_html, array_keys( $allowed_html ) );
+				$allowed_html         = wp_kses_allowed_html( 'post' );
+				$disallowed_html      = array_diff( $probably_unsafe_html, array_keys( $allowed_html ) );
 				?>
 				<?php if ( ! empty( $disallowed_html ) ) : ?>
 					<# if ( data.codeEditorDisabled ) { #>
@@ -288,7 +292,7 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 	public static function add_help_text() {
 		$screen = get_current_screen();
 
-		$content = '<p>';
+		$content  = '<p>';
 		$content .= __( 'Use the Custom HTML widget to add arbitrary HTML code to your widget areas.' );
 		$content .= '</p>';
 
@@ -299,7 +303,8 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 				__( 'The edit field automatically highlights code syntax. You can disable this in your <a href="%1$s" %2$s>user profile%3$s</a> to work in plain text mode.' ),
 				esc_url( get_edit_profile_url() ),
 				'class="external-link" target="_blank"',
-				sprintf( '<span class="screen-reader-text"> %s</span>',
+				sprintf(
+					'<span class="screen-reader-text"> %s</span>',
 					/* translators: accessibility text */
 					__( '(opens in a new window)' )
 				)
@@ -314,10 +319,12 @@ class WP_Widget_Custom_HTML extends WP_Widget {
 			$content .= '</ul>';
 		}
 
-		$screen->add_help_tab( array(
-			'id' => 'custom_html_widget',
-			'title' => __( 'Custom HTML Widget' ),
-			'content' => $content,
-		) );
+		$screen->add_help_tab(
+			array(
+				'id'      => 'custom_html_widget',
+				'title'   => __( 'Custom HTML Widget' ),
+				'content' => $content,
+			)
+		);
 	}
 }
diff --git a/wp-includes/widgets/class-wp-widget-links.php b/wp-includes/widgets/class-wp-widget-links.php
index c0934e402d..344bdc5f97 100644
--- a/wp-includes/widgets/class-wp-widget-links.php
+++ b/wp-includes/widgets/class-wp-widget-links.php
@@ -23,7 +23,7 @@ class WP_Widget_Links extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'description' => __( 'Your blogroll' ),
+			'description'                 => __( 'Your blogroll' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'links', __( 'Links' ), $widget_ops );
@@ -39,14 +39,14 @@ class WP_Widget_Links extends WP_Widget {
 	 * @param array $instance Settings for the current Links widget instance.
 	 */
 	public function widget( $args, $instance ) {
-		$show_description = isset($instance['description']) ? $instance['description'] : false;
-		$show_name = isset($instance['name']) ? $instance['name'] : false;
-		$show_rating = isset($instance['rating']) ? $instance['rating'] : false;
-		$show_images = isset($instance['images']) ? $instance['images'] : true;
-		$category = isset($instance['category']) ? $instance['category'] : false;
-		$orderby = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name';
-		$order = $orderby == 'rating' ? 'DESC' : 'ASC';
-		$limit = isset( $instance['limit'] ) ? $instance['limit'] : -1;
+		$show_description = isset( $instance['description'] ) ? $instance['description'] : false;
+		$show_name        = isset( $instance['name'] ) ? $instance['name'] : false;
+		$show_rating      = isset( $instance['rating'] ) ? $instance['rating'] : false;
+		$show_images      = isset( $instance['images'] ) ? $instance['images'] : true;
+		$category         = isset( $instance['category'] ) ? $instance['category'] : false;
+		$orderby          = isset( $instance['orderby'] ) ? $instance['orderby'] : 'name';
+		$order            = $orderby == 'rating' ? 'DESC' : 'ASC';
+		$limit            = isset( $instance['limit'] ) ? $instance['limit'] : -1;
 
 		$before_widget = preg_replace( '/id="[^"]*"/', 'id="%id"', $args['before_widget'] );
 
@@ -92,18 +92,25 @@ class WP_Widget_Links extends WP_Widget {
 	 */
 	public function update( $new_instance, $old_instance ) {
 		$new_instance = (array) $new_instance;
-		$instance = array( 'images' => 0, 'name' => 0, 'description' => 0, 'rating' => 0 );
+		$instance     = array(
+			'images'      => 0,
+			'name'        => 0,
+			'description' => 0,
+			'rating'      => 0,
+		);
 		foreach ( $instance as $field => $val ) {
-			if ( isset($new_instance[$field]) )
-				$instance[$field] = 1;
+			if ( isset( $new_instance[ $field ] ) ) {
+				$instance[ $field ] = 1;
+			}
 		}
 
 		$instance['orderby'] = 'name';
-		if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) )
+		if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) ) {
 			$instance['orderby'] = $new_instance['orderby'];
+		}
 
 		$instance['category'] = intval( $new_instance['category'] );
-		$instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
+		$instance['limit']    = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
 
 		return $instance;
 	}
@@ -118,15 +125,26 @@ class WP_Widget_Links extends WP_Widget {
 	public function form( $instance ) {
 
 		//Defaults
-		$instance = wp_parse_args( (array) $instance, array( 'images' => true, 'name' => true, 'description' => false, 'rating' => false, 'category' => false, 'orderby' => 'name', 'limit' => -1 ) );
+		$instance  = wp_parse_args(
+			(array) $instance, array(
+				'images'      => true,
+				'name'        => true,
+				'description' => false,
+				'rating'      => false,
+				'category'    => false,
+				'orderby'     => 'name',
+				'limit'       => -1,
+			)
+		);
 		$link_cats = get_terms( 'link_category' );
-		if ( ! $limit = intval( $instance['limit'] ) )
+		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'); ?>">
-		<option value=""><?php _ex('All Links', 'links widget'); ?></option>
+		<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' ); ?>">
+		<option value=""><?php _ex( 'All Links', 'links widget' ); ?></option>
 		<?php
 		foreach ( $link_cats as $link_cat ) {
 			echo '<option value="' . intval( $link_cat->term_id ) . '"'
@@ -135,8 +153,8 @@ class WP_Widget_Links extends WP_Widget {
 		}
 		?>
 		</select>
-		<label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e( 'Sort by:' ); ?></label>
-		<select name="<?php echo $this->get_field_name('orderby'); ?>" id="<?php echo $this->get_field_id('orderby'); ?>" class="widefat">
+		<label for="<?php echo $this->get_field_id( 'orderby' ); ?>"><?php _e( 'Sort by:' ); ?></label>
+		<select name="<?php echo $this->get_field_name( 'orderby' ); ?>" id="<?php echo $this->get_field_id( 'orderby' ); ?>" class="widefat">
 			<option value="name"<?php selected( $instance['orderby'], 'name' ); ?>><?php _e( 'Link title' ); ?></option>
 			<option value="rating"<?php selected( $instance['orderby'], 'rating' ); ?>><?php _e( 'Link rating' ); ?></option>
 			<option value="id"<?php selected( $instance['orderby'], 'id' ); ?>><?php _e( 'Link ID' ); ?></option>
@@ -144,18 +162,18 @@ class WP_Widget_Links extends WP_Widget {
 		</select>
 		</p>
 		<p>
-		<input class="checkbox" type="checkbox"<?php checked($instance['images'], true) ?> id="<?php echo $this->get_field_id('images'); ?>" name="<?php echo $this->get_field_name('images'); ?>" />
-		<label for="<?php echo $this->get_field_id('images'); ?>"><?php _e('Show Link Image'); ?></label><br />
-		<input class="checkbox" type="checkbox"<?php checked($instance['name'], true) ?> id="<?php echo $this->get_field_id('name'); ?>" name="<?php echo $this->get_field_name('name'); ?>" />
-		<label for="<?php echo $this->get_field_id('name'); ?>"><?php _e('Show Link Name'); ?></label><br />
-		<input class="checkbox" type="checkbox"<?php checked($instance['description'], true) ?> id="<?php echo $this->get_field_id('description'); ?>" name="<?php echo $this->get_field_name('description'); ?>" />
-		<label for="<?php echo $this->get_field_id('description'); ?>"><?php _e('Show Link Description'); ?></label><br />
-		<input class="checkbox" type="checkbox"<?php checked($instance['rating'], true) ?> id="<?php echo $this->get_field_id('rating'); ?>" name="<?php echo $this->get_field_name('rating'); ?>" />
-		<label for="<?php echo $this->get_field_id('rating'); ?>"><?php _e('Show Link Rating'); ?></label>
+		<input class="checkbox" type="checkbox"<?php checked( $instance['images'], true ); ?> id="<?php echo $this->get_field_id( 'images' ); ?>" name="<?php echo $this->get_field_name( 'images' ); ?>" />
+		<label for="<?php echo $this->get_field_id( 'images' ); ?>"><?php _e( 'Show Link Image' ); ?></label><br />
+		<input class="checkbox" type="checkbox"<?php checked( $instance['name'], true ); ?> id="<?php echo $this->get_field_id( 'name' ); ?>" name="<?php echo $this->get_field_name( 'name' ); ?>" />
+		<label for="<?php echo $this->get_field_id( 'name' ); ?>"><?php _e( 'Show Link Name' ); ?></label><br />
+		<input class="checkbox" type="checkbox"<?php checked( $instance['description'], true ); ?> id="<?php echo $this->get_field_id( 'description' ); ?>" name="<?php echo $this->get_field_name( 'description' ); ?>" />
+		<label for="<?php echo $this->get_field_id( 'description' ); ?>"><?php _e( 'Show Link Description' ); ?></label><br />
+		<input class="checkbox" type="checkbox"<?php checked( $instance['rating'], true ); ?> id="<?php echo $this->get_field_id( 'rating' ); ?>" name="<?php echo $this->get_field_name( 'rating' ); ?>" />
+		<label for="<?php echo $this->get_field_id( 'rating' ); ?>"><?php _e( 'Show Link Rating' ); ?></label>
 		</p>
 		<p>
-		<label for="<?php echo $this->get_field_id('limit'); ?>"><?php _e( 'Number of links to show:' ); ?></label>
-		<input id="<?php echo $this->get_field_id('limit'); ?>" name="<?php echo $this->get_field_name('limit'); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval( $limit ); ?>" size="3" />
+		<label for="<?php echo $this->get_field_id( 'limit' ); ?>"><?php _e( 'Number of links to show:' ); ?></label>
+		<input id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="text" value="<?php echo $limit == -1 ? '' : intval( $limit ); ?>" size="3" />
 		</p>
 		<?php
 	}
diff --git a/wp-includes/widgets/class-wp-widget-media-audio.php b/wp-includes/widgets/class-wp-widget-media-audio.php
index 94d2295673..742d248c13 100644
--- a/wp-includes/widgets/class-wp-widget-media-audio.php
+++ b/wp-includes/widgets/class-wp-widget-media-audio.php
@@ -22,26 +22,30 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * @since  4.8.0
 	 */
 	public function __construct() {
-		parent::__construct( 'media_audio', __( 'Audio' ), array(
-			'description' => __( 'Displays an audio player.' ),
-			'mime_type'   => 'audio',
-		) );
+		parent::__construct(
+			'media_audio', __( 'Audio' ), array(
+				'description' => __( 'Displays an audio player.' ),
+				'mime_type'   => 'audio',
+			)
+		);
 
-		$this->l10n = array_merge( $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' ),
-			'edit_media' => _x( 'Edit Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ),
-			'missing_attachment' => sprintf(
-				/* translators: %s: URL to media library */
-				__( 'We can&#8217;t find that audio file. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
-				esc_url( admin_url( 'upload.php' ) )
-			),
-			/* translators: %d: widget count */
-			'media_library_state_multi' => _n_noop( 'Audio Widget (%d)', 'Audio Widget (%d)' ),
-			'media_library_state_single' => __( 'Audio Widget' ),
-			'unsupported_file_type' => __( 'Looks like this isn&#8217;t the correct kind of file. Please link to an audio file instead.' ),
-		) );
+		$this->l10n = array_merge(
+			$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' ),
+				'edit_media'                 => _x( 'Edit Audio', 'label for button in the audio widget; should preferably not be longer than ~13 characters long' ),
+				'missing_attachment'         => sprintf(
+					/* translators: %s: URL to media library */
+					__( 'We can&#8217;t find that audio file. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
+					esc_url( admin_url( 'upload.php' ) )
+				),
+				/* translators: %d: widget count */
+				'media_library_state_multi'  => _n_noop( 'Audio Widget (%d)', 'Audio Widget (%d)' ),
+				'media_library_state_single' => __( 'Audio Widget' ),
+				'unsupported_file_type'      => __( 'Looks like this isn&#8217;t the correct kind of file. Please link to an audio file instead.' ),
+			)
+		);
 	}
 
 	/**
@@ -59,14 +63,14 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 			parent::get_instance_schema(),
 			array(
 				'preload' => array(
-					'type' => 'string',
-					'enum' => array( 'none', 'auto', 'metadata' ),
-					'default' => 'none',
+					'type'        => 'string',
+					'enum'        => array( 'none', 'auto', 'metadata' ),
+					'default'     => 'none',
 					'description' => __( 'Preload' ),
 				),
-				'loop' => array(
-					'type' => 'boolean',
-					'default' => false,
+				'loop'    => array(
+					'type'        => 'boolean',
+					'default'     => false,
 					'description' => __( 'Loop' ),
 				),
 			)
@@ -74,9 +78,9 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 
 		foreach ( wp_get_audio_extensions() as $audio_extension ) {
 			$schema[ $audio_extension ] = array(
-				'type' => 'string',
-				'default' => '',
-				'format' => 'uri',
+				'type'        => 'string',
+				'default'     => '',
+				'format'      => 'uri',
 				/* translators: %s: audio extension */
 				'description' => sprintf( __( 'URL to the %s audio source file' ), $audio_extension ),
 			);
@@ -94,7 +98,7 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 	 * @return void
 	 */
 	public function render_media( $instance ) {
-		$instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
+		$instance   = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
 		$attachment = null;
 
 		if ( $this->is_attachment_with_mime_type( $instance['attachment_id'], $this->widget_options['mime_type'] ) ) {
@@ -192,7 +196,7 @@ class WP_Widget_Media_Audio extends WP_Widget_Media {
 					<p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
 				</div>
 			<# } else if ( data.model && data.model.src ) { #>
-				<?php wp_underscore_audio_template() ?>
+				<?php wp_underscore_audio_template(); ?>
 			<# } #>
 		</script>
 		<?php
diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php
index 13ee9c2d6e..d447ea9774 100644
--- a/wp-includes/widgets/class-wp-widget-media-gallery.php
+++ b/wp-includes/widgets/class-wp-widget-media-gallery.php
@@ -22,17 +22,21 @@ class WP_Widget_Media_Gallery extends WP_Widget_Media {
 	 * @since 4.9.0
 	 */
 	public function __construct() {
-		parent::__construct( 'media_gallery', __( 'Gallery' ), array(
-			'description' => __( 'Displays an image gallery.' ),
-			'mime_type'   => 'image',
-		) );
+		parent::__construct(
+			'media_gallery', __( 'Gallery' ), array(
+				'description' => __( 'Displays an image gallery.' ),
+				'mime_type'   => 'image',
+			)
+		);
 
-		$this->l10n = array_merge( $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' => '',
-			'edit_media' => _x( 'Edit Gallery', 'label for button in the gallery widget; should not be longer than ~13 characters long' ),
-		) );
+		$this->l10n = array_merge(
+			$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'     => '',
+				'edit_media'        => _x( 'Edit Gallery', 'label for button in the gallery widget; should not be longer than ~13 characters long' ),
+			)
+		);
 	}
 
 	/**
@@ -47,37 +51,37 @@ class WP_Widget_Media_Gallery extends WP_Widget_Media {
 	 */
 	public function get_instance_schema() {
 		$schema = array(
-			'title' => array(
-				'type' => 'string',
-				'default' => '',
-				'sanitize_callback' => 'sanitize_text_field',
-				'description' => __( 'Title for the widget' ),
+			'title'          => array(
+				'type'                  => 'string',
+				'default'               => '',
+				'sanitize_callback'     => 'sanitize_text_field',
+				'description'           => __( 'Title for the widget' ),
 				'should_preview_update' => false,
 			),
-			'ids' => array(
-				'type' => 'array',
-				'items' => array(
+			'ids'            => array(
+				'type'              => 'array',
+				'items'             => array(
 					'type' => 'integer',
 				),
-				'default' => array(),
+				'default'           => array(),
 				'sanitize_callback' => 'wp_parse_id_list',
 			),
-			'columns' => array(
-				'type' => 'integer',
+			'columns'        => array(
+				'type'    => 'integer',
 				'default' => 3,
 				'minimum' => 1,
 				'maximum' => 9,
 			),
-			'size' => array(
-				'type' => 'string',
-				'enum' => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ),
+			'size'           => array(
+				'type'    => 'string',
+				'enum'    => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ),
 				'default' => 'thumbnail',
 			),
-			'link_type' => array(
-				'type' => 'string',
-				'enum' => array( 'post', 'file', 'none' ),
-				'default' => 'post',
-				'media_prop' => 'link',
+			'link_type'      => array(
+				'type'                  => 'string',
+				'enum'                  => array( 'post', 'file', 'none' ),
+				'default'               => 'post',
+				'media_prop'            => 'link',
 				'should_preview_update' => false,
 			),
 			'orderby_random' => array(
diff --git a/wp-includes/widgets/class-wp-widget-media-image.php b/wp-includes/widgets/class-wp-widget-media-image.php
index 4ebc42d66e..e374b57ce3 100644
--- a/wp-includes/widgets/class-wp-widget-media-image.php
+++ b/wp-includes/widgets/class-wp-widget-media-image.php
@@ -22,25 +22,29 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 	 * @since  4.8.0
 	 */
 	public function __construct() {
-		parent::__construct( 'media_image', __( 'Image' ), array(
-			'description' => __( 'Displays an image.' ),
-			'mime_type'   => 'image',
-		) );
+		parent::__construct(
+			'media_image', __( 'Image' ), array(
+				'description' => __( 'Displays an image.' ),
+				'mime_type'   => 'image',
+			)
+		);
 
-		$this->l10n = array_merge( $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' ),
-			'edit_media' => _x( 'Edit Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ),
-			'missing_attachment' => sprintf(
-				/* translators: %s: URL to media library */
-				__( 'We can&#8217;t find that image. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
-				esc_url( admin_url( 'upload.php' ) )
-			),
-			/* translators: %d: widget count */
-			'media_library_state_multi' => _n_noop( 'Image Widget (%d)', 'Image Widget (%d)' ),
-			'media_library_state_single' => __( 'Image Widget' ),
-		) );
+		$this->l10n = array_merge(
+			$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' ),
+				'edit_media'                 => _x( 'Edit Image', 'label for button in the image widget; should preferably not be longer than ~13 characters long' ),
+				'missing_attachment'         => sprintf(
+					/* translators: %s: URL to media library */
+					__( 'We can&#8217;t find that image. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
+					esc_url( admin_url( 'upload.php' ) )
+				),
+				/* translators: %d: widget count */
+				'media_library_state_multi'  => _n_noop( 'Image Widget (%d)', 'Image Widget (%d)' ),
+				'media_library_state_single' => __( 'Image Widget' ),
+			)
+		);
 	}
 
 	/**
@@ -57,91 +61,91 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 		return array_merge(
 			parent::get_instance_schema(),
 			array(
-				'size' => array(
-					'type' => 'string',
-					'enum' => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ),
-					'default' => 'medium',
+				'size'              => array(
+					'type'        => 'string',
+					'enum'        => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ),
+					'default'     => 'medium',
 					'description' => __( 'Size' ),
 				),
-				'width' => array( // Via 'customWidth', only when size=custom; otherwise via 'width'.
-					'type' => 'integer',
-					'minimum' => 0,
-					'default' => 0,
+				'width'             => array( // Via 'customWidth', only when size=custom; otherwise via 'width'.
+					'type'        => 'integer',
+					'minimum'     => 0,
+					'default'     => 0,
 					'description' => __( 'Width' ),
 				),
-				'height' => array( // Via 'customHeight', only when size=custom; otherwise via 'height'.
-					'type' => 'integer',
-					'minimum' => 0,
-					'default' => 0,
+				'height'            => array( // Via 'customHeight', only when size=custom; otherwise via 'height'.
+					'type'        => 'integer',
+					'minimum'     => 0,
+					'default'     => 0,
 					'description' => __( 'Height' ),
 				),
 
-				'caption' => array(
-					'type' => 'string',
-					'default' => '',
-					'sanitize_callback' => 'wp_kses_post',
-					'description' => __( 'Caption' ),
+				'caption'           => array(
+					'type'                  => 'string',
+					'default'               => '',
+					'sanitize_callback'     => 'wp_kses_post',
+					'description'           => __( 'Caption' ),
 					'should_preview_update' => false,
 				),
-				'alt' => array(
-					'type' => 'string',
-					'default' => '',
+				'alt'               => array(
+					'type'              => 'string',
+					'default'           => '',
 					'sanitize_callback' => 'sanitize_text_field',
-					'description' => __( 'Alternative Text' ),
+					'description'       => __( 'Alternative Text' ),
 				),
-				'link_type' => array(
-					'type' => 'string',
-					'enum' => array( 'none', 'file', 'post', 'custom' ),
-					'default' => 'custom',
-					'media_prop' => 'link',
-					'description' => __( 'Link To' ),
+				'link_type'         => array(
+					'type'                  => 'string',
+					'enum'                  => array( 'none', 'file', 'post', 'custom' ),
+					'default'               => 'custom',
+					'media_prop'            => 'link',
+					'description'           => __( 'Link To' ),
 					'should_preview_update' => true,
 				),
-				'link_url' => array(
-					'type' => 'string',
-					'default' => '',
-					'format' => 'uri',
-					'media_prop' => 'linkUrl',
-					'description' => __( 'URL' ),
+				'link_url'          => array(
+					'type'                  => 'string',
+					'default'               => '',
+					'format'                => 'uri',
+					'media_prop'            => 'linkUrl',
+					'description'           => __( 'URL' ),
 					'should_preview_update' => true,
 				),
-				'image_classes' => array(
-					'type' => 'string',
-					'default' => '',
-					'sanitize_callback' => array( $this, 'sanitize_token_list' ),
-					'media_prop' => 'extraClasses',
-					'description' => __( 'Image CSS Class' ),
+				'image_classes'     => array(
+					'type'                  => 'string',
+					'default'               => '',
+					'sanitize_callback'     => array( $this, 'sanitize_token_list' ),
+					'media_prop'            => 'extraClasses',
+					'description'           => __( 'Image CSS Class' ),
 					'should_preview_update' => false,
 				),
-				'link_classes' => array(
-					'type' => 'string',
-					'default' => '',
-					'sanitize_callback' => array( $this, 'sanitize_token_list' ),
-					'media_prop' => 'linkClassName',
+				'link_classes'      => array(
+					'type'                  => 'string',
+					'default'               => '',
+					'sanitize_callback'     => array( $this, 'sanitize_token_list' ),
+					'media_prop'            => 'linkClassName',
 					'should_preview_update' => false,
-					'description' => __( 'Link CSS Class' ),
+					'description'           => __( 'Link CSS Class' ),
 				),
-				'link_rel' => array(
-					'type' => 'string',
-					'default' => '',
-					'sanitize_callback' => array( $this, 'sanitize_token_list' ),
-					'media_prop' => 'linkRel',
-					'description' => __( 'Link Rel' ),
+				'link_rel'          => array(
+					'type'                  => 'string',
+					'default'               => '',
+					'sanitize_callback'     => array( $this, 'sanitize_token_list' ),
+					'media_prop'            => 'linkRel',
+					'description'           => __( 'Link Rel' ),
 					'should_preview_update' => false,
 				),
 				'link_target_blank' => array(
-					'type' => 'boolean',
-					'default' => false,
-					'media_prop' => 'linkTargetBlank',
-					'description' => __( 'Open link in a new tab' ),
+					'type'                  => 'boolean',
+					'default'               => false,
+					'media_prop'            => 'linkTargetBlank',
+					'description'           => __( 'Open link in a new tab' ),
 					'should_preview_update' => false,
 				),
-				'image_title' => array(
-					'type' => 'string',
-					'default' => '',
-					'sanitize_callback' => 'sanitize_text_field',
-					'media_prop' => 'title',
-					'description' => __( 'Image Title Attribute' ),
+				'image_title'       => array(
+					'type'                  => 'string',
+					'default'               => '',
+					'sanitize_callback'     => 'sanitize_text_field',
+					'media_prop'            => 'title',
+					'description'           => __( 'Image Title Attribute' ),
 					'should_preview_update' => false,
 				),
 
@@ -168,9 +172,11 @@ 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(
-			'size' => 'thumbnail',
-		) );
+		$instance = wp_parse_args(
+			$instance, array(
+				'size' => 'thumbnail',
+			)
+		);
 
 		$attachment = null;
 		if ( $this->is_attachment_with_mime_type( $instance['attachment_id'], $this->widget_options['mime_type'] ) ) {
@@ -205,7 +211,7 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 			$image = wp_get_attachment_image( $attachment->ID, $size, false, $image_attributes );
 
 			$caption_size = _wp_get_image_size_from_meta( $instance['size'], wp_get_attachment_metadata( $attachment->ID ) );
-			$width = empty( $caption_size[0] ) ? 0 : $caption_size[0];
+			$width        = empty( $caption_size[0] ) ? 0 : $caption_size[0];
 
 		} else {
 			if ( empty( $instance['url'] ) ) {
@@ -213,9 +219,9 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 			}
 
 			$instance['size'] = 'custom';
-			$caption = $instance['caption'];
-			$width   = $instance['width'];
-			$classes = 'image ' . $instance['image_classes'];
+			$caption          = $instance['caption'];
+			$width            = $instance['width'];
+			$classes          = 'image ' . $instance['image_classes'];
 			if ( 0 === $instance['width'] ) {
 				$instance['width'] = '';
 			}
@@ -223,7 +229,8 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 				$instance['height'] = '';
 			}
 
-			$image = sprintf( '<img class="%1$s" src="%2$s" alt="%3$s" width="%4$s" height="%5$s" />',
+			$image = sprintf(
+				'<img class="%1$s" src="%2$s" alt="%3$s" width="%4$s" height="%5$s" />',
 				esc_attr( $classes ),
 				esc_url( $instance['url'] ),
 				esc_attr( $instance['alt'] ),
@@ -259,10 +266,12 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 		}
 
 		if ( $caption ) {
-			$image = img_caption_shortcode( array(
-				'width' => $width,
-				'caption' => $caption,
-			), $image );
+			$image = img_caption_shortcode(
+				array(
+					'width'   => $width,
+					'caption' => $caption,
+				), $image
+			);
 		}
 
 		echo $image;
@@ -337,10 +346,12 @@ class WP_Widget_Media_Image extends WP_Widget_Media {
 			<# } else if ( data.url ) { #>
 				<img class="attachment-thumb" src="{{ data.url }}" draggable="false" alt="{{ data.alt }}" <# if ( ! data.alt && data.currentFilename ) { #> aria-describedby="{{ describedById }}" <# } #> />
 				<# if ( ! data.alt && data.currentFilename ) { #>
-					<p class="hidden" id="{{ describedById }}"><?php
+					<p class="hidden" id="{{ describedById }}">
+					<?php
 						/* translators: placeholder is image filename */
 						echo sprintf( __( 'Current image: %s' ), '{{ data.currentFilename }}' );
-					?></p>
+					?>
+					</p>
 				<# } #>
 			<# } #>
 		</script>
diff --git a/wp-includes/widgets/class-wp-widget-media-video.php b/wp-includes/widgets/class-wp-widget-media-video.php
index 96196e60f9..9d9235bd00 100644
--- a/wp-includes/widgets/class-wp-widget-media-video.php
+++ b/wp-includes/widgets/class-wp-widget-media-video.php
@@ -22,27 +22,31 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * @since  4.8.0
 	 */
 	public function __construct() {
-		parent::__construct( 'media_video', __( 'Video' ), array(
-			'description' => __( 'Displays a video from the media library or from YouTube, Vimeo, or another provider.' ),
-			'mime_type'   => 'video',
-		) );
+		parent::__construct(
+			'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(
-			'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' ),
-			'edit_media' => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
-			'missing_attachment' => sprintf(
-				/* translators: %s: URL to media library */
-				__( 'We can&#8217;t find that video. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
-				esc_url( admin_url( 'upload.php' ) )
-			),
-			/* translators: %d: widget count */
-			'media_library_state_multi' => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ),
-			'media_library_state_single' => __( 'Video Widget' ),
-			/* translators: %s: a list of valid video file extensions */
-			'unsupported_file_type' => sprintf( __( 'Sorry, we can&#8217;t load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
-		) );
+		$this->l10n = array_merge(
+			$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' ),
+				'edit_media'                 => _x( 'Edit Video', 'label for button in the video widget; should preferably not be longer than ~13 characters long' ),
+				'missing_attachment'         => sprintf(
+					/* translators: %s: URL to media library */
+					__( 'We can&#8217;t find that video. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
+					esc_url( admin_url( 'upload.php' ) )
+				),
+				/* translators: %d: widget count */
+				'media_library_state_multi'  => _n_noop( 'Video Widget (%d)', 'Video Widget (%d)' ),
+				'media_library_state_single' => __( 'Video Widget' ),
+				/* translators: %s: a list of valid video file extensions */
+				'unsupported_file_type'      => sprintf( __( 'Sorry, we can&#8217;t load the video at the supplied URL. Please check that the URL is for a supported video file (%s) or stream (e.g. YouTube and Vimeo).' ), '<code>.' . implode( '</code>, <code>.', wp_get_video_extensions() ) . '</code>' ),
+			)
+		);
 	}
 
 	/**
@@ -60,23 +64,23 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 			parent::get_instance_schema(),
 			array(
 				'preload' => array(
-					'type' => 'string',
-					'enum' => array( 'none', 'auto', 'metadata' ),
-					'default' => 'metadata',
-					'description' => __( 'Preload' ),
+					'type'                  => 'string',
+					'enum'                  => array( 'none', 'auto', 'metadata' ),
+					'default'               => 'metadata',
+					'description'           => __( 'Preload' ),
 					'should_preview_update' => false,
 				),
-				'loop' => array(
-					'type' => 'boolean',
-					'default' => false,
-					'description' => __( 'Loop' ),
+				'loop'    => array(
+					'type'                  => 'boolean',
+					'default'               => false,
+					'description'           => __( 'Loop' ),
 					'should_preview_update' => false,
 				),
 				'content' => array(
-					'type' => 'string',
-					'default' => '',
-					'sanitize_callback' => 'wp_kses_post',
-					'description' => __( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ),
+					'type'                  => 'string',
+					'default'               => '',
+					'sanitize_callback'     => 'wp_kses_post',
+					'description'           => __( 'Tracks (subtitles, captions, descriptions, chapters, or metadata)' ),
 					'should_preview_update' => false,
 				),
 			)
@@ -84,9 +88,9 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 
 		foreach ( wp_get_video_extensions() as $video_extension ) {
 			$schema[ $video_extension ] = array(
-				'type' => 'string',
-				'default' => '',
-				'format' => 'uri',
+				'type'        => 'string',
+				'default'     => '',
+				'format'      => 'uri',
 				/* translators: %s: video extension */
 				'description' => sprintf( __( 'URL to the %s video source file' ), $video_extension ),
 			);
@@ -105,7 +109,7 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 	 * @return void
 	 */
 	public function render_media( $instance ) {
-		$instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
+		$instance   = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance );
 		$attachment = null;
 
 		if ( $this->is_attachment_with_mime_type( $instance['attachment_id'], $this->widget_options['mime_type'] ) ) {
@@ -243,7 +247,7 @@ class WP_Widget_Media_Video extends WP_Widget_Media {
 					<span class="dashicons dashicons-format-video"></span>
 				</a>
 			<# } else if ( data.model.src ) { #>
-				<?php wp_underscore_video_template() ?>
+				<?php wp_underscore_video_template(); ?>
 			<# } #>
 		</script>
 		<?php
diff --git a/wp-includes/widgets/class-wp-widget-media.php b/wp-includes/widgets/class-wp-widget-media.php
index ec412d25f7..b4d3631b93 100644
--- a/wp-includes/widgets/class-wp-widget-media.php
+++ b/wp-includes/widgets/class-wp-widget-media.php
@@ -23,14 +23,14 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 * @var array
 	 */
 	public $l10n = array(
-		'add_to_widget' => '',
-		'replace_media' => '',
-		'edit_media' => '',
-		'media_library_state_multi' => '',
+		'add_to_widget'              => '',
+		'replace_media'              => '',
+		'edit_media'                 => '',
+		'media_library_state_multi'  => '',
 		'media_library_state_single' => '',
-		'missing_attachment' => '',
-		'no_media_selected' => '',
-		'add_media' => '',
+		'missing_attachment'         => '',
+		'no_media_selected'          => '',
+		'add_media'                  => '',
 	);
 
 	/**
@@ -54,29 +54,31 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 *                                for information on accepted arguments. Default empty array.
 	 */
 	public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		$widget_opts = wp_parse_args( $widget_options, array(
-			'description' => __( 'A media item.' ),
-			'customize_selective_refresh' => true,
-			'mime_type' => '',
-		) );
+		$widget_opts = wp_parse_args(
+			$widget_options, array(
+				'description'                 => __( 'A media item.' ),
+				'customize_selective_refresh' => true,
+				'mime_type'                   => '',
+			)
+		);
 
 		$control_opts = wp_parse_args( $control_options, array() );
 
 		$l10n_defaults = array(
-			'no_media_selected' => __( 'No media selected' ),
-			'add_media' => _x( 'Add Media', 'label for button in the media widget' ),
-			'replace_media' => _x( 'Replace Media', 'label for button in the media widget; should preferably not be longer than ~13 characters long' ),
-			'edit_media' => _x( 'Edit Media', 'label for button in the media widget; should preferably not be longer than ~13 characters long' ),
-			'add_to_widget' => __( 'Add to Widget' ),
-			'missing_attachment' => sprintf(
+			'no_media_selected'          => __( 'No media selected' ),
+			'add_media'                  => _x( 'Add Media', 'label for button in the media widget' ),
+			'replace_media'              => _x( 'Replace Media', 'label for button in the media widget; should preferably not be longer than ~13 characters long' ),
+			'edit_media'                 => _x( 'Edit Media', 'label for button in the media widget; should preferably not be longer than ~13 characters long' ),
+			'add_to_widget'              => __( 'Add to Widget' ),
+			'missing_attachment'         => sprintf(
 				/* translators: %s: URL to media library */
 				__( 'We can&#8217;t find that file. Check your <a href="%s">media library</a> and make sure it wasn&#8217;t deleted.' ),
 				esc_url( admin_url( 'upload.php' ) )
 			),
 			/* translators: %d: widget count */
-			'media_library_state_multi' => _n_noop( 'Media Widget (%d)', 'Media Widget (%d)' ),
+			'media_library_state_multi'  => _n_noop( 'Media Widget (%d)', 'Media Widget (%d)' ),
 			'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.' ),
+			'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 ) );
 
@@ -129,23 +131,23 @@ abstract class WP_Widget_Media extends WP_Widget {
 	public function get_instance_schema() {
 		$schema = array(
 			'attachment_id' => array(
-				'type' => 'integer',
-				'default' => 0,
-				'minimum' => 0,
+				'type'        => 'integer',
+				'default'     => 0,
+				'minimum'     => 0,
 				'description' => __( 'Attachment post ID' ),
-				'media_prop' => 'id',
+				'media_prop'  => 'id',
 			),
-			'url' => array(
-				'type' => 'string',
-				'default' => '',
-				'format' => 'uri',
+			'url'           => array(
+				'type'        => 'string',
+				'default'     => '',
+				'format'      => 'uri',
 				'description' => __( 'URL to the media file' ),
 			),
-			'title' => array(
-				'type' => 'string',
-				'default' => '',
-				'sanitize_callback' => 'sanitize_text_field',
-				'description' => __( 'Title for the widget' ),
+			'title'         => array(
+				'type'                  => 'string',
+				'default'               => '',
+				'sanitize_callback'     => 'sanitize_text_field',
+				'description'           => __( 'Title for the widget' ),
 				'should_preview_update' => false,
 			),
 		);
@@ -322,7 +324,7 @@ abstract class WP_Widget_Media extends WP_Widget {
 	 */
 	final public function form( $instance ) {
 		$instance_schema = $this->get_instance_schema();
-		$instance = wp_array_slice_assoc(
+		$instance        = wp_array_slice_assoc(
 			wp_parse_args( (array) $instance, wp_list_pluck( $instance_schema, 'default' ) ),
 			array_keys( $instance_schema )
 		);
diff --git a/wp-includes/widgets/class-wp-widget-meta.php b/wp-includes/widgets/class-wp-widget-meta.php
index 673976ee54..2df1f7030d 100644
--- a/wp-includes/widgets/class-wp-widget-meta.php
+++ b/wp-includes/widgets/class-wp-widget-meta.php
@@ -25,8 +25,8 @@ class WP_Widget_Meta extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_meta',
-			'description' => __( 'Login, RSS, &amp; WordPress.org links.' ),
+			'classname'                   => 'widget_meta',
+			'description'                 => __( 'Login, RSS, &amp; WordPress.org links.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'meta', __( 'Meta' ), $widget_ops );
@@ -56,8 +56,8 @@ class WP_Widget_Meta extends WP_Widget {
 			<ul>
 			<?php wp_register(); ?>
 			<li><?php wp_loginout(); ?></li>
-			<li><a href="<?php echo esc_url( get_bloginfo( 'rss2_url' ) ); ?>"><?php _e('Entries <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
-			<li><a href="<?php echo esc_url( get_bloginfo( 'comments_rss2_url' ) ); ?>"><?php _e('Comments <abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>
+			<li><a href="<?php echo esc_url( get_bloginfo( 'rss2_url' ) ); ?>"><?php _e( 'Entries <abbr title="Really Simple Syndication">RSS</abbr>' ); ?></a></li>
+			<li><a href="<?php echo esc_url( get_bloginfo( 'comments_rss2_url' ) ); ?>"><?php _e( 'Comments <abbr title="Really Simple Syndication">RSS</abbr>' ); ?></a></li>
 			<?php
 			/**
 			 * Filters the "Powered by WordPress" text in the Meta widget.
@@ -68,18 +68,21 @@ class WP_Widget_Meta extends WP_Widget {
 			 * @param string $title_text Default title text for the WordPress.org link.
 			 * @param array  $instance   Array of settings for the current widget.
 			 */
-			echo apply_filters( '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 );
+			echo apply_filters(
+				'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
+			);
 
 			wp_meta();
 			?>
 			</ul>
 			<?php
 
-		echo $args['after_widget'];
+			echo $args['after_widget'];
 	}
 
 	/**
@@ -93,7 +96,7 @@ class WP_Widget_Meta extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
+		$instance          = $old_instance;
 		$instance['title'] = sanitize_text_field( $new_instance['title'] );
 
 		return $instance;
@@ -108,9 +111,9 @@ 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'] );
+		$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>
+			<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
 	}
 }
diff --git a/wp-includes/widgets/class-wp-widget-pages.php b/wp-includes/widgets/class-wp-widget-pages.php
index 623bd6b331..025a0039c4 100644
--- a/wp-includes/widgets/class-wp-widget-pages.php
+++ b/wp-includes/widgets/class-wp-widget-pages.php
@@ -23,8 +23,8 @@ class WP_Widget_Pages extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_pages',
-			'description' => __( 'A list of your site&#8217;s Pages.' ),
+			'classname'                   => 'widget_pages',
+			'description'                 => __( 'A list of your site&#8217;s Pages.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'pages', __( 'Pages' ), $widget_ops );
@@ -53,11 +53,12 @@ class WP_Widget_Pages extends WP_Widget {
 		 */
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
-		$sortby = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby'];
+		$sortby  = empty( $instance['sortby'] ) ? 'menu_order' : $instance['sortby'];
 		$exclude = empty( $instance['exclude'] ) ? '' : $instance['exclude'];
 
-		if ( $sortby == 'menu_order' )
+		if ( $sortby == 'menu_order' ) {
 			$sortby = 'menu_order, post_title';
+		}
 
 		/**
 		 * Filters the arguments for the Pages widget.
@@ -70,12 +71,16 @@ class WP_Widget_Pages extends WP_Widget {
 		 * @param array $args     An array of arguments to retrieve the pages list.
 		 * @param array $instance Array of settings for the current widget.
 		 */
-		$out = wp_list_pages( apply_filters( 'widget_pages_args', array(
-			'title_li'    => '',
-			'echo'        => 0,
-			'sort_column' => $sortby,
-			'exclude'     => $exclude
-		), $instance ) );
+		$out = wp_list_pages(
+			apply_filters(
+				'widget_pages_args', array(
+					'title_li'    => '',
+					'echo'        => 0,
+					'sort_column' => $sortby,
+					'exclude'     => $exclude,
+				), $instance
+			)
+		);
 
 		if ( ! empty( $out ) ) {
 			echo $args['before_widget'];
@@ -102,7 +107,7 @@ class WP_Widget_Pages extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
+		$instance          = $old_instance;
 		$instance['title'] = sanitize_text_field( $new_instance['title'] );
 		if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ) ) ) {
 			$instance['sortby'] = $new_instance['sortby'];
@@ -124,17 +129,23 @@ class WP_Widget_Pages extends WP_Widget {
 	 */
 	public function form( $instance ) {
 		//Defaults
-		$instance = wp_parse_args( (array) $instance, array( 'sortby' => 'post_title', 'title' => '', 'exclude' => '') );
+		$instance = wp_parse_args(
+			(array) $instance, array(
+				'sortby'  => 'post_title',
+				'title'   => '',
+				'exclude' => '',
+			)
+		);
 		?>
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:' ); ?></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( $instance['title'] ); ?>" />
+			<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( $instance['title'] ); ?>" />
 		</p>
 		<p>
 			<label for="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>"><?php _e( 'Sort by:' ); ?></label>
 			<select name="<?php echo esc_attr( $this->get_field_name( 'sortby' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'sortby' ) ); ?>" class="widefat">
-				<option value="post_title"<?php selected( $instance['sortby'], 'post_title' ); ?>><?php _e('Page title'); ?></option>
-				<option value="menu_order"<?php selected( $instance['sortby'], 'menu_order' ); ?>><?php _e('Page order'); ?></option>
+				<option value="post_title"<?php selected( $instance['sortby'], 'post_title' ); ?>><?php _e( 'Page title' ); ?></option>
+				<option value="menu_order"<?php selected( $instance['sortby'], 'menu_order' ); ?>><?php _e( 'Page order' ); ?></option>
 				<option value="ID"<?php selected( $instance['sortby'], 'ID' ); ?>><?php _e( 'Page ID' ); ?></option>
 			</select>
 		</p>
diff --git a/wp-includes/widgets/class-wp-widget-recent-comments.php b/wp-includes/widgets/class-wp-widget-recent-comments.php
index a5c9b1d3bd..c7b0c264bd 100644
--- a/wp-includes/widgets/class-wp-widget-recent-comments.php
+++ b/wp-includes/widgets/class-wp-widget-recent-comments.php
@@ -23,8 +23,8 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_recent_comments',
-			'description' => __( 'Your site&#8217;s most recent comments.' ),
+			'classname'                   => 'widget_recent_comments',
+			'description'                 => __( 'Your site&#8217;s most recent comments.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'recent-comments', __( 'Recent Comments' ), $widget_ops );
@@ -35,7 +35,7 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 		}
 	}
 
- 	/**
+	/**
 	 * Outputs the default styles for the Recent Comments widget.
 	 *
 	 * @since 2.8.0
@@ -50,8 +50,9 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 		 * @param string $id_base The widget ID.
 		 */
 		if ( ! current_theme_supports( 'widgets' ) // Temp hack #14876
-			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) )
+			|| ! apply_filters( 'show_recent_comments_widget_style', true, $this->id_base ) ) {
 			return;
+		}
 		?>
 		<style type="text/css">.recentcomments a{display:inline !important;padding:0 !important;margin:0 !important;}</style>
 		<?php
@@ -67,8 +68,9 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * @param array $instance Settings for the current Recent Comments widget instance.
 	 */
 	public function widget( $args, $instance ) {
-		if ( ! isset( $args['widget_id'] ) )
+		if ( ! isset( $args['widget_id'] ) ) {
 			$args['widget_id'] = $this->id;
+		}
 
 		$output = '';
 
@@ -78,8 +80,9 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
 		$number = ( ! empty( $instance['number'] ) ) ? absint( $instance['number'] ) : 5;
-		if ( ! $number )
+		if ( ! $number ) {
 			$number = 5;
+		}
 
 		/**
 		 * Filters the arguments for the Recent Comments widget.
@@ -92,11 +95,15 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 		 * @param array $comment_args An array of arguments used to retrieve the recent comments.
 		 * @param array $instance     Array of settings for the current widget.
 		 */
-		$comments = get_comments( apply_filters( 'widget_comments_args', array(
-			'number'      => $number,
-			'status'      => 'approve',
-			'post_status' => 'publish'
-		), $instance ) );
+		$comments = get_comments(
+			apply_filters(
+				'widget_comments_args', array(
+					'number'      => $number,
+					'status'      => 'approve',
+					'post_status' => 'publish',
+				), $instance
+			)
+		);
 
 		$output .= $args['before_widget'];
 		if ( $title ) {
@@ -112,7 +119,8 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 			foreach ( (array) $comments as $comment ) {
 				$output .= '<li class="recentcomments">';
 				/* translators: comments widget: 1: comment author, 2: post link */
-				$output .= sprintf( _x( '%1$s on %2$s', 'widgets' ),
+				$output .= sprintf(
+					_x( '%1$s on %2$s', 'widgets' ),
 					'<span class="comment-author-link">' . get_comment_author_link( $comment ) . '</span>',
 					'<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . get_the_title( $comment->comment_post_ID ) . '</a>'
 				);
@@ -136,8 +144,8 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$instance           = $old_instance;
+		$instance['title']  = sanitize_text_field( $new_instance['title'] );
 		$instance['number'] = absint( $new_instance['number'] );
 		return $instance;
 	}
@@ -150,7 +158,7 @@ class WP_Widget_Recent_Comments extends WP_Widget {
 	 * @param array $instance Current settings.
 	 */
 	public function form( $instance ) {
-		$title = isset( $instance['title'] ) ? $instance['title'] : '';
+		$title  = isset( $instance['title'] ) ? $instance['title'] : '';
 		$number = isset( $instance['number'] ) ? absint( $instance['number'] ) : 5;
 		?>
 		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
diff --git a/wp-includes/widgets/class-wp-widget-recent-posts.php b/wp-includes/widgets/class-wp-widget-recent-posts.php
index 37843c3a8b..fa0f56ac2d 100644
--- a/wp-includes/widgets/class-wp-widget-recent-posts.php
+++ b/wp-includes/widgets/class-wp-widget-recent-posts.php
@@ -23,8 +23,8 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_recent_entries',
-			'description' => __( 'Your site&#8217;s most recent Posts.' ),
+			'classname'                   => 'widget_recent_entries',
+			'description'                 => __( 'Your site&#8217;s most recent Posts.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'recent-posts', __( 'Recent Posts' ), $widget_ops );
@@ -67,12 +67,16 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 		 * @param array $args     An array of arguments used to retrieve the recent posts.
 		 * @param array $instance Array of settings for the current widget.
 		 */
-		$r = new WP_Query( apply_filters( 'widget_posts_args', array(
-			'posts_per_page'      => $number,
-			'no_found_rows'       => true,
-			'post_status'         => 'publish',
-			'ignore_sticky_posts' => true,
-		), $instance ) );
+		$r = new WP_Query(
+			apply_filters(
+				'widget_posts_args', array(
+					'posts_per_page'      => $number,
+					'no_found_rows'       => true,
+					'post_status'         => 'publish',
+					'ignore_sticky_posts' => true,
+				), $instance
+			)
+		);
 
 		if ( ! $r->have_posts() ) {
 			return;
@@ -91,7 +95,7 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 				$title      = ( ! empty( $post_title ) ) ? $post_title : __( '(no title)' );
 				?>
 				<li>
-					<a href="<?php the_permalink( $recent_post->ID ); ?>"><?php echo $title ; ?></a>
+					<a href="<?php the_permalink( $recent_post->ID ); ?>"><?php echo $title; ?></a>
 					<?php if ( $show_date ) : ?>
 						<span class="post-date"><?php echo get_the_date( '', $recent_post->ID ); ?></span>
 					<?php endif; ?>
@@ -113,9 +117,9 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['number'] = (int) $new_instance['number'];
+		$instance              = $old_instance;
+		$instance['title']     = sanitize_text_field( $new_instance['title'] );
+		$instance['number']    = (int) $new_instance['number'];
 		$instance['show_date'] = isset( $new_instance['show_date'] ) ? (bool) $new_instance['show_date'] : false;
 		return $instance;
 	}
diff --git a/wp-includes/widgets/class-wp-widget-rss.php b/wp-includes/widgets/class-wp-widget-rss.php
index b0a93c8c46..3b9862c14d 100644
--- a/wp-includes/widgets/class-wp-widget-rss.php
+++ b/wp-includes/widgets/class-wp-widget-rss.php
@@ -22,11 +22,14 @@ class WP_Widget_RSS extends WP_Widget {
 	 * @since 2.8.0
 	 */
 	public function __construct() {
-		$widget_ops = array(
-			'description' => __( 'Entries from any RSS or Atom feed.' ),
+		$widget_ops  = array(
+			'description'                 => __( 'Entries from any RSS or Atom feed.' ),
 			'customize_selective_refresh' => true,
 		);
-		$control_ops = array( 'width' => 400, 'height' => 200 );
+		$control_ops = array(
+			'width'  => 400,
+			'height' => 200,
+		);
 		parent::__construct( 'rss', __( 'RSS' ), $widget_ops, $control_ops );
 	}
 
@@ -40,32 +43,38 @@ class WP_Widget_RSS extends WP_Widget {
 	 * @param array $instance Settings for the current RSS widget instance.
 	 */
 	public function widget( $args, $instance ) {
-		if ( isset($instance['error']) && $instance['error'] )
+		if ( isset( $instance['error'] ) && $instance['error'] ) {
 			return;
+		}
 
 		$url = ! empty( $instance['url'] ) ? $instance['url'] : '';
-		while ( stristr($url, 'http') != $url )
-			$url = substr($url, 1);
+		while ( stristr( $url, 'http' ) != $url ) {
+			$url = substr( $url, 1 );
+		}
 
-		if ( empty($url) )
+		if ( empty( $url ) ) {
 			return;
+		}
 
 		// self-url destruction sequence
-		if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) )
+		if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) ) {
 			return;
+		}
 
-		$rss = fetch_feed($url);
+		$rss   = fetch_feed( $url );
 		$title = $instance['title'];
-		$desc = '';
-		$link = '';
+		$desc  = '';
+		$link  = '';
 
-		if ( ! is_wp_error($rss) ) {
-			$desc = esc_attr(strip_tags(@html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
-			if ( empty($title) )
+		if ( ! is_wp_error( $rss ) ) {
+			$desc = esc_attr( strip_tags( @html_entity_decode( $rss->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) ) ) );
+			if ( empty( $title ) ) {
 				$title = strip_tags( $rss->get_title() );
+			}
 			$link = strip_tags( $rss->get_permalink() );
-			while ( stristr($link, 'http') != $link )
-				$link = substr($link, 1);
+			while ( stristr( $link, 'http' ) != $link ) {
+				$link = substr( $link, 1 );
+			}
 		}
 
 		if ( empty( $title ) ) {
@@ -75,10 +84,11 @@ class WP_Widget_RSS extends WP_Widget {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
-		$url = strip_tags( $url );
+		$url  = strip_tags( $url );
 		$icon = includes_url( 'images/rss.png' );
-		if ( $title )
-			$title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">'. esc_html( $title ) . '</a>';
+		if ( $title ) {
+			$title = '<a class="rsswidget" href="' . esc_url( $url ) . '"><img class="rss-widget-icon" style="border:0" width="14" height="14" src="' . esc_url( $icon ) . '" alt="RSS" /></a> <a class="rsswidget" href="' . esc_url( $link ) . '">' . esc_html( $title ) . '</a>';
+		}
 
 		echo $args['before_widget'];
 		if ( $title ) {
@@ -87,9 +97,10 @@ class WP_Widget_RSS extends WP_Widget {
 		wp_widget_rss_output( $rss, $instance );
 		echo $args['after_widget'];
 
-		if ( ! is_wp_error($rss) )
+		if ( ! is_wp_error( $rss ) ) {
 			$rss->__destruct();
-		unset($rss);
+		}
+		unset( $rss );
 	}
 
 	/**
@@ -103,7 +114,7 @@ class WP_Widget_RSS extends WP_Widget {
 	 * @return array Updated settings to save.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$testurl = ( isset( $new_instance['url'] ) && ( !isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
+		$testurl = ( isset( $new_instance['url'] ) && ( ! isset( $old_instance['url'] ) || ( $new_instance['url'] != $old_instance['url'] ) ) );
 		return wp_widget_rss_process( $new_instance, $testurl );
 	}
 
@@ -116,7 +127,15 @@ class WP_Widget_RSS extends WP_Widget {
 	 */
 	public function form( $instance ) {
 		if ( empty( $instance ) ) {
-			$instance = array( 'title' => '', 'url' => '', 'items' => 10, 'error' => false, 'show_summary' => 0, 'show_author' => 0, 'show_date' => 0 );
+			$instance = array(
+				'title'        => '',
+				'url'          => '',
+				'items'        => 10,
+				'error'        => false,
+				'show_summary' => 0,
+				'show_author'  => 0,
+				'show_date'    => 0,
+			);
 		}
 		$instance['number'] = $this->number;
 
diff --git a/wp-includes/widgets/class-wp-widget-search.php b/wp-includes/widgets/class-wp-widget-search.php
index b1a5b40356..d27babe9ab 100644
--- a/wp-includes/widgets/class-wp-widget-search.php
+++ b/wp-includes/widgets/class-wp-widget-search.php
@@ -23,8 +23,8 @@ class WP_Widget_Search extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_search',
-			'description' => __( 'A search form for your site.' ),
+			'classname'                   => 'widget_search',
+			'description'                 => __( 'A search form for your site.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'search', _x( 'Search', 'Search widget' ), $widget_ops );
@@ -64,10 +64,10 @@ class WP_Widget_Search extends WP_Widget {
 	 * @param array $instance Current settings.
 	 */
 	public function form( $instance ) {
-		$instance = wp_parse_args( (array) $instance, array( 'title' => '') );
-		$title = $instance['title'];
+		$instance = wp_parse_args( (array) $instance, array( 'title' => '' ) );
+		$title    = $instance['title'];
 		?>
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:'); ?> <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); ?>" /></label></p>
+		<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?> <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 ); ?>" /></label></p>
 		<?php
 	}
 
@@ -82,8 +82,8 @@ class WP_Widget_Search extends WP_Widget {
 	 * @return array Updated settings.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
-		$new_instance = wp_parse_args((array) $new_instance, array( 'title' => ''));
+		$instance          = $old_instance;
+		$new_instance      = wp_parse_args( (array) $new_instance, array( 'title' => '' ) );
 		$instance['title'] = sanitize_text_field( $new_instance['title'] );
 		return $instance;
 	}
diff --git a/wp-includes/widgets/class-wp-widget-tag-cloud.php b/wp-includes/widgets/class-wp-widget-tag-cloud.php
index 8b486202fc..e04631543f 100644
--- a/wp-includes/widgets/class-wp-widget-tag-cloud.php
+++ b/wp-includes/widgets/class-wp-widget-tag-cloud.php
@@ -23,7 +23,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'description' => __( 'A cloud of your most used tags.' ),
+			'description'                 => __( 'A cloud of your most used tags.' ),
 			'customize_selective_refresh' => true,
 		);
 		parent::__construct( 'tag_cloud', __( 'Tag Cloud' ), $widget_ops );
@@ -47,7 +47,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 			if ( 'post_tag' === $current_taxonomy ) {
 				$title = __( 'Tags' );
 			} else {
-				$tax = get_taxonomy( $current_taxonomy );
+				$tax   = get_taxonomy( $current_taxonomy );
 				$title = $tax->labels->name;
 			}
 		}
@@ -66,11 +66,15 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 		 * @param array $args     Args used for the tag cloud widget.
 		 * @param array $instance Array of settings for the current widget.
 		 */
-		$tag_cloud = wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array(
-			'taxonomy'   => $current_taxonomy,
-			'echo'       => false,
-			'show_count' => $show_count,
-		), $instance ) );
+		$tag_cloud = wp_tag_cloud(
+			apply_filters(
+				'widget_tag_cloud_args', array(
+					'taxonomy'   => $current_taxonomy,
+					'echo'       => false,
+					'show_count' => $show_count,
+				), $instance
+			)
+		);
 
 		if ( empty( $tag_cloud ) ) {
 			return;
@@ -103,10 +107,10 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$instance = array();
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
-		$instance['count'] = ! empty( $new_instance['count'] ) ? 1 : 0;
-		$instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
+		$instance             = array();
+		$instance['title']    = sanitize_text_field( $new_instance['title'] );
+		$instance['count']    = ! empty( $new_instance['count'] ) ? 1 : 0;
+		$instance['taxonomy'] = stripslashes( $new_instance['taxonomy'] );
 		return $instance;
 	}
 
@@ -118,19 +122,19 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * @param array $instance Current settings.
 	 */
 	public function form( $instance ) {
-		$current_taxonomy = $this->_get_current_taxonomy($instance);
-		$title_id = $this->get_field_id( 'title' );
-		$count = isset( $instance['count'] ) ? (bool) $instance['count'] : false;
+		$current_taxonomy  = $this->_get_current_taxonomy( $instance );
+		$title_id          = $this->get_field_id( 'title' );
+		$count             = isset( $instance['count'] ) ? (bool) $instance['count'] : false;
 		$instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
 
-		echo '<p><label for="' . $title_id .'">' . __( 'Title:' ) . '</label>
-			<input type="text" class="widefat" id="' . $title_id .'" name="' . $this->get_field_name( 'title' ) .'" value="' . $instance['title'] .'" />
+		echo '<p><label for="' . $title_id . '">' . __( 'Title:' ) . '</label>
+			<input type="text" class="widefat" id="' . $title_id . '" name="' . $this->get_field_name( 'title' ) . '" value="' . $instance['title'] . '" />
 		</p>';
 
 		$taxonomies = get_taxonomies( array( 'show_tagcloud' => true ), 'object' );
-		$id = $this->get_field_id( 'taxonomy' );
-		$name = $this->get_field_name( 'taxonomy' );
-		$input = '<input type="hidden" id="' . $id . '" name="' . $name . '" value="%s" />';
+		$id         = $this->get_field_id( 'taxonomy' );
+		$name       = $this->get_field_name( 'taxonomy' );
+		$input      = '<input type="hidden" id="' . $id . '" name="' . $name . '" value="%s" />';
 
 		$count_checkbox = sprintf(
 			'<p><input type="checkbox" class="checkbox" id="%1$s" name="%2$s"%3$s /> <label for="%1$s">%4$s</label></p>',
@@ -142,40 +146,40 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 
 		switch ( count( $taxonomies ) ) {
 
-		// No tag cloud supporting taxonomies found, display error message
-		case 0:
-			echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>';
-			printf( $input, '' );
-			break;
+			// No tag cloud supporting taxonomies found, display error message
+			case 0:
+				echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>';
+				printf( $input, '' );
+				break;
 
-		// Just a single tag cloud supporting taxonomy found, no need to display a select.
-		case 1:
-			$keys = array_keys( $taxonomies );
-			$taxonomy = reset( $keys );
-			printf( $input, esc_attr( $taxonomy ) );
-			echo $count_checkbox;
-			break;
+			// Just a single tag cloud supporting taxonomy found, no need to display a select.
+			case 1:
+				$keys     = array_keys( $taxonomies );
+				$taxonomy = reset( $keys );
+				printf( $input, esc_attr( $taxonomy ) );
+				echo $count_checkbox;
+				break;
 
-		// More than one tag cloud supporting taxonomy found, display a select.
-		default:
-			printf(
-				'<p><label for="%1$s">%2$s</label>' .
-				'<select class="widefat" id="%1$s" name="%3$s">',
-				$id,
-				__( 'Taxonomy:' ),
-				$name
-			);
-
-			foreach ( $taxonomies as $taxonomy => $tax ) {
+			// More than one tag cloud supporting taxonomy found, display a select.
+			default:
 				printf(
-					'<option value="%s"%s>%s</option>',
-					esc_attr( $taxonomy ),
-					selected( $taxonomy, $current_taxonomy, false ),
-					$tax->labels->name
+					'<p><label for="%1$s">%2$s</label>' .
+					'<select class="widefat" id="%1$s" name="%3$s">',
+					$id,
+					__( 'Taxonomy:' ),
+					$name
 				);
-			}
 
-			echo '</select></p>' . $count_checkbox;
+				foreach ( $taxonomies as $taxonomy => $tax ) {
+					printf(
+						'<option value="%s"%s>%s</option>',
+						esc_attr( $taxonomy ),
+						selected( $taxonomy, $current_taxonomy, false ),
+						$tax->labels->name
+					);
+				}
+
+				echo '</select></p>' . $count_checkbox;
 		}
 	}
 
@@ -187,9 +191,10 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
 	 * @param array $instance Current settings.
 	 * @return string Name of the current taxonomy if set, otherwise 'post_tag'.
 	 */
-	public function _get_current_taxonomy($instance) {
-		if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
+	public function _get_current_taxonomy( $instance ) {
+		if ( ! empty( $instance['taxonomy'] ) && taxonomy_exists( $instance['taxonomy'] ) ) {
 			return $instance['taxonomy'];
+		}
 
 		return 'post_tag';
 	}
diff --git a/wp-includes/widgets/class-wp-widget-text.php b/wp-includes/widgets/class-wp-widget-text.php
index b62885dabb..dc94978cd4 100644
--- a/wp-includes/widgets/class-wp-widget-text.php
+++ b/wp-includes/widgets/class-wp-widget-text.php
@@ -30,13 +30,13 @@ class WP_Widget_Text extends WP_Widget {
 	 * @since 2.8.0
 	 */
 	public function __construct() {
-		$widget_ops = array(
-			'classname' => 'widget_text',
-			'description' => __( 'Arbitrary text.' ),
+		$widget_ops  = array(
+			'classname'                   => 'widget_text',
+			'description'                 => __( 'Arbitrary text.' ),
 			'customize_selective_refresh' => true,
 		);
 		$control_ops = array(
-			'width' => 400,
+			'width'  => 400,
 			'height' => 350,
 		);
 		parent::__construct( 'text', __( 'Text' ), $widget_ops, $control_ops );
@@ -95,7 +95,7 @@ class WP_Widget_Text extends WP_Widget {
 			return false;
 		}
 
-		$wpautop = ! empty( $instance['filter'] );
+		$wpautop         = ! empty( $instance['filter'] );
 		$has_line_breaks = ( false !== strpos( trim( $instance['text'] ), "\n" ) );
 
 		// If auto-paragraphs are not enabled and there are line breaks, then ensure legacy mode.
@@ -116,38 +116,40 @@ class WP_Widget_Text extends WP_Widget {
 		}
 
 		$doc = new DOMDocument();
-		@$doc->loadHTML( sprintf(
-			'<!DOCTYPE html><html><head><meta charset="%s"></head><body>%s</body></html>',
-			esc_attr( get_bloginfo( 'charset' ) ),
-			$instance['text']
-		) );
+		@$doc->loadHTML(
+			sprintf(
+				'<!DOCTYPE html><html><head><meta charset="%s"></head><body>%s</body></html>',
+				esc_attr( get_bloginfo( 'charset' ) ),
+				$instance['text']
+			)
+		);
 		$body = $doc->getElementsByTagName( 'body' )->item( 0 );
 
 		// See $allowedposttags.
 		$safe_elements_attributes = array(
-			'strong' => array(),
-			'em' => array(),
-			'b' => array(),
-			'i' => array(),
-			'u' => array(),
-			's' => array(),
-			'ul' => array(),
-			'ol' => array(),
-			'li' => array(),
-			'hr' => array(),
-			'abbr' => array(),
+			'strong'  => array(),
+			'em'      => array(),
+			'b'       => array(),
+			'i'       => array(),
+			'u'       => array(),
+			's'       => array(),
+			'ul'      => array(),
+			'ol'      => array(),
+			'li'      => array(),
+			'hr'      => array(),
+			'abbr'    => array(),
 			'acronym' => array(),
-			'code' => array(),
-			'dfn' => array(),
-			'a' => array(
+			'code'    => array(),
+			'dfn'     => array(),
+			'a'       => array(
 				'href' => true,
 			),
-			'img' => array(
+			'img'     => array(
 				'src' => true,
 				'alt' => true,
 			),
 		);
-		$safe_empty_elements = array( 'img', 'hr', 'iframe' );
+		$safe_empty_elements      = array( 'img', 'hr', 'iframe' );
 
 		foreach ( $body->getElementsByTagName( '*' ) as $element ) {
 			/** @var DOMElement $element */
@@ -215,7 +217,7 @@ class WP_Widget_Text extends WP_Widget {
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
 		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
 
-		$text = ! empty( $instance['text'] ) ? $instance['text'] : '';
+		$text                  = ! empty( $instance['text'] ) ? $instance['text'] : '';
 		$is_visual_text_widget = ( ! empty( $instance['visual'] ) && ! empty( $instance['filter'] ) );
 
 		// In 4.8.0 only, visual Text widgets get filter=content, without visual prop; upgrade instance props just-in-time.
@@ -233,7 +235,7 @@ class WP_Widget_Text extends WP_Widget {
 		 * and it applies after wpautop() to prevent corrupting HTML output added by the shortcode. When do_shortcode() is
 		 * added to 'widget_text_content' then do_shortcode() will be manually called when in legacy mode as well.
 		 */
-		$widget_text_do_shortcode_priority = has_filter( 'widget_text', 'do_shortcode' );
+		$widget_text_do_shortcode_priority       = has_filter( 'widget_text', 'do_shortcode' );
 		$should_suspend_legacy_shortcode_support = ( $is_visual_text_widget && false !== $widget_text_do_shortcode_priority );
 		if ( $should_suspend_legacy_shortcode_support ) {
 			remove_filter( 'widget_text', 'do_shortcode', $widget_text_do_shortcode_priority );
@@ -351,12 +353,14 @@ class WP_Widget_Text extends WP_Widget {
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
 	public function update( $new_instance, $old_instance ) {
-		$new_instance = wp_parse_args( $new_instance, array(
-			'title' => '',
-			'text' => '',
-			'filter' => false, // For back-compat.
-			'visual' => null, // Must be explicitly defined.
-		) );
+		$new_instance = wp_parse_args(
+			$new_instance, array(
+				'title'  => '',
+				'text'   => '',
+				'filter' => false, // For back-compat.
+				'visual' => null, // Must be explicitly defined.
+			)
+		);
 
 		$instance = $old_instance;
 
@@ -417,7 +421,7 @@ class WP_Widget_Text extends WP_Widget {
 			(array) $instance,
 			array(
 				'title' => '',
-				'text' => '',
+				'text'  => '',
 			)
 		);
 		?>
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 179619d40d..c44b09a566 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -241,8 +241,18 @@ class wpdb {
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $tables = array( 'posts', 'comments', 'links', 'options', 'postmeta',
-		'terms', 'term_taxonomy', 'term_relationships', 'termmeta', 'commentmeta' );
+	var $tables = array(
+		'posts',
+		'comments',
+		'links',
+		'options',
+		'postmeta',
+		'terms',
+		'term_taxonomy',
+		'term_relationships',
+		'termmeta',
+		'commentmeta',
+	);
 
 	/**
 	 * List of deprecated WordPress tables
@@ -271,8 +281,15 @@ class wpdb {
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $ms_global_tables = array( 'blogs', 'signups', 'site', 'sitemeta',
-		'sitecategories', 'registration_log', 'blog_versions' );
+	var $ms_global_tables = array(
+		'blogs',
+		'signups',
+		'site',
+		'sitemeta',
+		'sitecategories',
+		'registration_log',
+		'blog_versions',
+	);
 
 	/**
 	 * WordPress Comments table
@@ -528,8 +545,13 @@ class wpdb {
 	 * @since 3.9.0
 	 * @var array
 	 */
-	protected $incompatible_modes = array( 'NO_ZERO_DATE', 'ONLY_FULL_GROUP_BY',
-		'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'TRADITIONAL' );
+	protected $incompatible_modes = array(
+		'NO_ZERO_DATE',
+		'ONLY_FULL_GROUP_BY',
+		'STRICT_TRANS_TABLES',
+		'STRICT_ALL_TABLES',
+		'TRADITIONAL',
+	);
 
 	/**
 	 * Whether to use mysqli over mysql.
@@ -567,8 +589,9 @@ class wpdb {
 	public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
 		register_shutdown_function( array( $this, '__destruct' ) );
 
-		if ( WP_DEBUG && WP_DEBUG_DISPLAY )
+		if ( WP_DEBUG && WP_DEBUG_DISPLAY ) {
 			$this->show_errors();
+		}
 
 		/* Use ext/mysqli if it exists and:
 		 *  - WP_USE_EXT_MYSQL is defined as false, or
@@ -586,10 +609,10 @@ class wpdb {
 			}
 		}
 
-		$this->dbuser = $dbuser;
+		$this->dbuser     = $dbuser;
 		$this->dbpassword = $dbpassword;
-		$this->dbname = $dbname;
-		$this->dbhost = $dbhost;
+		$this->dbname     = $dbname;
+		$this->dbhost     = $dbhost;
 
 		// wp-config.php creation will manually connect when ready.
 		if ( defined( 'WP_SETUP_CONFIG' ) ) {
@@ -619,8 +642,9 @@ class wpdb {
 	 * @return mixed The private member
 	 */
 	public function __get( $name ) {
-		if ( 'col_info' === $name )
+		if ( 'col_info' === $name ) {
 			$this->load_col_info();
+		}
 
 		return $this->$name;
 	}
@@ -639,7 +663,7 @@ class wpdb {
 			'table_charset',
 			'check_current_query',
 		);
-		if (  in_array( $name, $protected_members, true ) ) {
+		if ( in_array( $name, $protected_members, true ) ) {
 			return;
 		}
 		$this->$name = $value;
@@ -678,7 +702,7 @@ class wpdb {
 		$charset = '';
 		$collate = '';
 
-		if ( function_exists('is_multisite') && is_multisite() ) {
+		if ( function_exists( 'is_multisite' ) && is_multisite() ) {
 			$charset = 'utf8';
 			if ( defined( 'DB_COLLATE' ) && DB_COLLATE ) {
 				$collate = DB_COLLATE;
@@ -751,10 +775,12 @@ class wpdb {
 	 * @param string   $collate Optional. The collation. Default null.
 	 */
 	public function set_charset( $dbh, $charset = null, $collate = null ) {
-		if ( ! isset( $charset ) )
+		if ( ! isset( $charset ) ) {
 			$charset = $this->charset;
-		if ( ! isset( $collate ) )
+		}
+		if ( ! isset( $collate ) ) {
 			$collate = $this->collate;
+		}
 		if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) {
 			$set_charset_succeeded = true;
 
@@ -765,8 +791,9 @@ class wpdb {
 
 				if ( $set_charset_succeeded ) {
 					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
+					if ( ! empty( $collate ) ) {
 						$query .= $this->prepare( ' COLLATE %s', $collate );
+					}
 					mysqli_query( $dbh, $query );
 				}
 			} else {
@@ -775,8 +802,9 @@ class wpdb {
 				}
 				if ( $set_charset_succeeded ) {
 					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
+					if ( ! empty( $collate ) ) {
 						$query .= $this->prepare( ' COLLATE %s', $collate );
+					}
 					mysql_query( $query, $dbh );
 				}
 			}
@@ -859,30 +887,36 @@ class wpdb {
 	 */
 	public function set_prefix( $prefix, $set_table_names = true ) {
 
-		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-			return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
+		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+			return new WP_Error( 'invalid_db_prefix', 'Invalid database prefix' );
+		}
 
 		$old_prefix = is_multisite() ? '' : $prefix;
 
-		if ( isset( $this->base_prefix ) )
+		if ( isset( $this->base_prefix ) ) {
 			$old_prefix = $this->base_prefix;
+		}
 
 		$this->base_prefix = $prefix;
 
 		if ( $set_table_names ) {
-			foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
+			foreach ( $this->tables( 'global' ) as $table => $prefixed_table ) {
 				$this->$table = $prefixed_table;
+			}
 
-			if ( is_multisite() && empty( $this->blogid ) )
+			if ( is_multisite() && empty( $this->blogid ) ) {
 				return $old_prefix;
+			}
 
 			$this->prefix = $this->get_blog_prefix();
 
-			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
+			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table ) {
 				$this->$table = $prefixed_table;
+			}
 
-			foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
+			foreach ( $this->tables( 'old' ) as $table => $prefixed_table ) {
 				$this->$table = $prefixed_table;
+			}
 		}
 		return $old_prefix;
 	}
@@ -906,11 +940,13 @@ class wpdb {
 
 		$this->prefix = $this->get_blog_prefix();
 
-		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
+		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table ) {
 			$this->$table = $prefixed_table;
+		}
 
-		foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
+		foreach ( $this->tables( 'old' ) as $table => $prefixed_table ) {
 			$this->$table = $prefixed_table;
+		}
 
 		return $old_blog_id;
 	}
@@ -924,13 +960,15 @@ class wpdb {
 	 */
 	public function get_blog_prefix( $blog_id = null ) {
 		if ( is_multisite() ) {
-			if ( null === $blog_id )
+			if ( null === $blog_id ) {
 				$blog_id = $this->blogid;
+			}
 			$blog_id = (int) $blog_id;
-			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
+			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) ) {
 				return $this->base_prefix;
-			else
+			} else {
 				return $this->base_prefix . $blog_id . '_';
+			}
 		} else {
 			return $this->base_prefix;
 		}
@@ -965,48 +1003,54 @@ class wpdb {
 	 */
 	public function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
 		switch ( $scope ) {
-			case 'all' :
+			case 'all':
 				$tables = array_merge( $this->global_tables, $this->tables );
-				if ( is_multisite() )
+				if ( is_multisite() ) {
 					$tables = array_merge( $tables, $this->ms_global_tables );
+				}
 				break;
-			case 'blog' :
+			case 'blog':
 				$tables = $this->tables;
 				break;
-			case 'global' :
+			case 'global':
 				$tables = $this->global_tables;
-				if ( is_multisite() )
+				if ( is_multisite() ) {
 					$tables = array_merge( $tables, $this->ms_global_tables );
+				}
 				break;
-			case 'ms_global' :
+			case 'ms_global':
 				$tables = $this->ms_global_tables;
 				break;
-			case 'old' :
+			case 'old':
 				$tables = $this->old_tables;
 				break;
-			default :
+			default:
 				return array();
 		}
 
 		if ( $prefix ) {
-			if ( ! $blog_id )
+			if ( ! $blog_id ) {
 				$blog_id = $this->blogid;
-			$blog_prefix = $this->get_blog_prefix( $blog_id );
-			$base_prefix = $this->base_prefix;
+			}
+			$blog_prefix   = $this->get_blog_prefix( $blog_id );
+			$base_prefix   = $this->base_prefix;
 			$global_tables = array_merge( $this->global_tables, $this->ms_global_tables );
 			foreach ( $tables as $k => $table ) {
-				if ( in_array( $table, $global_tables ) )
+				if ( in_array( $table, $global_tables ) ) {
 					$tables[ $table ] = $base_prefix . $table;
-				else
+				} else {
 					$tables[ $table ] = $blog_prefix . $table;
+				}
 				unset( $tables[ $k ] );
 			}
 
-			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) )
+			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) ) {
 				$tables['users'] = CUSTOM_USER_TABLE;
+			}
 
-			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) )
+			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) ) {
 				$tables['usermeta'] = CUSTOM_USER_META_TABLE;
+			}
 		}
 
 		return $tables;
@@ -1024,8 +1068,9 @@ class wpdb {
 	 * @param resource|null $dbh Optional link identifier.
 	 */
 	public function select( $db, $dbh = null ) {
-		if ( is_null($dbh) )
+		if ( is_null( $dbh ) ) {
 			$dbh = $this->dbh;
+		}
 
 		if ( $this->use_mysqli ) {
 			$success = mysqli_select_db( $dbh, $db );
@@ -1051,7 +1096,7 @@ class wpdb {
 				$message .= '<li>' . sprintf(
 					/* translators: 1: database user, 2: database name */
 					__( 'Does the user %1$s have permission to use the %2$s database?' ),
-					'<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES )  . '</code>',
+					'<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES ) . '</code>',
 					'<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
 				) . "</li>\n";
 
@@ -1059,7 +1104,7 @@ class wpdb {
 					/* translators: %s: database name */
 					__( 'On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?' ),
 					htmlspecialchars( $db, ENT_QUOTES )
-				). "</li>\n";
+				) . "</li>\n";
 
 				$message .= "</ul>\n";
 
@@ -1088,8 +1133,9 @@ class wpdb {
 	 * @return string
 	 */
 	function _weak_escape( $string ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
+		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
 			_deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' );
+		}
 		return addslashes( $string );
 	}
 
@@ -1137,9 +1183,9 @@ class wpdb {
 		if ( is_array( $data ) ) {
 			foreach ( $data as $k => $v ) {
 				if ( is_array( $v ) ) {
-					$data[$k] = $this->_escape( $v );
+					$data[ $k ] = $this->_escape( $v );
 				} else {
-					$data[$k] = $this->_real_escape( $v );
+					$data[ $k ] = $this->_real_escape( $v );
 				}
 			}
 		} else {
@@ -1163,14 +1209,16 @@ class wpdb {
 	 * @return mixed
 	 */
 	public function escape( $data ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
+		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
 			_deprecated_function( __METHOD__, '3.6.0', 'wpdb::prepare() or esc_sql()' );
+		}
 		if ( is_array( $data ) ) {
 			foreach ( $data as $k => $v ) {
-				if ( is_array( $v ) )
-					$data[$k] = $this->escape( $v, 'recursive' );
-				else
-					$data[$k] = $this->_weak_escape( $v, 'internal' );
+				if ( is_array( $v ) ) {
+					$data[ $k ] = $this->escape( $v, 'recursive' );
+				} else {
+					$data[ $k ] = $this->_weak_escape( $v, 'internal' );
+				}
 			}
 		} else {
 			$data = $this->_weak_escape( $data, 'internal' );
@@ -1189,8 +1237,9 @@ class wpdb {
 	 * @param string $string to escape
 	 */
 	public function escape_by_ref( &$string ) {
-		if ( ! is_float( $string ) )
+		if ( ! is_float( $string ) ) {
 			$string = $this->_real_escape( $string );
+		}
 	}
 
 	/**
@@ -1244,7 +1293,7 @@ class wpdb {
 		$passed_as_array = false;
 		if ( is_array( $args[0] ) && count( $args ) == 1 ) {
 			$passed_as_array = true;
-			$args = $args[0];
+			$args            = $args[0];
 		}
 
 		foreach ( $args as $arg ) {
@@ -1276,7 +1325,7 @@ class wpdb {
 		$query = str_replace( '"%s"', '%s', $query ); // Strip any existing double quotes.
 		$query = preg_replace( '/(?<!%)%s/', "'%s'", $query ); // Quote the strings, avoiding escaped strings like %%s.
 
-		$query = preg_replace( "/(?<!%)(%($allowed_format)?f)/" , '%\\2F', $query ); // Force floats to be locale unaware.
+		$query = preg_replace( "/(?<!%)(%($allowed_format)?f)/", '%\\2F', $query ); // Force floats to be locale unaware.
 
 		$query = preg_replace( "/%(?:%|$|(?!($allowed_format)?[sdF]))/", '%%\\1', $query ); // Escape any unescaped percents.
 
@@ -1296,11 +1345,14 @@ class wpdb {
 				 * or we were expecting multiple arguments in an array, throw a warning.
 				 */
 				wp_load_translations_early();
-				_doing_it_wrong( 'wpdb::prepare',
+				_doing_it_wrong(
+					'wpdb::prepare',
 					/* translators: 1: number of placeholders, 2: number of arguments passed */
-					sprintf( __( 'The query does not contain the correct number of placeholders (%1$d) for the number of arguments passed (%2$d).' ),
+					sprintf(
+						__( 'The query does not contain the correct number of placeholders (%1$d) for the number of arguments passed (%2$d).' ),
 						$placeholders,
-						count( $args ) ),
+						count( $args )
+					),
 					'4.8.3'
 				);
 			}
@@ -1351,17 +1403,21 @@ class wpdb {
 	public function print_error( $str = '' ) {
 		global $EZSQL_ERROR;
 
-		if ( !$str ) {
+		if ( ! $str ) {
 			if ( $this->use_mysqli ) {
 				$str = mysqli_error( $this->dbh );
 			} else {
 				$str = mysql_error( $this->dbh );
 			}
 		}
-		$EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str );
+		$EZSQL_ERROR[] = array(
+			'query'     => $this->last_query,
+			'error_str' => $str,
+		);
 
-		if ( $this->suppress_errors )
+		if ( $this->suppress_errors ) {
 			return false;
+		}
 
 		wp_load_translations_early();
 
@@ -1376,8 +1432,9 @@ class wpdb {
 		error_log( $error_str );
 
 		// Are we showing errors?
-		if ( ! $this->show_errors )
+		if ( ! $this->show_errors ) {
 			return false;
+		}
 
 		// If there is an error then take note of it
 		if ( is_multisite() ) {
@@ -1422,7 +1479,7 @@ class wpdb {
 	 * @return bool Old value for showing errors.
 	 */
 	public function show_errors( $show = true ) {
-		$errors = $this->show_errors;
+		$errors            = $this->show_errors;
 		$this->show_errors = $show;
 		return $errors;
 	}
@@ -1438,7 +1495,7 @@ class wpdb {
 	 * @return bool Whether showing of errors was active
 	 */
 	public function hide_errors() {
-		$show = $this->show_errors;
+		$show              = $this->show_errors;
 		$this->show_errors = false;
 		return $show;
 	}
@@ -1455,7 +1512,7 @@ class wpdb {
 	 * @return bool Old value
 	 */
 	public function suppress_errors( $suppress = true ) {
-		$errors = $this->suppress_errors;
+		$errors                = $this->suppress_errors;
 		$this->suppress_errors = (bool) $suppress;
 		return $errors;
 	}
@@ -1466,18 +1523,18 @@ class wpdb {
 	 * @since 0.71
 	 */
 	public function flush() {
-		$this->last_result = array();
-		$this->col_info    = null;
-		$this->last_query  = null;
+		$this->last_result   = array();
+		$this->col_info      = null;
+		$this->last_query    = null;
 		$this->rows_affected = $this->num_rows = 0;
-		$this->last_error  = '';
+		$this->last_error    = '';
 
 		if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
 			mysqli_free_result( $this->result );
 			$this->result = null;
 
 			// Sanity check before using the handle
-			if ( empty( $this->dbh ) || !( $this->dbh instanceof mysqli ) ) {
+			if ( empty( $this->dbh ) || ! ( $this->dbh instanceof mysqli ) ) {
 				return;
 			}
 
@@ -1509,7 +1566,7 @@ class wpdb {
 		 * Deprecated in 3.9+ when using MySQLi. No equivalent
 		 * $new_link parameter exists for mysqli_* functions.
 		 */
-		$new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
+		$new_link     = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
 		$client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
 
 		if ( $this->use_mysqli ) {
@@ -1545,10 +1602,10 @@ class wpdb {
 
 				/*
 				 * It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if:
-		 		 *  - We haven't previously connected, and
-		 		 *  - WP_USE_EXT_MYSQL isn't set to false, and
-		 		 *  - ext/mysql is loaded.
-		 		 */
+				  *  - We haven't previously connected, and
+				  *  - WP_USE_EXT_MYSQL isn't set to false, and
+				  *  - ext/mysql is loaded.
+				  */
 				$attempt_fallback = true;
 
 				if ( $this->has_connected ) {
@@ -1647,7 +1704,7 @@ class wpdb {
 		$socket_pos = strpos( $host, ':/' );
 		if ( $socket_pos !== false ) {
 			$socket = substr( $host, $socket_pos + 1 );
-			$host = substr( $host, 0, $socket_pos );
+			$host   = substr( $host, 0, $socket_pos );
 		}
 
 		// We need to check for an IPv6 address first.
@@ -1661,7 +1718,7 @@ class wpdb {
 		}
 
 		$matches = array();
-		$result = preg_match( $pattern, $host, $matches );
+		$result  = preg_match( $pattern, $host, $matches );
 
 		if ( 1 !== $result ) {
 			// Couldn't parse the address, bail.
@@ -1865,8 +1922,9 @@ class wpdb {
 
 		if ( $this->last_error ) {
 			// Clear insert_id on a subsequent failed insert.
-			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) )
+			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
 				$this->insert_id = 0;
+			}
 
 			$this->print_error();
 			return false;
@@ -1894,12 +1952,12 @@ class wpdb {
 			$num_rows = 0;
 			if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
 				while ( $row = mysqli_fetch_object( $this->result ) ) {
-					$this->last_result[$num_rows] = $row;
+					$this->last_result[ $num_rows ] = $row;
 					$num_rows++;
 				}
 			} elseif ( is_resource( $this->result ) ) {
 				while ( $row = mysql_fetch_object( $this->result ) ) {
-					$this->last_result[$num_rows] = $row;
+					$this->last_result[ $num_rows ] = $row;
 					$num_rows++;
 				}
 			}
@@ -2161,10 +2219,10 @@ class wpdb {
 			}
 
 			$conditions[] = "`$field` = " . $value['format'];
-			$values[] = $value['value'];
+			$values[]     = $value['value'];
 		}
 
-		$fields = implode( ', ', $fields );
+		$fields     = implode( ', ', $fields );
 		$conditions = implode( ' AND ', $conditions );
 
 		$sql = "UPDATE `$table` SET $fields WHERE $conditions";
@@ -2213,7 +2271,7 @@ class wpdb {
 			}
 
 			$conditions[] = "`$field` = " . $value['format'];
-			$values[] = $value['value'];
+			$values[]     = $value['value'];
 		}
 
 		$conditions = implode( ' AND ', $conditions );
@@ -2388,12 +2446,12 @@ class wpdb {
 		}
 
 		// Extract var out of cached results based x,y vals
-		if ( !empty( $this->last_result[$y] ) ) {
-			$values = array_values( get_object_vars( $this->last_result[$y] ) );
+		if ( ! empty( $this->last_result[ $y ] ) ) {
+			$values = array_values( get_object_vars( $this->last_result[ $y ] ) );
 		}
 
 		// If there is a value return it else return null
-		return ( isset( $values[$x] ) && $values[$x] !== '' ) ? $values[$x] : null;
+		return ( isset( $values[ $x ] ) && $values[ $x ] !== '' ) ? $values[ $x ] : null;
 	}
 
 	/**
@@ -2422,20 +2480,21 @@ class wpdb {
 			return null;
 		}
 
-		if ( !isset( $this->last_result[$y] ) )
+		if ( ! isset( $this->last_result[ $y ] ) ) {
 			return null;
+		}
 
 		if ( $output == OBJECT ) {
-			return $this->last_result[$y] ? $this->last_result[$y] : null;
+			return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;
 		} elseif ( $output == ARRAY_A ) {
-			return $this->last_result[$y] ? get_object_vars( $this->last_result[$y] ) : null;
+			return $this->last_result[ $y ] ? get_object_vars( $this->last_result[ $y ] ) : null;
 		} elseif ( $output == ARRAY_N ) {
-			return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null;
+			return $this->last_result[ $y ] ? array_values( get_object_vars( $this->last_result[ $y ] ) ) : null;
 		} elseif ( strtoupper( $output ) === OBJECT ) {
 			// Back compat for OBJECT being previously case insensitive.
-			return $this->last_result[$y] ? $this->last_result[$y] : null;
+			return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;
 		} else {
-			$this->print_error( " \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N" );
+			$this->print_error( ' $db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N' );
 		}
 	}
 
@@ -2452,7 +2511,7 @@ class wpdb {
 	 * @param int         $x     Optional. Column to return. Indexed from 0.
 	 * @return array Database query result. Array indexed from 0 by SQL result row number.
 	 */
-	public function get_col( $query = null , $x = 0 ) {
+	public function get_col( $query = null, $x = 0 ) {
 		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
 			$this->check_current_query = false;
 		}
@@ -2464,7 +2523,7 @@ class wpdb {
 		$new_array = array();
 		// Extract the column values
 		for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
-			$new_array[$i] = $this->get_var( null, $x, $i );
+			$new_array[ $i ] = $this->get_var( null, $x, $i );
 		}
 		return $new_array;
 	}
@@ -2506,9 +2565,10 @@ class wpdb {
 			// (Duplicates are discarded)
 			foreach ( $this->last_result as $row ) {
 				$var_by_ref = get_object_vars( $row );
-				$key = array_shift( $var_by_ref );
-				if ( ! isset( $new_array[ $key ] ) )
+				$key        = array_shift( $var_by_ref );
+				if ( ! isset( $new_array[ $key ] ) ) {
 					$new_array[ $key ] = $row;
+				}
 			}
 			return $new_array;
 		} elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
@@ -2566,8 +2626,8 @@ class wpdb {
 		$charsets = $columns = array();
 
 		$table_parts = explode( '.', $table );
-		$table = '`' . implode( '`.`', $table_parts ) . '`';
-		$results = $this->get_results( "SHOW FULL COLUMNS FROM $table" );
+		$table       = '`' . implode( '`.`', $table_parts ) . '`';
+		$results     = $this->get_results( "SHOW FULL COLUMNS FROM $table" );
 		if ( ! $results ) {
 			return new WP_Error( 'wpdb_get_table_charset_failure' );
 		}
@@ -2643,7 +2703,7 @@ class wpdb {
 	 *                               character set. WP_Error object if there was an error.
 	 */
 	public function get_col_charset( $table, $column ) {
-		$tablekey = strtolower( $table );
+		$tablekey  = strtolower( $table );
 		$columnkey = strtolower( $column );
 
 		/**
@@ -2708,7 +2768,7 @@ class wpdb {
 	 *                              WP_Error object if there was an error.
 	 */
 	public function get_col_length( $table, $column ) {
-		$tablekey = strtolower( $table );
+		$tablekey  = strtolower( $table );
 		$columnkey = strtolower( $column );
 
 		// Skip this entirely if this isn't a MySQL database.
@@ -2737,7 +2797,7 @@ class wpdb {
 			$length = false;
 		}
 
-		switch( $type ) {
+		switch ( $type ) {
 			case 'char':
 			case 'varchar':
 				return array(
@@ -2838,7 +2898,7 @@ class wpdb {
 		}
 
 		$this->checking_collation = true;
-		$collation = $this->get_table_charset( $table );
+		$collation                = $this->get_table_charset( $table );
 		$this->checking_collation = false;
 
 		// Tables with no collation, or latin1 only, don't need extra checking.
@@ -2885,7 +2945,7 @@ class wpdb {
 			$charset = $value['charset'];
 
 			if ( is_array( $value['length'] ) ) {
-				$length = $value['length']['length'];
+				$length                  = $value['length']['length'];
 				$truncate_by_byte_length = 'byte' === $value['length']['type'];
 			} else {
 				$length = false;
@@ -2914,7 +2974,7 @@ class wpdb {
 				( ! isset( $value['ascii'] ) && $this->check_ascii( $value['value'] ) )
 			) {
 				$truncate_by_byte_length = true;
-				$needs_validation = false;
+				$needs_validation        = false;
 			}
 
 			if ( $truncate_by_byte_length ) {
@@ -2948,13 +3008,12 @@ class wpdb {
 					';
 				}
 
-				$regex .= '){1,40}                          # ...one or more times
+				$regex         .= '){1,40}                          # ...one or more times
 					)
 					| .                                  # anything else
 					/x';
 				$value['value'] = preg_replace( $regex, '$1', $value['value'] );
 
-
 				if ( false !== $length && mb_strlen( $value['value'], 'UTF-8' ) > $length ) {
 					$value['value'] = mb_substr( $value['value'], 0, $length, 'UTF-8' );
 				}
@@ -2989,9 +3048,9 @@ class wpdb {
 					}
 
 					if ( is_array( $value['length'] ) ) {
-						$length = sprintf( '%.0f', $value['length']['length'] );
+						$length          = sprintf( '%.0f', $value['length']['length'] );
 						$queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), $length ) USING $connection_charset )", $value['value'] );
-					} else if ( 'binary' !== $charset ) {
+					} elseif ( 'binary' !== $charset ) {
 						// If we don't have a length, there's no need to convert binary - it will always return the same result.
 						$queries[ $col ] = $this->prepare( "CONVERT( CONVERT( %s USING $charset ) USING $connection_charset )", $value['value'] );
 					}
@@ -3010,14 +3069,14 @@ class wpdb {
 			}
 
 			$this->check_current_query = false;
-			$row = $this->get_row( "SELECT " . implode( ', ', $sql ), ARRAY_A );
+			$row                       = $this->get_row( 'SELECT ' . implode( ', ', $sql ), ARRAY_A );
 			if ( ! $row ) {
 				return new WP_Error( 'wpdb_strip_invalid_text_failure' );
 			}
 
 			foreach ( array_keys( $data ) as $column ) {
-				if ( isset( $row["x_$column"] ) ) {
-					$data[ $column ]['value'] = $row["x_$column"];
+				if ( isset( $row[ "x_$column" ] ) ) {
+					$data[ $column ]['value'] = $row[ "x_$column" ];
 				}
 			}
 		}
@@ -3099,7 +3158,7 @@ class wpdb {
 				'value'   => $value,
 				'charset' => $charset,
 				'length'  => $this->get_col_length( $table, $column ),
-			)
+			),
 		);
 
 		$data = $this->strip_invalid_text( $data );
@@ -3129,13 +3188,15 @@ class wpdb {
 		$query = preg_replace( '/\((?!\s*select)[^(]*?\)/is', '()', $query );
 
 		// Quickly match most common queries.
-		if ( preg_match( '/^\s*(?:'
+		if ( preg_match(
+			'/^\s*(?:'
 				. 'SELECT.*?\s+FROM'
 				. '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?'
 				. '|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] );
 		}
 
@@ -3154,7 +3215,8 @@ class wpdb {
 		}
 
 		// Big pattern for the rest of the table-related queries.
-		if ( preg_match( '/^\s*(?:'
+		if ( preg_match(
+			'/^\s*(?:'
 				. '(?:EXPLAIN\s+(?:EXTENDED\s+)?)?SELECT.*?\s+FROM'
 				. '|DESCRIBE|DESC|EXPLAIN|HANDLER'
 				. '|(?:LOCK|UNLOCK)\s+TABLE(?:S)?'
@@ -3168,7 +3230,8 @@ 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] );
 		}
 
@@ -3179,11 +3242,11 @@ class wpdb {
 	 * Load the column metadata from the last query.
 	 *
 	 * @since 3.5.0
-	 *
 	 */
 	protected function load_col_info() {
-		if ( $this->col_info )
+		if ( $this->col_info ) {
 			return;
+		}
 
 		if ( $this->use_mysqli ) {
 			$num_fields = mysqli_num_fields( $this->result );
@@ -3212,15 +3275,15 @@ class wpdb {
 
 		if ( $this->col_info ) {
 			if ( $col_offset == -1 ) {
-				$i = 0;
+				$i         = 0;
 				$new_array = array();
 				foreach ( (array) $this->col_info as $col ) {
-					$new_array[$i] = $col->{$info_type};
+					$new_array[ $i ] = $col->{$info_type};
 					$i++;
 				}
 				return $new_array;
 			} else {
-				return $this->col_info[$col_offset]->{$info_type};
+				return $this->col_info[ $col_offset ]->{$info_type};
 			}
 		}
 	}
@@ -3260,15 +3323,15 @@ class wpdb {
 	 * @return false|void
 	 */
 	public function bail( $message, $error_code = '500' ) {
-		if ( !$this->show_errors ) {
+		if ( ! $this->show_errors ) {
 			if ( class_exists( 'WP_Error', false ) ) {
-				$this->error = new WP_Error($error_code, $message);
+				$this->error = new WP_Error( $error_code, $message );
 			} else {
 				$this->error = $message;
 			}
 			return false;
 		}
-		wp_die($message);
+		wp_die( $message );
 	}
 
 
@@ -3292,8 +3355,8 @@ class wpdb {
 		}
 
 		if ( $closed ) {
-			$this->dbh = null;
-			$this->ready = false;
+			$this->dbh           = null;
+			$this->ready         = false;
 			$this->has_connected = false;
 		}
 
@@ -3313,9 +3376,9 @@ class wpdb {
 	public function check_database_version() {
 		global $wp_version, $required_mysql_version;
 		// Make sure the server has the required MySQL version
-		if ( version_compare($this->db_version(), $required_mysql_version, '<') ) {
+		if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) {
 			/* translators: 1: WordPress version number, 2: Minimum required MySQL version number */
-			return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
+			return new WP_Error( 'database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
 		}
 	}
 
@@ -3346,10 +3409,12 @@ class wpdb {
 	public function get_charset_collate() {
 		$charset_collate = '';
 
-		if ( ! empty( $this->charset ) )
+		if ( ! empty( $this->charset ) ) {
 			$charset_collate = "DEFAULT CHARACTER SET $this->charset";
-		if ( ! empty( $this->collate ) )
+		}
+		if ( ! empty( $this->collate ) ) {
 			$charset_collate .= " COLLATE $this->collate";
+		}
 
 		return $charset_collate;
 	}
@@ -3372,13 +3437,13 @@ class wpdb {
 		$version = $this->db_version();
 
 		switch ( strtolower( $db_cap ) ) {
-			case 'collation' :    // @since 2.5.0
-			case 'group_concat' : // @since 2.7.0
-			case 'subqueries' :   // @since 2.7.0
+			case 'collation':    // @since 2.5.0
+			case 'group_concat': // @since 2.7.0
+			case 'subqueries':   // @since 2.7.0
 				return version_compare( $version, '4.1', '>=' );
-			case 'set_charset' :
+			case 'set_charset':
 				return version_compare( $version, '5.0.7', '>=' );
-			case 'utf8mb4' :      // @since 4.1.0
+			case 'utf8mb4':      // @since 4.1.0
 				if ( version_compare( $version, '5.5.3', '<' ) ) {
 					return false;
 				}
@@ -3398,7 +3463,7 @@ class wpdb {
 				} else {
 					return version_compare( $client_version, '5.5.3', '>=' );
 				}
-			case 'utf8mb4_520' : // @since 4.6.0
+			case 'utf8mb4_520': // @since 4.6.0
 				return version_compare( $version, '5.6', '>=' );
 		}
 
diff --git a/wp-includes/wp-diff.php b/wp-includes/wp-diff.php
index 8687ed00a4..deae25081d 100644
--- a/wp-includes/wp-diff.php
+++ b/wp-includes/wp-diff.php
@@ -18,4 +18,4 @@ if ( ! class_exists( 'Text_Diff', false ) ) {
 }
 
 require( ABSPATH . WPINC . '/class-wp-text-diff-renderer-table.php' );
-require( ABSPATH . WPINC . '/class-wp-text-diff-renderer-inline.php' );
\ No newline at end of file
+require( ABSPATH . WPINC . '/class-wp-text-diff-renderer-inline.php' );
diff --git a/wp-links-opml.php b/wp-links-opml.php
index 42e8b24a9c..7d4d216405 100644
--- a/wp-links-opml.php
+++ b/wp-links-opml.php
@@ -14,23 +14,26 @@
 
 require_once( dirname( __FILE__ ) . '/wp-load.php' );
 
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 $link_cat = '';
-if ( !empty($_GET['link_cat']) ) {
+if ( ! empty( $_GET['link_cat'] ) ) {
 	$link_cat = $_GET['link_cat'];
-	if ( !in_array($link_cat, array('all', '0')) )
-		$link_cat = absint( (string)urldecode($link_cat) );
+	if ( ! in_array( $link_cat, array( 'all', '0' ) ) ) {
+		$link_cat = absint( (string) urldecode( $link_cat ) );
+	}
 }
 
-echo '<?xml version="1.0"?'.">\n";
+echo '<?xml version="1.0"?' . ">\n";
 ?>
 <opml version="1.0">
 	<head>
-		<title><?php
+		<title>
+		<?php
 			/* translators: 1: Site name */
-			printf( __('Links for %s'), esc_attr(get_bloginfo('name', 'display')) );
-		?></title>
-		<dateCreated><?php echo gmdate("D, d M Y H:i:s"); ?> GMT</dateCreated>
+			printf( __( 'Links for %s' ), esc_attr( get_bloginfo( 'name', 'display' ) ) );
+		?>
+		</title>
+		<dateCreated><?php echo gmdate( 'D, d M Y H:i:s' ); ?> GMT</dateCreated>
 		<?php
 		/**
 		 * Fires in the OPML header.
@@ -42,12 +45,24 @@ echo '<?xml version="1.0"?'.">\n";
 	</head>
 	<body>
 <?php
-if ( empty($link_cat) )
-	$cats = get_categories(array('taxonomy' => 'link_category', 'hierarchical' => 0));
-else
-	$cats = get_categories(array('taxonomy' => 'link_category', 'hierarchical' => 0, 'include' => $link_cat));
+if ( empty( $link_cat ) ) {
+	$cats = get_categories(
+		array(
+			'taxonomy'     => 'link_category',
+			'hierarchical' => 0,
+		)
+	);
+} else {
+	$cats = get_categories(
+		array(
+			'taxonomy'     => 'link_category',
+			'hierarchical' => 0,
+			'include'      => $link_cat,
+		)
+	);
+}
 
-foreach ( (array)$cats as $cat ) :
+foreach ( (array) $cats as $cat ) :
 	/**
 	 * Filters the OPML outline link category name.
 	 *
@@ -58,20 +73,25 @@ foreach ( (array)$cats as $cat ) :
 	$catname = apply_filters( 'link_category', $cat->name );
 
 ?>
-<outline type="category" title="<?php echo esc_attr($catname); ?>">
+<outline type="category" title="<?php echo esc_attr( $catname ); ?>">
 <?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 );
+	$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 );
 ?>
-	<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; ?>" />
+<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
 	endforeach; // $bookmarks
 ?>
diff --git a/wp-load.php b/wp-load.php
index b32bcccebb..21cba39011 100644
--- a/wp-load.php
+++ b/wp-load.php
@@ -31,7 +31,7 @@ error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_W
  *
  * If neither set of conditions is true, initiate loading the setup process.
  */
-if ( file_exists( ABSPATH . 'wp-config.php') ) {
+if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
 
 	/** The config file resides in ABSPATH */
 	require_once( ABSPATH . 'wp-config.php' );
@@ -72,7 +72,7 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
 	wp_load_translations_early();
 
 	// Die with an error message
-	$die  = sprintf(
+	$die = sprintf(
 		/* translators: %s: wp-config.php */
 		__( "There doesn't seem to be a %s file. I need this before we can get started." ),
 		'<code>wp-config.php</code>'
@@ -87,7 +87,7 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
 		__( "You can create a %s file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ),
 		'<code>wp-config.php</code>'
 	) . '</p>';
-	$die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
+	$die .= '<p><a href="' . $path . '" class="button button-large">' . __( 'Create a Configuration File' ) . '</a>';
 
 	wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
 }
diff --git a/wp-login.php b/wp-login.php
index b5d0e4a8d5..4453f82032 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -9,11 +9,11 @@
  */
 
 /** Make sure that the WordPress bootstrap has run before continuing. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require( dirname( __FILE__ ) . '/wp-load.php' );
 
 // Redirect to https login if forced to use SSL
 if ( force_ssl_admin() && ! is_ssl() ) {
-	if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
+	if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
 		wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
 		exit();
 	} else {
@@ -38,8 +38,9 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
 
 	add_action( 'login_head', 'wp_login_viewport_meta' );
 
-	if ( empty($wp_error) )
+	if ( empty( $wp_error ) ) {
 		$wp_error = new WP_Error();
+	}
 
 	// Shake it!
 	$shake_error_codes = array( 'empty_password', 'empty_email', 'invalid_email', 'invalidcombo', 'empty_username', 'invalid_username', 'incorrect_password' );
@@ -52,8 +53,9 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
 	 */
 	$shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
 
-	if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
+	if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) {
 		add_action( 'login_head', 'wp_shake_js', 12 );
+	}
 
 	$login_title = get_bloginfo( 'name', 'display' );
 
@@ -78,7 +80,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
 		<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 	<!--<![endif]-->
 	<head>
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+	<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php bloginfo( 'charset' ); ?>" />
 	<title><?php echo $login_title; ?></title>
 	<?php
 
@@ -146,18 +148,20 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
 	}
 
 	$classes = array( 'login-action-' . $action, 'wp-core-ui' );
-	if ( is_rtl() )
+	if ( is_rtl() ) {
 		$classes[] = 'rtl';
+	}
 	if ( $interim_login ) {
 		$classes[] = 'interim-login';
 		?>
 		<style type="text/css">html{background-color: transparent;}</style>
 		<?php
 
-		if ( 'success' ===  $interim_login )
+		if ( 'success' === $interim_login ) {
 			$classes[] = 'interim-login-success';
+		}
 	}
-	$classes[] =' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+	$classes[] = ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
 	/**
 	 * Filters the login page body classes.
@@ -194,25 +198,27 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
 	 * @param string $message Login message text.
 	 */
 	$message = apply_filters( 'login_message', $message );
-	if ( !empty( $message ) )
+	if ( ! empty( $message ) ) {
 		echo $message . "\n";
+	}
 
 	// In case a plugin uses $error rather than the $wp_errors object
-	if ( !empty( $error ) ) {
-		$wp_error->add('error', $error);
-		unset($error);
+	if ( ! empty( $error ) ) {
+		$wp_error->add( 'error', $error );
+		unset( $error );
 	}
 
 	if ( $wp_error->get_error_code() ) {
-		$errors = '';
+		$errors   = '';
 		$messages = '';
 		foreach ( $wp_error->get_error_codes() as $code ) {
 			$severity = $wp_error->get_error_data( $code );
 			foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
-				if ( 'message' == $severity )
+				if ( 'message' == $severity ) {
 					$messages .= '	' . $error_message . "<br />\n";
-				else
+				} else {
 					$errors .= '	' . $error_message . "<br />\n";
+				}
 			}
 		}
 		if ( ! empty( $errors ) ) {
@@ -243,20 +249,23 @@ function login_header( $title = 'Log In', $message = '', $wp_error = '' ) {
  *
  * @param string $input_id Which input to auto-focus
  */
-function login_footer($input_id = '') {
+function login_footer( $input_id = '' ) {
 	global $interim_login;
 
 	// 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
-		/* translators: %s: site title */
-		printf( _x( '&larr; Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
-	?></a></p>
+	if ( ! $interim_login ) :
+	?>
+	<p id="backtoblog"><a href="<?php echo esc_url( home_url( '/' ) ); ?>">
+											<?php
+											/* translators: %s: site title */
+											printf( _x( '&larr; Back to %s', 'site' ), get_bloginfo( 'title', 'display' ) );
+	?>
+	</a></p>
 	<?php endif; ?>
 
 	</div>
 
-	<?php if ( !empty($input_id) ) : ?>
+	<?php if ( ! empty( $input_id ) ) : ?>
 	<script type="text/javascript">
 	try{document.getElementById('<?php echo $input_id; ?>').focus();}catch(e){}
 	if(typeof wpOnload=='function')wpOnload();
@@ -269,7 +278,8 @@ function login_footer($input_id = '') {
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'login_footer' ); ?>
+	do_action( 'login_footer' );
+	?>
 	<div class="clear"></div>
 	</body>
 	</html>
@@ -309,14 +319,15 @@ function retrieve_password() {
 	$errors = new WP_Error();
 
 	if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) {
-		$errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.'));
+		$errors->add( 'empty_username', __( '<strong>ERROR</strong>: Enter a username or email address.' ) );
 	} elseif ( strpos( $_POST['user_login'], '@' ) ) {
 		$user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
-		if ( empty( $user_data ) )
-			$errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
+		if ( empty( $user_data ) ) {
+			$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no user registered with that email address.' ) );
+		}
 	} else {
-		$login = trim($_POST['user_login']);
-		$user_data = get_user_by('login', $login);
+		$login     = trim( $_POST['user_login'] );
+		$user_data = get_user_by( 'login', $login );
 	}
 
 	/**
@@ -330,18 +341,19 @@ function retrieve_password() {
 	 */
 	do_action( 'lostpassword_post', $errors );
 
-	if ( $errors->get_error_code() )
+	if ( $errors->get_error_code() ) {
 		return $errors;
+	}
 
-	if ( !$user_data ) {
-		$errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.'));
+	if ( ! $user_data ) {
+		$errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: Invalid username or email.' ) );
 		return $errors;
 	}
 
 	// Redefining user_login ensures we return the right case in the email.
 	$user_login = $user_data->user_login;
 	$user_email = $user_data->user_email;
-	$key = get_password_reset_key( $user_data );
+	$key        = get_password_reset_key( $user_data );
 
 	if ( is_wp_error( $key ) ) {
 		return $key;
@@ -359,9 +371,9 @@ function retrieve_password() {
 
 	$message = __( 'Someone has requested a password reset for the following account:' ) . "\r\n\r\n";
 	/* translators: %s: site name */
-	$message .= sprintf( __( 'Site Name: %s'), $site_name ) . "\r\n\r\n";
+	$message .= sprintf( __( 'Site Name: %s' ), $site_name ) . "\r\n\r\n";
 	/* translators: %s: user login */
-	$message .= sprintf( __( 'Username: %s'), $user_login ) . "\r\n\r\n";
+	$message .= sprintf( __( 'Username: %s' ), $user_login ) . "\r\n\r\n";
 	$message .= __( 'If this was a mistake, just ignore this email and nothing will happen.' ) . "\r\n\r\n";
 	$message .= __( 'To reset your password, visit the following address:' ) . "\r\n\r\n";
 	$message .= '<' . network_site_url( "wp-login.php?action=rp&key=$key&login=" . rawurlencode( $user_login ), 'login' ) . ">\r\n";
@@ -396,8 +408,9 @@ function retrieve_password() {
 	 */
 	$message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
 
-	if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
-		wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
+	if ( $message && ! wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) {
+		wp_die( __( 'The email could not be sent.' ) . "<br />\n" . __( 'Possible reason: your host may have disabled the mail() function.' ) );
+	}
 
 	return true;
 }
@@ -406,34 +419,39 @@ function retrieve_password() {
 // Main
 //
 
-$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'login';
+$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'login';
 $errors = new WP_Error();
 
-if ( isset($_GET['key']) )
+if ( isset( $_GET['key'] ) ) {
 	$action = 'resetpass';
+}
 
 // validate action so as to default to the login screen
-if ( !in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) )
+if ( ! in_array( $action, array( 'postpass', 'logout', 'lostpassword', 'retrievepassword', 'resetpass', 'rp', 'register', 'login' ), true ) && false === has_filter( 'login_form_' . $action ) ) {
 	$action = 'login';
+}
 
 nocache_headers();
 
-header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
+header( 'Content-Type: ' . get_bloginfo( 'html_type' ) . '; charset=' . get_bloginfo( 'charset' ) );
 
 if ( defined( 'RELOCATE' ) && RELOCATE ) { // Move flag is set
-	if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
+	if ( isset( $_SERVER['PATH_INFO'] ) && ( $_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF'] ) ) {
 		$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
+	}
 
-	$url = dirname( set_url_scheme( 'http://' .  $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
-	if ( $url != get_option( 'siteurl' ) )
+	$url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
+	if ( $url != get_option( 'siteurl' ) ) {
 		update_option( 'siteurl', $url );
+	}
 }
 
 //Set a cookie now to see if they are supported by the browser.
 $secure = ( 'https' === parse_url( wp_login_url(), PHP_URL_SCHEME ) );
 setcookie( TEST_COOKIE, 'WP Cookie check', 0, COOKIEPATH, COOKIE_DOMAIN, $secure );
-if ( SITECOOKIEPATH != COOKIEPATH )
+if ( SITECOOKIEPATH != COOKIEPATH ) {
 	setcookie( TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN, $secure );
+}
 
 $lang            = ! empty( $_GET['wp_lang'] ) ? sanitize_text_field( $_GET['wp_lang'] ) : '';
 $switched_locale = switch_to_locale( $lang );
@@ -456,8 +474,8 @@ do_action( 'login_init' );
  */
 do_action( "login_form_{$action}" );
 
-$http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
-$interim_login = isset($_REQUEST['interim-login']);
+$http_post     = ( 'POST' == $_SERVER['REQUEST_METHOD'] );
+$interim_login = isset( $_REQUEST['interim-login'] );
 
 /**
  * Filters the separator used between login form navigation links.
@@ -468,125 +486,124 @@ $interim_login = isset($_REQUEST['interim-login']);
  */
 $login_link_separator = apply_filters( 'login_link_separator', ' | ' );
 
-switch ($action) {
+switch ( $action ) {
 
-case 'postpass' :
-	if ( ! array_key_exists( 'post_password', $_POST ) ) {
-		wp_safe_redirect( wp_get_referer() );
-		exit();
-	}
-
-	require_once ABSPATH . WPINC . '/class-phpass.php';
-	$hasher = new PasswordHash( 8, true );
-
-	/**
-	 * Filters the life span of the post password cookie.
-	 *
-	 * By default, the cookie expires 10 days from creation. To turn this
-	 * into a session cookie, return 0.
-	 *
-	 * @since 3.7.0
-	 *
-	 * @param int $expires The expiry time, as passed to setcookie().
-	 */
-	$expire = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
-	$referer = wp_get_referer();
-	if ( $referer ) {
-		$secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) );
-	} else {
-		$secure = false;
-	}
-	setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
-
-	if ( $switched_locale ) {
-	    restore_previous_locale();
-	}
-
-	wp_safe_redirect( wp_get_referer() );
-	exit();
-
-case 'logout' :
-	check_admin_referer('log-out');
-
-	$user = wp_get_current_user();
-
-	wp_logout();
-
-	if ( ! empty( $_REQUEST['redirect_to'] ) ) {
-		$redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
-	} else {
-		$redirect_to = 'wp-login.php?loggedout=true';
-		$requested_redirect_to = '';
-	}
-
-	if ( $switched_locale ) {
-	    restore_previous_locale();
-	}
-
-	/**
-	 * Filters the log out redirect URL.
-	 *
-	 * @since 4.2.0
-	 *
-	 * @param string  $redirect_to           The redirect destination URL.
-	 * @param string  $requested_redirect_to The requested redirect destination URL passed as a parameter.
-	 * @param WP_User $user                  The WP_User object for the user that's logging out.
-	 */
-	$redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
-	wp_safe_redirect( $redirect_to );
-	exit();
-
-case 'lostpassword' :
-case 'retrievepassword' :
-
-	if ( $http_post ) {
-		$errors = retrieve_password();
-		if ( !is_wp_error($errors) ) {
-			$redirect_to = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
-			wp_safe_redirect( $redirect_to );
+	case 'postpass':
+		if ( ! array_key_exists( 'post_password', $_POST ) ) {
+			wp_safe_redirect( wp_get_referer() );
 			exit();
 		}
-	}
 
-	if ( isset( $_GET['error'] ) ) {
-		if ( 'invalidkey' == $_GET['error'] ) {
-			$errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) );
-		} elseif ( 'expiredkey' == $_GET['error'] ) {
-			$errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) );
+		require_once ABSPATH . WPINC . '/class-phpass.php';
+		$hasher = new PasswordHash( 8, true );
+
+		/**
+		 * Filters the life span of the post password cookie.
+		 *
+		 * By default, the cookie expires 10 days from creation. To turn this
+		 * into a session cookie, return 0.
+		 *
+		 * @since 3.7.0
+		 *
+		 * @param int $expires The expiry time, as passed to setcookie().
+		 */
+		$expire  = apply_filters( 'post_password_expires', time() + 10 * DAY_IN_SECONDS );
+		$referer = wp_get_referer();
+		if ( $referer ) {
+			$secure = ( 'https' === parse_url( $referer, PHP_URL_SCHEME ) );
+		} else {
+			$secure = false;
 		}
-	}
+		setcookie( 'wp-postpass_' . COOKIEHASH, $hasher->HashPassword( wp_unslash( $_POST['post_password'] ) ), $expire, COOKIEPATH, COOKIE_DOMAIN, $secure );
 
-	$lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-	/**
-	 * Filters the URL redirected to after submitting the lostpassword/retrievepassword form.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param string $lostpassword_redirect The redirect destination URL.
-	 */
-	$redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect );
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
 
-	/**
-	 * Fires before the lost password form.
-	 *
-	 * @since 1.5.1
-	 */
-	do_action( 'lost_password' );
+		wp_safe_redirect( wp_get_referer() );
+		exit();
 
-	login_header(__('Lost Password'), '<p class="message">' . __('Please enter your username or email address. You will receive a link to create a new password via email.') . '</p>', $errors);
+	case 'logout':
+		check_admin_referer( 'log-out' );
 
-	$user_login = '';
+		$user = wp_get_current_user();
 
-	if ( isset( $_POST['user_login'] ) && is_string( $_POST['user_login'] ) ) {
-		$user_login = wp_unslash( $_POST['user_login'] );
-	}
+		wp_logout();
 
-?>
+		if ( ! empty( $_REQUEST['redirect_to'] ) ) {
+			$redirect_to = $requested_redirect_to = $_REQUEST['redirect_to'];
+		} else {
+			$redirect_to           = 'wp-login.php?loggedout=true';
+			$requested_redirect_to = '';
+		}
 
-<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
+		if ( $switched_locale ) {
+			restore_previous_locale();
+		}
+
+		/**
+		 * Filters the log out redirect URL.
+		 *
+		 * @since 4.2.0
+		 *
+		 * @param string  $redirect_to           The redirect destination URL.
+		 * @param string  $requested_redirect_to The requested redirect destination URL passed as a parameter.
+		 * @param WP_User $user                  The WP_User object for the user that's logging out.
+		 */
+		$redirect_to = apply_filters( 'logout_redirect', $redirect_to, $requested_redirect_to, $user );
+		wp_safe_redirect( $redirect_to );
+		exit();
+
+	case 'lostpassword':
+	case 'retrievepassword':
+		if ( $http_post ) {
+			$errors = retrieve_password();
+			if ( ! is_wp_error( $errors ) ) {
+				$redirect_to = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : 'wp-login.php?checkemail=confirm';
+				wp_safe_redirect( $redirect_to );
+				exit();
+			}
+		}
+
+		if ( isset( $_GET['error'] ) ) {
+			if ( 'invalidkey' == $_GET['error'] ) {
+				$errors->add( 'invalidkey', __( 'Your password reset link appears to be invalid. Please request a new link below.' ) );
+			} elseif ( 'expiredkey' == $_GET['error'] ) {
+				$errors->add( 'expiredkey', __( 'Your password reset link has expired. Please request a new link below.' ) );
+			}
+		}
+
+		$lostpassword_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+		/**
+		 * Filters the URL redirected to after submitting the lostpassword/retrievepassword form.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param string $lostpassword_redirect The redirect destination URL.
+		 */
+		$redirect_to = apply_filters( 'lostpassword_redirect', $lostpassword_redirect );
+
+		/**
+		 * Fires before the lost password form.
+		 *
+		 * @since 1.5.1
+		 */
+		do_action( 'lost_password' );
+
+		login_header( __( 'Lost Password' ), '<p class="message">' . __( 'Please enter your username or email address. You will receive a link to create a new password via email.' ) . '</p>', $errors );
+
+		$user_login = '';
+
+		if ( isset( $_POST['user_login'] ) && is_string( $_POST['user_login'] ) ) {
+			$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" /></label>
+		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label>
 	</p>
 	<?php
 	/**
@@ -594,99 +611,102 @@ case 'retrievepassword' :
 	 *
 	 * @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>
+	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' ) );
+	<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' ) );
 
-	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 );
-endif;
-?>
-</p>
+		/** 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();
-}
-
-break;
-
-case 'resetpass' :
-case 'rp' :
-	list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
-	$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
-	if ( isset( $_GET['key'] ) ) {
-		$value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );
-		setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) );
-		exit;
+	if ( $switched_locale ) {
+		restore_previous_locale();
 	}
 
-	if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
-		list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
-		$user = check_password_reset_key( $rp_key, $rp_login );
-		if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) {
+		break;
+
+	case 'resetpass':
+	case 'rp':
+		list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$rp_cookie       = 'wp-resetpass-' . COOKIEHASH;
+		if ( isset( $_GET['key'] ) ) {
+			$value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );
+			setcookie( $rp_cookie, $value, 0, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+			wp_safe_redirect( remove_query_arg( array( 'key', 'login' ) ) );
+			exit;
+		}
+
+		if ( isset( $_COOKIE[ $rp_cookie ] ) && 0 < strpos( $_COOKIE[ $rp_cookie ], ':' ) ) {
+			list( $rp_login, $rp_key ) = explode( ':', wp_unslash( $_COOKIE[ $rp_cookie ] ), 2 );
+			$user                      = check_password_reset_key( $rp_key, $rp_login );
+			if ( isset( $_POST['pass1'] ) && ! hash_equals( $rp_key, $_POST['rp_key'] ) ) {
+				$user = false;
+			}
+		} else {
 			$user = false;
 		}
-	} else {
-		$user = false;
-	}
 
-	if ( ! $user || is_wp_error( $user ) ) {
-		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		if ( $user && $user->get_error_code() === 'expired_key' )
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
-		else
-			wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
-		exit;
-	}
+		if ( ! $user || is_wp_error( $user ) ) {
+			setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+			if ( $user && $user->get_error_code() === 'expired_key' ) {
+				wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=expiredkey' ) );
+			} else {
+				wp_redirect( site_url( 'wp-login.php?action=lostpassword&error=invalidkey' ) );
+			}
+			exit;
+		}
 
-	$errors = new WP_Error();
+		$errors = new WP_Error();
 
-	if ( isset($_POST['pass1']) && $_POST['pass1'] != $_POST['pass2'] )
-		$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+		if ( isset( $_POST['pass1'] ) && $_POST['pass1'] != $_POST['pass2'] ) {
+			$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
+		}
 
-	/**
-	 * Fires before the password reset procedure is validated.
-	 *
-	 * @since 3.5.0
-	 *
-	 * @param object           $errors WP Error object.
-	 * @param WP_User|WP_Error $user   WP_User object if the login and reset key match. WP_Error object otherwise.
-	 */
-	do_action( 'validate_password_reset', $errors, $user );
+		/**
+		 * Fires before the password reset procedure is validated.
+		 *
+		 * @since 3.5.0
+		 *
+		 * @param object           $errors WP Error object.
+		 * @param WP_User|WP_Error $user   WP_User object if the login and reset key match. WP_Error object otherwise.
+		 */
+		do_action( 'validate_password_reset', $errors, $user );
 
-	if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && !empty( $_POST['pass1'] ) ) {
-		reset_password($user, $_POST['pass1']);
-		setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
-		login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
-		login_footer();
-		exit;
-	}
+		if ( ( ! $errors->get_error_code() ) && isset( $_POST['pass1'] ) && ! empty( $_POST['pass1'] ) ) {
+			reset_password( $user, $_POST['pass1'] );
+			setcookie( $rp_cookie, ' ', time() - YEAR_IN_SECONDS, $rp_path, COOKIE_DOMAIN, is_ssl(), true );
+			login_header( __( 'Password Reset' ), '<p class="message reset-pass">' . __( 'Your password has been reset.' ) . ' <a href="' . esc_url( wp_login_url() ) . '">' . __( 'Log in' ) . '</a></p>' );
+			login_footer();
+			exit;
+		}
 
-	wp_enqueue_script('utils');
-	wp_enqueue_script('user-profile');
+		wp_enqueue_script( 'utils' );
+		wp_enqueue_script( 'user-profile' );
 
-	login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );
+		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">
+	?>
+	<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" />
 
 	<div class="user-pass1-wrap">
 		<p>
-			<label for="pass1"><?php _e( 'New password' ) ?></label>
+			<label for="pass1"><?php _e( 'New password' ); ?></label>
 		</p>
 
 		<div class="wp-pwd">
@@ -707,7 +727,7 @@ case 'rp' :
 	</div>
 
 	<p class="user-pass2-wrap">
-		<label for="pass2"><?php _e( 'Confirm new password' ) ?></label><br />
+		<label for="pass2"><?php _e( 'Confirm new password' ); ?></label><br />
 		<input type="password" name="pass2" id="pass2" class="input" size="20" value="" autocomplete="off" />
 	</p>
 
@@ -725,88 +745,88 @@ case 'rp' :
 	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 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' ) );
+	<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' ) );
 
-	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 );
-endif;
-?>
-</p>
+		/** 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;
+		break;
 
-case 'register' :
-	if ( is_multisite() ) {
+	case 'register':
+		if ( is_multisite() ) {
+			/**
+			 * Filters the Multisite sign up URL.
+			 *
+			 * @since 3.0.0
+			 *
+			 * @param string $sign_up_url The sign up URL.
+			 */
+			wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
+			exit;
+		}
+
+		if ( ! get_option( 'users_can_register' ) ) {
+			wp_redirect( site_url( 'wp-login.php?registration=disabled' ) );
+			exit();
+		}
+
+		$user_login = '';
+		$user_email = '';
+
+		if ( $http_post ) {
+			if ( isset( $_POST['user_login'] ) && is_string( $_POST['user_login'] ) ) {
+				$user_login = $_POST['user_login'];
+			}
+
+			if ( isset( $_POST['user_email'] ) && is_string( $_POST['user_email'] ) ) {
+				$user_email = wp_unslash( $_POST['user_email'] );
+			}
+
+			$errors = register_new_user( $user_login, $user_email );
+			if ( ! is_wp_error( $errors ) ) {
+				$redirect_to = ! empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
+				wp_safe_redirect( $redirect_to );
+				exit();
+			}
+		}
+
+		$registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
 		/**
-		 * Filters the Multisite sign up URL.
+		 * Filters the registration redirect URL.
 		 *
 		 * @since 3.0.0
 		 *
-		 * @param string $sign_up_url The sign up URL.
+		 * @param string $registration_redirect The redirect destination URL.
 		 */
-		wp_redirect( apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) ) );
-		exit;
-	}
-
-	if ( !get_option('users_can_register') ) {
-		wp_redirect( site_url('wp-login.php?registration=disabled') );
-		exit();
-	}
-
-	$user_login = '';
-	$user_email = '';
-
-	if ( $http_post ) {
-		if ( isset( $_POST['user_login'] ) && is_string( $_POST['user_login'] ) ) {
-			$user_login = $_POST['user_login'];
-		}
-
-		if ( isset( $_POST['user_email'] ) && is_string( $_POST['user_email'] ) ) {
-			$user_email = wp_unslash( $_POST['user_email'] );
-		}
-
-		$errors = register_new_user($user_login, $user_email);
-		if ( !is_wp_error($errors) ) {
-			$redirect_to = !empty( $_POST['redirect_to'] ) ? $_POST['redirect_to'] : 'wp-login.php?checkemail=registered';
-			wp_safe_redirect( $redirect_to );
-			exit();
-		}
-	}
-
-	$registration_redirect = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-	/**
-	 * Filters the registration redirect URL.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param string $registration_redirect The redirect destination URL.
-	 */
-	$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">
+		$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 />
-		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label>
+		<label for="user_login"><?php _e( 'Username' ); ?><br />
+		<input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr( wp_unslash( $user_login ) ); ?>" size="20" /></label>
 	</p>
 	<p>
-		<label for="user_email"><?php _e('Email') ?><br />
+		<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
@@ -820,170 +840,189 @@ case 'register' :
 	<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 ); ?>" />
-	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>
-</form>
+	<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e( 'Register' ); ?>" /></p>
+	</form>
 
-<p id="nav">
-<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
-<?php echo esc_html( $login_link_separator ); ?>
-<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-</p>
+	<p id="nav">
+	<a href="<?php echo esc_url( wp_login_url() ); ?>"><?php _e( 'Log in' ); ?></a>
+	<?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;
+		break;
 
-case 'login' :
-default:
-	$secure_cookie = '';
-	$customize_login = isset( $_REQUEST['customize-login'] );
-	if ( $customize_login )
-		wp_enqueue_script( 'customize-base' );
-
-	// If the user wants ssl but the session is not ssl, force a secure cookie.
-	if ( !empty($_POST['log']) && !force_ssl_admin() ) {
-		$user_name = sanitize_user($_POST['log']);
-		$user = get_user_by( 'login', $user_name );
-
-		if ( ! $user && strpos( $user_name, '@' ) ) {
-			$user = get_user_by( 'email', $user_name );
+	case 'login':
+	default:
+		$secure_cookie   = '';
+		$customize_login = isset( $_REQUEST['customize-login'] );
+		if ( $customize_login ) {
+			wp_enqueue_script( 'customize-base' );
 		}
 
-		if ( $user ) {
-			if ( get_user_option('use_ssl', $user->ID) ) {
-				$secure_cookie = true;
-				force_ssl_admin(true);
+		// If the user wants ssl but the session is not ssl, force a secure cookie.
+		if ( ! empty( $_POST['log'] ) && ! force_ssl_admin() ) {
+			$user_name = sanitize_user( $_POST['log'] );
+			$user      = get_user_by( 'login', $user_name );
+
+			if ( ! $user && strpos( $user_name, '@' ) ) {
+				$user = get_user_by( 'email', $user_name );
+			}
+
+			if ( $user ) {
+				if ( get_user_option( 'use_ssl', $user->ID ) ) {
+					$secure_cookie = true;
+					force_ssl_admin( true );
+				}
 			}
 		}
-	}
 
-	if ( isset( $_REQUEST['redirect_to'] ) ) {
-		$redirect_to = $_REQUEST['redirect_to'];
-		// Redirect to https if user wants ssl
-		if ( $secure_cookie && false !== strpos($redirect_to, 'wp-admin') )
-			$redirect_to = preg_replace('|^http://|', 'https://', $redirect_to);
-	} else {
-		$redirect_to = admin_url();
-	}
-
-	$reauth = empty($_REQUEST['reauth']) ? false : true;
-
-	$user = wp_signon( array(), $secure_cookie );
-
-	if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
-		if ( headers_sent() ) {
-			/* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
-			$user = new WP_Error( '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/' ) ) );
-		} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
-			// If cookies are disabled we can't log in even with a valid user+pass
-			/* translators: 1: Browser cookie documentation URL */
-			$user = new WP_Error( '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' ) ) );
+		if ( isset( $_REQUEST['redirect_to'] ) ) {
+			$redirect_to = $_REQUEST['redirect_to'];
+			// Redirect to https if user wants ssl
+			if ( $secure_cookie && false !== strpos( $redirect_to, 'wp-admin' ) ) {
+				$redirect_to = preg_replace( '|^http://|', 'https://', $redirect_to );
+			}
+		} else {
+			$redirect_to = admin_url();
 		}
-	}
 
-	$requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-	/**
-	 * Filters the login redirect URL.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param string           $redirect_to           The redirect destination URL.
-	 * @param string           $requested_redirect_to The requested redirect destination URL passed as a parameter.
-	 * @param WP_User|WP_Error $user                  WP_User object if login was successful, WP_Error object otherwise.
-	 */
-	$redirect_to = apply_filters( 'login_redirect', $redirect_to, $requested_redirect_to, $user );
+		$reauth = empty( $_REQUEST['reauth'] ) ? false : true;
 
-	if ( !is_wp_error($user) && !$reauth ) {
-		if ( $interim_login ) {
-			$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 ) : ?>
+		$user = wp_signon( array(), $secure_cookie );
+
+		if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
+			if ( headers_sent() ) {
+				/* translators: 1: Browser cookie documentation URL, 2: Support forums URL */
+				$user = new WP_Error(
+					'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/' )
+					)
+				);
+			} elseif ( isset( $_POST['testcookie'] ) && empty( $_COOKIE[ TEST_COOKIE ] ) ) {
+				// If cookies are disabled we can't log in even with a valid user+pass
+				/* translators: 1: Browser cookie documentation URL */
+				$user = new WP_Error(
+					'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' )
+					)
+				);
+			}
+		}
+
+		$requested_redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
+		/**
+		 * Filters the login redirect URL.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param string           $redirect_to           The redirect destination URL.
+		 * @param string           $requested_redirect_to The requested redirect destination URL passed as a parameter.
+		 * @param WP_User|WP_Error $user                  WP_User object if login was successful, WP_Error object otherwise.
+		 */
+		$redirect_to = apply_filters( 'login_redirect', $redirect_to, $requested_redirect_to, $user );
+
+		if ( ! is_wp_error( $user ) && ! $reauth ) {
+			if ( $interim_login ) {
+				$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;
-		}
+				</body></html>
+	<?php
+	  exit;
+			}
 
-		if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
-			// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
-			if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) )
-				$redirect_to = user_admin_url();
-			elseif ( is_multisite() && !$user->has_cap('read') )
-				$redirect_to = get_dashboard_url( $user->ID );
-			elseif ( !$user->has_cap('edit_posts') )
-				$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
+			if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
+				// If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
+				if ( is_multisite() && ! get_active_blog_for_user( $user->ID ) && ! is_super_admin( $user->ID ) ) {
+					$redirect_to = user_admin_url();
+				} elseif ( is_multisite() && ! $user->has_cap( 'read' ) ) {
+					$redirect_to = get_dashboard_url( $user->ID );
+				} elseif ( ! $user->has_cap( 'edit_posts' ) ) {
+					$redirect_to = $user->has_cap( 'read' ) ? admin_url( 'profile.php' ) : home_url();
+				}
 
-			wp_redirect( $redirect_to );
+				wp_redirect( $redirect_to );
+				exit();
+			}
+			wp_safe_redirect( $redirect_to );
 			exit();
 		}
-		wp_safe_redirect($redirect_to);
-		exit();
-	}
 
-	$errors = $user;
-	// Clear errors if loggedout is set.
-	if ( !empty($_GET['loggedout']) || $reauth )
-		$errors = new WP_Error();
+		$errors = $user;
+		// Clear errors if loggedout is set.
+		if ( ! empty( $_GET['loggedout'] ) || $reauth ) {
+			$errors = new WP_Error();
+		}
 
-	if ( $interim_login ) {
-		if ( ! $errors->get_error_code() )
-			$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
-	} else {
-		// Some parts of this script use the main login form to display a message
-		if		( isset($_GET['loggedout']) && true == $_GET['loggedout'] )
-			$errors->add('loggedout', __('You are now logged out.'), 'message');
-		elseif	( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
-			$errors->add('registerdisabled', __('User registration is currently not allowed.'));
-		elseif	( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
-			$errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
-			$errors->add('newpass', __('Check your email for your new password.'), 'message');
-		elseif	( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
-			$errors->add('registered', __('Registration complete. Please check your email.'), 'message');
-		elseif ( strpos( $redirect_to, 'about.php?updated' ) )
-			$errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
-	}
+		if ( $interim_login ) {
+			if ( ! $errors->get_error_code() ) {
+				$errors->add( 'expired', __( 'Your session has expired. Please log in to continue where you left off.' ), 'message' );
+			}
+		} else {
+			// Some parts of this script use the main login form to display a message
+			if ( isset( $_GET['loggedout'] ) && true == $_GET['loggedout'] ) {
+				$errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' );
+			} elseif ( isset( $_GET['registration'] ) && 'disabled' == $_GET['registration'] ) {
+				$errors->add( 'registerdisabled', __( 'User registration is currently not allowed.' ) );
+			} elseif ( isset( $_GET['checkemail'] ) && 'confirm' == $_GET['checkemail'] ) {
+				$errors->add( 'confirm', __( 'Check your email for the confirmation link.' ), 'message' );
+			} elseif ( isset( $_GET['checkemail'] ) && 'newpass' == $_GET['checkemail'] ) {
+				$errors->add( 'newpass', __( 'Check your email for your new password.' ), 'message' );
+			} elseif ( isset( $_GET['checkemail'] ) && 'registered' == $_GET['checkemail'] ) {
+				$errors->add( 'registered', __( 'Registration complete. Please check your email.' ), 'message' );
+			} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
+				$errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
+			}
+		}
 
-	/**
-	 * Filters the login page errors.
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param object $errors      WP Error object.
-	 * @param string $redirect_to Redirect destination URL.
-	 */
-	$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
+		/**
+		 * Filters the login page errors.
+		 *
+		 * @since 3.6.0
+		 *
+		 * @param object $errors      WP Error object.
+		 * @param string $redirect_to Redirect destination URL.
+		 */
+		$errors = apply_filters( 'wp_login_errors', $errors, $redirect_to );
 
-	// Clear any stale cookies.
-	if ( $reauth )
-		wp_clear_auth_cookie();
+		// Clear any stale cookies.
+		if ( $reauth ) {
+			wp_clear_auth_cookie();
+		}
 
-	login_header(__('Log In'), '', $errors);
+		login_header( __( 'Log In' ), '', $errors );
 
-	if ( isset($_POST['log']) )
-		$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr(wp_unslash($_POST['log'])) : '';
-	$rememberme = ! empty( $_POST['rememberme'] );
+		if ( isset( $_POST['log'] ) ) {
+			$user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? esc_attr( wp_unslash( $_POST['log'] ) ) : '';
+		}
+		$rememberme = ! empty( $_POST['rememberme'] );
 
-	if ( ! empty( $errors->errors ) ) {
-		$aria_describedby_error = ' aria-describedby="login_error"';
-	} else {
-		$aria_describedby_error = '';
-	}
-?>
+		if ( ! empty( $errors->errors ) ) {
+			$aria_describedby_error = ' aria-describedby="login_error"';
+		} else {
+			$aria_describedby_error = '';
+		}
+	?>
 
-<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
+	<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
 	<p>
 		<label for="user_login"><?php _e( 'Username or Email Address' ); ?><br />
 		<input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label>
@@ -1002,87 +1041,90 @@ default:
 	?>
 	<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 ) { ?>
+		<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 ) { ?>
 		<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	} else { ?>
+		<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
+	<?php } ?>
+	<?php if ( $customize_login ) : ?>
 		<input type="hidden" name="customize-login" value="1" />
-<?php   endif; ?>
+	<?php endif; ?>
 		<input type="hidden" name="testcookie" value="1" />
 	</p>
-</form>
+	</form>
 
-<?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 ( ! $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' ) );
 
-		/** 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;
-	?>
-	<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
-<?php endif; ?>
-</p>
-<?php } ?>
+			echo esc_html( $login_link_separator );
+		endif;
+		?>
+		<a href="<?php echo esc_url( wp_lostpassword_url() ); ?>"><?php _e( 'Lost your password?' ); ?></a>
+	<?php endif; ?>
+	</p>
+	<?php } ?>
 
-<script type="text/javascript">
-function wp_attempt_focus(){
-setTimeout( function(){ try{
-<?php if ( $user_login ) { ?>
-d = document.getElementById('user_pass');
-d.value = '';
-<?php } else { ?>
-d = document.getElementById('user_login');
-<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
-if( d.value != '' )
-d.value = '';
-<?php
+	<script type="text/javascript">
+	function wp_attempt_focus(){
+	setTimeout( function(){ try{
+	<?php if ( $user_login ) { ?>
+	d = document.getElementById('user_pass');
+	d.value = '';
+	<?php } else { ?>
+	d = document.getElementById('user_login');
+	<?php if ( 'invalid_username' == $errors->get_error_code() ) { ?>
+	if( d.value != '' )
+	d.value = '';
+	<?php
 }
-}?>
-d.focus();
-d.select();
-} catch(e){}
-}, 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 ) { ?>
-wp_attempt_focus();
-<?php } ?>
-if(typeof wpOnload=='function')wpOnload();
-<?php if ( $interim_login ) { ?>
-(function(){
-try {
-	var i, links = document.getElementsByTagName('a');
-	for ( i in links ) {
-		if ( links[i].href )
-			links[i].target = '_blank';
+?>
+	d.focus();
+	d.select();
+	} catch(e){}
+	}, 200);
 	}
-} catch(e){}
-}());
-<?php } ?>
-</script>
 
-<?php
-login_footer();
+	<?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 } ?>
+	if(typeof wpOnload=='function')wpOnload();
+	<?php if ( $interim_login ) { ?>
+	(function(){
+	try {
+		var i, links = document.getElementsByTagName('a');
+		for ( i in links ) {
+			if ( links[i].href )
+				links[i].target = '_blank';
+		}
+	} catch(e){}
+	}());
+	<?php } ?>
+	</script>
 
-if ( $switched_locale ) {
-    restore_previous_locale();
-}
+	<?php
+	login_footer();
 
-break;
+	if ( $switched_locale ) {
+		restore_previous_locale();
+	}
+
+		break;
 } // end action switch
diff --git a/wp-mail.php b/wp-mail.php
index 35fb24aed2..977ed0fc16 100644
--- a/wp-mail.php
+++ b/wp-mail.php
@@ -8,11 +8,12 @@
  */
 
 /** Make sure that the WordPress bootstrap has run before continuing. */
-require(dirname(__FILE__) . '/wp-load.php');
+require( dirname( __FILE__ ) . '/wp-load.php' );
 
 /** This filter is documented in wp-admin/options.php */
-if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
+if ( ! apply_filters( 'enable_post_by_email_configuration', true ) ) {
 	wp_die( __( 'This action has been disabled by the administrator.' ), 403 );
+}
 
 $mailserver_url = get_option( 'mailserver_url' );
 
@@ -31,85 +32,90 @@ do_action( 'wp-mail.php' );
 require_once( ABSPATH . WPINC . '/class-pop3.php' );
 
 /** Only check at this interval for new messages. */
-if ( !defined('WP_MAIL_INTERVAL') )
-	define('WP_MAIL_INTERVAL', 300); // 5 minutes
+if ( ! defined( 'WP_MAIL_INTERVAL' ) ) {
+	define( 'WP_MAIL_INTERVAL', 300 ); // 5 minutes
+}
 
-$last_checked = get_transient('mailserver_last_checked');
+$last_checked = get_transient( 'mailserver_last_checked' );
 
-if ( $last_checked )
-	wp_die(__('Slow down cowboy, no need to check for new mails so often!'));
+if ( $last_checked ) {
+	wp_die( __( 'Slow down cowboy, no need to check for new mails so often!' ) );
+}
 
-set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
+set_transient( 'mailserver_last_checked', true, WP_MAIL_INTERVAL );
 
-$time_difference = get_option('gmt_offset') * HOUR_IN_SECONDS;
+$time_difference = get_option( 'gmt_offset' ) * HOUR_IN_SECONDS;
 
 $phone_delim = '::';
 
 $pop3 = new POP3();
 
-if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
+if ( ! $pop3->connect( get_option( 'mailserver_url' ), get_option( 'mailserver_port' ) ) || ! $pop3->user( get_option( 'mailserver_login' ) ) ) {
 	wp_die( esc_html( $pop3->ERROR ) );
+}
 
-$count = $pop3->pass( get_option('mailserver_pass') );
+$count = $pop3->pass( get_option( 'mailserver_pass' ) );
 
-if( false === $count )
+if ( false === $count ) {
 	wp_die( esc_html( $pop3->ERROR ) );
+}
 
-if( 0 === $count ) {
+if ( 0 === $count ) {
 	$pop3->quit();
-	wp_die( __('There doesn&#8217;t seem to be any new mail.') );
+	wp_die( __( 'There doesn&#8217;t seem to be any new mail.' ) );
 }
 
 for ( $i = 1; $i <= $count; $i++ ) {
 
-	$message = $pop3->get($i);
+	$message = $pop3->get( $i );
 
-	$bodysignal = false;
-	$boundary = '';
-	$charset = '';
-	$content = '';
-	$content_type = '';
+	$bodysignal                = false;
+	$boundary                  = '';
+	$charset                   = '';
+	$content                   = '';
+	$content_type              = '';
 	$content_transfer_encoding = '';
-	$post_author = 1;
-	$author_found = false;
-	foreach ($message as $line) {
+	$post_author               = 1;
+	$author_found              = false;
+	foreach ( $message as $line ) {
 		// Body signal.
-		if ( strlen($line) < 3 )
+		if ( strlen( $line ) < 3 ) {
 			$bodysignal = true;
+		}
 		if ( $bodysignal ) {
 			$content .= $line;
 		} else {
-			if ( preg_match('/Content-Type: /i', $line) ) {
-				$content_type = trim($line);
-				$content_type = substr($content_type, 14, strlen($content_type) - 14);
-				$content_type = explode(';', $content_type);
+			if ( preg_match( '/Content-Type: /i', $line ) ) {
+				$content_type = trim( $line );
+				$content_type = substr( $content_type, 14, strlen( $content_type ) - 14 );
+				$content_type = explode( ';', $content_type );
 				if ( ! empty( $content_type[1] ) ) {
-					$charset = explode('=', $content_type[1]);
-					$charset = ( ! empty( $charset[1] ) ) ? trim($charset[1]) : '';
+					$charset = explode( '=', $content_type[1] );
+					$charset = ( ! empty( $charset[1] ) ) ? trim( $charset[1] ) : '';
 				}
 				$content_type = $content_type[0];
 			}
-			if ( preg_match('/Content-Transfer-Encoding: /i', $line) ) {
-				$content_transfer_encoding = trim($line);
-				$content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding) - 27);
-				$content_transfer_encoding = explode(';', $content_transfer_encoding);
+			if ( preg_match( '/Content-Transfer-Encoding: /i', $line ) ) {
+				$content_transfer_encoding = trim( $line );
+				$content_transfer_encoding = substr( $content_transfer_encoding, 27, strlen( $content_transfer_encoding ) - 27 );
+				$content_transfer_encoding = explode( ';', $content_transfer_encoding );
 				$content_transfer_encoding = $content_transfer_encoding[0];
 			}
-			if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos($line, 'boundary="') ) && ( '' == $boundary ) ) {
-				$boundary = trim($line);
-				$boundary = explode('"', $boundary);
+			if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' == $boundary ) ) {
+				$boundary = trim( $line );
+				$boundary = explode( '"', $boundary );
 				$boundary = $boundary[1];
 			}
-			if (preg_match('/Subject: /i', $line)) {
-				$subject = trim($line);
-				$subject = substr($subject, 9, strlen($subject) - 9);
+			if ( preg_match( '/Subject: /i', $line ) ) {
+				$subject = trim( $line );
+				$subject = substr( $subject, 9, strlen( $subject ) - 9 );
 				// Captures any text in the subject before $phone_delim as the subject
-				if ( function_exists('iconv_mime_decode') ) {
-					$subject = iconv_mime_decode($subject, 2, get_option('blog_charset'));
+				if ( function_exists( 'iconv_mime_decode' ) ) {
+					$subject = iconv_mime_decode( $subject, 2, get_option( 'blog_charset' ) );
 				} else {
-					$subject = wp_iso_descrambler($subject);
+					$subject = wp_iso_descrambler( $subject );
 				}
-				$subject = explode($phone_delim, $subject);
+				$subject = explode( $phone_delim, $subject );
 				$subject = $subject[0];
 			}
 
@@ -118,27 +124,28 @@ for ( $i = 1; $i <= $count; $i++ ) {
 			 * otherwise use the site admin.
 			 */
 			if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
-				if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
+				if ( preg_match( '|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches ) ) {
 					$author = $matches[0];
-				else
-					$author = trim($line);
-				$author = sanitize_email($author);
-				if ( is_email($author) ) {
+				} else {
+					$author = trim( $line );
+				}
+				$author = sanitize_email( $author );
+				if ( is_email( $author ) ) {
 					/* translators: Post author email address */
-					echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
-					$userdata = get_user_by('email', $author);
+					echo '<p>' . sprintf( __( 'Author is %s' ), $author ) . '</p>';
+					$userdata = get_user_by( 'email', $author );
 					if ( ! empty( $userdata ) ) {
-						$post_author = $userdata->ID;
+						$post_author  = $userdata->ID;
 						$author_found = true;
 					}
 				}
 			}
 
 			if ( preg_match( '/Date: /i', $line ) ) { // of the form '20 Mar 2002 20:32:37 +0100'
-				$ddate = str_replace( 'Date: ', '', trim( $line ) );
-				$ddate = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate );	// remove parenthesised timezone string if it exists, as this confuses strtotime
-				$ddate_U = strtotime( $ddate );
-				$post_date = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference );
+				$ddate         = str_replace( 'Date: ', '', trim( $line ) );
+				$ddate         = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate ); // remove parenthesised timezone string if it exists, as this confuses strtotime
+				$ddate_U       = strtotime( $ddate );
+				$post_date     = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference );
 				$post_date_gmt = gmdate( 'Y-m-d H:i:s', $ddate_U );
 			}
 		}
@@ -146,27 +153,27 @@ for ( $i = 1; $i <= $count; $i++ ) {
 
 	// Set $post_status based on $author_found and on author's publish_posts capability
 	if ( $author_found ) {
-		$user = new WP_User($post_author);
-		$post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
+		$user        = new WP_User( $post_author );
+		$post_status = ( $user->has_cap( 'publish_posts' ) ) ? 'publish' : 'pending';
 	} else {
 		// Author not found in DB, set status to pending. Author already set to admin.
 		$post_status = 'pending';
 	}
 
-	$subject = trim($subject);
+	$subject = trim( $subject );
 
 	if ( $content_type == 'multipart/alternative' ) {
-		$content = explode('--'.$boundary, $content);
+		$content = explode( '--' . $boundary, $content );
 		$content = $content[2];
 
 		// Match case-insensitive content-transfer-encoding.
-		if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
-			$content = explode($delim[0], $content);
+		if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim ) ) {
+			$content = explode( $delim[0], $content );
 			$content = $content[1];
 		}
-		$content = strip_tags($content, '<img><p><br><i><b><u><em><strong><strike><font><span><div>');
+		$content = strip_tags( $content, '<img><p><br><i><b><u><em><strong><strike><font><span><div>' );
 	}
-	$content = trim($content);
+	$content = trim( $content );
 
 	/**
 	 * Filters the original content of the email.
@@ -180,19 +187,19 @@ for ( $i = 1; $i <= $count; $i++ ) {
 	 */
 	$content = apply_filters( 'wp_mail_original_content', $content );
 
-	if ( false !== stripos($content_transfer_encoding, "quoted-printable") ) {
-		$content = quoted_printable_decode($content);
+	if ( false !== stripos( $content_transfer_encoding, 'quoted-printable' ) ) {
+		$content = quoted_printable_decode( $content );
 	}
 
-	if ( function_exists('iconv') && ! empty( $charset ) ) {
-		$content = iconv($charset, get_option('blog_charset'), $content);
+	if ( function_exists( 'iconv' ) && ! empty( $charset ) ) {
+		$content = iconv( $charset, get_option( 'blog_charset' ), $content );
 	}
 
 	// Captures any text in the body after $phone_delim as the body
-	$content = explode($phone_delim, $content);
+	$content = explode( $phone_delim, $content );
 	$content = empty( $content[1] ) ? $content[0] : $content[1];
 
-	$content = trim($content);
+	$content = trim( $content );
 
 	/**
 	 * Filters the content of the post submitted by email before saving.
@@ -203,22 +210,26 @@ for ( $i = 1; $i <= $count; $i++ ) {
 	 */
 	$post_content = apply_filters( 'phone_content', $content );
 
-	$post_title = xmlrpc_getposttitle($content);
+	$post_title = xmlrpc_getposttitle( $content );
 
-	if ($post_title == '') $post_title = $subject;
+	if ( $post_title == '' ) {
+		$post_title = $subject;
+	}
 
-	$post_category = array(get_option('default_email_category'));
+	$post_category = array( get_option( 'default_email_category' ) );
 
-	$post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
-	$post_data = wp_slash($post_data);
+	$post_data = compact( 'post_content', 'post_title', 'post_date', 'post_date_gmt', 'post_author', 'post_category', 'post_status' );
+	$post_data = wp_slash( $post_data );
 
-	$post_ID = wp_insert_post($post_data);
-	if ( is_wp_error( $post_ID ) )
+	$post_ID = wp_insert_post( $post_data );
+	if ( is_wp_error( $post_ID ) ) {
 		echo "\n" . $post_ID->get_error_message();
+	}
 
 	// We couldn't post, for whatever reason. Better move forward to the next email.
-	if ( empty( $post_ID ) )
+	if ( empty( $post_ID ) ) {
 		continue;
+	}
 
 	/**
 	 * Fires after a post submitted by email is published.
@@ -232,7 +243,7 @@ for ( $i = 1; $i <= $count; $i++ ) {
 	echo "\n<p><strong>" . __( 'Author:' ) . '</strong> ' . esc_html( $post_author ) . '</p>';
 	echo "\n<p><strong>" . __( 'Posted title:' ) . '</strong> ' . esc_html( $post_title ) . '</p>';
 
-	if(!$pop3->delete($i)) {
+	if ( ! $pop3->delete( $i ) ) {
 		echo '<p>' . sprintf(
 			/* translators: %s: POP3 error */
 			__( 'Oops: %s' ),
@@ -247,7 +258,6 @@ for ( $i = 1; $i <= $count; $i++ ) {
 			'<strong>' . $i . '</strong>'
 		) . '</p>';
 	}
-
 }
 
 $pop3->quit();
diff --git a/wp-settings.php b/wp-settings.php
index bacf4cfddd..6edd3c98ca 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -45,7 +45,7 @@ wp_check_php_mysql_versions();
 
 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
 @ini_set( 'magic_quotes_runtime', 0 );
-@ini_set( 'magic_quotes_sybase',  0 );
+@ini_set( 'magic_quotes_sybase', 0 );
 
 // WordPress calculates offsets from UTC.
 date_default_timezone_set( 'UTC' );
@@ -128,8 +128,9 @@ if ( is_multisite() ) {
 register_shutdown_function( 'shutdown_action_hook' );
 
 // Stop most of WordPress from being loaded if we just want the basics.
-if ( SHORTINIT )
+if ( SHORTINIT ) {
 	return false;
+}
 
 // Load the L10n library.
 require_once( ABSPATH . WPINC . '/l10n.php' );
@@ -277,8 +278,9 @@ if ( is_multisite() ) {
  */
 do_action( 'muplugins_loaded' );
 
-if ( is_multisite() )
-	ms_cookie_constants(  );
+if ( is_multisite() ) {
+	ms_cookie_constants();
+}
 
 // Define constants after multisite is loaded.
 wp_cookie_constants();
@@ -314,8 +316,9 @@ require( ABSPATH . WPINC . '/pluggable-deprecated.php' );
 wp_set_internal_encoding();
 
 // Run wp_cache_postload() if object cache is enabled and the function exists.
-if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
+if ( WP_CACHE && function_exists( 'wp_cache_postload' ) ) {
 	wp_cache_postload();
+}
 
 /**
  * Fires once activated plugins have loaded.
@@ -341,6 +344,7 @@ do_action( 'sanitize_comment_cookies' );
 
 /**
  * WordPress Query object
+ *
  * @global WP_Query $wp_the_query
  * @since 2.0.0
  */
@@ -349,6 +353,7 @@ $GLOBALS['wp_the_query'] = new WP_Query();
 /**
  * Holds the reference to @see $wp_the_query
  * Use this global for WordPress queries
+ *
  * @global WP_Query $wp_query
  * @since 1.5.0
  */
@@ -356,6 +361,7 @@ $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
 
 /**
  * Holds the WordPress Rewrite object for creating pretty URLs
+ *
  * @global WP_Rewrite $wp_rewrite
  * @since 1.5.0
  */
@@ -363,6 +369,7 @@ $GLOBALS['wp_rewrite'] = new WP_Rewrite();
 
 /**
  * WordPress Object
+ *
  * @global WP $wp
  * @since 2.0.0
  */
@@ -370,6 +377,7 @@ $GLOBALS['wp'] = new WP();
 
 /**
  * WordPress Widget Factory Object
+ *
  * @global WP_Widget_Factory $wp_widget_factory
  * @since 2.8.0
  */
@@ -377,6 +385,7 @@ $GLOBALS['wp_widget_factory'] = new WP_Widget_Factory();
 
 /**
  * WordPress User Roles
+ *
  * @global WP_Roles $wp_roles
  * @since 2.0.0
  */
@@ -390,19 +399,21 @@ $GLOBALS['wp_roles'] = new WP_Roles();
 do_action( 'setup_theme' );
 
 // Define the template related constants.
-wp_templating_constants(  );
+wp_templating_constants();
 
 // Load the default text localization domain.
 load_default_textdomain();
 
-$locale = get_locale();
+$locale      = get_locale();
 $locale_file = WP_LANG_DIR . "/$locale.php";
-if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
+if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) ) {
 	require( $locale_file );
+}
 unset( $locale_file );
 
 /**
  * WordPress Locale object for loading locale domain date and various strings.
+ *
  * @global WP_Locale $wp_locale
  * @since 2.1.0
  */
@@ -420,10 +431,12 @@ $GLOBALS['wp_locale_switcher']->init();
 
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) {
-	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
+	if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) {
 		include( STYLESHEETPATH . '/functions.php' );
-	if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
+	}
+	if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) {
 		include( TEMPLATEPATH . '/functions.php' );
+	}
 }
 
 /**
@@ -455,7 +468,7 @@ if ( is_multisite() ) {
 		require( $file );
 		die();
 	}
-	unset($file);
+	unset( $file );
 }
 
 /**
diff --git a/wp-signup.php b/wp-signup.php
index 46a2131d29..cecaf989e5 100644
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -1,13 +1,13 @@
 <?php
 
 /** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
+require( dirname( __FILE__ ) . '/wp-load.php' );
 
 add_action( 'wp_head', 'wp_no_robots' );
 
 require( dirname( __FILE__ ) . '/wp-blog-header.php' );
 
-if ( is_array( get_site_option( 'illegal_names' )) && isset( $_GET[ 'new' ] ) && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) ) {
+if ( is_array( get_site_option( 'illegal_names' ) ) && isset( $_GET['new'] ) && in_array( $_GET['new'], get_site_option( 'illegal_names' ) ) ) {
 	wp_redirect( network_home_url() );
 	die();
 }
@@ -27,12 +27,12 @@ function do_signup_header() {
 }
 add_action( 'wp_head', 'do_signup_header' );
 
-if ( !is_multisite() ) {
+if ( ! is_multisite() ) {
 	wp_redirect( wp_registration_url() );
 	die();
 }
 
-if ( !is_main_site() ) {
+if ( ! is_main_site() ) {
 	wp_redirect( network_site_url( 'wp-signup.php' ) );
 	die();
 }
@@ -102,19 +102,23 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 
 	$current_network = get_network();
 	// Blog name
-	if ( !is_subdomain_install() )
-		echo '<label for="blogname">' . __('Site Name:') . '</label>';
-	else
-		echo '<label for="blogname">' . __('Site Domain:') . '</label>';
+	if ( ! is_subdomain_install() ) {
+		echo '<label for="blogname">' . __( 'Site Name:' ) . '</label>';
+	} else {
+		echo '<label for="blogname">' . __( 'Site Domain:' ) . '</label>';
+	}
 
-	if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
-		<p class="error"><?php echo $errmsg ?></p>
-	<?php }
+	if ( $errmsg = $errors->get_error_message( 'blogname' ) ) {
+	?>
+		<p class="error"><?php echo $errmsg; ?></p>
+	<?php
+	}
 
-	if ( !is_subdomain_install() )
-		echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="60" /><br />';
-	else
-		echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '</span><br />';
+	if ( ! is_subdomain_install() ) {
+		echo '<span class="prefix_address">' . $current_network->domain . $current_network->path . '</span><input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" /><br />';
+	} else {
+		echo '<input name="blogname" type="text" id="blogname" value="' . esc_attr( $blogname ) . '" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_network->domain ) ) . '</span><br />';
+	}
 
 	if ( ! is_user_logged_in() ) {
 		if ( ! is_subdomain_install() ) {
@@ -129,11 +133,12 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 
 	// Blog Title
 	?>
-	<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 }
-	echo '<input name="blog_title" type="text" id="blog_title" value="'.esc_attr($blog_title).'" />';
+	<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
+}
+	echo '<input name="blog_title" type="text" id="blog_title" value="' . esc_attr( $blog_title ) . '" />';
 	?>
 
 	<?php
@@ -157,40 +162,42 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
 				$lang = '';
 			}
 
-			wp_dropdown_languages( array(
-				'name'                        => 'WPLANG',
-				'id'                          => 'site-language',
-				'selected'                    => $lang,
-				'languages'                   => $languages,
-				'show_available_translations' => false,
-			) );
+			wp_dropdown_languages(
+				array(
+					'name'                        => 'WPLANG',
+					'id'                          => 'site-language',
+					'selected'                    => $lang,
+					'languages'                   => $languages,
+					'show_available_translations' => false,
+				)
+			);
 			?>
 		</p>
 	<?php
 		endif; // Languages.
 
 		$blog_public_on_checked = $blog_public_off_checked = '';
-		if ( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public']  ) {
-			$blog_public_off_checked = 'checked="checked"';
-		} else {
-			$blog_public_on_checked = 'checked="checked"';
-		}
+	if ( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) {
+		$blog_public_off_checked = 'checked="checked"';
+	} else {
+		$blog_public_on_checked = 'checked="checked"';
+	}
 	?>
 
 	<div id="privacy">
-        <p class="privacy-intro">
-            <label for="blog_public_on"><?php _e('Privacy:') ?></label>
-            <?php _e( 'Allow search engines to index this site.' ); ?>
-            <br style="clear:both" />
-            <label class="checkbox" for="blog_public_on">
-                <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php echo $blog_public_on_checked; ?> />
-                <strong><?php _e( 'Yes' ); ?></strong>
-            </label>
-            <label class="checkbox" for="blog_public_off">
-                <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php echo $blog_public_off_checked; ?> />
-                <strong><?php _e( 'No' ); ?></strong>
-            </label>
-        </p>
+		<p class="privacy-intro">
+			<label for="blog_public_on"><?php _e( 'Privacy:' ); ?></label>
+			<?php _e( 'Allow search engines to index this site.' ); ?>
+			<br style="clear:both" />
+			<label class="checkbox" for="blog_public_on">
+				<input type="radio" id="blog_public_on" name="blog_public" value="1" <?php echo $blog_public_on_checked; ?> />
+				<strong><?php _e( 'Yes' ); ?></strong>
+			</label>
+			<label class="checkbox" for="blog_public_off">
+				<input type="radio" id="blog_public_off" name="blog_public" value="0" <?php echo $blog_public_off_checked; ?> />
+				<strong><?php _e( 'No' ); ?></strong>
+			</label>
+		</p>
 	</div>
 
 	<?php
@@ -213,10 +220,11 @@ function show_blog_form( $blogname = '', $blog_title = '', $errors = '' ) {
  */
 function validate_blog_form() {
 	$user = '';
-	if ( is_user_logged_in() )
+	if ( is_user_logged_in() ) {
 		$user = wp_get_current_user();
+	}
 
-	return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
+	return wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'], $user );
 }
 
 /**
@@ -228,27 +236,27 @@ function validate_blog_form() {
  * @param string          $user_email The entered email address.
  * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
  */
-function show_user_form($user_name = '', $user_email = '', $errors = '') {
+function show_user_form( $user_name = '', $user_email = '', $errors = '' ) {
 	if ( ! is_wp_error( $errors ) ) {
 		$errors = new WP_Error();
 	}
 
 	// User name
-	echo '<label for="user_name">' . __('Username:') . '</label>';
-	if ( $errmsg = $errors->get_error_message('user_name') ) {
-		echo '<p class="error">'.$errmsg.'</p>';
+	echo '<label for="user_name">' . __( 'Username:' ) . '</label>';
+	if ( $errmsg = $errors->get_error_message( 'user_name' ) ) {
+		echo '<p class="error">' . $errmsg . '</p>';
 	}
-	echo '<input name="user_name" type="text" id="user_name" value="'. esc_attr( $user_name ) .'" autocapitalize="none" autocorrect="off" maxlength="60" /><br />';
+	echo '<input name="user_name" type="text" id="user_name" value="' . esc_attr( $user_name ) . '" autocapitalize="none" autocorrect="off" maxlength="60" /><br />';
 	_e( '(Must be at least 4 characters, letters and numbers only.)' );
 	?>
 
-	<label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label>
-	<?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
-		<p class="error"><?php echo $errmsg ?></p>
+	<label for="user_email"><?php _e( 'Email&nbsp;Address:' ); ?></label>
+	<?php if ( $errmsg = $errors->get_error_message( 'user_email' ) ) { ?>
+		<p class="error"><?php echo $errmsg; ?></p>
 	<?php } ?>
-	<input name="user_email" type="email" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?>
+	<input name="user_email" type="email" id="user_email" value="<?php echo esc_attr( $user_email ); ?>" maxlength="200" /><br /><?php _e( 'We send your registration email to this address. (Double-check your email address before continuing.)' ); ?>
 	<?php
-	if ( $errmsg = $errors->get_error_message('generic') ) {
+	if ( $errmsg = $errors->get_error_message( 'generic' ) ) {
 		echo '<p class="error">' . $errmsg . '</p>';
 	}
 	/**
@@ -269,7 +277,7 @@ function show_user_form($user_name = '', $user_email = '', $errors = '') {
  * @return array Contains username, email, and error messages.
  */
 function validate_user_form() {
-	return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
+	return wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
 }
 
 /**
@@ -284,14 +292,14 @@ function validate_user_form() {
 function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 	$current_user = wp_get_current_user();
 
-	if ( ! is_wp_error($errors) ) {
+	if ( ! is_wp_error( $errors ) ) {
 		$errors = new WP_Error();
 	}
 
 	$signup_defaults = array(
 		'blogname'   => $blogname,
 		'blog_title' => $blog_title,
-		'errors'     => $errors
+		'errors'     => $errors,
 	);
 
 	/**
@@ -309,9 +317,9 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 	 */
 	$filtered_results = apply_filters( 'signup_another_blog_init', $signup_defaults );
 
-	$blogname = $filtered_results['blogname'];
+	$blogname   = $filtered_results['blogname'];
 	$blog_title = $filtered_results['blog_title'];
-	$errors = $filtered_results['errors'];
+	$errors     = $filtered_results['errors'];
 
 	echo '<h2>' . sprintf( __( 'Get <em>another</em> %s site in seconds' ), get_network()->site_name ) . '</h2>';
 
@@ -319,22 +327,25 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 		echo '<p>' . __( 'There was a problem, please correct the form below and try again.' ) . '</p>';
 	}
 	?>
-	<p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ) ?></p>
+	<p><?php printf( __( 'Welcome back, %s. By filling out the form below, you can <strong>add another site to your account</strong>. There is no limit to the number of sites you can have, so create to your heart&#8217;s content, but write responsibly!' ), $current_user->display_name ); ?></p>
 
 	<?php
-	$blogs = get_blogs_of_user($current_user->ID);
-	if ( !empty($blogs) ) { ?>
+	$blogs = get_blogs_of_user( $current_user->ID );
+	if ( ! empty( $blogs ) ) {
+	?>
 
-			<p><?php _e( 'Sites you are already a member of:' ) ?></p>
+			<p><?php _e( 'Sites you are already a member of:' ); ?></p>
 			<ul>
-				<?php foreach ( $blogs as $blog ) {
+				<?php
+				foreach ( $blogs as $blog ) {
 					$home_url = get_home_url( $blog->userblog_id );
 					echo '<li><a href="' . esc_url( $home_url ) . '">' . $home_url . '</a></li>';
-				} ?>
+				}
+				?>
 			</ul>
 	<?php } ?>
 
-	<p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ) ?></p>
+	<p><?php _e( 'If you&#8217;re not going to use a great site domain, leave it for a new user. Now have at it!' ); ?></p>
 	<form id="setupform" method="post" action="wp-signup.php">
 		<input type="hidden" name="stage" value="gimmeanotherblog" />
 		<?php
@@ -348,8 +359,8 @@ function signup_another_blog( $blogname = '', $blog_title = '', $errors = '' ) {
 		 */
 		do_action( 'signup_hidden_fields', 'create-another-site' );
 		?>
-		<?php show_blog_form($blogname, $blog_title, $errors); ?>
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
+		<?php show_blog_form( $blogname, $blog_title, $errors ); ?>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ); ?>" /></p>
 	</form>
 	<?php
 }
@@ -372,14 +383,14 @@ function validate_another_blog_signup() {
 	$result = validate_blog_form();
 
 	// Extracted values set/overwrite globals.
-	$domain = $result['domain'];
-	$path = $result['path'];
-	$blogname = $result['blogname'];
+	$domain     = $result['domain'];
+	$path       = $result['path'];
+	$blogname   = $result['blogname'];
 	$blog_title = $result['blog_title'];
-	$errors = $result['errors'];
+	$errors     = $result['errors'];
 
 	if ( $errors->get_error_code() ) {
-		signup_another_blog($blogname, $blog_title, $errors);
+		signup_another_blog( $blogname, $blog_title, $errors );
 		return false;
 	}
 
@@ -387,7 +398,7 @@ function validate_another_blog_signup() {
 
 	$blog_meta_defaults = array(
 		'lang_id' => 1,
-		'public'  => $public
+		'public'  => $public,
 	);
 
 	// Handle the language setting for the new site.
@@ -402,7 +413,6 @@ function validate_another_blog_signup() {
 				$blog_meta_defaults['WPLANG'] = $language;
 			}
 		}
-
 	}
 
 	/**
@@ -467,18 +477,22 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $
 		$login_url = 'http://' . $domain . $path . 'wp-login.php';
 	}
 
-	$site = sprintf( '<a href="%1$s">%2$s</a>',
+	$site = sprintf(
+		'<a href="%1$s">%2$s</a>',
 		esc_url( $home_url ),
 		$blog_title
 	);
 
 	?>
-	<h2><?php
+	<h2>
+	<?php
 		/* translators: %s: site name */
 		printf( __( 'The site %s is yours.' ), $site );
-	?></h2>
+	?>
+	</h2>
 	<p>
-		<?php printf(
+		<?php
+		printf(
 			/* translators: 1: link to new site, 2: login URL, 3: username */
 			__( '%1$s is your new site. <a href="%2$s">Log in</a> as &#8220;%3$s&#8221; using your existing password.' ),
 			sprintf(
@@ -488,7 +502,8 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $
 			),
 			esc_url( $login_url ),
 			$user_name
-		); ?>
+		);
+		?>
 	</p>
 	<?php
 	/**
@@ -511,10 +526,11 @@ function confirm_another_blog_signup( $domain, $path, $blog_title, $user_name, $
 function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 	global $active_signup;
 
-	if ( !is_wp_error($errors) )
+	if ( ! is_wp_error( $errors ) ) {
 		$errors = new WP_Error();
+	}
 
-	$signup_for = isset( $_POST[ 'signup_for' ] ) ? esc_html( $_POST[ 'signup_for' ] ) : 'blog';
+	$signup_for = isset( $_POST['signup_for'] ) ? esc_html( $_POST['signup_for'] ) : 'blog';
 
 	$signup_user_defaults = array(
 		'user_name'  => $user_name,
@@ -536,23 +552,25 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 	 * }
 	 */
 	$filtered_results = apply_filters( 'signup_user_init', $signup_user_defaults );
-	$user_name = $filtered_results['user_name'];
-	$user_email = $filtered_results['user_email'];
-	$errors = $filtered_results['errors'];
+	$user_name        = $filtered_results['user_name'];
+	$user_email       = $filtered_results['user_email'];
+	$errors           = $filtered_results['errors'];
 
 	?>
 
-	<h2><?php
+	<h2>
+	<?php
 		/* translators: %s: name of the network */
 		printf( __( 'Get your own %s account in seconds' ), get_network()->site_name );
-	?></h2>
+	?>
+	</h2>
 	<form id="setupform" method="post" action="wp-signup.php" novalidate="novalidate">
 		<input type="hidden" name="stage" value="validate-user-signup" />
 		<?php
 		/** This action is documented in wp-signup.php */
 		do_action( 'signup_hidden_fields', 'validate-user' );
 		?>
-		<?php show_user_form($user_name, $user_email, $errors); ?>
+		<?php show_user_form( $user_name, $user_email, $errors ); ?>
 
 		<p>
 		<?php if ( $active_signup == 'blog' ) { ?>
@@ -561,14 +579,14 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
 			<input id="signupblog" type="hidden" name="signup_for" value="user" />
 		<?php } else { ?>
 			<input id="signupblog" type="radio" name="signup_for" value="blog" <?php checked( $signup_for, 'blog' ); ?> />
-			<label class="checkbox" for="signupblog"><?php _e('Gimme a site!') ?></label>
+			<label class="checkbox" for="signupblog"><?php _e( 'Gimme a site!' ); ?></label>
 			<br />
 			<input id="signupuser" type="radio" name="signup_for" value="user" <?php checked( $signup_for, 'user' ); ?> />
-			<label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
+			<label class="checkbox" for="signupuser"><?php _e( 'Just a username, please.' ); ?></label>
 		<?php } ?>
 		</p>
 
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Next' ); ?>" /></p>
 	</form>
 	<?php
 }
@@ -581,25 +599,25 @@ function signup_user( $user_name = '', $user_email = '', $errors = '' ) {
  * @return bool True if new user signup was validated, false if error
  */
 function validate_user_signup() {
-	$result = validate_user_form();
-	$user_name = $result['user_name'];
+	$result     = validate_user_form();
+	$user_name  = $result['user_name'];
 	$user_email = $result['user_email'];
-	$errors = $result['errors'];
+	$errors     = $result['errors'];
 
 	if ( $errors->get_error_code() ) {
-		signup_user($user_name, $user_email, $errors);
+		signup_user( $user_name, $user_email, $errors );
 		return false;
 	}
 
 	if ( 'blog' == $_POST['signup_for'] ) {
-		signup_blog($user_name, $user_email);
+		signup_blog( $user_name, $user_email );
 		return false;
 	}
 
 	/** This filter is documented in wp-signup.php */
 	wpmu_signup_user( $user_name, $user_email, apply_filters( 'add_signup_meta', array() ) );
 
-	confirm_user_signup($user_name, $user_email);
+	confirm_user_signup( $user_name, $user_email );
 	return true;
 }
 
@@ -611,13 +629,21 @@ function validate_user_signup() {
  * @param string $user_name The username
  * @param string $user_email The user's email address
  */
-function confirm_user_signup($user_name, $user_email) {
+function confirm_user_signup( $user_name, $user_email ) {
 	?>
-	<h2><?php /* translators: %s: username */
-	printf( __( '%s is your new username' ), $user_name) ?></h2>
-	<p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ) ?></p>
-	<p><?php /* translators: %s: email address */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
+	<h2>
+	<?php
+	/* translators: %s: username */
+	printf( __( '%s is your new username' ), $user_name )
+	?>
+	</h2>
+	<p><?php _e( 'But, before you can start using your new username, <strong>you must activate it</strong>.' ); ?></p>
+	<p>
+	<?php
+	/* translators: %s: email address */
+	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
+	?>
+	</p>
 	<p><?php _e( 'If you do not activate your username within two days, you will have to sign up again.' ); ?></p>
 	<?php
 	/** This action is documented in wp-signup.php */
@@ -635,16 +661,17 @@ function confirm_user_signup($user_name, $user_email) {
  * @param string          $blog_title The site title.
  * @param WP_Error|string $errors     A WP_Error object containing existing errors. Defaults to empty string.
  */
-function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
-	if ( !is_wp_error($errors) )
+function signup_blog( $user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '' ) {
+	if ( ! is_wp_error( $errors ) ) {
 		$errors = new WP_Error();
+	}
 
 	$signup_blog_defaults = array(
 		'user_name'  => $user_name,
 		'user_email' => $user_email,
 		'blogname'   => $blogname,
 		'blog_title' => $blog_title,
-		'errors'     => $errors
+		'errors'     => $errors,
 	);
 
 	/**
@@ -664,25 +691,26 @@ function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_ti
 	 */
 	$filtered_results = apply_filters( 'signup_blog_init', $signup_blog_defaults );
 
-	$user_name = $filtered_results['user_name'];
+	$user_name  = $filtered_results['user_name'];
 	$user_email = $filtered_results['user_email'];
-	$blogname = $filtered_results['blogname'];
+	$blogname   = $filtered_results['blogname'];
 	$blog_title = $filtered_results['blog_title'];
-	$errors = $filtered_results['errors'];
+	$errors     = $filtered_results['errors'];
 
-	if ( empty($blogname) )
+	if ( empty( $blogname ) ) {
 		$blogname = $user_name;
+	}
 	?>
 	<form id="setupform" method="post" action="wp-signup.php">
 		<input type="hidden" name="stage" value="validate-blog-signup" />
-		<input type="hidden" name="user_name" value="<?php echo esc_attr($user_name) ?>" />
-		<input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
+		<input type="hidden" name="user_name" value="<?php echo esc_attr( $user_name ); ?>" />
+		<input type="hidden" name="user_email" value="<?php echo esc_attr( $user_email ); ?>" />
 		<?php
 		/** This action is documented in wp-signup.php */
 		do_action( 'signup_hidden_fields', 'validate-site' );
 		?>
-		<?php show_blog_form($blogname, $blog_title, $errors); ?>
-		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
+		<?php show_blog_form( $blogname, $blog_title, $errors ); ?>
+		<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Signup' ); ?>" /></p>
 	</form>
 	<?php
 }
@@ -697,8 +725,8 @@ function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_ti
 function validate_blog_signup() {
 	// Re-validate user info.
 	$user_result = wpmu_validate_user_signup( $_POST['user_name'], $_POST['user_email'] );
-	$user_name = $user_result['user_name'];
-	$user_email = $user_result['user_email'];
+	$user_name   = $user_result['user_name'];
+	$user_email  = $user_result['user_email'];
 	$user_errors = $user_result['errors'];
 
 	if ( $user_errors->get_error_code() ) {
@@ -706,20 +734,23 @@ function validate_blog_signup() {
 		return false;
 	}
 
-	$result = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] );
-	$domain = $result['domain'];
-	$path = $result['path'];
-	$blogname = $result['blogname'];
+	$result     = wpmu_validate_blog_signup( $_POST['blogname'], $_POST['blog_title'] );
+	$domain     = $result['domain'];
+	$path       = $result['path'];
+	$blogname   = $result['blogname'];
 	$blog_title = $result['blog_title'];
-	$errors = $result['errors'];
+	$errors     = $result['errors'];
 
 	if ( $errors->get_error_code() ) {
-		signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
+		signup_blog( $user_name, $user_email, $blogname, $blog_title, $errors );
 		return false;
 	}
 
-	$public = (int) $_POST['blog_public'];
-	$signup_meta = array ('lang_id' => 1, 'public' => $public);
+	$public      = (int) $_POST['blog_public'];
+	$signup_meta = array(
+		'lang_id' => 1,
+		'public'  => $public,
+	);
 
 	// Handle the language setting for the new site.
 	if ( ! empty( $_POST['WPLANG'] ) ) {
@@ -733,14 +764,13 @@ function validate_blog_signup() {
 				$signup_meta['WPLANG'] = $language;
 			}
 		}
-
 	}
 
 	/** This filter is documented in wp-signup.php */
 	$meta = apply_filters( 'add_signup_meta', $signup_meta );
 
-	wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta);
-	confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta);
+	wpmu_signup_blog( $domain, $path, $blog_title, $user_name, $user_email, $meta );
+	confirm_blog_signup( $domain, $path, $blog_title, $user_name, $user_email, $meta );
 	return true;
 }
 
@@ -758,23 +788,33 @@ function validate_blog_signup() {
  */
 function confirm_blog_signup( $domain, $path, $blog_title, $user_name = '', $user_email = '', $meta = array() ) {
 	?>
-	<h2><?php /* translators: %s: site address */
-	printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+	<h2>
+	<?php
+	/* translators: %s: site address */
+	printf( __( 'Congratulations! Your new site, %s, is almost ready.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" )
+	?>
+	</h2>
 
-	<p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p>
-	<p><?php /* translators: %s: email address */
-	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' ); ?></p>
+	<p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ); ?></p>
+	<p>
+	<?php
+	/* translators: %s: email address */
+	printf( __( 'Check your inbox at %s and click the link given.' ), '<strong>' . $user_email . '</strong>' );
+	?>
+	</p>
 	<p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p>
 	<h2><?php _e( 'Still waiting for your email?' ); ?></h2>
 	<p>
-		<?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?>
+		<?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ); ?>
 		<ul id="noemail-tips">
-			<li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
-			<li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
-			<li><?php
+			<li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ); ?></strong></p></li>
+			<li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ); ?></p></li>
+			<li>
+			<?php
 				/* translators: %s: email address */
 				printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email );
-			?></li>
+			?>
+			</li>
 		</ul>
 	</p>
 	<?php
@@ -855,64 +895,69 @@ if ( current_user_can( 'manage_network' ) ) {
 	echo '</div>';
 }
 
-$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
+$newblogname = isset( $_GET['new'] ) ? strtolower( preg_replace( '/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'] ) ) : null;
 
 $current_user = wp_get_current_user();
 if ( $active_signup == 'none' ) {
 	_e( 'Registration has been disabled.' );
-} elseif ( $active_signup == 'blog' && !is_user_logged_in() ) {
+} elseif ( $active_signup == 'blog' && ! is_user_logged_in() ) {
 	$login_url = wp_login_url( network_site_url( 'wp-signup.php' ) );
 	/* translators: %s: login URL */
 	printf( __( 'You must first <a href="%s">log in</a>, and then you can create a new site.' ), $login_url );
 } else {
-	$stage = isset( $_POST['stage'] ) ?  $_POST['stage'] : 'default';
+	$stage = isset( $_POST['stage'] ) ? $_POST['stage'] : 'default';
 	switch ( $stage ) {
-		case 'validate-user-signup' :
-			if ( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
+		case 'validate-user-signup':
+			if ( $active_signup == 'all' || $_POST['signup_for'] == 'blog' && $active_signup == 'blog' || $_POST['signup_for'] == 'user' && $active_signup == 'user' ) {
 				validate_user_signup();
-			else
+			} else {
 				_e( 'User registration has been disabled.' );
-		break;
+			}
+			break;
 		case 'validate-blog-signup':
-			if ( $active_signup == 'all' || $active_signup == 'blog' )
+			if ( $active_signup == 'all' || $active_signup == 'blog' ) {
 				validate_blog_signup();
-			else
+			} else {
 				_e( 'Site registration has been disabled.' );
+			}
 			break;
 		case 'gimmeanotherblog':
 			validate_another_blog_signup();
 			break;
 		case 'default':
-		default :
-			$user_email = isset( $_POST[ 'user_email' ] ) ? $_POST[ 'user_email' ] : '';
+		default:
+			$user_email = isset( $_POST['user_email'] ) ? $_POST['user_email'] : '';
 			/**
 			 * Fires when the site sign-up form is sent.
 			 *
 			 * @since 3.0.0
 			 */
 			do_action( 'preprocess_signup_form' );
-			if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) )
-				signup_another_blog($newblogname);
-			elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) )
+			if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) {
+				signup_another_blog( $newblogname );
+			} elseif ( ! is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'user' ) ) {
 				signup_user( $newblogname, $user_email );
-			elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) )
+			} elseif ( ! is_user_logged_in() && ( $active_signup == 'blog' ) ) {
 				_e( 'Sorry, new registrations are not allowed at this time.' );
-			else
+			} else {
 				_e( 'You are logged in already. No need to register again!' );
+			}
 
 			if ( $newblogname ) {
 				$newblog = get_blogaddress_by_name( $newblogname );
 
-				if ( $active_signup == 'blog' || $active_signup == 'all' )
+				if ( $active_signup == 'blog' || $active_signup == 'all' ) {
 					/* translators: %s: site address */
-					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
+					printf(
+						'<p><em>' . __( 'The site you were looking for, %s, does not exist, but you can create it now!' ) . '</em></p>',
 						'<strong>' . $newblog . '</strong>'
 					);
-				else
-					/* translators: %s: site address */
-					printf( '<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
+				} else {                  /* translators: %s: site address */
+					printf(
+						'<p><em>' . __( 'The site you were looking for, %s, does not exist.' ) . '</em></p>',
 						'<strong>' . $newblog . '</strong>'
 					);
+				}
 			}
 			break;
 	}
@@ -926,6 +971,8 @@ if ( $active_signup == 'none' ) {
  *
  * @since 3.0.0
  */
-do_action( 'after_signup_form' ); ?>
+do_action( 'after_signup_form' );
+?>
 
-<?php get_footer( 'wp-signup' );
+<?php
+get_footer( 'wp-signup' );
diff --git a/wp-trackback.php b/wp-trackback.php
index 802bb2ba6d..6bc8495a9f 100644
--- a/wp-trackback.php
+++ b/wp-trackback.php
@@ -8,7 +8,7 @@
  * @subpackage Trackbacks
  */
 
-if (empty($wp)) {
+if ( empty( $wp ) ) {
 	require_once( dirname( __FILE__ ) . '/wp-load.php' );
 	wp( array( 'tb' => '1' ) );
 }
@@ -24,107 +24,113 @@ if (empty($wp)) {
  *                              Default '0'. Accepts '0' or '1', true or false.
  * @param string $error_message Error message if an error occurred.
  */
-function trackback_response($error = 0, $error_message = '') {
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
-	if ($error) {
-		echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+function trackback_response( $error = 0, $error_message = '' ) {
+	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
+	if ( $error ) {
+		echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
 		echo "<response>\n";
 		echo "<error>1</error>\n";
 		echo "<message>$error_message</message>\n";
-		echo "</response>";
+		echo '</response>';
 		die();
 	} else {
-		echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
+		echo '<?xml version="1.0" encoding="utf-8"?' . ">\n";
 		echo "<response>\n";
 		echo "<error>0</error>\n";
-		echo "</response>";
+		echo '</response>';
 	}
 }
 
 // Trackback is done by a POST.
 $request_array = 'HTTP_POST_VARS';
 
-if ( !isset($_GET['tb_id']) || !$_GET['tb_id'] ) {
-	$tb_id = explode('/', $_SERVER['REQUEST_URI']);
-	$tb_id = intval( $tb_id[ count($tb_id) - 1 ] );
+if ( ! isset( $_GET['tb_id'] ) || ! $_GET['tb_id'] ) {
+	$tb_id = explode( '/', $_SERVER['REQUEST_URI'] );
+	$tb_id = intval( $tb_id[ count( $tb_id ) - 1 ] );
 }
 
-$tb_url  = isset($_POST['url'])     ? $_POST['url']     : '';
-$charset = isset($_POST['charset']) ? $_POST['charset'] : '';
+$tb_url  = isset( $_POST['url'] ) ? $_POST['url'] : '';
+$charset = isset( $_POST['charset'] ) ? $_POST['charset'] : '';
 
 // These three are stripslashed here so they can be properly escaped after mb_convert_encoding().
-$title     = isset($_POST['title'])     ? wp_unslash($_POST['title'])      : '';
-$excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
-$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';
+$title     = isset( $_POST['title'] ) ? wp_unslash( $_POST['title'] ) : '';
+$excerpt   = isset( $_POST['excerpt'] ) ? wp_unslash( $_POST['excerpt'] ) : '';
+$blog_name = isset( $_POST['blog_name'] ) ? wp_unslash( $_POST['blog_name'] ) : '';
 
-if ($charset)
-	$charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
-else
+if ( $charset ) {
+	$charset = str_replace( array( ',', ' ' ), '', strtoupper( trim( $charset ) ) );
+} else {
 	$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
+}
 
 // No valid uses for UTF-7.
-if ( false !== strpos($charset, 'UTF-7') )
+if ( false !== strpos( $charset, 'UTF-7' ) ) {
 	die;
+}
 
 // For international trackbacks.
-if ( function_exists('mb_convert_encoding') ) {
-	$title     = mb_convert_encoding($title, get_option('blog_charset'), $charset);
-	$excerpt   = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset);
-	$blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset);
+if ( function_exists( 'mb_convert_encoding' ) ) {
+	$title     = mb_convert_encoding( $title, get_option( 'blog_charset' ), $charset );
+	$excerpt   = mb_convert_encoding( $excerpt, get_option( 'blog_charset' ), $charset );
+	$blog_name = mb_convert_encoding( $blog_name, get_option( 'blog_charset' ), $charset );
 }
 
 // Now that mb_convert_encoding() has been given a swing, we need to escape these three.
-$title     = wp_slash($title);
-$excerpt   = wp_slash($excerpt);
-$blog_name = wp_slash($blog_name);
+$title     = wp_slash( $title );
+$excerpt   = wp_slash( $excerpt );
+$blog_name = wp_slash( $blog_name );
 
-if ( is_single() || is_page() )
+if ( is_single() || is_page() ) {
 	$tb_id = $posts[0]->ID;
+}
 
-if ( !isset($tb_id) || !intval( $tb_id ) )
+if ( ! isset( $tb_id ) || ! intval( $tb_id ) ) {
 	trackback_response( 1, __( 'I really need an ID for this to work.' ) );
+}
 
-if (empty($title) && empty($tb_url) && empty($blog_name)) {
+if ( empty( $title ) && empty( $tb_url ) && empty( $blog_name ) ) {
 	// If it doesn't look like a trackback at all.
-	wp_redirect(get_permalink($tb_id));
+	wp_redirect( get_permalink( $tb_id ) );
 	exit;
 }
 
-if ( !empty($tb_url) && !empty($title) ) {
+if ( ! empty( $tb_url ) && ! empty( $title ) ) {
 	/**
-	* Fires before the trackback is added to a post.
-	*
-	* @since 4.7.0
-	*
-	* @param int    $tb_id     Post ID related to the trackback.
-	* @param string $tb_url    Trackback URL.
-	* @param string $charset   Character Set.
-	* @param string $title     Trackback Title.
-	* @param string $excerpt   Trackback Excerpt.
-	* @param string $blog_name Blog Name.
-	*/
+	 * Fires before the trackback is added to a post.
+	 *
+	 * @since 4.7.0
+	 *
+	 * @param int    $tb_id     Post ID related to the trackback.
+	 * @param string $tb_url    Trackback URL.
+	 * @param string $charset   Character Set.
+	 * @param string $title     Trackback Title.
+	 * @param string $excerpt   Trackback Excerpt.
+	 * @param string $blog_name Blog Name.
+	 */
 	do_action( 'pre_trackback_post', $tb_id, $tb_url, $charset, $title, $excerpt, $blog_name );
 
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
 
-	if ( !pings_open($tb_id) )
+	if ( ! pings_open( $tb_id ) ) {
 		trackback_response( 1, __( 'Sorry, trackbacks are closed for this item.' ) );
+	}
 
-	$title =  wp_html_excerpt( $title, 250, '&#8230;' );
+	$title   = wp_html_excerpt( $title, 250, '&#8230;' );
 	$excerpt = wp_html_excerpt( $excerpt, 252, '&#8230;' );
 
-	$comment_post_ID = (int) $tb_id;
-	$comment_author = $blog_name;
+	$comment_post_ID      = (int) $tb_id;
+	$comment_author       = $blog_name;
 	$comment_author_email = '';
-	$comment_author_url = $tb_url;
-	$comment_content = "<strong>$title</strong>\n\n$excerpt";
-	$comment_type = 'trackback';
+	$comment_author_url   = $tb_url;
+	$comment_content      = "<strong>$title</strong>\n\n$excerpt";
+	$comment_type         = 'trackback';
 
-	$dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) );
-	if ( $dupe )
+	$dupe = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url ) );
+	if ( $dupe ) {
 		trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) );
+	}
 
-	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
+	$commentdata = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type' );
 
 	$result = wp_new_comment( $commentdata );
 
diff --git a/xmlrpc.php b/xmlrpc.php
index fbfbb2c732..a0489bf110 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -10,38 +10,39 @@
  *
  * @var bool
  */
-define('XMLRPC_REQUEST', true);
+define( 'XMLRPC_REQUEST', true );
 
 // Some browser-embedded clients send cookies. We don't want them.
 $_COOKIE = array();
 
 // A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
 // but we can do it ourself.
-if ( !isset( $HTTP_RAW_POST_DATA ) ) {
+if ( ! isset( $HTTP_RAW_POST_DATA ) ) {
 	$HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
 }
 
 // fix for mozBlog and other cases where '<?xml' isn't on the very first line
-if ( isset($HTTP_RAW_POST_DATA) )
-	$HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
+if ( isset( $HTTP_RAW_POST_DATA ) ) {
+	$HTTP_RAW_POST_DATA = trim( $HTTP_RAW_POST_DATA );
+}
 
 /** Include the bootstrap for setting up WordPress environment */
 include( dirname( __FILE__ ) . '/wp-load.php' );
 
 if ( isset( $_GET['rsd'] ) ) { // http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>'; ?>
 <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
 	<service>
 		<engineName>WordPress</engineName>
 		<engineLink>https://wordpress.org/</engineLink>
-		<homePageLink><?php bloginfo_rss('url') ?></homePageLink>
+		<homePageLink><?php bloginfo_rss( 'url' ); ?></homePageLink>
 		<apis>
-			<api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
-			<api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
-			<api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
-			<api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
+			<api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
+			<api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
+			<api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
+			<api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url( 'xmlrpc.php', 'rpc' ); ?>" />
 			<?php
 			/**
 			 * Add additional APIs to the Really Simple Discovery (RSD) endpoint.
@@ -59,16 +60,17 @@ header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
 exit;
 }
 
-include_once(ABSPATH . 'wp-admin/includes/admin.php');
-include_once(ABSPATH . WPINC . '/class-IXR.php');
-include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php'); 
+include_once( ABSPATH . 'wp-admin/includes/admin.php' );
+include_once( ABSPATH . WPINC . '/class-IXR.php' );
+include_once( ABSPATH . WPINC . '/class-wp-xmlrpc-server.php' );
 
 /**
  * Posts submitted via the XML-RPC interface get that title
+ *
  * @name post_default_title
  * @var string
  */
-$post_default_title = "";
+$post_default_title = '';
 
 /**
  * Filters the class used for handling XML-RPC requests.
@@ -78,7 +80,7 @@ $post_default_title = "";
  * @param string $class The name of the XML-RPC server class.
  */
 $wp_xmlrpc_server_class = apply_filters( 'wp_xmlrpc_server_class', 'wp_xmlrpc_server' );
-$wp_xmlrpc_server = new $wp_xmlrpc_server_class;
+$wp_xmlrpc_server       = new $wp_xmlrpc_server_class;
 
 // Fire off the request
 $wp_xmlrpc_server->serve_request();
@@ -96,6 +98,7 @@ exit;
  */
 function logIO( $io, $msg ) {
 	_deprecated_function( __FUNCTION__, '3.4.0', 'error_log()' );
-	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) )
+	if ( ! empty( $GLOBALS['xmlrpc_logging'] ) ) {
 		error_log( $io . ' - ' . $msg );
-}
\ No newline at end of file
+	}
+}